ordering-ui-external 1.9.6 → 2.0.0

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

@@ -178,3 +178,5 @@ export const Header = (props) => {
     </HeaderContainer>
   )
 }
+
+export default Header

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

@@ -104,3 +104,5 @@ export const Modal = (props) => {
     <Popup {...ModalProps} />
   )
 }
+
+export default Modal

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

@@ -34,7 +34,7 @@ const getPayIcon = (method) => {
     case 1:
       return <Cash />
     case 22:
-      return <BilStripe />
+      return <CreditCard />
     case 28:
       return <FaCcStripe />
     case 31:

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

@@ -1,5 +1,6 @@
 import React, { useState, useEffect } from 'react'
 import { useHistory } from 'react-router-dom'
+import { useTheme } from 'styled-components'
 import {
   useLanguage,
   useUtils,
@@ -8,7 +9,6 @@ import {
   useSession,
   useValidationFields,
   useOrder,
-  useOrderingTheme,
   MultiCheckout as MultiCheckoutController
 } from 'ordering-components-external'
 
@@ -62,14 +62,15 @@ const MultiCheckoutUI = (props) => {
     onRedirectPage,
     cartGroup,
     cartUuid,
-    totalCartsFee
+    totalCartsFee,
+    handleSearchRedirect
   } = props
 
+  const theme = useTheme()
   const [, t] = useLanguage()
   const [{ configs }] = useConfig()
   const [{ parsePrice }] = useUtils()
   const [customerState] = useCustomer()
-  const [orderingTheme] = useOrderingTheme()
   const [validationFields] = useValidationFields()
   const [{ user }] = useSession()
   const [orderState] = useOrder()
@@ -80,8 +81,10 @@ const MultiCheckoutUI = (props) => {
   const [alertState, setAlertState] = useState({ open: false, content: [] })
   const isDisablePlaceOrderButton = !(paymethodSelected?.paymethod_id || paymethodSelected?.wallet_id) || (paymethodSelected?.paymethod?.gateway === 'stripe' && !paymethodSelected?.paymethod_data)
   const walletCarts = (Object.values(orderState?.carts)?.filter(cart => cart?.products && cart?.products?.length && cart?.status !== 2 && cart?.valid_schedule && cart?.valid_products && cart?.valid_address && cart?.valid_maximum && cart?.valid_minimum && cart?.wallets) || null) || []
-  const isMultiDriverTips = orderingTheme?.theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
+  const isMultiDriverTips = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
   const driverTipsOptions = typeof configs?.driver_tip_options?.value === 'string'
+    ? JSON.parse(configs?.driver_tip_options?.value) || []
+    : configs?.driver_tip_options?.value || []
   const totalFeeEnabled = configs?.multi_business_checkout_show_combined_delivery_fee?.value === '1'
     ? JSON.parse(configs?.driver_tip_options?.value) || []
     : configs?.driver_tip_options?.value || []
@@ -159,9 +162,11 @@ const MultiCheckoutUI = (props) => {
 
   return (
     <>
-      {!cartGroup?.loading && openCarts.length === 0 ? (
+      {((!cartGroup?.loading && openCarts.length === 0) || !cartUuid) ? (
         <NotFoundSource
-          content={t('CARTS_NOT_FOUND', 'You don’t have carts available')}
+          content={t('NOT_FOUND_CARTS', 'Sorry, You don\'t seem to have any carts.')}
+          btnTitle={t('SEARCH_REDIRECT', 'Go to Businesses')}
+          onClickButton={handleSearchRedirect}
         />
       ) : (
         <Container>

package/src/themes/five/src/components/MultiOrdersDetails/SingleOrderCard.js

@@ -75,7 +75,7 @@ const SingleOrderCardUI = (props) => {
   }
 
   const handleGoToOrderDetails = (uuid) => {
-    events.emit('go_to_page', { page: 'order_detail', params: { orderId: uuid }, replace: true })
+    events.emit('go_to_page', { page: 'order_detail', params: { orderId: uuid }, replace: !props.isMultiOrders })
   }
 
   const handleOpenMessages = (data) => {

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

@@ -168,6 +168,7 @@ const MultiOrdersDetailsUI = (props) => {
           {orders.map(order => (
             <SingleOrderCard
               key={order.id}
+              isMultiOrders
               getOrderStatus={getOrderStatus}
               order={order}
             />

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

@@ -216,3 +216,5 @@ export const NavigationBar = () => {
     </>
   )
 }
+
+export default NavigationBar

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

@@ -61,3 +61,5 @@ export const NotNetworkConnectivity = (props) => {
     </>
   )
 }
+
+export default NotNetworkConnectivity

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

@@ -151,7 +151,7 @@ const ProductOptionsUI = (props) => {
   }
 
   const handleSaveProduct = () => {
-    const isErrors = Object.values(errors).length > 0
+    const isErrors = Object.values(errors)?.length > 0
     if (!isErrors) {
       handleSave && handleSave()
       return
@@ -212,7 +212,7 @@ const ProductOptionsUI = (props) => {
 
   const getOverFlowImage = (url) => {
     const keys = url.split('/')
-    const _videoId = keys[keys.length - 1]
+    const _videoId = keys[keys?.length - 1]
     const overFlowImg = 'http://img.youtube.com/vi/' + _videoId + '/0.jpg'
     return overFlowImg
   }
@@ -230,7 +230,7 @@ const ProductOptionsUI = (props) => {
 
   const scrollDown = () => {
     const adjustHeight = windowSize?.width > 768 ? 50 : 55
-    const isErrors = Object.values(errors).length > 0
+    const isErrors = Object.values(errors)?.length > 0
     if (!isErrors) {
       return
     }
@@ -272,8 +272,8 @@ const ProductOptionsUI = (props) => {
       if (product?.ingredients.length > 0 || product?.extras.length > 0) {
         const menuList = []
         if (product?.ingredients?.length > 0) menuList.push('ingredients')
-        product?.extras?.length > 0 && product.extras.sort((a, b) => a.rank - b.rank).forEach(extra => {
-          extra.options?.length > 0 && extra.options.sort((a, b) => a.rank - b.rank).forEach(option => {
+        product?.extras.length > 0 && product?.extras.sort((a, b) => a.rank - b.rank).forEach(extra => {
+          extra?.options.length > 0 && extra?.options.sort((a, b) => a.rank - b.rank).forEach(option => {
             showOption(option) && menuList.push(`id_${option?.id}`)
           })
         })
@@ -545,12 +545,12 @@ const ProductOptionsUI = (props) => {
             <Divider />
             <ProductEdition>
               {
-                (product?.ingredients.length > 0 || product?.extras.length > 0) && (
+                (product?.ingredients?.length > 0 || product?.extras?.length > 0) && (
                   <ProductTabContainer id='all'>
                     <Tabs>
                       <AutoScroll scrollId='optionList'>
                         {
-                          product?.ingredients.length > 0 && (
+                          product?.ingredients?.length > 0 && (
                             <Tab
                               key='ingredients'
                               id='menu_ingredients'
@@ -563,7 +563,7 @@ const ProductOptionsUI = (props) => {
                           )
                         }
                         {
-                          product?.extras.sort((a, b) => a.rank - b.rank).map(extra => extra.options.sort((a, b) => a.rank - b.rank).map(option => {
+                          product?.extras.sort((a, b) => a.rank - b.rank).map(extra => extra.options?.sort((a, b) => a.rank - b.rank).map(option => {
                             return (
                               showOption(option) && (
                                 <Tab
@@ -584,9 +584,9 @@ const ProductOptionsUI = (props) => {
                   </ProductTabContainer>
                 )
               }
-              {product?.ingredients.length > 0 && (
+              {product?.ingredients?.length > 0 && (
                 <div id='ingredients'>
-                  {product?.ingredients.length > 0 && (<SectionTitle>{t('INGREDIENTS', theme?.defaultLanguages?.INGREDIENTS || 'Ingredients')}</SectionTitle>)}
+                  {product?.ingredients?.length > 0 && (<SectionTitle>{t('INGREDIENTS', theme?.defaultLanguages.INGREDIENTS || 'Ingredients')}</SectionTitle>)}
                   <WrapperIngredients isProductSoldout={isSoldOut || maxProductQuantity <= 0}>
                     {product?.ingredients.map(ingredient => (
                       <ProductIngredient
@@ -602,7 +602,7 @@ const ProductOptionsUI = (props) => {
               )}
               <div>
                 {
-                  product?.extras.sort((a, b) => a.rank - b.rank).map(extra => extra.options.sort((a, b) => a.rank - b.rank).map(option => {
+                  product?.extras?.sort((a, b) => a.rank - b.rank).map(extra => extra.options.sort((a, b) => a.rank - b.rank).map(option => {
                     const currentState = productCart.options[`id:${option?.id}`] || {}
                     return (
                       <React.Fragment key={option?.id}>

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

@@ -251,3 +251,5 @@ export const ReviewDriver = (props) => {
 
   return <ReviewDriverController {...reviewDriverProps} />
 }
+
+export default ReviewDriver

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

@@ -247,3 +247,5 @@ export const ReviewOrder = (props) => {
 
   return <ReviewOrderController {...ReviewOrderProps} />
 }
+
+export default ReviewOrder

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

@@ -257,3 +257,5 @@ export const ReviewProduct = (props) => {
   }
   return <ReviewProductController {...reviewProductProps} />
 }
+
+export default ReviewProduct

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

@@ -84,3 +84,5 @@ export const ReviewTrigger = (props) => {
     </>
   )
 }
+
+export default ReviewTrigger

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

@@ -106,3 +106,5 @@ export const SignUpApproval = (props) => {
     </Container>
   )
 }
+
+export default SignUpApproval

package/src/themes/five/src/styles/Buttons/index.js

@@ -36,7 +36,7 @@ export const Button = styled.button`
       padding-left: 15%
       ${props => props.theme?.rtl && css`
         padding-right: 15%;
-        padding-left: 0
+        padding-left: 0;
     `}
     }
   `}
@@ -259,3 +259,5 @@ export const Button = styled.button`
     `}
   `}
 `
+
+export default Button

package/src/themes/five/src/styles/Inputs/index.js

@@ -112,7 +112,7 @@ export const InputGroupRight = styled(InputGroupLeft)`
     margin-right: -7px;
     ${props => props.theme?.rtl && css`
         margin-left: -7px;
-        margin-right: 0
+        margin-right: 0;
     `}
   }
   

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

@@ -379,3 +379,5 @@ export const SignUpIcon = () => {
     </svg>
   )
 }
+
+export default Header

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

@@ -325,3 +325,5 @@ const styles = {
 Header.defaultProps = {
   isShowOrderOptions: true
 }
+
+export default Header

package/template/components/HelmetTags/index.js

@@ -30,3 +30,5 @@ export const HelmetTags = (props) => {
     </Helmet>
   )
 }
+
+export default HelmetTags

package/template/components/ListenPageChanges/index.js

@@ -113,3 +113,5 @@ export const ListenPageChanges = ({ children }) => {
     </>
   )
 }
+
+export default ListenPageChanges

package/template/components/ScrollToTop/index.js

@@ -21,3 +21,5 @@ export const ScrollToTop = withRouter(({ history, children }) => {
 
   return <>{children}</>
 })
+
+export default ScrollToTop

package/template/components/SubdomainComponent/index.js

@@ -1,11 +1,7 @@
-import React, { cloneElement, useEffect, useState } from 'react'
-
-import { SpinnerLoader } from '../../../src/components/SpinnerLoader'
+import { cloneElement } from 'react'
 import settings from '../../config'
 
 export const SubdomainComponent = (props) => {
-  const [checkState, setCheckState] = useState({ loading: true, result: null, error: null })
-
   const projectFromSubdomain = window.location.hostname.split('.').slice(0, 1).join()
   const isValidSubdomain = window.location.hostname.includes('tryordering.com') || window.location.hostname.includes('ordering.co')
 
@@ -22,40 +18,9 @@ export const SubdomainComponent = (props) => {
     }
   }
 
-  const checkProject = async () => {
-    try {
-      const response = await fetch(`${settings?.api?.url}/${settings?.api?.version}/system/integrations/projects/check_availability?project_code=${project}`, {
-        method: 'GET',
-        headers: { 'Content-Type': 'application/json' }
-      })
-      const { error, result } = await response.json()
-
-      setCheckState({
-        ...checkState,
-        loading: false,
-        result: error ? [] : result,
-        error: error
-          ? typeof result === 'string' ? result : result?.[0]
-          : null
-      })
-    } catch (error) {
-      setCheckState({
-        ...checkState,
-        loading: false,
-        error: error.message
-      })
-    }
-  }
-
-  useEffect(() => {
-    checkProject()
-  }, [])
-
   return (
-    checkState.loading
-      ? <SpinnerLoader />
-      : cloneElement(props.children, {
-        settings: { ...settings, project }
-      })
+    cloneElement(props.children, {
+      settings: { ...settings, project }
+    })
   )
 }

package/template/config.json

@@ -21,5 +21,6 @@
   "use_kiosk": false,
   "businessSlug": "",
   "franchiseSlug": null,
-  "isCancellation" : false
+  "isCancellation" : false,
+  "useOptimizeLoad": false
 }

package/template/pages/AddressList/index.js

@@ -32,3 +32,5 @@ export const AddressList = (props) => {
     </>
   )
 }
+
+export default AddressList

package/template/pages/BusinessListingSearch/index.js

@@ -104,3 +104,5 @@ export const BusinessListingSearch = (props) => {
     </>
   )
 }
+
+export default BusinessListingSearch

package/template/pages/BusinessProductsList/index.js

@@ -226,3 +226,5 @@ export const BusinessProductsList = (props) => {
     </>
   )
 }
+
+export default BusinessProductsList

package/template/pages/BusinessesList/index.js

@@ -35,3 +35,5 @@ export const BusinessesList = (props) => {
     </>
   )
 }
+
+export default BusinessesList

package/template/pages/Checkout/index.js

@@ -136,3 +136,5 @@ export const CheckoutPage = (props) => {
     </>
   )
 }
+
+export default CheckoutPage

package/template/pages/Cms/index.js

@@ -22,3 +22,5 @@ export const Cms = (props) => {
     </>
   )
 }
+
+export default Cms

package/template/pages/Favorite/index.js

@@ -10,3 +10,5 @@ export const Favorite = (props) => {
     </>
   )
 }
+
+export default Favorite

package/template/pages/Help/index.js

@@ -15,3 +15,5 @@ export const Help = (props) => {
     </>
   )
 }
+
+export default Help

package/template/pages/Home/index.js

@@ -120,3 +120,5 @@ export const HomePage = (props) => {
     </>
   )
 }
+
+export default HomePage

package/template/pages/MessagesList/index.js

@@ -19,3 +19,5 @@ export const MessagesList = (props) => {
     </>
   )
 }
+
+export default MessagesList

package/template/pages/MultiCheckout/index.js

@@ -86,6 +86,9 @@ export const MultiCheckout = (props) => {
     cartUuid,
     errors,
     clearErrors: () => setErrors([]),
+    handleSearchRedirect: () => {
+      events.emit('go_to_page', { page: 'search' })
+    },
     onRedirectPage: (data) => events.emit('go_to_page', data),
     onPlaceOrderClick: (order) => {
       events.emit('go_to_page', { page: 'multi_orders', params: { orderId: order?.id } })
@@ -100,3 +103,5 @@ export const MultiCheckout = (props) => {
     </>
   )
 }
+
+export default MultiCheckout

package/template/pages/MultiOrdersDetails/index.js

@@ -24,3 +24,5 @@ export const MultiOrdersDetails = (props) => {
     </>
   )
 }
+
+export default MultiOrdersDetails

package/template/pages/MyOrders/index.js

@@ -103,3 +103,5 @@ export const MyOrders = (props) => {
     </>
   )
 }
+
+export default MyOrders

package/template/pages/OrderDetails/index.js

@@ -46,3 +46,5 @@ export const OrderDetailsPage = (props) => {
     </>
   )
 }
+
+export default OrderDetailsPage

package/template/pages/PageNotFound/index.js

@@ -4,3 +4,5 @@ import { PageNotFound as PageNotFoundController } from '../../../src/components/
 export const PageNotFound = (props) => {
   return <PageNotFoundController {...props} />
 }
+
+export default PageNotFound

package/template/pages/PagesList/index.js

@@ -16,3 +16,5 @@ export const PagesList = (props) => {
   ]
   return <PagesListController {...props} routes={routes} />
 }
+
+export default PagesList

package/template/pages/Profile/index.js

@@ -29,3 +29,5 @@ export const Profile = (props) => {
     </>
   )
 }
+
+export default Profile

package/template/pages/Promotions/index.js

@@ -11,3 +11,5 @@ export const Promotions = (props) => {
     </>
   )
 }
+
+export default Promotions

package/template/pages/ResetPassword/index.js

@@ -36,3 +36,5 @@ export const ResetPassword = (props) => {
     </>
   )
 }
+
+export default ResetPassword

package/template/pages/SessionsList/index.js

@@ -10,3 +10,5 @@ export const SessionsList = (props) => {
     </>
   )
 }
+
+export default SessionsList

package/template/pages/SignUpBusiness/index.js

@@ -10,3 +10,5 @@ export const SignUpBusiness = (props) => {
     </>
   )
 }
+
+export default SignUpBusiness

package/template/pages/SignUpDriver/index.js

@@ -10,3 +10,5 @@ export const SignUpDriver = (props) => {
     </>
   )
 }
+
+export default SignUpDriver

package/template/pages/UserVerification/index.js

@@ -10,3 +10,5 @@ export const UserVerification = (props) => {
     </>
   )
 }
+
+export default UserVerification

package/template/pages/Wallets/index.js

@@ -10,3 +10,5 @@ export const Wallets = (props) => {
     </>
   )
 }
+
+export default Wallets