ordering-ui-react-native 0.17.76 → 0.17.77-release

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

@@ -16,11 +16,12 @@ import {
 	PlaceholderLine,
 	Fade
 } from "rn-placeholder";
-import { View, BackHandler } from 'react-native'
+import { View, BackHandler, Platform } from 'react-native'
 import {
 	MessageListingWrapper,
 	MessageContainer
 } from './styles';
+import { getOrderStatus } from '../../utils'
 
 const OrdersOptionUI = (props: OrdersOptionParams) => {
 	const {
@@ -51,40 +52,6 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 		: theme.images.general.emptyPastOrders
 	const orders = customArray || values || []
 
-	const getOrderStatus = (s: string) => {
-		const status = parseInt(s)
-		const orderStatus = [
-			{ key: 0, value: t('PENDING', 'Pending') },
-			{ key: 1, value: t('COMPLETED', 'Completed') },
-			{ key: 2, value: t('REJECTED', 'Rejected') },
-			{ key: 3, value: t('DRIVER_IN_BUSINESS', 'Driver in business') },
-			{ key: 4, value: t('PREPARATION_COMPLETED', 'Preparation Completed') },
-			{ key: 5, value: t('REJECTED_BY_BUSINESS', 'Rejected by business') },
-			{ key: 6, value: t('REJECTED_BY_DRIVER', 'Rejected by Driver') },
-			{ key: 7, value: t('ACCEPTED_BY_BUSINESS', 'Accepted by business') },
-			{ key: 8, value: t('ACCEPTED_BY_DRIVER', 'Accepted by driver') },
-			{ key: 9, value: t('PICK_UP_COMPLETED_BY_DRIVER', 'Pick up completed by driver') },
-			{ key: 10, value: t('PICK_UP_FAILED_BY_DRIVER', 'Pick up Failed by driver') },
-			{ key: 11, value: t('DELIVERY_COMPLETED_BY_DRIVER', 'Delivery completed by driver') },
-			{ key: 12, value: t('DELIVERY_FAILED_BY_DRIVER', 'Delivery Failed by driver') },
-			{ key: 13, value: t('PREORDER', 'PreOrder') },
-			{ key: 14, value: t('ORDER_NOT_READY', 'Order not ready') },
-			{ key: 15, value: t('ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER', 'Order picked up completed by customer') },
-			{ key: 16, value: t('CANCELLED_BY_CUSTOMER', 'Cancelled by customer') },
-			{ key: 17, value: t('ORDER_NOT_PICKEDUP_BY_CUSTOMER', 'Order not picked up by customer') },
-			{ key: 18, value: t('DRIVER_ALMOST_ARRIVED_TO_BUSINESS', 'Driver almost arrived to business') },
-			{ key: 19, value: t('DRIVER_ALMOST_ARRIVED_TO_CUSTOMER', 'Driver almost arrived to customer') },
-			{ key: 20, value: t('ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS', 'Customer almost arrived to business') },
-			{ key: 21, value: t('ORDER_CUSTOMER_ARRIVED_BUSINESS', 'Customer arrived to business') },
-			{ key: 22, value: t('ORDER_LOOKING_FOR_DRIVER', 'Looking for driver') },
-      		{ key: 23, value: t('ORDER_DRIVER_ON_WAY', 'Driver on way') }
-		]
-
-		const objectStatus = orderStatus.find((o) => o.key === status)
-
-		return objectStatus && objectStatus
-	}
-
 	const handleClickOrder = (uuid: string) => {
 		setSelectedOrderId(uuid)
 		setOpenMessges(true)
@@ -102,7 +69,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 	}, [orderList, loading])
 
 	useEffect(() => {
-		if(refreshOrders){
+		if (refreshOrders) {
 			loadOrders(false, false, false, true)
 			setRefreshOrders && setRefreshOrders(false)
 		}
@@ -156,7 +123,9 @@ const OrderMessageUI = (props: any) => {
 		setMessages,
 		readMessages,
 		messagesReadList,
-		setOpenMessges
+		setOpenMessges,
+		setSeletedOrder,
+		setSelectedOrderId
 	} = props;
 	const [openModalForBusiness, setOpenModalForBusiness] = useState(false);
 	const [openModalForDriver, setOpenModalForDriver] = useState(false);
@@ -173,6 +142,8 @@ const OrderMessageUI = (props: any) => {
 
 	const handleClose = () => {
 		setOpenMessges(false)
+		setSeletedOrder(null)
+		setSelectedOrderId(null)
 	}
 
 	const handleOpenMessages = (data: any) => {
@@ -225,7 +196,7 @@ const OrderMessageUI = (props: any) => {
 }
 
 export const OrderListing = (props: OrdersOptionParams) => {
-  const [businessState] = useBusiness();
+	const [businessState] = useBusiness();
 	const OrderListingProps = {
 		...props,
 		UIComponent: OrdersOptionUI,
@@ -236,7 +207,7 @@ export const OrderListing = (props: OrdersOptionParams) => {
 			pageSize: 10,
 			controlType: 'infinity'
 		},
-    businessId: businessState?.business?.id,
+		businessId: businessState?.business?.id,
 		profileMessages: true,
 		orderBy: 'last_direct_message_at',
 		orderDirection: 'asc'
@@ -292,7 +263,7 @@ export const MessageListing = (props: MessageListingParams) => {
 				titleAlign={'center'}
 				onActionLeft={goToBack}
 				showCall={false}
-				paddingTop={10}
+				paddingTop={Platform.OS === 'ios' ? 20 : 10}
 				btnStyle={{ paddingLeft: 0 }}
 			/>
 			<OrderListing
@@ -300,9 +271,9 @@ export const MessageListing = (props: MessageListingParams) => {
 				setSelectedOrderId={setSelectedOrderId}
 				setOrderList={setOrderListStatus}
 				setOpenMessges={setOpenMessges}
-        franchiseId={props.franchiseId}
+				franchiseId={props.franchiseId}
 			/>
-			{openMessages && seletedOrder && (
+			{openMessages && !!seletedOrder?.id && (
 				<OModal
 					open={openMessages}
 					entireModal
@@ -311,7 +282,10 @@ export const MessageListing = (props: MessageListingParams) => {
 				>
 					<MessagesView
 						order={seletedOrder}
+						orderId={seletedOrder?.id}
 						setOpenMessges={setOpenMessges}
+						setSeletedOrder={setSeletedOrder}
+						setSelectedOrderId={setSelectedOrderId}
 					/>
 				</OModal>
 			)}

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

@@ -13,6 +13,7 @@ import { Header, TitleHeader, Wrapper, QuickMessageContainer, ProfileMessageHead
 import { MessagesParams } from '../../types'
 import { useWindowDimensions } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
+import { getLogisticTag } from '../../utils'
 
 const ORDER_STATUS: any = {
 	0: 'ORDER_STATUS_PENDING',
@@ -127,7 +128,7 @@ const MessagesUI = (props: MessagesParams) => {
 			?
 			`${t('ORDER', 'Order')} ${t(message.change.attribute.toUpperCase(), message.change.attribute.replace('_', ' '))} ${t('CHANGED_FROM', 'Changed from')} ${filterSpecialStatus.includes(message.change.attribute) ?
 				`${message.change.old === null ? '0' : message.change.old} ${t('TO', 'to')} ${message.change.new} ${t('MINUTES', 'Minutes')}` :
-				`${message.change.old !== null && t(ORDER_STATUS[parseInt(message.change.old, 10)])} ${t('TO', 'to')} ${t(ORDER_STATUS[parseInt(message.change.new, 10)])}`
+				`${message.change?.attribute !== 'logistic_status' ? message.change.old !== null && t(ORDER_STATUS[parseInt(message.change.old, 10)]) : message.change.old !== null && getLogisticTag(message.change.old)} ${t('TO', 'to')} ${message.change?.attribute !== 'logistic_status' ? t(ORDER_STATUS[parseInt(message.change.new, 10)]) : getLogisticTag(message.change.new)}`
 			}`
 			: message.change.new
 				?
@@ -155,9 +156,9 @@ const MessagesUI = (props: MessagesParams) => {
 					image: message.source,
 					system: message.type === 1,
 					user: {
-						_id: message.author.id,
-						name: message.author.name,
-						avatar: message.author.id !== user.id && type === USER_TYPE.DRIVER ? order?.driver?.photo : order?.business?.logo
+						_id: message.author && message.author.id,
+						name: message.author && message.author.name,
+						avatar: message.author && (message.author.id !== user.id && type === USER_TYPE.DRIVER ? order?.driver?.photo : order?.business?.logo)
 					}
 				});
 			}
@@ -170,9 +171,9 @@ const MessagesUI = (props: MessagesParams) => {
 					image: message.source,
 					system: message.type === 1,
 					user: {
-						_id: message.author.id,
-						name: message.author.name,
-						avatar: message.author.id !== user.id && type === USER_TYPE.DRIVER ? order?.driver?.photo : order?.business?.logo
+						_id: message.author && message.author.id,
+						name: message.author && message.author.name,
+						avatar: message.author && (message.author.id !== user.id && type === USER_TYPE.DRIVER ? order?.driver?.photo : order?.business?.logo)
 					}
 				});
 			}
@@ -241,6 +242,7 @@ const MessagesUI = (props: MessagesParams) => {
 
 	const renderAccessory = () => {
 		return (
+			!chatDisabled &&
 			<QuickMessageContainer
 				style={{
 					marginLeft: 10,
@@ -411,6 +413,11 @@ const MessagesUI = (props: MessagesParams) => {
 		);
 	}
 
+	useEffect(() => {
+		if (!order?.id || messages?.loading) return
+		readMessages && readMessages()
+	}, [order?.id, messages?.loading])
+
 	return (
 		<View style={{ height: getViewHeight(), width: '100%', paddingTop: 12, backgroundColor: 'white' }}>
 			<Wrapper>

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

@@ -13,7 +13,8 @@ import IconAntDesign from 'react-native-vector-icons/AntDesign'
 import {
 	StyleSheet,
 	View,
-	TouchableOpacity
+	Platform,
+	Pressable
 } from 'react-native';
 import Spinner from 'react-native-loading-spinner-overlay';
 import { MomentOptionParams } from '../../types';
@@ -37,6 +38,14 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 		hoursList,
 		dateSelected,
 		timeSelected,
+		cateringPreorder,
+		isCart,
+		preorderLeadTime,
+		business,
+		getActualSchedule,
+		preorderMaximumDays,
+		preorderMinimumDays,
+		isPage,
 		handleAsap,
 		handleChangeDate,
 		handleChangeTime,
@@ -146,12 +155,12 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 	});
 	const { bottom } = useSafeAreaInsets();
 
-	const is12hours = configs?.dates_moment_format?.value?.includes('hh:mm')
+	const is12hours = configs?.general_hour_format?.value?.includes('hh:mm')
 
 	const [selectedTime, setSelectedTime] = useState(null);
 	const [datesWhitelist, setDateWhitelist] = useState<any>([{ start: null, end: null }])
-	const [selectDate, setSelectedDate] = useState<any>(null)
-
+	const [selectDate, setSelectedDate] = useState<any>(dateSelected)
+	const [timeList, setTimeList] = useState<any>(hoursList)
 	const goToBack = () => navigation?.canGoBack() && navigation.goBack();
 
 	const _handleAsap = () => {
@@ -163,9 +172,9 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 		}
 	};
 
-	const handleChangeMoment = () => {
+	const handleChangeMoment = (time?: any) => {
 		setMomentState({ isLoading: 1, isEditing: true });
-		handleChangeTime(selectedTime);
+		handleChangeTime(time ?? selectedTime);
 	};
 
 	const momento = moment(
@@ -204,6 +213,14 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 		if (handleChangeDate) handleChangeDate(moment(val).format('YYYY-MM-DD'))
 	}
 
+	const handleChangeTimeSelected = (time: any) => {
+		if (cateringPreorder) {
+			handleChangeMoment(time)
+		} else {
+			setSelectedTime(time)
+		}
+	}
+
 	const LeftSelector = () => {
 		return (
 			<View style={{ height: '100%', justifyContent: 'flex-end' }}>
@@ -230,20 +247,25 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 
 	useEffect(() => {
 		if (datesList?.length > 0) {
-			const _datesList = datesList.slice(0, Number(configs?.max_days_preorder?.value || 6))
-			const minDateParts = _datesList[0].split('-')
-			const maxDateParts = _datesList[_datesList.length - 1].split('-')
-			const _minDate = new Date(minDateParts[0], minDateParts[1] - 1, minDateParts[2])
-			const _maxDate = new Date(maxDateParts[0], maxDateParts[1] - 1, maxDateParts[2])
-			setDateWhitelist([{ start: _minDate, end: _maxDate }])
+			const _datesList = datesList.slice((cateringPreorder && preorderMinimumDays) || 0, Number(cateringPreorder ? preorderMaximumDays || configs?.max_days_preorder?.value : configs?.max_days_preorder?.value ?? 6))
+			if (_datesList?.length > 0) {
+				const minDateParts = _datesList?.[0]?.split('-')
+				const maxDateParts = _datesList[_datesList.length - 1].split('-')
+				const _minDate = new Date(minDateParts[0], minDateParts[1] - 1, minDateParts[2])
+				const _maxDate = new Date(maxDateParts[0], maxDateParts[1] - 1, maxDateParts[2])
+				setDateWhitelist([{ start: _minDate, end: _maxDate }])
+			}
 		}
-	}, [datesList])
+	}, [JSON.stringify(datesList), preorderMinimumDays, preorderMaximumDays, cateringPreorder])
 
 	useEffect(() => {
 		if (dateSelected) {
 			const dateParts = dateSelected.split('-')
 			const _dateSelected = new Date(dateParts[0], dateParts[1] - 1, dateParts[2])
 			setSelectedDate(_dateSelected)
+			if (cateringPreorder) {
+				onSelectDate(_dateSelected)
+			}
 		}
 	}, [dateSelected])
 
@@ -251,41 +273,98 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 		setSelectedTime(timeSelected)
 	}, [timeSelected])
 
+	useEffect(() => {
+		if (cateringPreorder) {
+			let _timeLists = []
+			const schedule = business && getActualSchedule()
+			if (!schedule && business) {
+				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))
+				.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' })
+						),
+						endText: is12hours ? (
+							hour.endTime.includes('12')
+								? `${hour.endTime}PM`
+								: parseTime(moment(hour.endTime, 'HH:mm'), { outputFormat: 'hh:mma' })
+						) : (
+							parseTime(moment(hour.endTime, 'HH:mm'), { outputFormat: 'HH:mm' })
+						)
+					}
+				})
+			if (_timeLists?.length > 0) {
+				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' })
+					)
+				}
+			}))
+		}
+	}, [dateSelected, JSON.stringify(hoursList), JSON.stringify(datesWhitelist), cateringPreorder, JSON.stringify(business)])
+
 	return (
 		<>
 			<Container
 				style={{
-					paddingLeft: 40,
-					paddingRight: 40
-				}}>
-				<View style={{ paddingBottom: 90, paddingRight: 20 }}>
-					<NavBar
-						onActionLeft={() => goToBack()}
-						btnStyle={{ paddingLeft: 0 }}
-						style={{ paddingBottom: 0 }}
-						title={t('QUESTION_WHEN_ORDER', 'When do you want your order?')}
-						titleAlign={'center'}
-						titleStyle={{ fontSize: 20, marginRight: 0, marginLeft: 0 }}
-						titleWrapStyle={{ paddingHorizontal: 0 }}
-					/>
-					<WrapSelectOption
-						onPress={() => _handleAsap()}
-						disabled={orderState.loading} style={{ alignItems: 'flex-start' }}>
-						{optionSelected.isAsap ? (
-							<OIcon
-								src={theme.images.general.option_checked}
-								width={16}
-								style={{ marginEnd: 24 }}
-							/>
-						) : (
-							<OIcon
-								src={theme.images.general.option_normal}
-								width={16}
-								style={{ marginEnd: 24 }}
-							/>
-						)}
-						<OText color={optionSelected.isAsap ? theme.colors.textNormal : theme.colors.disabled}>{t('ASAP_ABBREVIATION', 'ASAP') + ` (${t(moment().format('dddd')?.toLocaleUpperCase(), moment().format('dddd'))}, ${t(monthsEnum[moment().format('MMM')], moment().format('MMM'))}${moment().format(' D, yyyy h:mm A')} + ${t('DELIVERY_TIME', 'delivery time')})`}</OText>
-					</WrapSelectOption>
+					paddingLeft: !cateringPreorder || isPage ? 40 : 0,
+					paddingRight: !cateringPreorder || isPage ? 40 : 0
+				}}
+				nestedScrollEnabled
+			>
+				<View style={{ paddingBottom: cateringPreorder ? 0 : 90, paddingRight: 20 }}>
+					{!isCart && (
+						<NavBar
+							onActionLeft={() => goToBack()}
+							btnStyle={{ paddingLeft: 0 }}
+							style={{ paddingBottom: 0 }}
+							paddingTop={Platform.OS === 'ios' ? 10 : 0}
+							title={t('QUESTION_WHEN_ORDER', 'When do you want your order?')}
+							titleAlign={'center'}
+							titleStyle={{ fontSize: 20, marginRight: 0, marginLeft: 0 }}
+							titleWrapStyle={{ paddingHorizontal: 0 }}
+						/>
+					)}
+					{(preorderMinimumDays === 0 && preorderLeadTime === 0) || !cateringPreorder && (
+						<WrapSelectOption
+							onPress={() => _handleAsap()}
+							disabled={orderState.loading} style={{ alignItems: 'flex-start' }}>
+							{optionSelected.isAsap ? (
+								<OIcon
+									src={theme.images.general.option_checked}
+									width={16}
+									style={{ marginEnd: 24 }}
+								/>
+							) : (
+								<OIcon
+									src={theme.images.general.option_normal}
+									width={16}
+									style={{ marginEnd: 24 }}
+								/>
+							)}
+							<OText color={optionSelected.isAsap ? theme.colors.textNormal : theme.colors.disabled}>{t('ASAP_ABBREVIATION', 'ASAP') + ` (${t(moment().format('dddd')?.toLocaleUpperCase(), moment().format('dddd'))}, ${t(monthsEnum[moment().format('MMM')], moment().format('MMM'))}${moment().format(' D, yyyy h:mm A')} + ${t('DELIVERY_TIME', 'delivery time')})`}</OText>
+						</WrapSelectOption>
+					)}
 					<WrapSelectOption
 						onPress={() => setOptionSelected({ isAsap: false, isSchedule: true })}
 						disabled={orderState.loading}>
@@ -304,58 +383,80 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 						)}
 						<OText color={optionSelected.isSchedule ? theme.colors.textNormal : theme.colors.disabled}>{t('SCHEDULE_FOR_LATER', 'Schedule for later')}</OText>
 					</WrapSelectOption>
-
 					{optionSelected.isSchedule && (
 						<OrderTimeWrapper>
-							<View style={{ flex: 1 }}>
-								{selectDate && datesWhitelist[0]?.start !== null && (
-									<CalendarStrip
-										scrollable
-										locale={locale}
-										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={selectDate}
-										datesWhitelist={datesWhitelist}
-										disabledDateNameStyle={styles.disabledDateName}
-										disabledDateNumberStyle={styles.disabledDateNumber}
-										disabledDateOpacity={0.6}
-										onDateSelected={(date) => onSelectDate(date)}
-										leftSelector={<LeftSelector />}
-										rightSelector={<RightSelector />}
-									/>
-								)}
-							</View>
-							<TimeListWrapper nestedScrollEnabled={true}>
+							{datesWhitelist[0]?.start === datesWhitelist[0]?.end && (
+								<OText>
+									{moment(selectDate).format('Do MMMM, YYYY')}
+								</OText>
+							)}
+							{datesWhitelist[0]?.start !== datesWhitelist[0]?.end && (
+								<View style={{ flex: 1 }}>
+									{selectDate && datesWhitelist[0]?.start !== null && (
+										<CalendarStrip
+											scrollable
+											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}
+											minDate={moment()}
+											maxDate={cateringPreorder ? moment().add(preorderMaximumDays, 'days') : undefined}
+											disabledDateNameStyle={styles.disabledDateName}
+											disabledDateNumberStyle={styles.disabledDateNumber}
+											disabledDateOpacity={0.6}
+											onDateSelected={(date) => onSelectDate(date)}
+											leftSelector={<LeftSelector />}
+											rightSelector={<RightSelector />}
+										/>
+									)}
+								</View>
+							)}
+							<TimeListWrapper nestedScrollEnabled={true} cateringPreorder={cateringPreorder}>
 								<TimeContentWrapper>
-									{hoursList.map((time: any, i: number) => (
-										<TouchableOpacity key={i} onPress={() => setSelectedTime(time.startTime)}>
-											<TimeItem active={selectedTime === time.startTime}>
+									{timeList.map((time: any, i: number) => (
+										<Pressable key={i} 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={14}
-													color={selectedTime === time.startTime ? theme.colors.primary : theme.colors.textNormal}
+													size={cateringPreorder ? 18 : 16}
+													color={selectedTime === time.value ? theme.colors.primary : theme.colors.textNormal}
 													style={{
 														lineHeight: 24
 													}}
-												>{is12hours ? (
-													time.startTime.includes('12')
-														? `${time.startTime}PM`
-														: parseTime(moment(time.startTime, 'HH:mm'), { outputFormat: 'hh:mma' })
-												) : time.startTime
-													}</OText>
+												>{time.text} {cateringPreorder && `- ${time.endText}`}</OText>
 											</TimeItem>
-										</TouchableOpacity>
+										</Pressable>
 									))}
-									{hoursList.length % 3 === 2 && (
+									{timeList.length % 3 === 2 && (
 										<TimeItem style={{ backgroundColor: 'transparent' }} />
 									)}
 								</TimeContentWrapper>
@@ -365,9 +466,11 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 				</View>
 				<Spinner visible={momentState.isLoading === 1} />
 			</Container>
-			<View style={{ position: 'absolute', bottom: bottom, paddingBottom: 20, paddingHorizontal: 40, backgroundColor: 'white', width: '100%' }}>
-				<OButton onClick={handleChangeMoment} isDisabled={!selectedTime} text={t('CONTINUE', 'Continue')} style={{ borderRadius: 7.6, height: 44, shadowOpacity: 0 }} textStyle={{ color: 'white', fontSize: 14 }} showNextIcon />
-			</View>
+			{!isCart && !cateringPreorder && (
+				<View style={{ position: 'absolute', bottom: bottom, paddingBottom: 20, paddingHorizontal: 40, backgroundColor: 'white', width: '100%' }}>
+					<OButton onClick={() => handleChangeMoment()} isDisabled={!selectedTime} text={t('CONTINUE', 'Continue')} style={{ borderRadius: 7.6, height: 44, shadowOpacity: 0 }} textStyle={{ color: 'white', fontSize: 14 }} showNextIcon />
+				</View>
+			)}
 		</>
 	);
 };

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

@@ -30,7 +30,7 @@ const MomentSelectorUI = (props: any) => {
   const [customizedDateList, setCustomizedDateList] = useState([])
   const [customizedTimeList, setCustomizedTimeList] = useState([])
 
-  const is12hours = configs?.dates_moment_format?.value?.includes('hh:mm')
+  const is12hours = configs?.general_hour_format?.value?.includes('hh:mm')
 
   const styles = StyleSheet.create({
     selectOption: {