ordering-ui-react-native 0.16.40-release → 0.16.41-release

package/package.json

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

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

@@ -472,7 +472,7 @@ const ChatUI = (props: MessagesParams) => {
     const firstMessage = {
       _id: 0,
       text: console,
-      createdAt: order?.created_at,
+      createdAt: parseDate(order?.created_at, { outputFormat: 'YYYY-MM-DD HH:mm:ss' }),
       system: true,
     };
     messages?.messages.map((message: any) => {
@@ -488,7 +488,7 @@ const ChatUI = (props: MessagesParams) => {
         newMessage = {
           _id: message.id,
           text: message.type === 1 ? messageConsole(message) : message.comment,
-          createdAt: message.type !== 0 && message.created_at,
+          createdAt: message.type !== 0 && parseDate(message?.created_at, { outputFormat: 'YYYY-MM-DD HH:mm:ss' }),
           image: message.source,
           system: message.type === 1,
           user: {

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

@@ -74,7 +74,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 	const theme = useTheme();
 	const [, t] = useLanguage()
 	const [{ auth }] = useSession()
-	const [orderState, { clearCart }] = useOrder()
+	const [orderState, { addProduct, updateProduct }] = useOrder()
 	const [{ parsePrice }] = useUtils()
 	const [, { showToast }] = useToast()
 	const [{ configs }] = useConfig()
@@ -133,6 +133,7 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 	const [searchBarHeight, setSearchBarHeight] = useState(60)
 
 	const isCheckoutMultiBusinessEnabled: Boolean = configs?.checkout_multi_business_enabled?.value === '1'
+	const isQuickAddProduct = configs?.add_product_with_one_click?.value === '1'
 	const openCarts = (Object.values(orderState?.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 currentCart: any = Object.values(orderState.carts).find((cart: any) => cart?.business?.slug === business?.slug) ?? {}
@@ -141,20 +142,39 @@ const BusinessProductsListingUI = (props: BusinessProductsListingParams) => {
 	const onRedirect = (route: string, params?: any) => {
 		navigation.navigate(route, params)
 	}
-
-	const onProductClick = (product: any) => {
-		const productAddedToCartLength = currentCart?.products?.reduce((productsLength: number, Cproduct: any) => { return productsLength + (Cproduct?.id === product?.id ? Cproduct?.quantity : 0) }, 0) || 0
-		if (product?.type === 'service' && business?.professionals?.length > 0) {
-			setCurrentProduct(product)
-			setOpenService(true)
-			return
+	const onProductClick = async (product: any) => {
+		if (product.extras.length === 0 && !product.inventoried && auth && isQuickAddProduct) {
+			const isProductAddedToCart = currentCart?.products?.find((Cproduct: any) => Cproduct.id === product.id)
+			const productQuantity = isProductAddedToCart?.quantity
+			const addCurrentProduct = {
+				...product,
+				quantity: 1
+			}
+			const updateCurrentProduct = {
+				id: product.id,
+				code: isProductAddedToCart?.code,
+				quantity: productQuantity + 1
+			}
+			const cartData = currentCart?.business_id ? currentCart : { business_id: business.id }
+			if (isProductAddedToCart) {
+				await updateProduct(updateCurrentProduct, cartData, isQuickAddProduct)
+			} else {
+				await addProduct(addCurrentProduct, cartData, isQuickAddProduct)
+			}
+		} else {
+			const productAddedToCartLength = currentCart?.products?.reduce((productsLength: number, Cproduct: any) => { return productsLength + (Cproduct?.id === product?.id ? Cproduct?.quantity : 0) }, 0) || 0
+			if (product?.type === 'service' && business?.professionals?.length > 0) {
+				setCurrentProduct(product)
+				setOpenService(true)
+				return
+			}
+			onRedirect('ProductDetails', {
+				product: product,
+				businessSlug: business.slug,
+				businessId: business.id,
+				productAddedToCartLength
+			})
 		}
-		onRedirect('ProductDetails', {
-			product: product,
-			businessSlug: business.slug,
-			businessId: business.id,
-			productAddedToCartLength
-		})
 	}
 
 	const handleCancel = () => {

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

@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { View, StyleSheet, TouchableOpacity, Platform, I18nManager } from 'react-native';
+import { View, StyleSheet, TouchableOpacity, Platform, I18nManager, Vibration } from 'react-native';
 import { initStripe, useConfirmPayment } from '@stripe/stripe-react-native';
 import Picker from 'react-native-country-picker-modal';
 import MaterialIcons from 'react-native-vector-icons/MaterialIcons'
@@ -87,7 +87,8 @@ const CheckoutUI = (props: any) => {
 		instructionsOptions,
 		handleChangeDeliveryOption,
 		currency,
-		merchantId
+		merchantId,
+		setPlaceSpotNumber
 	} = props
 
 	const theme = useTheme();
@@ -600,6 +601,7 @@ const CheckoutUI = (props: any) => {
 								isInputMode
 								cart={cart}
 								spotNumberDefault={cartState?.cart?.spot_number ?? cart?.spot_number}
+								setPlaceSpotNumber={setPlaceSpotNumber}
 								vehicleDefault={cart?.vehicle}
 							/>
 							<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginHorizontal: -40 }} />
@@ -741,7 +743,7 @@ const CheckoutUI = (props: any) => {
 			</Container>
 			{!cartState.loading && cart && cart?.status !== 2 && (
 				<FloatingButton
-					handleClick={() => handlePlaceOrder(null)}
+					handleClick={isDisabledButtonPlace ? () => Vibration.vibrate() : () => handlePlaceOrder(null)}
 					isSecondaryBtn={isDisabledButtonPlace}
 					disabled={isDisabledButtonPlace}
 					btnText={subtotalWithTaxes >= cart?.minimum

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

@@ -141,7 +141,7 @@ const MessagesUI = (props: MessagesParams) => {
 		const firstMessage = {
 			_id: 0,
 			text: _console,
-			createdAt: order?.created_at,
+			createdAt: parseDate(order?.created_at, { outputFormat: 'YYYY-MM-DD HH:mm:ss' }),
 			system: true
 		}
 		const newMessage: any = [];
@@ -150,7 +150,7 @@ const MessagesUI = (props: MessagesParams) => {
 				newMessage.push({
 					_id: message?.id,
 					text: message.type === 1 ? messageConsole(message) : message.comment,
-					createdAt: message.type !== 0 && message.created_at,
+					createdAt: message.type !== 0 && parseDate(message?.created_at, { outputFormat: 'YYYY-MM-DD HH:mm:ss' }),
 					image: message.source,
 					system: message.type === 1,
 					user: {
@@ -165,7 +165,7 @@ const MessagesUI = (props: MessagesParams) => {
 				newMessage.push({
 					_id: message?.id,
 					text: message.type === 1 ? messageConsole(message) : message.comment,
-					createdAt: message.type !== 0 && message.created_at,
+					createdAt: message.type !== 0 && parseDate(message?.created_at, { outputFormat: 'YYYY-MM-DD HH:mm:ss' }),
 					image: message.source,
 					system: message.type === 1,
 					user: {

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

@@ -23,13 +23,14 @@ const PlaceSpotUI = (props: PlaceSpotParams) => {
     isInputMode,
     setSpotNumber,
     setVehicle,
-    handleChangeSpot
+    handleChangeSpot,
+    setPlaceSpotNumber
   } = props
 
   const theme = useTheme()
   const [, t] = useLanguage()
   const [orderState] = useOrder()
-	const [, { showToast }] = useToast();
+  const [, { showToast }] = useToast();
 
   const [placeGroupSelected, setPlaceGroupSelected] = useState<any>(null)
   const vehicleInputAllowed = [4, 5]
@@ -135,10 +136,15 @@ const PlaceSpotUI = (props: PlaceSpotParams) => {
   useEffect(() => {
     if (spotState?.error?.length > 0) {
       const errorText = manageErrorsToShow(spotState?.error)
-			showToast(ToastType.Error, errorText)
+      showToast(ToastType.Error, errorText)
     }
   }, [spotState?.error])
 
+  const onChangePlaceSpot = (value: string) => {
+    setSpotNumber(value)
+    setPlaceSpotNumber(value)
+  }
+
   return (
     <PlaceSpotContainer>
       {isInputMode ? (
@@ -220,12 +226,12 @@ const PlaceSpotUI = (props: PlaceSpotParams) => {
             value={spotNumber?.toString() ?? ''}
             placeholder={placeholderText}
             type='number-pad'
-            onChange={(value: string) => setSpotNumber(value)}
+            onChange={(value: string) => onChangePlaceSpot(value)}
             style={{
               borderColor: theme.colors.border,
               borderRadius: 7.6
             }}
-						inputStyle={{ fontSize: 12, color: theme.colors.textNormal }}
+            inputStyle={{ fontSize: 12, color: theme.colors.textNormal }}
           />
           <View style={{ alignItems: 'flex-start' }}>
             <OButton
@@ -278,7 +284,7 @@ const PlaceSpotUI = (props: PlaceSpotParams) => {
                     onSelect={(place: any) => handlerChangePlace(place)}
                     placeholder={t('SELECT_YOUR_SPOT', 'Select your spot')}
                     options={getPlaces()}
-                    defaultValue={placesState?.places?.find((place : any) => place?.id === cart?.place_id)}
+                    defaultValue={placesState?.places?.find((place: any) => place?.id === cart?.place_id)}
                     isModal
                   />
                 </View>

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

@@ -670,6 +670,7 @@ export interface PlaceSpotParams {
 	vehicle?: any,
 	setVehicle?: any,
 	handleChangeSpot?: any
+	setPlaceSpotNumber?: any
 }
 
 export interface PromotionParams {
@@ -735,7 +736,7 @@ export interface PreviousBusinessOrderedParams {
 	isBusinessesSearchList?: any,
 	businessLoading?: boolean,
 	businesses?: any
-  handleUpdateBusinesses?: (businessId: number, changes: any) => {},
+	handleUpdateBusinesses?: (businessId: number, changes: any) => {},
 }
 
 export interface ServiceFormParams {