ordering-ui-external 1.3.2 → 1.4.0

package/_modules/themes/five/src/components/SingleProfessionalCard/styles.js

@@ -0,0 +1,47 @@
+"use strict";
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.UserPhoto = exports.InfoWrapper = exports.Container = exports.ActionWrapper = void 0;
+var _styledComponents = _interopRequireWildcard(require("styled-components"));
+var _react = _interopRequireDefault(require("react"));
+var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7;
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
+var Container = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  box-shadow: 0px 1px 4px rgba(0, 0, 0, 0.1);\n  border-radius: 4px;\n  padding: 12px 14px;\n  display: flex;\n  align-items: center;\n  background-color: ", ";\n  border: 1px solid ", ";\n  box-sizing: border-box;\n  margin: 10px;\n"])), function (props) {
+  return props.theme.colors.backgroundPage;
+}, function (props) {
+  return props.theme.colors.gray200;
+});
+exports.Container = Container;
+var UserPhotoStyled = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  box-sizing: border-box;\n  position: relative;\n  background-repeat: no-repeat, repeat;\n  background-size: cover;\n  background-position: center;\n  object-fit: cover;\n  min-height: 86px;\n  width: 86px;\n  height: 86px;\n  border-radius: 4px;\n\n  ", "\n"])), function (_ref) {
+  var isSkeleton = _ref.isSkeleton;
+  return isSkeleton && (0, _styledComponents.css)(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n    background-color: ", ";\n  "])), function (props) {
+    return props.theme.colors.gray200;
+  });
+});
+var UserPhoto = function UserPhoto(props) {
+  var style = {};
+  if (props.bgimage) {
+    style.backgroundImage = "url(".concat(props.bgimage, ")");
+  }
+  return /*#__PURE__*/_react.default.createElement(UserPhotoStyled, _extends({}, props, {
+    style: style
+  }), props.children);
+};
+exports.UserPhoto = UserPhoto;
+var InfoWrapper = _styledComponents.default.div(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  width: calc(100% - 106px);\n  margin-left: 20px;\n  ", "\n  > h4 {\n    font-weight: 400;\n    font-size: 14px;\n    line-height: 24px;\n    margin: 0px;\n    white-space: nowrap;\n    text-overflow: ellipsis;\n    overflow: hidden;\n  }\n  p {\n    margin-top: 2px;\n    font-weight: 400;\n    font-size: 12px;\n    line-height: 22px;\n  }\n"])), function (props) {
+  return props.theme.rtl && (0, _styledComponents.css)(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n    margin-left: 0px;\n    margin-right: 20px;\n  "])));
+});
+exports.InfoWrapper = InfoWrapper;
+var ActionWrapper = _styledComponents.default.div(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n  margin-top: 15px;\n  display: flex;\n  align-items: center;\n  > .info {\n    cursor: pointer;\n    font-size: 16px;\n    margin-right: 7px;\n    ", "\n  }\n  > span {\n    display: flex;\n    align-items: center;\n    justify-content: center;\n    cursor: pointer;\n    svg {\n      color: ", ";\n      font-size: 16px;\n      margin-top: 2px;\n    }\n  }\n"])), function (props) {
+  return props.theme.rtl && (0, _styledComponents.css)(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["\n      margin-right: 0px;\n      margin-left: 7px;\n    "])));
+}, function (props) {
+  return props.theme.colors.danger500;
+});
+exports.ActionWrapper = ActionWrapper;

package/_modules/themes/five/src/styles/Selects/index.js

@@ -21,7 +21,7 @@ var Option = _styledComponents.default.div(_templateObject || (_templateObject =
   });
 });
 exports.Option = Option;
-var Options = _styledComponents.default.div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  position: absolute;\n  background-color: #CCC;\n  margin-top: 7px;\n  z-index: 10000;\n  border-width: 1px;\n  border-style: solid;\n  border-color: #CCC;\n  border-radius: 15px;\n  overflow: hidden;\n  ", "\n  ", "\n"])), function (_ref2) {
+var Options = _styledComponents.default.div(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  position: absolute;\n  background-color: #CCC;\n  margin-top: 7px;\n  z-index: 10000;\n  border-width: 1px;\n  border-style: solid;\n  border-color: #CCC;\n  border-radius: 15px;\n  overflow: hidden;\n\n  ", "\n  ", "\n"])), function (_ref2) {
   var position = _ref2.position;
   return (position === null || position === void 0 ? void 0 : position.toLowerCase()) === 'left' && (0, _styledComponents.css)(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["\n    left: 0;\n    margin-left: -1px;\n    ", "\n  "])), function (props) {
     var _props$theme2;

package/index-template.js

@@ -20,6 +20,7 @@ import isotype from './template/assets/images/isotype.svg'
 import isotypeInvert from './template/assets/images/isotype-invert.svg'
 
 import homeHero from './template/assets/images/home-hero.jpg'
+import businessHero from './template/assets/images/business-hero.jpg'
 import notFound from './template/assets/images/not-found.svg'
 import notNetwork from './template/assets/images/not-network.svg'
 import notFound404 from './template/assets/images/not-found-404.svg'
@@ -27,8 +28,12 @@ import notFoundLighting from './template/assets/images/not-found-lighting.svg'
 import searchIcon from './template/assets/images/search-icon.svg'
 import emptyActiveOrders from './template/assets/images/empty-active-orders.svg'
 import emptyPastOrders from './template/assets/images/empty-past-orders.svg'
-import creatingOrder from './template/assets/images/order-creating.png'
-import successOrder from './template/assets/images/order-sucess.png'
+import visa from './template/assets/images/visa.png'
+import mastercard from './template/assets/images/mastercard.png'
+import credit from './template/assets/images/credit.png'
+import businessSignUpHero from './template/assets/images/business_signup.png'
+import driverSignUpHero from './template/assets/images/driver-signup-hero.png'
+import loyaltyLevel from './template/assets/images/loyalty_level.png'
 
 import orderStatus0 from './template/assets/images/order/status-0.svg'
 import orderStatus1 from './template/assets/images/order/status-1.svg'
@@ -65,6 +70,12 @@ import storeDummy from './template/assets/images/dummies/store.png'
 import leftArrow from './template/assets/left-arrow.svg'
 import rightArrow from './template/assets/right-arrow.svg'
 
+import delivery from './template/assets/images/delivery-types/delivery.jpg'
+import curbside from './template/assets/images/delivery-types/curbside.jpg'
+import driveThru from './template/assets/images/delivery-types/drive_thru.jpg'
+import eatIn from './template/assets/images/delivery-types/eat_in.jpg'
+import pickUp from './template/assets/images/delivery-types/pickup.jpg'
+
 Sentry.init({
   environment: process.env.NODE_ENV,
   dsn: "https://28d1f7ef8d764235902101e569102521@o460529.ingest.sentry.io/6302953",
@@ -97,6 +108,7 @@ theme.images = {
   logos,
   general: {
     homeHero,
+    businessHero,
     notFound,
     notFound404,
     notFoundLighting,
@@ -104,8 +116,11 @@ theme.images = {
     notNetwork,
     emptyActiveOrders,
     emptyPastOrders,
-    creatingOrder,
-    successOrder,
+    visa,
+    mastercard,
+    credit,
+    businessSignUpHero,
+    driverSignUpHero,
     leftArrow,
     rightArrow
   },
@@ -145,7 +160,15 @@ theme.images = {
     product: productDummy,
     driverPhoto: 'https://res.cloudinary.com/demo/image/fetch/c_thumb,g_face,r_max/https://www.freeiconspng.com/thumbs/driver-icon/driver-icon-14.png',
     businessLogo: storeDummy,
-    customerPhoto: 'https://res.cloudinary.com/demo/image/upload/c_thumb,g_face,r_max/d_avatar.png/non_existing_id.png'
+    customerPhoto: 'https://res.cloudinary.com/demo/image/upload/c_thumb,g_face,r_max/d_avatar.png/non_existing_id.png',
+    loyaltyLevel
+  },
+  deliveryTypes: {
+    delivery: delivery,
+    curbside: curbside,
+    driveThru: driveThru,
+    eatIn: eatIn,
+    pickUp: pickUp
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-external",
-  "version": "1.3.2",
+  "version": "1.4.0",
   "description": "Ordering UI Components",
   "main": "./_modules/index.js",
   "exports": {
@@ -67,7 +67,9 @@
     "url-loader": "^4.1.1",
     "webpack": "^4.43.0",
     "webpack-cli": "^3.3.12",
-    "webpack-dev-server": "^3.11.0"
+    "webpack-dev-server": "^3.11.0",
+    "webpack-merge": "^5.2.0",
+    "workbox-webpack-plugin": "^6.5.3"
   },
   "dependencies": {
     "@babel/runtime": "^7.10.4",
@@ -83,13 +85,14 @@
     "libphonenumber-js": "^1.9.4",
     "lodash": "^4.17.19",
     "moment": "^2.29.4",
-    "ordering-components-external": "1.2.1",
+    "ordering-components-external": "1.3.0",
     "polished": "^3.6.6",
     "react-bootstrap-icons": "^1.7.2",
     "react-calendar": "^3.3.1",
     "react-datepicker": "^4.1.1",
     "react-helmet": "^6.1.0",
     "react-hook-form": "^6.8.1",
+    "react-ios-pwa-prompt": "^1.8.4",
     "react-linkify": "^1.0.0-alpha",
     "react-loading-skeleton": "^2.1.1",
     "react-otp-input": "^2.3.0",

package/src/themes/five/index.js

@@ -84,6 +84,7 @@ import { SignUpBusiness } from './src/components/SignUpBusiness'
 import { SignUpDriver } from './src/components/SignUpDriver'
 import { SignUpApproval } from './src/components/SignUpApproval'
 import { SingleProductCard } from './src/components/SingleProductCard'
+import { SingleProfessionalCard } from './src/components/SingleProfessionalCard'
 import { StripeElementsForm } from './src/components/StripeElementsForm'
 import { StripeRedirectForm } from './src/components/StripeRedirectForm'
 import { UpsellingPage } from './src/components/UpsellingPage'
@@ -199,6 +200,7 @@ export {
   SignUpDriver,
   SignUpApproval,
   SingleProductCard,
+  SingleProfessionalCard,
   StripeElementsForm,
   StripeRedirectForm,
   UpsellingPage,

package/src/themes/five/src/components/BusinessListingSearch/MaxSectionItem/index.js

@@ -0,0 +1,44 @@
+import { useLanguage, useUtils } from 'ordering-components-external'
+import React from 'react'
+import { MaxFilterContainer, MaxItem, MaxItemContainer, ProgressBar, ProgressContentWrapper } from '../styles'
+
+export const MaxSectionItem = (props) => {
+  const {
+    filters,
+    handleChangeFilters,
+    title,
+    options,
+    filter
+  } = props
+
+  const [, t] = useLanguage()
+  const [{ parsePrice }] = useUtils()
+
+  const parseValue = (option) => {
+    return filter === 'max_distance'
+      ? `${option / 1000} ${t('KM', 'Km')}`
+      : filter === 'max_eta'
+        ? `${option} ${t('MIN', 'min')}`
+        : parsePrice(option)
+  }
+
+  return (
+    <MaxFilterContainer>
+      <h3>{title}</h3>
+      <ProgressContentWrapper>
+        <ProgressBar style={{ width: `${((options.indexOf(filters?.[filter]) / 3) * 100) ?? 100}%` }} />
+      </ProgressContentWrapper>
+      <MaxItemContainer>
+        {options.map((option, i) => (
+          <MaxItem
+            key={option}
+            active={filters?.[filter] === option || (option === 'default' && (filters?.[filter] === 'default' || !filters?.[filter]))}
+            onClick={() => handleChangeFilters(filter, option)}
+          >
+            {option === 'default' ? `${parseValue(options[i - 1])}+` : parseValue(option)}
+          </MaxItem>
+        ))}
+      </MaxItemContainer>
+    </MaxFilterContainer>
+  )
+}

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

@@ -53,6 +53,7 @@ import BisDownArrow from '@meronex/icons/bi/BisDownArrow'
 import BisUpArrow from '@meronex/icons/bi/BisUpArrow'
 import { Modal } from '../Modal'
 import { ProductForm } from '../ProductForm'
+import { MaxSectionItem } from './MaxSectionItem'
 
 export const BusinessListingSearchUI = (props) => {
   const {
@@ -123,35 +124,6 @@ export const BusinessListingSearchUI = (props) => {
     setCurProduct({ business: null, product: null })
   }
 
-  const MaxSectionItem = ({ title, options, filter }) => {
-    const parseValue = (option) => {
-      return filter === 'max_distance'
-        ? `${option / 1000} ${t('KM', 'Km')}`
-        : filter === 'max_eta'
-          ? `${option} ${t('MIN', 'min')}`
-          : parsePrice(option)
-    }
-    return (
-      <MaxFilterContainer>
-        <h3>{title}</h3>
-        <ProgressContentWrapper>
-          <ProgressBar style={{ width: `${((options.indexOf(filters?.[filter]) / 3) * 100) ?? 100}%` }} />
-        </ProgressContentWrapper>
-        <MaxItemContainer>
-          {options.map((option, i) => (
-            <MaxItem
-              key={option}
-              active={filters?.[filter] === option || (option === 'default' && (filters?.[filter] === 'default' || !filters?.[filter]))}
-              onClick={() => handleChangeFilters(filter, option)}
-            >
-              {option === 'default' ? `${parseValue(options[i - 1])}+` : parseValue(option)}
-            </MaxItem>
-          ))}
-        </MaxItemContainer>
-      </MaxFilterContainer>
-    )
-  }
-
   return (
     <BusinessListingSearchContainer>
       <BusinessesTitle>
@@ -226,6 +198,8 @@ export const BusinessListingSearchUI = (props) => {
               title={t('MAX_DELIVERY_FEE', 'Max delivery fee')}
               options={maxDeliveryFeeOptions}
               filter='max_delivery_price'
+              filters={filters}
+              handleChangeFilters={handleChangeFilters}
             />
           )}
           {[1, 2].includes(orderState?.options?.type) && (
@@ -233,12 +207,16 @@ export const BusinessListingSearchUI = (props) => {
               title={orderState?.options?.type === 1 ? t('MAX_DELIVERY_TIME', 'Max delivery time') : t('MAX_PICKUP_TIME', 'Max pickup time')}
               options={maxTimeOptions}
               filter='max_eta'
+              filters={filters}
+              handleChangeFilters={handleChangeFilters}
             />
           )}
           <MaxSectionItem
             title={t('MAX_DISTANCE', 'Max distance')}
             options={maxDistanceOptions}
             filter='max_distance'
+            filters={filters}
+            handleChangeFilters={handleChangeFilters}
           />
           {/* <MaxSectionItem
               title={t('MAX_PRODUCT_PRICE', 'Max product price')}
@@ -255,7 +233,7 @@ export const BusinessListingSearchUI = (props) => {
           </TagsContainer>
         </Filters>
         <FiltersResultContainer>
-          {auth && (
+          {auth && termValue?.length === 0 && (
             <PreviouslyOrderedContainer>
               <MyOrders
                 hideOrders

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

@@ -5,6 +5,8 @@ import { SingleProductCard } from '../SingleProductCard'
 import { NotFoundSource } from '../NotFoundSource'
 import { Modal } from '../Modal'
 import { shape } from '../../../../../utils'
+import { AutoScroll } from '../AutoScroll'
+import { XLg as Close } from 'react-bootstrap-icons'
 
 import {
   ProductsContainer,
@@ -19,7 +21,8 @@ import {
   ContainerButton,
   CategoryDescription,
   DescriptionContainer,
-  SubcategorySearchContainer
+  SubcategorySearchContainer,
+  SubCategoriesInnerContainer
 } from './styles'
 import { Button } from '../../styles/Buttons'
 
@@ -74,33 +77,37 @@ const BusinessProductsListUI = (props) => {
 
     return (
       <SubCategoriesContainer>
-        <ContainerButton
-          isSelected={allsubcategorySelected}
-        >
-          <Button
-            onClick={() => onClickSubcategory(null, category)}
-            color={allsubcategorySelected ? 'primary' : 'secondary'}
-          >
-            {t('ALL', 'All')} {allsubcategorySelected && 'X'}
-          </Button>
-        </ContainerButton>
-        {category?.subcategories?.map(subcategory => {
-          const isSubcategorySelected = subcategoriesSelected?.find(_subcategory => _subcategory?.id === subcategory?.id)
-          return (
+        <SubCategoriesInnerContainer>
+          <AutoScroll scrollId={`scroll_${category?.id}`}>
             <ContainerButton
-              key={subcategory?.id}
-              isSelected={isSubcategorySelected}
+              isSelected={allsubcategorySelected}
             >
               <Button
-                onClick={() => onClickSubcategory(subcategory, category)}
-                color={isSubcategorySelected ? 'primary' : 'secondary'}
+                onClick={() => onClickSubcategory(null, category)}
+                color={allsubcategorySelected ? 'primary' : 'lightGray'}
               >
-                {subcategory?.name} {isSubcategorySelected && 'X'}
+                {t('ALL', 'All')} {allsubcategorySelected && <Close />}
               </Button>
             </ContainerButton>
-          )
-        }
-        )}
+            {category?.subcategories?.map(subcategory => {
+              const isSubcategorySelected = subcategoriesSelected?.find(_subcategory => _subcategory?.id === subcategory?.id)
+              return (
+                <ContainerButton
+                  key={subcategory?.id}
+                  isSelected={isSubcategorySelected}
+                >
+                  <Button
+                    onClick={() => onClickSubcategory(subcategory, category)}
+                    color={isSubcategorySelected ? 'primary' : 'lightGray'}
+                  >
+                    {subcategory?.name} {isSubcategorySelected && <Close />}
+                  </Button>
+                </ContainerButton>
+              )
+            }
+            )}
+          </AutoScroll>
+        </SubCategoriesInnerContainer>
       </SubCategoriesContainer>
     )
   }

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

@@ -162,16 +162,39 @@ export const RibbonBox = styled.div`
 `
 
 export const SubCategoriesContainer = styled.div`
+  overflow: auto hidden;
+  margin-top: 10px;
+  width: 100%;
+  ::-webkit-scrollbar {
+      opacity: 0;
+  }
+  @media (min-width: 993px) {
+    width: calc(100% - 30px);
+  }
+`
+
+export const SubCategoriesInnerContainer = styled.div`
   display: flex;
 `
 
 export const ContainerButton = styled.div`
   button {
+    white-space: nowrap;
+    font-size: 14px;
+    display: flex;
+    align-items: center;
     overflow: hidden;
     margin-right: 10px;
-    margin-top: 10px;
     border-radius: 50px;
-    color: ${({ isSelected }) => isSelected ? '#fff' : '#414954'};
+
+    svg {
+      margin-left: 5px;
+      font-size: 13px;
+      ${props => props.theme.rtl && css`
+        margin-right: 5px;
+        margin-left: 0px;
+      `}
+    }
   }
 `
 

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

@@ -347,7 +347,7 @@ const BusinessProductsListingUI = (props) => {
           disabled={openUpselling || !currentCart?.valid_maximum || (!currentCart?.valid_minimum && !(currentCart?.discount_type === 1 && currentCart?.discount_rate === 100))}
         />
       )}
-      {windowSize.width < 1000 && currentCart?.products?.length > 0 && (
+      {(windowSize.width < 1000 || windowSize.height < 600) && currentCart?.products?.length > 0 && (
         <MobileCartViewWrapper>
           <span>{parsePrice(currentCart?.total)}</span>
           <Button color='primary' onClick={() => setisCartModal(true)}>{t('VIEW_CART', 'View cart')}</Button>

package/src/themes/five/src/components/BusinessesListing/layouts/OriginalBusinessesListing/index.js

@@ -9,7 +9,6 @@ import {
   useSession,
   useLanguage,
   useConfig,
-  useOrderingTheme,
   BusinessList as BusinessListController
 } from 'ordering-components-external'
 
@@ -76,7 +75,6 @@ const BusinessesListingUI = (props) => {
   const [orderState, { changeCityFilter }] = useOrder()
   const [{ auth }] = useSession()
   const [{ configs }] = useConfig()
-  const orderingTheme = useOrderingTheme()
   const theme = useTheme()
   const [modals, setModals] = useState({ listOpen: false, formOpen: false, citiesOpen: false })
   const [alertState, setAlertState] = useState({ open: false, content: [] })
@@ -250,7 +248,10 @@ const BusinessesListingUI = (props) => {
       {props.beforeComponents?.map((BeforeComponent, i) => (
         <BeforeComponent key={i} {...props} />))}
       <BusinessContainer>
-        <BusinessHeroImg bgimage={theme.images?.general?.businessHero} />
+        <BusinessHeroImg
+          bgimage={theme.images?.general?.businessHero}
+          height={theme?.business_listing_view?.components?.business_hero?.style?.height}
+        />
         <OrderProgressWrapper>
           <OrderProgress
             franchiseId={props.franchiseId}

package/src/themes/five/src/components/BusinessesListing/layouts/OriginalBusinessesListing/styles.js

@@ -98,7 +98,7 @@ export const BusinessHeroImgStyled = styled.div`
     height: 370px;
   }
   @media (min-width: 821px) {
-    height: 650px;
+    height: ${({ height }) => height || '650px'};
   }
 `
 

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

@@ -617,9 +617,11 @@ const CartUI = (props) => {
           onClose={() => setOpenChangeStore(false)}
         >
           <CartStoresListing
+            isStore={isStore}
             pageChangeStore='business'
             cartuuid={cart?.uuid}
             onClose={() => setOpenChangeStore(false)}
+            handleCustomStoreRedirect={handleStoreRedirect}
           />
         </Modal>
 

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

@@ -624,19 +624,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' && (