ordering-ui-react-native 0.23.11 → 0.23.13

package/package.json

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

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

@@ -156,7 +156,7 @@ const NewOrderNotificationUI = (props: any) => {
         setCurrentEvent({ evt: 2, orderId: value?.id ?? value?.order_id })
       }
     }
-    if ((!orderStatus.includes(value.status) && evtType !== 1 && isBusinessApp) || value?.author_id === user.id) return    
+    if ((!orderStatus.includes(value.status) && evtType !== 1 && isBusinessApp && orderStatus?.length > 0) || value?.author_id === user.id) return    
     setCurrentEvent({
       evt: evtType,
       orderId: value?.driver

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

@@ -566,7 +566,7 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
               </OText>
             )}
 
-            {order?.customer?.address_notes && (
+            {!!order?.customer?.address_notes && (
               <OText style={{ marginBottom: 5 }}>
                 {`${t('NOTES', 'Notes')}: ${order?.customer?.address_notes}`}
               </OText>
@@ -665,7 +665,7 @@ export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermi
               {t('ORDER_DETAILS', 'Order Details')}
             </OText>
 
-            {order?.comment && (
+            {!!order?.comment && (
               <OText style={{ marginBottom: 5 }}>
                 {`${t('ORDER_COMMENT', 'Order Comment')}: ${order?.comment}`}
               </OText>

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

@@ -129,8 +129,9 @@ const CartUI = (props: any) => {
         cartUuid: cart?.uuid,
         businessLogo: cart?.business?.logo,
         businessName: cart?.business?.name,
-        cartTotal: cart?.total
-      }, true)
+        cartTotal: cart?.total,
+        fromProductsList: isFromUpselling
+      })
     } else {
       const groupKeys: any = {}
       cartsAvailable.forEach((_cart: any) => {
@@ -146,12 +147,12 @@ const CartUI = (props: any) => {
         onNavigationRedirect('CheckoutNavigator', {
           screen: 'MultiCheckout',
           checkCarts: true
-        }, true)
+        })
       } else {
         onNavigationRedirect('CheckoutNavigator', {
           screen: 'MultiCheckout',
           cartUuid: cartsAvailable[0]?.group?.uuid
-        }, true)
+        })
       }
     }
   }

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

@@ -36,10 +36,16 @@ export const ProductOptionSubOptionUI = (props: any) => {
 		setIsScrollAvailable,
 		image,
 		enableIntersection,
-		onChange
+		usePizzaValidation,
+		pizzaState
 	} = props
 
-	const disableIncrement = option?.limit_suboptions_by_max ? balance === option?.max || state.quantity === suboption?.max : state.quantity === suboption?.max || (!state.selected && balance === option?.max)
+	const disableIncrement =
+		option?.with_half_option
+			? pizzaState?.[`option:${option?.id}`]?.value === option?.max
+			: option?.limit_suboptions_by_max
+				? (balance === option?.max || state.quantity === suboption.max)
+				: state.quantity === suboption?.max || (!state.selected && balance === option?.max)
 	const price = option?.with_half_option && suboption?.half_price && state.position !== 'whole' ? suboption?.half_price : suboption?.price
 
 	const theme = useTheme();
@@ -66,8 +72,9 @@ export const ProductOptionSubOptionUI = (props: any) => {
 	const handleSuboptionClick = () => {
 		toggleSelect()
 		setIsDirty(true)
+		const minMaxValidation = option?.with_half_option ? usePizzaValidation : (balance === option?.max && option?.suboptions?.length > balance && !(option?.min === 1 && option?.max === 1))
 
-		if (balance === option?.max && option?.suboptions?.length > balance && !(option?.min === 1 && option?.max === 1)) {
+		if (!state.selected && minMaxValidation) {
 			setShowMessage(true)
 		}
 	}
@@ -87,13 +94,7 @@ export const ProductOptionSubOptionUI = (props: any) => {
 		if (!(balance === option?.max && option?.suboptions?.length > balance && !(option?.min === 1 && option?.max === 1))) {
 			setShowMessage(false)
 		}
-	}, [balance])
-
-	useEffect(() => {
-		if (!suboption?.preselected || !option?.respect_to) return
-		const newState = { ...state, selected: suboption?.preselected, quantity: state.selected ? 0 : 1 }
-		onChange(newState, suboption, option)
-	}, [suboption, option])
+	}, [balance, pizzaState?.[`option:${option?.id}`]?.value])
 
 	return (
 		<InView onChange={(inView: boolean) => handleChangeInterSection(inView)} triggerOnce={true}>
@@ -129,7 +130,7 @@ export const ProductOptionSubOptionUI = (props: any) => {
 							{suboption?.name}
 						</OText>
 					</IconControl>
-					{option?.allow_suboption_quantity && state?.selected && (
+					{!(option?.max === 1 && option?.min === 1) && option?.allow_suboption_quantity && state?.selected && (
 						<QuantityControl>
 							<>
 								<Checkbox disabled={disabled || state.quantity === 0} onPress={decrement}>
@@ -142,11 +143,11 @@ export const ProductOptionSubOptionUI = (props: any) => {
 								<OText size={12}>
 									{state.quantity}
 								</OText>
-								<Checkbox disabled={disabled || disableIncrement} onPress={increment}>
+								<Checkbox disabled={disabled || disableIncrement || usePizzaValidation} onPress={increment}>
 									<IconAntDesign
 										name='pluscircleo'
 										size={iconsSize}
-										color={disableIncrement || disabled ? theme.colors.disabled : theme.colors.primary}
+										color={disableIncrement || disabled || usePizzaValidation ? theme.colors.disabled : theme.colors.primary}
 									/>
 								</Checkbox>
 							</>
@@ -164,7 +165,7 @@ export const ProductOptionSubOptionUI = (props: any) => {
 										style={styles.inverse}
 									/>
 								</Circle>
-								<Circle disabled={disabled} onPress={() => changePosition('whole')}>
+								<Circle disabled={disabled || (pizzaState?.[`option:${option?.id}`]?.value === option?.max)} onPress={() => changePosition('whole')}>
 									<OIcon
 										src={theme.images.general.half_f}
 										color={state.selected && state.position === 'whole' ? theme.colors.primary : '#cbcbcb'}