ordering-ui-react-native 0.15.52 → 0.15.55

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.15.52",
+  "version": "0.15.55",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

package/themes/business/src/components/Home/index.tsx

@@ -1,18 +1,66 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { StyleSheet, View, Dimensions, Platform } from 'react-native';
-import { useLanguage } from 'ordering-components/native';
+import { useForm, Controller } from 'react-hook-form';
+import { useLanguage, useApi } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
-import { LogoWrapper, Container, BackgroundImage } from './styles';
-import { OButton, OIcon, OText } from '../shared';
+import { LogoWrapper, Container, BackgroundImage, FormInput } from './styles';
+import { OButton, OIcon, OText, OInput } from '../shared';
 import { _setStoreData } from '../../providers/StoreUtil';
 
 export const Home = (props: any) => {
-  const { onNavigationRedirect } = props;
+  const { onNavigationRedirect, useRootPoint } = props;
   const safeHeight = Platform.OS === 'ios' ? 80 : 40;
 
   const theme = useTheme();
+  const [ordering, { setOrdering }] = useApi();
   const [, t] = useLanguage();
+  const { control, handleSubmit, errors } = useForm();
 
+
+  const styles = StyleSheet.create({
+    logo: {
+      height: 65,
+      width: 300,
+    },
+    wrapperContent: {
+      width: '100%',
+    },
+    wrapperText: {
+      marginBottom: 20,
+    },
+    textTitle: {
+      fontWeight: '600',
+      fontStyle: 'normal',
+      fontSize: 50,
+    },
+    textSubtitle: {
+      fontWeight: 'normal',
+      fontStyle: 'normal',
+      fontSize: 14,
+    },
+    wrapperBtn: {
+      marginBottom: 20
+    },
+    btn: {
+      borderRadius: 7.6,
+      marginTop: 20,
+    },
+    btnText: {
+      fontFamily: 'Poppins',
+      fontStyle: 'normal',
+      fontWeight: 'normal',
+      fontSize: 18,
+    },
+    input: {
+      borderWidth: 1,
+      borderRadius: 7.6,
+      borderColor: Object.keys(errors).length > 0 ? theme.colors.error : theme.colors.inputSignup,
+      backgroundColor: theme.colors.transparent,
+    },
+  });
+
+  const [projectName, setProjectName] = useState<any>(null)
+  const [isLoadingProject, setLoadingProject] = useState(false)
   const [orientation, setOrientation] = useState(
     Dimensions.get('window').width < Dimensions.get('window').height
       ? 'Portrait'
@@ -34,6 +82,27 @@ export const Home = (props: any) => {
     }
   });
 
+  const onSubmit = (values: any) => {
+    setLoadingProject(true)
+    setProjectName(values)
+    setOrdering({ ...ordering, project: values?.project_name })
+    _setStoreData('project_name', values?.project_name)
+  };
+
+  useEffect(() => {
+    if (Object.keys(errors).length > 0) {
+      setProjectName(null)
+      setLoadingProject(false)
+    }
+  }, [errors])
+
+  useEffect(() => {
+    if (ordering?.project === projectName?.project_name) {
+      setLoadingProject(false)
+      onNavigationRedirect('Login')
+    }
+  }, [ordering])
+
   return (
     <Container height={windowHeight - safeHeight} orientation={orientation}>
       <BackgroundImage
@@ -54,58 +123,62 @@ export const Home = (props: any) => {
             </OText>
           </View>
 
-          <View style={styles.wrapperBtn}>
-            <OButton
-              text={t('LOGIN', 'Login')}
-              textStyle={{
-                ...styles.btnText,
-                color: theme.colors.inputTextColor,
-              }}
-              bgColor={theme.colors.primary}
-              borderColor={theme.colors.primary}
-              style={styles.btn}
-              imgRightSrc={false}
-              onClick={() => onNavigationRedirect('Login')}
-            />
-          </View>
+          <>
+            {useRootPoint && (
+              <FormInput>
+                <Controller
+                  control={control}
+                  name='project_name'
+                  rules={{ required: t(`VALIDATION_ERROR_PROJECT_NAME_REQUIRED`, 'The field project name is required') }}
+                  defaultValue=""
+                  render={({ onChange, value }: any) => (
+                    <OInput
+                      name='project_name'
+                      placeholderTextColor={theme.colors.arrowColor}
+                      placeholder={t('PROJECT_NAME', 'Project Name')}
+                      icon={theme.images.general.project}
+                      iconColor={theme.colors.arrowColor}
+                      onChange={(e: any) => onChange(e?.target?.value)}
+                      selectionColor={theme.colors.primary}
+                      color={theme.colors.white}
+                      value={value}
+                      style={styles.input}
+                      returnKeyType='done'
+                      autoCorrect={false}
+                      autoCapitalize='none'
+                      blurOnSubmit={false}
+                      onSubmitEditing={() => handleSubmit(onSubmit)()}
+                    />
+                  )}
+                />
+              </FormInput>
+            )}
+            {Object.keys(errors).length > 0 && (
+              <OText
+                color={theme.colors.white}
+                style={{ alignSelf: 'center', marginTop: 5 }}
+              >
+                {errors['project_name'].message}
+              </OText>
+            )}
+            <View style={styles.wrapperBtn}>
+              <OButton
+                text={useRootPoint ? t('SET_PROJECT', 'Set project') : t('LOGIN', 'Login')}
+                textStyle={{
+                  ...styles.btnText,
+                  color: theme.colors.inputTextColor,
+                }}
+                bgColor={theme.colors.primary}
+                borderColor={theme.colors.primary}
+                isLoading={isLoadingProject}
+                style={styles.btn}
+                imgRightSrc={false}
+                onClick={() => useRootPoint ? handleSubmit(onSubmit)() : onNavigationRedirect('Login')}
+              />
+            </View>
+          </>
         </View>
       </BackgroundImage>
     </Container>
   );
 };
-
-const styles = StyleSheet.create({
-  logo: {
-    height: 65,
-    width: 300,
-  },
-  wrapperContent: {
-    width: '100%',
-  },
-  wrapperText: {
-    marginBottom: 20,
-  },
-  textTitle: {
-    fontWeight: '600',
-    fontStyle: 'normal',
-    fontSize: 50,
-  },
-  textSubtitle: {
-    fontWeight: 'normal',
-    fontStyle: 'normal',
-    fontSize: 14,
-  },
-  wrapperBtn: {
-    marginBottom: 20,
-  },
-  btn: {
-    borderRadius: 7.6,
-    marginTop: 20,
-  },
-  btnText: {
-    fontFamily: 'Poppins',
-    fontStyle: 'normal',
-    fontWeight: 'normal',
-    fontSize: 18,
-  },
-});

package/themes/business/src/components/Home/styles.tsx

@@ -1,4 +1,4 @@
-import styled from 'styled-components/native';
+import styled, { css } from 'styled-components/native';
 
 export const Container = styled.View`
   width: 100%;
@@ -25,3 +25,10 @@ export const BackgroundImage = styled.ImageBackground`
   align-items: center;
   padding: 20px 40px;
 `;
+
+export const FormInput = styled.View`
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  min-height: 50px;
+`;

package/themes/business/src/components/OrderDetails/Delivery.tsx

@@ -101,9 +101,9 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   };
 
   const handleOpenMapView = async () => {
-    if (permissions.locationStatus === 'granted') {
+    if (permissions?.locationStatus === 'granted') {
       setOpenModalForMapView(!openModalForMapView);
-    } else if (permissions.locationStatus === 'blocked') {
+    } else if (permissions?.locationStatus === 'blocked') {
       // redirectToSettings();
       showToast(
         ToastType.Error,
@@ -141,9 +141,9 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     handleArrowBack()
   }
 
-  const handleAcceptLogisticOrder = (order : any) => {
+  const handleAcceptLogisticOrder = (order: any) => {
     handleClickLogisticOrder?.(1, order?.logistic_order_id)
-    if(order?.order_group){
+    if (order?.order_group) {
       handleArrowBack()
     }
   }
@@ -166,10 +166,10 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   ];
 
   useEffect(() => {
-    if (permissions.locationStatus !== 'granted' && openModalForMapView) {
+    if (permissions?.locationStatus !== 'granted' && openModalForMapView) {
       setOpenModalForMapView(false);
     }
-  }, [permissions.locationStatus]);
+  }, [permissions?.locationStatus]);
 
   useEffect(() => {
     if (openModalForAccept) {
@@ -215,8 +215,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   }, [messagesReadList]);
 
   useEffect(() => {
-    forceUpdate && handleViewActionOrder && handleViewActionOrder(forceUpdate === 9 ? 'forcePickUp': 'forceDelivery')
-  },[forceUpdate])
+    forceUpdate && handleViewActionOrder && handleViewActionOrder(forceUpdate === 9 ? 'forcePickUp' : 'forceDelivery')
+  }, [forceUpdate])
 
   const styles = StyleSheet.create({
     btnPickUp: {
@@ -254,7 +254,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     );
   }
 
-  const OrderDetailsInformation = (props : {order: any, isOrderGroup?: boolean, lastOrder?: boolean}) => {
+  const OrderDetailsInformation = (props: { order: any, isOrderGroup?: boolean, lastOrder?: boolean }) => {
     const {
       order,
       isOrderGroup,

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

@@ -248,7 +248,7 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
               style={{ borderRadius: 7.6 }}
             />
           )}
-          <OText>{openDescription?.description}</OText>
+          <OText mBottom={40}>{openDescription?.description}</OText>
         </ScrollView>
       </OModal>
     </ProductsContainer>

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

@@ -90,33 +90,12 @@ const BusinessReviewsUI = (props: BusinessReviewsParams) => {
 		</View>
 	);
 
-	const ReviewItem = ({ comment, created_at, total, customer }: any) => (
+	const ReviewItem = ({ comment, created_at, total }: any) => (
 		<View style={{ marginBottom: 30 }}>
-			<View
-				style={{ flexDirection: 'row', marginBottom: 19, alignItems: 'center' }}>
-				<OIcon
-					url={theme.images.dummies.customerPhoto}
-					width={38}
-					height={38}
-					style={{
-						borderRadius: 7.6,
-						borderWidth: 1,
-						borderColor: theme.colors.border,
-						marginEnd: 9,
-					}}
-				/>
-				<View>
-					<OText size={12} color={theme.colors.textNormal} weight={'500'}>
-						{customer?.name || 'Jane Cooper'}
-					</OText>
-					<OText size={10} color={theme.colors.textSecondary}>
-						{moment(created_at).format('MMMM d, yyyy • hh:mm')}
-					</OText>
-				</View>
-			</View>
-			<OText size={10} color={theme.colors.textNormal}>
-				{comment}
+			<OText size={12} color={theme.colors.textSecondary}>
+				{moment(created_at).format('MMMM d, yyyy • hh:mm')}
 			</OText>
+			<OText size={12} color={theme.colors.textNormal}>{comment}</OText>
 		</View>
 	);
 

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

@@ -112,7 +112,7 @@ const OrderSummaryUI = (props: any) => {
       {cart?.products?.length > 0 && (
         <>
           <OSProductList>
-            {cart?.products.map((product: any) => (
+            {cart?.products?.map((product: any) => (
               <ProductItemAccordion
                 key={product.code}
                 product={product}

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

@@ -1,11 +1,12 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { View, Pressable, StyleSheet, Linking, Platform } from 'react-native';
+import { View, Pressable, StyleSheet, Linking, Platform, TouchableOpacity } from 'react-native';
 import { useForm, Controller } from 'react-hook-form';
 import Spinner from 'react-native-loading-spinner-overlay';
 import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons';
 import CheckBox from '@react-native-community/checkbox';
 import { PhoneInputNumber } from '../PhoneInputNumber';
 import { FacebookLogin } from '../FacebookLogin';
+import Recaptcha from 'react-native-recaptcha-that-works'
 
 import {
 	SignupForm as SignUpController,
@@ -23,6 +24,7 @@ import {
 	LoginWith as SignupWith,
 	OTab,
 	OTabs,
+	RecaptchaButton
 } from '../LoginForm/styles';
 
 import NavBar from '../NavBar';
@@ -63,7 +65,9 @@ const SignupFormUI = (props: SignupParams) => {
 		handleSendVerifyCode,
 		handleCheckPhoneCode,
 		notificationState,
-		handleChangePromotions
+		handleChangePromotions,
+		enableReCaptcha,
+		handleReCaptcha
 	} = props;
 
 	const theme = useTheme();
@@ -117,6 +121,8 @@ const SignupFormUI = (props: SignupParams) => {
 			cellphone: null,
 		},
 	});
+	const [recaptchaConfig, setRecaptchaConfig] = useState<any>({})
+	const [recaptchaVerified, setRecaptchaVerified] = useState(false)
 
 	const nameRef = useRef<any>(null);
 	const lastnameRef = useRef<any>(null);
@@ -125,6 +131,7 @@ const SignupFormUI = (props: SignupParams) => {
 	const emailRef = useRef<any>(null);
 	const phoneRef = useRef<any>(null);
 	const passwordRef = useRef<any>(null);
+	const recaptchaRef = useRef<any>({});
 
   const showInputPhoneNumber = (validationFields?.fields?.checkout?.cellphone?.enabled ?? false) || configs?.verification_phone_required?.value === '1'
 
@@ -286,6 +293,33 @@ const SignupFormUI = (props: SignupParams) => {
 		}
 	}
 
+	const handleOpenRecaptcha = () => {
+		setRecaptchaVerified(false)
+	  	if (!recaptchaConfig?.siteKey) {
+			showToast(ToastType.Error, t('NO_RECAPTCHA_SITE_KEY', 'The config doesn\'t have recaptcha site key'));
+			return
+		}
+		if (!recaptchaConfig?.baseUrl) {
+			showToast(ToastType.Error, t('NO_RECAPTCHA_BASE_URL', 'The config doesn\'t have recaptcha base url'));
+			return
+		}
+		recaptchaRef.current.open()
+  	}
+
+	const onRecaptchaVerify = (token: any) => {
+		setRecaptchaVerified(true)
+		handleReCaptcha(token)
+	}
+
+	useEffect(() => {
+		if (configs && Object.keys(configs).length > 0 && enableReCaptcha) {
+			setRecaptchaConfig({
+				siteKey: configs?.security_recaptcha_site_key?.value || null,
+				baseUrl: configs?.security_recaptcha_base_url?.value || null
+			})
+		}
+	}, [configs, enableReCaptcha])
+
 	useEffect(() => {
 		if (!formState.loading && formState.result?.error) {
 			formState.result?.result &&
@@ -467,6 +501,39 @@ const SignupFormUI = (props: SignupParams) => {
 								</View>
 							)}
 
+							{enableReCaptcha && (
+								<>
+									<TouchableOpacity
+										onPress={handleOpenRecaptcha}
+										style={{ marginHorizontal: 4, marginBottom: 10 }}
+									>
+										<RecaptchaButton>
+											{recaptchaVerified ? (
+												<MaterialCommunityIcons
+													name="checkbox-marked"
+													size={23}
+													color={theme.colors.primary}
+												/>
+											) : (
+												<MaterialCommunityIcons
+													name="checkbox-blank-outline"
+													size={23}
+													color={theme.colors.disabled}
+												/>
+											)}
+											<OText size={14} mLeft={8}>{t('VERIFY_ReCAPTCHA', 'Verify reCAPTCHA')}</OText>
+										</RecaptchaButton>
+									</TouchableOpacity>
+									<Recaptcha
+										ref={recaptchaRef}
+										siteKey={recaptchaConfig?.siteKey}
+										baseUrl={recaptchaConfig?.baseUrl}
+										onVerify={onRecaptchaVerify}
+										onExpire={() => setRecaptchaVerified(false)}
+									/>
+								</>
+							)}
+
 							<View style={{ flexDirection: 'row', alignItems: 'center', marginBottom: 20 }}>
 								<Controller
 									control={control}
@@ -736,6 +803,7 @@ const SignupFormUI = (props: SignupParams) => {
 export const SignupForm = (props: any) => {
 	const signupProps = {
 		...props,
+		isRecaptchaEnable: true,
 		UIComponent: SignupFormUI,
 	};
 	return <SignUpController {...signupProps} />;

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

@@ -102,6 +102,8 @@ export interface SignupParams {
 	handleCheckPhoneCode?: any;
 	notificationState?: any;
 	handleChangePromotions: () => void;
+	enableReCaptcha?: boolean;
+	handleReCaptcha?: () => void;
 }
 
 export interface PhoneInputParams {