ordering-ui-react-native 0.21.19 → 0.21.20-release

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

@@ -1,116 +1,41 @@
-import React, { useState, useEffect } from 'react'
-import { Platform, StyleSheet, TouchableOpacity, View } from 'react-native'
+import React, { useEffect } from 'react'
 import {
   UpsellingPage as UpsellingPageController,
-  useUtils,
-  useLanguage,
   useOrder,
-  useConfig
 } from 'ordering-components/native'
-import { useTheme } from 'styled-components/native';
-import { OText, OIcon, OBottomPopup, OButton } from '../shared'
+import { OBottomPopup } from '../shared'
 import { UpsellingProductsParams } from '../../types'
-import {
-  Container,
-  UpsellingContainer,
-  Item,
-  Details,
-  AddButton,
-  CartList,
-  CartDivider
-} from './styles'
-import { OrderSummary } from '../OrderSummary';
-import { Cart } from '../Cart';
-import { ScrollView } from 'react-native-gesture-handler';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
+
+import { UpsellingLayout } from './UpsellingLayout';
+import { UpsellingContent } from './UpsellingContent';
 
 const UpsellingProductsUI = (props: UpsellingProductsParams) => {
   const {
     isCustomMode,
     upsellingProducts,
-    business,
     handleUpsellingPage,
     openUpselling,
     canOpenUpselling,
     setCanOpenUpselling,
-    isFromCart,
-    onNavigationRedirect,
-    onGoBack
+    isFromCart
   } = props
 
-  const theme = useTheme();
-
-  const styles = StyleSheet.create({
-    imageStyle: {
-      width: 73,
-      height: 73,
-      resizeMode: 'cover',
-      borderRadius: 7.6,
-    },
-    closeUpsellingButton: {
-      borderRadius: 7.6,
-      borderColor: theme.colors.primary,
-      backgroundColor: theme.colors.primary,
-      borderWidth: 1,
-      alignSelf: 'center',
-      height: 44,
-      shadowOpacity: 0,
-      width: '80%',
-    },
-    cancelBtn: {
-      paddingHorizontal: 18,
-      borderWidth: 1,
-      borderRadius: 7.6,
-      borderColor: theme.colors.textSecondary,
-      height: 38
-    },
-    headerItem: {
-      flexDirection: 'row',
-      alignItems: 'center',
-      marginVertical: 2,
-      marginHorizontal: 20,
-    },
-    btnBackArrow: {
-      borderWidth: 0,
-      width: 26,
-      height: 26,
-      backgroundColor: theme.colors.clear,
-      borderColor: theme.colors.clear,
-      shadowColor: theme.colors.clear,
-      paddingLeft: 0,
-      paddingRight: 0,
-      marginLeft: 20,
-      marginBottom: 10
-    },
-  })
-
   const [{ carts }] = useOrder()
-  const [{ parsePrice }] = useUtils()
-  const [{ configs }] = useConfig()
-  const [, t] = useLanguage()
-  const { bottom } = useSafeAreaInsets()
-  const [isCartsLoading, setIsCartsLoading] = useState(false)
-
-  const isMultiCheckout = configs?.checkout_multi_business_enabled?.value === '1'
-  const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
-  const showCartList = isChewLayout
-  const commentDelayTime = isChewLayout ? 500 : null
 
   const cart = carts?.[`businessId:${props.businessId}`] ?? {}
-  const cartList = (carts && Object.values(carts).filter((_cart: any) => _cart?.products?.length > 0 && _cart.uuid !== cart?.uuid)) || []
   const cartProducts = cart?.products?.length
-    ? cart?.products.map((product: any) => product.id)
-    : []
+  ? cart?.products.map((product: any) => product.id)
+  : []
 
   const productsList = !upsellingProducts.loading && !upsellingProducts.error
-    ? upsellingProducts?.products?.length
+  ? upsellingProducts?.products?.length
       ? upsellingProducts?.products.filter((product: any) => !cartProducts.includes(product.id))
       : (props?.products ?? []).filter((product: any) => !cartProducts.includes(product.id)) ?? []
-    : []
+  : []
 
   useEffect(() => {
     if (!isCustomMode && !props.products) {
-      if (!upsellingProducts.loading) {
+      if (!upsellingProducts?.loading) {
         if (upsellingProducts?.products?.length && !isFromCart) {
           setCanOpenUpselling && setCanOpenUpselling(true)
         } else {
@@ -118,125 +43,16 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
         }
       }
     }
-  }, [upsellingProducts.loading, upsellingProducts?.products.length])
-
-  const handleFormProduct = (product: any) => {
-    onNavigationRedirect && onNavigationRedirect('ProductDetails', {
-      product: product,
-      businessId: product?.api?.businessId,
-      businessSlug: business.slug,
-    })
-  }
-
-  const UpsellingLayout = () => {
-    return (
-      <Container>
-        <UpsellingContainer
-          horizontal
-          showsHorizontalScrollIndicator={false}
-          contentContainerStyle={{ paddingHorizontal: Platform.OS === 'ios' ? 40 : 0 }}
-        >
-          {
-            !upsellingProducts.loading && (
-              <>
-                {
-                  !upsellingProducts.error ? productsList.map((product: any, i: number) => (
-                    <Item key={`${product.id}_${i}`}>
-                      <View style={{ flexBasis: '57%' }}>
-                        <Details>
-                          <OText size={12} lineHeight={18} numberOfLines={1} ellipsizeMode='tail'>{product.name}</OText>
-                          <OText size={12} lineHeight={18} color={theme.colors.textNormal}>{parsePrice(product.price)}</OText>
-                        </Details>
-                        <AddButton onPress={() => handleFormProduct(product)}>
-                          <OText size={10} color={theme.colors.primary}>{t('ADD', 'Add')}</OText>
-                        </AddButton>
-                      </View>
-                      <View>
-                        <OIcon url={product?.images || theme?.images?.dummies?.product} style={styles.imageStyle} />
-                      </View>
-                    </Item>
-                  )) : (
-                    <OText>
-                      {upsellingProducts.message}
-                    </OText>
-                  )
-                }
-              </>
-            )
-          }
-        </UpsellingContainer>
-      </Container>
-    )
-  }
-
-  const UpsellingContent = () => {
-    return (
-      <>
-        <View style={{ ...styles.headerItem, flex: 1, marginTop: Platform.OS == 'ios' ? 35 : 14 }}>
-          <TouchableOpacity onPress={() => onGoBack()} style={styles.btnBackArrow}>
-            <OIcon src={theme.images.general.arrow_left} color={theme.colors.textNormal} />
-          </TouchableOpacity>
-        </View>
-        <ScrollView style={{ marginTop: 10, marginBottom: props.isPage ? 40 : bottom + (Platform.OS == 'ios' ? 96 : 130) }} showsVerticalScrollIndicator={false}>
-          {productsList.length > 0 &&
-            <View style={{ paddingHorizontal: 40, overflow: 'visible' }}>
-              <OText size={16} lineHeight={24} weight={'500'}>{t('WANT_SOMETHING_ELSE', 'Do you want something else?')}</OText>
-              <UpsellingLayout />
-            </View>
-          }
-          <View style={{ paddingHorizontal: 40 }}>
-            <OText size={20} lineHeight={30} weight={600} style={{ marginTop: 10, marginBottom: 17 }}>{t('YOUR_CART', 'Your cart')}</OText>
-            <OrderSummary
-              cart={cart}
-              commentDelayTime={commentDelayTime}
-              isCartPending={cart?.status === 2}
-              onNavigationRedirect={onNavigationRedirect}
-            />
-          </View>
-          {showCartList && cartList.map((cart: any, i: number) => (
-            <CartList key={i}>
-              <Cart
-                isFromUpselling
-                cart={cart}
-                cartuuid={cart.uuid}
-                hideUpselling
-                singleBusiness={props.singleBusiness}
-                isFranchiseApp={props.isFranchiseApp}
-                isCartsLoading={isCartsLoading}
-                setIsCartsLoading={setIsCartsLoading}
-                isMultiCheckout={isMultiCheckout}
-                onNavigationRedirect={props.onNavigationRedirect}
-              />
-              <CartDivider />
-            </CartList>
-          ))}
-        </ScrollView>
-        <View
-          style={{
-            alignItems: 'center',
-            bottom: props.isPage ? Platform.OS === 'ios' ? 0 : 20 : Platform.OS === 'ios' ? bottom + 59 : bottom + 125
-          }}
-        >
-          <OButton
-            imgRightSrc=''
-            text={t('CHECKOUT', 'Checkout')}
-            style={{ ...styles.closeUpsellingButton }}
-            textStyle={{ color: theme.colors.white, fontSize: 14 }}
-            onClick={() => handleUpsellingPage(cart)}
-          />
-        </View>
-      </>
-    )
-  }
+  }, [upsellingProducts?.loading, upsellingProducts?.products?.length])
 
   return (
     <>
       {isCustomMode ? (
-        <UpsellingLayout />
+        <UpsellingLayout {...props} productsList={productsList} />
       ) : (
         <>
           {props.isPage ? (
-            <UpsellingContent />
+            <UpsellingContent {...props} cart={cart} productsList={productsList} />
           ) : (
             canOpenUpselling && (
               <OBottomPopup
@@ -245,7 +61,7 @@ const UpsellingProductsUI = (props: UpsellingProductsParams) => {
                 onClose={() => handleUpsellingPage(cart)}
                 isStatusBar
               >
-                <UpsellingContent />
+                <UpsellingContent {...props} productsList={productsList} />
               </OBottomPopup>
             )
           )}

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

@@ -59,3 +59,22 @@ export const CartDivider = styled.View`
   background-color:  ${(props: any) => props.theme.colors.backgroundGray100};
   margin: 20px -40px 0;
 `
+
+
+export const TopActionsHeader = styled.TouchableOpacity`
+	height: 60px;
+	justify-content: center;
+  min-width: 30px;
+  padding-right: 15px;
+`;
+
+export const TopHeader = styled.View`
+  width: 100%;
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  z-index: 1;
+  height: 60px;
+  min-height: 60px;
+`
+

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

@@ -5,7 +5,7 @@ import { useTheme } from 'styled-components/native';
 import { useForm, Controller } from 'react-hook-form';
 import { SignupForm } from '../SignupForm'
 
-import { UDForm, UDLoader, UDWrapper, WrapperPhone } from './styles';
+import { UDForm, UDLoader, UDWrapper, WrapperPhone, WrapperBirthdate } from './styles';
 
 import { OText, OButton, OInput, OModal, OIcon } from '../shared';
 import { OAlert } from '../../../../../src/components/shared'
@@ -13,6 +13,8 @@ import { OAlert } from '../../../../../src/components/shared'
 import { PhoneInputNumber } from '../PhoneInputNumber';
 import { sortInputFields } from '../../utils';
 import { ListItem } from '../UserProfile/styles';
+import moment from 'moment';
+import { DatePickerUI } from '../DatePicker';
 
 export const UserFormDetailsUI = (props: any) => {
 	const {
@@ -81,6 +83,8 @@ export const UserFormDetailsUI = (props: any) => {
 	const [isValid, setIsValid] = useState(false)
 	const [isChanged, setIsChanged] = useState(false)
 	const [isModalOpen, setIsModalOpen] = useState(false)
+	const [birthdate, setBirthdate] = useState(user?.birthdate ?? null)
+	const [showDatePicker, setShowDatePicker] = useState(false)
 	const [phoneInputData, setPhoneInputData] = useState({
 		error: '',
 		phone: {
@@ -92,6 +96,7 @@ export const UserFormDetailsUI = (props: any) => {
 
 	const isAdmin = user?.level === 0
 	const showInputPhoneNumber = (validationFields?.fields?.checkout?.cellphone?.enabled ?? false) || configs?.verification_phone_required?.value === '1'
+	const showInputBirthday = validationFields?.fields?.checkout?.birthdate?.enabled ?? false
 
 	const handleSuccessSignup = (user: any) => {
 		login({
@@ -206,6 +211,13 @@ export const UserFormDetailsUI = (props: any) => {
 		handleChangeInput(countryCode, true);
 	}
 
+	const _handleChangeDate = (date: any) => {
+		setBirthdate(date)
+		const _birthdate = moment(date).format('YYYY-MM-DD')
+		handleChangeInput({ target: { name: 'birthdate', value: _birthdate } })
+		setShowDatePicker(false)
+	}
+
 	const onRemoveAccount = () => {
 		setConfirm({
 			open: true,
@@ -268,6 +280,14 @@ export const UserFormDetailsUI = (props: any) => {
 		}
 	}, [phoneInputData, configs?.verification_phone_required?.value, isChanged])
 
+	useEffect(() => {
+		if (!validationFields.loading && birthdate) {
+			setValue('birthdate', formState?.result?.result
+				? formState?.result?.result?.birthdate
+				: formState?.changes?.birthdate ?? (user && user?.birthdate) ?? '')
+		}
+	}, [validationFields, birthdate])
+
 	useEffect(() => {
 		if (!requiredFields || formState?.changes?.length === 0) return
 		const _isValid = requiredFields.every((key: any) => formState?.changes[key])
@@ -359,7 +379,21 @@ export const UserFormDetailsUI = (props: any) => {
 										</React.Fragment>
 									),
 							)}
-
+							{showInputBirthday && (
+								<>
+									<WrapperBirthdate>
+										<OText size={14} lineHeight={21} color={theme.colors.textNormal} weight={'500'} style={{ textTransform: 'capitalize', alignSelf: 'flex-start' }}>
+											{t('BIRTHDATE', 'Birthdate')}
+										</OText>
+										<TouchableOpacity onPress={() => setShowDatePicker(!showDatePicker)}>
+											<OText size={14} lineHeight={21} color={theme.colors.textNormal} weight={'500'} style={{ marginTop: 6 }}>
+												{birthdate ? moment(birthdate).format('YYYY-MM-DD') : ''}
+											</OText>
+										</TouchableOpacity>
+									</WrapperBirthdate>
+									<DatePickerUI open={showDatePicker} birthdate={birthdate} onConfirm={_handleChangeDate} onCancel={() => setShowDatePicker(false)} />
+								</>
+							)}
 							{!!showInputPhoneNumber && ((requiredFields && requiredFields.includes('cellphone')) || !requiredFields) && (
 								<WrapperPhone>
 									<OText size={14} lineHeight={21} weight={'500'} color={theme.colors.textNormal}>{t('PHONE', 'Phone')}</OText>
@@ -448,8 +482,8 @@ export const UserFormDetailsUI = (props: any) => {
 										? t('UPDATING', 'Updating...')
 										: t('UPDATE', 'Update')
 								}
-								bgColor={theme.colors.white}
-								textStyle={{ color: theme.colors.primary, fontSize: 14 }}
+								bgColor={theme.colors.primary}
+								textStyle={{ color: theme.colors.white, fontSize: 14 }}
 								borderColor={theme.colors.primary}
 								isDisabled={formState.loading}
 								imgRightSrc={null}
@@ -468,12 +502,25 @@ export const UserFormDetailsUI = (props: any) => {
 								? t('SIGN_UP_AND_PLACE_ORDER', 'Sign up and place order')
 								: t('CONTINUE', 'Continue'))
 					}
-					bgColor={theme.colors.white}
-					textStyle={{ color: theme.colors.primary, fontSize: 14 }}
+					bgColor={theme.colors.primary}
+					textStyle={{
+						color: !user?.guest_id && (formState.loading || !isValid) ? theme.colors.primary : theme.colors.white,
+						fontSize: 14
+					}}
 					borderColor={theme.colors.primary}
 					isDisabled={!user?.guest_id && (formState.loading || !isValid)}
 					imgRightSrc={null}
-					style={{ borderRadius: 7.6, shadowOpacity: 0, width: '100%', borderWidth: 1, marginTop: 20, marginBottom: 20 }}
+					style={{
+						borderRadius: 7.6,
+						shadowOpacity: 0,
+						width: '100%',
+						borderWidth: 1,
+						marginTop: 20,
+						marginBottom: 20,
+						backgroundColor: !user?.guest_id && (formState.loading || !isValid) ? theme.colors.lightGray : theme.colors.primary,
+						borderColor: !user?.guest_id && (formState.loading || !isValid) ? theme.colors.white : theme.colors.primary,
+						opacity: !user?.guest_id && (formState.loading || !isValid) ? 0.3 : 1,
+					}}
 					onClick={!user?.guest_id ? handleSubmit(onSubmit) : () => setIsModalOpen(true)}
 				/>
 			)}
@@ -507,4 +554,3 @@ export const UserFormDetailsUI = (props: any) => {
 		</>
 	);
 };
-

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

@@ -32,3 +32,10 @@ export const WrapperPhone = styled.View`
   border-bottom-width: 1px;
   border-bottom-color: ${(props: any) => props.theme.colors.border};
 `
+
+export const WrapperBirthdate = styled.View`
+  margin-bottom: 25px;
+  width: 100%;
+  border-bottom-width: 1px;
+  border-bottom-color: ${(props: any) => props.theme.colors.border};
+`

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

@@ -20,7 +20,7 @@ import MaterialIcons from 'react-native-vector-icons/MaterialIcons'
 import FontAwesome from 'react-native-vector-icons/FontAwesome'
 import FastImage from 'react-native-fast-image'
 import { OAlert } from '../../../../../src/components/shared'
-
+import { WebsocketStatus } from '../WebsocketStatus'
 import {
 	OIcon,
 	OText,
@@ -101,7 +101,7 @@ const ProfileListUI = (props: ProfileParams) => {
 			marginEnd: 14
 		},
 		pagePadding: {
-			paddingHorizontal: isChewLayout ? 20 : 40
+			paddingHorizontal: 20
 		},
 		messageIconStyle: {
 			fontSize: 18,
@@ -270,6 +270,7 @@ const ProfileListUI = (props: ProfileParams) => {
 					<View style={{ height: 17 }} />
 				</Actions>
 			</ListWrap>
+			<WebsocketStatus />
 			<OAlert
 				open={confirm.open}
 				title={confirm.title}

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

@@ -288,43 +288,37 @@ const ProfileUI = (props: ProfileParams) => {
 					showCall={false}
 					btnStyle={{ paddingLeft: 0 }}
 				/>
-				<KeyboardAvoidingView
-					behavior={Platform.OS == 'ios' ? 'padding' : 'height'}
-					enabled={Platform.OS === 'ios' ? true : false}
-					style={{ flex: 1, flexDirection: 'column', justifyContent: 'center' }}
-				>
-					<CenterView>
-						<View style={styles.photo}>
-							{user?.photo ? (
-								<FastImage
-									style={{ height: 80, width: 80, borderRadius: 8 }}
-									source={{
-										uri: user?.photo,
-										priority: FastImage.priority.normal,
-									}}
-									resizeMode={FastImage.resizeMode.cover}
-								/>
-							) : (
-								<Ionicons name='person-outline' size={50} />
-							)}
-						</View>
-						<OIconButton
-							icon={theme.images.general.camera}
-							borderColor={theme.colors.clear}
-							iconStyle={{ width: 20, height: 20 }}
-							style={{ maxWidth: 40, position: 'absolute', alignSelf: 'center', backgroundColor: '#000', opacity: 0.5 }}
-							onClick={() => handleImagePicker()}
-						/>
-					</CenterView>
-					<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginVertical: 32, zIndex: 10 }} />
-					<Spinner visible={formState?.loading || verifyPhoneState?.loading} />
-					<UserFormDetailsUI
-						{...props}
-						isProfile
-						isEdit
-						setWillVerifyOtpState={setWillVerifyOtpState}
+				<CenterView>
+					<View style={styles.photo}>
+						{user?.photo ? (
+							<FastImage
+								style={{ height: 80, width: 80, borderRadius: 8 }}
+								source={{
+									uri: user?.photo,
+									priority: FastImage.priority.normal,
+								}}
+								resizeMode={FastImage.resizeMode.cover}
+							/>
+						) : (
+							<Ionicons name='person-outline' size={50} />
+						)}
+					</View>
+					<OIconButton
+						icon={theme.images.general.camera}
+						borderColor={theme.colors.clear}
+						iconStyle={{ width: 20, height: 20 }}
+						style={{ maxWidth: 40, position: 'absolute', alignSelf: 'center', backgroundColor: '#000', opacity: 0.5 }}
+						onClick={() => handleImagePicker()}
 					/>
-				</KeyboardAvoidingView>
+				</CenterView>
+				<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginVertical: 32, zIndex: 10 }} />
+				<Spinner visible={formState?.loading || verifyPhoneState?.loading} />
+				<UserFormDetailsUI
+					{...props}
+					isProfile
+					isEdit
+					setWillVerifyOtpState={setWillVerifyOtpState}
+				/>
 			</Container>
 			<OModal
 				open={isModalVisible}

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

@@ -3,6 +3,7 @@ import styled from 'styled-components/native'
 export const Container = styled.View`
   display: flex;
   flex-direction: column;
+  width: 100%;
 `
 
 export const TransactionsWrapper = styled.View`

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

@@ -73,7 +73,7 @@ const WalletsUI = (props: any) => {
   const [tabSelected, setTabSelected] = useState(isWalletCashEnabled ? 'cash' : 'credit_point')
   const [openHistory, setOpenHistory] = useState(false)
   const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
-  const hideWalletsTheme = theme?.bar_menu?.components?.wallets?.hidden
+  const hideWalletsTheme = theme?.bar_menu?.components?.wallet?.hidden === true
 
   const isWalletEnabled = configs?.cash_wallet?.value && configs?.wallet_enabled?.value === '1' && (isWalletCashEnabled || isWalletPointsEnabled)
 
@@ -120,18 +120,16 @@ const WalletsUI = (props: any) => {
 
   return (
     <>
-      <Container
-        pdng={Platform.OS === 'ios' ? '10px' : '0'}
-      >
+      <Container>
         <Header>
           <View style={{
             ...{
               width: '100%',
               display: 'flex',
-              flexDirection: hideWalletsTheme ? 'column' : 'row',
-              justifyContent: hideWalletsTheme ? 'flex-start' : 'space-between',
-              alignItems: hideWalletsTheme ? 'flex-start' : 'center',
-              marginTop: hideWalletsTheme ? 0 : 10,
+              flexDirection: !hideWalletsTheme ? 'column' : 'row',
+              justifyContent: !hideWalletsTheme ? 'flex-start' : 'space-between',
+              alignItems: !hideWalletsTheme ? 'flex-start' : 'center',
+              marginTop: !hideWalletsTheme ? Platform.OS === 'ios' ? 20 : 30 : 10,
             },
           }}>
             <NavBar
@@ -141,6 +139,7 @@ const WalletsUI = (props: any) => {
               showCall={false}
               paddingTop={10}
               btnStyle={{ paddingLeft: 0 }}
+              isVertical={!hideWalletsTheme}
               hideArrowLeft={!hideWalletsTheme}
             />
             {isChewLayout && !openHistory && (
@@ -151,7 +150,7 @@ const WalletsUI = (props: any) => {
                 imgRightSrc={null}
                 textStyle={{ fontSize: 12, color: theme.colors.disabled }}
                 onClick={() => setOpenHistory(true)}
-                style={{ borderRadius: 8, height: 40, width: hideWalletsTheme ? '100%' : 150, marginTop: hideWalletsTheme ? 10 : 0 }}
+                style={{ borderRadius: 8, height: 40, width: !hideWalletsTheme ? '100%' : 150, marginTop: !hideWalletsTheme ? 10 : 0 }}
               />
             )}
           </View>

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

@@ -3,7 +3,7 @@ import styled from 'styled-components/native'
 export const Container = styled.View`
   padding-horizontal: 20px;
   padding-bottom: 20px;
-  padding-top: ${(props: any) => props.pdng};
+  padding-top: ${(props: any) => props.pdng || 0};
 `
 export const Header = styled.View`
   flex-direction: row;