ordering-ui-react-native 0.16.70 → 0.16.71-release

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

@@ -7,7 +7,7 @@ import {
   useValidationFields,
   useSession,
   useToast,
-	ToastType,
+  ToastType,
   MultiCheckout as MultiCheckoutController
 } from 'ordering-components/native'
 import { View, StyleSheet, Platform } from 'react-native'
@@ -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,
@@ -36,11 +39,11 @@ import {
 } from './styles'
 
 const mapConfigs = {
-	mapZoom: 16,
-	mapSize: {
-		width: 640,
-		height: 190
-	}
+  mapZoom: 16,
+  mapSize: {
+    width: 640,
+    height: 190
+  }
 }
 
 const MultiCheckoutUI = (props: any) => {
@@ -53,74 +56,79 @@ const MultiCheckoutUI = (props: any) => {
     paymethodSelected,
     handleSelectPaymethod,
     handleSelectWallet,
-    handlePaymethodDataChange
+    handlePaymethodDataChange,
+    cartUuid,
+    totalCartsFee,
+    cartGroup
   } = props
 
-	const theme = useTheme();
+  const theme = useTheme();
   const styles = StyleSheet.create({
     pagePadding: {
-			paddingLeft: 40,
-			paddingRight: 40
-		},
-    wrapperNavbar: Platform.OS === 'ios'
-			? { paddingVertical: 0, paddingHorizontal: 40 }
-			: { paddingVertical: 20, paddingHorizontal: 40 }
+      paddingLeft: 40,
+      paddingRight: 40
+    },
+    wrapperNavbar: { paddingHorizontal: 40 }
   })
 
-	const [, { showToast }] = useToast();
+  const [, { showToast }] = useToast();
   const [, t] = useLanguage()
-	const [{ configs }] = useConfig();
-	const [{ parsePrice, parseDate }] = useUtils();
-	const [{ options, carts, loading }, { confirmCart }] = useOrder();
-	const [validationFields] = useValidationFields();
+  const [{ configs }] = useConfig();
+  const [{ parsePrice, parseDate }] = useUtils();
+  const [{ options, carts, loading }, { confirmCart }] = useOrder();
+  const [validationFields] = useValidationFields();
   const [{ user }] = useSession()
 
-	const configTypes = configs?.order_types_allowed?.value.split('|').map((value: any) => Number(value)) || []
-	const isPreOrder = configs?.preorder_status_enabled?.value === '1'
-  const maximumCarts = 5
-  const isDisablePlaceOrderButton = !(paymethodSelected?.paymethod_id || paymethodSelected?.wallet_id) || openCarts.length > maximumCarts
+  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);
-	const [userErrors, setUserErrors] = useState<any>([]);
+  const [isUserDetailsEdit, setIsUserDetailsEdit] = useState(false);
+  const [phoneUpdate, setPhoneUpdate] = useState(false);
+  const [userErrors, setUserErrors] = useState<any>([]);
   const handleMomentClick = () => {
-		if (isPreOrder) {
-			navigation.navigate('MomentOption')
-		}
-	}
+    if (isPreOrder) {
+      navigation.navigate('MomentOption')
+    }
+  }
 
   const checkValidationFields = () => {
-		setUserErrors([])
-		const errors = []
-		const notFields = ['coupon', 'driver_tip', 'mobile_phone', 'address', 'zipcode', 'address_notes']
+    setUserErrors([])
+    const errors = []
+    const notFields = ['coupon', 'driver_tip', 'mobile_phone', 'address', 'zipcode', 'address_notes']
 
-		Object.values(validationFields?.fields?.checkout).map((field: any) => {
-			if (field?.required && !notFields.includes(field.code)) {
-				if (!user[field?.code]) {
-					errors.push(t(`VALIDATION_ERROR_${field.code.toUpperCase()}_REQUIRED`, `The field ${field?.name} is required`))
-				}
-			}
-		})
+    Object.values(validationFields?.fields?.checkout).map((field: any) => {
+      if (field?.required && !notFields.includes(field.code)) {
+        if (!user[field?.code]) {
+          errors.push(t(`VALIDATION_ERROR_${field.code.toUpperCase()}_REQUIRED`, `The field ${field?.name} is required`))
+        }
+      }
+    })
 
-		if (
-			!user?.cellphone &&
-			((validationFields?.fields?.checkout?.cellphone?.enabled &&
-				validationFields?.fields?.checkout?.cellphone?.required) ||
-				configs?.verification_phone_required?.value === '1')
-		) {
-			errors.push(t('VALIDATION_ERROR_MOBILE_PHONE_REQUIRED', 'The field Phone number is required'))
-		}
+    if (
+      !user?.cellphone &&
+      ((validationFields?.fields?.checkout?.cellphone?.enabled &&
+        validationFields?.fields?.checkout?.cellphone?.required) ||
+        configs?.verification_phone_required?.value === '1')
+    ) {
+      errors.push(t('VALIDATION_ERROR_MOBILE_PHONE_REQUIRED', 'The field Phone number is required'))
+    }
 
-		if (phoneUpdate) {
-			errors.push(t('NECESSARY_UPDATE_COUNTRY_PHONE_CODE', 'It is necessary to update your phone number'))
-		}
+    if (phoneUpdate) {
+      errors.push(t('NECESSARY_UPDATE_COUNTRY_PHONE_CODE', 'It is necessary to update your phone number'))
+    }
 
-		setUserErrors(errors)
-	}
+    setUserErrors(errors)
+  }
 
   const togglePhoneUpdate = (val: boolean) => {
-		setPhoneUpdate(val)
-	}
+    setPhoneUpdate(val)
+  }
 
   const handlePlaceOrder = () => {
     if (!userErrors.length) {
@@ -128,33 +136,30 @@ const MultiCheckoutUI = (props: any) => {
       return
     }
     let stringError = ''
-		Object.values(userErrors).map((item: any, i: number) => {
-			stringError += (i + 1) === userErrors.length ? `- ${item?.message || item}` : `- ${item?.message || item}\n`
-		})
-		showToast(ToastType.Error, stringError)
+    Object.values(userErrors).map((item: any, i: number) => {
+      stringError += (i + 1) === userErrors.length ? `- ${item?.message || item}` : `- ${item?.message || item}\n`
+    })
+    showToast(ToastType.Error, stringError)
     setIsUserDetailsEdit(true)
   }
 
   useEffect(() => {
-		if (validationFields && validationFields?.fields?.checkout) {
-			checkValidationFields()
-		}
-	}, [validationFields, user])
+    if (validationFields && validationFields?.fields?.checkout) {
+      checkValidationFields()
+    }
+  }, [validationFields, user])
 
   return (
     <>
       <Container noPadding>
         <View style={styles.wrapperNavbar}>
           <NavBar
-            isVertical
             title={t('CHECKOUT', 'Checkout')}
             titleAlign={'center'}
             onActionLeft={() => navigation?.canGoBack() && navigation.goBack()}
             showCall={false}
+            paddingTop={Platform.OS === 'ios' ? 0 : 4}
             btnStyle={{ paddingLeft: 0 }}
-            style={{ marginTop: Platform.OS === 'ios' ? 0 : 30 }}
-            titleWrapStyle={{ paddingHorizontal: 0 }}
-            titleStyle={{ marginRight: 0, marginLeft: 0 }}
           />
         </View>
         <ChContainer style={styles.pagePadding}>
@@ -224,10 +229,40 @@ const MultiCheckoutUI = (props: any) => {
               handleSelectPaymethod={handleSelectPaymethod}
               handleSelectWallet={handleSelectWallet}
               handlePaymethodDataChange={handlePaymethodDataChange}
+              cartUuid={cartUuid}
             />
             <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>
@@ -241,20 +276,46 @@ const MultiCheckoutUI = (props: any) => {
                     cart={cart}
                     cartuuid={cart.uuid}
                     isMultiCheckout
+                    hideDeliveryFee={configs?.multi_business_checkout_show_combined_delivery_fee?.value === '1'}
+                    hideDriverTip={configs?.multi_business_checkout_show_combined_driver_tip?.value === '1'}
                     onNavigationRedirect={(route: string, params: any) => props.navigation.navigate(route, params)}
                   />
                   <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginTop: 13, marginHorizontal: -40 }} />
                 </React.Fragment>
               ))}
-              {openCarts.length === 0 && (
+              {!cartGroup?.loading && openCarts.length === 0 && (
                 <CCNotCarts>
                   <OText size={24} style={{ textAlign: 'center' }}>
                     {t('CARTS_NOT_FOUND', 'You don\'t have carts available')}
                   </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>
+                  {totalCartsFee && configs?.multi_business_checkout_show_combined_delivery_fee?.value === '1' && (
+                    <View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
+                      <OText size={14} lineHeight={24} color={theme.colors.textNormal} weight={'400'}>
+                        {t('TOTAL_DELIVERY_FEE', 'Total delivery fee')}
+                      </OText>
+                      <OText size={14} lineHeight={24} color={theme.colors.textNormal} weight={'400'}>{parsePrice(totalCartsFee)}</OText>
+                    </View>
+                  )}
+                  {openCarts.reduce((sum: any, cart: any) => sum + cart?.driver_tip, 0) > 0 &&
+                    configs?.multi_business_checkout_show_combined_driver_tip?.value === '1' && (
+                    <View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
+                      <OText size={14} lineHeight={24} color={theme.colors.textNormal} weight={'400'}>
+                        {t('DRIVER_TIP', 'Driver tip')}
+                      </OText>
+                      <OText size={14} lineHeight={24} color={theme.colors.textNormal} weight={'400'}>
+                        {parsePrice(openCarts.reduce((sum: any, cart: any) => sum + cart?.driver_tip, 0))}
+                      </OText>
+                    </View>
+                  )}
                   <View style={{ flexDirection: 'row', justifyContent: 'space-between' }}>
                     <OText size={16} lineHeight={24} color={theme.colors.textNormal} weight={'500'}>
                       {t('TOTAL_FOR_ALL_CARTS', 'Total for all Carts')}
@@ -266,23 +327,18 @@ const MultiCheckoutUI = (props: any) => {
                   </OText>
                 </ChCartsTotal>
               )}
-              {openCarts.length > maximumCarts && (
-                <OText size={14} color={theme.colors.danger5} style={{ marginVertical: 20 }}>
-                  {t('WARNING_MAXIMUM_CARTS', 'You can only pay for a maximum of 5 carts, please discard one or more to continue.')}
-                </OText>
-              )}
             </ChCarts>
           </ChSection>
         </ChContainer>
       </Container>
-      
+
       <FloatingButton
-				handleClick={() => handlePlaceOrder()}
+        handleClick={() => handlePlaceOrder()}
         isSecondaryBtn={isDisablePlaceOrderButton}
         disabled={isDisablePlaceOrderButton}
         btnText={placing ? t('PLACING', 'Placing') : t('PLACE_ORDER', 'Place Order')}
         btnRightValueShow
-				btnRightValue={parsePrice(totalCartsPrice)}
+        btnRightValue={parsePrice(totalCartsPrice)}
         iosBottom={30}
       />
     </>
@@ -290,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/SingleOrderCard.tsx

@@ -3,6 +3,7 @@ import {
   useLanguage,
   useEvent,
   useUtils,
+  useConfig,
   OrderDetails as OrderDetailsController
 } from 'ordering-components/native'
 import { View, StyleSheet, TouchableOpacity, Linking } from 'react-native'
@@ -15,6 +16,7 @@ import {
   StaturBar,
   Icons
 } from './styles'
+import { getOrderStatus } from '../../utils'
 
 const SingleOrderCardUI = (props: any) => {
   const {
@@ -23,13 +25,17 @@ const SingleOrderCardUI = (props: any) => {
     readMessages,
     messages,
     setMessages,
-    handleGoToOrderDetails
+    handleGoToOrderDetails,
+    showProgressBar
   } = props
 
   const { order } = props.order
   const theme = useTheme()
   const [, t] = useLanguage()
   const [{ parseDate, parsePrice }] = useUtils()
+  const [{ configs }] = useConfig()
+
+  const hideIndividualButton = configs.multi_business_checkout_remove_individual_buttons?.value === '1'
 
   const styles = StyleSheet.create({
     statusBar: {
@@ -37,205 +43,6 @@ const SingleOrderCardUI = (props: any) => {
     }
   })
 
-  const getOrderStatus = (s: string) => {
-    const status = parseInt(s);
-    const orderStatus = [
-      {
-        key: 0,
-        value: t('PENDING', 'Pending'),
-        slug: 'PENDING',
-        percentage: 0.25,
-        image: theme.images.order.status0,
-      },
-      {
-        key: 1,
-        value: t('COMPLETED', 'Completed'),
-        slug: 'COMPLETED',
-        percentage: 1,
-        image: theme.images.order.status1,
-      },
-      {
-        key: 2,
-        value: t('REJECTED', 'Rejected'),
-        slug: 'REJECTED',
-        percentage: 0,
-        image: theme.images.order.status2,
-      },
-      {
-        key: 3,
-        value: t('DRIVER_IN_BUSINESS', 'Driver in business'),
-        slug: 'DRIVER_IN_BUSINESS',
-        percentage: 0.6,
-        image: theme.images.order.status3,
-      },
-      {
-        key: 4,
-        value: t('PREPARATION_COMPLETED', 'Preparation Completed'),
-        slug: 'PREPARATION_COMPLETED',
-        percentage: 0.7,
-        image: theme.images.order.status4,
-      },
-      {
-        key: 5,
-        value: t('REJECTED_BY_BUSINESS', 'Rejected by business'),
-        slug: 'REJECTED_BY_BUSINESS',
-        percentage: 0,
-        image: theme.images.order.status5,
-      },
-      {
-        key: 6,
-        value: t('REJECTED_BY_DRIVER', 'Rejected by Driver'),
-        slug: 'REJECTED_BY_DRIVER',
-        percentage: 0,
-        image: theme.images.order.status6,
-      },
-      {
-        key: 7,
-        value: t('ACCEPTED_BY_BUSINESS', 'Accepted by business'),
-        slug: 'ACCEPTED_BY_BUSINESS',
-        percentage: 0.35,
-        image: theme.images.order.status7,
-      },
-      {
-        key: 8,
-        value: t('ACCEPTED_BY_DRIVER', 'Accepted by driver'),
-        slug: 'ACCEPTED_BY_DRIVER',
-        percentage: 0.45,
-        image: theme.images.order.status8,
-      },
-      {
-        key: 9,
-        value: t('PICK_UP_COMPLETED_BY_DRIVER', 'Pick up completed by driver'),
-        slug: 'PICK_UP_COMPLETED_BY_DRIVER',
-        percentage: 0.8,
-        image: theme.images.order.status9,
-      },
-      {
-        key: 10,
-        value: t('PICK_UP_FAILED_BY_DRIVER', 'Pick up Failed by driver'),
-        slug: 'PICK_UP_FAILED_BY_DRIVER',
-        percentage: 0,
-        image: theme.images.order.status10,
-      },
-      {
-        key: 11,
-        value: t(
-          'DELIVERY_COMPLETED_BY_DRIVER',
-          'Delivery completed by driver',
-        ),
-        slug: 'DELIVERY_COMPLETED_BY_DRIVER',
-        percentage: 1,
-        image: theme.images.order.status11,
-      },
-      {
-        key: 12,
-        value: t('DELIVERY_FAILED_BY_DRIVER', 'Delivery Failed by driver'),
-        slug: 'DELIVERY_FAILED_BY_DRIVER',
-        percentage: 0,
-        image: theme.images.order.status12,
-      },
-      {
-        key: 13,
-        value: t('PREORDER', 'PreOrder'),
-        slug: 'PREORDER',
-        percentage: 0,
-        image: theme.images.order.status13,
-      },
-      {
-        key: 14,
-        value: t('ORDER_NOT_READY', 'Order not ready'),
-        slug: 'ORDER_NOT_READY',
-        percentage: 0,
-        image: theme.images.order.status13,
-      },
-      {
-        key: 15,
-        value: t(
-          'ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER',
-          'Order picked up completed by customer',
-        ),
-        slug: 'ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER',
-        percentage: 100,
-        image: theme.images.order.status1,
-      },
-      {
-        key: 16,
-        value: t('CANCELLED_BY_CUSTOMER', 'Cancelled by customer'),
-        slug: 'CANCELLED_BY_CUSTOMER',
-        percentage: 0,
-        image: theme.images.order.status2,
-      },
-      {
-        key: 17,
-        value: t(
-          'ORDER_NOT_PICKEDUP_BY_CUSTOMER',
-          'Order not picked up by customer',
-        ),
-        slug: 'ORDER_NOT_PICKEDUP_BY_CUSTOMER',
-        percentage: 0,
-        image: theme.images.order.status2,
-      },
-      {
-        key: 18,
-        value: t(
-          'DRIVER_ALMOST_ARRIVED_TO_BUSINESS',
-          'Driver almost arrived to business',
-        ),
-        slug: 'DRIVER_ALMOST_ARRIVED_TO_BUSINESS',
-        percentage: 0.15,
-        image: theme.images.order.status3,
-      },
-      {
-        key: 19,
-        value: t(
-          'DRIVER_ALMOST_ARRIVED_TO_CUSTOMER',
-          'Driver almost arrived to customer',
-        ),
-        slug: 'DRIVER_ALMOST_ARRIVED_TO_CUSTOMER',
-        percentage: 0.9,
-        image: theme.images.order.status11,
-      },
-      {
-        key: 20,
-        value: t(
-          'ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS',
-          'Customer almost arrived to business',
-        ),
-        slug: 'ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS',
-        percentage: 90,
-        image: theme.images.order.status7,
-      },
-      {
-        key: 21,
-        value: t(
-          'ORDER_CUSTOMER_ARRIVED_BUSINESS',
-          'Customer arrived to business',
-        ),
-        slug: 'ORDER_CUSTOMER_ARRIVED_BUSINESS',
-        percentage: 95,
-        image: theme.images.order.status7,
-      },
-      {
-        key: 22,
-        value: t('ORDER_LOOKING_FOR_DRIVER', 'Looking for driver'),
-        slug: 'ORDER_LOOKING_FOR_DRIVER',
-        percentage: 35,
-        image: theme.images.order.status8
-      },
-      {
-        key: 23,
-        value: t('ORDER_DRIVER_ON_WAY', 'Driver on way'),
-        slug: 'ORDER_DRIVER_ON_WAY',
-        percentage: 45,
-        image: theme.images.order.status8
-      }
-    ];
-
-    const objectStatus = orderStatus.find((o) => o.key === status);
-
-    return objectStatus && objectStatus;
-  };
-
   const handleGoToMessages = (type: string) => {
     readMessages && readMessages();
     navigation.navigate(
@@ -275,14 +82,16 @@ const SingleOrderCardUI = (props: any) => {
             </View>
           </View>
         </View>
-        <OButton
-          onClick={() => handleGoToOrderDetails(order?.uuid)}
-          textStyle={{ color: theme.colors.primary, textAlign: 'center', fontSize: 14 }}
-          style={{ flexDirection: 'row', justifyContent: 'center', borderRadius: 7.6, shadowOpacity: 0, paddingLeft: 5, paddingRight: 5, height: 44 }}
-          text={t('ORDER_DETAILS', 'Order Details')}
-          bgColor={theme.colors.white}
-          borderColor={theme.colors.primary}
-        />
+        {!hideIndividualButton && (
+          <OButton
+            onClick={() => handleGoToOrderDetails(order?.uuid)}
+            textStyle={{ color: theme.colors.primary, textAlign: 'center', fontSize: 14 }}
+            style={{ flexDirection: 'row', justifyContent: 'center', borderRadius: 7.6, shadowOpacity: 0, paddingLeft: 5, paddingRight: 5, height: 44 }}
+            text={t('ORDER_DETAILS', 'Order Details')}
+            bgColor={theme.colors.white}
+            borderColor={theme.colors.primary}
+          />
+        )}
       </View>
       <OText size={16} lineHeight={24} mBottom={17} weight={'500'} color={theme.colors.textNormal}>
         {t('FROM', 'From')}
@@ -324,25 +133,29 @@ const SingleOrderCardUI = (props: any) => {
         <OText size={12} lineHeight={18} color={theme.colors.textNormal}>
           {order?.business?.cellphone}
         </OText>
-      )}      
+      )}
       <OText size={12} lineHeight={18} color={theme.colors.textNormal}>
         {order?.business?.address}
       </OText>
-      <StaturBar>
-        <LinearGradient
-          start={{ x: 0.0, y: 0.0 }}
-          end={{
-            x: getOrderStatus(order?.status)?.percentage || 0,
-            y: 0,
-          }}
-          locations={[0.9999, 0.9999]}
-          colors={[theme.colors.primary, theme.colors.backgroundGray100]}
-          style={styles.statusBar}
-        />
-      </StaturBar>
-      <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
-        {getOrderStatus(order?.status)?.value}
-      </OText>
+      {showProgressBar && (
+        <>
+          <StaturBar>
+            <LinearGradient
+              start={{ x: 0.0, y: 0.0 }}
+              end={{
+                x: getOrderStatus(order?.status)?.percentage || 0,
+                y: 0,
+              }}
+              locations={[0.9999, 0.9999]}
+              colors={[theme.colors.primary, theme.colors.backgroundGray100]}
+              style={styles.statusBar}
+            />
+          </StaturBar>
+          <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
+            {getOrderStatus(order?.status)?.value}
+          </OText>
+        </>
+      )}
       <View style={{ flexDirection: 'row', justifyContent: 'flex-end', marginTop: 20 }}>
         <OText size={16} lineHeight={24} weight={'600'} color={theme.colors.textNormal}>
           {t('EXPORT_ORDER_TOTAL', 'Order total')}: {parsePrice(order?.summary?.total ?? order?.total)}