ordering-ui-external 2.4.2 → 2.4.4

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}
     </>
   )
 }