ordering-ui-external 1.3.2 → 1.4.0

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;
   }
 `

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

@@ -11,6 +11,8 @@ import BiStore from '@meronex/icons/bi/BiStore'
 import FaUserCircle from '@meronex/icons/fa/FaUserCircle'
 import BiHelpCircle from '@meronex/icons/bi/BiHelpCircle'
 import SiJsonwebtokens from '@meronex/icons/si/SiJsonwebtokens'
+import BiMessageDetail from '@meronex/icons/bi/BiMessageDetail'
+import BsSearch from '@meronex/icons/bs/BsSearch'
 import { Heart, Tag } from 'react-bootstrap-icons'
 
 import { useEvent, useLanguage, useOrder, useSession, useConfig } from 'ordering-components-external'
@@ -196,6 +198,64 @@ export const SidebarMenu = (props) => {
 
           {auth && (
             <>
+              <MenuLink
+                onClick={() => handleGoToPage({ page: 'business_search' })}
+              >
+                <WrappContent>
+                  <MenuLinkIcon
+                    active={
+                      window.location.pathname === '/business_search'
+                    }
+                  >
+                    <BsSearch />
+                  </MenuLinkIcon>
+                  <MenuLinkText>
+                    <TextInfo
+                      active={
+                        window.location.pathname === '/business_search'
+                      }
+                    >
+                      {t('BROWSE_SEARCH', 'Browse & Search')}
+                    </TextInfo>
+                  </MenuLinkText>
+                  <MenuLinkSeparator>
+                    <div>
+                      <hr />
+                    </div>
+                  </MenuLinkSeparator>
+                </WrappContent>
+              </MenuLink>
+              {
+                !isCustomerMode && (
+                  <MenuLink
+                    onClick={() => handleGoToPage({ page: 'orders' })}
+                  >
+                    <WrappContent>
+                      <MenuLinkIcon
+                        active={
+                          window.location.pathname === '/profile/orders'
+                        }
+                      >
+                        <FaRegListAlt />
+                      </MenuLinkIcon>
+                      <MenuLinkText>
+                        <TextInfo
+                          active={
+                            window.location.pathname === '/profile/orders'
+                          }
+                        >
+                          {t('ORDERS', 'Orders')}
+                        </TextInfo>
+                      </MenuLinkText>
+                      <MenuLinkSeparator>
+                        <div>
+                          <hr />
+                        </div>
+                      </MenuLinkSeparator>
+                    </WrappContent>
+                  </MenuLink>
+                )
+              }
               <MenuLink
                 onClick={() => handleGoToPage({ page: 'profile' })}
               >
@@ -213,7 +273,7 @@ export const SidebarMenu = (props) => {
                         window.location.pathname === '/profile'
                       }
                     >
-                      {t('PROFILE', 'Profile')}
+                      {t('VIEW_ACCOUNT', 'View account')}
                     </TextInfo>
                   </MenuLinkText>
                   <MenuLinkSeparator>
@@ -283,23 +343,23 @@ export const SidebarMenu = (props) => {
               )}
 
               <MenuLink
-                onClick={() => handleGoToPage({ page: 'help' })}
+                onClick={() => handleGoToPage({ page: 'messages' })}
               >
                 <WrappContent>
                   <MenuLinkIcon
                     active={
-                      window.location.pathname === '/help'
+                      window.location.pathname === '/messages'
                     }
                   >
-                    <BiHelpCircle />
+                    <BiMessageDetail />
                   </MenuLinkIcon>
                   <MenuLinkText>
                     <TextInfo
                       active={
-                        window.location.pathname === '/help'
+                        window.location.pathname === '/messages'
                       }
                     >
-                      {t('HELP', 'help')}
+                      {t('MESSAGES', 'Messages')}
                     </TextInfo>
                   </MenuLinkText>
                   <MenuLinkSeparator>
@@ -309,24 +369,25 @@ export const SidebarMenu = (props) => {
                   </MenuLinkSeparator>
                 </WrappContent>
               </MenuLink>
+
               <MenuLink
-                onClick={() => handleGoToPage({ page: 'favorite' })}
+                onClick={() => handleGoToPage({ page: 'help' })}
               >
                 <WrappContent>
                   <MenuLinkIcon
                     active={
-                      window.location.pathname === '/favorite'
+                      window.location.pathname === '/help'
                     }
                   >
-                    <Heart />
+                    <BiHelpCircle />
                   </MenuLinkIcon>
                   <MenuLinkText>
                     <TextInfo
                       active={
-                        window.location.pathname === '/favorite'
+                        window.location.pathname === '/help'
                       }
                     >
-                      {t('FAVORITES', 'Favorites')}
+                      {t('HELP', 'help')}
                     </TextInfo>
                   </MenuLinkText>
                   <MenuLinkSeparator>
@@ -363,38 +424,33 @@ export const SidebarMenu = (props) => {
                   </MenuLinkSeparator>
                 </WrappContent>
               </MenuLink>
-              {
-                !isCustomerMode && (
-                  <MenuLink
-                    onClick={() => handleGoToPage({ page: 'orders' })}
+              <MenuLink
+                onClick={() => handleGoToPage({ page: 'favorite' })}
+              >
+                <WrappContent>
+                  <MenuLinkIcon
+                    active={
+                      window.location.pathname === '/favorite'
+                    }
                   >
-                    <WrappContent>
-                      <MenuLinkIcon
-                        active={
-                          window.location.pathname === '/profile/orders'
-                        }
-                      >
-                        <FaRegListAlt />
-                      </MenuLinkIcon>
-                      <MenuLinkText>
-                        <TextInfo
-                          active={
-                            window.location.pathname === '/profile/orders'
-                          }
-                        >
-                          {t('ORDERS', 'Orders')}
-                        </TextInfo>
-                      </MenuLinkText>
-                      <MenuLinkSeparator>
-                        <div>
-                          <hr />
-                        </div>
-                      </MenuLinkSeparator>
-                    </WrappContent>
-                  </MenuLink>
-                )
-              }
-
+                    <Heart />
+                  </MenuLinkIcon>
+                  <MenuLinkText>
+                    <TextInfo
+                      active={
+                        window.location.pathname === '/favorite'
+                      }
+                    >
+                      {t('FAVORITES', 'Favorites')}
+                    </TextInfo>
+                  </MenuLinkText>
+                  <MenuLinkSeparator>
+                    <div>
+                      <hr />
+                    </div>
+                  </MenuLinkSeparator>
+                </WrappContent>
+              </MenuLink>
               <LogoutButton onCustomClick={() => actionSidebar(false)} />
             </>
           )}

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

@@ -188,7 +188,11 @@ export const QuantityContainer = styled.div`
   height: 25px;
   text-align: center;
   border-radius: 50%;
-  transform: translate(-50%, 50%);
+  transform: translate(-20px, 50%);
+
+  @media (min-width: 768px) {
+    transform: translate(-50%, 50%);
+  }
 `
 
 export const RibbonBox = styled.div`