ordering-ui-react-native 0.17.71 → 0.17.72

package/package.json

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

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

@@ -66,6 +66,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 		getNextProducts,
 		handleUpdateProducts,
 		professionalSelected,
+		handleUpdateProfessionals,
 		handleChangeProfessionalSelected,
 		onBusinessClick
 	} = props
@@ -570,6 +571,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 					professionalList={business?.professionals}
 					professionalSelected={professionalSelected}
 					handleChangeProfessional={handleChangeProfessionalSelected}
+					handleUpdateProfessionals={handleUpdateProfessionals}
 					onSave={() => setOpenService(false)}
 					onClose={() => setOpenService(false)}
 				/>

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

@@ -452,7 +452,7 @@ const CheckoutUI = (props: any) => {
 														<OText
 															size={14}
 														>
-															{deliveryOptions.find((option: any) => option.value === deliveryOptionSelected).label}
+															{deliveryOptions.find((option: any) => option.value === deliveryOptionSelected)?.label}
 														</OText>
 														<MaterialIcons name='keyboard-arrow-down' style={styles.icon} />
 													</DeliveryOptionItem>

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

@@ -84,16 +84,15 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 					review: orderCompleted.review && currentOrder.review,
 					user_review: orderCompleted.user_review && currentOrder.user_review,
 					products: [orderCompleted.products, currentOrder.products].flat()
-				}))
+				})).filter((order: any) => {
+					const isDuplicate = uniqueOrders.includes(order?.cart_group_id)
+					if (!isDuplicate) {
+						uniqueOrders.push(order?.cart_group_id)
+						return true
+					}
+					return false
+				})
 			: order)
-			.filter((order: any) => {
-				const isDuplicate = uniqueOrders.includes(order?.cart_group_id)
-				if (!isDuplicate) {
-					uniqueOrders.push(order?.cart_group_id)
-					return true
-				}
-				return false
-			})
 		setOrders(orders)
 	}, [JSON.stringify(_orders)])
 

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

@@ -111,9 +111,15 @@ const ServiceFormUI = (props: ServiceFormParams) => {
 
   const isBusyTime = (professional: any) => {
     if (professional?.busy_times?.length === 0 || !dateSelected) return false
-    const valid = professional?.busy_times.some((item: any) => {
-      return moment(item?.start).valueOf() <= moment(dateSelected).valueOf() &&
-        moment(dateSelected).valueOf() <= moment(item?.end).valueOf()
+    const duration = product?.duration ?? 0
+    const busyTimes = isCartProduct
+      ? professional?.busy_times.filter((item: any) => !(item.start === productCart?.calendar_event?.start && item.end === productCart?.calendar_event?.end))
+      : [...professional?.busy_times]
+    const valid = busyTimes.some((item: any) => {
+      return (moment.utc(item?.start).local().valueOf() <= moment(dateSelected).valueOf() &&
+        moment(dateSelected).valueOf() <= moment.utc(item?.end).local().valueOf()) ||
+        (moment.utc(item?.start).local().valueOf() <= moment(dateSelected).add(duration, 'minutes').valueOf() &&
+        moment(dateSelected).add(duration, 'minutes').valueOf() <= moment.utc(item?.end).local().valueOf())
     })
     return valid
   }
@@ -523,7 +529,7 @@ const ServiceFormUI = (props: ServiceFormParams) => {
                       ? t('SOLD_OUT', 'Sold out')
                       : t('BOOK', 'Book'))}
                   style={styles.buttonStyle}
-                  isDisabled={isSoldOut || maxProductQuantity <= 0 || !currentProfessional?.id || !dateSelected}
+                  isDisabled={isSoldOut || maxProductQuantity <= 0 || !currentProfessional?.id || !dateSelected || isBusyTime(currentProfessional)}
                   textStyle={{ fontSize: 14, color: theme.colors.white }}
                 />
               )}

package/themes/original/src/types/index.tsx

@@ -249,6 +249,7 @@ export interface BusinessProductsListingParams {
 	handleUpdateProducts?: any;
 	professionalSelected?: any;
 	handleChangeProfessionalSelected?: any;
+	handleUpdateProfessionals?: any;
 	onBusinessClick?: any;
 }
 export interface BusinessBasicInformationParams {