ordering-ui-react-native 0.17.91 → 0.17.93

package/themes/original/src/components/BusinessesListing/Layout/Original/index.tsx

@@ -82,7 +82,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 	const [{ parseDate }] = useUtils();
 
 	const appState = useRef(AppState.currentState)
-	const isChewLayout = theme?.header?.components?.layout?.type === 'chew'
+	const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
 	const [refreshing] = useState(false);
 	const hideCities = (theme?.business_listing_view?.components?.cities?.hidden || orderState?.options?.type !== 2) ?? true
 	const hideHero = theme?.business_listing_view?.components?.business_hero?.hidden

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

@@ -125,7 +125,10 @@ const CartUI = (props: any) => {
         (Object.keys(groupKeys).length === 1 && Object.keys(groupKeys)[0] === 'null') ||
         Object.keys(groupKeys).length > 1
       ) {
-        onNavigationRedirect('CheckoutNavigator', { screen: 'MultiCart' })
+        onNavigationRedirect('CheckoutNavigator', {
+          screen: 'MultiCheckout',
+          checkCarts: true
+        })
       } else {
         onNavigationRedirect('CheckoutNavigator', {
           screen: 'MultiCheckout',
@@ -393,7 +396,7 @@ const CartUI = (props: any) => {
               </OSTable>
             )}
 
-            {isMultiCheckout &&
+            {!isMultiCheckout &&
               cart &&
               cart?.valid &&
               orderState?.options?.type === 1 &&

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

@@ -45,7 +45,10 @@ export const CartContent = (props: any) => {
         (Object.keys(groupKeys).length === 1 && Object.keys(groupKeys)[0] === 'null') ||
         Object.keys(groupKeys).length > 1
       ) {
-        onNavigationRedirect('CheckoutNavigator', { screen: 'MultiCart' })
+        onNavigationRedirect('CheckoutNavigator', {
+					screen: 'MultiCheckout',
+					checkCarts: true
+				})
       } else {
         onNavigationRedirect('CheckoutNavigator', {
           screen: 'MultiCheckout',

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

@@ -154,7 +154,7 @@ const CheckoutUI = (props: any) => {
 	const isWalletCreditPointsEnabled = businessConfigs.find((config: any) => config.key === 'wallet_credit_point_enabled')?.value === '1'
 	const isWalletEnabled = configs?.cash_wallet?.value && configs?.wallet_enabled?.value === '1' && (isWalletCashEnabled || isWalletCreditPointsEnabled)
 	const isBusinessChangeEnabled = configs?.cart_change_business_validation?.value === '1'
-	const isChewLayout = theme?.header?.components?.layout?.type === 'chew'
+	const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
 	const hideBusinessAddress = theme?.checkout?.components?.business?.components?.address?.hidden
 	const hideBusinessDetails = theme?.checkout?.components?.business?.hidden
 	const hideBusinessMap = theme?.checkout?.components?.business?.components?.map?.hidden

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

@@ -22,7 +22,7 @@ const DriverTipsUI = (props: any) => {
 	const {
 		driverTip,
 		driverTipsOptions,
-		optionSelected,
+		isMulti,
 		cart,
 		isDriverTipUseCustom,
 		handlerChangeOption,
@@ -33,7 +33,7 @@ const DriverTipsUI = (props: any) => {
 	const theme = useTheme();
 	const [, t] = useLanguage();
 	const [{ configs }] = useConfig();
-	const [customTip, setCustomTip] = useState((isDriverTipUseCustom && !driverTipsOptions.includes(driverTip)) ?? false)
+	const [customTip, setCustomTip] = useState((!isMulti && isDriverTipUseCustom && !driverTipsOptions.includes(driverTip)) ?? false)
 	const currentTip = customTip ? parseFloat(driverTip || 0) > 0 : (!customTip && !driverTipsOptions.includes(driverTip) && parseFloat(driverTip || 0)) > 0
 	const [value, setvalue] = useState('');
 

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

@@ -61,7 +61,7 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
       case 'paypal':
         return theme.images.general.paypal
       case 'stripe':
-        return theme.images.general.stripe
+        return theme.images.general.creditCard
       case 'stripe_direct':
         return theme.images.general.stripecc
       case 'stripe_connect':
@@ -83,7 +83,7 @@ const MultiCartsPaymethodsAndWalletsUI = (props: any) => {
           isActive={paymethodSelected?.id === item.id}
         >
           <OIcon
-            src={getPayIcon(item.paymethod?.gateway)}
+            src={getPayIcon(item?.gateway ?? item.paymethod?.gateway)}
             width={20}
             height={20}
             color={paymethodSelected?.id === item.id ? theme.colors.white : theme.colors.backgroundDark}

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

@@ -18,9 +18,12 @@ import { OText, OIcon, OModal } from '../shared';
 import { getTypesText } from '../../utils';
 import { UserDetails } from '../UserDetails'
 import { AddressDetails } from '../AddressDetails'
+import { MultiCart as MultiCartController } from '../MultiCart'
 import { MultiCartsPaymethodsAndWallets } from '../MultiCartsPaymethodsAndWallets'
 import { Cart } from '../Cart'
 import { FloatingButton } from '../FloatingButton'
+import { DriverTips } from '../DriverTips'
+import { DriverTipsContainer } from '../Cart/styles'
 
 import {
   ChContainer,
@@ -78,8 +81,12 @@ const MultiCheckoutUI = (props: any) => {
 
   const configTypes = configs?.order_types_allowed?.value.split('|').map((value: any) => Number(value)) || []
   const isPreOrder = configs?.preorder_status_enabled?.value === '1'
+  const isMultiDriverTips = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
   const isDisablePlaceOrderButton = !(paymethodSelected?.paymethod_id || paymethodSelected?.wallet_id) || (paymethodSelected?.paymethod?.gateway === 'stripe' && !paymethodSelected?.paymethod_data)
   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 driverTipsOptions = typeof configs?.driver_tip_options?.value === 'string'
+    ? JSON.parse(configs?.driver_tip_options?.value) || []
+    : configs?.driver_tip_options?.value || []
 
   const [isUserDetailsEdit, setIsUserDetailsEdit] = useState(false);
   const [phoneUpdate, setPhoneUpdate] = useState(false);
@@ -227,6 +234,35 @@ const MultiCheckoutUI = (props: any) => {
             <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginTop: 13, marginHorizontal: -40 }} />
           </ChSection>
 
+          {
+            isMultiDriverTips &&
+            options?.type === 1 &&
+            validationFields?.fields?.checkout?.driver_tip?.enabled &&
+            openCarts.every((cart: any) => cart.business_id && cart.status !== 2) &&
+            driverTipsOptions && driverTipsOptions?.length > 0 &&
+          (
+            <ChSection>
+              <DriverTipsContainer>
+                <OText size={14} lineHeight={20} color={theme.colors.textNormal}>
+                  {t('DRIVER_TIPS', 'Driver Tips')}
+                </OText>
+                <DriverTips
+                  isMulti
+                  carts={openCarts}
+                  businessIds={openCarts.map((cart: any) => cart.business_id)}
+                  driverTipsOptions={driverTipsOptions}
+                  isFixedPrice={parseInt(configs?.driver_tip_type?.value, 10) === 1}
+                  isDriverTipUseCustom={!!parseInt(configs?.driver_tip_use_custom?.value, 10)}
+                  driverTip={parseInt(configs?.driver_tip_type?.value, 10) === 1
+                    ? openCarts[0]?.driver_tip
+                    : openCarts[0]?.driver_tip_rate}
+                  useOrderContext
+                />
+              </DriverTipsContainer>
+              <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginTop: 13, marginHorizontal: -40 }} />
+            </ChSection>
+          )}
+
           <ChSection>
             <ChCarts>
               <CartsHeader>
@@ -310,9 +346,34 @@ const MultiCheckoutUI = (props: any) => {
 }
 
 export const MultiCheckout = (props: any) => {
+  const [loadMultiCarts, setLoadMultiCarts] = useState(!!props.route?.params?.checkCarts)
+  const [cartUuid, setCartUuid] = useState('')
+
   const multiCheckoutProps = {
     ...props,
+    cartUuid: props.route?.params?.cartUuid ?? cartUuid,
     UIComponent: MultiCheckoutUI
   }
-  return <MultiCheckoutController {...multiCheckoutProps} />
+
+  const multiCartProps = {
+    ...props,
+    handleOnRedirectMultiCheckout: (cartUuid: string) => {
+      setCartUuid(cartUuid)
+      setLoadMultiCarts(false)
+    },
+    handleOnRedirectCheckout: (cartUuid: string) => {
+      props.navigation.navigate('CheckoutNavigator', {
+        screen: 'CheckoutPage',
+        cartUuid: cartUuid
+      })
+    }
+  }
+
+  return (
+    loadMultiCarts ? (
+      <MultiCartController {...multiCartProps} />
+    ) : (
+      <MultiCheckoutController {...multiCheckoutProps} />
+    )
+  )
 }

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

@@ -3,7 +3,6 @@ import { useLanguage, useUtils, useToast, ToastType, useConfig, MultiOrdersDetai
 import { View, StyleSheet, BackHandler, TouchableOpacity } from 'react-native'
 import { useTheme } from 'styled-components/native'
 import { OText, OButton } from '../shared'
-import { Container } from '../../layouts/Container'
 import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder'
 import { SingleOrderCard } from './SingleOrderCard'
 import AntDesignIcon from 'react-native-vector-icons/AntDesign'
@@ -53,6 +52,7 @@ export const MultiOrdersDetailsUI = (props: any) => {
   const [, { showToast }] = useToast();
   const [{ configs }] = useConfig()
 
+  const isTaxIncludedOnPrice = orders.every((_order: any) => _order.taxes?.length ? _order.taxes?.every((_tax: any) => _tax.type === 1) : true)
   const progressBarStyle = configs.multi_business_checkout_progress_bar_style?.value
   const showBarInOrder = ['group', 'both']
   const showBarInIndividual = ['individual', 'both']
@@ -225,23 +225,27 @@ export const MultiOrdersDetailsUI = (props: any) => {
             </Row>
           ))}
           <BorderLine />
-          <Row>
-            <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
-              {t('TOTAL_BEFORE_TAX', 'Total before tax')}:
-            </OText>
-            <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
-              {parsePrice(ordersSummary?.subtotal)}
-            </OText>
-          </Row>
-          <Row>
-            <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
-              {t('ESTIMATED_TAX_TO_BE_COLLECTED', 'Estimated tax to be collected')}:
-            </OText>
-            <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
-              {parsePrice(ordersSummary?.tax)}
-            </OText>
-          </Row>
-          <BorderLine />
+          {!isTaxIncludedOnPrice && (
+            <>
+              <Row>
+                <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
+                  {t('TOTAL_BEFORE_TAX', 'Total before tax')}:
+                </OText>
+                <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
+                  {parsePrice(ordersSummary?.subtotal)}
+                </OText>
+              </Row>
+              <Row>
+                <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
+                  {t('ESTIMATED_TAX_TO_BE_COLLECTED', 'Estimated tax to be collected')}:
+                </OText>
+                <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
+                  {parsePrice(ordersSummary?.tax)}
+                </OText>
+              </Row>
+              <BorderLine />
+            </>
+          )}
           <Row style={{ marginTop: 10 }}>
             <OText size={14} lineHeight={18} weight={'500'} color={theme.colors.textNormal}>
               {t('PAYMENT_TOTAL', 'Payment total')}:

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

@@ -31,7 +31,7 @@ export const MyOrders = (props: any) => {
   const notOrderOptions = ['business', 'products']
   const allEmpty = (ordersLength?.activeOrdersLength === 0 && ordersLength?.previousOrdersLength === 0) || ((isEmptyBusinesses || businessOrderIds?.length === 0) && hideOrders)
 
-  const isChewLayout = theme?.header?.components?.layout?.type === 'chew'
+  const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
   const showNavbar = theme?.bar_menu?.components?.orders?.hidden
   const hideOrdersTheme = theme?.bar_menu?.components?.orders?.hidden
   const hideProductsTab = theme?.orders?.components?.products_tab?.hidden
@@ -90,7 +90,7 @@ export const MyOrders = (props: any) => {
           },
           ...props.titleStyle
         }}>
-          {(!props.hideBackBtn || !hideOrdersTheme) && !isChewLayout && (
+          {!props.hideBackBtn && (!isChewLayout || (isChewLayout && hideOrdersTheme)) && (
             <OButton
               imgLeftStyle={{ width: 18 }}
               imgRightSrc={null}
@@ -103,7 +103,7 @@ export const MyOrders = (props: any) => {
                 shadowColor: '#FFF',
                 paddingLeft: 0,
                 paddingRight: 0,
-                marginTop: 50,
+                marginTop: 30,
               }}
               onClick={goToBack}
               icon={AntDesignIcon}

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

@@ -77,7 +77,7 @@ export const ProductOptionsUI = (props: any) => {
 	const theme = useTheme();
 	const [, { showToast }] = useToast()
 
-	const isChewLayout = theme?.header?.components?.layout?.type === 'chew'
+	const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
 
 	const styles = StyleSheet.create({
 		mainContainer: {

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

@@ -41,7 +41,7 @@ export const ProductOptionSubOptionUI = (props: any) => {
 	const [showMessage, setShowMessage] = useState(false)
 	const [isDirty, setIsDirty] = useState(false)
 
-	const isChewLayout = theme?.header?.components?.layout?.type === 'chew'
+	const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
 	const iconsSize = isChewLayout ? 20 : 16
 
 	const handleSuboptionClick = () => {

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

@@ -45,7 +45,7 @@ const SingleProductCardUI = React.memo((props: SingleProductCardParams) => {
 
 	const theme = useTheme();
 	const hideAddButton = theme?.business_view?.components?.products?.components?.add_to_cart_button?.hidden ?? true
-	const isChewLayout = theme?.header?.components?.layout?.type === 'chew'
+	const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
 	const hideProductDescription = theme?.business_view?.components?.products?.components?.product?.components?.description?.hidden
 	const hideProductLogo = viewString
 		? theme?.[viewString]?.components?.cart?.components?.products?.image?.hidden

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

@@ -49,7 +49,7 @@ const ProfileListUI = (props: ProfileParams) => {
 
 	const theme = useTheme();
 
-	const isChewLayout = theme?.header?.components?.layout?.type === 'chew'
+	const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
 	const hideProfileImage = theme?.profile?.components?.picture?.hidden
 	const hideOrders = theme?.profile?.components?.orders?.hidden
 	const hideProfile = theme?.profile?.components?.profile?.hidden

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

@@ -71,7 +71,7 @@ const WalletsUI = (props: any) => {
 
   const [tabSelected, setTabSelected] = useState(isWalletCashEnabled ? 'cash' : 'credit_point')
   const [openHistory, setOpenHistory] = useState(false)
-  const isChewLayout = theme?.header?.components?.layout?.type === 'chew'
+  const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
   const hideWalletsTheme = theme?.bar_menu?.components?.wallets?.hidden
 
   const isWalletEnabled = configs?.cash_wallet?.value && configs?.wallet_enabled?.value === '1' && (isWalletCashEnabled || isWalletPointsEnabled)