ordering-ui-react-native 0.18.22 → 0.18.24

package/package.json

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

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

@@ -185,10 +185,13 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
     handleChangeSearch('')
   }
 
-  const handleUpsellingPage = () => {
+  const handleUpsellingPage = (cart: any) => {
+    const isProductCartParam = !!cart?.products?.length
     setOpenUpselling(false)
     setCanOpenUpselling(false)
-    const cartsAvailable: any = Object.values(orderState?.carts)?.filter((cart: any) => cart?.valid && cart?.status !== 2)
+    const cartsAvailable: any = Object.values(orderState?.carts)
+      ?.filter((_cart: any) => _cart?.valid && _cart?.status !== 2 && _cart?.products?.length)
+      ?.filter((_c: any) => !isProductCartParam ? _c.uuid !== cart.uuid : _c)
     if (cartsAvailable.length === 1 || !isCheckoutMultiBusinessEnabled) {
       const cart = isCheckoutMultiBusinessEnabled ? cartsAvailable[0] : currentCart
 
@@ -198,7 +201,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
         businessLogo: cart?.business?.logo,
         businessName: cart?.business?.name,
         cartTotal: cart?.total
-      })
+      }, true)
     } else {
       const groupKeys: any = {}
       cartsAvailable.forEach((_cart: any) => {
@@ -214,12 +217,12 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
         props.onNavigationRedirect('CheckoutNavigator', {
           screen: 'MultiCheckout',
           checkCarts: true
-        })
+        }, true)
       } else {
         props.onNavigationRedirect('CheckoutNavigator', {
           screen: 'MultiCheckout',
           cartUuid: cartsAvailable[0]?.group?.uuid
-        })
+        }, true)
       }
     }
   }
@@ -601,7 +604,6 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
           professionalList={business?.professionals}
           professionalSelected={professionalSelected}
           handleChangeProfessional={handleChangeProfessionalSelected}
-          handleChangeProfessional={handleChangeProfessionalSelected}
           handleUpdateProfessionals={handleUpdateProfessionals}
           onSave={() => setOpenService(false)}
           onClose={() => setOpenService(false)}

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

@@ -110,9 +110,13 @@ const CartUI = (props: any) => {
   }
 
   const handleUpsellingPage = (individualCart : any) => {
+    const isProductCartParam = !!individualCart?.products?.length
     setOpenUpselling(false)
     setCanOpenUpselling(false)
-    const cartsAvailable: any = Object.values(orderState?.carts)?.filter((cart: any) => cart?.valid && cart?.status !== 2)
+
+    const cartsAvailable: any = Object.values(orderState?.carts)
+      ?.filter((_cart: any) => _cart?.valid && _cart?.status !== 2 && _cart?.products?.length)
+      ?.filter((_c: any) => !isProductCartParam ? _c.uuid !== cart.uuid : _c)
     if (cartsAvailable.length === 1 || !isMultiCheckout) {
       const cart = isMultiCheckout ? cartsAvailable[0] : individualCart
       onNavigationRedirect('CheckoutNavigator', {
@@ -121,7 +125,7 @@ const CartUI = (props: any) => {
         businessLogo: cart?.business?.logo,
         businessName: cart?.business?.name,
         cartTotal: cart?.total
-      })
+      }, true)
     } else {
       const groupKeys: any = {}
       cartsAvailable.forEach((_cart: any) => {
@@ -137,12 +141,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/Checkout/index.tsx

@@ -333,7 +333,7 @@ const CheckoutUI = (props: any) => {
 					<NavBar
 						title={t('CHECKOUT', 'Checkout')}
 						titleAlign={'center'}
-						onActionLeft={() => navigation?.canGoBack() && navigation.goBack()}
+						onActionLeft={() => onNavigationRedirect('BottomTab', { screen: 'Cart' }, !props.fromMulti)}
 						showCall={false}
 						btnStyle={{ paddingLeft: 0, paddingTop: Platform.OS == 'ios' ? 0 : 2 }}
 						titleWrapStyle={{ paddingHorizontal: 0 }}

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

@@ -62,7 +62,8 @@ const MultiCheckoutUI = (props: any) => {
     cartUuid,
     rewardRate,
     totalCartsFee,
-    cartGroup
+    cartGroup,
+    onNavigationRedirectReplace
   } = props
 
   const theme = useTheme();
@@ -154,6 +155,16 @@ const MultiCheckoutUI = (props: any) => {
     }
   }, [validationFields, user])
 
+  useEffect(() => {
+    if (openCarts.length === 1) {
+      onNavigationRedirectReplace('CheckoutPage', {
+        cartUuid: openCarts[0]?.uuid,
+        fromMulti: true
+      })
+      return
+    }
+  }, [openCarts])
+
   return (
     <>
       <Container noPadding>

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

@@ -143,7 +143,7 @@ const PromotionsUI = (props: PromotionParams) => {
             <WrapperSingleOffer key={offer.id}>
               <SingleOfferContainer>
                 <FastImage
-                  style={{ height: 80, width: 80, aspectRatio: 3 / 2, borderRadius: 8 }}
+                  style={{ height: 80, width: 80, aspectRatio: 1, borderRadius: 8 }}
                   source={typeof offer?.image !== 'number' ? {
                     uri: optimizeImage(offer?.image, 'h_1024,c_limit'),
                     priority: FastImage.priority.normal,

package/themes/original/src/components/Promotions/styles.tsx

@@ -9,6 +9,7 @@ export const PromotionsContainer = styled.View`
 export const WrapperSingleOffer = styled.View`
   flex-direction: column;
   width: 100%;
+  margin-bottom: 30px;
 `
 
 export const SingleOfferContainer = styled.View`
@@ -16,11 +17,12 @@ export const SingleOfferContainer = styled.View`
   width: 100%;
   justify-content: space-between;
   align-items: center;
-  margin-bottom: 20px;
+  margin-bottom: 10px;
 `
 
 export const OfferInformation = styled.View`
   justify-content: space-between;
+  min-width: 70%;
   max-width: 70%;
 `
 

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

@@ -30,7 +30,6 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
     upsellingProducts,
     business,
     handleUpsellingPage,
-    handleCloseUpsellingPage,
     openUpselling,
     canOpenUpselling,
     setCanOpenUpselling,
@@ -85,13 +84,11 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
     },
   })
 
-  const [modalIsOpen, setModalIsOpen] = useState(false)
   const [{ carts }] = useOrder()
   const [{ parsePrice }] = useUtils()
   const [{ configs }] = useConfig()
   const [, t] = useLanguage()
   const { bottom } = useSafeAreaInsets()
-  const [isCheckout, setIsCheckout] = useState(false)
   const [isCartsLoading, setIsCartsLoading] = useState(false)
 
   const isMultiCheckout = configs?.checkout_multi_business_enabled?.value === '1'
@@ -224,10 +221,7 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
             text={t('CHECKOUT', 'Checkout')}
             style={{ ...styles.closeUpsellingButton }}
             textStyle={{ color: theme.colors.white, fontSize: 14 }}
-            onClick={() => {
-              handleUpsellingPage(cart)
-              setIsCheckout(true)
-            }}
+            onClick={() => handleUpsellingPage(cart)}
           />
         </View>
       </>
@@ -243,7 +237,7 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
           {props.isPage ? (
             <UpsellingContent />
           ) : (
-            canOpenUpselling && !modalIsOpen && (
+            canOpenUpselling && (
               <OBottomPopup
                 title={''}
                 open={openUpselling}