ordering-ui-react-native 0.24.1 → 0.24.3

package/package.json

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

package/themes/business/src/components/OrderDetails/OrderHeaderComponent.tsx

@@ -163,8 +163,8 @@ export const OrderHeaderComponent = (props: OrderHeader) => {
           </TouchableOpacity>
           {(!order?.isLogistic || (!logisticOrderStatus?.includes(order?.status) && !order?.order_group)) && (
             <Actions>
-              {getOrderStatus(order?.status, t)?.value !==
-                t('PENDING', 'Pending') && (
+              {getOrderStatus(order?.status, t)?.slug !==
+                'PENDING' && (
                   <>
                     <TouchableOpacity onPress={() => handleCopyClipboard?.()}>
                       <MaterialCommunityIcons
@@ -244,8 +244,8 @@ export const OrderHeaderComponent = (props: OrderHeader) => {
 
             {(!order?.isLogistic || (!logisticOrderStatus?.includes(order?.status) && !order?.order_group)) && (
               <Actions>
-                {getOrderStatus(order?.status, t)?.value !==
-                  t('PENDING', 'Pending') && (
+                {getOrderStatus(order?.status, t)?.slug !==
+                  'PENDING' && (
                     <>
                       <TouchableOpacity onPress={() => handleCopyClipboard?.()}>
                         <MaterialCommunityIcons

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

@@ -814,14 +814,14 @@ export const OrdersListManager = (props: OrdersOptionParams) => {
       {
         key: 18,
         text: t(
-          'DRIVER_ALMOST_ARRIVED_TO_BUSINESS',
+          'ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS',
           'Driver almost arrived to business',
         ),
       },
       {
         key: 19,
         text: t(
-          'DRIVER_ALMOST_ARRIVED_TO_CUSTOMER',
+          'ORDER_DRIVER_ALMOST_ARRIVED_CUSTOMER',
           'Driver almost arrived to customer',
         ),
       },

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

@@ -1169,14 +1169,14 @@ export const OrdersOption = (props: OrdersOptionParams) => {
       {
         key: 18,
         text: t(
-          'DRIVER_ALMOST_ARRIVED_TO_BUSINESS',
+          'ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS',
           'Driver almost arrived to business',
         ),
       },
       {
         key: 19,
         text: t(
-          'DRIVER_ALMOST_ARRIVED_TO_CUSTOMER',
+          'ORDER_DRIVER_ALMOST_ARRIVED_CUSTOMER',
           'Driver almost arrived to customer',
         ),
       },

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

@@ -158,19 +158,19 @@ export const PreviousMessages = (props: PreviousMessagesParams) => {
       {
         key: 18,
         value: t(
-          'DRIVER_ALMOST_ARRIVED_TO_BUSINESS',
+          'ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS',
           'Driver almost arrived to business',
         ),
-        slug: 'DRIVER_ALMOST_ARRIVED_TO_BUSINESS',
+        slug: 'ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS',
         percentage: 0.15,
       },
       {
         key: 19,
         value: t(
-          'DRIVER_ALMOST_ARRIVED_TO_CUSTOMER',
+          'ORDER_DRIVER_ALMOST_ARRIVED_CUSTOMER',
           'Driver almost arrived to customer',
         ),
-        slug: 'DRIVER_ALMOST_ARRIVED_TO_CUSTOMER',
+        slug: 'ORDER_DRIVER_ALMOST_ARRIVED_CUSTOMER',
         percentage: 0.9,
       },
       {

package/themes/business/src/utils/index.tsx

@@ -301,19 +301,19 @@ export const getOrderStatus = (s: string, t: any) => {
     {
       key: 18,
       value: t(
-        'DRIVER_ALMOST_ARRIVED_TO_BUSINESS',
+        'ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS',
         'Driver almost arrived to business',
       ),
-      slug: 'DRIVER_ALMOST_ARRIVED_TO_BUSINESS',
+      slug: 'ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS',
       percentage: 0.15,
     },
     {
       key: 19,
       value: t(
-        'DRIVER_ALMOST_ARRIVED_TO_CUSTOMER',
+        'ORDER_DRIVER_ALMOST_ARRIVED_CUSTOMER',
         'Driver almost arrived to customer',
       ),
-      slug: 'DRIVER_ALMOST_ARRIVED_TO_CUSTOMER',
+      slug: 'ORDER_DRIVER_ALMOST_ARRIVED_CUSTOMER',
       percentage: 0.9,
     },
     {

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

@@ -349,15 +349,50 @@ const AddressFormUI = (props: AddressFormParams) => {
 	};
 
 	const handleChangeAddress = (data: any, details: any) => {
-		const addressSelected = {
-			address: data?.description || data?.address,
-			location: details?.geometry?.location,
-			utc_offset: details?.utc_offset || null,
-			map_data: { library: 'google', place_id: data.place_id },
-			zip_code: data?.zip_code || null,
-		};
-		updateChanges(addressSelected);
-	};
+		const addressObj : any = {}
+    if (details?.address_components) {
+      details.address_components.map((component: any) => {
+        const addressType = component.types[0]
+        if (addressType === 'postal_code') {
+          addressObj.zipcode = component.short_name
+        }
+        if (addressType === 'street_number') {
+          addressObj.street_number = component.long_name
+        }
+        if (addressType === 'neighborhood') {
+          addressObj.neighborhood = component.long_name
+        }
+        if (addressType === 'route') {
+          addressObj.route = component.short_name
+        }
+        if (addressType === 'locality') {
+          addressObj.locality = component.long_name
+        }
+        if (component.types?.includes('sublocality')) {
+          addressObj.sublocality = component.long_name
+        }
+        if (addressType === 'country') {
+          addressObj.country = component.long_name
+          addressObj.country_code = component.short_name
+        }
+        if (addressType === 'administrative_area_level_1') {
+          addressObj.state = component.long_name
+        }
+        if (addressType === 'administrative_area_level_2') {
+          addressObj.city = component.long_name
+        }
+      })
+    }
+    const addressSelected = {
+      address: data?.description || data?.address,
+      location: details?.geometry?.location,
+      utc_offset: details?.utc_offset || null,
+      map_data: { library: 'google', place_id: data.place_id },
+      zipcode: data?.zipcode || null,
+      ...addressObj
+    };
+    updateChanges(addressSelected);
+  };
 
 	const handleAddressTag = (tag: string) => {
 		setAddressTag(tag);
@@ -610,7 +645,7 @@ const AddressFormUI = (props: AddressFormParams) => {
 											onFail={(error) =>
 												setAlertState({
 													open: true,
-													content: getTraduction(error),
+													content: getTraduction(error, t),
 												})
 											}
 											styles={{

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

@@ -34,7 +34,8 @@ export const GPSButton = (props: any) => {
         }
         let data : any
         const details = {
-          geometry: { location: { lat: pos.latitude, lng: pos.longitude } }
+          geometry: { location: { lat: pos.latitude, lng: pos.longitude } },
+          address_components: results[0]?.address_components
         }
         // if (isSetInputs) {
           data = {

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

@@ -82,7 +82,8 @@ export const GoogleMap = (props: GoogleMapsParams) => {
           place_id: results[0]?.place_id,
         }
         const details = {
-          geometry: { location: { lat: pos.latitude, lng: pos.longitude } }
+          geometry: { location: { lat: pos.latitude, lng: pos.longitude } },
+          address_components: results[0]?.address_components,
         }
         handleChangeAddressMap && handleChangeAddressMap(address, details)
         setSaveLocation && setSaveLocation(false)

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

@@ -133,9 +133,9 @@ const MessagesUI = (props: MessagesParams) => {
 				? `${message.change.old === null ? '0' : message.change.old} ${t('TO', 'to')} ${message.change.new} ${t('MINUTES', 'Minutes')}`
 				: `${message.change?.attribute !== 'logistic_status'
 					? message.change.old !== null && t(ORDER_STATUS[parseInt(message.change.old, 10)])
-					: message.change.old !== null && getLogisticTag(message.change.old)} ${t('TO', 'to')} ${message.change?.attribute !== 'logistic_status'
+					: message.change.old !== null && getLogisticTag(message.change.old, t)} ${t('TO', 'to')} ${message.change?.attribute !== 'logistic_status'
 						? t(ORDER_STATUS[parseInt(message.change.new, 10)])
-						: getLogisticTag(message.change.new)}`
+						: getLogisticTag(message.change.new, t)}`
 			}`
 			: message.change.new
 				?

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

@@ -534,7 +534,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                           <LinearGradient
                             start={{ x: 0.0, y: 0.0 }}
                             end={{
-                              x: progressBarObjt(order?.status)?.percentage || 0,
+                              x: progressBarObjt(order?.status, t)?.percentage || 0,
                               y: 0,
                             }}
                             locations={[0.9999, 0.9999]}
@@ -547,7 +547,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                           lineHeight={24}
                           weight={'600'}
                           color={theme.colors.textNormal}>
-                          {progressBarObjt(order?.status)?.value}
+                          {progressBarObjt(order?.status, t)?.value}
                         </OText>
                       </>
                     )}

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

@@ -114,7 +114,7 @@ const OrderProgressUI = (props: any) => {
     setInitialLoaded(true)
   }, [orderList.loading, initialLoaded])
 
-  const progressBarObjt = (s: any) => lastOrder?.delivery_type && lastOrder?.delivery_type === 2 ? getOrderStatuPickUp(s) : getOrderStatus(s)
+  const progressBarObjt = (s: any) => lastOrder?.delivery_type && lastOrder?.delivery_type === 2 ? getOrderStatuPickUp(s, t) : getOrderStatus(s, t)
 
   return (
     <>

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

@@ -177,7 +177,7 @@ export const VerifyPhone = (props: any) => {
 								size={16}
 								color={theme.colors.error}
 							>
-								{`* ${t(getTraduction(e))}`}
+								{`* ${t(getTraduction(e, t))}`}
 							</OText>
 						))}
 					</ErrorSection>

package/themes/original/src/providers/AlertProvider.tsx

@@ -28,7 +28,7 @@ const Alert = (props: Props) => {
       show={open}
       showProgress={false}
       title={title}
-      message={getTraduction(content?.[0])}
+      message={getTraduction(content?.[0], t)}
       closeOnTouchOutside={true}
       closeOnHardwareBackPress={false}
       showConfirmButton={true}

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

@@ -1,11 +1,9 @@
 import React from 'react';
-import { useLanguage } from 'ordering-components/native';
 import FontAwesome from 'react-native-vector-icons/FontAwesome';
 import { CODES } from 'ordering-components/native'
 import { ORDER_TYPES } from '../config/constants';
 import { useTheme } from 'styled-components/native';
 
-const [languageState, t] = useLanguage();
 const theme = useTheme()
 
 export const flatArray = (arr: any) => [].concat(...arr)
@@ -19,8 +17,7 @@ export const orderTypeList = ['delivery', 'pickup', 'eatin', 'curbside', 'drivet
  * Function to return the traduction depending of a key 't'
  * @param {string} key for traduction
  */
-export const getTraduction = (key: string) => {
-  const [, t] = useLanguage()
+export const getTraduction = (key: string, t: any) => {
   const keyList: any = {
     // Add the key and traduction that you need below
     ERROR_ORDER_WITHOUT_CART: 'The order was placed without a cart',
@@ -130,32 +127,34 @@ export const monthsEnum: any = {
   Dec: 'MONTHSHORT12',
 }
 
-export const locale = {
-  name: languageState?.language?.code?.slice(0, 2),
-  config: {
-    months: [
-      t('MONTH1', 'January'),
-      t('MONTH2', 'February'),
-      t('MONTH3', 'March'),
-      t('MONTH4', 'April'),
-      t('MONTH5', 'May'),
-      t('MONTH6', 'June'),
-      t('MONTH7', 'July'),
-      t('MONTH8', 'August'),
-      t('MONTH9', 'September'),
-      t('MONTH10', 'October'),
-      t('MONTH11', 'November'),
-      t('MONTH12', 'December')
-    ],
-    weekdaysShort: [
-      t('DAYSHORT7', 'Sun'),
-      t('DAYSHORT1', 'Mon'),
-      t('DAYSHORT2', 'Tue'),
-      t('DAYSHORT3', 'Wed'),
-      t('DAYSHORT4', 'Thu'),
-      t('DAYSHORT5', 'Fri'),
-      t('DAYSHORT6', 'Sat')
-    ],
+export const locale = (languageState: any, t: any) => {
+  return {
+    name: languageState?.language?.code?.slice(0, 2),
+    config: {
+      months: [
+        t('MONTH1', 'January'),
+        t('MONTH2', 'February'),
+        t('MONTH3', 'March'),
+        t('MONTH4', 'April'),
+        t('MONTH5', 'May'),
+        t('MONTH6', 'June'),
+        t('MONTH7', 'July'),
+        t('MONTH8', 'August'),
+        t('MONTH9', 'September'),
+        t('MONTH10', 'October'),
+        t('MONTH11', 'November'),
+        t('MONTH12', 'December')
+      ],
+      weekdaysShort: [
+        t('DAYSHORT7', 'Sun'),
+        t('DAYSHORT1', 'Mon'),
+        t('DAYSHORT2', 'Tue'),
+        t('DAYSHORT3', 'Wed'),
+        t('DAYSHORT4', 'Thu'),
+        t('DAYSHORT5', 'Fri'),
+        t('DAYSHORT6', 'Sat')
+      ],
+    }
   }
 };
 
@@ -365,7 +364,7 @@ export const priceList = [
   { level: '5', content: '$$$$$' }
 ]
 
-export const getLogisticTag = (status: any) => {
+export const getLogisticTag = (status: any, t: any) => {
   const keyList: any = {
     0: t('PENDING', 'Pending'),
     1: t('IN_PROGRESS', 'In progress'),
@@ -376,7 +375,7 @@ export const getLogisticTag = (status: any) => {
   return keyList[status] ? keyList[status] : t('UNKNOWN', 'Unknown')
 }
 
-export const getOrderStatus = (s: string) => {
+export const getOrderStatus = (s: string, t: any) => {
   const status = parseInt(s);
   const orderStatus = [
     {
@@ -593,7 +592,7 @@ export const getOrderStatus = (s: string) => {
   return objectStatus && objectStatus;
 }
 
-export const getOrderStatuPickUp = (s: any) => {
+export const getOrderStatuPickUp = (s: any, t: any) => {
   const status = parseInt(s);
   const orderStatus = [
     {