ordering-ui-react-native 0.18.40-test → 0.18.41

package/package.json

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

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

@@ -1,4 +1,4 @@
-import React, { useContext, useState } from 'react';
+import React, { useState } from 'react';
 import { OText, OIconButton } from '../shared';
 import { StyleSheet, View, Platform, Alert } from 'react-native';
 import {
@@ -23,11 +23,7 @@ import { useTheme } from 'styled-components/native';
 
 import { ProductItemAccordion } from '../ProductItemAccordion';
 
-export const OrderSummary = ({ order, navigation, orderStatus, permissions,
-  askBluetoothPermission,
-  getPermissions,
-  isGrantedPermissions,
-  checkBluetoothPermission }: any) => {
+export const OrderSummary = ({ order, navigation, orderStatus, askBluetoothPermission, getPermissions, isGrantedPermissions, checkBluetoothPermission }: any) => {
   const handleArrowBack: any = () => {
     navigation?.canGoBack() && navigation.goBack();
   };
@@ -377,8 +373,8 @@ export const OrderSummary = ({ order, navigation, orderStatus, permissions,
 
             <OText style={{ marginBottom: 5 }}>
               {`${t('DELIVERY_DATE', 'Delivery Date')}: ${order?.delivery_datetime_utc
-                ? parseDate(order?.delivery_datetime_utc)
-                : parseDate(order?.delivery_datetime, { utc: false })
+                  ? parseDate(order?.delivery_datetime_utc)
+                  : parseDate(order?.delivery_datetime, { utc: false })
                 }`}
             </OText>
 

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

@@ -187,7 +187,7 @@ export const AnalyticsSegment = (props: any) => {
     segmentClient.track('Coupon Denied', {
       business_id: coupon.business_id,
       coupon: coupon.coupon,
-      user_id: coupon.user.id,
+      user_id: coupon?.user_id,
       reason: typeof coupon.reason === 'string' ? t(coupon.reason) : t(coupon.reason[0])
     })
   }

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

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react'
-import { useLanguage, BusinessSearchList, useOrder, useUtils, showToast, ToastType } from 'ordering-components/native'
+import { useLanguage, BusinessSearchList, useOrder, useUtils, useEvent, showToast, ToastType } from 'ordering-components/native'
 import { ScrollView, StyleSheet, TouchableOpacity, View, Dimensions } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { useTheme } from 'styled-components/native'
@@ -54,6 +54,7 @@ export const BusinessListingSearchUI = (props: BusinessSearchParams) => {
   const screenWidth = Dimensions.get('window').width;
   const theme = useTheme()
   const [orderState] = useOrder()
+  const [events] = useEvent()
   const { top } = useSafeAreaInsets();
   const [, t] = useLanguage()
   const [{ parsePrice, parseDistance, optimizeImage }] = useUtils();
@@ -225,6 +226,13 @@ export const BusinessListingSearchUI = (props: BusinessSearchParams) => {
     }
   };
 
+  const onChangeTermValue = (query: any) => {
+    handleChangeTermValue(query)
+    if (query) {
+      events.emit('products_searched', query)
+    }
+  }
+
   useEffect(() => {
     if (filters.business_types?.length === 0 && filters.orderBy === 'default' && Object.keys(filters)?.length === 2 && !openFilters) {
       handleSearchbusinessAndProducts(true)
@@ -287,7 +295,7 @@ export const BusinessListingSearchUI = (props: BusinessSearchParams) => {
             {...(isChewLayout && { height: 55 })}
             inputStyle={{ ...styles.searchInput }}
             placeholder={t('SEARCH_BUSINESSES', 'Search Businesses')}
-            onSearch={(val: string) => handleChangeTermValue(val)}
+            onSearch={(val: string) => onChangeTermValue(val)}
             value={termValue}
           />
         </SearchWrapper>

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

@@ -261,7 +261,7 @@ const CheckoutUI = (props: any) => {
 	const checkValidationFields = () => {
 		setUserErrors([])
 		const errors = []
-		const notFields = ['coupon', 'driver_tip', 'mobile_phone', 'address', 'zipcode', 'address_notes']
+		const notFields = ['coupon', 'driver_tip', 'mobile_phone', 'address', 'zipcode', 'address_notes', 'comments']
 		const _requiredFields: any = []
 
 		Object.values(validationFields?.fields?.checkout).map((field: any) => {

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

@@ -454,7 +454,7 @@ export const MultiCheckout = (props: any) => {
     handleOnRedirectCheckout: (cartUuid: string) => {
       props.navigation.navigate('CheckoutNavigator', {
         screen: 'CheckoutPage',
-        cartUuid: cartUuid
+        cartUuid
       })
     }
   }

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

@@ -18,7 +18,7 @@ import {
 } from "rn-placeholder";
 
 import { View, ScrollView } from 'react-native'
-import { getOrderStatus } from '../../utils'
+import { getOrderStatus, flatArray } from '../../utils'
 
 const OrdersOptionUI = (props: OrdersOptionParams) => {
 	const {
@@ -121,6 +121,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 	}
 
 	useEffect(() => {
+		if (reorderState?.loading) return
 		const _businessId = 'businessId:' + reorderState?.result?.business_id
 		if (reorderState?.error) {
 			if (reorderState?.result?.business_id) {
@@ -128,21 +129,39 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 				navigation.navigate('Business', { store: reorderState?.result?.business?.slug })
 			}
 		}
-		if (!reorderState?.error && reorderState.loading === false && reorderState?.result?.business_id) {
+		if (!reorderState?.error && !reorderState.loading && reorderState?.result?.business_id) {
 			const cartProducts = carts?.[_businessId]?.products
-			const available = cartProducts.every((product: any) => product.valid === true)
-			const orderProducts = orders.find((order: any) => order?.id === reorderState?.result?.orderId)?.products
 
-			if (available && reorderState?.result?.uuid && (cartProducts?.length === orderProducts?.length)) {
-				onNavigationRedirect && onNavigationRedirect('CheckoutNavigator', { cartUuid: reorderState?.result.uuid })
+			const available = cartProducts.every((product: any) => product.valid)
+			const orderProducts = orders.find(
+				(order: any) => Array.isArray(order?.id)
+					? order?.id?.includes(reorderState?.result?.orderId)
+					: order?.id === reorderState?.result?.orderId
+			)?.products
+
+			const productsFlatten = orderProducts?.length && flatArray(orderProducts)?.filter(product => product?.order_id === reorderState?.result?.orderId)
+
+			if (available && reorderState?.result?.uuid && (cartProducts?.length === productsFlatten?.length)) {
+				const multiOrders = flatArray(orderProducts)?.map(product => product.order_id)
+				const params = multiOrders?.length > 1
+					? { screen: 'MultiCheckout', checkCarts: true }
+					: { cartUuid: reorderState?.result.uuid }
+
+				onNavigationRedirect && onNavigationRedirect('CheckoutNavigator', params)
 			} else {
 				_setStoreData('adjust-cart-products', JSON.stringify(_businessId))
-				cartProducts?.length !== orderProducts?.length && _setStoreData('already-removed', JSON.stringify('removed'))
+				cartProducts?.length !== productsFlatten?.length && _setStoreData('already-removed', JSON.stringify('removed'))
 				navigation.navigate('Business', { store: reorderState?.result?.business?.slug })
 			}
 		}
 	}, [reorderState])
 
+	useEffect(() => {
+		if (reorderState?.error) {
+			showToast(ToastType.Error, reorderState?.result)
+		}
+	}, [reorderState])
+
 	useFocusEffect(
 		React.useCallback(() => {
 			if (!businessesSearchList) {

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

@@ -47,7 +47,7 @@ const SingleOrderCardUI = (props: SingleOrderCardParams) => {
   const theme = useTheme();
   const isFocused = useIsFocused();
 
-  const [reorderSelected, setReorderSelected] = useState<number | null>(null);
+  let [reorderSelected, setReorderSelected] = useState<number | null>(null);
   const [confirm, setConfirm] = useState<any>({ open: false, content: null, handleOnAccept: null, id: null, title: null })
   const [isPressed, setIsPressed] = useState(false)
 
@@ -130,19 +130,29 @@ const SingleOrderCardUI = (props: SingleOrderCardParams) => {
   });
 
   const handleReorderClick = (order: any) => {
-    if (carts[`businessId:${order?.business_id}`] && carts[`businessId:${order?.business_id}`]?.products?.length > 0) {
+    setReorderSelected(null)
+    reorderSelected = null
+    const isMultiOrders = Array.isArray(order?.id)
+
+    const isRemoveCart = isMultiOrders
+      ? order?.business_id?.some((businessId: any) => !!carts[`businessId:${businessId}`]?.uuid)
+      : carts[`businessId:${order?.business_id}`] && !!carts[`businessId:${order?.business_id}`]?.uuid
+
+    if (isRemoveCart) {
       setConfirm({
         open: true,
         content: [t('QUESTION_DELETE_PRODUCTS_FROM_CART', 'Are you sure that you want to delete all products from cart?')],
         title: t('ORDER', 'Order'),
         handleOnAccept: async () => {
-          handleRemoveCart()
+          handleRemoveCart(order)
           setConfirm({ ...confirm, open: false })
         }
       })
     } else {
-      setReorderSelected(order?.id);
-      handleReorder && handleReorder(order?.id);
+      const orderId = Array.isArray(order?.id) ? order?.id[0] : order?.id
+      setReorderSelected(orderId)
+      reorderSelected = orderId
+      handleReorder && handleReorder(order?.id)
     }
   };
 
@@ -286,7 +296,7 @@ const SingleOrderCardUI = (props: SingleOrderCardParams) => {
                         </OText>
                       </TouchableOpacity>
                     )}
-                  {order.cart && !hideReorderButton && (
+                  {!hideReorderButton && order?.id === 'number' && (
                     <OButton
                       text={t('REORDER', 'Reorder')}
                       imgRightSrc={''}

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

@@ -751,7 +751,7 @@ export interface SingleOrderCardParams {
 	pastOrders: any,
 	isMessageView?: any,
 	handleClickOrder: (value: any) => {},
-	handleRemoveCart: () => {},
+	handleRemoveCart: (value: any) => {},
 	cartState: any
 }