ordering-ui-external 1.3.2 → 1.4.1

package/src/themes/five/src/components/Checkout/index.js

@@ -125,6 +125,7 @@ const CheckoutUI = (props) => {
     placing ||
     errorCash ||
     loading ||
+    (options?.type === 3 && !(cartState?.cart?.spot_number || cart?.spot_number)) ||
     !cart?.valid_maximum ||
     (!cart?.valid_minimum && !(cart?.discount_type === 1 && cart?.discount_rate === 100)) ||
     // (((placeSpotTypes.includes(options?.type) && !cart?.place) && hasBusinessPlaces)) ||
@@ -507,11 +508,11 @@ const CheckoutUI = (props) => {
           </WarningText>
         )}
 
-        {/* {placeSpotTypes.includes(options?.type) && !cart?.place && hasBusinessPlaces && (
+        {options?.type === 3 && !cart?.spot_number && (
           <WarningText>
             {t('WARNING_PLACE_SPOT', 'Please, select your spot to place order.')}
           </WarningText>
-        )} */}
+        )}
 
         {options.type === 1 &&
         validationFields?.fields?.checkout?.driver_tip?.enabled &&
@@ -624,19 +625,26 @@ export const Checkout = (props) => {
 
   const getOrder = async (cartId) => {
     try {
-      setCartState({ ...cartState, loading: true })
+      let result = {}
+      const cart = cartsWithProducts.find(cart => cart.uuid === cartId)
       const userCustomer = JSON.parse(window.localStorage.getItem('user-customer'))
-      const url = userCustomer
-        ? `${ordering.root}/carts/${cartId}?user_id=${userCustomer?.id}`
-        : `${ordering.root}/carts/${cartId}`
-      const response = await fetch(url, {
-        method: 'GET',
-        headers: {
-          'Content-Type': 'application/json',
-          Authorization: `Bearer ${token}`
-        }
-      })
-      const { result } = await response.json()
+      if (cart && !userCustomer) {
+        result = { ...cart }
+      } else {
+        setCartState({ ...cartState, loading: true })
+        const url = userCustomer
+          ? `${ordering.root}/carts/${cartId}?user_id=${userCustomer?.id}`
+          : `${ordering.root}/carts/${cartId}`
+        const response = await fetch(url, {
+          method: 'GET',
+          headers: {
+            'Content-Type': 'application/json',
+            Authorization: `Bearer ${token}`
+          }
+        })
+        const content = await response.json()
+        result = content.result
+      }
 
       if (result.status === 1 && result.order?.uuid) {
         handleOrderRedirect(result.order.uuid)

package/src/themes/five/src/components/Favorite/index.js

@@ -1,5 +1,5 @@
 import React, { useState } from 'react'
-import { useLanguage, useOrder } from 'ordering-components-external'
+import { useLanguage, useOrder, useOrderingTheme } from 'ordering-components-external'
 import { FavoriteList } from '../FavoriteList'
 import { Tabs } from '../../styles/Tabs'
 import {
@@ -12,7 +12,9 @@ import {
 
 export const Favorite = (props) => {
   const [, t] = useLanguage()
+  const [orderingTheme] = useOrderingTheme()
   const [orderState] = useOrder()
+  const layout = orderingTheme?.theme?.favorite?.components?.layout?.type || 'original'
 
   const [tabSelected, setTabSelected] = useState('businesses')
 
@@ -44,6 +46,15 @@ export const Favorite = (props) => {
                 {item?.name}
               </Tab>
             ))}
+            {layout === 'appointments' && (
+              <Tab
+                borderBottom
+                active={tabSelected === 'professionals'}
+                onClick={() => setTabSelected('professionals')}
+              >
+                {t('PROFESSIONALS', 'Professionals')}
+              </Tab>
+            )}
           </Tabs>
         </TabsContainer>
         <ContentWrapper>
@@ -70,6 +81,13 @@ export const Favorite = (props) => {
               isOrder
             />
           )}
+          {tabSelected === 'professionals' && (
+            <FavoriteList
+              favoriteURL='favorite_users'
+              originalURL='users'
+              isProfessional
+            />
+          )}
         </ContentWrapper>
       </FavoritesContainer>
       {props.afterComponents?.map((AfterComponent, i) => (

package/src/themes/five/src/components/FavoriteList/index.js

@@ -11,6 +11,7 @@ import { SingleProductCard } from '../SingleProductCard'
 import { useTheme } from 'styled-components'
 import { SingleOrderCard } from '../SingleOrderCard'
 import { checkSiteUrl } from '../../../../../utils'
+import { SingleProfessionalCard } from '../SingleProfessionalCard'
 
 import {
   Container,
@@ -29,6 +30,7 @@ const FavoriteListUI = (props) => {
     isBusiness,
     isProduct,
     isOrder,
+    isProfessional,
     handleReorder,
     reorderState
   } = props
@@ -323,6 +325,28 @@ const FavoriteListUI = (props) => {
                   )}
                 </>
               )}
+              {isProfessional && (
+                <>
+                  {
+                    !favoriteList?.loading && favoriteList?.favorites?.map((professional, i) => (
+                      <SingleProfessionalCard
+                        key={i}
+                        professional={professional}
+                        handleUpdateProfessionals={handleUpdateFavoriteList}
+                      />
+                    ))
+                  }
+                  {favoriteList?.loading && (
+                    [...Array(5).keys()].map(i => (
+                      <SingleProfessionalCard
+                        key={i}
+                        professional={{}}
+                        isSkeleton
+                      />
+                    ))
+                  )}
+                </>
+              )}
               {!favoriteList?.loading && pagination?.totalPages && pagination?.currentPage < pagination?.totalPages && (
                 <ReadMoreCard>
                   <Button

package/src/themes/five/src/components/Header/index.js

@@ -24,7 +24,8 @@ import {
   AddressMenu,
   MomentMenu,
   FarAwayMessage,
-  Divider
+  Divider,
+  AddressFormWrapper
 } from './styles'
 import { useWindowSize } from '../../../../../hooks/useWindowSize'
 import { useOnlineStatus } from '../../../../../hooks/useOnlineStatus'
@@ -433,13 +434,15 @@ export const Header = (props) => {
                   isCustomerMode={isCustomerMode}
                 />
               ) : (
-                <AddressForm
-                  useValidationFileds
-                  address={orderState?.options?.address || {}}
-                  onCancel={() => setModalIsOpen(false)}
-                  onSaveAddress={() => setModalIsOpen(false)}
-                  isCustomerMode={isCustomerMode}
-                />
+                <AddressFormWrapper>
+                  <AddressForm
+                    useValidationFileds
+                    address={orderState?.options?.address || {}}
+                    onCancel={() => setModalIsOpen(false)}
+                    onSaveAddress={() => setModalIsOpen(false)}
+                    isCustomerMode={isCustomerMode}
+                  />
+                </AddressFormWrapper>
               )
             )}
             {modalSelected === 'moment' && (

package/src/themes/five/src/components/Header/styles.js

@@ -385,3 +385,8 @@ export const Divider = styled.div`
   border: 1px solid #DEE2E6;
   height: 100%;
 `
+export const AddressFormWrapper = styled.div`
+  @media (min-width: 450px) {
+    margin-top: 20px;
+  }
+`

package/src/themes/five/src/components/Modal/index.js

@@ -7,7 +7,8 @@ import {
   ModalTitle,
   ModalIcon,
   ModalHeader,
-  ModalBackHeader
+  ModalBackHeader,
+  ModalIconWrapper
 } from './styles'
 
 import { Button } from '../../styles/Buttons'
@@ -68,11 +69,13 @@ const ModalUI = (props) => {
         <ModalBackHeader />
       )}
       {!hideCloseDefault && (
-        <ModalIcon isProductForm={isProductForm}>
-          {
-            (authModal && onRemove) ? <MdClose onClick={() => onRemove()} /> : <MdClose onClick={() => onClose()} />
-          }
-        </ModalIcon>
+        <ModalIconWrapper>
+          <ModalIcon isProductForm={isProductForm}>
+            {
+              (authModal && onRemove) ? <MdClose onClick={() => onRemove()} /> : <MdClose onClick={() => onClose()} />
+            }
+          </ModalIcon>
+        </ModalIconWrapper>
       )}
       <ModalHeader>
         {title && (

package/src/themes/five/src/components/Modal/styles.js

@@ -86,7 +86,7 @@ export const ModalActions = styled.div`
 `
 export const ModalHeader = styled.div`
   display: flex;
-  margin-top: 30px;
+  margin-top: 40px;
 
   @media(min-width: 450px){
     margin-top: 0;
@@ -172,3 +172,17 @@ export const ModalBackHeader = styled.div`
     display: none;
   }
 `
+export const ModalIconWrapper = styled.div`
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  background-color: ${props => props.theme.colors.backgroundPage};
+  z-index: 100;
+  height: 70px;
+
+  @media (min-width: 450px) {
+    position: initial;
+    height: initial;
+  }
+`

package/src/themes/five/src/components/MyOrders/index.js

@@ -48,7 +48,7 @@ export const MyOrders = (props) => {
     { key: 'products', value: t('PRODUCTS', 'Products') }
   ]
 
-  const notOrderOptions = ['business', 'products']
+  const notOrderOptions = ['business', 'products', 'professionals']
   const allEmpty = (isEmptyActive && isEmptyPast && isEmptyPreorder) || ((isEmptyBusinesses || businessOrderIds?.length === 0) && hideOrders)
 
   const handleChangeFilter = (key) => {
@@ -87,6 +87,15 @@ export const MyOrders = (props) => {
                   {option?.value}
                 </Tab>
               ))}
+              {layout === 'appointments' && (
+                <Tab
+                  onClick={() => setSelectedOption('professionals')}
+                  active={selectedOption === 'professionals'}
+                  borderBottom
+                >
+                  {t('PROFESSIONALS', 'Professionals')}
+                </Tab>
+              )}
             </Tabs>
           </MyOrdersMenuContainer>
         )}
@@ -165,6 +174,7 @@ export const MyOrders = (props) => {
             horizontal
             isBusiness={selectedOption === 'business'}
             isProducts={selectedOption === 'products'}
+            isProfessionals={selectedOption === 'professionals'}
             activeOrders
             pastOrders
             preOrders

package/src/themes/five/src/components/OrderDetails/ActionsSection.js

@@ -33,6 +33,7 @@ export const ActionsSection = (props) => {
         ? setUnreadAlert({ ...unreadAlert, business: false })
         : setUnreadAlert({ ...unreadAlert, driver: false })
     }
+    window.scrollTo(0, 0)
   }
 
   return (

package/src/themes/five/src/components/OrdersOption/PreviousBusinessOrdered/index.js

@@ -1,19 +1,17 @@
-import React, { useEffect } from 'react'
-import { BusinessList as BusinessListController, useOrder } from 'ordering-components-external'
+import React from 'react'
+import { useOrder } from 'ordering-components-external'
 import { BusinessController } from '../../BusinessController'
 import { AutoScroll } from '../../AutoScroll'
 import { BusinessList, BusinessListWrapper } from './styles'
 import { useWindowSize } from '../../../../../../hooks/useWindowSize'
-export const PreviousBusinessOrderedUI = (props) => {
+
+export const PreviousBusinessOrdered = (props) => {
   const {
-    businessesList,
     isCustomLayout,
     isCustomerMode,
-    setBusinessLoading,
     onRedirectPage,
-    businessId,
-    isLoadingOrders,
-    handleUpdateBusinessList
+    handleUpdateBusinessList,
+    businesses
   } = props
 
   const [orderState] = useOrder()
@@ -21,20 +19,13 @@ export const PreviousBusinessOrderedUI = (props) => {
   const onBusinessClick = (business) => {
     onRedirectPage({ page: 'business', params: { store: business.slug } })
   }
-  useEffect(() => {
-    if (businessesList?.loading && businessesList?.businesses?.length === 0) {
-      setBusinessLoading(true)
-    } else {
-      setBusinessLoading(false)
-    }
-  }, [businessesList?.loading])
 
   return (
-    <BusinessListWrapper isLoading={businessesList?.loading || businessesList.businesses?.length === 0 || isLoadingOrders}>
+    <BusinessListWrapper isLoading={businesses?.loading}>
       <BusinessList>
         <AutoScroll scrollId='searchlistorder'>
           {
-            businessesList.businesses?.filter(business => businessId?.includes(business?.id))?.map((business, i) => (
+            businesses?.result?.map((business, i) => (
               <BusinessController
                 key={business.id}
                 className='card'
@@ -63,15 +54,3 @@ export const PreviousBusinessOrderedUI = (props) => {
     </BusinessListWrapper>
   )
 }
-
-export const PreviousBusinessOrdered = (props) => {
-  const previousBusinessOrderedController = {
-    ...props,
-    UIComponent: PreviousBusinessOrderedUI,
-    paginationSettings: { initialPage: 1, pageSize: 50, controlType: 'infinity' }
-  }
-
-  return (
-    <BusinessListController {...previousBusinessOrderedController} />
-  )
-}

package/src/themes/five/src/components/OrdersOption/PreviousProfessionalOrdered/index.js

@@ -0,0 +1,32 @@
+import React from 'react'
+
+import {
+  ProductsList,
+  ProductsListContainer
+} from './styles'
+
+import { AutoScroll } from '../../AutoScroll'
+import { SingleProfessionalCard } from '../../SingleProfessionalCard'
+
+export const PreviousProfessionalOrdered = (props) => {
+  const {
+    professionals,
+    handleUpdateProfessionals
+  } = props
+
+  return (
+    <ProductsListContainer isLoading={professionals?.length < 1}>
+      <ProductsList>
+        <AutoScroll>
+          {professionals?.map(professional => (
+            <SingleProfessionalCard
+              key={professional?.id}
+              professional={professional}
+              handleUpdateProfessionals={handleUpdateProfessionals}
+            />
+          ))}
+        </AutoScroll>
+      </ProductsList>
+    </ProductsListContainer>
+  )
+}

package/src/themes/five/src/components/OrdersOption/PreviousProfessionalOrdered/styles.js

@@ -0,0 +1,38 @@
+import styled, { css } from 'styled-components'
+
+export const ProductsList = styled.div`
+  display: flex;
+  box-sizing: border-box;
+
+  #autoscroll {
+    > div {
+      width: 300px;
+      max-width: 300px;
+    }
+  }
+
+  @media(min-width: 480px){
+    #autoscroll {
+      > div {
+        width: 350px;
+        max-width: 350px;
+      }
+    }
+  }
+`
+
+export const ProductsListContainer = styled.div`
+    margin-top: 10px;
+    display: flex;
+    overflow: scroll hidden;
+    ::-webkit-scrollbar {
+      width: 6px;
+      height: 6px;
+    }
+    ${({ isLoading }) => isLoading && css`
+      ::-webkit-scrollbar {
+        width: 0px;
+        height: 0px;
+      }
+    `}
+`

package/src/themes/five/src/components/OrdersOption/index.js

@@ -1,8 +1,7 @@
 import React, { useState, useEffect } from 'react'
 import Skeleton from 'react-loading-skeleton'
 import moment from 'moment'
-import { OrderList, useLanguage, useOrder, useEvent } from 'ordering-components-external'
-
+import { useLanguage, useOrder, useEvent, OrderList } from 'ordering-components-external'
 import { HorizontalOrdersLayout } from '../HorizontalOrdersLayout'
 import { VerticalOrdersLayout } from '../../../../../components/VerticalOrdersLayout'
 import { NotFoundSource } from '../../../../../components/NotFoundSource'
@@ -28,6 +27,7 @@ import { BusinessController } from '../BusinessController'
 import { SingleProductCard } from '../SingleProductCard'
 import { useWindowSize } from '../../../../../hooks/useWindowSize'
 import { Alert } from '../Confirm'
+import { PreviousProfessionalOrdered } from './PreviousProfessionalOrdered'
 
 const OrdersOptionUI = (props) => {
   const {
@@ -56,13 +56,17 @@ const OrdersOptionUI = (props) => {
     handleReorder,
     isBusiness,
     isProducts,
+    isProfessionals,
     businessOrderIds,
     products,
     hideOrders,
     onProductRedirect,
     businessesSearchList,
     handleUpdateProducts,
-    onBusinessClick
+    onBusinessClick,
+    professionals,
+    handleUpdateProfessionals,
+    businesses
   } = props
 
   const [, t] = useLanguage()
@@ -82,7 +86,6 @@ const OrdersOptionUI = (props) => {
     : orders.length > 0
 
   const [loadingOrders, setLoadingOrders] = useState(true)
-  const [businessLoading, setBusinessLoading] = useState(true)
   const [alertState, setAlertState] = useState({ open: false, content: [] })
   const closeOrderModal = (e) => {
     const outsideModal = !window.document.getElementById('app-modals') ||
@@ -94,7 +97,7 @@ const OrdersOptionUI = (props) => {
     }
   }
 
-  const showSkeletons = (!isBusiness && !isProducts && loading) || (businessLoading && isBusiness) || (products?.length === 0 && isProducts && ((!businessesSearchList && loading) || businessesSearchList?.loading))
+  const showSkeletons = (!isBusiness && !isProducts && loading) || (businesses?.loading && isBusiness) || (products?.length === 0 && isProducts && ((!businessesSearchList && loading) || businessesSearchList?.loading))
 
   const getOrderStatus = (s) => {
     const status = parseInt(s)
@@ -222,8 +225,7 @@ const OrdersOptionUI = (props) => {
       )}
       {isBusiness && businessOrderIds?.length > 0 && (
         <PreviousBusinessOrdered
-          businessId={businessOrderIds}
-          setBusinessLoading={setBusinessLoading}
+          businesses={businesses}
           onRedirectPage={onRedirectPage}
           isLoadingOrders={loading}
         />
@@ -238,9 +240,16 @@ const OrdersOptionUI = (props) => {
         />
       )}
 
-      {(isCustomLayout ? (loadingOrders || loading || isBusinessesLoading) : showSkeletons) && (
+      {isProfessionals && (
+        <PreviousProfessionalOrdered
+          professionals={professionals}
+          handleUpdateProfessionals={handleUpdateProfessionals}
+        />
+      )}
+
+      {(isCustomLayout ? (loadingOrders || loading || businesses?.loading) : showSkeletons) && (
         <>
-          {(businessLoading && isBusiness) ? (
+          {(businesses?.loading && isBusiness) ? (
             <BusinessControllerSkeleton>
               {[...Array(3).keys()].map((item, i) => (
                 <BusinessController

package/src/themes/five/src/components/ProductForm/index.js

@@ -640,15 +640,15 @@ const ProductOptionsUI = (props) => {
               <div className='price-amount-block'>
                 <div className='price'>
                   <h4>{productCart.total && parsePrice(productCart.total)}</h4>
-                  {product?.minimum_per_order && productCart?.quantity < product?.minimum_per_order && <span>{t('MINIMUM_TO_ORDER', 'Minimum _number_ to order').replace('_number_', product?.minimum_per_order)}</span>}
-                  {product?.maximum_per_order && productCart?.quantity > product?.maximum_per_order && <span>{t('MAXIMUM_TO_ORDER', 'Max. _number_ to order'.replace('_number_', product?.maximum_per_order))}</span>}
+                  {product?.minimum_per_order && productCart?.quantity <= product?.minimum_per_order && productCart?.quantity !== 1 && <span>{t('MINIMUM_TO_ORDER', 'Minimum _number_ to order').replace('_number_', product?.minimum_per_order)}</span>}
+                  {product?.maximum_per_order && productCart?.quantity >= product?.maximum_per_order && <span>{t('MAXIMUM_TO_ORDER', 'Max. _number_ to order'.replace('_number_', product?.maximum_per_order))}</span>}
                 </div>
                 {
                   productCart && !isSoldOut && maxProductQuantity > 0 && (
                     <div className={isHaveWeight ? 'incdec-control show-weight-unit' : 'incdec-control'}>
                       <FiMinusCircle
                         onClick={decrement}
-                        className={`${productCart.quantity === 1 || !productCart.quantity || isSoldOut ? 'disabled' : ''}`}
+                        className={`${productCart.quantity === 1 || !productCart.quantity || isSoldOut || (productCart?.quantity <= product?.minimum_per_order) ? 'disabled' : ''}`}
                       />
                       {
                         qtyBy?.pieces && (
@@ -669,7 +669,7 @@ const ProductOptionsUI = (props) => {
                       )}
                       <FiPlusCircle
                         onClick={increment}
-                        className={`${maxProductQuantity <= 0 || productCart.quantity >= maxProductQuantity || isSoldOut ? 'disabled' : ''}`}
+                        className={`${maxProductQuantity <= 0 || productCart.quantity >= maxProductQuantity || (productCart.quantity >= product?.maximum_per_order && product?.maximum_per_order) || isSoldOut ? 'disabled' : ''}`}
                       />
                       {isHaveWeight && (
                         <WeightUnitSwitch>
@@ -817,7 +817,7 @@ const ProductOptionsUI = (props) => {
 export const ProductForm = (props) => {
   const productOptionsProps = {
     ...props,
-    productCart: { quantity: props?.product?.minimum_per_order || 1 },
+    productCart: { quantity: props?.product?.maximum_per_order || props?.product?.minimum_per_order || 1 },
     UIComponent: ProductOptionsUI
   }
 

package/src/themes/five/src/components/RenderProductsLayout/styles.js

@@ -76,7 +76,7 @@ export const BusinessCartContainer = styled(BusinessCategoriesContainer)`
       margin-top: 0px;
     `}
   }
-  @media (min-width: 1000px) {
+  @media (min-width: 1000px) and (min-height: 600px) {
     display: block;
   }
 `