ordering-ui-react-native 0.15.29 → 0.15.30-release

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

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from 'react'
 import { useLanguage, BusinessSearchList, useOrder, useUtils } from 'ordering-components/native'
-import { ScrollView, StyleSheet, TouchableOpacity, Platform, View } from 'react-native'
+import { ScrollView, StyleSheet, TouchableOpacity, Platform, View, Dimensions } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
 import { useTheme } from 'styled-components/native'
 import { OButton, OIcon, OModal, OText } from '../shared'
@@ -22,15 +22,18 @@ import {
   ProgressContentWrapper,
   ProgressBar,
   TagsContainer,
-  SortContainer
+  SortContainer,
+  BrandContainer,
+  BrandItem,
+  PriceFilterWrapper
 } from './styles'
 import FastImage from 'react-native-fast-image'
 import { convertHoursToMinutes } from '../../utils'
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder'
 import { BusinessSearchParams } from '../../types'
 
-export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
 
+export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
   const {
     navigation,
     businessesSearchList,
@@ -42,9 +45,11 @@ export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
     handleChangeFilters,
     filters,
     businessTypes,
-    setFilters
+    setFilters,
+    brandList
   } = props
-
+  
+  const screenHeight = Dimensions.get('window').height;
   const theme = useTheme()
   const [orderState] = useOrder()
   const { top } = useSafeAreaInsets();
@@ -63,11 +68,24 @@ export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
     { text: t('PICKUP_TIME', 'Pickup time'), value: 'pickup_time' }
   ]
 
+  const priceList = [
+    { level: '1', content: '$' },
+    { level: '2', content: '$$' },
+    { level: '3', content: '$$$' },
+    { level: '4', content: '$$$$' },
+    { level: '5', content: '$$$$$' }
+  ]
+
   const styles = StyleSheet.create({
     container: {
       paddingHorizontal: 40,
       width: '100%'
     },
+    filterContainer: {
+      maxHeight: screenHeight - 150,
+      paddingHorizontal: 40,
+      width: '100%'
+    },
     searchInput: {
       fontSize: 10,
     },
@@ -84,6 +102,12 @@ export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
       flexWrap: 'wrap',
       justifyContent: 'center'
     },
+    priceContainer: {
+      width: '100%',
+      flexDirection: 'row',
+      flexWrap: 'wrap',
+      justifyContent: 'space-between'
+    },
     categoryStyle: {
       marginRight: 10,
       marginTop: 10,
@@ -95,6 +119,16 @@ export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
       height: 28,
       borderWidth: 0
     },
+    priceItem: {
+      marginRight: 10,
+      marginTop: 10,
+      borderRadius: 50,
+      paddingVertical: 4,
+      paddingLeft: 5,
+      paddingRight: 5,
+      height: 27,
+      borderWidth: 0
+    },
     applyButton: {
       paddingHorizontal: 40,
       width: '100%',
@@ -107,7 +141,7 @@ export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
   }
 
   const handleCloseFilters = () => {
-    setFilters({ business_types: [], orderBy: 'default' })
+    setFilters({ business_types: [], orderBy: 'default', franchise_ids: [], price_level: null })
     setOpenFilters(false)
   }
 
@@ -126,6 +160,18 @@ export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
     }
   }
 
+  const handleChangeBrandFilter = (brandId: number) => {
+    let franchiseIds = [...filters?.franchise_ids]
+    if (filters?.franchise_ids?.includes(brandId)) franchiseIds = filters?.franchise_ids?.filter((item: any) => item !== brandId)
+    else franchiseIds.push(brandId)
+    handleChangeFilters && handleChangeFilters('franchise_ids', franchiseIds)
+  }
+
+  const handleChangePriceRange = (value: string) => {
+    if (value === filters?.price_level) handleChangeFilters('price_level', null)
+    else handleChangeFilters('price_level', value)
+  }
+
   const handleApplyFilters = () => {
     handleSearchbusinessAndProducts(true)
     setOpenFilters(false)
@@ -137,6 +183,10 @@ export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
     }
   }, [filters, openFilters])
 
+  useEffect(() => {
+    handleSearchbusinessAndProducts(true)
+  }, [])
+
   const MaxSectionItem = ({ title, options, filter }: any) => {
     const parseValue = (option: number) => {
       return filter === 'max_distance'
@@ -384,7 +434,7 @@ export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
         onCancel={() => handleCloseFilters()}
         onClose={() => handleCloseFilters()}
       >
-        <ScrollView style={styles.container}>
+        <ScrollView style={styles.filterContainer}>
           <OText
             size={20}
             mBottom={15}
@@ -411,6 +461,70 @@ export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
               </TouchableOpacity>
             ))}
           </SortContainer>
+          <BrandContainer>
+            <OText
+              size={16}
+              weight='bold'
+              lineHeight={24}
+              style={{ marginBottom: 10 }}
+            >
+              {t('BRANDS', 'Brands')}
+            </OText>
+            {!brandList?.loading && !brandList?.error && brandList?.brands?.length > 0 && (
+              <ScrollView
+                style={{ maxHeight: 300, marginBottom: 10 }}
+                showsVerticalScrollIndicator={true}
+                nestedScrollEnabled={true}
+              >
+                {brandList?.brands.map((brand: any, i: number) => brand?.enabled && (
+                  <BrandItem
+                    key={i}
+                    onPress={() => handleChangeBrandFilter(brand?.id)}
+                  >
+                    <OText
+                      size={14}
+                      weight={'400'}
+                      lineHeight={24}
+                    >
+                      {brand?.name}
+                    </OText>
+                    {filters?.franchise_ids?.includes(brand?.id) && (
+                      <AntDesignIcon
+                        name='check'
+                        color={theme.colors.success500}
+                        size={16}
+                      />
+                    )}
+                  </BrandItem>
+                ))}
+              </ScrollView>
+            )}
+            {!brandList?.loading && ((brandList?.brands?.filter((brand: any) => brand?.enabled))?.length === 0) && (
+              <OText size={14} weight='400'>{t('NO_RESULTS_FOUND', 'Sorry, no results found')}</OText>
+            )}
+          </BrandContainer>
+          <PriceFilterWrapper>
+            <OText
+              size={16}
+              weight='bold'
+              lineHeight={24}
+              style={{ marginBottom: 5 }}
+            >
+              {t('PRICE_RANGE', 'Price range')}
+            </OText>
+            <View style={styles.priceContainer}>
+              {priceList.map((price: any, i: number) => (
+                <OButton
+                  key={i}
+                  bgColor={(filters?.price_level === price?.level) ? theme.colors.primary : theme.colors.backgroundGray200}
+                  onClick={() => handleChangePriceRange(price?.level)}
+                  text={`${price.content} ${(filters?.price_level === price?.level) ? ' X' : ''}`}
+                  style={styles.priceItem}
+                  textStyle={{ fontSize: 10, color: (filters?.price_level === price?.level) ? theme.colors.backgroundLight : theme.colors.textNormal }}
+                />
+              ))}
+            </View>
+          </PriceFilterWrapper>
           {orderState?.options?.type === 1 && (
             <MaxSectionItem
               title={t('MAX_DELIVERY_FEE', 'Max delivery fee')}

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

@@ -68,9 +68,22 @@ export const ProgressContentWrapper = styled.View`
 `
 
 export const TagsContainer = styled.View`
-
+  padding-bottom: 10px;
 `
 
 export const SortContainer = styled.View`
   margin-bottom: 10px;
 `
+
+export const BrandContainer = styled.View``
+
+export const BrandItem = styled.TouchableOpacity`
+  flex-direction: row;
+  justify-content: space-between;
+  margin-bottom: 4px;
+  align-items: center;
+`
+
+export const PriceFilterWrapper = styled.View`
+  margin-bottom: 20px;
+`

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

@@ -1,4 +1,4 @@
-import React from 'react'
+import React, { useEffect } from 'react'
 import { useLanguage, BusinessMenuListing } from 'ordering-components/native'
 import { OText } from '../shared'
 import { BusinessMenuListParams } from '../../types'
@@ -19,7 +19,7 @@ const BusinessMenuListUI = (props: BusinessMenuListParams) => {
 
   const [, t] = useLanguage()
   const theme = useTheme()
-  const {top} = useSafeAreaInsets()
+  const { top } = useSafeAreaInsets()
 
   const styles = StyleSheet.create({
     container: {
@@ -36,7 +36,7 @@ const BusinessMenuListUI = (props: BusinessMenuListParams) => {
       height: 44,
       width: '100%'
     }
-	})
+  })
 
   const dropDownIcon = () => {
     return (
@@ -48,12 +48,18 @@ const BusinessMenuListUI = (props: BusinessMenuListParams) => {
     )
   }
 
+  useEffect(() => {
+    if (!businessMenuList?.loading && businessMenuList?.menus?.length === 1){
+      setMenu(businessMenuList?.menus[0])
+    }
+  }, [businessMenuList?.menus])
+
   return (
     <>
       {businessMenuList.loading ? (
         <Placeholder Animation={Fade}>
           <View>
-            <PlaceholderLine height={44}/>
+            <PlaceholderLine height={44} />
           </View>
         </Placeholder>
       ) : (
@@ -67,6 +73,7 @@ const BusinessMenuListUI = (props: BusinessMenuListParams) => {
                 onSelect={(selectedItem, index) => {
                   setMenu(selectedItem)
                 }}
+                defaultValue={businessMenuList?.menus?.length === 1 && businessMenuList?.menus[0]}
                 buttonTextAfterSelection={(selectedItem, index) => {
                   return selectedItem.name
                 }}

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

@@ -51,7 +51,9 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
   const [selectDate, setSelectedDate] = useState<any>(null)
   const [datesWhitelist, setDateWhitelist] = useState<any>([{ start: null, end: null }])
   const [isEnabled, setIsEnabled] = useState(false)
-  const {top} = useSafeAreaInsets()
+  const { top } = useSafeAreaInsets()
+  const showOrderTime = (selectedPreorderType === 1 && Object.keys(menu)?.length > 0) || selectedPreorderType === 0
+  const isPreOrderSetting = configs?.preorder_status_enabled?.value === '1'
   const styles = StyleSheet.create({
     container: {
       height: windowHeight,
@@ -142,7 +144,7 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
 
   const validateSelectedDate = (curdate: any, menu: any) => {
     const day = moment(curdate).format('d')
-    setIsEnabled(menu?.schedule[day]?.enabled || false)
+    setIsEnabled(menu?.schedule?.[day]?.enabled || false)
   }
 
   const getTimes = (curdate: any, menu: any) => {
@@ -300,60 +302,62 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
             />
           </View>
         </BusinessInfoWrapper>
-        <PreorderTypeWrapper>
-          <OText
-            size={16}
-            style={{
-              fontWeight: '600',
-              lineHeight: 24,
-              marginBottom: 12
-            }}
-          >
-            {t('PREORDER_TYPE', 'Preorder type')}
-          </OText>
-          <SelectDropdown
-            defaultValueByIndex={selectedPreorderType}
-            data={preorderTypeList}
-            // disabled={orderState.loading}
-            onSelect={(selectedItem, index) => {
-              setSelectedPreorderType(index)
-            }}
-            buttonTextAfterSelection={(selectedItem, index) => {
-              return selectedItem.name
-            }}
-            rowTextForSelection={(item, index) => {
-              return item.name
-            }}
-            buttonStyle={styles.selectOption}
-            buttonTextStyle={{
-              color: theme.colors.disabled,
-              fontSize: 14,
-              textAlign: 'left',
-              marginHorizontal: 0
-            }}
-            dropdownStyle={{
-              borderRadius: 8,
-              borderColor: theme.colors.lightGray,
-              marginTop: Platform.OS === 'ios' ? 12 : -top
-            }}
-            rowStyle={{
-              borderBottomColor: theme.colors.backgroundGray100,
-              backgroundColor: theme.colors.backgroundGray100,
-              height: 40,
-              flexDirection: 'column',
-              alignItems: 'flex-start',
-              paddingTop: 8,
-              paddingHorizontal: 14
-            }}
-            rowTextStyle={{
-              color: theme.colors.disabled,
-              fontSize: 14,
-              marginHorizontal: 0
-            }}
-            renderDropdownIcon={() => dropDownIcon()}
-            dropdownOverlayColor='transparent'
-          />
-        </PreorderTypeWrapper>
+        {isPreOrderSetting && (
+          <PreorderTypeWrapper>
+            <OText
+              size={16}
+              style={{
+                fontWeight: '600',
+                lineHeight: 24,
+                marginBottom: 12
+              }}
+            >
+              {t('PREORDER_TYPE', 'Preorder type')}
+            </OText>
+            <SelectDropdown
+              defaultValueByIndex={selectedPreorderType}
+              data={preorderTypeList}
+              // disabled={orderState.loading}
+              onSelect={(selectedItem, index) => {
+                setSelectedPreorderType(index)
+              }}
+              buttonTextAfterSelection={(selectedItem, index) => {
+                return selectedItem.name
+              }}
+              rowTextForSelection={(item, index) => {
+                return item.name
+              }}
+              buttonStyle={styles.selectOption}
+              buttonTextStyle={{
+                color: theme.colors.disabled,
+                fontSize: 14,
+                textAlign: 'left',
+                marginHorizontal: 0
+              }}
+              dropdownStyle={{
+                borderRadius: 8,
+                borderColor: theme.colors.lightGray,
+                marginTop: Platform.OS === 'ios' ? 12 : -top
+              }}
+              rowStyle={{
+                borderBottomColor: theme.colors.backgroundGray100,
+                backgroundColor: theme.colors.backgroundGray100,
+                height: 40,
+                flexDirection: 'column',
+                alignItems: 'flex-start',
+                paddingTop: 8,
+                paddingHorizontal: 14
+              }}
+              rowTextStyle={{
+                color: theme.colors.disabled,
+                fontSize: 14,
+                marginHorizontal: 0
+              }}
+              renderDropdownIcon={() => dropDownIcon()}
+              dropdownOverlayColor='transparent'
+            />
+          </PreorderTypeWrapper>
+        )}
         {selectedPreorderType === 1 && (
           <MenuWrapper>
             <OText
@@ -373,78 +377,94 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
             />
           </MenuWrapper>
         )}
-        <OrderTimeWrapper>
+        {isPreOrderSetting && showOrderTime && (
+          <OrderTimeWrapper>
+            <OText
+              size={16}
+              style={{
+                fontWeight: '600',
+                lineHeight: 24
+              }}
+            >
+              {t('ORDER_TIME', 'Order time')}
+            </OText>
+            <View style={{ flex: 1 }}>
+              {selectDate && datesWhitelist[0]?.start !== null && (
+                <CalendarStrip
+                  scrollable
+                  style={styles.calendar}
+                  calendarHeaderContainerStyle={styles.calendarHeaderContainer}
+                  calendarHeaderStyle={styles.calendarHeader}
+                  dateNumberStyle={styles.dateNumber}
+                  dateNameStyle={styles.dateName}
+                  iconContainer={{ flex: 0.1 }}
+                  highlightDateNameStyle={styles.highlightDateName}
+                  highlightDateNumberStyle={styles.highlightDateNumber}
+                  dayContainerStyle={{ height: '100%' }}
+                  highlightDateContainerStyle={{ height: '100%' }}
+                  calendarHeaderFormat='MMMM, YYYY'
+                  iconStyle={{ borderWidth: 1 }}
+                  selectedDate={selectDate}
+                  datesWhitelist={datesWhitelist}
+                  disabledDateNameStyle={styles.disabledDateName}
+                  disabledDateNumberStyle={styles.disabledDateNumber}
+                  disabledDateOpacity={0.6}
+                  onDateSelected={(date) => onSelectDate(date)}
+                  leftSelector={<LeftSelector />}
+                  rightSelector={<RightSelector />}
+                />
+              )}
+            </View>
+            <TimeListWrapper nestedScrollEnabled={true}>
+              {(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>
+        )}
+        {!isPreOrderSetting && (
           <OText
             size={16}
             style={{
               fontWeight: '600',
-              lineHeight: 24
+              lineHeight: 24,
+              marginTop: 30,
+              marginBottom: 12,
+              textAlign: 'center'
             }}
-          >
-            {t('ORDER_TIME', 'Order time')}
+            >
+            {t('ERROR_ADD_PRODUCT_BUSINESS_CLOSED', 'The business is closed at the moment')}
           </OText>
-          <View style={{ flex: 1 }}>
-            {selectDate && datesWhitelist[0]?.start !== null && (
-              <CalendarStrip
-                scrollable
-                style={styles.calendar}
-                calendarHeaderContainerStyle={styles.calendarHeaderContainer}
-                calendarHeaderStyle={styles.calendarHeader}
-                dateNumberStyle={styles.dateNumber}
-                dateNameStyle={styles.dateName}
-                iconContainer={{ flex: 0.1 }}
-                highlightDateNameStyle={styles.highlightDateName}
-                highlightDateNumberStyle={styles.highlightDateNumber}
-                dayContainerStyle={{ height: '100%' }}
-                highlightDateContainerStyle={{ height: '100%' }}
-                calendarHeaderFormat='MMMM, YYYY'
-                iconStyle={{ borderWidth: 1 }}
-                selectedDate={selectDate}
-                datesWhitelist={datesWhitelist}
-                disabledDateNameStyle={styles.disabledDateName}
-                disabledDateNumberStyle={styles.disabledDateNumber}
-                disabledDateOpacity={0.6}
-                onDateSelected={(date) => onSelectDate(date)}
-                leftSelector={<LeftSelector />}
-                rightSelector={<RightSelector />}
-              />
-            )}
-          </View>
-          <TimeListWrapper nestedScrollEnabled={true}>
-            {(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
           text={t('GO_TO_MENU', 'Go to menu')}
           textStyle={{ color: 'white' }}

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

@@ -44,11 +44,11 @@ const BusinessProductsCategoriesUI = (props: any) => {
 			borderTopStartRadius: 4,
 			borderTopEndRadius: 4,
 			backgroundColor: theme.colors.textPrimary,
-		  },
-		  tabDeactived: {
+		},
+		tabDeactived: {
 			marginTop: 10,
 			height: 4
-		  }
+		}
 	});
 
 	const handleCategoryScroll = (category: any) => {
@@ -57,12 +57,12 @@ const BusinessProductsCategoriesUI = (props: any) => {
 
 		if (!lazyLoadProductsRecommended) {
 			if (category?.id) {
-				scrollViewRef.current.scrollTo({
+				scrollViewRef?.current?.scrollTo && scrollViewRef.current.scrollTo({
 					y: categoriesLayout[`cat_${category?.id}`]?.y + productListLayout?.y - 70,
 					animated: true
 				})
 			} else {
-				scrollViewRef.current.scrollTo({
+				scrollViewRef?.current?.scrollTo && scrollViewRef.current.scrollTo({
 					y: productListLayout?.y - 70,
 					animated: true
 				})
@@ -111,8 +111,10 @@ const BusinessProductsCategoriesUI = (props: any) => {
 				categories.length &&
 				categories.map((category: any) => (
 					<Tab
-						key={category.name}
-						onPress={() => handleCategoryScroll(category)}
+						key={category.id}
+						onPress={() => requestAnimationFrame(() => {
+							handleCategoryScroll(category)
+						})}
 						style={[
 							category.id === 'featured' && !featured && styles.featuredStyle,
 							{

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

@@ -0,0 +1,44 @@
+import React from 'react'
+import { OModal, OText, OIcon } from '../../shared'
+import { ScrollView } from 'react-native'
+import { useUtils } from 'ordering-components/native'
+
+interface CategoryDescriptionParams {
+    openDescription?: {name: string, image: string, description: string} | null,
+    setOpenDescription: any;
+}
+
+function categoryDescriptionPropsAreEqual(prev : any, next : any) {
+    return prev.openDescription === next.openDescription
+}
+
+const CategoryDescription = (props : CategoryDescriptionParams) => {
+    const [{ optimizeImage }] = useUtils()
+    return (
+        <OModal
+            open={!!props.openDescription}
+            onClose={() => props.setOpenDescription(null)}
+            styleContainerCloseButton={{
+                marginLeft: -30,
+                width: 55,
+                height: 55,
+                marginTop: 2
+            }}
+        >
+            <OText size={20} style={{ paddingLeft: 70, paddingRight: 20, bottom: 25 }}>{props.openDescription?.name}</OText>
+            <ScrollView style={{ padding: 20 }}>
+                {!!props.openDescription?.image && (
+                    <OIcon
+                        url={optimizeImage(props.openDescription?.image, 'h_100,c_limit')}
+                        width={240}
+                        height={240}
+                        style={{ borderRadius: 7.6 }}
+                    />
+                )}
+                <OText mBottom={60}>{props.openDescription?.description}</OText>
+            </ScrollView>
+        </OModal>
+    )
+}
+
+export const CategoryDescriptionMemoized = React.memo(CategoryDescription,categoryDescriptionPropsAreEqual)