ordering-ui-react-native 0.16.78 → 0.16.80

package/package.json

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

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

@@ -125,6 +125,8 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 	const [currentProduct, setCurrentProduct] = useState(null)
 
 	const isCheckoutMultiBusinessEnabled: Boolean = configs?.checkout_multi_business_enabled?.value === '1'
+	const openCarts = (Object.values(orderState?.carts)?.filter((cart: any) => 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 currentCart: any = Object.values(orderState.carts).find((cart: any) => cart?.business?.slug === business?.slug) ?? {}
 	const isOpenFiltProducts = isOpenSearchBar && !!searchValue
 	const filtProductsHeight = Platform.OS === 'ios' ? 0 : 100
@@ -151,7 +153,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 	}
 
 	const handleUpsellingPage = () => {
-		if (isCheckoutMultiBusinessEnabled) {
+		if (isCheckoutMultiBusinessEnabled && openCarts.length > 1) {
 			onRedirect('CheckoutNavigator', {
 				screen: 'MultiCheckout'
 			})

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

@@ -62,6 +62,7 @@ const CartUI = (props: any) => {
   const isCartPending = cart?.status === 2
   const isCouponEnabled = validationFields?.fields?.checkout?.coupon?.enabled
   const isCheckoutMultiBusinessEnabled: Boolean = configs?.checkout_multi_business_enabled?.value === '1'
+  const openCarts = (Object.values(orderState?.carts)?.filter((cart: any) => 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 business: any = (orderState?.carts && Object.values(orderState.carts).find((_cart: any) => _cart?.uuid === props.cartuuid)) ?? {}
   const businessId = business?.business_id ?? null
@@ -103,7 +104,7 @@ const CartUI = (props: any) => {
   const handleUpsellingPage = () => {
     setOpenUpselling(false)
     setCanOpenUpselling(false)
-    if (isCheckoutMultiBusinessEnabled) {
+    if (isCheckoutMultiBusinessEnabled && openCarts.length > 1) {
       props.onNavigationRedirect('CheckoutNavigator', {
         screen: 'MultiCheckout'
       })

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

@@ -79,6 +79,7 @@ const MultiCheckoutUI = (props: any) => {
 	const isPreOrder = configs?.preorder_status_enabled?.value === '1'
   const maximumCarts = 5
   const isDisablePlaceOrderButton = !(paymethodSelected?.paymethod_id || paymethodSelected?.wallet_id) || openCarts.length > maximumCarts
+  const walletCarts = (Object.values(carts)?.filter((cart: any) => 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 [isUserDetailsEdit, setIsUserDetailsEdit] = useState(false);
 	const [phoneUpdate, setPhoneUpdate] = useState(false);
@@ -253,6 +254,11 @@ const MultiCheckoutUI = (props: any) => {
                   </OText>
                 </CCNotCarts>
               )}
+              {walletCarts.length > 0 && (
+                <OText size={14} color={theme.colors.danger5} style={{ marginVertical: 20 }}>
+                  {t('WARNING_PARTIAL_WALLET_CARTS', 'Important: One or more carts can`t be completed due a partial payment with cash/points wallet and requires to be paid individually')}
+                </OText>
+              )}
               {openCarts.length > 0 && (
                 <ChCartsTotal>
                   <View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>

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

@@ -1031,6 +1031,7 @@ export const ProductOptionsUI = (props: any) => {
 										disabled={
 											maxProductQuantity <= 0 ||
 											productCart.quantity >= maxProductQuantity ||
+											productCart.quantity >= product?.maximum_per_order ||
 											isSoldOut
 										}>
 										<OIcon
@@ -1039,6 +1040,7 @@ export const ProductOptionsUI = (props: any) => {
 											color={
 												maxProductQuantity <= 0 ||
 													productCart.quantity >= maxProductQuantity ||
+													productCart.quantity >= product?.maximum_per_order ||
 													isSoldOut
 													? theme.colors.backgroundGray
 													: theme.colors.backgroundDark
@@ -1093,7 +1095,7 @@ export const ProductOptionsUI = (props: any) => {
 export const ProductForm = (props: any) => {
 	const productOptionsProps = {
 		...props,
-		productCart: { quantity: props?.product?.minimum_per_order || 1 },
+		productCart: { quantity: props?.product?.maximum_per_order || 1 },
 		UIComponent: ProductOptionsUI,
 	};