ordering-ui-react-native 0.24.10 → 0.24.12

package/package.json

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

package/themes/business/src/components/ProductItemAccordion/index.tsx

@@ -72,18 +72,20 @@ export const ProductItemAccordion = (props: ProductItemAccordionParams) => {
   const parseOptions = typeof productInfo().options === 'string' ? JSON.parse(productInfo().options) : productInfo().options
 
   const getProductPrice = (product: any) => {
-    let subOptionPrice = 0;
-    if (product?.options?.length > 0 && product?.options[0]?.suboptions?.length > 0) {
-      for (const option of product?.options) {
-        for (const suboption of option?.suboptions) {
-          subOptionPrice += suboption.quantity * suboption.price;
+    let subOptionPrice = 0
+    if (Array.isArray(product?.options)) {
+      if (product.options?.length > 0) {
+        for (const option of product.options) {
+          for (const suboption of option.suboptions) {
+            subOptionPrice += suboption.quantity * ((['left', 'right'].includes(suboption.position)) ? (suboption.half_price ?? suboption.price) : suboption.price)
+          }
         }
       }
     }
 
-    const price = product.quantity * (product.price + subOptionPrice);
-    return parseFloat(price.toFixed(2));
-  };
+    const price = product.quantity * (product.price + subOptionPrice)
+    return parseFloat(price.toFixed(2))
+  }
 
   const getFormattedSubOptionName = ({ quantity, name, position, price }: any) => {
     if (name !== 'No') {

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

@@ -255,7 +255,7 @@ const CheckoutUI = (props: any) => {
 
 	const handleMomentClick = () => {
 		if (isPreOrder) {
-			navigation.navigate('MomentOption')
+			navigation.navigate('MomentOption', { business: businessDetails?.business })
 		}
 	}
 

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

@@ -163,6 +163,7 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 	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();
 
@@ -180,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',
@@ -319,18 +374,8 @@ 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' })
-					)
-				}
-			}))
+			const _times = getTimes(selectDate, business)
+      		setTimeList(_times)
 		}
 	}, [dateSelected, hoursList?.length, JSON.stringify(datesWhitelist), JSON.stringify(business)])
 
@@ -454,7 +499,7 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 								</View>
 							)}
 							<TimeListWrapper nestedScrollEnabled={true} cateringPreorder={cateringPreorder}>
-								{timeList?.length > 0 ? (
+								{isEnabled && timeList?.length > 0 ? (
 									<TimeContentWrapper>
 										{timeList.map((time: any, i: number) => (
 											<TimeListItem

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/OrderProgress/index.tsx

@@ -114,7 +114,7 @@ const OrderProgressUI = (props: any) => {
     setInitialLoaded(true)
   }, [orderList.loading, initialLoaded])
 
-  const progressBarObjt = (s: any) => lastOrder?.delivery_type && lastOrder?.delivery_type === 2 ? getOrderStatuPickUp(s) : getOrderStatus(s, t)
+  const progressBarObjt = (s: any) => lastOrder?.delivery_type && lastOrder?.delivery_type === 2 ? getOrderStatuPickUp(s, t) : getOrderStatus(s, t)
 
   return (
     <>