ordering-ui-react-native 0.23.56 → 0.23.58

package/package.json

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

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

@@ -175,9 +175,12 @@ const CheckoutUI = (props: any) => {
 	const [showTitle, setShowTitle] = useState(false)
 	const [cardList, setCardList] = useState<any>({ cards: [], loading: false, error: null })
 	const [isGiftCardCart, setIsGiftCardCart] = useState(!cart?.business_id)
+	const [userHasCards, setUserHasCards] = useState(false)
 	const containerRef = useRef<any>()
 	const cardsMethods = ['credomatic']
 	const stripePaymethods: any = ['stripe', 'stripe_connect', 'stripe_redirect']
+	const cardsPaymethods: any = ['stripe', 'stripe_connect']
+
 	const notFields = ['coupon', 'driver_tip', 'mobile_phone', 'address', 'zipcode', 'address_notes', 'comments']
 
 	const checkoutFields = useMemo(() => checkoutFieldsState?.fields?.filter((field: any) => field.order_type_id === options?.type), [checkoutFieldsState, options])
@@ -226,8 +229,8 @@ const CheckoutUI = (props: any) => {
 		validateCommentsCartField ||
 		validateDriverTipField ||
 		validateCouponField ||
-		validateZipcodeCard
-
+		validateZipcodeCard ||
+		(!userHasCards && cardsPaymethods.includes(paymethodSelected?.gateway))
 
 	const driverTipsOptions = typeof configs?.driver_tip_options?.value === 'string'
 		? JSON.parse(configs?.driver_tip_options?.value) || []
@@ -266,7 +269,9 @@ const CheckoutUI = (props: any) => {
 			user,
 			token: user?.session?.access_token
 		})
-		openModal?.isGuest && handlePlaceOrderAsGuest()
+		if (openModal?.isGuest && requiredFields?.length === 0) {
+			openModal?.isGuest && handlePlaceOrderAsGuest()
+		}
 		setOpenModal({ ...openModal, signup: false, isGuest: false })
 	}
 
@@ -409,12 +414,14 @@ const CheckoutUI = (props: any) => {
 	}, [errors])
 
 	useEffect(() => {
-		if (cart?.products?.length === 0) {
-			if (cart?.business_id !== null) {
-				onNavigationRedirect('Business', { store: cart?.business?.slug, header: null, logo: null, fromMulti: props.fromMulti })
-			} else if (isGiftCardCart) {
-				onNavigationRedirect('Wallets')
-			}
+		if (cart?.products?.length === 0 || !userLoading) return
+		if (cart?.business_id !== null) {
+			onNavigationRedirect('Business', { store: cart?.business?.slug, header: null, logo: null, fromMulti: props.fromMulti })
+			return
+		}
+		if (isGiftCardCart) {
+			onNavigationRedirect('Wallets')
+			return
 		}
 	}, [cart?.products?.length])
 
@@ -864,6 +871,7 @@ const CheckoutUI = (props: any) => {
 									openUserModal={setIsOpen}
 									paymethodClicked={paymethodClicked}
 									setPaymethodClicked={setPaymethodClicked}
+									setUserHasCards={setUserHasCards}
 								/>
 							</ChPaymethods>
 						</ChSection>

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

@@ -377,7 +377,7 @@ const MomentOptionUI = (props: MomentOptionParams) => {
 							titleWrapStyle={{ paddingHorizontal: 0 }}
 						/>
 					)}
-					{(preorderMinimumDays === 0 && preorderLeadTime === 0) || !cateringPreorder && (
+					{((preorderMinimumDays === 0 && preorderLeadTime === 0) || !cateringPreorder) && (
 						<WrapSelectOption
 							onPress={() => _handleAsap()}
 							disabled={orderState.loading} style={{ alignItems: 'flex-start' }}>
@@ -510,4 +510,4 @@ export const MomentOption = (props: any) => {
 		UIComponent: MomentOptionUI,
 	};
 	return <MomentOptionController {...momentOptionProps} />;
-};
+};

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

@@ -76,7 +76,8 @@ const PaymentOptionsUI = (props: any) => {
 		openUserModal,
 		paymethodClicked,
 		setPaymethodClicked,
-		androidAppId
+		androidAppId,
+		setUserHasCards
 	} = props
 
 	const theme = useTheme();
@@ -348,6 +349,7 @@ const PaymentOptionsUI = (props: any) => {
 						businessId={props.businessId}
 						onPaymentChange={onPaymentChange}
 						paySelected={props.paySelected}
+						setUserHasCards={setUserHasCards}
 					/>
 				</View>
 			)}
@@ -440,6 +442,7 @@ const PaymentOptionsUI = (props: any) => {
 						publicKey={isOpenMethod?.paymethod?.credentials.publishable}
 						publicKeyAddCard={isOpenMethod?.paymethod?.credentials?.stripe?.publishable || isOpenMethod?.paymethod?.credentials?.publishable}
 						paySelected={props.paySelected}
+						setUserHasCards={setUserHasCards}
 					/>
 				</View>
 			)}

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

@@ -87,7 +87,7 @@ export const PhoneInputNumber = (props: PhoneInputParams) => {
 					error: '',
 					phone: {
 						country_phone_code: callingCode,
-						cellphone: !isDisableNumberValidation ? userphoneNumber : formattedNumber?.number
+						cellphone: !isDisableNumberValidation ? cellphone.slice(callingCode?.length) : formattedNumber?.number
 					}
 				})
 			} else {

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

@@ -32,7 +32,8 @@ export const StripeCardsListUI = (props: any) => {
 		gateway,
 		paySelected,
 		newCardAdded,
-		addNewCardAsDefault
+		addNewCardAsDefault,
+		setUserHasCards
 	} = props;
 
 	const theme = useTheme();
@@ -62,6 +63,11 @@ export const StripeCardsListUI = (props: any) => {
 		}
 	}, [JSON.stringify(newCardAdded)])
 
+	useEffect(() => {
+		const hasCardSelected = cardsList?.cards?.some?.((card : any) => card?.id === paySelected?.data?.id)
+		setUserHasCards && setUserHasCards(cardsList?.cards?.length > 0 && hasCardSelected)
+	}, [cardsList?.cards?.length])
+
 	return (
 		<>
 			{token && !cardsList.loading && cardsList.cards && cardsList.cards.length === 0 && (