ordering-ui-react-native 0.23.34 → 0.23.36

package/package.json

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

package/themes/business/src/components/OrderDetails/Delivery.tsx

@@ -473,7 +473,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   let isBusinessMarker = false;
   const customerStatusses = [3, 9, 19, 23, 26]
   const businessStatusses = [7, 8, 18]
-  const arrivedCustomerStatusses = [19, 23]
+  const arrivedCustomerStatusses = [9, 19, 23]
   if (businessStatusses?.includes(order?.status)) {
     const markerBusiness = 'Business';
     isBusinessMarker = true;

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

@@ -43,7 +43,8 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
     getActualSchedule,
     isAsap,
     cateringPreorder,
-    preorderLeadTime
+    preorderLeadTime,
+    preorderMaximumDays
   } = props
 
   const theme = useTheme()
@@ -263,14 +264,23 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
     if (cateringPreorder) {
       let _timeLists = []
       const schedule = business && getActualSchedule()
-      if (!schedule && cateringPreorder && Object.keys(business)?.length > 0) {
+      if (!schedule && business) {
+        setTimeList([])
         return
       }
+
       _timeLists = hoursList
-        .filter(hour => ((Object.keys(business || {})?.length === 0) || 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,
@@ -298,7 +308,7 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
       const _times = getTimes(selectDate, selectedMenu)
       setTimeList(_times)
     }
-  }, [selectDate, menu, business, cateringPreorder, hoursList, dateSelected])
+  }, [selectDate, menu, JSON.stringify(datesWhitelist), JSON.stringify(business), cateringPreorder, JSON.stringify(hoursList), dateSelected])
 
   useEffect(() => {
     if (selectedPreorderType === 0 && Object.keys(menu).length > 0) setMenu({})
@@ -314,8 +324,8 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
   }, [dateSelected])
 
   useEffect(() => {
-		setLocalMoment(moment, t)
-	}, [])
+    setLocalMoment(moment, t)
+  }, [])
 
   useFocusEffect(
     React.useCallback(() => {
@@ -441,22 +451,18 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
               {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={selectDate}
                   datesWhitelist={datesWhitelist}
+                  highlightDateNameStyle={styles.highlightDateName}
+                  highlightDateNumberStyle={styles.highlightDateNumber}
+                  minDate={moment()}
+                  maxDate={cateringPreorder ? moment().add(preorderMaximumDays, 'days') : undefined}
                   disabledDateNameStyle={styles.disabledDateName}
                   disabledDateNumberStyle={styles.disabledDateNumber}
+                  dateNumberStyle={styles.dateNumber}
+                  dateNameStyle={styles.dateName}
                   disabledDateOpacity={0.6}
                   onDateSelected={(date) => onSelectDate(date)}
                   leftSelector={<LeftSelector />}
@@ -565,9 +571,10 @@ export const BusinessPreorder = (props: any) => {
 
   const splitCateringValue = (configName: string) =>
     Object.values(props?.business?.configs || {})
-      ?.find(config => config?.key === configName)
+      ?.find((config : any) => config?.key === configName)
       ?.value?.split('|')
-      ?.find(val => val.includes(cateringTypeString || ''))?.split(',')[1]
+      ?.find((val : any) => val.includes(cateringTypeString || ''))?.split(',')[1]
+
   const preorderSlotInterval = parseInt(splitCateringValue('preorder_slot_interval'))
   const preorderLeadTime = parseInt(splitCateringValue('preorder_lead_time'))
   const preorderTimeRange = parseInt(splitCateringValue('preorder_time_range'))

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

@@ -281,13 +281,21 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 			let _timeLists = []
 			const schedule = business && getActualSchedule()
 			if (!schedule && business) {
+				setTimeList([])
 				return
 			}
 			_timeLists = hoursList
-				.filter(hour => (Object.keys(business || {})?.length === 0 || 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,
@@ -324,7 +332,7 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 				}
 			}))
 		}
-	}, [dateSelected, hoursList, JSON.stringify(datesWhitelist), JSON.stringify(business)])
+	}, [dateSelected, hoursList?.length, JSON.stringify(datesWhitelist), JSON.stringify(business)])
 
 	useEffect(() => {
 		setLocalMoment(moment, t)
@@ -340,7 +348,7 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 
 	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)
+			const notime = timeList?.filter((_: any, i: number) => i !== 0)?.find?.((time: any) => time?.value === timeSelected)
 			if (!notime) {
 				handleChangeTime(nextTime?.value)
 			}
@@ -430,7 +438,9 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 											disabledDateNameStyle={styles.disabledDateName}
 											disabledDateNumberStyle={styles.disabledDateNumber}
 											disabledDateOpacity={0.6}
-											onDateSelected={(date : any) => onSelectDate(date)}
+											dateNumberStyle={styles.dateNumber}
+											dateNameStyle={styles.dateName}
+											onDateSelected={(date: any) => onSelectDate(date)}
 											leftSelector={<LeftSelector />}
 											rightSelector={<RightSelector />}
 										/>
@@ -438,20 +448,34 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 								</View>
 							)}
 							<TimeListWrapper nestedScrollEnabled={true} cateringPreorder={cateringPreorder}>
-								<TimeContentWrapper>
-									{timeList.map((time: any, i: number) => (
-										<TimeListItem
-											key={i}
-											time={time}
-											selectedTime={selectedTime}
-											handleChangeTimeSelected={handleChangeTimeSelected}
-											cateringPreorder={cateringPreorder}
-										/>
-									))}
-									{timeList.length % 3 === 2 && (
-										<TimeItem style={{ backgroundColor: 'transparent' }} />
-									)}
-								</TimeContentWrapper>
+								{timeList?.length > 0 ? (
+									<TimeContentWrapper>
+										{timeList.map((time: any, i: number) => (
+											<TimeListItem
+												key={i}
+												time={time}
+												selectedTime={selectedTime}
+												handleChangeTimeSelected={handleChangeTimeSelected}
+												cateringPreorder={cateringPreorder}
+											/>
+										))}
+										{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/MomentSelector/index.tsx

@@ -194,4 +194,4 @@ export const MomentSelector = (props: any) => {
     maxDate: currentDate
   }
   return <MomentOptionController {...businessPreorderProps} />
-}
+}