ordering-ui-react-native 0.18.44 → 0.18.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.18.44",
+  "version": "0.18.46",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/themes/business/src/components/NewOrderNotification/index.tsx

@@ -58,14 +58,16 @@ const NewOrderNotificationUI = (props: any) => {
   const handlePlayNotificationSound = (eventObj: any = null) => {
     setCurrentEvent(eventObj)
     let times = 1
-    if (times < SOUND_LOOP) {
-      _timeout = setInterval(() => {
-        notificationSound.play(success => success && (times = times + 1))
-        if (times === SOUND_LOOP) {
-          clearInterval(_timeout)
-        }
-      }, 2500)
-    }
+    _timeout = setInterval(() => {
+      if (times <= SOUND_LOOP) {
+        notificationSound.play()
+        times++
+      } else {
+        clearInterval(_timeout)
+        times = 1
+        return
+      }
+    }, 2500)
   }
 
   const handleEventNotification = async (evtType: number, value: any) => {

package/themes/original/src/components/MultiCheckout/index.tsx

@@ -96,14 +96,13 @@ const MultiCheckoutUI = (props: any) => {
     ? JSON.parse(configs?.driver_tip_options?.value) || []
     : configs?.driver_tip_options?.value || []
 
-  const creditPointPlan = loyaltyPlansState?.result?.find((loyal: any) => loyal.type === 'credit_point')
-  const businessIds = openCarts.map((cart: any) => cart.business_id)
-  const loyalBusinessIds = creditPointPlan?.businesses?.filter((b: any) => b.accumulates).map((item: any) => item.business_id) ?? []
-  const creditPointPlanOnBusiness = businessIds.every((bid: any) => loyalBusinessIds.includes(bid)) && creditPointPlan
+  const creditPointGeneralPlan = loyaltyPlansState?.result?.find((loyal: any) => loyal.type === 'credit_point')
+  const loyalBusinessAvailable = creditPointGeneralPlan?.businesses?.filter((b: any) => b.accumulates) ?? []
 
-  const [isUserDetailsEdit, setIsUserDetailsEdit] = useState(false);
-  const [phoneUpdate, setPhoneUpdate] = useState(false);
-  const [userErrors, setUserErrors] = useState<any>([]);
+  const accumulationRateBusiness = (businessId: number) => {
+    const value = loyalBusinessAvailable?.find((loyal: any) => loyal.business_id === businessId)?.accumulation_rate ?? 0
+    return value || (creditPointGeneralPlan?.accumulation_rate ?? 0)
+  }
 
   const getIncludedTaxes = (cart: any) => {
     if (cart?.taxes === null || !cart?.taxes) {
@@ -115,12 +114,13 @@ const MultiCheckoutUI = (props: any) => {
     }
   }
 
-  const subtotalAmount = openCarts.reduce((sum: any, cart: any) => sum + (cart?.subtotal + getIncludedTaxes(cart)), 0) *
-    creditPointPlanOnBusiness?.accumulation_rate
+  const clearAmount = (value: any) => parseFloat((Math.trunc(value * 100) / 100).toFixed(configs.format_number_decimal_length?.value ?? 2))
 
-  const loyaltyRewardValue = (creditPointPlanOnBusiness?.accumulation_rate
-    ? (Math.trunc(subtotalAmount * 100) / 100).toFixed(configs.format_number_decimal_length?.value ?? 2)
-    : 0)
+  const loyaltyRewardValue = openCarts.reduce((sum: any, cart: any) => sum + clearAmount((cart?.subtotal + getIncludedTaxes(cart)) * accumulationRateBusiness(cart?.business_id)), 0)
+
+  const [isUserDetailsEdit, setIsUserDetailsEdit] = useState(false);
+  const [phoneUpdate, setPhoneUpdate] = useState(false);
+  const [userErrors, setUserErrors] = useState<any>([]);
 
   const handleMomentClick = () => {
     if (isPreOrder) {
@@ -405,7 +405,7 @@ const MultiCheckoutUI = (props: any) => {
                     </OText>
                     <OText size={16} lineHeight={24} color={theme.colors.textNormal} weight={'500'}>{parsePrice(totalCartsPrice)}</OText>
                   </View>
-                  {!!loyaltyRewardValue && isFinite(loyaltyRewardValue) && (
+                  {!!loyaltyRewardValue && (
                     <View style={{ flexDirection: 'row', marginTop: 10, justifyContent: 'flex-end' }}>
                       <OText size={12} color={theme.colors.textNormal}>
                         {t('REWARD_LOYALTY_POINT', 'Reward :amount: on loyalty points').replace(':amount:', loyaltyRewardValue)}

package/themes/original/src/components/OrderDetails/OrderEta.tsx

@@ -12,7 +12,7 @@ export const OrderEta = (props: any) => {
   const [estimatedDeliveryTime, setEstimatedDeliveryTime] = useState(null)
 
   const getEstimatedDeliveryTime = () => {
-    let _estimatedTime
+    let _estimatedTime = null
     let totalEta = 0
     const _delivery = order?.delivery_datetime_utc
       ? order?.delivery_datetime_utc
@@ -40,7 +40,8 @@ export const OrderEta = (props: any) => {
     } else {
       _estimatedTime = moment.utc(_delivery).add(order?.eta_time, 'minutes')
     }
-    _estimatedTime = outputFormat ? moment(_estimatedTime).format(outputFormat) : parseDate(_estimatedTime, { utc: false })
+    if (order?.delivered_in) { _estimatedTime = moment.utc(_delivery).add(order?.delivered_in, 'minutes')}
+    _estimatedTime = outputFormat ? moment(_estimatedTime).local().format(outputFormat) : parseDate(_estimatedTime, { utc: false })
     setEstimatedDeliveryTime(_estimatedTime)
   }
 

package/themes/original/src/components/OrderSummary/index.tsx

@@ -83,9 +83,8 @@ const OrderSummaryUI = (props: any) => {
     }
   }
 
-  const loyaltyRewardValue = ((
-    Math.trunc(((cart?.subtotal + getIncludedTaxes()) * loyaltyRewardRate) * 100) / 100
-  ).toFixed(configs.format_number_decimal_length?.value ?? 2), 10)
+  const clearAmount = (value: any) => parseFloat((Math.trunc(value * 100) / 100).toFixed(configs.format_number_decimal_length?.value ?? 2))
+  const loyaltyRewardValue = clearAmount((cart?.subtotal + getIncludedTaxes()) * loyaltyRewardRate)
 
   const handleDeleteClick = (product: any) => {
     removeProduct(product, cart)
@@ -317,7 +316,7 @@ const OrderSummaryUI = (props: any) => {
                       {parsePrice(cart?.balance >= 0 ? cart?.balance : 0)}
                     </OText>
                   </OSTable>
-                  {!!loyaltyRewardValue && isFinite(loyaltyRewardValue) && (
+                  {!!loyaltyRewardValue && (
                     <OSTable style={{ justifyContent: 'flex-end' }}>
                       <OText size={12} color={theme.colors.textNormal}>
                         {t('REWARD_LOYALTY_POINT', 'Reward :amount: on loyalty points').replace(':amount:', loyaltyRewardValue)}

package/themes/original/src/components/ProductOptionSubOption/index.tsx

@@ -67,7 +67,7 @@ export const ProductOptionSubOptionUI = (props: any) => {
 
 	return (
 		<View>
-			<Container onPress={() => handleSuboptionClick()}>
+			<Container onPress={!(option?.with_half_option || option?.allow_suboption_quantity) ? () => handleSuboptionClick() : null}>
 				<IconControl disabled={disabled} onPress={() => handleSuboptionClick()}>
 					{((option?.min === 0 && option?.max === 1) || option?.max > 1) ? (
 						state?.selected ? (

package/themes/original/src/components/SignupForm/index.tsx

@@ -393,7 +393,7 @@ const SignupFormUI = (props: SignupParams) => {
 				vibrateApp()
 				return
 			}
-			formState.result?.result && showToast(ToastType.Error, formState.result?.result[0]);
+			formState.result?.result && showToast(ToastType.Error, t(`${formState.result?.result[0]}`, 'Phone number already used'));
 			formState.result?.result && vibrateApp()
 			setIsLoadingVerifyModal(false);
 		}

package/themes/original/src/components/StripeCardsList/index.tsx

@@ -39,7 +39,7 @@ const StripeCardsListUI = (props: any) => {
 	}
 
 	useEffect(() => {
-		if (!cardsList?.loading && cardsList?.cards?.length === 0) {
+		if (!cardsList && !cardsList?.loading && cardsList?.cards?.length === 0) {
 			setAddCardOpen(true)
 		}
 	}, [cardsList?.loading])