ordering-ui-react-native 0.14.51 → 0.14.54

package/package.json

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

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

@@ -34,7 +34,9 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
     timeSelected,
     handleBusinessClick,
     handleChangeDate,
-    handleChangeTime
+    handleChangeTime,
+    handleAsap,
+    isAsap
   } = props
 
   const theme = useTheme()
@@ -43,10 +45,11 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
   const [{ configs }] = useConfig()
   const [orderState] = useOrder()
   const [selectedPreorderType, setSelectedPreorderType] = useState(0)
-  const [menu, setMenu] = useState({})
+  const [menu, setMenu] = useState<any>({})
   const [timeList, setTimeList] = useState<any>([])
   const [selectDate, setSelectedDate] = useState<any>(null)
   const [datesWhitelist, setDateWhitelist] = useState<any>([{ start: null, end: null }])
+  const [isEnabled, setIsEnabled] = useState(false)
 
   const styles = StyleSheet.create({
     container: {
@@ -137,7 +140,13 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
     { key: 'business_menu', name: t('BUSINESS_MENU', 'Business menu') }
   ]
 
+  const validateSelectedDate = (curdate: any, menu: any) => {
+    const day = moment(curdate).format('d')
+    setIsEnabled(menu?.schedule[day]?.enabled || false)
+  }
+
   const getTimes = (curdate: any, menu: any) => {
+    validateSelectedDate(curdate, menu)
     const date = new Date()
     var dateSeleted = new Date(curdate)
     var times = []
@@ -240,26 +249,11 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
   }
 
   useEffect(() => {
-    if (hoursList.length === 0) return
-    if (Object.keys(menu).length > 0) {
-      const _times: any = getTimes(selectDate, menu)
-      setTimeList(_times)
-    } else {
-      const _timeLists = hoursList.map((hour: any) => {
-        return {
-          value: hour.startTime,
-          text: configs?.format_time?.value === '12' ? (
-            hour.startTime.includes('12')
-              ? `${hour.startTime}PM`
-              : parseTime(moment(hour.startTime, 'HH:mm'), { outputFormat: 'hh:mma' })
-          ) : (
-            parseTime(moment(hour.startTime, 'HH:mm'), { outputFormat: 'HH:mm' })
-          )
-        }
-      })
-      setTimeList(_timeLists)
-    }
-  }, [selectDate, hoursList, menu])
+    if (selectDate === null) return
+    const selectedMenu = Object.keys(menu).length > 0 ? (menu?.use_business_schedule ? business : menu) : business
+    const _times = getTimes(selectDate, selectedMenu)
+    setTimeList(_times)
+  }, [selectDate, menu])
 
   useEffect(() => {
     if (selectedPreorderType === 0 && Object.keys(menu).length > 0) setMenu({})
@@ -273,6 +267,10 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
     }
   }, [dateSelected])
 
+  useEffect(() => {
+    handleAsap && handleAsap()
+  }, [])
+
   return (
     <>
       <PreOrderContainer contentContainerStyle={{ paddingVertical: 32, paddingHorizontal: 40 }}>
@@ -413,24 +411,38 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
             )}
           </View>
           <TimeListWrapper nestedScrollEnabled={true}>
-            <TimeContentWrapper>
-              {timeList.map((time: any, i: number) => (
-                <TouchableOpacity key={i} onPress={() => handleChangeTime(time.value)}>
-                  <TimeItem active={timeSelected === time.value}>
-                    <OText
-                      size={14}
-                      color={timeSelected === time.value ? theme.colors.primary : theme.colors.textNormal}
-                      style={{
-                        lineHeight: 24
-                      }}
-                    >{time.text}</OText>
-                  </TimeItem>
-                </TouchableOpacity>
-              ))}
-              {timeList.length % 3 === 2 && (
-                <TimeItem style={{ backgroundColor: 'transparent' }} />
-              )}
-            </TimeContentWrapper>
+            {(isEnabled && timeList?.length > 0) ? (
+              <TimeContentWrapper>
+                {timeList.map((time: any, i: number) => (
+                  <TouchableOpacity key={i} onPress={() => handleChangeTime(time.value)}>
+                    <TimeItem active={timeSelected === time.value}>
+                      <OText
+                        size={14}
+                        color={timeSelected === time.value ? theme.colors.primary : theme.colors.textNormal}
+                        style={{
+                          lineHeight: 24
+                        }}
+                      >{time.text}</OText>
+                    </TimeItem>
+                  </TouchableOpacity>
+                ))}
+                {timeList.length % 3 === 2 && (
+                  <TimeItem style={{ backgroundColor: 'transparent' }} />
+                )}
+              </TimeContentWrapper>
+            ) : (
+              <OText
+                size={16}
+                style={{
+                  fontWeight: '600',
+                  lineHeight: 24,
+                  marginBottom: 12,
+                  textAlign: 'center'
+                }}
+              >
+                {t('ERROR_ADD_PRODUCT_BUSINESS_CLOSED', 'The business is closed at the moment')}
+              </OText>
+            )}
           </TimeListWrapper>
         </OrderTimeWrapper>
         <OButton
@@ -438,6 +450,7 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
           textStyle={{ color: 'white' }}
           style={{ borderRadius: 7.6, marginBottom: 20, marginTop: 30 }}
           onClick={() => handleClickBusiness()}
+          isDisabled={isAsap || !(dateSelected && timeSelected)}
         />
       </PreOrderContainer>
       <Spinner visible={orderState.loading} />

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

@@ -240,7 +240,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 				{isFarAway && (
 					<FarAwayMessage style={styles.farAwayMsg}>
 						<Ionicons name='md-warning-outline' style={styles.iconStyle} />
-						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'Your are far from this address')}</OText>
+						<OText size={12} numberOfLines={1} ellipsizeMode={'tail'} color={theme.colors.textNormal}>{t('YOU_ARE_FAR_FROM_ADDRESS', 'You are far from this address')}</OText>
 					</FarAwayMessage>
 				)}
 				<OrderControlContainer>

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

@@ -127,6 +127,8 @@ const CheckoutUI = (props: any) => {
 	const [openChangeStore, setOpenChangeStore] = useState(false)
 	const [isDeliveryOptionModalVisible, setIsDeliveryOptionModalVisible] = useState(false)
 
+  const isWalletEnabled = configs?.wallet_enabled?.value === '1'
+
 	const driverTipsOptions = typeof configs?.driver_tip_options?.value === 'string'
 		? JSON.parse(configs?.driver_tip_options?.value) || []
 		: configs?.driver_tip_options?.value || []
@@ -506,7 +508,7 @@ const CheckoutUI = (props: any) => {
 						</ChSection>
 					)}
 
-          {!cartState.loading && cart && (
+          {!cartState.loading && cart && isWalletEnabled && (
             <WalletPaymentOptionContainer>
               <PaymentOptionWallet
                 cart={cart}

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

@@ -55,7 +55,7 @@ const PaymentOptionWalletUI = (props: any) => {
   }
 
   const handleOnChange = (position: any, wallet: any) => {
-    const updatedCheckedState = checkedState.map((item, index) =>
+    const updatedCheckedState = checkedState.map((item: any, index: any) =>
       index === position ? !item : item
     );
 
@@ -85,7 +85,7 @@ const PaymentOptionWalletUI = (props: any) => {
         walletsState.result?.length > 0 &&
       (
         <>
-          {walletsState.result?.map((wallet: any, idx: any) => wallet.valid && (
+          {walletsState.result?.map((wallet: any, idx: any) => wallet.valid && wallet.balance >= 0 && (
             <Container
               key={wallet.id}
               isBottomBorder={idx === walletsState.result?.filter((wallet: any) => wallet.valid)?.length - 1}

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

@@ -212,7 +212,9 @@ export const ProductOptionsUI = (props: any) => {
 	}
 
 	const handleRedirectLogin = () => {
-		navigation.navigate('Login');
+		navigation.navigate('Login', {
+			store_slug:  props.businessSlug
+		});
 	};
 
 	const handleSwitchQtyUnit = (val: string) => {

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

@@ -5,6 +5,7 @@ import {
 	useLanguage,
 	ToastType,
 	useToast,
+  useConfig
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 import { useForm } from 'react-hook-form';
@@ -91,12 +92,15 @@ const ProfileListUI = (props: ProfileParams) => {
 
 	const [{ user }] = useSession();
 	const [, t] = useLanguage();
+	const [{ configs }] = useConfig();
 	const [, { showToast }] = useToast();
 	const { errors } = useForm();
 
 	const { height } = useWindowDimensions();
 	const { top, bottom } = useSafeAreaInsets();
 
+  const isWalletEnabled = configs?.wallet_enabled?.value === '1'
+
 	const onRedirect = (route: string, params?: any) => {
 		navigation.navigate(route, params)
 	}
@@ -161,10 +165,12 @@ const ProfileListUI = (props: ProfileParams) => {
 						<MessageCircle name='message1' style={styles.messageIconStyle} color={theme.colors.textNormal} />
 						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('MESSAGES', 'Messages')}</OText>
 					</ListItem>
-					<ListItem onPress={() => onRedirect('Wallets', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
-						<Ionicons name='wallet-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
-						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('WALLETS', 'Wallets')}</OText>
-					</ListItem>
+          {!isWalletEnabled && (
+            <ListItem onPress={() => onRedirect('Wallets', { isFromProfile: true, isGoBack: true })} activeOpacity={0.7}>
+              <Ionicons name='wallet-outline' style={styles.messageIconStyle} color={theme.colors.textNormal} />
+              <OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('WALLETS', 'Wallets')}</OText>
+            </ListItem>
+          )}
 					<ListItem onPress={() => navigation.navigate('Help', {})} activeOpacity={0.7}>
 						<OIcon src={theme.images.general.ic_help} width={16} color={theme.colors.textNormal} style={{ marginEnd: 14 }} />
 						<OText size={14} lineHeight={24} weight={'400'} color={theme.colors.textNormal}>{t('HELP', 'Help')}</OText>

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

@@ -1,4 +1,4 @@
-import React, { useState } from 'react'
+import React, { useState, useEffect } from 'react'
 import { Pressable, View } from 'react-native';
 import { useTheme } from 'styled-components/native'
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
@@ -60,6 +60,14 @@ const WalletsUI = (props: any) => {
     navigation?.canGoBack() && navigation.goBack()
   }
 
+  useEffect(() => {
+    if (configs?.wallet_enabled?.value === '0') {
+      navigation.navigate('BottomTab', {
+        screen: 'Profile'
+      })
+    }
+  }, [configs])
+
   return (
     <Container>
       <NavBar