ordering-ui-react-native 0.15.26 → 0.15.27-release

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

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

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

@@ -91,7 +91,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/components/shared/index.tsx

@@ -11,6 +11,7 @@ import OKeyButton from './OKeyButton'
 import OModal from './OModal'
 import OAlert from './OAlert'
 import OBottomPopup from './OBottomPopup'
+import HeaderTitle from './HeaderTitle'
 
 export {
 	OText,
@@ -26,4 +27,5 @@ export {
 	OAlert,
   	OModal,
 	OBottomPopup,
+  HeaderTitle
 }

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,6 +153,7 @@ export interface BusinessesListingParams {
 	defaultBusinessType?: any;
 	franchiseId?: any;
 	businessId?: any;
+	isGuestUser?: any;
 }
 export interface HighestRatedBusinessesParams {
 	businessesList: { businesses: Array<any>, loading: boolean, error: null | string };
@@ -157,7 +172,7 @@ export interface BusinessTypeFilterParams {
 	setBusinessTypes?: any
 }
 export interface BusinessControllerParams {
-	key?: number;
+	key?: string | number;
 	business?: any;
 	handleCustomClick?: any;
 	orderType?: any;
@@ -166,7 +181,15 @@ export interface BusinessControllerParams {
 	businessWillCloseSoonMinutes?: number
 	isBusinessClose?: number,
 	navigation?: any,
-	style?: ViewStyle
+	style?: ViewStyle,
+	businessHeader?: string,
+	businessFeatured?: boolean,
+	businessLogo?: string,
+	businessReviews?: any,
+	businessDeliveryPrice?: number,
+	businessDeliveryTime?: string,
+	businessPickupTime?: string,
+	businessDistance?: number
 }
 export interface BusinessProductsListingParams {
 	navigation?: any;
@@ -182,6 +205,9 @@ 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?: () => {};
@@ -214,6 +240,7 @@ export interface BusinessProductsCategoriesParams {
 }
 export interface BusinessProductsListParams {
 	errors?: any;
+	isFiltMode?: any;
 	businessId?: number;
 	category?: any;
 	categories: Array<any>;
@@ -228,7 +255,11 @@ export interface BusinessProductsListParams {
 	handleCancelSearch?: () => void,
 	categoriesLayout?: any,
 	setCategoriesLayout?: any,
-	currentCart?: any
+	currentCart?: any,
+	setSubcategoriesSelected?: any,
+  subcategoriesSelected?: any,
+  onClickCategory?: any,
+  lazyLoadProductsRecommended?: boolean,
 }
 export interface SingleProductCardParams {
 	businessId: any,
@@ -280,11 +311,15 @@ 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
 }
 export interface ActiveOrdersParams {
 	orders?: any,
@@ -306,7 +341,7 @@ export interface PreviousOrdersParams {
 	orderID?: number
 	reorderLoading?: boolean,
 	loadMoreOrders?: () => {},
-	handleReorder: (order: any) => {},
+	handleReorder?: (orderId: number) => {},
 	onNavigationRedirect?: (route: string, params?: any) => {}
 }
 export interface OrderDetailsParams {
@@ -470,6 +505,7 @@ export interface OrderTypeSelectParams {
 	defaultValue?: number;
 	configTypes?: Array<any>;
 	orderTypes: Array<any>;
+	setOrderTypeValue?: (value : number) => any
 }
 export interface UpsellingProductsParams {
 	isCustomMode?: boolean;
@@ -543,7 +579,8 @@ export interface BusinessSearchParams {
 	filters: any,
 	businessTypes: Array<number>,
 	setFilters: (filters: any) => void,
-	lazySearch?: boolean
+	lazySearch?: boolean,
+	brandList?: any;
 }
 
 export interface NoNetworkParams {
@@ -558,3 +595,28 @@ 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
+}

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)
@@ -170,6 +171,15 @@ export const getTypesText = (value: number) => {
   return ret?.content;
 }
 
+/**
+ * List shape for ribbon
+ */
+ export const shape = {
+  rectangle: 'rectangle',
+  rectangleRound: 'rectangle_round',
+  capsuleShape: 'capsule_shape'
+}
+
 /**
  * Function to transform degree to radian
  * @param {number} value for transform
@@ -202,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 }}
 			/>
@@ -97,27 +97,27 @@ export const OrderTypeSelector = (props: any) => {
       {
         value: 1,
         content: t('DELIVERY', 'Delivery'),
-        description: t('ORDERTYPE_DESCRIPTION_DELIVERY', 'Lorem ipsum dolor sit amet, consectetur.')
+        description: t('ORDERTYPE_DESCRIPTION_DELIVERY', 'Delivery description')
       },
       {
         value: 2,
         content: t('PICKUP', 'Pickup'),
-        description: t('ORDERTYPE_DESCRIPTION_PICKUP', 'Lorem ipsum dolor sit amet, consectetur.')
+        description: t('ORDERTYPE_DESCRIPTION_PICKUP', 'Pickup description')
       },
       {
         value: 3,
         content: t('EAT_IN', 'Eat in'),
-        description: t('ORDERTYPE_DESCRIPTION_EATIN', 'Lorem ipsum dolor sit amet, consectetur.')
+        description: t('ORDERTYPE_DESCRIPTION_EATIN', 'Eat in description')
       },
       {
         value: 4,
         content: t('CURBSIDE', 'Curbside'),
-        description: t('ORDERTYPE_DESCRIPTION_CURBSIDE', 'Lorem ipsum dolor sit amet, consectetur.')
+        description: t('ORDERTYPE_DESCRIPTION_CURBSIDE', 'Curbside description')
       },
       {
         value: 5,
         content: t('DRIVE_THRU', 'Drive thru'),
-        description: t('ORDERTYPE_DESCRIPTION_DRIVETHRU', 'Lorem ipsum dolor sit amet, consectetur.')
+        description: t('ORDERTYPE_DESCRIPTION_DRIVETHRU', 'Drive Thru description')
       }
     ]
 	}

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

package/src/components/StripeMethodForm/index.tsx

@@ -1,168 +0,0 @@
-import React, { useState, useEffect } from 'react'
-import { useLanguage } from 'ordering-components/native'
-import { useGooglePay, ApplePayButton, useApplePay } from '@stripe/stripe-react-native'
-import { OButton } from '../shared';
-import { Platform, View } from 'react-native';
-import { StripeMethodFormParams } from '../../types';
-import Spinner from 'react-native-loading-spinner-overlay';
-import { android_app_id } from '../../config.json'
-export const StripeMethodForm = (props: StripeMethodFormParams) => {
-  const {
-    cart,
-    handleSource,
-    onCancel,
-    setErrors,
-    paymethod,
-    devMode
-  } = props
-  const { initGooglePay, createGooglePayPaymentMethod, loading } = useGooglePay();
-  const { presentApplePay, isApplePaySupported } = useApplePay();
-  const [initialized, setInitialized] = useState(false);
-  const [loadingGooglePayment, setLoadingGooglePayment] = useState(false)
-  const [, t] = useLanguage()
-
-  useEffect(() => {
-    if (paymethod !== 'google_pay' || !initGooglePay) return
-    if (Platform.OS === 'ios') {
-      setErrors(t('GOOGLE_PAY_NOT_SUPPORTED', 'Google pay not supported'))
-      return
-    }
-    const initialize = async () => {
-      try {
-        const { error } = await initGooglePay({
-          testEnv: devMode,
-          merchantName: android_app_id,
-          countryCode: 'US',
-          billingAddressConfig: {
-            format: 'FULL',
-            isPhoneNumberRequired: true,
-            isRequired: false,
-          },
-          existingPaymentMethodRequired: false,
-          isEmailRequired: true,
-        });
-
-        if (error) {
-          setErrors(error.code + ' - ' + error.message);
-          return;
-        }
-        setInitialized(true);
-      } catch (err: any) {
-        setErrors('Catch ' + err?.message)
-      }
-    }
-    initialize();
-  }, [initGooglePay]);
-
-  useEffect(() => {
-    if (paymethod !== 'apple_pay') return
-    if (Platform.OS === 'android') {
-      setErrors(t('APPLE_PAY_NOT_SUPPORTED', 'Apple pay not supported'))
-      return
-    }
-  }, [])
-
-  const createPaymentMethod = async () => {
-    setLoadingGooglePayment(true)
-    const { error, paymentMethod } = await createGooglePayPaymentMethod({
-      amount: cart?.balance ?? cart?.total,
-      currencyCode: 'USD',
-    });
-    if (error) {
-      setErrors(error.code + ' - ' + error.message);
-      setLoadingGooglePayment(false)
-      return;
-    } else if (paymentMethod) {
-      handleSource({
-        ...paymentMethod?.Card,
-        id: paymentMethod.id,
-        type: paymentMethod.type,
-        source_id: paymentMethod?.id,
-        card: {
-          brand: paymentMethod.Card.brand,
-          last4: paymentMethod.Card.last4
-        }
-      })
-      onCancel()
-      setLoadingGooglePayment(false)
-    }
-  };
-
-  const pay = async () => {
-    if (!isApplePaySupported) {
-      setErrors(t('APPLE_PAY_NOT_SUPPORTED', 'Apple pay not supported'))
-      return
-    }
-
-    const { error, paymentMethod } = await presentApplePay({
-      cartItems: cart?.products?.map((product: any) => ({ label: product?.name, amount: product?.price?.toString?.() })),
-      country: 'US',
-      currency: 'USD',
-      shippingMethods: [
-        {
-          amount: cart?.balance?.toString() ?? cart?.total?.toString?.(),
-          identifier: 'DPS',
-          label: 'Courier',
-          detail: 'Delivery',
-          type: 'final',
-        },
-      ],
-
-      requiredShippingAddressFields: ['emailAddress', 'phoneNumber'],
-      requiredBillingContactFields: ['phoneNumber', 'name'],
-    });
-    if (error) {
-      setErrors(error.code + ' - ' + error.message);
-    } else if (paymentMethod) {
-      handleSource({
-        ...paymentMethod?.Card,
-        id: paymentMethod.id,
-        type: paymentMethod.type,
-        source_id: paymentMethod?.id,
-        card: {
-          brand: paymentMethod.Card.brand,
-          last4: paymentMethod.Card.last4
-        }
-      })
-      onCancel()
-    }
-  }
-
-  return (
-    <>
-      {paymethod === 'google_pay' ? (
-        <View>
-          <OButton
-            textStyle={{
-              color: '#fff'
-            }}
-            imgRightSrc={null}
-            onClick={createPaymentMethod}
-            isDisabled={loading || !initialized}
-            text={t('PAY_WITH_GOOGLE_PAY', 'Pay with Google Pay')}
-            isLoading={loading || !initialized}
-            style={{ marginTop: 20 }}
-          />
-        </View>
-      ) : (
-        <View>
-          {isApplePaySupported && (
-            <ApplePayButton
-              onPress={pay}
-              type="plain"
-              buttonStyle="black"
-              borderRadius={4}
-              style={{
-                width: '100%',
-                height: 50,
-              }}
-            />
-          )}
-        </View>
-      )}
-      <Spinner
-        visible={loadingGooglePayment}
-      />
-    </>
-  )
-}