ordering-ui-react-native 0.23.97 → 0.23.98

package/package.json

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

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

@@ -201,7 +201,7 @@ const CheckoutUI = (props: any) => {
 	const hideBusinessDetails = theme?.checkout?.components?.business?.hidden
 	const hideBusinessMap = theme?.checkout?.components?.business?.components?.map?.hidden
 	const hideCustomerDetails = theme?.checkout?.components?.customer?.hidden
-
+	const isGuestCheckoutEnabled = configs?.guest_checkout_enabled?.value === '1'
 	const creditPointPlan = loyaltyPlansState?.result?.find((loyal: any) => loyal.type === 'credit_point')
 	const creditPointPlanOnBusiness = creditPointPlan?.businesses?.find((b: any) => b.business_id === cart?.business_id && b.accumulates)
 	const methodsPay = ['google_pay', 'apple_pay']
@@ -230,7 +230,8 @@ const CheckoutUI = (props: any) => {
 		validateDriverTipField ||
 		validateCouponField ||
 		validateZipcodeCard ||
-		(!userHasCards && cardsPaymethods.includes(paymethodSelected?.gateway))
+		(!userHasCards && cardsPaymethods.includes(paymethodSelected?.gateway)) ||
+		(!isGuestCheckoutEnabled && !!user?.guest_id)
 
 	const driverTipsOptions = typeof configs?.driver_tip_options?.value === 'string'
 		? JSON.parse(configs?.driver_tip_options?.value) || []
@@ -276,6 +277,10 @@ const CheckoutUI = (props: any) => {
 		if (user) setOpenModal({ ...openModal, login: false })
 	}
 
+	const handleOpenGuestSignup = () => {
+    setOpenModal({ ...openModal, signup: true, isGuest: true })
+  }
+
 	const handlePlaceOrder = (confirmPayment: any, forcePlace: boolean = false) => {
 		if (stripePaymethods.includes(paymethodSelected?.gateway) && user?.guest_id) {
 			setOpenModal({ ...openModal, signup: true, isGuest: true })
@@ -671,14 +676,16 @@ const CheckoutUI = (props: any) => {
 												style={{ borderRadius: 7.6, marginTop: 20 }}
 												onClick={() => setOpenModal({ ...openModal, login: true })}
 											/>
-											<OButton
-												text={t('CONTINUE_AS_GUEST', 'Continue as guest')}
-												textStyle={{ color: theme.colors.black }}
-												bgColor={theme.colors.white}
-												borderColor={theme.colors.black}
-												style={{ borderRadius: 7.6, marginTop: 20 }}
-												onClick={() => setAllowedGuest(true)}
-											/>
+											{isGuestCheckoutEnabled && (
+                        <OButton
+                          text={t('CONTINUE_AS_GUEST', 'Continue as guest')}
+                          textStyle={{ color: theme.colors.black }}
+                          bgColor={theme.colors.white}
+                          borderColor={theme.colors.black}
+                          style={{ borderRadius: 7.6, marginTop: 20 }}
+                          onClick={() => setAllowedGuest(true)}
+                        />
+                      )}
 										</View>
 									) : (
 										<UserDetails
@@ -869,6 +876,8 @@ const CheckoutUI = (props: any) => {
 									paymethodClicked={paymethodClicked}
 									setPaymethodClicked={setPaymethodClicked}
 									setUserHasCards={setUserHasCards}
+									handleOpenGuestSignup={handleOpenGuestSignup}
+									guestDisabledError={(!isGuestCheckoutEnabled && !!user?.guest_id)}
 								/>
 							</ChPaymethods>
 						</ChSection>
@@ -1038,6 +1047,14 @@ const CheckoutUI = (props: any) => {
 											{t('WARNING_INVALID_COUPON_FIELD', 'Coupon is required.')}
 										</OText>
 									)}
+									{(!isGuestCheckoutEnabled && !!user?.guest_id) && (
+                    <OText
+                      color={theme.colors.error}
+                      size={12}
+                    >
+                      {t('LOGIN_SIGN_UP_COMPLETE_ORDER', 'Login/Sign up to complete your order.')}
+                    </OText>
+                  )}
 							</ChErrors>
 						</View>
 					)}

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

@@ -103,6 +103,7 @@ const MultiCheckoutUI = (props: any) => {
   const configTypes = configs?.order_types_allowed?.value.split('|').map((value: any) => Number(value)) || []
   const isPreOrder = configs?.preorder_status_enabled?.value === '1'
   const isMultiDriverTips = configs?.checkout_multi_business_enabled?.value === '1'
+  const isGuestCheckoutEnabled = configs?.guest_checkout_enabled?.value === '1'
   const walletCarts = (Object.values(carts)?.filter((cart: any) => cart?.products && cart?.products?.length && cart?.status !== 2 && cart?.valid_schedule && cart?.valid_products && cart?.valid_address && cart?.valid_maximum && cart?.valid_minimum && cart?.wallets) || null) || []
   const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
   const cartsToShow = openCarts?.length > 0 ? openCarts : cartsInvalid
@@ -123,7 +124,7 @@ const MultiCheckoutUI = (props: any) => {
 
   const creditPointGeneralPlan = loyaltyPlansState?.result?.find((loyal: any) => loyal.type === 'credit_point')
   const loyalBusinessAvailable = creditPointGeneralPlan?.businesses?.filter((b: any) => b.accumulates) ?? []
-  const checkoutFields = useMemo(() => checkoutFieldsState?.fields?.filter((field : any) => field.order_type_id === options?.type), [checkoutFieldsState, options])
+  const checkoutFields = useMemo(() => checkoutFieldsState?.fields?.filter((field: any) => field.order_type_id === options?.type), [checkoutFieldsState, options])
 
   const accumulationRateBusiness = (businessId: number) => {
     const value = loyalBusinessAvailable?.find((loyal: any) => loyal.business_id === businessId)?.accumulation_rate ?? 0
@@ -162,7 +163,8 @@ const MultiCheckoutUI = (props: any) => {
   const isDisablePlaceOrderButton = cartGroup?.loading || placing || (!(paymethodSelected?.paymethod_id || paymethodSelected?.wallet_id) && cartGroup?.result?.balance > 0) ||
     (paymethodSelected?.paymethod?.gateway === 'stripe' && !paymethodSelected?.paymethod_data) ||
     walletCarts.length > 0
-    || (methodsPay.includes(paymethodSelected?.gateway) && (!methodPaySupported.enabled || methodPaySupported.loading)) || openCarts?.length === 0
+    || (methodsPay.includes(paymethodSelected?.gateway) && (!methodPaySupported.enabled || methodPaySupported.loading)) || openCarts?.length === 0 ||
+    (!isGuestCheckoutEnabled && !!user?.guest_id)
 
   const handleMomentClick = () => {
     if (isPreOrder) {
@@ -428,14 +430,16 @@ const MultiCheckoutUI = (props: any) => {
                     style={{ borderRadius: 7.6, marginTop: 20 }}
                     onClick={() => setOpenModal({ ...openModal, login: true })}
                   />
-                  <OButton
-                    text={t('CONTINUE_AS_GUEST', 'Continue as guest')}
-                    textStyle={{ color: theme.colors.black }}
-                    bgColor={theme.colors.white}
-                    borderColor={theme.colors.black}
-                    style={{ borderRadius: 7.6, marginTop: 20 }}
-                    onClick={() => setAllowedGuest(true)}
-                  />
+                  {isGuestCheckoutEnabled && (
+                    <OButton
+                      text={t('CONTINUE_AS_GUEST', 'Continue as guest')}
+                      textStyle={{ color: theme.colors.black }}
+                      bgColor={theme.colors.white}
+                      borderColor={theme.colors.black}
+                      style={{ borderRadius: 7.6, marginTop: 20 }}
+                      onClick={() => setAllowedGuest(true)}
+                    />
+                  )}
                 </View>
               ) : (
                 <UserDetails
@@ -643,6 +647,14 @@ const MultiCheckoutUI = (props: any) => {
               {t('WARNING_INVALID_PRODUCTS_CHECKOUT', 'To continue with your checkout, please remove from your cart the products that are not available.')}
             </OText>
           )}
+          {(!isGuestCheckoutEnabled && !!user?.guest_id) && (
+            <OText
+              color={theme.colors.error}
+              size={12}
+            >
+              {t('LOGIN_SIGN_UP_COMPLETE_ORDER', 'Login/Sign up to complete your order.')}
+            </OText>
+          )}
         </ChContainer>
         <OModal
           open={openModal.signup}

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

@@ -48,6 +48,8 @@ const stripeDirectMethods = ['stripe_direct']
 const webViewPaymentGateway: any = ['paypal', 'square']
 const multiCheckoutMethods = ['global_google_pay', 'global_apple_pay']
 const cardsPaymethods = ['credomatic']
+const guestNotSupportedMethods = ['stripe', 'stripe_connect', 'stripe_redirect']
+const popupMethods = [...guestNotSupportedMethods, 'stripe_direct', 'paypal']
 
 const PaymentOptionsUI = (props: any) => {
   const {
@@ -77,7 +79,9 @@ const PaymentOptionsUI = (props: any) => {
     paymethodClicked,
     setPaymethodClicked,
     androidAppId,
-    setUserHasCards
+    setUserHasCards,
+    guestDisabledError,
+    handleOpenGuestSignup
   } = props
 
   const theme = useTheme();
@@ -125,6 +129,11 @@ const PaymentOptionsUI = (props: any) => {
   const paymethodsFieldRequired = ['paypal', 'apple_pay', 'global_apple_pay']
 
   const handlePaymentMethodClick = (paymethod: any) => {
+    const _guestNotSupportedMethods = guestDisabledError ? popupMethods : guestNotSupportedMethods
+    if (handleOpenGuestSignup && _guestNotSupportedMethods.includes(paymethod?.gateway) && !!user?.guest_id) {
+      handleOpenGuestSignup()
+      return
+    }
     if (cart?.balance > 0 || !!user?.guest_id) {
       if (paymethodsFieldRequired.includes(paymethod?.gateway) && requiredFields.length > 0) {
         openUserModal && openUserModal(true)