ordering-ui-react-native 0.14.85 → 0.14.86-release

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

@@ -0,0 +1,16 @@
+import styled from 'styled-components/native'
+
+export const ReviewProductsContainer = styled.ScrollView`
+  padding: 20px 40px;
+  margin-bottom: 100px;
+`
+
+export const ActionContainer = styled.View`
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  padding: 3px 30px;
+`
+
+export const SkipButton = styled.TouchableOpacity`
+`

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

@@ -68,7 +68,6 @@ const SignupFormUI = (props: SignupParams) => {
 
 	const theme = useTheme();
 
-
 	const style = StyleSheet.create({
 		btnOutline: {
 			backgroundColor: '#FFF',
@@ -77,7 +76,6 @@ const SignupFormUI = (props: SignupParams) => {
 		inputStyle: {
 			marginBottom: 20,
 			borderWidth: 1,
-			borderColor: theme.colors.border,
 			borderRadius: 7.6,
 		},
 		wrappText: {
@@ -102,7 +100,7 @@ const SignupFormUI = (props: SignupParams) => {
 	const [, t] = useLanguage();
 	const [, { login }] = useSession();
 	const [{ configs }] = useConfig();
-	const { control, handleSubmit, errors } = useForm();
+	const { control, handleSubmit, errors, register, setValue } = useForm();
 
 	const [passwordSee, setPasswordSee] = useState(false);
 	const [formValues, setFormValues] = useState(null);
@@ -227,7 +225,7 @@ const SignupFormUI = (props: SignupParams) => {
 			handleButtonSignupClick &&
 				handleButtonSignupClick({
 					...values,
-					...phoneInputData.phone,
+					...((phoneInputData.phone.cellphone !== null && phoneInputData.phone.country_phone_code !== null) && {...phoneInputData.phone}),
 				});
 			if (
 				!formState.loading &&
@@ -298,36 +296,23 @@ const SignupFormUI = (props: SignupParams) => {
 
 	useEffect(() => {
 		if (Object.keys(errors).length > 0) {
-			// Convert all errors in one string to show in toast provider
-			const list = Object.values(errors);
-			if (phoneInputData.error) {
-				list.push({ message: phoneInputData.error });
-			}
-			if (
-				!phoneInputData.error &&
-				!phoneInputData.phone.country_phone_code &&
-				!phoneInputData.phone.cellphone &&
-				((validationFields?.fields?.checkout?.cellphone?.enabled &&
-          validationFields?.fields?.checkout?.cellphone?.required) ||
-          configs?.verification_phone_required?.value === '1')
-			) {
-				list.push({
-					message: t(
-						'VALIDATION_ERROR_MOBILE_PHONE_REQUIRED',
-						'The field Mobile phone is required.',
-					),
-				});
-			}
-			let stringError = '';
-			list.map((item: any, i: number) => {
-				stringError +=
-					i + 1 === list.length ? `- ${item.message}` : `- ${item.message}\n`;
-			});
-			showToast(ToastType.Error, stringError);
 			setIsLoadingVerifyModal(false);
 		}
 	}, [errors]);
 
+	useEffect(() => {
+    register('cellphone', {
+      required: isRequiredField('cellphone')
+        ? t('VALIDATION_ERROR_MOBILE_PHONE_REQUIRED', 'The field Mobile phone is required').replace('_attribute_', t('CELLPHONE', 'Cellphone'))
+        : null
+    })
+  }, [register])
+
+	useEffect(() => {
+		if (phoneInputData?.phone?.cellphone) setValue('cellphone', phoneInputData?.phone?.cellphone, '')
+		else setValue('cellphone', '')
+	}, [phoneInputData?.phone?.cellphone])
+
 	useEffect(() => {
 		if (verifyPhoneState && !verifyPhoneState?.loading) {
 			if (verifyPhoneState.result?.error) {
@@ -412,48 +397,58 @@ const SignupFormUI = (props: SignupParams) => {
 									!notValidationFields.includes(field.code) &&
 									showField &&
 									showField(field.code) && (
-										<Controller
-											key={field.id}
-											control={control}
-											render={({ onChange, value }: any) => (
-												<OInput
-													placeholder={t(field.name)}
-													style={style.inputStyle}
-													icon={
-														field.code === 'email'
-															? theme.images.general.email
-															: theme.images.general.user
-													}
-													value={value}
-													onChange={(val: any) =>
-														field.code !== 'email'
-															? onChange(val)
-															: handleChangeInputEmail(val, onChange)
-													}
-													autoCapitalize={
-														field.code === 'email' ? 'none' : 'sentences'
-													}
-													autoCorrect={field.code === 'email' && false}
-													type={
-														field.code === 'email' ? 'email-address' : 'default'
-													}
-													autoCompleteType={
-														field.code === 'email' ? 'email' : 'off'
-													}
-													returnKeyType="next"
-													blurOnSubmit={false}
-													forwardRef={(ref: any) => handleRefs(ref, field.code)}
-													onSubmitEditing={() =>
-														field.code === 'email'
-															? phoneRef?.current?.focus?.()
-															: handleFocusRef(getNextFieldCode(i))
-													}
-												/>
+										<React.Fragment key={field.id}>
+											{errors?.[`${field.code}`] && (
+												<OText
+													size={14}
+													color={theme.colors.danger5}
+													weight={'normal'}>
+													{errors?.[`${field.code}`]?.message} {errors?.[`${field.code}`]?.type === 'required' && '*'}
+												</OText>
 											)}
-											name={field.code}
-											rules={getInputRules(field)}
-											defaultValue=""
-										/>
+											<Controller
+												control={control}
+												render={({ onChange, value }: any) => (
+													<OInput
+														placeholder={t(field.name)}
+														style={style.inputStyle}
+														icon={
+															field.code === 'email'
+																? theme.images.general.email
+																: theme.images.general.user
+														}
+														value={value}
+														onChange={(val: any) =>
+															field.code !== 'email'
+																? onChange(val)
+																: handleChangeInputEmail(val, onChange)
+														}
+														autoCapitalize={
+															field.code === 'email' ? 'none' : 'sentences'
+														}
+														autoCorrect={field.code === 'email' && false}
+														type={
+															field.code === 'email' ? 'email-address' : 'default'
+														}
+														autoCompleteType={
+															field.code === 'email' ? 'email' : 'off'
+														}
+														returnKeyType="next"
+														blurOnSubmit={false}
+														forwardRef={(ref: any) => handleRefs(ref, field.code)}
+														onSubmitEditing={() =>
+															field.code === 'email'
+																? phoneRef?.current?.focus?.()
+																: handleFocusRef(getNextFieldCode(i))
+														}
+														borderColor={errors?.[`${field.code}`] ? theme.colors.danger5 : theme.colors.border}
+													/>
+												)}
+												name={field.code}
+												rules={getInputRules(field)}
+												defaultValue=""
+											/>
+										</React.Fragment>
 									),
 							)}
 
@@ -467,6 +462,7 @@ const SignupFormUI = (props: SignupParams) => {
 											returnKeyType: 'next',
 											onSubmitEditing: () => passwordRef?.current?.focus?.(),
 										}}
+										isStartValidation={errors?.cellphone}
 									/>
 								</View>
 							)}
@@ -499,99 +495,122 @@ const SignupFormUI = (props: SignupParams) => {
 							</View>
 
 							{configs?.terms_and_conditions?.value === 'true' && (
-								<View style={{ flexDirection: 'row', alignItems: 'center', marginBottom: 20 }}>
+								<>
+									{errors?.termsAccept && (
+										<OText
+											size={14}
+											color={theme.colors.danger5}
+											weight={'normal'}>
+											{errors?.termsAccept?.message}*
+										</OText>
+									)}
+									<View style={{ flexDirection: 'row', alignItems: 'center', marginBottom: 20 }}>
+										<Controller
+											control={control}
+											render={({ onChange, value }: any) => (
+												<CheckBox
+													value={value}
+													onValueChange={newValue => {
+														onChange(newValue)
+													}}
+													boxType={'square'}
+													tintColors={{
+														true: theme.colors.primary,
+														false: theme.colors.disabled
+													}}
+													tintColor={theme.colors.disabled}
+													onCheckColor={theme.colors.primary}
+													onTintColor={theme.colors.primary}
+													style={Platform.OS === 'ios' && style.checkBoxStyle}
+												/>
+											)}
+											name='termsAccept'
+											rules={{
+												required: t('VALIDATION_ERROR_ACCEPTED', 'The _attribute_ must be accepted.').replace('_attribute_', t('TERMS_AND_CONDITIONS', 'Terms & Conditions'))
+											}}
+											defaultValue={false}
+										/>
+										<OText style={{ fontSize: 14, paddingHorizontal: 5 }}>{t('TERMS_AND_CONDITIONS_TEXT', 'I agree with')}</OText>
+										<OButton
+											imgRightSrc={null}
+											text={t('TERMS_AND_CONDITIONS', 'Terms & Conditions')}
+											bgColor='#FFF'
+											borderColor='#FFF'
+											style={{ paddingLeft: 0, paddingRight: 0, height: 30, shadowColor: '#FFF' }}
+											textStyle={{ color: theme.colors.primary, marginLeft: 0, marginRight: 0 }}
+											onClick={() => handleOpenTermsUrl(configs?.terms_and_conditions_url?.value)}
+										/>
+									</View>
+								</>
+
+							)}
+
+							{signupTab !== 'cellphone' && (
+								<>
+									{errors?.password && (
+										<OText
+											size={14}
+											color={theme.colors.danger5}
+											weight={'normal'}>
+											{errors?.password?.message} {errors?.password?.type === 'required' && '*'}
+										</OText>
+									)}
 									<Controller
 										control={control}
 										render={({ onChange, value }: any) => (
-											<CheckBox
+											<OInput
+												isSecured={!passwordSee ? true : false}
+												placeholder={t('PASSWORD', 'Password')}
+												style={style.inputStyle}
+												icon={theme.images.general.lock}
+												iconCustomRight={
+													!passwordSee ? (
+														<MaterialCommunityIcons
+															name="eye-outline"
+															color={theme.colors.disabled}
+															size={24}
+															onPress={() => setPasswordSee(!passwordSee)}
+														/>
+													) : (
+														<MaterialCommunityIcons
+															name="eye-off-outline"
+															color={theme.colors.disabled}
+															size={24}
+															onPress={() => setPasswordSee(!passwordSee)}
+														/>
+													)
+												}
 												value={value}
-												onValueChange={newValue => {
-													onChange(newValue)
-												}}
-												boxType={'square'}
-												tintColors={{
-													true: theme.colors.primary,
-													false: theme.colors.disabled
-												}}
-												tintColor={theme.colors.disabled}
-												onCheckColor={theme.colors.primary}
-												onTintColor={theme.colors.primary}
-												style={Platform.OS === 'ios' && style.checkBoxStyle}
+												onChange={(val: any) => onChange(val)}
+												returnKeyType="done"
+												onSubmitEditing={handleSubmit(onSubmit)}
+												blurOnSubmit
+												forwardRef={passwordRef}
+												borderColor={errors?.password ? theme.colors.danger5 : theme.colors.border}
 											/>
 										)}
-										name='termsAccept'
+										name="password"
 										rules={{
-											required: t('VALIDATION_ERROR_ACCEPTED', 'The _attribute_ must be accepted.').replace('_attribute_', t('TERMS_AND_CONDITIONS', 'Terms & Conditions'))
+											required: isRequiredField('password')
+												? t(
+													'VALIDATION_ERROR_PASSWORD_REQUIRED',
+													'The field Password is required',
+												).replace('_attribute_', t('PASSWORD', 'password'))
+												: null,
+											minLength: {
+												value: 8,
+												message: t(
+													'VALIDATION_ERROR_PASSWORD_MIN_STRING',
+													'The Password must be at least 8 characters.',
+												)
+													.replace('_attribute_', t('PASSWORD', 'Password'))
+													.replace('_min_', 8),
+											},
 										}}
-										defaultValue={false}
-									/>
-									<OText style={{ fontSize: 14, paddingHorizontal: 5 }}>{t('TERMS_AND_CONDITIONS_TEXT', 'I agree with')}</OText>
-									<OButton
-										imgRightSrc={null}
-										text={t('TERMS_AND_CONDITIONS', 'Terms & Conditions')}
-										bgColor='#FFF'
-										borderColor='#FFF'
-										style={{ paddingLeft: 0, paddingRight: 0, height: 30, shadowColor: '#FFF' }}
-										textStyle={{ color: theme.colors.primary, marginLeft: 0, marginRight: 0 }}
-										onClick={() => handleOpenTermsUrl(configs?.terms_and_conditions_url?.value)}
+										defaultValue=""
 									/>
-								</View>
-							)}
+								</>
 
-							{signupTab !== 'cellphone' && (
-								<Controller
-									control={control}
-									render={({ onChange, value }: any) => (
-										<OInput
-											isSecured={!passwordSee ? true : false}
-											placeholder={t('PASSWORD', 'Password')}
-											style={style.inputStyle}
-											icon={theme.images.general.lock}
-											iconCustomRight={
-												!passwordSee ? (
-													<MaterialCommunityIcons
-														name="eye-outline"
-														color={theme.colors.disabled}
-														size={24}
-														onPress={() => setPasswordSee(!passwordSee)}
-													/>
-												) : (
-													<MaterialCommunityIcons
-														name="eye-off-outline"
-														color={theme.colors.disabled}
-														size={24}
-														onPress={() => setPasswordSee(!passwordSee)}
-													/>
-												)
-											}
-											value={value}
-											onChange={(val: any) => onChange(val)}
-											returnKeyType="done"
-											onSubmitEditing={handleSubmit(onSubmit)}
-											blurOnSubmit
-											forwardRef={passwordRef}
-										/>
-									)}
-									name="password"
-									rules={{
-										required: isRequiredField('password')
-											? t(
-												'VALIDATION_ERROR_PASSWORD_REQUIRED',
-												'The field Password is required',
-											).replace('_attribute_', t('PASSWORD', 'password'))
-											: null,
-										minLength: {
-											value: 8,
-											message: t(
-												'VALIDATION_ERROR_PASSWORD_MIN_STRING',
-												'The Password must be at least 8 characters.',
-											)
-												.replace('_attribute_', t('PASSWORD', 'Password'))
-												.replace('_min_', 8),
-										},
-									}}
-									defaultValue=""
-								/>
 							)}
 						</>
 					) : (

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

@@ -70,25 +70,18 @@ export const SingleProductCard = (props: SingleProductCardParams) => {
 	const editMode = typeof product?.code !== 'undefined';
 
 	const removeToBalance = editMode ? product?.quantity : 0;
-	const cart = orderState.carts[`businessId:${businessId}`];
-	const productCart = cart?.products?.find(
-		(prod: any) => prod.id === product?.id,
-	);
-	const totalBalance = (productCart?.quantity || 0) - removeToBalance;
+	const cartProducts: any = Object.values(orderState.carts).reduce((products: any, _cart: any) => [...products, ..._cart?.products], [])
+	const productBalance = cartProducts.reduce((sum: any, _product: any) => sum + (_product.id === product?.id ? _product.quantity : 0), 0)
+
+	const totalBalance = (productBalance || 0) - removeToBalance
 
 	const maxCartProductConfig =
 		(stateConfig.configs.max_product_amount
 			? parseInt(stateConfig.configs.max_product_amount)
 			: 100) - totalBalance;
 
-	const productBalance =
-		(cart?.products?.reduce(
-			(sum: any, _product: any) =>
-				sum + (product && _product.id === product?.id ? _product.quantity : 0),
-			0,
-		) || 0) - removeToBalance;
 	let maxCartProductInventory =
-		(product?.inventoried ? product?.quantity : undefined) - productBalance;
+		(product?.inventoried ? product?.quantity : undefined) - totalBalance;
 	maxCartProductInventory = !isNaN(maxCartProductInventory)
 		? maxCartProductInventory
 		: maxCartProductConfig;
@@ -139,7 +132,7 @@ export const SingleProductCard = (props: SingleProductCardParams) => {
 				<FastImage
 					style={styles.productStyle}
 					source={{
-						uri: optimizeImage(product?.images, 'h_75,c_limit'),
+						uri: optimizeImage(product?.images, 'h_250,c_limit'),
 						priority: FastImage.priority.normal,
 					}}
 					resizeMode={FastImage.resizeMode.cover}

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

@@ -30,4 +30,4 @@ export const QuantityContainer = styled.View`
 export const PricesContainer = styled.View`
   flex-direction: row;
   align-items: center;
-`
+`

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

@@ -0,0 +1,166 @@
+import React, { useState, useEffect } from 'react'
+import { useLanguage } from 'ordering-components/native'
+import { OText, OButton, OInput } from '../shared'
+import { StyleSheet, TouchableOpacity, View } from 'react-native'
+import AntDesignIcons from 'react-native-vector-icons/AntDesign'
+import { useTheme } from 'styled-components/native'
+import { SingleProductReviewParams } from '../../types'
+
+import { reviewCommentList } from '../../../../../src/utils'
+
+import {
+  ProductContainer,
+  ProductHeader,
+  LikeHandsActionContainer,
+  LikeHandsButton,
+  CommentsButtonGroup,
+} from './styles'
+
+export const SingleProductReview = (props: SingleProductReviewParams) => {
+  const {
+    product,
+    formState,
+    handleChangeFormState,
+  } = props
+
+  const [, t] = useLanguage()
+  const theme = useTheme()
+
+  const styles = StyleSheet.create({
+    inputTextArea: {
+      borderColor: theme.colors.lightGray,
+      borderRadius: 8,
+      marginTop: 10,
+      marginBottom: 40,
+      height: 100,
+      alignItems: 'flex-start'
+    },
+    additionalCommentButton: {
+      flexDirection: 'row',
+      justifyContent: 'center',
+      marginVertical: 10,
+    },
+  })
+
+  const [comments, setComments] = useState<Array<any>>([])
+  const [extraComment, setExtraComment] = useState('')
+  const [isShowTextArea, setIsShowTextArea] = useState(false)
+  const [qualification, setQualification] = useState(5)
+  const [currentValue, setCurrentValue] = useState(5)
+
+  const commentsList = reviewCommentList('product')
+
+  const isSelectedComment = (commentKey: number) => {
+    const found = comments.find((comment: any) => comment?.key === commentKey)
+    return found
+  }
+
+  const handleChangeComment = (commentItem: any) => {
+    const found = comments.find((comment: any) => comment?.key === commentItem.key)
+    if (found) {
+      const _comments = comments.filter((comment: any) => comment?.key !== commentItem.key)
+      setComments(_comments)
+    } else {
+      setComments([...comments, commentItem])
+    }
+  }
+
+  useEffect(() => {
+    const value = qualification ? 5 : 1
+    setCurrentValue(value)
+    if (value !== currentValue) setComments([])
+    if (comments?.length === 0 && !extraComment && formState.changes?.length === 0 && qualification === 5) return
+    let _comments = ''
+    if (comments.length > 0) {
+      comments.map(comment => (_comments += comment.content + '. '))
+    }
+    const _comment = _comments + extraComment
+    let found = false
+    const _changes = formState.changes.map((item: any) => {
+      if (item?.product_id === product?.product_id) {
+        found = true
+        return {
+          product_id: product?.product_id,
+          comment: _comment,
+          qualification: qualification
+        }
+      }
+      return item
+    })
+    if (!found) {
+      _changes.push({
+        product_id: product?.product_id,
+        comment: _comment,
+        qualification: qualification
+      })
+    }
+    handleChangeFormState && handleChangeFormState(_changes)
+  }, [comments, extraComment, qualification])
+
+  return (
+    <>
+      <ProductContainer>
+        <ProductHeader>
+          <OText numberOfLines={1} style={{ flex: 1 }} color={theme.colors.textNormal}>{product?.name}</OText>
+          <LikeHandsActionContainer>
+            <LikeHandsButton
+              isLike
+              onPress={() => setQualification(5)}
+            >
+              <AntDesignIcons name='like2' size={20} color={qualification === 5 ? theme.colors.primary : theme.colors.lightGray} />
+            </LikeHandsButton>
+            <LikeHandsButton onPress={() => setQualification(1)}>
+              <AntDesignIcons name='dislike2' size={20} color={qualification === 1 ? theme.colors.primary : theme.colors.lightGray} />
+            </LikeHandsButton>
+          </LikeHandsActionContainer>
+        </ProductHeader>
+        <CommentsButtonGroup>
+          {commentsList[qualification === 5 ? 'like' : 'dislike']?.map(commentItem => (
+            <OButton
+              key={commentItem.key}
+              text={commentItem.content}
+              bgColor={isSelectedComment(commentItem.key) ? theme.colors.primary : theme.colors.backgroundGray200}
+              borderColor={isSelectedComment(commentItem.key) ? theme.colors.primary : theme.colors.backgroundGray200}
+              textStyle={{
+                color: isSelectedComment(commentItem.key) ? theme.colors.white : theme.colors.textNormal,
+                fontSize: 13,
+                paddingRight: isSelectedComment(commentItem.key) ? 15 : 0
+              }}
+              style={{ height: 35, paddingLeft: 5, paddingRight: 5, marginHorizontal: 3, marginVertical: 10 }}
+              imgRightSrc={isSelectedComment(commentItem.key) ? theme.images.general.close : null}
+              imgRightStyle={{ tintColor: theme.colors.white, right: 5, margin: 5 }}
+              onClick={() => handleChangeComment(commentItem) }
+            />
+          ))}
+        </CommentsButtonGroup>
+        <TouchableOpacity
+          style={styles.additionalCommentButton}
+          onPress={() => setIsShowTextArea(!isShowTextArea)}
+        >
+          <OText
+            color={isShowTextArea ? theme.colors.primary : theme.colors.disabled}
+            style={{
+              borderBottomColor: isShowTextArea ? theme.colors.primary : theme.colors.disabled,
+              borderBottomWidth: 1
+            }}
+          >
+            {t('ADDITIONAL_COMMENTS', 'Additional comments')}
+          </OText>
+        </TouchableOpacity>
+        {isShowTextArea && (
+          <View>
+            <OText style={{ marginTop: 10 }} color={theme.colors.textNormal}>{t('REVIEW_COMMENT_QUESTION', 'Do you want to add something?')}</OText>
+            <OInput
+              name='comments'
+              onChange={(val: any) => {
+                setExtraComment(val.target.value)
+              }}
+              style={styles.inputTextArea}
+              multiline
+            />
+          </View>
+        )}
+      </ProductContainer>
+    </>
+  )
+}

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

@@ -0,0 +1,27 @@
+import styled, { css } from 'styled-components/native'
+
+export const ProductContainer = styled.View`
+  margin-bottom: 15px;
+`
+
+export const ProductHeader = styled.View`
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  margin-bottom: 10px;
+`
+
+export const LikeHandsActionContainer = styled.View`
+  flex-direction: row;
+`
+
+export const LikeHandsButton = styled.TouchableOpacity`
+  ${(props: any) => props.isLike && css`
+    margin-horizontal: 15px;
+  `}
+`
+
+export const CommentsButtonGroup = styled.View`
+  flex-direction: row;
+  flex-wrap: wrap;
+`