ordering-ui-react-native 0.14.92 → 0.14.94-release

package/src/components/OrderDetails/index.tsx

@@ -1,5 +1,5 @@
-import React, { useState, useEffect } from 'react'
-import { View, StyleSheet, BackHandler, TouchableOpacity, I18nManager } from 'react-native'
+import React, { useState, useEffect, useRef } from 'react'
+import { View, StyleSheet, BackHandler, TouchableOpacity, I18nManager, AppState } from 'react-native'
 import LinearGradient from 'react-native-linear-gradient'
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
 import MaterialCommunityIcon from 'react-native-vector-icons/MaterialCommunityIcons'
@@ -64,7 +64,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     isFromRoot,
     driverLocation,
     goToBusinessList,
-    onNavigationRedirect
+    onNavigationRedirect,
+    getOrder
   } = props
 
   const theme = useTheme()
@@ -108,6 +109,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const [isReviewed, setIsReviewed] = useState(false)
   const [openOrderCreating, setOpenOrderCreating] = useState(false)
   const [openTaxModal, setOpenTaxModal] = useState<any>({ open: false, tax: null, type: '' })
+  const appState = useRef(AppState.currentState)
+
   const { order, loading, businessData, error } = props.order
 
   const getOrderStatus = (s: string) => {
@@ -256,6 +259,24 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     })
   }, [])
 
+  useEffect(() => {
+    const onFocusApp = (nextAppState: any) => {
+      if (
+        appState.current.match(/inactive|background/) &&
+        nextAppState === "active"
+      ) {
+        getOrder && getOrder()
+      }
+      appState.current = nextAppState;
+    }
+
+    AppState.addEventListener("change", onFocusApp);
+    return () => {
+      AppState.removeEventListener('change', onFocusApp);
+    };
+  }, [])
+
+
   return (
     <OrderDetailsContainer keyboardShouldPersistTaps='handled'>
       {order && order?.id && !error && !loading && (
@@ -387,7 +408,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                   <OText style={{ textAlign: 'left' }}>{order?.delivery_option?.name}</OText>
                 </View>
               )}
-              {order?.comment && (
+              {!!order?.comment && (
                 <View>
                   <OText size={18} style={{ textAlign: 'left' }} >{t('COMMENT', 'Comment')}</OText>
                   <OText style={{ textAlign: 'left' }}>{order?.comment}</OText>
@@ -535,7 +556,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                     <OSRow>
                       <OText numberOfLines={1}>
                         {fee.name || t('INHERIT_FROM_BUSINESS', 'Inherit from business')}
-                        ({parsePrice(fee?.fixed)} + {fee.percentage}%){' '}
+                        ({fee?.fixed > 0 && `${parsePrice(fee?.fixed)} + `}{fee.percentage}%){' '}
                       </OText>
                       <TouchableOpacity onPress={() => setOpenTaxModal({ open: true, data: fee, type: 'fee' })}>
                         <AntIcon name='exclamationcircleo' size={18} color={theme.colors.primary} />

package/src/components/PaymentOptions/index.tsx

@@ -61,14 +61,11 @@ const PaymentOptionsUI = (props: any) => {
     handlePaymethodDataChange,
     handlePaymentMethodClickCustom,
     isOpenMethod,
-    setCardData,
-    handlePlaceOrder
+    setCardData
   } = props
 
   const theme = useTheme();
   const [, t] = useLanguage();
-  const methodsPay = ['google_pay', 'apple_pay']
-  const stripeDirectMethods = ['stripe_direct', ...methodsPay]
 
   const [addCardOpen, setAddCardOpen] = useState({ stripe: false, stripeConnect: false });
   let paymethodSelected = props.paySelected || props.paymethodSelected || isOpenMethod?.paymethod
@@ -122,11 +119,8 @@ const PaymentOptionsUI = (props: any) => {
   }, [props.paySelected])
 
   useEffect(() => {
-    setCardData && setCardData(paymethodData)
-    if (methodsPay.includes(paymethodSelected?.gateway) && paymethodData?.id && paymethodSelected?.data?.card) {
-      handlePlaceOrder()
-    }
-  }, [paymethodData, paymethodSelected])
+    setCardData(paymethodData)
+  }, [paymethodData])
 
   const renderPaymethods = ({ item }: any) => {
     return (
@@ -285,11 +279,11 @@ const PaymentOptionsUI = (props: any) => {
         </KeyboardAvoidingView>
       </OModal>
 
-      {/* Stripe direct, Google pay, Apple pay */}
+      {/* Stripe direct */}
       <OModal
         entireModal
         title={t('ADD_CREDIT_OR_DEBIT_CARD', 'Add credit or debit card')}
-        open={stripeDirectMethods?.includes(isOpenMethod?.paymethod?.gateway) && !paymethodData.id}
+        open={isOpenMethod?.paymethod?.gateway === 'stripe_direct' && !paymethodData?.id}
         onClose={() => handlePaymethodClick(null)}
       >
         <KeyboardAvoidingView
@@ -298,13 +292,10 @@ const PaymentOptionsUI = (props: any) => {
           enabled={Platform.OS === 'ios' ? true : false}
         >
           <StripeElementsForm
-            cart={cart}
-            paymethod={isOpenMethod?.paymethod?.gateway}
-            methodsPay={methodsPay}
             businessId={props.businessId}
-            publicKey={isOpenMethod?.paymethod?.credentials?.publishable || isOpenMethod?.paymethod?.credentials?.publishable_key}
+            publicKey={isOpenMethod?.paymethod?.credentials?.publishable}
             handleSource={handlePaymethodDataChange}
-            onCancel={() => handlePaymethodClick(null)}
+            onCancel={() => handlePaymethodClick(false)}
           />
         </KeyboardAvoidingView>
       </OModal>

package/src/components/PaymentOptionsWebView/index.tsx

@@ -5,147 +5,146 @@ import WebView from 'react-native-webview';
 import { ActivityIndicator } from 'react-native-paper';
 
 import {
-  ToastType,
-  useToast,
-  useApi,
-  useLanguage,
-  useConfig
+    ToastType,
+    useToast,
+    useApi,
+    useLanguage,
+    useConfig
 } from 'ordering-components/native';
 
 import { OText } from '../shared';
 
 interface PaymentOptionsWebViewParams {
-  onNavigationRedirect?: Function,
-  uri?: any,
-  user?: any,
-  token?: any,
-  cart?: any,
-  currency?: any,
-  webviewPaymethod?: any,
-  setShowGateway?: any,
-  setOpenOrderCreating?: any,
-  locationId?: any
+    onNavigationRedirect?: Function,
+    uri?: any,
+    user?: any,
+    token?: any,
+    cart?: any,
+    currency?: any,
+    webviewPaymethod?: any,
+    setShowGateway?: any,
+    setOpenOrderCreating?: any,
+    locationId?: any
 }
 export const PaymentOptionsWebView = (props: PaymentOptionsWebViewParams) => {
-  const {
-    onNavigationRedirect,
-    uri,
-    user,
-    token,
-    cart,
-    currency,
-    webviewPaymethod,
-    setShowGateway,
-    setOpenOrderCreating,
-    locationId
-  } = props
+    const { 
+        onNavigationRedirect,
+        uri,
+        user,
+        token,
+        cart,
+        currency,
+        webviewPaymethod,
+        setShowGateway,
+        setOpenOrderCreating,
+        locationId
+    } = props
 
-  const webviewRef = useRef<any>(null)
-  const [, { showToast }] = useToast();
-  const [ordering] = useApi()
-  const [{ configs }] = useConfig();
-  const [, t] = useLanguage();
+   const webviewRef = useRef<any>(null)
+   const [, { showToast }] = useToast();
+   const [ordering] = useApi()
+   const [{ configs }] = useConfig();
+   const [, t] = useLanguage();
 
+   
+   const [progClr, setProgClr] = useState('#424242');
+   const [prog, setProg] = useState(true);
 
-  const [progClr, setProgClr] = useState('#424242');
-  const [prog, setProg] = useState(true);
-
-  const handleCloseWebview = () => {
+   const handleCloseWebview = () => {
     setProg(true);
     setShowGateway({ open: false, closedByUser: true })
   }
 
-  const onMessage = (e: any) => {
-    if (e?.nativeEvent?.data && e?.nativeEvent?.data !== 'undefined') {
-      let payment = JSON.parse(e.nativeEvent.data);
+   const onMessage = (e: any) => {
+        if (e?.nativeEvent?.data && e?.nativeEvent?.data !== 'undefined') {
+            let payment = JSON.parse(e.nativeEvent.data);
 
-      if (payment === 'api error') {
-        setShowGateway({ closedByUser: true, open: false })
-        setProg(true);
-      }
+            if (payment === 'api error') {
+                setShowGateway({ closedByUser: true, open: false })
+                setProg(true);
+            }
 
-      if (payment) {
-        if (payment.error) {
-          showToast(ToastType.Error, payment.result)
-          setOpenOrderCreating && setOpenOrderCreating(false)
-        } else if (payment?.result?.order?.uuid) {
-          showToast(ToastType.Success, t('ORDER_PLACED_SUCCESSfULLY', 'The order was placed successfully'))
-          onNavigationRedirect && onNavigationRedirect('OrderDetails', { orderId: payment?.result?.order?.uuid, isFromCheckout: true })
+            if (payment) {
+                if (payment.error) {
+                showToast(ToastType.Error, payment.result)
+                setOpenOrderCreating && setOpenOrderCreating(false)
+                } else if (payment?.result?.order?.uuid) {
+                showToast(ToastType.Success, t('ORDER_PLACED_SUCCESSfULLY', 'The order was placed successfully'))
+                onNavigationRedirect && onNavigationRedirect('OrderDetails', { orderId: payment?.result?.order?.uuid, isFromCheckout: true})
+                }
+                setProg(true);
+                setShowGateway({ closedByUser: false, open: false })
+            }
         }
-        setProg(true);
-        setShowGateway({ closedByUser: false, open: false })
-      }
-    }
-  }
+   }
 
-  return (
+   return (
     <View style={{ zIndex: 9999, height: '100%', width: '100%', position: 'absolute', backgroundColor: 'white' }}>
-      <Icon
-        name="x"
-        size={35}
-        style={{ backgroundColor: 'white', paddingTop: 30, paddingLeft: 10 }}
-        onPress={handleCloseWebview}
-      />
-      <OText
-        style={{
-          textAlign: 'center',
-          fontSize: 16,
-          fontWeight: 'bold',
-          color: '#00457C',
-          marginBottom: 5,
-          marginTop: 10
-        }}>
-        {webviewPaymethod?.gateway === 'paypal' ? (t('PAYPAL_GATEWAY', 'PayPal GateWay')) : (t('SQUARE_PAYMENT', 'Square payment'))}
-      </OText>
-      <View style={{ padding: 20, opacity: prog ? 1 : 0, backgroundColor: 'white' }}>
-        <ActivityIndicator size={24} color={progClr} />
-      </View>
-      <WebView
-        source={{ uri: uri }}
-        onMessage={onMessage}
-        ref={webviewRef}
-        javaScriptEnabled={true}
-        javaScriptEnabledAndroid={true}
-        cacheEnabled={false}
-        cacheMode='LOAD_NO_CACHE'
-        style={{ flex: 1 }}
-        onShouldStartLoadWithRequest={() => true}
-        onLoadStart={() => {
-          setProg(true);
-          setProgClr('#424242');
-        }}
-        onLoadProgress={() => {
-          setProg(true);
-          setProgClr('#00457C');
-        }}
-        onLoad={() => {
-          setProg(true);
-          setProgClr('#00457C');
-        }}
-        onLoadEnd={(e) => {
-          const messageParams = locationId ? { locationId, clientId: webviewPaymethod?.credentials?.application_id } : {}
-          const message = {
-            action: 'init',
-            data: {
-              urlPlace: `${ordering.root}/carts/${cart?.uuid}/place`,
-              urlConfirm: `${ordering.root}/carts/${cart?.uuid}/confirm`,
-              payData: {
-                paymethod_id: webviewPaymethod?.id,
-                amount: cart?.balance ?? cart?.total,
-                delivery_zone_id: cart?.delivery_zone_id,
-                user_id: user?.id,
-                user_name: user?.name
-              },
-              currency: configs?.stripe_currency?.value || currency,
-              userToken: token,
-              clientId: webviewPaymethod?.credentials?.client_id,
-              ...messageParams
-            }
-          }
-          setProg(false);
-          webviewRef?.current?.postMessage?.(JSON.stringify(message))
-        }}
-      />
+          <Icon
+            name="x"
+            size={35}
+            style={{ backgroundColor: 'white', paddingTop: 30, paddingLeft: 10 }}
+            onPress={handleCloseWebview}
+          />
+          <OText
+            style={{
+              textAlign: 'center',
+              fontSize: 16,
+              fontWeight: 'bold',
+              color: '#00457C',
+              marginBottom: 5,
+              marginTop: 10
+            }}>
+           {webviewPaymethod?.gateway === 'paypal' ? (t('PAYPAL_GATEWAY', 'PayPal GateWay')) : (t('SQUARE_PAYMENT', 'Square payment'))}
+          </OText>
+          <View style={{ padding: 20, opacity: prog ? 1 : 0, backgroundColor: 'white' }}>
+            <ActivityIndicator size={24} color={progClr} />
+          </View>
+          <WebView
+            source={{ uri: uri }}
+            onMessage={onMessage}
+            ref={webviewRef}
+            javaScriptEnabled={true}
+            javaScriptEnabledAndroid={true}
+            cacheEnabled={false}
+            cacheMode='LOAD_NO_CACHE'
+            style={{ flex: 1 }}
+            onShouldStartLoadWithRequest={() => true}
+            onLoadStart={() => {
+              setProg(true);
+              setProgClr('#424242');
+            }}
+            onLoadProgress={() => {
+              setProg(true);
+              setProgClr('#00457C');
+            }}
+            onLoad={() => {
+              setProg(true);
+              setProgClr('#00457C');
+            }}
+            onLoadEnd={(e) => {
+            const messageParams = locationId ? { locationId } : {}
+              const message = {
+                action: 'init',
+                data: {
+                  urlPlace: `${ordering.root}/carts/${cart?.uuid}/place`,
+                  urlConfirm: `${ordering.root}/carts/${cart?.uuid}/confirm`,
+                  payData: {
+                    paymethod_id: webviewPaymethod?.id,
+                    amount: cart?.balance ?? cart?.total,
+                    delivery_zone_id: cart?.delivery_zone_id,
+                    user_id: user?.id,
+                    user_name: user?.name
+                  },
+                  currency: configs?.stripe_currency?.value || currency,
+                  userToken: token,
+                  clientId: webviewPaymethod?.credentials?.client_id,
+                  ...messageParams
+                }
+              }
+              setProg(false);
+              webviewRef?.current?.postMessage?.(JSON.stringify(message))
+            }}
+          />
     </View>
-  )
-}
+)}

package/src/components/ProductForm/index.tsx

@@ -378,7 +378,7 @@ const styles = StyleSheet.create({
     borderBottomLeftRadius: 10,
     borderBottomRightRadius: 10,
     borderColor: '#DBDCDB',
-    height: 100,
+    height: 160,
     alignItems: 'flex-start',
   },
   quantityControl: {

package/src/components/ProductForm/styles.tsx

@@ -66,6 +66,7 @@ export const WrapperSubOption = styled.View`
 `
 
 export const ProductComment = styled.View`
+  height: 160px;
 `
 
 export const ProductActions = styled.View`

package/src/components/StripeElementsForm/index.tsx

@@ -7,11 +7,10 @@ import {
   useConfirmSetupIntent,
   createPaymentMethod
 } from '@stripe/stripe-react-native';
-import configs from '../../config.json'
+
 import { ErrorMessage } from './styles';
 
 import { StripeElementsForm as StripeFormController } from './naked';
-import { StripeMethodForm } from '../StripeMethodForm';
 import { OButton, OText } from '../shared';
 import { useTheme } from 'styled-components/native';
 
@@ -23,10 +22,6 @@ const StripeElementsFormUI = (props: any) => {
     businessId,
     requirements,
     stripeTokenHandler,
-    methodsPay,
-    paymethod,
-    onCancel,
-    cart
   } = props;
 
   const theme = useTheme();
@@ -126,49 +121,33 @@ const StripeElementsFormUI = (props: any) => {
     <View style={styles.container}>
       {publicKey ? (
         <View style={{ flex: 1 }}>
-          <StripeProvider 
-            publishableKey={publicKey}
-            merchantIdentifier={`merchant.${configs.apple_app_id}`}
-          >
-            {methodsPay?.includes(paymethod) ? (
-              <StripeMethodForm 
-                handleSource={handleSource}
-                onCancel={onCancel}
-                cart={cart}
-                setErrors={setErrors}
-                paymethod={paymethod}
-                devMode={publicKey?.includes('test')}
-              />
-            ) : (
-              <CardField
-                postalCodeEnabled={true}
-                cardStyle={{
-                  backgroundColor: '#FFFFFF',
-                  textColor: '#000000',
-                }}
-                style={{
-                  width: '100%',
-                  height: 50,
-                  marginVertical: 30,
-                  zIndex: 9999,
-                }}
-                onCardChange={(cardDetails: any) => setCard(cardDetails)}
-              />
-            )}
-          </StripeProvider>
-          {!methodsPay?.includes(paymethod) && (
-            <OButton
-              text={t('SAVE_CARD', 'Save card')}
-              bgColor={isCompleted ? theme.colors.primary : theme.colors.backgroundGray}
-              borderColor={isCompleted ? theme.colors.primary :theme.colors.backgroundGray}
-              style={styles.btnAddStyle}
-              textStyle={{color: 'white'}}
-              imgRightSrc={null}
-              onClick={() => handleSaveCard()}
-              isDisabled={!isCompleted}
-              isLoading={confirmSetupLoading || values.loadingAdd || createPmLoading}
+          <StripeProvider publishableKey={publicKey}>
+            <CardField
+              postalCodeEnabled={true}
+              cardStyle={{
+                backgroundColor: '#FFFFFF',
+                textColor: '#000000',
+              }}
+              style={{
+                width: '100%',
+                height: 50,
+                marginVertical: 30,
+                zIndex: 9999,
+              }}
+              onCardChange={(cardDetails: any) => setCard(cardDetails)}
             />
-          )}
+          </StripeProvider>
+          <OButton
+            text={t('SAVE_CARD', 'Save card')}
+            bgColor={isCompleted ? theme.colors.primary : theme.colors.backgroundGray}
+            borderColor={isCompleted ? theme.colors.primary :theme.colors.backgroundGray}
+            style={styles.btnAddStyle}
+            textStyle={{color: 'white'}}
+            imgRightSrc={null}
+            onClick={() => handleSaveCard()}
+            isDisabled={!isCompleted}
+            isLoading={confirmSetupLoading || values.loadingAdd || createPmLoading}
+          />
           {!!errors && (
             <ErrorMessage>
               <OText

package/src/components/UserProfileForm/index.tsx

@@ -47,6 +47,40 @@ export const UserProfileForm = (props: ProfileParams) => {
     }
   });
 
+  const _pickerStyle = StyleSheet.create({
+    inputAndroid: {
+      color: '#000',
+      borderWidth: 1,
+      borderColor: theme.colors.clear,
+      padding: 10,
+      height: 40,
+      backgroundColor: theme.colors.disabled,
+      borderRadius: 8
+    },
+    inputIOS: {
+      color: '#000',
+      padding: 10,
+      height: 40,
+      borderWidth: 1,
+      borderColor: theme.colors.clear,
+      backgroundColor: theme.colors.clear,
+    },
+    icon: {
+      width: 10,
+      marginTop: 9,
+      marginEnd: 10
+    },
+    placeholder: {
+      color: theme.colors.secundaryContrast
+    },
+    chevronDown: {
+      display: 'none'
+    },
+    chevronUp: {
+      display: 'none'
+    }
+  })
+
   const onRedirect = (route: string, params?: any) => {
     navigation.navigate(route, params)
   }
@@ -97,7 +131,7 @@ export const UserProfileForm = (props: ProfileParams) => {
       <View>
         <LanguageContainer>
           <Ionicons name='globe-outline' style={styles.iconStyle} />
-          <LanguageSelector isFromProfile />
+          <LanguageSelector pickerStyle={_pickerStyle} />
         </LanguageContainer>
         <LogoutButton />
       </View>

package/src/components/VerifyPhone/styles.tsx

@@ -2,7 +2,7 @@ import styled from 'styled-components/native';
 
 export const Container = styled.View`
   width: 100%;
-  padding: 0 43px;
+  padding: 0 30px;
 `
 
 export const CountDownContainer = styled.View`
@@ -20,7 +20,6 @@ export const ResendSection = styled.View`
   display: flex;
   flex-direction: row;
   justify-content: center;
-  flex-wrap: wrap;
 `
 
 export const WrappCountdown = styled.View`

package/src/config.json

@@ -3,8 +3,6 @@
   "notification_app": "orderingapp",
   "app_name": "Ordering",
   "project": "reactdemo",
-  "apple_app_id": "com.delivery",
-  "android_app_id": "com.delivery",
   "api": {
     "url": "https://apiv4.ordering.co",
     "language": "en",

package/src/pages/Checkout.tsx

@@ -7,7 +7,7 @@ import styled from 'styled-components/native';
 
 import { useOrder, useLanguage, ToastType, useToast } from 'ordering-components/native';
 
-const stripePaymentOptions = ['stripe', 'stripe_direct', 'stripe_connect', 'google_pay', 'apple_pay'];
+const stripePaymentOptions = ['stripe', 'stripe_direct', 'stripe_connect'];
 
 const KeyboardView = styled.KeyboardAvoidingView`
   flex: 1;

package/src/providers/AlertProvider.tsx

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

package/src/types/index.tsx

@@ -113,6 +113,7 @@ export interface LanguageSelectorParams {
   currentLanguage?: string;
   handleChangeLanguage?: any;
   isFromProfile?: boolean,
+  pickerStyle?: any
 }
 export interface BusinessesListingParams {
   navigation?: any;
@@ -286,6 +287,7 @@ export interface OrderDetailsParams {
   isFromRoot?: any;
   goToBusinessList?: any;
   onNavigationRedirect?: any;
+  getOrder?: () => {}
 }
 export interface ProductItemAccordionParams {
   key?: any;
@@ -473,12 +475,3 @@ export interface HelpGuideParams {
 export interface HelpAccountAndPaymentParams {
   navigation: any;
 }
-
-export interface StripeMethodFormParams {
-  cart: any;
-  handleSource: ({id, card} : {id : string, card : any}) => void;
-  onCancel: () => void;
-  setErrors: (error: string) => void;
-  paymethod: string;
-  devMode?: boolean;
-}

package/src/utils/index.tsx

@@ -32,7 +32,8 @@ export const getTraduction = (key: string, t: any) => {
     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_ADD_BUSINESS_INVALID: 'An error occurred with the business',
   }
 
   return keyList[key] ? t(key, keyList[key]) : t(key)