ordering-ui-react-native 0.15.46 → 0.15.47-release

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

@@ -1,7 +1,8 @@
 import React, { useState, useEffect } from 'react'
-import { Pressable, View } from 'react-native';
+import { Pressable, StyleSheet, View } from 'react-native';
 import { useTheme } from 'styled-components/native'
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
+import FastImage from 'react-native-fast-image'
 import {
   WalletList,
   useLanguage,
@@ -15,7 +16,10 @@ import {
   TransactionsWrapper,
   OTabs,
   OTab,
-  SectionContent
+  SectionContent,
+  LoyaltyContent,
+  LoyaltyWrapp,
+  LoyaltyImg
 } from './styles'
 
 import NavBar from '../NavBar'
@@ -27,10 +31,14 @@ const WalletsUI = (props: any) => {
   const {
     navigation,
     walletList,
+    userLoyaltyLevel,
     transactionsList,
     setWalletSelected,
     isWalletCashEnabled,
-    isWalletPointsEnabled
+    isWalletPointsEnabled,
+    getWallets,
+    refreshWallets,
+    setRefreshWallets
   } = props
 
   const [, t] = useLanguage()
@@ -38,12 +46,27 @@ const WalletsUI = (props: any) => {
   const [{ parsePrice }] = useUtils()
   const [{ configs }] = useConfig()
 
+  const styles = StyleSheet.create({
+    logoStyle: {
+      width: 120,
+      height: 120,
+      borderRadius: 8,
+      borderWidth: 1,
+      borderColor: theme.colors.border,
+      flexDirection: 'column',
+      justifyContent: 'center',
+      alignItems: 'center',
+    }
+  });
+
   const [tabSelected, setTabSelected] = useState(isWalletCashEnabled ? 'cash' : 'credit_point')
 
-  const isWalletEnabled = configs?.wallet_enabled?.value === '1' && (isWalletCashEnabled || isWalletPointsEnabled)
+  const isWalletEnabled = configs?.cash_wallet?.value && configs?.wallet_enabled?.value === '1' && (isWalletCashEnabled || isWalletPointsEnabled)
 
   const currentWalletSelected = (walletList.wallets?.length > 0 && walletList.wallets?.find((w: any) => w.type === tabSelected)) ?? null
 
+  const loyaltyLevel = Object.keys(userLoyaltyLevel.loyaltyLevel ?? {}).length > 0 && userLoyaltyLevel.loyaltyLevel
+
   const walletName: any = {
     cash: {
       name: t('CASH_WALLET', 'Cash Wallet'),
@@ -74,6 +97,13 @@ const WalletsUI = (props: any) => {
     }
   }, [configs])
 
+  useEffect(() => {
+    if(refreshWallets){
+      getWallets()
+      setRefreshWallets && setRefreshWallets(false)
+    }
+  }, [refreshWallets])
+
   return (
     <Container>
       <NavBar
@@ -86,18 +116,22 @@ const WalletsUI = (props: any) => {
       />
 
       {!walletList.loading &&
+        !userLoyaltyLevel.loading &&
         !walletList.error &&
         walletList.wallets?.length > 0 &&
       (
         <>
-          <OTabs>
+          <OTabs
+            horizontal
+            showsHorizontalScrollIndicator={false}
+          >
             {walletList.wallets?.map((wallet: any) => walletName[wallet.type]?.isActive && (
               <Pressable
                 key={wallet.id}
                 onPress={() => handleChangeTab(wallet)}
               >
-                <OTab>
-                  <OText size={18} color={tabSelected === wallet.type ? theme.colors.primary : theme.colors.disabled}>
+                <OTab isSelected={tabSelected === wallet.type}>
+                  <OText size={18}>
                     {walletName[wallet.type]?.name}
                   </OText>
                 </OTab>
@@ -106,6 +140,39 @@ const WalletsUI = (props: any) => {
           </OTabs>
 
           <SectionContent>
+            {!!loyaltyLevel && tabSelected === 'credit_point' && (
+              <LoyaltyContent>
+                <LoyaltyWrapp>
+                  <OText size={20}>
+                    {`${t('LOYALTY_LEVEL_TITLE', 'Your level is')}:`}
+                  </OText>
+                  {loyaltyLevel.image ? (
+                    <FastImage
+                      style={styles.logoStyle}
+                      source={{
+                        uri: loyaltyLevel.image,
+                        priority: FastImage.priority.high,
+                        cache:FastImage.cacheControl.web
+                      }}
+                      resizeMode={FastImage.resizeMode.contain}
+                    />
+                  ) : (
+                    <LoyaltyImg
+                      source={theme.images.dummies.loyaltyLevel}
+                      resizeMode='contain'
+                    />
+                  )}
+                  <OText
+                    size={22}
+                    weight='bold'
+                    style={{ textTransform: 'uppercase' }}
+                    color={theme.colors.primary}
+                  >
+                    {loyaltyLevel.name}
+                  </OText>
+                </LoyaltyWrapp>
+              </LoyaltyContent>
+            )}
             <BalanceElement>
               <OText size={20} style={{fontWeight: '600'}}>
                 {currentWalletSelected?.type === 'cash'
@@ -172,7 +239,7 @@ const WalletsUI = (props: any) => {
         </>
       )}
 
-      {walletList?.loading && (
+      {(walletList?.loading || userLoyaltyLevel.loading) && (
         <>
           <View>
             <Placeholder Animation={Fade}>
@@ -196,7 +263,7 @@ const WalletsUI = (props: any) => {
         </>
       )}
 
-      {!walletList?.loading && (walletList?.error || !walletList?.wallets?.length) && (
+      {!walletList?.loading && !userLoyaltyLevel.loading && (walletList?.error || !walletList?.wallets?.length) && (
         <NotFoundSource
           content={walletList?.error
             ? t('ERROR_NOT_FOUND_WALLETS', 'Sorry, an error has occurred')

package/themes/original/src/components/Wallets/styles.tsx

@@ -41,3 +41,24 @@ export const OTabs = styled.View`
 export const OTab = styled.View`
   padding-horizontal: 10px;
 `;
+
+export const LoyaltyContent = styled.View`
+  width: 100%;
+  margin-bottom: 20px;
+`
+
+export const LoyaltyWrapp = styled.View`
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+`
+
+export const LoyaltyImg = styled.ImageBackground`
+  position: relative;
+  height: 150px;
+  width: 100%;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+`

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

@@ -1,4 +1,5 @@
 import React from 'react';
+import { Platform } from 'react-native';
 import OText from './OText';
 
 const HeaderTitle = (props: any) => {
@@ -7,7 +8,7 @@ const HeaderTitle = (props: any) => {
     <OText
       size={24}
       style={style ?? {
-        marginTop: 30,
+        marginTop: Platform.OS === 'android' ? 50 : 30,
         paddingHorizontal: 40,
         textTransform: 'capitalize'
       }}

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

@@ -21,6 +21,7 @@ interface Props {
 	isNotDecoration?: boolean;
 	styleCloseButton?: any,
 	isAvoidKeyBoardView?: boolean;
+	styleContainerCloseButton?: any;
 }
 const KeyboardView = styled.KeyboardAvoidingView`
   flex-grow: 1;
@@ -45,6 +46,7 @@ const OModal = (props: Props): React.ReactElement => {
 		isNotDecoration,
 		style,
 		styleCloseButton,
+		styleContainerCloseButton,
 		isAvoidKeyBoardView
 	} = props
 
@@ -55,7 +57,7 @@ const OModal = (props: Props): React.ReactElement => {
 			{!entireModal ? (
 				<View style={styles.centeredView}>
 					<View style={titleSectionStyle ? titleSectionStyle : styles.titleSection}>
-						<TouchableOpacity style={styles.wrapperIcon} onPress={onClose}>
+						<TouchableOpacity style={{...styles.wrapperIcon, ...styleContainerCloseButton}} onPress={onClose}>
 							<OIcon
 								src={theme.images.general.close}
 								width={16}
@@ -91,7 +93,7 @@ const OModal = (props: Props): React.ReactElement => {
 			animationType="slide"
 			transparent={isTransparent}
 			visible={open}
-			onRequestClose={() => onClose()}
+			onRequestClose={() =>  onClose && onClose()}
 			style={{ height: '100%', flex: 1, position: 'absolute', ...style, zIndex: 9999 }}
 		>
 			{isAvoidKeyBoardView ? (

package/themes/original/src/config/constants.tsx

@@ -8,26 +8,26 @@ export const ORDER_TYPES = [
 	{
 		value: 1,
 		content: 'DELIVERY',
-		description: 'DELIVERY_DESCRIPTION'
+		description: 'ORDERTYPE_DESCRIPTION_DELIVERY'
 	},
 	{
 		value: 2,
 		content: 'PICKUP',
-		description: 'PICKUP_DESCRIPTION',
+		description: 'ORDERTYPE_DESCRIPTION_PICKUP',
 	},
 	{
 		value: 3,
 		content: 'EAT_IN',
-		description: 'EAT_IN_DESCRIPTION',
+		description: 'ORDERTYPE_DESCRIPTION_EATIN',
 	},
 	{
 		value: 4,
 		content: 'CURBSIDE',
-		description: 'CURBSIDE_DESCRIPTION',
+		description: 'ORDERTYPE_DESCRIPTION_CURBSIDE',
 	},
 	{
 		value: 5,
 		content: 'DRIVE_THRU',
-		description: 'DRIVE_THRU_DESCRIPTION',
+		description: 'ORDERTYPE_DESCRIPTION_DRIVETHRU',
 	}
-]
+]

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

@@ -17,6 +17,14 @@ export interface LoginParams {
 	handleSendVerifyCode?: any;
 	handleCheckPhoneCode?: any;
 	notificationState?: any;
+	handleReCaptcha?: any;
+	enableReCaptcha?: any;
+	otpType?: string,
+	setOtpType: (type: string) => void,
+	generateOtpCode: (values?: any) => void,
+	useLoginOtpEmail?: boolean,
+	useLoginOtpCellphone?: boolean,
+	useLoginOtp?: boolean
 }
 export interface ProfileParams {
 	navigation?: any;
@@ -37,6 +45,8 @@ export interface ProfileParams {
 	verifyPhoneState?: any;
 	setCheckPhoneCodeState?: any;
 	isVerifiedPhone?: any;
+	handleRemoveAccount?: any;
+	removeAccountState?: any;
 }
 
 export interface AddressListParams {
@@ -55,6 +65,7 @@ export interface AddressListParams {
 	isFromProductsList?: boolean;
 	afterSignup?: boolean;
 	isFromCheckout?: boolean
+	loadAddresses: () => void
 }
 
 export interface AddressFormParams {
@@ -100,6 +111,8 @@ export interface SignupParams {
 	handleCheckPhoneCode?: any;
 	notificationState?: any;
 	handleChangePromotions: () => void;
+	enableReCaptcha?: boolean;
+	handleReCaptcha?: () => void;
 }
 
 export interface PhoneInputParams {
@@ -116,6 +129,7 @@ export interface PhoneInputParams {
 	flagStyle?: any;
 	isDisabled?: any;
 	isStartValidation?: any;
+	changeCountry?: any;
 }
 
 export interface LanguageSelectorParams {
@@ -139,13 +153,18 @@ export interface BusinessesListingParams {
 	defaultBusinessType?: any;
 	franchiseId?: any;
 	businessId?: any;
+	isGuestUser?: any;
+	handleUpdateBusinessList?: any;
 }
 export interface HighestRatedBusinessesParams {
 	businessesList: { businesses: Array<any>, loading: boolean, error: null | string };
 	onBusinessClick?: void;
 	navigation?: any;
 	isLoading?: boolean;
-	getBusinesses: (newFetch: boolean) => void
+	getBusinesses: (newFetch: boolean) => void,
+	favoriteIds?: any,
+	setFavoriteIds?: any,
+	handleUpdateBusinessList?: any
 }
 export interface BusinessTypeFilterParams {
 	businessTypes?: Array<any>;
@@ -157,7 +176,7 @@ export interface BusinessTypeFilterParams {
 	setBusinessTypes?: any
 }
 export interface BusinessControllerParams {
-	key?: number;
+	key?: string | number;
 	business?: any;
 	handleCustomClick?: any;
 	orderType?: any;
@@ -174,7 +193,11 @@ export interface BusinessControllerParams {
 	businessDeliveryPrice?: number,
 	businessDeliveryTime?: string,
 	businessPickupTime?: string,
-	businessDistance?: number
+	businessDistance?: number,
+	favoriteIds?: number[],
+	handleFavoriteBusiness?: any,
+	setFavoriteIds?: any;
+	handleUpdateBusinessList?: any;
 }
 export interface BusinessProductsListingParams {
 	navigation?: any;
@@ -190,10 +213,14 @@ export interface BusinessProductsListingParams {
 	header?: any;
 	logo?: any;
 	productModal?: any;
+	alertState?: { open: boolean, content: any[] };
+	setAlertState?: any;
+	multiRemoveProducts?: (in1: any, in2: any) => {};
 	getNextProducts?: () => {};
 	handleChangeCategory: (value: any) => {};
 	setProductLogin?: () => {};
 	updateProductModal?: (value: any) => {};
+	handleUpdateProducts?: any;
 }
 export interface BusinessBasicInformationParams {
 	navigation?: any;
@@ -236,7 +263,13 @@ export interface BusinessProductsListParams {
 	handleCancelSearch?: () => void,
 	categoriesLayout?: any,
 	setCategoriesLayout?: any,
-	currentCart?: any
+	currentCart?: any,
+	setSubcategoriesSelected?: any,
+	subcategoriesSelected?: any,
+	onClickCategory?: any,
+	lazyLoadProductsRecommended?: boolean,
+	isFiltMode?: boolean,
+	handleUpdateProducts?: any
 }
 export interface SingleProductCardParams {
 	businessId: any,
@@ -244,7 +277,10 @@ export interface SingleProductCardParams {
 	isSoldOut: boolean;
 	onProductClick: any;
 	productAddedToCartLength: number;
-	style?: ViewStyle
+	style?: ViewStyle,
+	categoryState?: any,
+	handleFavoriteProduct?: any,
+	handleUpdateProducts?: any
 }
 export interface BusinessInformationParams {
 	navigation?: any,
@@ -278,6 +314,7 @@ export interface OrdersOptionParams {
 	orderList?: any,
 	franchiseId?: any,
 	activeOrders?: boolean,
+	pastOrders?: boolean,
 	pagination?: any,
 	titleContent?: string,
 	customArray?: Array<any>,
@@ -288,11 +325,23 @@ export interface OrdersOptionParams {
 	loadOrders?: any,
 	setOrderList?: any,
 	preOrders?: boolean,
+	reorderState?: any,
+	handleReorder?: (orderId: number) => {},
 	setOrdersLength?: ({ activeOrdersLength, previousOrdersLength }: { activeOrdersLength: number, previousOrdersLength: number }) => void,
 	ordersLength: { activeOrdersLength: number, previousOrdersLength: number },
 	setSelectedOrderId?: any,
 	setOpenMessges?: any,
-	loadMoreStatus?: boolean
+	loadMoreStatus?: boolean,
+	refreshOrders?: boolean,
+	setRefreshOrders?: (value: boolean) => void,
+	handleUpdateOrderList?: (orderId: number, changes: any) => {},
+	isBusiness?: boolean,
+	isProducts?: boolean,
+	businessOrderIds?: any,
+	products?: any,
+	businessesSearchList?: any,
+	hideOrders?: boolean,
+	BusinessControllerSkeletons?: any,
 }
 export interface ActiveOrdersParams {
 	orders?: any,
@@ -305,7 +354,8 @@ export interface ActiveOrdersParams {
 	loadMoreOrders?: () => {},
 	onNavigationRedirect?: (route: string, params?: any) => {},
 	isMessageView?: boolean,
-	handleClickOrder?: any
+	handleClickOrder?: any,
+	handleUpdateOrderList?: (orderId: number, changes: any) => {}
 }
 export interface PreviousOrdersParams {
 	orders?: any,
@@ -314,8 +364,9 @@ export interface PreviousOrdersParams {
 	orderID?: number
 	reorderLoading?: boolean,
 	loadMoreOrders?: () => {},
-	handleReorder: (order: any) => {},
+	handleReorder?: (orderId: number) => {},
 	onNavigationRedirect?: (route: string, params?: any) => {}
+	handleUpdateOrderList?: (orderId: number, changes: any) => {}
 }
 export interface OrderDetailsParams {
 	navigation?: any,
@@ -478,6 +529,7 @@ export interface OrderTypeSelectParams {
 	defaultValue?: number;
 	configTypes?: Array<any>;
 	orderTypes: Array<any>;
+	setOrderTypeValue?: (value: number) => any
 }
 export interface UpsellingProductsParams {
 	isCustomMode?: boolean;
@@ -551,7 +603,11 @@ export interface BusinessSearchParams {
 	filters: any,
 	businessTypes: Array<number>,
 	setFilters: (filters: any) => void,
-	lazySearch?: boolean
+	lazySearch?: boolean,
+	brandList?: any;
+	onNavigationRedirect?: any,
+	handleUpdateProducts: any,
+	handleUpdateBusinessList?: any;
 }
 
 export interface NoNetworkParams {
@@ -566,3 +622,70 @@ export interface PlaceSpotParams {
 	getPlacesList?: any,
 	setOpenPlaceModal?: any
 }
+
+export interface PromotionParams {
+	navigation: any,
+	offersState: any,
+	handleSearchValue: any,
+	searchValue: string,
+	offerSelected: any,
+	setOfferSelected: any,
+	loadOffers: any
+}
+export interface SessionsParams {
+	navigation: any,
+	sessionsList: any,
+	actionState: any,
+	handleDeleteSession: any,
+	handleDeleteAllSessions: any
+}
+
+export interface otpParams {
+	willVerifyOtpState: boolean,
+	setWillVerifyOtpState: (val: boolean) => void,
+	onSubmit: () => void,
+	handleLoginOtp: (code: string) => void,
+	setAlertState: any
+}
+
+export interface FavoriteParams {
+	favoriteList: any,
+	handleUpdateFavoriteList: (id: number, changes: any) => {},
+	pagination: any,
+	getFavoriteList: (value: number) => {},
+	navigation?: any,
+	onNavigationRedirect?: (route: string, params?: any) => {},
+	reorderState?: any,
+	handleReorder?: (orderId: number) => {},
+	isOrder?: boolean,
+	isProduct?: boolean,
+	isBusiness?: boolean
+}
+
+export interface SingleOrderCardParams {
+	order: any,
+	reorderLoading: any,
+	handleReorder?: (value: any) => {},
+	getOrderStatus: any,
+	handleFavoriteOrder?: (value: boolean) => {},
+	onNavigationRedirect?: (route: string, params?: any) => {},
+	pastOrders: any,
+	isMessageView?: any,
+	handleClickOrder: (value: any) => {}
+}
+
+export interface PreviousBusinessOrderedParams {
+	navigation?: any,
+	businessesList?: any,
+	setBusinessLoading?: any,
+	businessId?: number,
+	onNavigationRedirect?: any,
+	isBusinessesSearchList?: any,
+	businessLoading?: boolean
+}
+
+export interface PreviousProductsOrderedParams {
+	products?: any,
+	onProductClick?: any,
+	isBusinessesSearchList?: boolean
+}

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

@@ -33,7 +33,8 @@ export const getTraduction = (key: string) => {
     ERROR_PLACE_PAY_WITH_CARD1: 'An error occurred while trying to pay by card',
     ERROR_PLACE_PAY_WITH_PAYPAL_CAPTURE: 'An error occurred while trying to pay by PayPal',
     ERROR_ADD_PRODUCT_VERY_FAR_FOR_DELIVERY: 'Error adding product, very far for delivery',
-    ERROR_PRODUCT_NOT_FOUND: 'Error with the product'
+    ERROR_PRODUCT_NOT_FOUND: 'Error with the product',
+    ERROR_INVALID_OFFER: 'The offer doesn\'t exist'
   }
 
   return keyList[key] ? t(key, keyList[key]) : t(key)
@@ -211,4 +212,20 @@ export const formatUrlVideo = (url : string) => {
   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) => {
+  // Hours, minutes and seconds
+  var hrs = ~~(seconds / 3600)
+  var mins = ~~((seconds % 3600) / 60)
+  var secs = ~~seconds % 60
+
+  // Output like '1:01' or '4:03:59' or '123:03:59'
+  var ret = ''
+  if (hrs > 0) {
+    ret += '' + hrs + ':' + (mins < 10 ? '0' : '')
+  }
+  ret += '' + mins + ':' + (secs < 10 ? '0' : '')
+  ret += '' + secs
+  return ret
+}

package/themes/single-business/src/components/AddressList/index.tsx

@@ -140,7 +140,7 @@ const AddressListUI = (props: AddressListParams) => {
 				<AddressListContainer>
 					{isProfile && (
 						<NavBar
-							title={t('MY_SAVED_PLACES', 'My saved places')}
+							title={t('SAVED_PLACES', 'My saved places')}
 							titleAlign={'center'}
 							onActionLeft={() => goToBack()}
 							showCall={false}

package/themes/single-business/src/components/OrderTypeSelector/index.tsx

@@ -58,7 +58,7 @@ const OrderTypeSelectorUI = (props: OrderTypeSelectParams) => {
 				btnStyle={{ paddingLeft: 0 }}
 				paddingTop={0}
 				style={{ paddingBottom: 0 }}
-				title={t('HOW_WILL_YOUR_ORDER_TYPE', 'How will your order type?')}
+				title={t('HOW_WILL_YOU_DELIVERY_TYPE', 'How will your order type?')}
 				titleAlign={'center'}
 				titleStyle={{ fontSize: 14 }}
 			/>

package/themes/single-business/src/components/UserProfile/index.tsx

@@ -154,7 +154,7 @@ const ProfileListUI = (props: ProfileParams) => {
 				<Actions>
 					<ListItem onPress={() => onRedirect('AddressList', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
 						<OIcon src={theme.images.general.pin} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />
-						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('MY_SAVED_PLACES', 'My saved places')}</OText>
+						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('SAVED_PLACES', 'My saved places')}</OText>
 					</ListItem>
 					<ListItem onPress={() => navigation.navigate('Help', {})} activeOpacity={0.7}>
 						<OIcon src={theme.images.general.help} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />

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