ordering-ui-external 1.9.3 → 1.9.5

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

@@ -7,7 +7,6 @@ import {
   useUtils,
   useValidationFields,
   useConfig,
-  useOrderingTheme,
   useSite,
   useCustomer
 } from 'ordering-components-external'
@@ -24,7 +23,6 @@ import { useWindowSize } from '../../../../../hooks/useWindowSize'
 import { TaxInformation } from '../TaxInformation'
 import { TextArea } from '../../styles/Inputs'
 import { SpinnerLoader } from '../../../../../components/SpinnerLoader'
-import { CartStoresListing } from '../../../../franchise/src/components/CartStoresListing'
 import { DriverTips } from '../DriverTips'
 import { ServiceForm } from '../ServiceForm'
 import {
@@ -56,7 +54,6 @@ const CartUI = (props) => {
     onClickCheckout,
     isCheckout,
     useKioskApp,
-    isMultiCheckout,
     isCartPending,
     isCartPopover,
     isForceOpenCart,
@@ -78,7 +75,6 @@ const CartUI = (props) => {
   const [orderState] = useOrder()
   const [events] = useEvent()
   const [{ parsePrice, parseNumber, parseDate }] = useUtils()
-  const [orderingTheme] = useOrderingTheme()
   const [validationFields] = useValidationFields()
   const [{ configs }] = useConfig()
   const [{ site }] = useSite()
@@ -96,17 +92,16 @@ const CartUI = (props) => {
   const [canOpenUpselling, setCanOpenUpselling] = useState(false)
   const [openTaxModal, setOpenTaxModal] = useState({ open: false, tax: null })
   const [isUpselling, setIsUpselling] = useState(false)
-  const [openChangeStore, setOpenChangeStore] = useState(false)
+  // const [openChangeStore, setOpenChangeStore] = useState(false)
 
   const businessUrlTemplate = site?.business_url_template || '/store/:business_slug'
 
   const isCouponEnabled = validationFields?.fields?.checkout?.coupon?.enabled
-  const checkoutMultiBusinessEnabled = configs?.checkout_multi_business_enabled?.value === '1'
-  const openCarts = (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 cart = orderState?.carts?.[`businessId:${props.cart.business_id}`]
+  const isMultiCheckout = configs?.checkout_multi_business_enabled?.value === '1'
+  const cart = cartMulticart || orderState?.carts?.[`businessId:${props.cart?.business_id}`]
   const viewString = isStore ? 'business_view' : 'header'
-  const hideCartComments = orderingTheme?.theme?.[viewString]?.components?.cart?.components?.comments?.hidden
+  const hideCartComments = theme?.[viewString]?.components?.cart?.components?.comments?.hidden
+  const hideCartDiscount = theme?.[viewString]?.components?.cart?.components?.discount?.hidden
   const walletName = {
     cash: {
       name: t('PAY_WITH_CASH_WALLET', 'Pay with Cash Wallet')
@@ -137,37 +132,30 @@ const CartUI = (props) => {
   }
 
   const handleClickCheckout = () => {
-    const cartSelectedHasGroup = cart?.group?.uuid
-    const cartFilterValidation = cart => cart?.valid && cart?.status !== 2
-    const cartsGroupLength = cartSelectedHasGroup ? Object.values(orderState.carts).filter(_cart => _cart?.group?.uuid === cartSelectedHasGroup && cartFilterValidation(_cart))?.length : 0
-    if (cartsGroupLength > 1 && checkoutMultiBusinessEnabled) {
-      events.emit('go_to_page', { page: 'multi_checkout', params: { cartUuid: cart?.group?.uuid } })
-      events.emit('cart_popover_closed')
-      return
-    }
-    const cartGroupsCount = {}
-    // eslint-disable-next-line no-unused-expressions
-    Object.values(orderState.carts).filter(_cart => cartFilterValidation(_cart))?.forEach(_cart => {
-      if (cartGroupsCount[_cart?.group?.uuid]) {
-        cartGroupsCount[_cart?.group?.uuid] += 1
-      } else {
-        cartGroupsCount[_cart?.group?.uuid] = 1
-      }
-    })
-    let groupForTheCart
-    const groupForAddCartArray = Object.keys(cartGroupsCount).filter(cartGroupUuid => cartGroupsCount[cartGroupUuid] > 0 && cartGroupsCount[cartGroupUuid] < 5)
-    const max = Math.max(...groupForAddCartArray.map(uuid => cartGroupsCount[uuid]))
-    const indexes = groupForAddCartArray.filter(uuid => cartGroupsCount[uuid] === max)
-    if (indexes?.length > 1) {
-      groupForTheCart = indexes.find(uuid => uuid !== 'undefined')
+    const cartsAvailable = Object.values(orderState?.carts)?.filter(cart => cart?.valid && cart?.status !== 2)
+    if (cartsAvailable.length === 1) {
+      events.emit('go_to_page', { page: 'checkout', params: { cartUuid: cartsAvailable[0]?.uuid } })
     } else {
-      groupForTheCart = indexes[0]
-    }
+      const groupKeys = {}
+      cartsAvailable.forEach(_cart => {
+        groupKeys[_cart?.group?.uuid]
+          ? groupKeys[_cart?.group?.uuid] += 1
+          : groupKeys[_cart?.group?.uuid ?? 'null'] = 1
+      })
 
-    if (checkoutMultiBusinessEnabled && openCarts?.length > 1 && groupForTheCart) {
-      events.emit('go_to_page', { page: 'multi_cart', params: { cartUuid: cart.uuid, cartGroup: groupForTheCart === 'undefined' ? 'create' : groupForTheCart } })
-    } else {
-      events.emit('go_to_page', { page: 'checkout', params: { cartUuid: cart.uuid } })
+      if (
+        (Object.keys(groupKeys).length === 1 && Object.keys(groupKeys)[0] === 'null') ||
+        Object.keys(groupKeys).length > 1
+      ) {
+        events.emit('go_to_page', { page: 'multi_cart' })
+      } else {
+        events.emit('go_to_page', {
+          page: 'multi_checkout',
+          params: {
+            cartUuid: cartsAvailable[0]?.group?.uuid
+          }
+        })
+      }
     }
     events.emit('cart_popover_closed')
     onClickCheckout && onClickCheckout()
@@ -221,7 +209,7 @@ const CartUI = (props) => {
 
   const getIncludedTaxes = () => {
     if (cart?.taxes === null) {
-      return cart.business.tax_type === 1 ? cart?.tax : 0
+      return cart?.business.tax_type === 1 ? cart?.tax : 0
     } else {
       return cart?.taxes.reduce((taxIncluded, tax) => {
         return taxIncluded + (tax.type === 1 ? tax.summary?.tax : 0)
@@ -245,9 +233,9 @@ const CartUI = (props) => {
     })
   }
 
-  const handleChangeStore = () => {
-    setOpenChangeStore(true)
-  }
+  // const handleChangeStore = () => {
+  //   setOpenChangeStore(true)
+  // }
 
   useEffect(() => {
     if (isCustomMode) setIsUpselling(true)
@@ -284,7 +272,7 @@ const CartUI = (props) => {
             handleClickCheckout={handleClickCheckout}
             checkoutButtonDisabled={(openUpselling && !canOpenUpselling) || !cart?.valid_maximum || (!cart?.valid_minimum && !(cart?.discount_type === 1 && cart?.discount_rate === 100)) || !cart?.valid_address}
             setPreorderBusiness={setPreorderBusiness}
-            handleChangeStore={!useKioskApp && handleChangeStore}
+            // handleChangeStore={!useKioskApp && handleChangeStore}
             isMultiCheckout={isMultiCheckout}
           >
             {cart?.products?.length > 0 && cart?.products.map(product => (
@@ -292,6 +280,7 @@ const CartUI = (props) => {
                 key={product.code}
                 isCartPending={isCartPending}
                 isCartProduct
+                isDisabledEdit={!cart?.business_id}
                 product={product}
                 isCheckout={isCheckout}
                 changeQuantity={changeQuantity}
@@ -300,6 +289,7 @@ const CartUI = (props) => {
                 onDeleteProduct={handleDeleteClick}
                 onEditProduct={handleEditProduct}
                 isStore={isStore}
+                viewString={viewString}
               />
             ))}
             {!cart?.valid_products && (
@@ -413,11 +403,11 @@ const CartUI = (props) => {
                     {orderState?.options?.type === 1 && cart?.delivery_price > 0 && !hideDeliveryFee && (
                       <tr>
                         <td>{t('DELIVERY_FEE', 'Delivery Fee')}</td>
-                        <td>{parsePrice(cart?.delivery_price)}</td>
+                        <td>{parsePrice(cart?.delivery_price_with_discount ?? cart?.delivery_price)}</td>
                       </tr>
                     )}
                     {
-                      cart?.offers?.length > 0 && cart?.offers?.filter(offer => offer?.target === 2)?.map(offer => (
+                      !hideCartDiscount && cart?.offers?.length > 0 && cart?.offers?.filter(offer => offer?.target === 2)?.map(offer => (
                         <tr key={offer.id}>
                           <td className='icon'>
                             {offer.name}
@@ -451,11 +441,11 @@ const CartUI = (props) => {
                     )}
                   </tbody>
                 </table>
-                {isCouponEnabled && !isCartPending && ((isCheckout || isCartPopover || isMultiCheckout) && !(isCheckout && isCartPopover)) && (
+                {isCouponEnabled && !isCartPending && ((isCheckout || isCartPopover || isMultiCheckout) && !(isCheckout && isCartPopover)) && !hideCartDiscount && (
                   <CouponContainer>
                     <CouponControl
-                      businessId={cart.business_id}
-                      price={cart.total}
+                      businessId={cart?.business_id}
+                      price={cart?.total}
                     />
                   </CouponContainer>
                 )}
@@ -570,7 +560,7 @@ const CartUI = (props) => {
                 )}
               </OrderBill>
             )}
-            {(onClickCheckout || isForceOpenCart) && !isCheckout && cart?.valid_products && (
+            {(onClickCheckout || isForceOpenCart) && !isCheckout && cart?.valid_products && (!isMultiCheckout || isStore) && (
               <CheckoutAction>
                 <p>{cart?.total >= 1 && parsePrice(cart?.total)}</p>
                 <Button
@@ -645,17 +635,17 @@ const CartUI = (props) => {
             <TaxInformation
               type={openTaxModal.type}
               data={openTaxModal.data}
-              products={cart.products}
+              products={cart?.products}
               useKioskApp={useKioskApp}
             />
           </Modal>
           {(openUpselling || isUpselling) && (
             <UpsellingPage
               useKioskApp={useKioskApp}
-              businessId={cart.business_id}
+              businessId={cart?.business_id}
               isCustomMode={isCustomMode}
-              cartProducts={cart.products}
-              business={cart.business}
+              cartProducts={cart?.products}
+              business={cart?.business}
               handleUpsellingPage={handleUpsellingPage}
               openUpselling={openUpselling}
               canOpenUpselling={canOpenUpselling}

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

@@ -25,16 +25,6 @@ export const CartContent = (props) => {
 
   const [currentCartUuid, setCurrentCartUuid] = useState(null)
   const checkoutMultiBusinessEnabled = configs?.checkout_multi_business_enabled?.value === '1'
-  const openCarts = (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 handleAddProduct = (product, cart) => {
     setCurrentCartUuid(cart?.uuid)
@@ -46,38 +36,30 @@ export const CartContent = (props) => {
   }
 
   const handleClickCheckout = () => {
-    const cart = carts.find(cart => cart?.group?.uuid)
-    const cartSelectedHasGroup = cart?.group?.uuid
-    const cartFilterValidation = cart => cart?.valid && cart?.status !== 2
-    const cartsGroupLength = cartSelectedHasGroup ? Object.values(orderState.carts).filter(_cart => _cart?.group?.uuid === cartSelectedHasGroup && cartFilterValidation(_cart))?.length : 0
-    if (cartsGroupLength > 1 && checkoutMultiBusinessEnabled) {
-      events.emit('go_to_page', { page: 'multi_checkout', params: { cartUuid: cart?.group?.uuid } })
-      events.emit('cart_popover_closed')
-      return
-    }
-    const cartGroupsCount = {}
-    // eslint-disable-next-line no-unused-expressions
-    Object.values(orderState.carts).filter(_cart => cartFilterValidation(_cart))?.forEach(_cart => {
-      if (cartGroupsCount[_cart?.group?.uuid]) {
-        cartGroupsCount[_cart?.group?.uuid] += 1
-      } else {
-        cartGroupsCount[_cart?.group?.uuid] = 1
-      }
-    })
-    let groupForTheCart
-    const groupForAddCartArray = Object.keys(cartGroupsCount).filter(cartGroupUuid => cartGroupsCount[cartGroupUuid] > 0 && cartGroupsCount[cartGroupUuid] < 5)
-    const max = Math.max(...groupForAddCartArray.map(uuid => cartGroupsCount[uuid]))
-    const indexes = groupForAddCartArray.filter(uuid => cartGroupsCount[uuid] === max)
-    if (indexes?.length > 1) {
-      groupForTheCart = indexes.find(uuid => uuid !== 'undefined')
+    const cartsAvailable = Object.values(orderState?.carts)?.filter(cart => cart?.valid && cart?.status !== 2)
+    if (cartsAvailable.length === 1) {
+      events.emit('go_to_page', { page: 'checkout', params: { cartUuid: cartsAvailable[0]?.uuid } })
     } else {
-      groupForTheCart = indexes[0]
-    }
+      const groupKeys = {}
+      cartsAvailable.forEach(_cart => {
+        groupKeys[_cart?.group?.uuid]
+          ? groupKeys[_cart?.group?.uuid] += 1
+          : groupKeys[_cart?.group?.uuid ?? 'null'] = 1
+      })
 
-    if (checkoutMultiBusinessEnabled && openCarts?.length > 1 && groupForTheCart) {
-      events.emit('go_to_page', { page: 'multi_cart', params: { cartUuid: cart?.uuid, cartGroup: groupForTheCart === 'undefined' ? 'create' : groupForTheCart } })
-    } else {
-      events.emit('go_to_page', { page: 'checkout', params: { cartUuid: cart?.uuid } })
+      if (
+        (Object.keys(groupKeys).length === 1 && Object.keys(groupKeys)[0] === 'null') ||
+        Object.keys(groupKeys).length > 1
+      ) {
+        events.emit('go_to_page', { page: 'multi_cart' })
+      } else {
+        events.emit('go_to_page', {
+          page: 'multi_checkout',
+          params: {
+            cartUuid: cartsAvailable[0]?.group?.uuid
+          }
+        })
+      }
     }
     events.emit('cart_popover_closed')
     props.onClose && props.onClose()
@@ -98,7 +80,7 @@ export const CartContent = (props) => {
         {!isSlideBar && (
           <WrapperContainer>
             <Title>{t('YOUR_CART', 'Your cart')}</Title>
-            {checkoutMultiBusinessEnabled && (
+            {checkoutMultiBusinessEnabled && carts?.length > 0 && (
               <Button onClick={handleClickCheckout} color='primary'>{t('CHECKOUT', 'Checkout')}</Button>
             )}
           </WrapperContainer>

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

@@ -78,8 +78,7 @@ const MultiCheckoutUI = (props) => {
   const [userErrors, setUserErrors] = useState([])
   const [isUserDetailsEdit, setIsUserDetailsEdit] = useState(null)
   const [alertState, setAlertState] = useState({ open: false, content: [] })
-  const maximumCarts = 5
-  const isDisablePlaceOrderButton = !(paymethodSelected?.paymethod_id || paymethodSelected?.wallet_id) || openCarts.length > maximumCarts || (paymethodSelected?.paymethod?.gateway === 'stripe' && !paymethodSelected?.paymethod_data)
+  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 driverTipsOptions = typeof configs?.driver_tip_options?.value === 'string'
@@ -294,11 +293,6 @@ const MultiCheckoutUI = (props) => {
                 {placing ? t('PLACING', 'Placing') : t('PLACE_ORDER', 'Place Order')}
               </Button>
             </WrapperPlaceOrderButton>
-            {openCarts.length > maximumCarts && (
-              <WarningText>
-                {t('WARNING_MAXIMUM_CARTS', 'You can only pay for a maximum of 5 carts, please discard one or more to continue.')}
-              </WarningText>
-            )}
           </WrapperRightContainer>
 
           <Alert

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

@@ -35,6 +35,8 @@ const MultiOrdersDetailsUI = (props) => {
   const [{ parsePrice }] = useUtils()
   const [alertState, setAlertState] = useState({ open: false, content: [] })
 
+  const isTaxIncludedOnPrice = orders.every(_order => _order.taxes?.length ? _order.taxes?.every(_tax => _tax.type === 1) : true)
+
   const walletName = {
     cash: {
       name: t('PAY_WITH_CASH_WALLET', 'Pay with Cash Wallet')
@@ -124,19 +126,23 @@ const MultiOrdersDetailsUI = (props) => {
                   ))}
                 </tbody>
               </table>
-              <Divider />
-              <table>
-                <tbody>
-                  <tr>
-                    <td>{t('TOTAL_BEFORE_TAX', 'Total before tax')}:</td>
-                    <td>{parsePrice(ordersSummary?.subtotal)}</td>
-                  </tr>
-                  <tr>
-                    <td>{t('ESTIMATED_TAX_TO_BE_COLLECTED', 'Estimated tax to be collected')}:</td>
-                    <td>{parsePrice(ordersSummary?.tax)}</td>
-                  </tr>
-                </tbody>
-              </table>
+              {!isTaxIncludedOnPrice && (
+                <>
+                  <Divider />
+                  <table>
+                    <tbody>
+                      <tr>
+                        <td>{t('TOTAL_BEFORE_TAX', 'Total before tax')}:</td>
+                        <td>{parsePrice(ordersSummary?.subtotal)}</td>
+                      </tr>
+                      <tr>
+                        <td>{t('ESTIMATED_TAX_TO_BE_COLLECTED', 'Estimated tax to be collected')}:</td>
+                        <td>{parsePrice(ordersSummary?.tax)}</td>
+                      </tr>
+                    </tbody>
+                  </table>
+                </>
+              )}
               <Divider />
               <table>
                 <tbody>

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

@@ -368,6 +368,7 @@ const OrdersOptionUI = (props) => {
             reorderLoading={reorderState?.loading}
             orders={orders.filter(order => orderStatus.includes(order.status)).sort((a, b) => moment(b?.delivery_datetime_utc).valueOf() - moment(a?.delivery_datetime_utc).valueOf())}
             pagination={pagination}
+            customArray={customArray}
             loadMoreOrders={loadMoreOrders}
             onRedirectPage={onRedirectPage}
             getOrderStatus={getOrderStatus}
@@ -409,7 +410,7 @@ export const OrdersOption = (props) => {
     useDefualtSessionManager: true,
     paginationSettings: {
       initialPage: 1,
-      pageSize: 3,
+      pageSize: (getAllOrders || props.activeOrders) ? 30 : 10,
       controlType: 'infinity'
     }
   }

package/src/utils/index.js

@@ -4,7 +4,7 @@ import { useTheme } from 'styled-components'
 export const getIconCard = (brand = '') => {
   const value = brand.toLowerCase()
   const theme = useTheme()
-    return theme.images?.general?.[value] ?? theme.images?.general?.credit
+  return theme.images?.general?.[value] ?? theme.images?.general?.credit
 }
 
 /**
@@ -616,3 +616,37 @@ export const getStarWidth = (qualification) => {
     return '0%'
   }
 }
+
+export const getOrderStatus = (s) => {
+  const [, t] = useLanguage()
+  const theme = useTheme()
+  const status = parseInt(s)
+  const orderStatus = [
+    { key: 0, value: t('PENDING', theme?.defaultLanguages?.PENDING || 'Pending'), slug: 'PENDING', percentage: 25 },
+    { key: 1, value: t('COMPLETED', theme?.defaultLanguages?.COMPLETED || 'Completed'), slug: 'COMPLETED', percentage: 100 },
+    { key: 2, value: t('REJECTED', theme?.defaultLanguages?.REJECTED || 'Rejected'), slug: 'REJECTED', percentage: 0 },
+    { key: 3, value: t('DRIVER_IN_BUSINESS', theme?.defaultLanguages?.DRIVER_IN_BUSINESS || 'Driver in business'), slug: 'DRIVER_IN_BUSINESS', percentage: 60 },
+    { key: 4, value: t('PREPARATION_COMPLETED', theme?.defaultLanguages?.PREPARATION_COMPLETED || 'Preparation Completed'), slug: 'PREPARATION_COMPLETED', percentage: 70 },
+    { key: 5, value: t('REJECTED_BY_BUSINESS', theme?.defaultLanguages?.REJECTED_BY_BUSINESS || 'Rejected by business'), slug: 'REJECTED_BY_BUSINESS', percentage: 0 },
+    { key: 6, value: t('REJECTED_BY_DRIVER', theme?.defaultLanguages?.REJECTED_BY_DRIVER || 'Rejected by Driver'), slug: 'REJECTED_BY_DRIVER', percentage: 0 },
+    { key: 7, value: t('ACCEPTED_BY_BUSINESS', theme?.defaultLanguages?.ACCEPTED_BY_BUSINESS || 'Accepted by business'), slug: 'ACCEPTED_BY_BUSINESS', percentage: 35 },
+    { key: 8, value: t('ACCEPTED_BY_DRIVER', theme?.defaultLanguages?.ACCEPTED_BY_DRIVER || 'Accepted by driver'), slug: 'ACCEPTED_BY_DRIVER', percentage: 45 },
+    { key: 9, value: t('PICK_UP_COMPLETED_BY_DRIVER', theme?.defaultLanguages?.PICK_UP_COMPLETED_BY_DRIVER || 'Pick up completed by driver'), slug: 'PICK_UP_COMPLETED_BY_DRIVER', percentage: 80 },
+    { key: 10, value: t('PICK_UP_FAILED_BY_DRIVER', theme?.defaultLanguages?.PICK_UP_FAILED_BY_DRIVER || 'Pick up Failed by driver'), slug: 'PICK_UP_FAILED_BY_DRIVER', percentage: 0 },
+    { key: 11, value: t('DELIVERY_COMPLETED_BY_DRIVER', theme?.defaultLanguages?.DELIVERY_COMPLETED_BY_DRIVER || 'Delivery completed by driver'), slug: 'DELIVERY_COMPLETED_BY_DRIVER', percentage: 100 },
+    { key: 12, value: t('DELIVERY_FAILED_BY_DRIVER', theme?.defaultLanguages?.DELIVERY_FAILED_BY_DRIVER || 'Delivery Failed by driver'), slug: 'DELIVERY_FAILED_BY_DRIVER', percentage: 0 },
+    { key: 13, value: t('PREORDER', theme?.defaultLanguages?.PREORDER || 'PreOrder'), slug: 'PREORDER', percentage: 0 },
+    { key: 14, value: t('ORDER_NOT_READY', theme?.defaultLanguages?.ORDER_NOT_READY || 'Order not ready'), slug: 'ORDER_NOT_READY', percentage: 65 },
+    { key: 15, value: t('ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER', theme?.defaultLanguages?.ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER || 'Order picked up completed by customer'), slug: 'ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER', percentage: 100 },
+    { key: 16, value: t('ORDER_STATUS_CANCELLED_BY_CUSTOMER', theme?.defaultLanguages?.ORDER_STATUS_CANCELLED_BY_CUSTOMER || 'Order cancelled by customer'), slug: 'ORDER_STATUS_CANCELLED_BY_CUSTOMER', percentage: 0 },
+    { key: 17, value: t('ORDER_NOT_PICKEDUP_BY_CUSTOMER', theme?.defaultLanguages?.ORDER_NOT_PICKEDUP_BY_CUSTOMER || 'Order not picked up by customer'), slug: 'ORDER_NOT_PICKEDUP_BY_CUSTOMER', percentage: 0 },
+    { key: 18, value: t('ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS', theme?.defaultLanguages?.ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS || 'Driver almost arrived to business'), slug: 'ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS', percentage: 55 },
+    { key: 19, value: t('ORDER_DRIVER_ALMOST_ARRIVED_CUSTOMER', theme?.defaultLanguages?.ORDER_DRIVER_ALMOST_ARRIVED_CUSTOMER || 'Driver almost arrived to customer'), slug: 'ORDER_DRIVER_ALMOST_ARRIVED_CUSTOMER', percentage: 90 },
+    { key: 20, value: t('ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS', theme?.defaultLanguages?.ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS || 'Customer almost arrived to business'), slug: 'ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS', percentage: 90 },
+    { key: 21, value: t('ORDER_CUSTOMER_ARRIVED_BUSINESS', theme?.defaultLanguages?.ORDER_CUSTOMER_ARRIVED_BUSINESS || 'Customer arrived to business'), slug: 'ORDER_CUSTOMER_ARRIVED_BUSINESS', percentage: 95 },
+    { key: 22, value: t('ORDER_LOOKING_FOR_DRIVER', theme?.defaultLanguages?.ORDER_LOOKING_FOR_DRIVER || 'Looking for driver'), slug: 'ORDER_LOOKING_FOR_DRIVER', percentage: 35 },
+    { key: 23, value: t('ORDER_DRIVER_ON_WAY', theme?.defaultLanguages?.ORDER_DRIVER_ON_WAY || 'Driver on way'), slug: 'ORDER_DRIVER_ON_WAY', percentage: 45 }
+  ]
+  const objectStatus = orderStatus.find((o) => o.key === status)
+  return objectStatus && objectStatus
+}