ordering-ui-react-native 0.16.53 → 0.16.54-release

package/themes/original/src/components/shared/OIcon.tsx

@@ -26,7 +26,14 @@ const OImage = (props: Props): React.ReactElement => {
 	return (
 		<Wrapper style={{ borderRadius: props.style?.borderRadius, overflow: 'hidden', marginHorizontal: props.style?.marginHorizontal }}>
 			<SImage
-				source={props.src ? props.src : props.url ? { uri: props.url } : props.dummy}
+				source={
+					props.src
+						? props.src
+						: props.url
+							? typeof props.url === 'number'
+								? props.url
+								: { uri: props.url }
+							: props.dummy}
 				style={{
 					tintColor: props.color,
 					flex: props.isWrap ? 1 : 0,

package/themes/original/src/components/shared/OInput.tsx

@@ -3,6 +3,7 @@ import { ImageSourcePropType, ImageStyle, ViewStyle, TextInputProps, TextStyle }
 import styled from 'styled-components/native';
 import OIcon from './OIcon';
 import MaterialIcon from 'react-native-vector-icons/MaterialIcons'
+import { useTheme } from 'styled-components/native';
 
 const Input = styled.TextInput`
   flex-grow: 1;
@@ -39,6 +40,7 @@ interface Props extends TextInputProps {
 	inputStyle?: TextStyle;
 	wrapperRef?: any;
 	onPress?: any;
+	isFocusHighlight?: boolean
 }
 
 const Wrapper = styled.Pressable`
@@ -54,12 +56,16 @@ const Wrapper = styled.Pressable`
 `;
 
 const OInput = (props: Props): React.ReactElement => {
+	const theme = useTheme();
+	const [inputFocused, setInputFocused] = React.useState(false)
 	return (
 		<Wrapper
 			onPress={() => { props.forwardRef?.current?.focus?.(); props.onPress && props.onPress() }}
 			style={{
 				backgroundColor: props.bgColor,
-				borderColor: props.borderColor,
+				borderColor: !props.isFocusHighlight
+					? props.borderColor
+					: inputFocused ? theme.colors.primary : theme.colors.border,
 				...props.style,
 			}}>
 			{props.icon ? (
@@ -95,6 +101,8 @@ const OInput = (props: Props): React.ReactElement => {
 					props.forwardRef && (props.forwardRef.current = e)
 				}}
 				style={props?.inputStyle}
+				onFocus={() => setInputFocused(true)}
+				onBlur={() => setInputFocused(false)}
 			/>
 			{props.iconRight && (
 				<OIcon
@@ -114,6 +122,7 @@ OInput.defaultProps = {
 	iconColor: '#959595',
 	bgColor: 'white',
 	borderColor: 'white',
+	isFocusHighlight: false
 };
 
 export default OInput;

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/layouts/FloatingBottomContainer.tsx

@@ -19,7 +19,11 @@ export const Container = styled.View`
 
 export const FloatingBottomContainer = (props: any) => {
   return (
-    <Container style={{ width: windowWidth }}>
+    <Container style={{
+      width: windowWidth,
+      borderTopWidth: props?.borderTopWidth ?? 1,
+      borderRadius: props?.borderRadius ?? 0
+    }}>
       {props.children}
     </Container>
   )

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,
@@ -169,6 +172,10 @@ export interface BusinessesListingParams {
 	priceLevelSelected?: any;
 	handleChangePriceLevel?: any;
 	businessTypeSelected?: any;
+	logosLayout?: boolean;
+	isCustomLayout?: boolean;
+	citiesState?: any;
+	actualSlug?: any;
 }
 export interface HighestRatedBusinessesParams {
 	businessesList: { businesses: Array<any>, loading: boolean, error: null | string };
@@ -214,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;
@@ -239,6 +249,8 @@ export interface BusinessProductsListingParams {
 	handleUpdateProducts?: any;
 	professionalSelected?: any;
 	handleChangeProfessionalSelected?: any;
+	handleUpdateProfessionals?: any;
+	onBusinessClick?: any;
 }
 export interface BusinessBasicInformationParams {
 	navigation?: any;
@@ -287,7 +299,9 @@ export interface BusinessProductsListParams {
 	onClickCategory?: any,
 	lazyLoadProductsRecommended?: boolean,
 	isFiltMode?: boolean,
-	handleUpdateProducts?: any
+	handleUpdateProducts?: any,
+	navigation?: any;
+	previouslyProducts?: any;
 }
 export interface SingleProductCardParams {
 	businessId: any;
@@ -300,6 +314,9 @@ export interface SingleProductCardParams {
 	handleFavoriteProduct?: any;
 	handleUpdateProducts?: any;
 	enableIntersection?: boolean;
+	navigation?: any;
+	isPreviously?: any;
+	isProductId?: any;
 }
 export interface BusinessInformationParams {
 	navigation?: any,
@@ -354,6 +371,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,
@@ -361,6 +380,8 @@ export interface OrdersOptionParams {
 	businessesSearchList?: any,
 	hideOrders?: boolean,
 	BusinessControllerSkeletons?: any,
+	businessPaginationProps?: any,
+	businesses?: any
 }
 export interface ActiveOrdersParams {
 	orders?: any,
@@ -382,6 +403,7 @@ export interface PreviousOrdersParams {
 	getOrderStatus?: any,
 	orderID?: number
 	reorderLoading?: boolean,
+	loading?: boolean,
 	loadMoreOrders?: () => {},
 	handleReorder?: (orderId: number) => {},
 	onNavigationRedirect?: (route: string, params?: any) => {}
@@ -417,8 +439,9 @@ export interface ProductItemAccordionParams {
 	isFromCheckout?: any
 }
 export interface ReviewOrderParams {
-	order?: { id: number, business_id: number, business_name?: string, delivery_datetime?: string, logo: string, driver: any, products: Array<any>, review: any, user_review: any };
+	order?: { id: number, business_id: number, logo: string, driver: any, products: Array<any>, review: any, user_review: any };
 	stars?: any;
+	defaultStar?: number;
 	handleChangeInput?: any;
 	handleChangeRating?: any;
 	handleSendReview?: any;
@@ -428,8 +451,6 @@ export interface ReviewOrderParams {
 	handleReviewState?: any;
 	setStars?: any;
 	onNavigationRedirect?: any;
-	closeReviewOrder?: () => void;
-	skipReview?: () => void;
 }
 export interface ReviewProductParams {
 	navigation?: any,
@@ -438,7 +459,6 @@ export interface ReviewProductParams {
 	formState?: any,
 	handleChangeFormState?: any,
 	handleSendProductReview?: any;
-	closeReviewProduct?: () => void;
 }
 export interface SingleProductReviewParams {
 	product: any,
@@ -454,7 +474,6 @@ export interface ReviewDriverParams {
 	dirverReviews?: any,
 	setDriverReviews?: any,
 	handleSendDriverReview?: any;
-	closeReviewDriver?: () => void;
 }
 export interface MessagesParams {
 	type?: string,
@@ -513,6 +532,7 @@ export interface FloatingButtonParams {
 	handleClick?: any;
 	handleEmpty?: any;
 	iosBottom?: number
+	hideButton?: boolean
 }
 export interface MomentOptionParams {
 	navigation: any;
@@ -552,7 +572,9 @@ export interface OrderTypeSelectParams {
 	defaultValue?: number;
 	configTypes?: Array<any>;
 	orderTypes: Array<any>;
-	setOrderTypeValue?: (value: number) => any
+	setOrderTypeValue?: (value: number) => any,
+	isChewLayout?: boolean;
+	chewOrderTypes?: any;
 }
 export interface UpsellingProductsParams {
 	isCustomMode?: boolean;
@@ -631,6 +653,7 @@ export interface BusinessSearchParams {
 	onNavigationRedirect?: any,
 	handleUpdateProducts: any,
 	handleUpdateBusinessList?: any;
+	brandId?: number
 }
 
 export interface NoNetworkParams {
@@ -638,12 +661,21 @@ export interface NoNetworkParams {
 }
 
 export interface PlaceSpotParams {
-	isOpenPlaceSpot?: boolean,
+	isCheckout?: any,
+	isInputMode?: any,
 	cart?: any,
+	spotNumberDefault?: any,
+	vehicleDefault?: any,
+	spotNumber?: any,
+	setSpotNumber?: any,
+	orderTypes?: any,
 	placesState?: any,
 	handleChangePlace?: any,
-	getPlacesList?: any,
-	setOpenPlaceModal?: any
+	spotState?: any,
+	vehicle?: any,
+	setVehicle?: any,
+	handleChangeSpot?: any
+	setPlaceSpotNumber?: any
 }
 
 export interface PromotionParams {
@@ -695,7 +727,9 @@ export interface SingleOrderCardParams {
 	onNavigationRedirect?: (route: string, params?: any) => {},
 	pastOrders: any,
 	isMessageView?: any,
-	handleClickOrder: (value: any) => {}
+	handleClickOrder: (value: any) => {},
+	handleRemoveCart: () => {},
+	cartState: any
 }
 
 export interface PreviousBusinessOrderedParams {
@@ -705,7 +739,9 @@ export interface PreviousBusinessOrderedParams {
 	businessId?: number,
 	onNavigationRedirect?: any,
 	isBusinessesSearchList?: any,
-	businessLoading?: boolean
+	businessLoading?: boolean,
+	businesses?: any
+	handleUpdateBusinesses?: (businessId: number, changes: any) => {},
 }
 
 export interface ServiceFormParams {
@@ -718,7 +754,10 @@ export interface ServiceFormParams {
 	maxProductQuantity: any,
 	businessSlug?: string,
 	onClose: any,
-	professionalList: any
+	professionalList: any,
+	productObject?: any,
+	professionalListState?: any,
+	isCartProduct?: any
 }
 
 export interface ProfessionalFilterParams {
@@ -733,8 +772,21 @@ export interface ProfessionalProfileParams {
 	onClose: any
 }
 
+export interface OrderItAgainParams {
+	onProductClick: any,
+	productList: any,
+	businessId: any,
+	categoryState: any,
+	currentCart: any,
+	handleUpdateProducts: 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,10 +1,11 @@
 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';
 
 export const flatArray = (arr: any) => [].concat(...arr)
+const [languageState, t] = useLanguage();
 
 /**
  * Function to return the traduction depending of a key 't'
@@ -43,69 +44,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 +227,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 +258,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 +269,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 +285,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 +296,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 +318,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,7 +344,7 @@ 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: '$$$' },

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}>