ordering-ui-react-native 0.17.95 → 0.17.97

package/package.json

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

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

@@ -81,15 +81,15 @@ export const PreviousOrders = (props: any) => {
                 imgRightSrc={null}
                 style={{ borderRadius: 7, height: 40 }}
                 parentStyle={{ width: '100%' }}
-                textStyle={{ color: theme.colors.primary }}
+                textStyle={{ color: theme?.colors?.white }}
               />
             ) : (
               <>
                 <OButton
                   text={t('REJECT', 'Reject')}
                   onClick={() => handleClickLogisticOrder(2, _order?.id)}
-                  bgColor={theme.colors.danger}
-                  borderColor={theme.colors.danger}
+                  bgColor={theme.colors.red}
+                  borderColor={theme.colors.red}
                   imgRightSrc={null}
                   style={{ borderRadius: 7, height: 40 }}
                   parentStyle={{ width: '45%' }}
@@ -98,8 +98,8 @@ export const PreviousOrders = (props: any) => {
                 <OButton
                   text={t('ACCEPT', 'Accept')}
                   onClick={() => handleClickLogisticOrder(1, _order?.id)}
-                  bgColor={theme.colors.successOrder}
-                  borderColor={theme.colors.successOrder}
+                  bgColor={theme.colors.green}
+                  borderColor={theme.colors.green}
                   imgRightSrc={null}
                   style={{ borderRadius: 7, height: 40 }}
                   parentStyle={{ width: '45%' }}

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

@@ -108,17 +108,18 @@ const CartUI = (props: any) => {
     }
   }
 
-  const handleUpsellingPage = () => {
+  const handleUpsellingPage = (individualCart : any) => {
     setOpenUpselling(false)
     setCanOpenUpselling(false)
     const cartsAvailable: any = Object.values(orderState?.carts)?.filter((cart: any) => cart?.valid && cart?.status !== 2)
-    if (cartsAvailable.length === 1) {
+    if (cartsAvailable.length === 1 || !isMultiCheckout) {
+      const cart = isMultiCheckout ? cartsAvailable[0] : individualCart
       onNavigationRedirect('CheckoutNavigator', {
         screen: 'CheckoutPage',
-        cartUuid: cartsAvailable[0]?.uuid,
-        businessLogo: cartsAvailable[0]?.business?.logo,
-        businessName: cartsAvailable[0]?.business?.name,
-        cartTotal: cartsAvailable[0]?.total
+        cartUuid: cart?.uuid,
+        businessLogo: cart?.business?.logo,
+        businessName: cart?.business?.name,
+        cartTotal: cart?.total
       })
     } else {
       const groupKeys: any = {}

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

@@ -68,7 +68,7 @@ export const ProductOptionSubOptionUI = (props: any) => {
 
 	return (
 		<View>
-			<Container>
+			<Container onPress={() => handleSuboptionClick()}>
 				<IconControl disabled={disabled} onPress={() => handleSuboptionClick()}>
 					{((option?.min === 0 && option?.max === 1) || option?.max > 1) ? (
 						state?.selected ? (
@@ -139,7 +139,7 @@ export const ProductOptionSubOptionUI = (props: any) => {
 					)}
 				</PositionControl>
 				{price > 0 && (
-					<OText size={12} lineHeight={18} color={theme.colors.textSecondary}>
+					<OText size={12} lineHeight={18} color={theme.colors.textSecondary} style={{ paddingRight: 10 }}>
 						+ {parsePrice(price)}
 					</OText>
 				)}

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

@@ -4,12 +4,12 @@ export const Container = styled.TouchableOpacity`
   flex-direction: row;
   align-items: center;
   justify-content: space-between;
-  padding: 10px;
   width: 100%;
 `
 
 export const IconControl = styled.TouchableOpacity`
   flex-direction: row;
+  padding: 10px;
   width: 45%;
   align-items: center;
 `

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

@@ -117,7 +117,7 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
         if (upsellingProducts?.products?.length && !isFromCart) {
           setCanOpenUpselling && setCanOpenUpselling(true)
         } else {
-          handleUpsellingPage && handleUpsellingPage()
+          handleUpsellingPage && handleUpsellingPage(cart)
         }
       }
     }
@@ -225,7 +225,7 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
             style={{ ...styles.closeUpsellingButton }}
             textStyle={{ color: theme.colors.white, fontSize: 14 }}
             onClick={() => {
-              handleUpsellingPage()
+              handleUpsellingPage(cart)
               setIsCheckout(true)
             }}
           />
@@ -247,7 +247,7 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
               <OBottomPopup
                 title={''}
                 open={openUpselling}
-                onClose={() => handleUpsellingPage()}
+                onClose={() => handleUpsellingPage(cart)}
                 isStatusBar
               >
                 <UpsellingContent />

package/themes/original/src/types/index.tsx

@@ -593,7 +593,7 @@ export interface UpsellingProductsParams {
 	business?: any;
 	businessId?: number;
 	cartProducts?: Array<any>;
-	handleUpsellingPage: () => void;
+	handleUpsellingPage: (cart ?: any) => void;
 	openUpselling: boolean;
 	canOpenUpselling?: boolean;
 	setCanOpenUpselling?: (value: any) => void;