ordering-ui-react-native 0.21.23 → 0.21.25

package/package.json

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

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

@@ -96,10 +96,10 @@ const NewOrderNotificationUI = (props: any) => {
         handlePlayNotificationSound({ evt: 2, orderId: value?.id })
       }
     }
-    if (evtType === 3 || value.author_id === user.id) return
+    if (evtType === 3 || value?.author_id === user.id) return
     setTimeout(() => handlePlayNotificationSound({
       evt: evtType,
-      orderId: value?.driver ? value?.order_id : evtList[evtType].event === 'messages' ? value?.order?.id : value?.order_id
+      orderId: value?.driver ? value?.order_id : evtList[evtType].event === 'messages' ? value?.order?.id : value?.order_id ?? value?.id
     }), 1000)
   }
 

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

@@ -158,12 +158,13 @@ const CheckoutUI = (props: any) => {
 	const [webviewPaymethod, setWebviewPaymethod] = useState<any>(null)
 	const [isOpen, setIsOpen] = useState(false)
 	const [requiredFields, setRequiredFields] = useState<any>([])
-	const [openModal, setOpenModal] = useState({ login: false, signup: false })
+	const [openModal, setOpenModal] = useState({ login: false, signup: false, isGuest: false })
 	const [allowedGuest, setAllowedGuest] = useState(false)
 	const [placeByMethodPay, setPlaceByMethodPay] = useState(false)
 	const [methodPaySupported, setMethodPaySupported] = useState({ enabled: false, message: null, loading: true })
 	const [cardList, setCardList] = useState<any>({ cards: [], loading: false, error: null })
 	const cardsMethods = ['credomatic']
+  	const stripePaymethods: any = ['stripe', 'stripe_direct', 'stripe_connect', 'stripe_redirect']
 	const placeSpotTypes = [3, 4, 5]
 	const placeSpotsEnabled = placeSpotTypes.includes(options?.type)
 	const isGiftCardCart = !cart?.business_id
@@ -237,7 +238,8 @@ const CheckoutUI = (props: any) => {
 			user,
 			token: user?.session?.access_token
 		})
-		setOpenModal({ ...openModal, signup: false })
+		openModal?.isGuest && handlePlaceOrderAsGuest()
+    	setOpenModal({ ...openModal, signup: false, isGuest: false })
 	}
 
 	const handleSuccessLogin = (user: any) => {
@@ -245,6 +247,11 @@ const CheckoutUI = (props: any) => {
 	}
 
 	const handlePlaceOrder = (confirmPayment: any, forcePlace: boolean = false) => {
+		if (stripePaymethods.includes(paymethodSelected?.gateway) && user?.guest_id) {
+			setOpenModal({ ...openModal, signup: true, isGuest: true })
+			return
+		}
+
 		if (!userErrors.length && (!requiredFields?.length || allowedGuest) || forcePlace) {
 			vibrateApp()
 			handlerClickPlaceOrder && handlerClickPlaceOrder(null, { isNative: true }, confirmPayment)
@@ -927,7 +934,7 @@ const CheckoutUI = (props: any) => {
 					</OModal>
 					<OModal
 						open={openModal.signup}
-						onClose={() => setOpenModal({ ...openModal, signup: false })}
+						onClose={() => setOpenModal({ ...openModal, signup: false, isGuest: false })}
 					>
 						<ScrollView style={{ paddingHorizontal: 20, width: '100%' }}>
 							<SignupForm