ordering-ui-external 2.4.3 → 2.4.5

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

@@ -1,7 +1,7 @@
 import React, { useEffect, useState } from 'react'
 import { useTheme } from 'styled-components'
-import { useLanguage, useEvent, useConfig, useOrder } from 'ordering-components-external'
-import { Container, NotCarts, Title, WrapperContainer } from './styles'
+import { useLanguage, useEvent, useConfig, useOrder, useUtils } from 'ordering-components-external'
+import { Container, MultiCartPriceContainer, NotCarts, Title, WrapperContainer } from './styles'
 
 import { Cart } from '../Cart'
 import { Button } from '../../styles/Buttons'
@@ -21,11 +21,17 @@ export const CartContent = (props) => {
   const theme = useTheme()
   const [events] = useEvent()
   const [orderState] = useOrder()
+  const [{ parsePrice }] = useUtils()
   const [{ configs }] = useConfig()
 
   const [currentCartUuid, setCurrentCartUuid] = useState(null)
   const checkoutMultiBusinessEnabled = configs?.checkout_multi_business_enabled?.value === '1'
 
+  const totalCartsPrice = carts?.length && carts.reduce((total, cart) => { return total + cart?.total }, 0)
+  const totalCartsFee = carts?.length && carts
+    ?.filter((cart) => cart?.status !== 1 && cart?.valid)
+    ?.reduce((total, cart) => { return total + (cart?.delivery_price_with_discount) }, 0)
+
   const handleAddProduct = (product, cart) => {
     setCurrentCartUuid(cart?.uuid)
   }
@@ -85,26 +91,56 @@ export const CartContent = (props) => {
             )}
           </WrapperContainer>
         )}
-        {isOrderStateCarts && carts?.length > 0 &&
-          carts.map(cart => (
-            <React.Fragment key={cart.uuid}>
-              {cart.products.length > 0 && (
-                <Cart
-                  isCartPending={cart?.status === 2}
-                  cart={cart}
-                  isCartPopover={isCartPopover}
-                  isCheckout={window.location.pathname === `/checkout/${cart?.uuid}` && !isCartPopover}
-                  isForceOpenCart={isForceOpenCart}
-                  currentCartUuid={currentCartUuid}
-                  isProducts={cart.products.length}
-                  onClickCheckout={props.onClose}
-                  setPreorderBusiness={setPreorderBusiness}
-                  isOpenCart={isOpenCart}
-                  businessConfigs={cart?.business?.configs}
-                />
-              )}
-            </React.Fragment>
-          ))}
+        {isOrderStateCarts && carts?.length > 0 && (
+          <>
+            {carts.map(cart => (
+              <React.Fragment key={cart.uuid}>
+                {cart.products.length > 0 && (
+                  <Cart
+                    cart={cart}
+                    isCartPending={cart?.status === 2}
+                    isOpenCart={isOpenCart}
+                    isCartPopover={isCartPopover}
+                    isCheckout={window.location.pathname === `/checkout/${cart?.uuid}` && !isCartPopover}
+                    isForceOpenCart={isForceOpenCart}
+                    currentCartUuid={currentCartUuid}
+                    isProducts={cart.products.length}
+                    onClickCheckout={props.onClose}
+                    setPreorderBusiness={setPreorderBusiness}
+                    businessConfigs={cart?.business?.configs}
+                    hideCouponInput={configs?.multi_business_checkout_coupon_input_style?.value === 'group'}
+                    hideDeliveryFee={configs?.multi_business_checkout_show_combined_delivery_fee?.value === '1'}
+                    hideDriverTip={configs?.multi_business_checkout_show_combined_driver_tip?.value === '1'}
+                  />
+                )}
+              </React.Fragment>
+            ))}
+            {checkoutMultiBusinessEnabled && !!carts.length && (
+              <MultiCartPriceContainer>
+                {!!totalCartsFee &&
+                  configs?.multi_business_checkout_show_combined_delivery_fee?.value === '1' &&
+                  (
+                    <span>
+                      <p>{t('TOTAL_DELIVERY_FEE', 'Total delivery fee')}</p>
+                      <p>{parsePrice(totalCartsFee)}</p>
+                    </span>
+                  )}
+                {carts.reduce((sum, cart) => sum + cart?.driver_tip, 0) > 0 &&
+                  configs?.multi_business_checkout_show_combined_driver_tip?.value === '1' &&
+                  (
+                    <span>
+                      <p>{t('DRIVER_TIP', 'Driver tip')}</p>
+                      <p>{parsePrice(carts.reduce((sum, cart) => sum + cart?.driver_tip, 0))}</p>
+                    </span>
+                  )}
+                <div>
+                  <h4>{t('TOTAL_FOR_ALL_CARTS', 'Total for all Carts')}</h4>
+                  <h4>{parsePrice(totalCartsPrice)}</h4>
+                </div>
+              </MultiCartPriceContainer>
+            )}
+          </>
+        )}
         {(!carts || carts?.length === 0) && (
           <NotCarts>
             <img src={theme.images?.general?.notFound} alt='Not Found' width='200px' height='122px' loading='lazy' />

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

@@ -54,3 +54,29 @@ export const Title = styled.h1`
     text-align: left;
   }
 `
+
+export const MultiCartPriceContainer = styled.div`
+  margin-top: 38px;
+  > div {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-top: 5px;
+    margin-bottom: 5px;
+    > h4 {
+      font-size: 18px;
+      margin: 0;
+    }
+  }
+  > span {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 5px;
+  }
+  p {
+    font-size: 14px;
+    color: ${props => props.theme.colors.darkGray};
+    margin: 0;
+  }
+`

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

@@ -341,7 +341,7 @@ const CheckoutUI = (props) => {
                     </div>
                   ) : (
                     <AddressDetails
-                      location={businessDetails?.business?.location}
+                      location={options?.address?.location}
                       businessLogo={businessDetails?.business?.logo || theme.images?.dummies?.businessLogo}
                       isCartPending={cart?.status === 2}
                       businessId={cart?.business_id}

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

@@ -108,7 +108,7 @@ const MultiCheckoutUI = (props) => {
 
   const getIncludedTaxes = (cart) => {
     if (cart?.taxes === null || !cart?.taxes) {
-      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)
@@ -116,11 +116,12 @@ const MultiCheckoutUI = (props) => {
     }
   }
 
-  const loyaltyRewardValue = creditPointPlanOnBusiness?.accumulation_rate
-    ? Math.round(
-      openCarts.reduce((sum, cart) => sum + cart?.subtotal + getIncludedTaxes(cart), 0) /
-      creditPointPlanOnBusiness?.accumulation_rate
-    ) : 0
+  const subtotalAmount = openCarts.reduce((sum, cart) => sum + (cart?.subtotal + getIncludedTaxes(cart)), 0) *
+    creditPointPlanOnBusiness?.accumulation_rate
+
+  const loyaltyRewardValue = (creditPointPlanOnBusiness?.accumulation_rate
+    ? (Math.trunc(subtotalAmount * 100) / 100).toFixed(configs.format_number_decimal_length?.value ?? 2)
+    : 0)
 
   const handlePlaceOrder = () => {
     if (!userErrors.length) {

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

@@ -8,7 +8,7 @@ export const OrderEta = (props) => {
     outputFormat
   } = props
 
-  const [{ parseTime }] = useUtils()
+  const [{ parseDate }] = useUtils()
   const [estimatedDeliveryTime, setEstimatedDeliveryTime] = useState(null)
 
   const getEstimatedDeliveryTime = () => {
@@ -36,10 +36,11 @@ export const OrderEta = (props) => {
       if (diffTimeAsMinutes <= 0) {
         totalEta += (Math.floor(Math.abs(diffTimeAsMinutes / order?.eta_current_status_time) + 1) * order?.eta_current_status_penalty_time)
       }
-      _estimatedTime = moment(_delivery).add(totalEta, 'minutes')
+      _estimatedTime = moment.utc(_delivery).add(totalEta, 'minutes')
     } else {
-      _estimatedTime = moment(_delivery).add(order?.eta_time, 'minutes')
+      _estimatedTime = moment.utc(_delivery).add(order?.eta_time, 'minutes')
     }
+    _estimatedTime = outputFormat ? moment(_estimatedTime).format(outputFormat) : parseDate(_estimatedTime, { utc: false })
     setEstimatedDeliveryTime(_estimatedTime)
   }
 
@@ -49,11 +50,11 @@ export const OrderEta = (props) => {
       getEstimatedDeliveryTime()
     }, 1000)
     return () => clearInterval(interval)
-  }, [order])
+  }, [order, outputFormat])
 
   return (
     <>
-      {!outputFormat ? parseTime(estimatedDeliveryTime) : parseTime(estimatedDeliveryTime, { outputFormat: 'hh:mm A' })}
+      {estimatedDeliveryTime}
     </>
   )
 }

package/src/utils/index.js

@@ -676,3 +676,23 @@ export const calendarLanguages = {
     Su: 'DAYMIN7'
   }
 }
+
+export const getCateringValues = (cateringTypeString, configs) => {
+  const splitCateringValue = (configName) => Object.values(configs || {})
+    ?.find(config => config?.key === configName)
+    ?.value?.split('|')
+    ?.find(val => val.includes(cateringTypeString))?.split(',')[1]
+  const preorderSlotInterval = parseInt(splitCateringValue('preorder_slot_interval'))
+  const preorderLeadTime = parseInt(splitCateringValue('preorder_lead_time'))
+  const preorderTimeRange = parseInt(splitCateringValue('preorder_time_range'))
+  const preorderMaximumDays = parseInt(splitCateringValue('preorder_maximum_days'))
+  const preorderMinimumDays = parseInt(splitCateringValue('preorder_minimum_days'))
+
+  return {
+    preorderSlotInterval,
+    preorderLeadTime,
+    preorderTimeRange,
+    preorderMaximumDays,
+    preorderMinimumDays
+  }
+}