ordering-ui-react-native 0.16.71 → 0.16.72-release

package/themes/original/src/layouts/Container.tsx

@@ -1,6 +1,7 @@
 import React from 'react';
-import styled, { css } from 'styled-components/native';
-import { Platform } from 'react-native';
+import { useSafeAreaInsets } from 'react-native-safe-area-context'
+import styled, { css, useTheme } from 'styled-components/native';
+import { Platform, View } from 'react-native';
 
 const ContainerStyled = styled.ScrollView`
   flex: 1;
@@ -10,17 +11,20 @@ const ContainerStyled = styled.ScrollView`
   background-color: ${(props: any) => props.theme.colors.backgroundPage};
 `;
 
-const SafeAreaStyled = styled.SafeAreaView`
-  flex: 1;
-  background-color: ${(props: any) => props.theme.colors.backgroundPage};
-`;
-
 export const Container = (props: any) => {
+  const theme = useTheme()
+  const insets = useSafeAreaInsets()
   return (
-    <SafeAreaStyled>
+    <View
+      style={{
+        flex: 1,
+        paddingTop: props.pt ?? insets.top,
+        backgroundColor: theme.colors.backgroundPage
+      }}
+    >
       <ContainerStyled {...props} ref={props?.forwardRef} keyboardShouldPersistTaps='handled' style={{...props.style}}>
         {props.children}
       </ContainerStyled>
-    </SafeAreaStyled>
+    </View>
   )
 }

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

@@ -47,6 +47,8 @@ export interface ProfileParams {
 	isVerifiedPhone?: any;
 	handleRemoveAccount?: any;
 	removeAccountState?: any;
+	handleChangePromotions?: any;
+	notificationsGroup?: any;
 }
 
 export interface AddressListParams {
@@ -80,6 +82,7 @@ export interface AddressFormParams {
 	saveAddress?: any,
 	userCustomerSetup?: boolean,
 	isRequiredField?: (field: string) => {},
+	showField?: (field: string) => {},
 	isGuestUser?: boolean,
 	useValidationFileds?: boolean,
 	isSelectedAfterAdd?: boolean,
@@ -170,6 +173,9 @@ export interface BusinessesListingParams {
 	handleChangePriceLevel?: any;
 	businessTypeSelected?: any;
 	logosLayout?: boolean;
+	isCustomLayout?: boolean;
+	citiesState?: any;
+	actualSlug?: any;
 }
 export interface HighestRatedBusinessesParams {
 	businessesList: { businesses: Array<any>, loading: boolean, error: null | string };
@@ -215,6 +221,9 @@ export interface BusinessControllerParams {
 	setFavoriteIds?: any;
 	handleUpdateBusinessList?: any;
 	enableIntersection?: boolean;
+	isCustomLayout?: boolean;
+	getBusinessOffer?: any;
+	handleCustomUpdate?: (businessId: number, changes: any) => {};
 }
 export interface BusinessProductsListingParams {
 	navigation?: any;
@@ -240,6 +249,9 @@ export interface BusinessProductsListingParams {
 	handleUpdateProducts?: any;
 	professionalSelected?: any;
 	handleChangeProfessionalSelected?: any;
+	handleUpdateProfessionals?: any;
+	onBusinessClick?: any;
+	onNavigationRedirect?: any;
 }
 export interface BusinessBasicInformationParams {
 	navigation?: any;
@@ -305,6 +317,7 @@ export interface SingleProductCardParams {
 	enableIntersection?: boolean;
 	navigation?: any;
 	isPreviously?: any;
+	isProductId?: any;
 }
 export interface BusinessInformationParams {
 	navigation?: any,
@@ -359,6 +372,8 @@ export interface OrdersOptionParams {
 	refreshOrders?: boolean,
 	setRefreshOrders?: (value: boolean) => void,
 	handleUpdateOrderList?: (orderId: number, changes: any) => {},
+	handleUpdateProducts?: (productId: number, changes: any) => {},
+	handleUpdateBusinesses?: (businessId: number, changes: any) => {},
 	isBusiness?: boolean,
 	isProducts?: boolean,
 	businessOrderIds?: any,
@@ -366,6 +381,8 @@ export interface OrdersOptionParams {
 	businessesSearchList?: any,
 	hideOrders?: boolean,
 	BusinessControllerSkeletons?: any,
+	businessPaginationProps?: any,
+	businesses?: any
 }
 export interface ActiveOrdersParams {
 	orders?: any,
@@ -387,6 +404,7 @@ export interface PreviousOrdersParams {
 	getOrderStatus?: any,
 	orderID?: number
 	reorderLoading?: boolean,
+	loading?: boolean,
 	loadMoreOrders?: () => {},
 	handleReorder?: (orderId: number) => {},
 	onNavigationRedirect?: (route: string, params?: any) => {}
@@ -575,6 +593,8 @@ export interface UpsellingProductsParams {
 	products?: any;
 	onNavigationRedirect?: any;
 	onGoBack?: any;
+	singleBusiness?: any;
+	isFranchiseApp?: any;
 }
 
 export interface GoogleMapsParams {
@@ -635,6 +655,7 @@ export interface BusinessSearchParams {
 	onNavigationRedirect?: any,
 	handleUpdateProducts: any,
 	handleUpdateBusinessList?: any;
+	brandId?: number
 }
 
 export interface NoNetworkParams {
@@ -648,14 +669,15 @@ export interface PlaceSpotParams {
 	spotNumberDefault?: any,
 	vehicleDefault?: any,
 	spotNumber?: any,
-    setSpotNumber?: any,
+	setSpotNumber?: any,
 	orderTypes?: any,
 	placesState?: any,
-	handleChangePlace? : any,
+	handleChangePlace?: any,
 	spotState?: any,
 	vehicle?: any,
 	setVehicle?: any,
 	handleChangeSpot?: any
+	setPlaceSpotNumber?: any
 }
 
 export interface PromotionParams {
@@ -719,7 +741,9 @@ export interface PreviousBusinessOrderedParams {
 	businessId?: number,
 	onNavigationRedirect?: any,
 	isBusinessesSearchList?: any,
-	businessLoading?: boolean
+	businessLoading?: boolean,
+	businesses?: any
+	handleUpdateBusinesses?: (businessId: number, changes: any) => {},
 }
 
 export interface ServiceFormParams {
@@ -732,7 +756,10 @@ export interface ServiceFormParams {
 	maxProductQuantity: any,
 	businessSlug?: string,
 	onClose: any,
-	professionalList: any
+	professionalList: any,
+	productObject?: any,
+	professionalListState?: any,
+	isCartProduct?: any
 }
 
 export interface ProfessionalFilterParams {
@@ -754,11 +781,14 @@ export interface OrderItAgainParams {
 	categoryState: any,
 	currentCart: any,
 	handleUpdateProducts: any,
-	navigation: any
+	navigation: any,
+	searchValue?: string
 }
 
 export interface PreviousProductsOrderedParams {
 	products?: any,
+	isProductId?: boolean
 	onProductClick?: any,
 	isBusinessesSearchList?: boolean
+	handleUpdateProducts?: any
 }

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

@@ -1,8 +1,12 @@
 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 { 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)
 
@@ -43,69 +47,113 @@ export const getTraduction = (key: string) => {
 /**
  * Change local moment variables
  */
- export const setLocalMoment = (moment : any, t : any) => {
+export const setLocalMoment = (moment: any, t: any) => {
   moment.locale('custom', {
     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')
+      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')
     ],
     monthsShort: [
-      t('MONTHSHORT1','Jan'),
-      t('MONTHSHORT2','Feb'),
-      t('MONTHSHORT3','Mar'),
-      t('MONTHSHORT4','Apr'),
-      t('MONTHSHORT5','May'),
-      t('MONTHSHORT6','Jun'),
-      t('MONTHSHORT7','Jul'),
-      t('MONTHSHORT8','Aug'),
-      t('MONTHSHORT9','Sep'),
-      t('MONTHSHORT10','Oct'),
-      t('MONTHSHORT11','Nov'),
-      t('MONTHSHORT12','Dec')
+      t('MONTHSHORT1', 'Jan'),
+      t('MONTHSHORT2', 'Feb'),
+      t('MONTHSHORT3', 'Mar'),
+      t('MONTHSHORT4', 'Apr'),
+      t('MONTHSHORT5', 'May'),
+      t('MONTHSHORT6', 'Jun'),
+      t('MONTHSHORT7', 'Jul'),
+      t('MONTHSHORT8', 'Aug'),
+      t('MONTHSHORT9', 'Sep'),
+      t('MONTHSHORT10', 'Oct'),
+      t('MONTHSHORT11', 'Nov'),
+      t('MONTHSHORT12', 'Dec')
     ],
     weekdays: [
-      t('DAY7','Sunday'),
-      t('DAY1','Monday'),
-      t('DAY2','Tuesday'),
-      t('DAY3','Wednesday'),
-      t('DAY4','Thursday'),
-      t('DAY5','Friday'),
-      t('DAY6','Saturday')
+      t('DAY7', 'Sunday'),
+      t('DAY1', 'Monday'),
+      t('DAY2', 'Tuesday'),
+      t('DAY3', 'Wednesday'),
+      t('DAY4', 'Thursday'),
+      t('DAY5', 'Friday'),
+      t('DAY6', 'Saturday')
     ],
     weekdaysShort: [
-      t('DAYSHORT7','Sun'),
-      t('DAYSHORT1','Mon'),
-      t('DAYSHORT2','Tue'),
-      t('DAYSHORT3','Wed'),
-      t('DAYSHORT4','Thu'),
-      t('DAYSHORT5','Fri'),
-      t('DAYSHORT6','Sat')
+      t('DAYSHORT7', 'Sun'),
+      t('DAYSHORT1', 'Mon'),
+      t('DAYSHORT2', 'Tue'),
+      t('DAYSHORT3', 'Wed'),
+      t('DAYSHORT4', 'Thu'),
+      t('DAYSHORT5', 'Fri'),
+      t('DAYSHORT6', 'Sat')
     ],
     weekdaysMin: [
-      t('DAYMIN7','Su'),
-      t('DAYMIN1','Mo'),
-      t('DAYMIN2','Tu'),
-      t('DAYMIN3','We'),
-      t('DAYMIN4','Th'),
-      t('DAYMIN5','Fr'),
-      t('DAYMIN6','Sa')
+      t('DAYMIN7', 'Su'),
+      t('DAYMIN1', 'Mo'),
+      t('DAYMIN2', 'Tu'),
+      t('DAYMIN3', 'We'),
+      t('DAYMIN4', 'Th'),
+      t('DAYMIN5', 'Fr'),
+      t('DAYMIN6', 'Sa')
     ],
-    meridiem : function (hours : any) {
-      return hours < 12 ? t('AM', 'AM') : t('PM','PM');
+    meridiem: function (hours: any) {
+      return hours < 12 ? t('AM', 'AM') : t('PM', 'PM');
     }
   })
 }
 
+export const monthsEnum: any = {
+  Jan: 'MONTHSHORT1',
+  Feb: 'MONTHSHORT2',
+  Mar: 'MONTHSHORT3',
+  Apr: 'MONTHSHORT4',
+  May: 'MONTHSHORT5',
+  Jun: 'MONTHSHORT6',
+  Jul: 'MONTHSHORT7',
+  Aug: 'MONTHSHORT8',
+  Sep: 'MONTHSHORT9',
+  Oct: 'MONTHSHORT10',
+  Nov: 'MONTHSHORT11',
+  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')
+    ],
+  }
+};
+
 /**
  * Function to convert delivery time in minutes
  * @param {string} time business delivery time
@@ -182,7 +230,7 @@ export const getIconCard = (brand: string, size: number) => {
  * Function to return a static google maps image based in location
  * @param {object} param object with latitude and logitude
  */
- export const getGoogleMapImage = ({ lat, lng }: any, apiKey: string) => {
+export const getGoogleMapImage = ({ lat, lng }: any, apiKey: string) => {
   return `https://maps.googleapis.com/maps/api/staticmap?size=500x190&center=${lat},${lng}&zoom=17&scale=2&maptype=roadmap&&markers=icon:https://res.cloudinary.com/ditpjbrmz/image/upload/f_auto,q_auto,w_45,q_auto:best,q_auto:best/v1564675872/marker-customer_kvxric.png%7Ccolor:white%7C${lat},${lng}&key=${apiKey}`
 }
 /**
@@ -213,8 +261,8 @@ export const sortInputFields = ({ fields, values }: any) => {
   return fieldsSorted;
 }
 
-export const transformCountryCode = (countryCode : number) => {
-  const code = CODES.find((code : any) => code.phoneCode === countryCode)
+export const transformCountryCode = (countryCode: number) => {
+  const code = CODES.find((code: any) => code.phoneCode === countryCode)
   return code?.countryCode
 }
 
@@ -224,7 +272,7 @@ export const transformCountryCode = (countryCode : number) => {
  * @param {*} parser function fallback when is decimal
  * @returns string
  */
- export const verifyDecimals = (value: number, parser: any) => {
+export const verifyDecimals = (value: number, parser: any) => {
   if (value % 1 === 0) {
     return value
   } else {
@@ -240,7 +288,7 @@ export const getTypesText = (value: number) => {
 /**
  * List shape for ribbon
  */
- export const shape = {
+export const shape = {
   rectangle: 'rectangle',
   rectangleRound: 'rectangle_round',
   capsuleShape: 'capsule_shape'
@@ -251,7 +299,7 @@ export const getTypesText = (value: number) => {
  * @param {number} value for transform
  *
  */
- export const convertToRadian = (value: number) => {
+export const convertToRadian = (value: number) => {
   return value * Math.PI / 180
 }
 
@@ -273,14 +321,14 @@ export const getDistance = (lat1: any, lon1: any, lat2: any, lon2: any) => {
   return R * c
 }
 
-export const formatUrlVideo = (url : string) => {
+export const formatUrlVideo = (url: string) => {
   const regExp = /^.*((youtu.be\/)|(v\/)|(\/u\/\w\/)|(embed\/)|(watch\?))\??v?=?([^#&?]*).*/
   const match = url.match(regExp)
   const id = (match && match[7].length === 11) ? match[7] : false
   return `https://www.youtube-nocookie.com/embed/${id}`
 }
 
-export const formatSeconds = (seconds : number) => {
+export const formatSeconds = (seconds: number) => {
   // Hours, minutes and seconds
   var hrs = ~~(seconds / 3600)
   var mins = ~~((seconds % 3600) / 60)
@@ -299,10 +347,209 @@ export const formatSeconds = (seconds : number) => {
 /**
  * List of price to filter businesses
  */
- export const priceList = [
+export const priceList = [
   { level: '1', content: '$' },
   { level: '2', content: '$$' },
   { level: '3', content: '$$$' },
   { level: '4', content: '$$$$' },
   { level: '5', content: '$$$$$' }
 ]
+
+export const getOrderStatus = (s: string) => {
+  const status = parseInt(s);
+  const orderStatus = [
+    {
+      key: 0,
+      value: t('PENDING', 'Pending'),
+      slug: 'PENDING',
+      percentage: 0.25,
+      image: theme.images.order.status0,
+    },
+    {
+      key: 1,
+      value: t('COMPLETED', 'Completed'),
+      slug: 'COMPLETED',
+      percentage: 1,
+      image: theme.images.order.status1,
+    },
+    {
+      key: 2,
+      value: t('REJECTED', 'Rejected'),
+      slug: 'REJECTED',
+      percentage: 0,
+      image: theme.images.order.status2,
+    },
+    {
+      key: 3,
+      value: t('DRIVER_IN_BUSINESS', 'Driver in business'),
+      slug: 'DRIVER_IN_BUSINESS',
+      percentage: 0.6,
+      image: theme.images.order.status3,
+    },
+    {
+      key: 4,
+      value: t('PREPARATION_COMPLETED', 'Preparation Completed'),
+      slug: 'PREPARATION_COMPLETED',
+      percentage: 0.7,
+      image: theme.images.order.status4,
+    },
+    {
+      key: 5,
+      value: t('REJECTED_BY_BUSINESS', 'Rejected by business'),
+      slug: 'REJECTED_BY_BUSINESS',
+      percentage: 0,
+      image: theme.images.order.status5,
+    },
+    {
+      key: 6,
+      value: t('REJECTED_BY_DRIVER', 'Rejected by Driver'),
+      slug: 'REJECTED_BY_DRIVER',
+      percentage: 0,
+      image: theme.images.order.status6,
+    },
+    {
+      key: 7,
+      value: t('ACCEPTED_BY_BUSINESS', 'Accepted by business'),
+      slug: 'ACCEPTED_BY_BUSINESS',
+      percentage: 0.35,
+      image: theme.images.order.status7,
+    },
+    {
+      key: 8,
+      value: t('ACCEPTED_BY_DRIVER', 'Accepted by driver'),
+      slug: 'ACCEPTED_BY_DRIVER',
+      percentage: 0.45,
+      image: theme.images.order.status8,
+    },
+    {
+      key: 9,
+      value: t('PICK_UP_COMPLETED_BY_DRIVER', 'Pick up completed by driver'),
+      slug: 'PICK_UP_COMPLETED_BY_DRIVER',
+      percentage: 0.8,
+      image: theme.images.order.status9,
+    },
+    {
+      key: 10,
+      value: t('PICK_UP_FAILED_BY_DRIVER', 'Pick up Failed by driver'),
+      slug: 'PICK_UP_FAILED_BY_DRIVER',
+      percentage: 0,
+      image: theme.images.order.status10,
+    },
+    {
+      key: 11,
+      value: t(
+        'DELIVERY_COMPLETED_BY_DRIVER',
+        'Delivery completed by driver',
+      ),
+      slug: 'DELIVERY_COMPLETED_BY_DRIVER',
+      percentage: 1,
+      image: theme.images.order.status11,
+    },
+    {
+      key: 12,
+      value: t('DELIVERY_FAILED_BY_DRIVER', 'Delivery Failed by driver'),
+      slug: 'DELIVERY_FAILED_BY_DRIVER',
+      percentage: 0,
+      image: theme.images.order.status12,
+    },
+    {
+      key: 13,
+      value: t('PREORDER', 'PreOrder'),
+      slug: 'PREORDER',
+      percentage: 0,
+      image: theme.images.order.status13,
+    },
+    {
+      key: 14,
+      value: t('ORDER_NOT_READY', 'Order not ready'),
+      slug: 'ORDER_NOT_READY',
+      percentage: 0,
+      image: theme.images.order.status13,
+    },
+    {
+      key: 15,
+      value: t(
+        'ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER',
+        'Order picked up completed by customer',
+      ),
+      slug: 'ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER',
+      percentage: 100,
+      image: theme.images.order.status1,
+    },
+    {
+      key: 16,
+      value: t('CANCELLED_BY_CUSTOMER', 'Cancelled by customer'),
+      slug: 'CANCELLED_BY_CUSTOMER',
+      percentage: 0,
+      image: theme.images.order.status2,
+    },
+    {
+      key: 17,
+      value: t(
+        'ORDER_NOT_PICKEDUP_BY_CUSTOMER',
+        'Order not picked up by customer',
+      ),
+      slug: 'ORDER_NOT_PICKEDUP_BY_CUSTOMER',
+      percentage: 0,
+      image: theme.images.order.status2,
+    },
+    {
+      key: 18,
+      value: t(
+        'DRIVER_ALMOST_ARRIVED_TO_BUSINESS',
+        'Driver almost arrived to business',
+      ),
+      slug: 'DRIVER_ALMOST_ARRIVED_TO_BUSINESS',
+      percentage: 0.15,
+      image: theme.images.order.status3,
+    },
+    {
+      key: 19,
+      value: t(
+        'DRIVER_ALMOST_ARRIVED_TO_CUSTOMER',
+        'Driver almost arrived to customer',
+      ),
+      slug: 'DRIVER_ALMOST_ARRIVED_TO_CUSTOMER',
+      percentage: 0.9,
+      image: theme.images.order.status11,
+    },
+    {
+      key: 20,
+      value: t(
+        'ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS',
+        'Customer almost arrived to business',
+      ),
+      slug: 'ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS',
+      percentage: 90,
+      image: theme.images.order.status7,
+    },
+    {
+      key: 21,
+      value: t(
+        'ORDER_CUSTOMER_ARRIVED_BUSINESS',
+        'Customer arrived to business',
+      ),
+      slug: 'ORDER_CUSTOMER_ARRIVED_BUSINESS',
+      percentage: 95,
+      image: theme.images.order.status7,
+    },
+    {
+      key: 22,
+      value: t('ORDER_LOOKING_FOR_DRIVER', 'Looking for driver'),
+      slug: 'ORDER_LOOKING_FOR_DRIVER',
+      percentage: 35,
+      image: theme.images.order.status8
+    },
+    {
+      key: 23,
+      value: t('ORDER_DRIVER_ON_WAY', 'Driver on way'),
+      slug: 'ORDER_DRIVER_ON_WAY',
+      percentage: 45,
+      image: theme.images.order.status8
+    }
+  ];
+  
+  const objectStatus = orderStatus.find((o) => o.key === status);
+
+  return objectStatus && objectStatus;
+}

package/themes/uber-eats/src/components/BusinessesListing/index.tsx

@@ -144,7 +144,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
         {isFarAway && (
 					<FarAwayMessage style={styles.farAwayMsg}>
 						<Ionicons name='md-warning-outline' style={styles.iconStyle} />
-						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'You are far from this address')}</OText>
+						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'Your are far from this address')}</OText>
 					</FarAwayMessage>
 				)}
         <View style={styles.wrapperOrderOptions}>