ordering-ui-react-native 0.16.3 → 0.16.4

package/package.json

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

package/src/components/LoginForm/index.tsx

@@ -92,6 +92,8 @@ const LoginFormUI = (props: LoginParams) => {
 
   const inputRef = useRef<any>({})
 
+  const googleLoginEnabled = configs?.google_login_enabled?.value === '1' || !configs?.google_login_enabled?.enabled
+
   const anySocialButtonActivated = ((configs?.facebook_login?.value === 'true' || configs?.facebook_login?.value === '1') && configs?.facebook_id?.value) ||
     (configs?.google_login_client_id?.value !== '' && configs?.google_login_client_id?.value !== null) ||
     (configs?.apple_login_client_id?.value !== '' && configs?.apple_login_client_id?.value !== null)
@@ -381,7 +383,7 @@ const LoginFormUI = (props: LoginParams) => {
                     handleSuccessFacebookLogin={handleSuccessFacebook}
                   />
                 )}
-                {(configs?.google_login_client_id?.value !== '' && configs?.google_login_client_id?.value !== null) && (
+                {(configs?.google_login_client_id?.value !== '' && configs?.google_login_client_id?.value !== null) && googleLoginEnabled && (
                   <GoogleLogin
                     notificationState={notificationState}
                     webClientId={configs?.google_login_client_id?.value}

package/src/components/SignupForm/index.tsx

@@ -115,6 +115,8 @@ const SignupFormUI = (props: SignupParams) => {
   const phoneRef = useRef<any>(null)
   const passwordRef = useRef<any>(null)
 
+  const googleLoginEnabled = configs?.google_login_enabled?.value === '1' || !configs?.google_login_enabled?.enabled
+
   const anySocialButtonActivated = ((configs?.facebook_login?.value === 'true' || configs?.facebook_login?.value === '1') && configs?.facebook_id?.value) ||
     (configs?.google_login_client_id?.value !== '' && configs?.google_login_client_id?.value !== null) ||
     (configs?.apple_login_client_id?.value !== '' && configs?.apple_login_client_id?.value !== null)
@@ -543,7 +545,7 @@ const SignupFormUI = (props: SignupParams) => {
                       handleSuccessFacebookLogin={handleSuccessFacebook}
                     />
                   )}
-                {(configs?.google_login_client_id?.value !== '' && configs?.google_login_client_id?.value !== null) && (
+                {(configs?.google_login_client_id?.value !== '' && configs?.google_login_client_id?.value !== null) && googleLoginEnabled && (
                   <GoogleLogin
                     notificationState={notificationState}
                     webClientId={configs?.google_login_client_id?.value}

package/src/components/shared/OModal.tsx

@@ -78,7 +78,7 @@ const OModal = (props: Props): React.ReactElement => {
       animationType="slide"
       transparent={isTransparent}
       visible={open}
-      onRequestClose={() => { onClose() }}
+      onRequestClose={() => {  onClose && onClose() }}
       style={{ height: '100%', flex: 1, position: 'absolute', ...style, zIndex: 9999 }}
     >
      {isAvoidKeyBoardView ? (

package/themes/business/src/components/shared/OModal.tsx

@@ -165,7 +165,7 @@ const OModal = (props: Props): React.ReactElement => {
         transparent={isTransparent}
         visible={open}
         onRequestClose={() => {
-          onClose();
+          onClose && onClose();
         }}
         style={{
           height: '100%',

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

@@ -144,7 +144,7 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
 
   const validateSelectedDate = (curdate: any, menu: any) => {
     const day = moment(curdate).format('d')
-    setIsEnabled(menu?.schedule[day]?.enabled || false)
+    setIsEnabled(menu?.schedule?.[day]?.enabled || false)
   }
 
   const getTimes = (curdate: any, menu: any) => {

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

@@ -57,12 +57,12 @@ const BusinessProductsCategoriesUI = (props: any) => {
 
 		if (!lazyLoadProductsRecommended) {
 			if (category?.id) {
-				scrollViewRef.current.scrollTo({
+				scrollViewRef?.current?.scrollTo && scrollViewRef.current.scrollTo({
 					y: categoriesLayout[`cat_${category?.id}`]?.y + productListLayout?.y - 70,
 					animated: true
 				})
 			} else {
-				scrollViewRef.current.scrollTo({
+				scrollViewRef?.current?.scrollTo && scrollViewRef.current.scrollTo({
 					y: productListLayout?.y - 70,
 					animated: true
 				})

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

@@ -106,7 +106,7 @@ const CartUI = (props: any) => {
   }
 
   const getIncludedTaxes = () => {
-    if (cart?.taxes === null) {
+    if (cart?.taxes === null || !cart?.taxes) {
       return cart.business.tax_type === 1 ? cart?.tax : 0
     } else {
       return cart?.taxes.reduce((taxIncluded: number, tax: any) => {

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

@@ -193,6 +193,7 @@ export const GoogleMap = (props: GoogleMapsParams) => {
               <React.Fragment key={i}>
                 {
                   <Marker
+                    zIndex={i}
                     coordinate={location}
                     title={locations[i]?.title}
                   >

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

@@ -99,6 +99,8 @@ const LoginFormUI = (props: LoginParams) => {
 	const theme = useTheme();
 	const isOtpEmail = loginTab === 'otp' && otpType === 'email'
 	const isOtpCellphone = loginTab === 'otp' && otpType === 'cellphone'
+	const googleLoginEnabled = configs?.google_login_enabled?.value === '1' || !configs?.google_login_enabled?.enabled
+
 	const loginStyle = StyleSheet.create({
 		btnOutline: {
 			backgroundColor: '#FFF',
@@ -710,7 +712,7 @@ const LoginFormUI = (props: LoginParams) => {
 												handleSuccessFacebookLogin={handleSuccessFacebook}
 											/>
 										)}
-									{(configs?.google_login_client_id?.value !== '' && configs?.google_login_client_id?.value !== null) && (
+									{(configs?.google_login_client_id?.value !== '' && configs?.google_login_client_id?.value !== null) && googleLoginEnabled && (
 										<GoogleLogin
 											notificationState={notificationState}
 											webClientId={configs?.google_login_client_id?.value}

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

@@ -333,7 +333,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   };
 
   const getIncludedTaxes = () => {
-    if (order?.taxes?.length === 0) {
+    if (order?.taxes?.length === 0 || !order?.taxes) {
       return order.tax_type === 1 ? order?.summary?.tax ?? 0 : 0
     } else {
       return order?.taxes.reduce((taxIncluded: number, tax: any) => {
@@ -364,27 +364,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     )
   }
 
-  const RenderGoogleMap = () => {
-    const driverLocationString = typeof order?.driver?.location?.location === 'string' && order?.driver?.location?.location?.split(',').map((l: string) => l.replace(/[^-.0-9]/g, ''))
-    const parsedLocations = locations.map(location => typeof location?.location === 'string' ? {
-      ...location,
-      lat: parseFloat(location?.location?.split(',')[0].replace(/[^-.0-9]/g, '')),
-      lng: parseFloat(location?.location?.split(',')[1].replace(/[^-.0-9]/g, ''))
-    } : location)
-
-    return (
-      <GoogleMap
-        location={typeof order?.driver?.location?.location === 'string'
-          ? {
-            lat: parseFloat(driverLocationString[0]),
-            lng: parseFloat(driverLocationString[1]),
-          } : order?.driver?.location
-        }
-        locations={parsedLocations}
-        readOnly
-      />
-    )
-  }
 
   useEffect(() => {
     const _businessId = 'businessId:' + businessData?.id
@@ -436,6 +415,12 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
         'https://res.cloudinary.com/demo/image/upload/c_thumb,g_face,r_max/d_avatar.png/non_existing_id.png',
     },
   ];
+  const driverLocationString = typeof order?.driver?.location?.location === 'string' && order?.driver?.location?.location?.split(',').map((l: string) => l.replace(/[^-.0-9]/g, ''))
+  const parsedLocations = locations.map(location => typeof location?.location === 'string' ? {
+      ...location,
+      lat: parseFloat(location?.location?.split(',')[0].replace(/[^-.0-9]/g, '')),
+      lng: parseFloat(location?.location?.split(',')[1].replace(/[^-.0-9]/g, ''))
+    } : location)
 
   useEffect(() => {
     if (driverLocation) {
@@ -697,7 +682,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   </OText>
                 </View>
               )}
-              {order?.comment && (
+              {!!order?.comment && (
                 <View style={{ marginTop: 15 }}>
                   <OText size={16} style={{ textAlign: 'left' }} color={theme.colors.textNormal}>
                     {t('COMMENT', 'Comment')}
@@ -709,7 +694,16 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                 <>
                   {order?.driver?.location && mapValidStatuses.includes(parseInt(order?.status)) && (
                     <Map>
-                      <RenderGoogleMap />
+                      <GoogleMap
+                        location={typeof order?.driver?.location?.location === 'string'
+                        ? {
+                            lat: parseFloat(driverLocationString[0]),
+                            lng: parseFloat(driverLocationString[1]),
+                          } : driverLocation ?? order?.driver?.location
+                        }
+                        locations={parsedLocations}
+                        readOnly
+                      />
                     </Map>
                   )}
                 </>

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

@@ -71,7 +71,7 @@ const OrderSummaryUI = (props: any) => {
   }
 
   const getIncludedTaxes = () => {
-    if (cart?.taxes === null) {
+    if (cart?.taxes === null || !cart?.taxes) {
       return cart.business.tax_type === 1 ? cart?.tax : 0
     } else {
       return cart?.taxes.reduce((taxIncluded: number, tax: any) => {

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

@@ -9,7 +9,7 @@ import { PreviousOrders } from '../PreviousOrders'
 
 import { OptionTitle, NoOrdersWrapper } from './styles'
 import { OrdersOptionParams } from '../../types'
-
+import { _setStoreData } from '../../providers/StoreUtil';
 import {
 	Placeholder,
 	PlaceholderLine,
@@ -35,13 +35,15 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 		setOrdersLength,
 		ordersLength,
 		refreshOrders,
-		setRefreshOrders
+		setRefreshOrders,
+		reorderState,
+		handleReorder
 	} = props
 
 	const theme = useTheme();
 
 	const [, t] = useLanguage()
-	const [, { reorder }] = useOrder()
+	const [{ carts }] = useOrder()
 	const { showToast } = useToast()
 	const { loading, error, orders: values } = orderList
 
@@ -51,26 +53,6 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 
 	const orders = customArray || values || []
 
-	const [reorderLoading, setReorderLoading] = useState(false)
-
-
-	const handleReorder = async (orderId: number) => {
-		setReorderLoading(true)
-		try {
-			const { error, result } = await reorder(orderId)
-			if (!error) {
-				onNavigationRedirect && onNavigationRedirect('CheckoutNavigator', { cartUuid: result.uuid })
-				setReorderLoading(false)
-				return
-			}
-			setReorderLoading(false)
-
-		} catch (err: any) {
-			showToast(ToastType.Error, t('ERROR', err.message))
-			setReorderLoading(false)
-		}
-	}
-
 	const getOrderStatus = (s: string) => {
 		const status = parseInt(s)
 		const orderStatus = [
@@ -105,6 +87,29 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 		return objectStatus && objectStatus
 	}
 
+	useEffect(() => {
+		const _businessId = 'businessId:' + reorderState?.result?.business_id
+		if (reorderState?.error) {
+		  if (reorderState?.result?.business_id) {
+			_setStoreData('adjust-cart-products', JSON.stringify(_businessId))
+			navigation.navigate('Business', { store: reorderState?.result?.business?.slug })
+		  }
+		}
+		if (!reorderState?.error && reorderState.loading === false && 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 })
+		  } else {
+			_setStoreData('adjust-cart-products', JSON.stringify(_businessId))
+			cartProducts?.length !== orderProducts?.length && _setStoreData('already-removed', JSON.stringify('removed'))
+			navigation.navigate('Business', { store: reorderState?.result?.business?.slug })
+		  }
+		}
+	  }, [reorderState])
+
 	useFocusEffect(
 		React.useCallback(() => {
 			loadOrders(false, false, false, true)
@@ -213,7 +218,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 						orders={orders.filter((order: any) => orderStatus.includes(order.status))}
 						pagination={pagination}
 						loadMoreOrders={loadMoreOrders}
-						reorderLoading={reorderLoading}
+						reorderLoading={reorderState?.loading}
 						customArray={customArray}
 						getOrderStatus={getOrderStatus}
 						onNavigationRedirect={onNavigationRedirect}
@@ -222,14 +227,14 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 					<ActiveOrders
 						orders={orders.filter((order: any) => orderStatus.includes(order.status))}
 						pagination={pagination}
-						reorderLoading={reorderLoading}
+						reorderLoading={reorderState?.loading}
 						customArray={customArray}
 						getOrderStatus={getOrderStatus}
 						onNavigationRedirect={onNavigationRedirect}
 					/>
 				) : (
 					<PreviousOrders
-						reorderLoading={reorderLoading}
+						reorderLoading={reorderState?.loading}
 						orders={orders.filter((order: any) => orderStatus.includes(order.status)).sort((a: any, b: any) => a?.id < b?.id)}
 						pagination={pagination}
 						loadMoreOrders={loadMoreOrders}

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

@@ -100,7 +100,7 @@ export const PreviousOrders = (props: PreviousOrdersParams) => {
 
 	const handleReorderClick = (id: number) => {
 		setReorderSelected(id);
-		handleReorder(id);
+		handleReorder && handleReorder(id);
 	};
 
 	return (

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

@@ -135,6 +135,7 @@ const SignupFormUI = (props: SignupParams) => {
 	const recaptchaRef = useRef<any>({});
 
 	const showInputPhoneNumber = (validationFields?.fields?.checkout?.cellphone?.enabled ?? false) || configs?.verification_phone_required?.value === '1'
+	const googleLoginEnabled = configs?.google_login_enabled?.value === '1' || !configs?.google_login_enabled?.enabled
 
 	const handleRefs = (ref: any, code: string) => {
 		switch (code) {
@@ -787,7 +788,7 @@ const SignupFormUI = (props: SignupParams) => {
 											handleSuccessFacebookLogin={handleSuccessFacebook}
 										/>
 									)}
-								{(configs?.google_login_client_id?.value !== '' && configs?.google_login_client_id?.value !== null) && (
+								{(configs?.google_login_client_id?.value !== '' && configs?.google_login_client_id?.value !== null) && googleLoginEnabled && (
 									<GoogleLogin
 										notificationState={notificationState}
 										webClientId={configs?.google_login_client_id?.value}

package/themes/original/src/components/shared/OModal.tsx

@@ -91,7 +91,7 @@ const OModal = (props: Props): React.ReactElement => {
 			animationType="slide"
 			transparent={isTransparent}
 			visible={open}
-			onRequestClose={() => onClose()}
+			onRequestClose={() =>  onClose && onClose()}
 			style={{ height: '100%', flex: 1, position: 'absolute', ...style, zIndex: 9999 }}
 		>
 			{isAvoidKeyBoardView ? (

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

@@ -311,6 +311,8 @@ export interface OrdersOptionParams {
 	loadOrders?: any,
 	setOrderList?: any,
 	preOrders?: boolean,
+	reorderState?: any,
+	handleReorder?: (orderId: number) => {},
 	setOrdersLength?: ({ activeOrdersLength, previousOrdersLength }: { activeOrdersLength: number, previousOrdersLength: number }) => void,
 	ordersLength: { activeOrdersLength: number, previousOrdersLength: number },
 	setSelectedOrderId?: any,
@@ -339,7 +341,7 @@ export interface PreviousOrdersParams {
 	orderID?: number
 	reorderLoading?: boolean,
 	loadMoreOrders?: () => {},
-	handleReorder: (order: any) => {},
+	handleReorder?: (orderId: number) => {},
 	onNavigationRedirect?: (route: string, params?: any) => {}
 }
 export interface OrderDetailsParams {