ordering-ui-react-native 0.22.75 → 0.22.76-release

package/themes/original/src/components/MomentOption/TimeListItem.tsx

@@ -0,0 +1,56 @@
+import React from 'react'
+import { Pressable } from 'react-native'
+import {
+    TimeItem,
+} from './styles'
+import { OIcon, OText } from '../shared'
+import { useTheme } from 'styled-components/native'
+
+const timeListItemPropsAreEqual = (prevProps: any, nextProps: any) => {
+    return JSON.stringify(prevProps.time) === JSON.stringify(nextProps.time) && 
+    JSON.stringify(prevProps.selectedTime) === JSON.stringify(nextProps.selectedTime) &&
+    JSON.stringify(prevProps.cateringPreorder) === JSON.stringify(nextProps.cateringPreorder)
+}
+export const TimeListItem = React.memo((props : any) => {
+    const {
+        time,
+        selectedTime,
+        handleChangeTimeSelected,
+        cateringPreorder
+    } = props
+    const theme = useTheme()
+
+    return (
+        <Pressable onPress={() => handleChangeTimeSelected(time.value)}>
+            <TimeItem
+                active={selectedTime === time.value}
+                cateringPreorder={cateringPreorder}
+            >
+                {cateringPreorder && (
+                    <>
+                        {selectedTime === time.value ? (
+                            <OIcon
+                                src={theme.images.general.option_checked}
+                                width={18}
+                                style={{ marginEnd: 24, bottom: 2 }}
+                            />
+                        ) : (
+                            <OIcon
+                                src={theme.images.general.option_normal}
+                                width={18}
+                                style={{ marginEnd: 24, bottom: 2 }}
+                            />
+                        )}
+                    </>
+                )}
+                <OText
+                    size={cateringPreorder ? 18 : 16}
+                    color={selectedTime === time.value ? theme.colors.primary : theme.colors.textNormal}
+                    style={{
+                        lineHeight: 24
+                    }}
+                >{time.text} {cateringPreorder && `- ${time.endText}`}</OText>
+            </TimeItem>
+        </Pressable>
+    )
+}, timeListItemPropsAreEqual)

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

@@ -30,6 +30,7 @@ import {
 } from './styles';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { monthsEnum, setLocalMoment } from '../../utils';
+import { TimeListItem } from './TimeListItem';
 
 const MomentOptionUI = (props: MomentOptionParams) => {
 	const {
@@ -161,6 +162,9 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 	const [datesWhitelist, setDateWhitelist] = useState<any>([{ start: null, end: null }])
 	const [selectDate, setSelectedDate] = useState<any>(dateSelected)
 	const [timeList, setTimeList] = useState<any>(hoursList)
+	const [nextTime, setNextTime] = useState(null)
+	const [isEnabled, setIsEnabled] = useState(false)
+
 	const goToBack = () => navigation?.canGoBack() && navigation.goBack();
 
 	const _handleAsap = () => {
@@ -177,6 +181,60 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 		handleChangeTime(time ?? selectedTime);
 	};
 
+	const validateSelectedDate = (curdate: any, menu: any) => {
+		const day = moment(curdate).format('d')
+		setIsEnabled(menu?.schedule?.[day]?.enabled || false)
+	}
+
+	const getTimes = (curdate: any, menu: any) => {
+		validateSelectedDate(curdate, menu)
+		const date = new Date()
+		var dateSeleted = new Date(curdate)
+		var times = []
+		for (var k = 0; k < menu.schedule[dateSeleted.getDay()].lapses.length; k++) {
+			var open = {
+				hour: menu.schedule[dateSeleted.getDay()].lapses[k].open.hour,
+				minute: menu.schedule[dateSeleted.getDay()].lapses[k].open.minute
+			}
+			var close = {
+				hour: menu.schedule[dateSeleted.getDay()].lapses[k].close.hour,
+				minute: menu.schedule[dateSeleted.getDay()].lapses[k].close.minute
+			}
+			for (var i = open.hour; i <= close.hour; i++) {
+				if (date.getDate() !== dateSeleted.getDate() || i >= date.getHours()) {
+					let hour = ''
+					let meridian = ''
+					if (is12hours) {
+						if (i === 0) {
+							hour = '12'
+							meridian = ' ' + t('AM', 'AM')
+						} else if (i > 0 && i < 12) {
+							hour = (i < 10 ? '0' + i : i)
+							meridian = ' ' + t('AM', 'AM')
+						} else if (i === 12) {
+							hour = '12'
+							meridian = ' ' + t('PM', 'PM')
+						} else {
+							hour = ((i - 12 < 10) ? '0' + (i - 12) : `${(i - 12)}`)
+							meridian = ' ' + t('PM', 'PM')
+						}
+					} else {
+						hour = i < 10 ? '0' + i : i
+					}
+					for (let j = (i === open.hour ? open.minute : 0); j <= (i === close.hour ? close.minute : 59); j += 15) {
+						if (i !== date.getHours() || j >= date.getMinutes() || date.getDate() !== dateSeleted.getDate()) {
+							times.push({
+								text: hour + ':' + (j < 10 ? '0' + j : j) + meridian,
+								value: (i < 10 ? '0' + i : i) + ':' + (j < 10 ? '0' + j : j)
+							})
+						}
+					}
+				}
+			}
+		}
+		return times
+	}
+
 	const momento = moment(
 		`${dateSelected} ${timeSelected}`,
 		'YYYY-MM-DD HH:mm',
@@ -256,7 +314,7 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 				setDateWhitelist([{ start: _minDate, end: _maxDate }])
 			}
 		}
-	}, [JSON.stringify(datesList), preorderMinimumDays, preorderMaximumDays, cateringPreorder])
+	}, [JSON.stringify(datesList), preorderMinimumDays, preorderMaximumDays])
 
 	useEffect(() => {
 		if (dateSelected) {
@@ -278,13 +336,21 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 			let _timeLists = []
 			const schedule = business && getActualSchedule()
 			if (!schedule && business) {
+				setTimeList([])
 				return
 			}
 			_timeLists = hoursList
-				.filter(hour => (!business || schedule?.lapses?.some((lapse: any) =>
-					moment(dateSelected + ` ${hour.startTime}`) >= moment(dateSelected + ` ${lapse.open.hour}:${lapse.open.minute}`).add(preorderLeadTime, 'minutes') && moment(dateSelected + ` ${hour.endTime}`) <= moment(dateSelected + ` ${lapse.close.hour}:${lapse.close.minute}`))) &&
-					moment(dateSelected + ` ${hour.startTime}`) < moment(dateSelected + ` ${hour.endTime}`) &&
-					(moment().add(preorderLeadTime, 'minutes') < moment(dateSelected + ` ${hour.startTime}`) || !cateringPreorder))
+				.filter(hour => {
+					return (Object.keys(business || {})?.length === 0 || schedule?.lapses?.some((lapse: any) => {
+						const openHour = lapse.open.hour < 10 ? `0${lapse.open.hour}` : lapse.open.hour
+						const openMinute = lapse.open.minute < 10 ? `0${lapse.open.minute}` : lapse.open.minute
+						const closeHour = lapse.close.hour < 10 ? `0${lapse.close.hour}` : lapse.close.hour
+						const closeMinute = lapse.close.minute < 10 ? `0${lapse.close.minute}` : lapse.close.minute
+						return moment(dateSelected + ` ${hour.startTime}`) >= moment(dateSelected + ` ${openHour}:${openMinute}`).add(preorderLeadTime, 'minutes') && moment(dateSelected + ` ${hour.endTime}`) <= moment(dateSelected + ` ${closeHour}:${closeMinute}`)
+					})) &&
+						(moment(dateSelected + ` ${hour.startTime}`) < moment(dateSelected + ` ${hour.endTime}`)) &&
+						(moment().add(preorderLeadTime, 'minutes') < moment(dateSelected + ` ${hour.startTime}`) || !cateringPreorder)
+				})
 				.map(hour => {
 					return {
 						value: hour.startTime,
@@ -308,25 +374,49 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 				setTimeList(_timeLists)
 			}
 		} else {
-			setTimeList(hoursList.map(hour => {
-				return {
-					value: hour.startTime,
-					text: is12hours ? (
-						hour.startTime.includes('12')
-							? `${hour.startTime}PM`
-							: parseTime(moment(hour.startTime, 'HH:mm'), { outputFormat: 'hh:mma' })
-					) : (
-						parseTime(moment(hour.startTime, 'HH:mm'), { outputFormat: 'HH:mm' })
-					)
-				}
-			}))
+			let _times: any = []
+			if (business) {
+				_times = getTimes(selectDate, business)
+			} else {
+				_times = hoursList.map(hour => {
+					return {
+						value: hour.startTime,
+						text: is12hours ? (
+							hour.startTime.includes('12')
+								? `${hour.startTime}PM`
+								: parseTime(moment(hour.startTime, 'HH:mm'), { outputFormat: 'hh:mma' })
+						) : (
+							parseTime(moment(hour.startTime, 'HH:mm'), { outputFormat: 'HH:mm' })
+						)
+					}
+				})
+				setIsEnabled(true)
+			}
+			setTimeList(_times)
 		}
-	}, [dateSelected, JSON.stringify(hoursList), JSON.stringify(datesWhitelist), cateringPreorder, JSON.stringify(business)])
+	}, [dateSelected, hoursList?.length, JSON.stringify(datesWhitelist), JSON.stringify(business)])
 
 	useEffect(() => {
 		setLocalMoment(moment, t)
 	}, [])
 
+	useEffect(() => {
+		if (preorderMinimumDays === 0 && preorderLeadTime === 0) return
+		const isToday = dateSelected === moment().format('YYYY-MM-DD')
+		if (isCart && isToday && !orderState?.loading && timeList?.length > 0) {
+			setNextTime(timeList?.[0] ?? null)
+		}
+	}, [timeList?.length])
+
+	useEffect(() => {
+		if (nextTime?.value && timeList?.length > 0 && isCart && !orderState?.loading && !(preorderMinimumDays === 0 && preorderLeadTime === 0)) {
+			const notime = timeList?.filter((_: any, i: number) => i !== 0)?.find?.((time: any) => time?.value === timeSelected)
+			if (!notime) {
+				handleChangeTime(nextTime?.value)
+			}
+		}
+	}, [nextTime?.value])
+
 	return (
 		<>
 			<Container
@@ -349,7 +439,7 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 							titleWrapStyle={{ paddingHorizontal: 0 }}
 						/>
 					)}
-					{(preorderMinimumDays === 0 && preorderLeadTime === 0) || !cateringPreorder && (
+					{((preorderMinimumDays === 0 && preorderLeadTime === 0) || !cateringPreorder) && (
 						<WrapSelectOption
 							onPress={() => _handleAsap()}
 							disabled={orderState.loading} style={{ alignItems: 'flex-start' }}>
@@ -402,23 +492,23 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 											style={styles.calendar}
 											calendarHeaderContainerStyle={styles.calendarHeaderContainer}
 											calendarHeaderStyle={styles.calendarHeader}
-											dateNumberStyle={styles.dateNumber}
-											dateNameStyle={styles.dateName}
 											iconContainer={{ flex: 0.1 }}
-											highlightDateNameStyle={styles.highlightDateName}
-											highlightDateNumberStyle={styles.highlightDateNumber}
 											dayContainerStyle={{ height: '100%' }}
 											highlightDateContainerStyle={{ height: '100%' }}
 											calendarHeaderFormat='MMMM, YYYY'
 											iconStyle={{ borderWidth: 1 }}
 											selectedDate={dateSelected}
 											datesWhitelist={datesWhitelist}
+											highlightDateNumberStyle={styles.highlightDateNumber}
+											highlightDateNameStyle={styles.highlightDateName}
 											minDate={moment()}
 											maxDate={cateringPreorder ? moment().add(preorderMaximumDays, 'days') : undefined}
 											disabledDateNameStyle={styles.disabledDateName}
 											disabledDateNumberStyle={styles.disabledDateNumber}
 											disabledDateOpacity={0.6}
-											onDateSelected={(date) => onSelectDate(date)}
+											dateNumberStyle={styles.dateNumber}
+											dateNameStyle={styles.dateName}
+											onDateSelected={(date: any) => onSelectDate(date)}
 											leftSelector={<LeftSelector />}
 											rightSelector={<RightSelector />}
 										/>
@@ -426,44 +516,34 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 								</View>
 							)}
 							<TimeListWrapper nestedScrollEnabled={true} cateringPreorder={cateringPreorder}>
-								<TimeContentWrapper>
-									{timeList.map((time: any, i: number) => (
-										<Pressable key={i} onPress={() => handleChangeTimeSelected(time.value)}>
-											<TimeItem
-												active={selectedTime === time.value}
+								{isEnabled && timeList?.length > 0 ? (
+									<TimeContentWrapper>
+										{timeList.map((time: any, i: number) => (
+											<TimeListItem
+												key={i}
+												time={time}
+												selectedTime={selectedTime}
+												handleChangeTimeSelected={handleChangeTimeSelected}
 												cateringPreorder={cateringPreorder}
-											>
-												{cateringPreorder && (
-													<>
-														{selectedTime === time.value ? (
-															<OIcon
-																src={theme.images.general.option_checked}
-																width={18}
-																style={{ marginEnd: 24, bottom: 2 }}
-															/>
-														) : (
-															<OIcon
-																src={theme.images.general.option_normal}
-																width={18}
-																style={{ marginEnd: 24, bottom: 2 }}
-															/>
-														)}
-													</>
-												)}
-												<OText
-													size={cateringPreorder ? 18 : 16}
-													color={selectedTime === time.value ? theme.colors.primary : theme.colors.textNormal}
-													style={{
-														lineHeight: 24
-													}}
-												>{time.text} {cateringPreorder && `- ${time.endText}`}</OText>
-											</TimeItem>
-										</Pressable>
-									))}
-									{timeList.length % 3 === 2 && (
-										<TimeItem style={{ backgroundColor: 'transparent' }} />
-									)}
-								</TimeContentWrapper>
+											/>
+										))}
+										{timeList.length % 3 === 2 && (
+											<TimeItem style={{ backgroundColor: 'transparent' }} />
+										)}
+									</TimeContentWrapper>
+								) : (
+									<OText
+										size={16}
+										style={{
+											fontWeight: '600',
+											lineHeight: 24,
+											marginBottom: 12,
+											textAlign: 'center'
+										}}
+									>
+										{t('ERROR_ADD_PRODUCT_BUSINESS_CLOSED', 'The business is closed at the moment')}
+									</OText>
+								)}
 							</TimeListWrapper>
 						</OrderTimeWrapper>
 					)}

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

@@ -40,7 +40,7 @@ export const TimeItem = styled.View`
   border-radius: 7.6px;
   justify-content: center;
   align-items: center;
-  margin: 10px 0px;
+  margin: 10px 5px;
   ${({ cateringPreorder }: any) => cateringPreorder && css`
     background: #fff;
     width: 100%;

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

@@ -5,7 +5,8 @@ import { useTheme } from 'styled-components/native'
 import {
   MomentOption as MomentOptionController,
   useConfig,
-  useUtils
+  useUtils,
+  useLanguage
 } from 'ordering-components/native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import IconAntDesign from 'react-native-vector-icons/AntDesign'
@@ -26,6 +27,7 @@ const MomentSelectorUI = (props: any) => {
   const { top } = useSafeAreaInsets()
   const [{ configs }] = useConfig()
   const [{ parseTime }] = useUtils()
+	const [, t] = useLanguage()
 
   const [customizedDateList, setCustomizedDateList] = useState([])
   const [customizedTimeList, setCustomizedTimeList] = useState([])
@@ -130,6 +132,7 @@ const MomentSelectorUI = (props: any) => {
       <View style={styles.selectWrapper}>
         <SelectDropdown
           defaultValue={customizedTimeList?.find((item: any) => item.key === timeSelected)}
+          defaultButtonText={t('SELECT_A_TIME_OPTION', 'Select an option')}
           data={customizedTimeList}
           onSelect={(selectedItem, index) => {
             handleChangeTime(selectedItem.key)
@@ -194,4 +197,4 @@ export const MomentSelector = (props: any) => {
     maxDate: currentDate
   }
   return <MomentOptionController {...businessPreorderProps} />
-}
+}

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

@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useCallback } from 'react'
+import React, { useState, useEffect, useCallback, useMemo } from 'react'
 import {
   useLanguage,
   useConfig,
@@ -70,7 +70,8 @@ const MultiCheckoutUI = (props: any) => {
     walletState,
     onNavigationRedirectReplace,
     merchantId,
-    cartsInvalid
+    cartsInvalid,
+    checkoutFieldsState
   } = props
 
   const theme = useTheme();
@@ -96,11 +97,14 @@ const MultiCheckoutUI = (props: any) => {
   const [{ parsePrice, parseDate }] = useUtils();
   const [{ options, carts, loading }, { confirmCart }] = useOrder();
   const [validationFields] = useValidationFields();
-  const [{ user }, { login }] = useSession()
+  const [{ user, loading: userLoading }, { login }] = useSession()
 
+  const notFields = ['coupon', 'driver_tip', 'mobile_phone', 'address', 'zipcode', 'address_notes', 'comments']
   const configTypes = configs?.order_types_allowed?.value.split('|').map((value: any) => Number(value)) || []
   const isPreOrder = configs?.preorder_status_enabled?.value === '1'
   const isMultiDriverTips = configs?.checkout_multi_business_enabled?.value === '1'
+  const allowDriverTipPickup = configs?.driver_tip_allowed_at_pickup?.value === '1' && options?.type === 2
+  const isGuestCheckoutEnabled = configs?.guest_checkout_enabled?.value === '1'
   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 isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
   const cartsToShow = openCarts?.length > 0 ? openCarts : cartsInvalid
@@ -121,6 +125,7 @@ const MultiCheckoutUI = (props: any) => {
 
   const creditPointGeneralPlan = loyaltyPlansState?.result?.find((loyal: any) => loyal.type === 'credit_point')
   const loyalBusinessAvailable = creditPointGeneralPlan?.businesses?.filter((b: any) => b.accumulates) ?? []
+  const checkoutFields = useMemo(() => checkoutFieldsState?.fields?.filter((field: any) => field.order_type_id === options?.type), [checkoutFieldsState, options])
 
   const accumulationRateBusiness = (businessId: number) => {
     const value = loyalBusinessAvailable?.find((loyal: any) => loyal.business_id === businessId)?.accumulation_rate ?? 0
@@ -159,7 +164,8 @@ const MultiCheckoutUI = (props: any) => {
   const isDisablePlaceOrderButton = cartGroup?.loading || placing || (!(paymethodSelected?.paymethod_id || paymethodSelected?.wallet_id) && cartGroup?.result?.balance > 0) ||
     (paymethodSelected?.paymethod?.gateway === 'stripe' && !paymethodSelected?.paymethod_data) ||
     walletCarts.length > 0
-    || (methodsPay.includes(paymethodSelected?.gateway) && (!methodPaySupported.enabled || methodPaySupported.loading)) || openCarts?.length === 0
+    || (methodsPay.includes(paymethodSelected?.gateway) && (!methodPaySupported.enabled || methodPaySupported.loading)) || openCarts?.length === 0 ||
+    (!isGuestCheckoutEnabled && !!user?.guest_id)
 
   const handleMomentClick = () => {
     if (isPreOrder) {
@@ -169,35 +175,55 @@ const MultiCheckoutUI = (props: any) => {
 
   const checkValidationFields = () => {
     setUserErrors([])
-    const errors = []
-    const notFields = ['coupon', 'driver_tip', 'mobile_phone', 'address', 'zipcode', 'address_notes']
-    const _requiredFields: any = []
-
-    Object.values(validationFields?.fields?.checkout).map((field: any) => {
-      if (field?.required && !notFields.includes(field.code)) {
-        if (!user[field?.code]) {
-          _requiredFields.push(field?.code)
+    const errors: Array<string> = []
+    const userSelected = user
+    const _requiredFields: Array<string> = []
+    Object.values(checkoutFieldsState?.fields).map((field: any) => {
+      if (options?.type === field?.order_type_id &&
+        field?.enabled &&
+        field?.required &&
+        !notFields.includes(field?.validation_field?.code)
+      ) {
+        if (userSelected && !userSelected[field?.validation_field?.code]) {
+          _requiredFields.push(field?.validation_field?.code)
         }
       }
     })
-
+    const mobilePhoneField: any = Object.values(checkoutFieldsState?.fields)?.find((field: any) => field?.order_type_id === options?.type && field?.validation_field?.code === 'mobile_phone')
     if (
-      !user?.cellphone &&
-      ((validationFields?.fields?.checkout?.cellphone?.enabled &&
-        validationFields?.fields?.checkout?.cellphone?.required) ||
+      userSelected &&
+      !userSelected?.cellphone &&
+      ((mobilePhoneField?.enabled &&
+        mobilePhoneField?.required) ||
         configs?.verification_phone_required?.value === '1')
     ) {
       _requiredFields.push('cellphone')
     }
     setRequiredFields(_requiredFields)
 
-    if (phoneUpdate) {
-      errors.push(t('NECESSARY_UPDATE_COUNTRY_PHONE_CODE', 'It is necessary to update your phone number'))
-    }
-
     setUserErrors(errors)
   }
 
+  const checkGuestValidationFields = () => {
+    const userSelected = user
+    const _requiredFields = checkoutFieldsState?.fields
+      .filter((field) => (field?.order_type_id === options?.type) && field?.enabled && field?.required_with_guest &&
+        !notFields.includes(field?.validation_field?.code) &&
+        userSelected && !userSelected[field?.validation_field?.code])
+    const requiredFieldsCode = _requiredFields.map((item) => item?.validation_field?.code)
+    const guestCheckoutCellPhone = checkoutFieldsState?.fields?.find((field) => field.order_type_id === options?.type && field?.validation_field?.code === 'mobile_phone')
+    if (
+      userSelected &&
+      !userSelected?.cellphone &&
+      ((guestCheckoutCellPhone?.enabled &&
+        guestCheckoutCellPhone?.required_with_guest) ||
+        configs?.verification_phone_required?.value === '1')
+    ) {
+      requiredFieldsCode.push('cellphone')
+    }
+    setRequiredFields(requiredFieldsCode)
+  }
+
   const togglePhoneUpdate = (val: boolean) => {
     setPhoneUpdate(val)
   }
@@ -208,7 +234,7 @@ const MultiCheckoutUI = (props: any) => {
       return
     }
 
-    if (!userErrors.length && (!requiredFields?.length || allowedGuest)) {
+    if (!userErrors.length && !requiredFields?.length) {
       handleGroupPlaceOrder && handleGroupPlaceOrder(confirmPayment)
       return
     }
@@ -255,10 +281,13 @@ const MultiCheckoutUI = (props: any) => {
   }
 
   useEffect(() => {
-    if (validationFields && validationFields?.fields?.checkout) {
+    if (checkoutFieldsState?.loading || userLoading) return
+    if (user?.guest_id) {
+      checkGuestValidationFields()
+    } else {
       checkValidationFields()
     }
-  }, [validationFields, user])
+  }, [checkoutFieldsState, user, options?.type])
 
   useEffect(() => {
     if (cartsToShow?.length === 1) {
@@ -402,14 +431,16 @@ const MultiCheckoutUI = (props: any) => {
                     style={{ borderRadius: 7.6, marginTop: 20 }}
                     onClick={() => setOpenModal({ ...openModal, login: true })}
                   />
-                  <OButton
-                    text={t('CONTINUE_AS_GUEST', 'Continue as guest')}
-                    textStyle={{ color: theme.colors.black }}
-                    bgColor={theme.colors.white}
-                    borderColor={theme.colors.black}
-                    style={{ borderRadius: 7.6, marginTop: 20 }}
-                    onClick={() => setAllowedGuest(true)}
-                  />
+                  {isGuestCheckoutEnabled && (
+                    <OButton
+                      text={t('CONTINUE_AS_GUEST', 'Continue as guest')}
+                      textStyle={{ color: theme.colors.black }}
+                      bgColor={theme.colors.white}
+                      borderColor={theme.colors.black}
+                      style={{ borderRadius: 7.6, marginTop: 20 }}
+                      onClick={() => setAllowedGuest(true)}
+                    />
+                  )}
                 </View>
               ) : (
                 <UserDetails
@@ -420,6 +451,9 @@ const MultiCheckoutUI = (props: any) => {
                   isCheckout
                   phoneUpdate={phoneUpdate}
                   togglePhoneUpdate={togglePhoneUpdate}
+                  isOrderTypeValidationField
+                  requiredFields={requiredFields}
+                  checkoutFields={checkoutFields}
                 />
               )}
             </ChUserDetails>
@@ -461,7 +495,7 @@ const MultiCheckoutUI = (props: any) => {
           )}
           {
             isMultiDriverTips &&
-            options?.type === 1 &&
+            (options?.type === 1 || allowDriverTipPickup) &&
             validationFields?.fields?.checkout?.driver_tip?.enabled &&
             openCarts.every((cart: any) => cart.business_id && cart.status !== 2) &&
             driverTipsOptions && driverTipsOptions?.length > 0 &&
@@ -614,6 +648,14 @@ const MultiCheckoutUI = (props: any) => {
               {t('WARNING_INVALID_PRODUCTS_CHECKOUT', 'To continue with your checkout, please remove from your cart the products that are not available.')}
             </OText>
           )}
+          {(!isGuestCheckoutEnabled && !!user?.guest_id) && (
+            <OText
+              color={theme.colors.error}
+              size={12}
+            >
+              {t('LOGIN_SIGN_UP_COMPLETE_ORDER', 'Login/Sign up to complete your order.')}
+            </OText>
+          )}
         </ChContainer>
         <OModal
           open={openModal.signup}
@@ -656,9 +698,12 @@ const MultiCheckoutUI = (props: any) => {
               isEdit
               phoneUpdate={phoneUpdate}
               togglePhoneUpdate={togglePhoneUpdate}
-              requiredFields={requiredFields}
               hideUpdateButton
               handlePlaceOrderAsGuest={handlePlaceOrderAsGuest}
+              isCheckoutPlace
+              isOrderTypeValidationField
+              requiredFields={requiredFields}
+              checkoutFields={checkoutFields}
               onClose={() => {
                 setIsOpen(false)
                 handlePlaceOrder()

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

@@ -143,7 +143,7 @@ const SingleOrderCardUI = (props: any) => {
             <LinearGradient
               start={{ x: 0.0, y: 0.0 }}
               end={{
-                x: getOrderStatus(order?.status)?.percentage || 0,
+                x: getOrderStatus(order?.status, t)?.percentage || 0,
                 y: 0,
               }}
               locations={[0.9999, 0.9999]}
@@ -152,7 +152,7 @@ const SingleOrderCardUI = (props: any) => {
             />
           </StaturBar>
           <OText size={12} lineHeight={18} weight={'400'} color={theme.colors.textNormal}>
-            {getOrderStatus(order?.status)?.value}
+            {getOrderStatus(order?.status, t)?.value}
           </OText>
         </>
       )}

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

@@ -208,7 +208,7 @@ export const MultiOrdersDetailsUI = (props: any) => {
               <LinearGradient
                 start={{ x: 0.0, y: 0.0 }}
                 end={{
-                  x: getOrderStatus(orders[0]?.status)?.percentage || 0,
+                  x: getOrderStatus(orders[0]?.status, t)?.percentage || 0,
                   y: 0,
                 }}
                 locations={[0.9999, 0.9999]}
@@ -218,7 +218,7 @@ export const MultiOrdersDetailsUI = (props: any) => {
             </StaturBar>
           )}
           <OText size={14} lineHeight={18} weight={'400'} color={theme.colors.textNormal} mBottom={10}>
-            {getOrderStatus(orders[0]?.status)?.value}
+            {getOrderStatus(orders[0]?.status, t)?.value}
           </OText>
           {orders.map((order: any) => (
             <Row key={order.id}>

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

@@ -1,3 +1,6 @@
+
+
+
 import * as React from 'react'
 import styled, { useTheme } from 'styled-components/native'
 import { OButton, OIcon, OText } from '../shared'
@@ -130,8 +133,9 @@ NavBar.defaultProps = {
 	textAlign: 'center'
 };
 
-const areEqual = (prevProps: { route?: any; }, nextProps: { route?: any; }) => {
-	return prevProps.route === nextProps.route
+const areEqual = (prevProps: { route?: any, title?: string }, nextProps: { route?: any, title?: string }) => {
+	return prevProps.route === nextProps.route && 
+	JSON.stringify(prevProps.title) === JSON.stringify(nextProps.title)
 	return true
 }