ordering-ui-react-native 0.15.61 → 0.15.63-release

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

@@ -6,10 +6,11 @@ import { OText, OButton } from '../shared'
 import { NotFoundSource } from '../NotFoundSource'
 import { ActiveOrders } from '../ActiveOrders'
 import { PreviousOrders } from '../PreviousOrders'
-
+import { PreviousBusinessOrdered } from './PreviousBusinessOrdered'
+import { PreviousProductsOrdered } from './PreviousProductsOrdered'
 import { OptionTitle, NoOrdersWrapper } from './styles'
 import { OrdersOptionParams } from '../../types'
-
+import { _setStoreData } from '../../providers/StoreUtil';
 import {
 	Placeholder,
 	PlaceholderLine,
@@ -33,15 +34,28 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 		loadMoreOrders,
 		loadOrders,
 		setOrdersLength,
-		ordersLength
+		ordersLength,
+		refreshOrders,
+		setRefreshOrders,
+		reorderState,
+		handleReorder,
+		handleUpdateOrderList,
+		isBusiness,
+		isProducts,
+		businessOrderIds,
+		products,
+		businessesSearchList,
+		hideOrders,
+		BusinessControllerSkeletons,
 	} = props
 
 	const theme = useTheme();
 
 	const [, t] = useLanguage()
-	const [, { reorder }] = useOrder()
-	const { showToast } = useToast()
+	const [{ carts }] = useOrder()
+	const [, { showToast }] = useToast()
 	const { loading, error, orders: values } = orderList
+	const [businessLoading, setBusinessLoading] = useState(true)
 
 	const imageFails = activeOrders
 		? theme.images.general.emptyActiveOrders
@@ -49,26 +63,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 = [
@@ -103,9 +97,51 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 		return objectStatus && objectStatus
 	}
 
+	const onProductClick = (product: any) => {
+		if (product?.product_id && product?.category_id && product?.businessId &&
+			product?.business.slug && product?.business.header && product?.business.logo) {
+			onNavigationRedirect('ProductDetails', {
+				isRedirect: 'business',
+				businessId: product?.businessId,
+				categoryId: product?.category_id,
+				productId: product?.product_id,
+				business: {
+					store: product?.business.slug,
+					header: product?.business.header,
+					logo: product?.business.logo,
+				}
+			})
+		} else {
+			showToast(ToastType.Error, t('ERROR_FAILED_REDIRECT_IDS', 'Failed to redirect product for ids'))
+		}
+	}
+
+	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()
+			loadOrders(false, false, false, true)
 		}, [navigation])
 	)
 
@@ -126,7 +162,14 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 		} else if (!preOrders) {
 			setOrdersLength && setOrdersLength({ ...ordersLength, previousOrdersLength: updateOrders?.length })
 		}
-	}, [orders, activeOrders])
+	}, [orders, activeOrders, preOrders])
+
+	useEffect(() => {
+		if (refreshOrders) {
+			loadOrders(false, false, false, true)
+			setRefreshOrders && setRefreshOrders(false)
+		}
+	}, [refreshOrders])
 
 	return (
 		<>
@@ -144,9 +187,9 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 
 				</NoOrdersWrapper>
 			)}
-			{(ordersLength.activeOrdersLength > 0 || ordersLength.previousOrdersLength > 0) && (
+			{(ordersLength?.activeOrdersLength > 0 || ordersLength?.previousOrdersLength > 0) && (
 				<>
-					<OptionTitle>
+					<OptionTitle titleContent={!!titleContent} isBusinessesSearchList={!!businessesSearchList}>
 						<OText size={16} lineHeight={24} weight={'500'} color={theme.colors.textNormal} mBottom={10} >
 							{titleContent || (activeOrders
 								? t('ACTIVE', 'Active')
@@ -155,7 +198,7 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 									: t('PAST', 'Past'))}
 						</OText>
 					</OptionTitle>
-					{!(ordersLength.activeOrdersLength === 0 && ordersLength.previousOrdersLength === 0) &&
+					{!(ordersLength?.activeOrdersLength === 0 && ordersLength?.previousOrdersLength === 0) &&
 						!loading &&
 						orders.filter((order: any) => orderStatus.includes(order.status)).length === 0 &&
 						(
@@ -167,7 +210,51 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 						)}
 				</>
 			)}
-			{loading && (
+			{isBusiness && !!businessesSearchList && businessLoading && (
+				<ScrollView horizontal>
+					<BusinessControllerSkeletons />
+				</ScrollView>
+			)}
+			{isBusiness && businessOrderIds?.length > 0 && (
+				<PreviousBusinessOrdered
+					businessId={businessOrderIds}
+					businessLoading={businessLoading}
+					setBusinessLoading={setBusinessLoading}
+					onNavigationRedirect={onNavigationRedirect}
+					isLoadingOrders={loading}
+					isBusinessesSearchList={!!businessesSearchList}
+				/>
+			)}
+
+			{isProducts && (
+				<PreviousProductsOrdered
+					products={products}
+					onProductClick={onProductClick}
+					isBusinessesSearchList={!!businessesSearchList}
+				/>
+			)}
+			{(loading && isProducts) && (
+				<>
+					{[...Array(4).keys()].map(
+						(item, i) => (
+							<Placeholder key={i} style={{ padding: 5, paddingLeft: 40 }} Animation={Fade}>
+								<View style={{ flexDirection: 'row' }}>
+									<PlaceholderLine
+										width={24}
+										height={70}
+										style={{ marginRight: 10, marginBottom: 10 }}
+									/>
+									<Placeholder style={{ paddingVertical: 10 }}>
+										<PlaceholderLine width={60} style={{ marginBottom: 25 }} />
+										<PlaceholderLine width={20} />
+									</Placeholder>
+								</View>
+							</Placeholder>
+						),
+					)}
+				</>
+			)}
+			{loading && !hideOrders && (
 				<>
 					{!activeOrders ? (
 						<Placeholder style={{ marginTop: 30 }} Animation={Fade}>
@@ -198,35 +285,38 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 					)}
 				</>
 			)}
-			{!loading && !error && orders.length > 0 && (
+			{!loading && !error && orders.length > 0 && !hideOrders && (
 				preOrders ? (
 					<ActiveOrders
 						orders={orders.filter((order: any) => orderStatus.includes(order.status))}
 						pagination={pagination}
 						loadMoreOrders={loadMoreOrders}
-						reorderLoading={reorderLoading}
+						reorderLoading={reorderState?.loading}
 						customArray={customArray}
 						getOrderStatus={getOrderStatus}
 						onNavigationRedirect={onNavigationRedirect}
+						handleUpdateOrderList={handleUpdateOrderList}
 					/>
 				) : activeOrders ? (
 					<ActiveOrders
 						orders={orders.filter((order: any) => orderStatus.includes(order.status))}
 						pagination={pagination}
-						reorderLoading={reorderLoading}
+						reorderLoading={reorderState?.loading}
 						customArray={customArray}
 						getOrderStatus={getOrderStatus}
 						onNavigationRedirect={onNavigationRedirect}
+						handleUpdateOrderList={handleUpdateOrderList}
 					/>
 				) : (
 					<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}
 						getOrderStatus={getOrderStatus}
 						onNavigationRedirect={onNavigationRedirect}
 						handleReorder={handleReorder}
+						handleUpdateOrderList={handleUpdateOrderList}
 					/>
 				)
 			)}
@@ -235,13 +325,22 @@ const OrdersOptionUI = (props: OrdersOptionParams) => {
 }
 
 export const OrdersOption = (props: OrdersOptionParams) => {
+	const getAllOrders = props.activeOrders && props.pastOrders && props.preOrders
+
 	const MyOrdersProps = {
 		...props,
 		UIComponent: OrdersOptionUI,
-		orderStatus: props.preOrders ? [13] : props.activeOrders
-			? [0, 3, 4, 7, 8, 9, 14, 18, 19, 20, 21, 22, 23]
-			: [1, 2, 5, 6, 10, 11, 12, 15, 16, 17],
+		orderStatus: getAllOrders
+			? [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23]
+			: props.preOrders ? [13] : props.activeOrders
+				? [0, 3, 4, 7, 8, 9, 14, 18, 19, 20, 21, 22, 23]
+				: [1, 2, 5, 6, 10, 11, 12, 15, 16, 17],
 		useDefualtSessionManager: true,
+		paginationSettings: {
+			initialPage: 1,
+			pageSize: getAllOrders ? 30 : 10,
+			controlType: 'infinity'
+		}
 	}
 
 	return <OrderList {...MyOrdersProps} />

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

@@ -1,7 +1,10 @@
-import styled from 'styled-components/native'
+import styled, { css } from 'styled-components/native'
 
 export const OptionTitle = styled.View`
 	margin-top: 24px;
+	${(props : any) => props.titleContent && css`
+		margin-left: ${() => props.isBusinessesSearchList ? '0' : '40px'};
+	`}
 `
 
 export const NoOrdersWrapper = styled.View`

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

@@ -23,8 +23,8 @@ export const PaymentOptionCash = (props: any) => {
 			borderRadius: 7.6,
 			marginTop: 10,
 			width: '100%',
-			height: 44,
-			maxHeight: 44
+			height: 50,
+			maxHeight: 50
 		},
 		errorMsg: {
 			marginTop: 10,

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

@@ -1,8 +1,8 @@
 import React, { useState, useEffect } from 'react'
-import { Platform, StyleSheet, View } from 'react-native'
+import { View } from 'react-native'
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
 import { useTheme } from 'styled-components/native'
-import CheckBox from '@react-native-community/checkbox';
+import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
 import {
   PaymentOptionWallet as PaymentOptionWalletController,
   useLanguage,
@@ -41,13 +41,6 @@ const PaymentOptionWalletUI = (props: any) => {
   const isBusinessWalletCashEnabled = businessConfigs.find((config: any) => config.key === 'wallet_cash_enabled')?.value === '1'
   const isBusinessWalletPointsEnabled = businessConfigs.find((config: any) => config.key === 'wallet_credit_point_enabled')?.value === '1'
 
-  const styles = StyleSheet.create({
-    checkBoxStyle: {
-      width: 25,
-      height: 25,
-    }
-  });
-
   const [checkedState, setCheckedState] = useState(
     new Array(walletsState.result?.length).fill(false)
   );
@@ -100,22 +93,23 @@ const PaymentOptionWalletUI = (props: any) => {
             <Container
               key={wallet.id}
               isBottomBorder={idx === walletsState.result?.filter((wallet: any) => wallet.valid)?.length - 1}
+              onPress={() => handleOnChange(idx, wallet)}
+              disabled={(cart?.balance === 0 && !checkedState[idx]) || wallet.balance === 0}
             >
               <SectionLeft>
-                <CheckBox
-                  value={checkedState[idx]}
-                  onValueChange={() => handleOnChange(idx, wallet)}
-                  disabled={(cart?.balance === 0 && !checkedState[idx]) || wallet.balance === 0 }
-                  boxType={'square'}
-                  tintColors={{
-                    true: theme.colors.primary,
-                    false: theme.colors.disabled
-                  }}
-                  tintColor={theme.colors.disabled}
-                  onCheckColor={theme.colors.primary}
-                  onTintColor={theme.colors.primary}
-                  style={Platform.OS === 'ios' && styles.checkBoxStyle}
-                />
+                {checkedState[idx] ? (
+                  <MaterialCommunityIcons
+                    name="checkbox-marked"
+                    size={25}
+                    color={theme.colors.primary}
+                  />
+                ) : (
+                  <MaterialCommunityIcons
+                    name="checkbox-blank-outline"
+                    size={25}
+                    color={theme.colors.disabled}
+                  />
+                )}
                 <View style={{ alignItems: 'baseline', marginLeft: 5 }}>
                   <View>
                     <OText

package/themes/original/src/components/PaymentOptionWallet/styles.tsx

@@ -1,6 +1,6 @@
 import styled, { css } from 'styled-components/native'
 
-export const Container = styled.View`
+export const Container = styled.TouchableOpacity`
   width: 100%;
   display: flex;
   padding: 20px 0;

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

@@ -9,7 +9,7 @@ import {
 import {
 	PaymentOptions as PaymentOptionsController,
 	useLanguage,
-  ToastType,
+	ToastType,
 	useToast,
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
@@ -30,6 +30,7 @@ import {
 	PMCardItemContent
 } from './styles'
 import { getIconCard, flatArray } from '../../utils';
+import { useApplePay } from '@stripe/stripe-react-native';
 
 const stripeOptions: any = ['stripe_direct', 'stripe', 'stripe_connect']
 const methodsPay = ['google_pay', 'apple_pay']
@@ -62,7 +63,8 @@ const PaymentOptionsUI = (props: any) => {
 	} = props
 
 	const theme = useTheme();
-  const [, { showToast }] = useToast();
+	const [, { showToast }] = useToast();
+	const { confirmApplePayPayment } = useApplePay()
 
 	const getPayIcon = (method: string) => {
 		switch (method) {
@@ -80,6 +82,8 @@ const PaymentOptionsUI = (props: any) => {
 				return theme.images.general.stripes
 			case 'stripe_redirect':
 				return theme.images.general.stripesb
+			case 'apple_pay':
+				return theme.images.general.applePayMark
 			default:
 				return theme.images.general.creditCard
 		}
@@ -98,18 +102,18 @@ const PaymentOptionsUI = (props: any) => {
 	// ]
 
 	const handlePaymentMethodClick = (paymethod: any) => {
-    if (cart?.balance > 0) {
-      const isPopupMethod = ['stripe', 'stripe_direct', 'stripe_connect', 'stripe_redirect', 'paypal'].includes(paymethod?.gateway)
-      if (webViewPaymentGateway.includes(paymethod?.gateway)) {
-        handlePaymentMethodClickCustom(paymethod)
-      }
-      handlePaymethodClick(paymethod, isPopupMethod)
-      return
-    }
-    showToast(
+		if (cart?.balance > 0) {
+			const isPopupMethod = ['stripe', 'stripe_direct', 'stripe_connect', 'stripe_redirect', 'paypal'].includes(paymethod?.gateway)
+			if (webViewPaymentGateway.includes(paymethod?.gateway)) {
+				handlePaymentMethodClickCustom(paymethod)
+			}
+			handlePaymethodClick(paymethod, isPopupMethod)
+			return
+		}
+		showToast(
 			ToastType.Error,
 			t('CART_BALANCE_ZERO', 'Sorry, the amount to pay is equal to zero and it is not necessary to select a payment method'))
-		;
+			;
 	}
 
 	useEffect(() => {
@@ -134,39 +138,56 @@ const PaymentOptionsUI = (props: any) => {
 
 	useEffect(() => {
 		if (methodsPay.includes(paymethodSelected?.gateway) && paymethodData?.id && paymethodSelected?.data?.card) {
-		  handlePlaceOrder()
+			handlePlaceOrder(confirmApplePayPayment)
 		}
 	}, [paymethodData, paymethodSelected])
 
 	const renderPaymethods = ({ item }: any) => {
 		return (
-			<TouchableOpacity
-				onPress={() => handlePaymentMethodClick(item)}
-			>
-				<PMItem
-					key={item.id}
-					isDisabled={isDisabled}
-					isActive={paymethodSelected?.id === item.id}
-				>
-					<OIcon
-						src={getPayIcon(item.gateway)}
-						width={20}
-						height={20}
-						color={paymethodSelected?.id === item.id ? theme.colors.white : theme.colors.backgroundDark}
-					/>
-					<OText
-						size={10}
-						style={{ margin: 0, marginTop: 4 }}
-						color={paymethodSelected?.id === item.id ? theme.colors.white : '#000'}
+			<>
+				{item?.gateway === 'apple_pay' ? (
+					<TouchableOpacity
+						onPress={() => handlePaymentMethodClick(item)}
 					>
-						{t(item.gateway.toUpperCase(), item.name)}
-					</OText>
-				</PMItem>
-			</TouchableOpacity>
+						<OIcon
+							src={getPayIcon(item.gateway)}
+							width={70}
+							height={70}
+							style={{ marginRight: 10 }}
+						/>
+					</TouchableOpacity>
+				) : (
+					<TouchableOpacity
+						onPress={() => handlePaymentMethodClick(item)}
+					>
+						{console.log(item?.gateway)}
+						<PMItem
+							key={item.id}
+							isDisabled={isDisabled}
+							isActive={paymethodSelected?.id === item.id}
+						>
+							<OIcon
+								src={getPayIcon(item.gateway)}
+								width={20}
+								height={20}
+								color={item?.gateway === 'apple_pay' ? '' : paymethodSelected?.id === item.id ? theme.colors.white : theme.colors.backgroundDark}
+							/>
+							<OText
+								size={10}
+								style={{ margin: 0, marginTop: 4 }}
+								color={paymethodSelected?.id === item.id ? theme.colors.white : '#000'}
+							>
+								{t(item.gateway.toUpperCase(), item.name)}
+							</OText>
+						</PMItem>
+					</TouchableOpacity>
+				)}
+			</>
+
 		)
 	}
 
-	const excludeIds: any = [32]; //exclude paypal & connect & redirect
+	const excludeIds: any = [32, 66]; //exclude paypal & connect & redirect
 
 	return (
 		<PMContainer>
@@ -214,7 +235,7 @@ const PaymentOptionsUI = (props: any) => {
 
 			{paymethodSelected?.gateway === 'cash' && (
 				<PaymentOptionCash
-					orderTotal={cart.total}
+					orderTotal={cart.balance ?? cart.total}
 					defaultValue={paymethodSelected?.data?.cash}
 					onChangeData={handlePaymethodDataChange}
 					setErrorCash={props.setErrorCash}

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

@@ -22,9 +22,8 @@ export const PhoneInputNumber = (props: PhoneInputParams) => {
 		textStyle,
 		flagStyle,
 		noDropIcon,
-		isDisabled,
-		isStartValidation,
-		changeCountry
+    isDisabled,
+		isStartValidation
 	} = props
 
 	const theme = useTheme();
@@ -59,7 +58,7 @@ export const PhoneInputNumber = (props: PhoneInputParams) => {
 	}
 
 	useEffect(() => {
-		if ((defaultValue && userphoneNumber) || defaultValue === undefined || defaultValue === '') {
+		if ((defaultValue && userphoneNumber) || !defaultValue) {
 			if (userphoneNumber) {
 				const checkValid = phoneInput.current?.isValidNumber(userphoneNumber);
 				const callingCode = phoneInput.current?.getCallingCode();
@@ -107,16 +106,11 @@ export const PhoneInputNumber = (props: PhoneInputParams) => {
 			)}
 			<PhoneInput
 				ref={phoneInput}
-				disabled={isDisabled}
+        disabled={isDisabled}
 				defaultValue={userphoneNumber || defaultValue}
-				defaultCode={defaultCode ?
-					!isNaN(defaultCode)
-						? transformCountryCode(defaultCode)
-						: defaultCode
-					: configs?.default_country_code?.value}
+				defaultCode={defaultCode ? transformCountryCode(defaultCode) : configs?.default_country_code?.value}
 				onChangeFormattedText={(text: string) => handleChangeNumber(text)}
 				withDarkTheme
-				onChangeCountry={(country) => changeCountry?.(country)}
 				countryPickerProps={{ withAlphaFilter: true }}
 				textContainerStyle={{ ...style.input, ...inputStyle ? inputStyle : {} }}
 				textInputStyle={textStyle}