ordering-ui-react-native 0.12.54 → 0.12.58

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

@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { View } from 'react-native'
+import { ActivityIndicator, View } from 'react-native'
 import {
   Cart,
   useOrder,
@@ -19,7 +19,7 @@ import {
 
 import { ProductItemAccordion } from '../ProductItemAccordion';
 import { CouponControl } from '../CouponControl';
-import { OModal, OText } from '../shared';
+import { OInput, OModal, OText } from '../shared';
 import { ProductForm } from '../ProductForm';
 import { verifyDecimals } from '../../utils';
 import AntIcon from 'react-native-vector-icons/AntDesign'
@@ -34,7 +34,9 @@ const OrderSummaryUI = (props: any) => {
     offsetDisabled,
     removeProduct,
     isCartPending,
-    isFromCheckout
+    isFromCheckout,
+    commentState,
+    handleChangeComment
   } = props;
 
   const theme = useTheme()
@@ -188,6 +190,38 @@ const OrderSummaryUI = (props: any) => {
                   </OSTable>
                 </View>
               )}
+              {cart?.status !== 2 && (
+                <OSTable>
+                  <View style={{ width: '100%', marginTop: 20 }}>
+                    <OText size={12}>{t('COMMENTS', 'Comments')}</OText>
+                    <View style={{ flex: 1, width: '100%' }}>
+                      <OInput
+                        value={cart?.comment}
+                        placeholder={t('SPECIAL_COMMENTS', 'Special Comments')}
+                        onChange={(value: string) => handleChangeComment(value)}
+                        style={{
+                          alignItems: 'flex-start',
+                          width: '100%',
+                          height: 100,
+                          borderColor: theme.colors.textSecondary,
+                          paddingRight: 50,
+                          marginTop: 10
+                        }}
+                        multiline
+                      />
+                      {commentState?.loading && (
+                        <View style={{ position: 'absolute', right: 20 }}>
+                          <ActivityIndicator
+                            size='large'
+                            style={{ height: 100 }}
+                            color={theme.colors.primary}
+                          />
+                        </View>
+                      )}
+                    </View>
+                  </View>
+                </OSTable>
+              )}
             </OSBill>
           )}
           <OModal

package/themes/original/src/layouts/Container.tsx

@@ -18,7 +18,7 @@ const SafeAreaStyled = styled.SafeAreaView`
 export const Container = (props: any) => {
   return (
     <SafeAreaStyled>
-      <ContainerStyled keyboardShouldPersistTaps='handled' {...props} style={{...props.style}}>
+      <ContainerStyled {...props} ref={props?.forwardRef} keyboardShouldPersistTaps='handled' style={{...props.style}}>
         {props.children}
       </ContainerStyled>
     </SafeAreaStyled>

package/themes/single-business/src/components/Cart/index.tsx

@@ -16,26 +16,32 @@ import {
   OSCoupon,
   OSTotal,
   Title,
-  LineDivider
+  LineDivider,
+  BIHeader,
+  BIInfo,
+  BIContentInfo,
+  BITotal
 } from './styles';
 
 import { ProductItemAccordion } from '../ProductItemAccordion';
 import { CouponControl } from '../CouponControl';
 
-import { OButton, OModal, OText } from '../shared';
+import { OButton, OIcon, OModal, OText } from '../shared';
 import { ProductForm } from '../ProductForm';
 import { UpsellingProducts } from '../UpsellingProducts';
-import { verifyDecimals } from '../../utils';
+import { convertHoursToMinutes, verifyDecimals } from '../../utils';
 import { Container } from '../../layouts/Container';
 import { NotFoundSource } from '../NotFoundSource'
 import { OSRow } from '../OrderSummary/styles';
 import AntIcon from 'react-native-vector-icons/AntDesign'
+import MaterialCommunityIcon from 'react-native-vector-icons/MaterialCommunityIcons'
 import { TaxInformation } from '../TaxInformation';
 import { TouchableOpacity } from 'react-native';
 const CartUI = (props: any) => {
   const {
     cart,
     clearCart,
+    isCartList,
     changeQuantity,
     getProductMax,
     offsetDisabled,
@@ -62,6 +68,8 @@ const CartUI = (props: any) => {
 
   const isCartPending = cart?.status === 2
   const isCouponEnabled = validationFields?.fields?.checkout?.coupon?.enabled
+  const isClosed = !cart?.valid_schedule
+  const isProducts = cart?.products?.length
 
   const handleDeleteClick = (product: any) => {
     removeProduct(product, cart)
@@ -110,22 +118,91 @@ const CartUI = (props: any) => {
     }
   }
 
+  const CartHeader = () => {
+    return (
+      <BIHeader isClosed={isClosed}>
+        <BIInfo>
+          {cart?.business?.logo && (
+            <View
+              style={{
+                height: 72,
+                width: 72,
+                borderWidth: 1,
+                borderColor: theme.colors.border,
+                borderRadius: 8
+              }}
+            >
+              <OIcon
+                url={cart?.business?.logo}
+                width={70}
+                height={70}
+                style={{ borderRadius: 16 }}
+              />
+            </View>
+          )}
+          <BIContentInfo>
+            <OText>{cart?.business?.name}</OText>
+            {orderState?.options?.type === 1 ? (
+              <View style={{ display: 'flex', flexDirection: 'row', alignItems: 'center' }}>
+                <MaterialCommunityIcon
+                  name='clock-outline'
+                  size={20}
+                />
+                <OText size={12}>{convertHoursToMinutes(cart?.business?.delivery_time)}</OText>
+              </View>
+            ) : (
+              <View style={{ display: 'flex', flexDirection: 'row', alignItems: 'center' }}>
+                <MaterialCommunityIcon
+                  name='clock-outline'
+                  size={20}
+                />
+                <OText size={12}>{convertHoursToMinutes(cart?.business?.pickup_time)}</OText>
+              </View>
+            )}
+          </BIContentInfo>
+        </BIInfo>
+
+        {!isClosed && !!isProducts && cart?.valid_products && cart?.total > 0 && (
+          <BITotal>
+            <OText size={12}>{t('CART_TOTAL', 'Total')}</OText>
+            <OText size={12} color='#000'>{parsePrice(cart?.total)}</OText>
+          </BITotal>
+        )}
+
+        {isClosed && (
+          <BITotal>
+            <OText>{t('CLOSED', 'Closed')}</OText>
+          </BITotal>
+        )}
+
+        {!isClosed && !isProducts && (
+          <BITotal>
+            <OText>{t('NO_PRODUCTS', 'No products')}</OText>
+          </BITotal>
+        )}
+      </BIHeader>
+    )
+  }
+
   return (
     cart?.products?.length > 0 ? (
       <ScrollView
         showsVerticalScrollIndicator={false}
         showsHorizontalScrollIndicator={false}
-        style={{ height, backgroundColor: theme.colors.backgroundPage }}
+        style={{ height: isCartList ? 'auto' : height, backgroundColor: theme.colors.backgroundPage }}
       >
-        <Container>
-          <Title>
-            <OText
-              size={20}
-              weight='bold'
-            >
-              {t('YOUR_CART', 'Your cart')}
-            </OText>
-          </Title>
+        <Container noPadding={isCartList}>
+          {!isCartList ? (
+            <Title>
+              <OText
+                size={20}
+              >
+                {t('YOUR_CART', 'Your cart')}
+              </OText>
+            </Title>
+          ) : (
+            <CartHeader />
+          )}
 
           {cart?.products?.length > 0 && (
             <View>
@@ -247,7 +324,7 @@ const CartUI = (props: any) => {
           <>
             <LineDivider />
 
-            <Container>
+            <Container noPadding={isCartList}>
               <View style={{ padding: 0, }}>
                 <ScrollView
                   showsVerticalScrollIndicator={false}
@@ -323,7 +400,6 @@ const CartUI = (props: any) => {
         <Title>
           <OText
             size={20}
-            weight='bold'
           >
             {t('YOUR_CART', 'Your cart')}
           </OText>
@@ -339,7 +415,7 @@ const CartUI = (props: any) => {
           onClose={() => setOpenTaxModal({ open: false, data: null })}
           entireModal
         >
-          <TaxInformation data={openTaxModal.data} products={cart.products} />
+          <TaxInformation data={openTaxModal.data} products={cart?.products} />
         </OModal>
       </Container>
     )

package/themes/single-business/src/components/Cart/styles.tsx

@@ -61,3 +61,42 @@ export const OSCoupon = styled.View`
   width: 100%;
   padding: 5px 0px;
 `
+
+export const BIHeader = styled.View`
+  flex-direction: row;
+  align-items: center;
+  justify-content: space-between;
+  border-bottom-width: 1px;
+  border-bottom-color: ${(props: any) => props.theme.colors.border};
+  padding-bottom: 10px;
+
+  ${(props: any) => props.isClosed && css`
+    background-color: rgba(0, 0, 0, 0.1);
+  `}
+`
+
+export const BIInfo = styled.View`
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  width: 55%;
+`
+
+export const BIContent = styled.View`
+`
+
+export const BIContentInfo = styled.View`
+  display: flex;
+  flex-direction: column;
+  justify-content: flex-end;
+  text-transform: capitalize;
+  margin-left: 10px;
+  max-width: 65%;
+`
+
+export const BITotal = styled.View`
+  width: 25%;
+  display: flex;
+  flex-direction: column;
+  align-items: flex-end;
+`

package/themes/single-business/src/components/CartContent/index.tsx

@@ -1,60 +1,64 @@
-import React, { useEffect, useState } from 'react';
-import { useLanguage, useOrder } from 'ordering-components/native';
+import React, { useState } from 'react';
+import { useWindowDimensions, View } from 'react-native';
 import { useTheme } from 'styled-components/native';
-import { CCContainer, CCNotCarts, CCList } from './styles';
+import { useLanguage } from 'ordering-components/native';
+import Spinner from 'react-native-loading-spinner-overlay';
 
+import { Title } from './styles';
 import { Cart } from '../Cart';
-import { OIcon, OText } from '../shared';
-import Spinner from 'react-native-loading-spinner-overlay';
-import { View } from 'react-native';
+import { NotFoundSource } from '../NotFoundSource';
+import { OText } from '../shared';
 
 export const CartContent = (props: any) => {
-	const {
-		carts,
-		isOrderStateCarts
-	} = props
+  const { carts } = props
 
-	const theme = useTheme();
-	const [, t] = useLanguage()
-	const [isCartsLoading, setIsCartsLoading] = useState(false)
+  const { height } = useWindowDimensions()
+  const theme = useTheme();
+  const [, t] = useLanguage()
+  const [isCartsLoading, setIsCartsLoading] = useState(false)
 
-	return (
-		<CCContainer>
-			{isOrderStateCarts && carts?.length > 0 && (
-				<>
-					<OText size={24} lineHeight={36} weight={'600'} style={{ marginBottom: 20 }}>
-						{carts.length > 1 ? t('MY_CARTS', 'My Carts') : t('CART', 'Cart')}
-					</OText>
-					{carts.map((cart: any) => (
-						<CCList key={cart.uuid} style={{ overflow: 'visible' }}>
-							{cart.products.length > 0 && (
-								<>
-									<Cart
-										cart={cart}
-										onNavigationRedirect={props.onNavigationRedirect}
-										isCartsLoading={isCartsLoading}
-										setIsCartsLoading={setIsCartsLoading}
-									/>
-									<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginHorizontal: -40, marginTop: 20 }} />
-								</>
-							)}
-						</CCList>
-					))}
-				</>
-			)}
-			{(!carts || carts?.length === 0) && (
-				<CCNotCarts>
-					{/* <OIcon
-            url={props.icon}
-            width={200}
-            height={122}
-          /> */}
-					<OText size={24} style={{ textAlign: 'center' }}>
-						{t('CARTS_NOT_FOUND', 'You don\'t have carts available')}
-					</OText>
-				</CCNotCarts>
-			)}
-			<Spinner visible={isCartsLoading} />
-		</CCContainer>
-	)
+  return (
+    carts?.length > 0 ? (
+      <>
+        <Title>
+          <OText size={20} style={{ marginTop: 20 }}>
+            {carts.length > 1 ? t('MY_CARTS', 'My Carts') : t('CART', 'Cart')}
+          </OText>
+        </Title>
+        {carts.map((cart: any, i: number) => (
+          <View key={cart.uuid} style={{ overflow: 'visible' }}>
+            {cart.products.length > 0 && (
+              <>
+                <Cart
+                  cart={cart}
+                  isCartList
+                  onNavigationRedirect={props.onNavigationRedirect}
+                  isCartsLoading={isCartsLoading}
+                  setIsCartsLoading={setIsCartsLoading}
+                />
+                {!(i === (carts.length - 1)) && (
+                  <View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginVertical: 20 }} />
+                )}
+              </>
+            )}
+          </View>
+        ))}
+        <Spinner visible={isCartsLoading} />
+      </>
+    ) : (
+      <>
+        <Title>
+          <OText size={20}>
+            {t('MY_CARTS', 'My Carts')}
+          </OText>
+        </Title>
+        <View style={{ height: height * 0.7, justifyContent: 'center' }}>
+          <NotFoundSource
+            content={t('NO_CARTS_FOUND', 'Sorry, no carts found')}
+            image={theme.images.general.notFound}
+          />
+        </View>
+      </>
+    )
+  )
 }

package/themes/single-business/src/components/CartContent/styles.tsx

@@ -1,19 +1,5 @@
 import styled from 'styled-components/native';
 
-export const CCContainer = styled.View`
-  padding: 20px 40px;
-`
-
-export const CCNotCarts = styled.View`
-  height: 300px;
-  display: flex;
-  flex-direction: column;
-  justify-content: center;
-  align-items: center;
-  width: 80%;
-  margin: auto;
-`
-
-export const CCList = styled.ScrollView`
-  padding: 10px 0px;
+export const Title = styled.View`
+  margin: 20px 0;
 `

package/themes/single-business/src/components/PhoneInputNumber/index.tsx

@@ -1,127 +1,118 @@
 import React, { useEffect, useRef, useState } from 'react';
 import PhoneInput from "react-native-phone-number-input";
-import { StyleSheet, View } from 'react-native';
+import { StyleSheet } from 'react-native';
 import { useLanguage, useConfig } from 'ordering-components/native';
-import { useTheme } from 'styled-components/native';
+
 import { Wrapper } from './styles'
 
 import { PhoneInputParams } from '../../types';
-import { OIcon, OText } from '../shared';
-import { transformCountryCode } from '../../utils'
+import { OText } from '../shared';
+import {transformCountryCode} from '../../utils'
+import {I18nManager} from 'react-native'
+import { useTheme } from 'styled-components/native';
 
 export const PhoneInputNumber = (props: PhoneInputParams) => {
-	const {
-		data,
-		handleData,
-		defaultValue,
-		defaultCode,
-		forwardRef,
-		textInputProps,
-		boxStyle,
-		inputStyle,
-		textStyle,
-		flagStyle,
-		noDropIcon
-	} = props
-
-	const theme = useTheme();
-
+  const {
+    data,
+    handleData,
+    defaultValue,
+    defaultCode,
+    forwardRef,
+    textInputProps
+  } = props
 
-	const style = StyleSheet.create({
-		input: {
-			backgroundColor: theme.colors.white,
-			borderRadius: 7.6,
-			borderWidth: 1,
-			borderColor: theme.colors.border,
-			paddingBottom: 0,
-			paddingTop: 0,
-			flexGrow: 1,
-			flex: 1,
-			height: 50,
-		},
-		countryBtn: {
-			borderWidth: 1,
-			borderColor: theme.colors.border,
-			borderRadius: 7.6,
-			marginEnd: 9,
-		}
-	})
+  const theme = useTheme();
 
+  const style = StyleSheet.create({
+    input: {
+      backgroundColor: theme.colors.white,
+      borderRadius: 8,
+      borderWidth: 1,
+      borderColor: theme.colors.border,
+      paddingVertical: 0,
+      flexGrow: 1,
+      flex: 1,
+      height: 50,
+    },
+    countryBtn: {
+      borderWidth: 1,
+      borderColor: theme.colors.border,
+      borderRadius: 8,
+      marginEnd: 9,
+    }
+  })
 
-	const [, t] = useLanguage()
-	const [{ configs }] = useConfig()
-	const phoneInput = useRef<PhoneInput>(null);
-	const [userphoneNumber, setUserphoneNumber] = useState('');
+  const [, t] = useLanguage()
+  const [{ configs }] = useConfig()
+  const phoneInput = useRef<PhoneInput>(null);
+  const [userphoneNumber, setUserphoneNumber] = useState('');
 
-	const handleChangeNumber = (number: any) => {
-		setUserphoneNumber(number)
-	}
+  const handleChangeNumber = (number: any) => {
+    setUserphoneNumber(number)
+  }
 
-	useEffect(() => {
-		if ((defaultValue && userphoneNumber) || defaultValue === undefined || defaultValue === '') {
-			if (userphoneNumber) {
-				const checkValid = phoneInput.current?.isValidNumber(userphoneNumber);
-				const callingCode = phoneInput.current?.getCallingCode();
-				const formattedNumber = phoneInput.current?.getNumberAfterPossiblyEliminatingZero();
-				const regex = /^[0-9]*$/
-				const cellphone = userphoneNumber.slice(0, 0) + userphoneNumber.slice(1, userphoneNumber.length)
-				const validNumber = regex.test(cellphone)
-				if ((!checkValid && formattedNumber?.number) || !validNumber) {
-					handleData && handleData({
-						...data,
-						error: t('INVALID_ERROR_PHONE_NUMBER', 'The Phone Number field is invalid')
-					})
-					return
-				}
-				handleData && handleData({
-					...data,
-					error: '',
-					phone: {
-						country_phone_code: callingCode,
-						cellphone: formattedNumber?.number
-					}
-				})
-			} else {
-				handleData && handleData({
-					...data,
-					error: '',
-					phone: {
-						country_phone_code: null,
-						cellphone: null
-					}
-				})
-			}
-		}
-	}, [userphoneNumber])
+  useEffect(() => {
+    if((defaultValue && userphoneNumber) || !defaultValue){
+     if (userphoneNumber === '') return;
+      if (userphoneNumber) {
+        const checkValid = phoneInput.current?.isValidNumber(userphoneNumber);
+        const callingCode = phoneInput.current?.getCallingCode();
+        const formattedNumber = phoneInput.current?.getNumberAfterPossiblyEliminatingZero();
+        const regex = /^[0-9]*$/
+        const cellphone = userphoneNumber.slice(0, 0) + userphoneNumber.slice(1, userphoneNumber.length)
+        const validNumber = regex.test(cellphone)
+        if ((!checkValid && formattedNumber?.number) || !validNumber) {
+          handleData && handleData({
+            ...data,
+            error: t('INVALID_ERROR_PHONE_NUMBER', 'The Phone Number field is invalid')
+          })
+          return
+        }
+        handleData && handleData({
+          ...data,
+          error: '',
+          phone: {
+            country_phone_code: callingCode,
+            cellphone: formattedNumber?.number
+          }
+        })
+      } else {
+        handleData && handleData({
+          ...data,
+          error: '',
+          phone: {
+            country_phone_code: null,
+            cellphone: null
+          }
+        })
+      }
+    }
+  }, [userphoneNumber])
 
-	return (
-		<Wrapper>
-			<PhoneInput
-				ref={phoneInput}
-				defaultValue={userphoneNumber || defaultValue}
-				defaultCode={defaultCode ? transformCountryCode(defaultCode) : configs?.default_country_code?.value}
-				onChangeFormattedText={(text: string) => handleChangeNumber(text)}
-				withDarkTheme
-				countryPickerProps={{ withAlphaFilter: true }}
-				textContainerStyle={{ ...style.input, ...inputStyle ? inputStyle : {} }}
-				textInputStyle={textStyle}
-				codeTextStyle={textStyle}
-				flagButtonStyle={flagStyle}
-				countryPickerButtonStyle={{ ...style.countryBtn, ...boxStyle ? boxStyle : {} }}
-				placeholder={t('PHONE_NUMBER', 'Phone Number')}
-				textInputProps={{ autoCompleteType: 'tel', ref: forwardRef, ...textInputProps }}
-				containerStyle={{ width: '100%' }}
-				renderDropdownImage={noDropIcon ? <View /> : <OIcon src={theme.images.general.arrow_down} width={13} color={'#B1BCCC'}></OIcon>}
-			/>
-			{!!data?.error && (
-				<OText
-					size={16}
-					color={theme.colors.error}
-					style={{ textAlign: 'center', marginTop: 5 }}
-				>
-					{data.error}
-				</OText>
-			)}
-		</Wrapper>
-	)
+  return (
+    <Wrapper>
+      <PhoneInput
+        ref={phoneInput}
+        defaultValue={userphoneNumber || defaultValue}
+        defaultCode={defaultCode ? transformCountryCode(defaultCode) : configs?.default_country_code?.value}
+        onChangeFormattedText={(text : string) => handleChangeNumber(text)}
+        withDarkTheme
+        textInputStyle={{textAlign: I18nManager.isRTL ? 'right' : 'left'}}
+        countryPickerProps={{withAlphaFilter:true}}
+        textContainerStyle={style.input}
+        placeholder={t('PHONE_NUMBER', 'Phone Number')}
+        countryPickerButtonStyle={{ ...style.countryBtn }}
+        textInputProps={{autoCompleteType: 'tel', ref: forwardRef, ...textInputProps}}
+      />
+      {!!data?.error && (
+        <OText
+          size={16}
+          color={theme.colors.error}
+          style={{ textAlign: 'center', marginTop: 5 }}
+          >
+          {data.error}
+        </OText>
+      )}
+    </Wrapper>
+  )
 }