ordering-ui-react-native 0.15.81 → 0.15.82-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 { useLanguage, BusinessSearchList, useOrder, useUtils, showToast, ToastType } from 'ordering-components/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,21 @@ import {
   ProgressContentWrapper,
   ProgressBar,
   TagsContainer,
-  SortContainer
+  SortContainer,
+  BrandContainer,
+  BrandItem,
+  PriceFilterWrapper,
+  OptionTitle
 } from './styles'
 import FastImage from 'react-native-fast-image'
 import { convertHoursToMinutes } from '../../utils'
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder'
 import { BusinessSearchParams } from '../../types'
+import { MyOrders } from '../MyOrders'
+import { useIsFocused } from '@react-navigation/native';
 
-export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
 
+export const BusinessListingSearchUI = (props: BusinessSearchParams) => {
   const {
     navigation,
     businessesSearchList,
@@ -42,9 +48,15 @@ export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
     handleChangeFilters,
     filters,
     businessTypes,
-    setFilters
+    setFilters,
+    brandList,
+    onNavigationRedirect,
+    handleUpdateBusinessList,
+    handleUpdateProducts
   } = props
 
+  const screenHeight = Dimensions.get('window').height;
+  const screenWidth = Dimensions.get('window').width;
   const theme = useTheme()
   const [orderState] = useOrder()
   const { top } = useSafeAreaInsets();
@@ -63,11 +75,26 @@ 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 isFocused = useIsFocused();
+
   const styles = StyleSheet.create({
     container: {
       paddingHorizontal: 40,
       width: '100%'
     },
+    filterContainer: {
+      maxHeight: screenHeight - 150,
+      paddingHorizontal: 40,
+      width: '100%'
+    },
     searchInput: {
       fontSize: 10,
     },
@@ -84,6 +111,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 +128,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 +150,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,11 +169,47 @@ 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)
   }
 
+  const isInteger = (val: any) => Number.isInteger(Number(val)) && !!val
+
+  const onProductClick = (business: any, categoryId: any, productId: any) => {
+    if (!isInteger(business?.id) ||
+      !isInteger(categoryId) ||
+      !isInteger(productId) ||
+      !business.slug || !business.header || !business.logo) {
+      showToast(ToastType.error, t('NOT_AVAILABLE', 'Not Available'))
+      return
+    }
+
+    navigation.navigate('ProductDetails', {
+      isRedirect: 'business',
+      businessId: business?.id,
+      categoryId: categoryId,
+      productId: productId,
+      business: {
+        store: business.slug,
+        header: business.header,
+        logo: business.logo,
+      }
+    })
+  }
+
   useEffect(() => {
     if (filters.business_types?.length === 0 && filters.orderBy === 'default' && Object.keys(filters)?.length === 2 && !openFilters) {
       handleSearchbusinessAndProducts(true)
@@ -141,6 +220,11 @@ export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
     handleSearchbusinessAndProducts(true)
   }, [])
 
+  
+  useEffect(() => {
+    handleChangeTermValue('')
+  }, [isFocused])
+
   const MaxSectionItem = ({ title, options, filter }: any) => {
     const parseValue = (option: number) => {
       return filter === 'max_distance'
@@ -176,12 +260,63 @@ export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
     )
   }
 
+  const BusinessControllerSkeletons = () => {
+    return (
+      <>
+        {[
+          ...Array(
+            paginationProps.nextPageItems
+              ? paginationProps.nextPageItems
+              : 3,
+          ).keys(),
+        ].map((item, i) => (
+          <Placeholder
+            Animation={Fade}
+            key={i}
+            style={{ width: 320, marginRight: 20, marginTop: 20 }}>
+            <View style={{ width: 320 }}>
+              <PlaceholderLine
+                height={155}
+                style={{ marginBottom: 20, borderRadius: 25 }}
+              />
+              <View style={{ paddingHorizontal: 10 }}>
+                <View
+                  style={{
+                    flexDirection: 'row',
+                    justifyContent: 'space-between',
+                  }}>
+                  <PlaceholderLine
+                    height={25}
+                    width={40}
+                    style={{ marginBottom: 10 }}
+                  />
+                  <PlaceholderLine
+                    height={25}
+                    width={20}
+                    style={{ marginBottom: 10 }}
+                  />
+                </View>
+                <PlaceholderLine
+                  height={20}
+                  width={30}
+                  style={{ marginBottom: 10 }}
+                />
+                <PlaceholderLine
+                  height={20}
+                  width={80}
+                  style={{ marginBottom: 0 }}
+                />
+              </View>
+            </View>
+          </Placeholder>
+        ))}
+      </>
+    )
+  }
+
   return (
     <ScrollView style={styles.container}>
       <WrapHeader style={{ paddingTop: top + 20, marginVertical: 2 }}>
-        <TouchableOpacity onPress={() => navigation?.canGoBack() && navigation.goBack()} style={{ position: 'absolute', paddingVertical: 20 }}>
-          <OIcon src={theme.images.general.arrow_left} width={20} />
-        </TouchableOpacity>
         <OText
           size={20}
           mBottom={15}
@@ -193,6 +328,7 @@ export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
       </WrapHeader>
       <SearchWrapper>
         <SearchBar
+          autoFocus
           lazyLoad
           inputStyle={{ ...styles.searchInput, ...Platform.OS === 'ios' ? {} : { paddingBottom: 4 } }}
           placeholder={`${t('SEARCH_BUSINESSES', 'Search Businesses')} / ${t('TYPE_AT_LEAST_3_CHARACTERS', 'type at least 3 characters')}`}
@@ -211,15 +347,31 @@ export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
           </View>
         )
       }
+      {businessesSearchList.businesses?.length > 0 && (
+        <MyOrders
+          hideOrders
+          businessesSearchList={businessesSearchList}
+          onNavigationRedirect={onNavigationRedirect}
+          BusinessControllerSkeletons={BusinessControllerSkeletons}
+        />
+      )}
+
+      <OptionTitle isBusinessesSearchList={!!businessesSearchList}>
+        <OText size={16} lineHeight={24} weight={'500'} color={theme.colors.textNormal} mBottom={10}>
+          {t('BUSINESSES', 'Businesses')}
+        </OText>
+      </OptionTitle>
       <ScrollView horizontal>
         {businessesSearchList.businesses?.length > 0 && businessesSearchList.businesses.map((business: any, i: number) => (
           <BusinessController
             key={business.id}
             business={business}
             isBusinessOpen={business.open}
+            enableIntersection={false}
             handleCustomClick={() => onBusinessClick(business)}
+            handleUpdateBusinessList={handleUpdateBusinessList}
             orderType={orderState?.options?.type}
-            style={{ width: 320, marginRight: (businessesSearchList.loading || i !== businessesSearchList.businesses?.length - 1) ? 20 : 0 }}
+            style={{ width: screenWidth - 120, marginRight: (businessesSearchList.loading || i !== businessesSearchList.businesses?.length - 1) ? 20 : 0 }}
           />
         ))}
         {!businessesSearchList.loading && paginationProps?.totalPages && paginationProps?.currentPage < paginationProps?.totalPages && (
@@ -234,55 +386,7 @@ export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
           </LoadMoreBusinessContainer>
         )}
         {businessesSearchList.loading && (
-          <>
-            {[
-              ...Array(
-                paginationProps.nextPageItems
-                  ? paginationProps.nextPageItems
-                  : 3,
-              ).keys(),
-            ].map((item, i) => (
-              <Placeholder
-                Animation={Fade}
-                key={i}
-                style={{ width: 320, marginRight: 20, marginTop: 20 }}>
-                <View style={{ width: 320 }}>
-                  <PlaceholderLine
-                    height={155}
-                    style={{ marginBottom: 20, borderRadius: 25 }}
-                  />
-                  <View style={{ paddingHorizontal: 10 }}>
-                    <View
-                      style={{
-                        flexDirection: 'row',
-                        justifyContent: 'space-between',
-                      }}>
-                      <PlaceholderLine
-                        height={25}
-                        width={40}
-                        style={{ marginBottom: 10 }}
-                      />
-                      <PlaceholderLine
-                        height={25}
-                        width={20}
-                        style={{ marginBottom: 10 }}
-                      />
-                    </View>
-                    <PlaceholderLine
-                      height={20}
-                      width={30}
-                      style={{ marginBottom: 10 }}
-                    />
-                    <PlaceholderLine
-                      height={20}
-                      width={80}
-                      style={{ marginBottom: 0 }}
-                    />
-                  </View>
-                </View>
-              </Placeholder>
-            ))}
-          </>
+          <BusinessControllerSkeletons />
         )}
       </ScrollView>
       <ProductsList>
@@ -329,16 +433,18 @@ export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
                 style={{ borderRadius: 50, paddingLeft: 5, paddingRight: 5, height: 20 }}
               />
             </SingleBusinessContainer>
-            <ScrollView horizontal style={styles.productsContainer}>
+            <ScrollView horizontal style={styles.productsContainer} contentContainerStyle={{ flexGrow: 1 }}>
               {business?.categories?.map((category: any) => category?.products?.map((product: any, i: number) => (
                 <SingleProductCard
                   key={product?.id}
                   isSoldOut={(product.inventoried && !product.quantity)}
                   product={product}
+                  enableIntersection={false}
                   businessId={business?.id}
-                  onProductClick={() => { }}
+                  onProductClick={(product: any) => onProductClick(business, category?.id, product?.id)}
                   productAddedToCartLength={0}
-                  style={{ width: 320, marginRight: i === category?.products?.length - 1 ? 0 : 20 }}
+                  handleUpdateProducts={(productId: number, changes: any) => handleUpdateProducts(productId, category?.id, business?.id, changes)}
+                  style={{ width: screenWidth - 80, maxWidth: screenWidth - 80, marginRight: 20 }}
                 />
               )))}
 
@@ -388,7 +494,7 @@ export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
         onCancel={() => handleCloseFilters()}
         onClose={() => handleCloseFilters()}
       >
-        <ScrollView style={styles.container}>
+        <ScrollView style={styles.filterContainer}>
           <OText
             size={20}
             mBottom={15}
@@ -406,7 +512,7 @@ export const BusinessListingSearchUI = (props : BusinessSearchParams) => {
                 onPress={() => handleChangeFilters('orderBy', item?.value)}
                 style={{ marginBottom: 7 }}
               >
-                <OText 
+                <OText
                   weight={filters?.orderBy?.includes(item?.value) ? 'bold' : '500'}
                   mBottom={filters?.orderBy?.includes(item?.value) ? 5 : 0}
                 >
@@ -415,6 +521,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

@@ -1,4 +1,4 @@
-import styled from 'styled-components/native'
+import styled, { css } from 'styled-components/native'
 
 export const WrapHeader = styled.View`
   width: 100%;
@@ -68,9 +68,29 @@ 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;
+`
+
+export const OptionTitle = styled.View`
+	margin-top: 24px;
+	${(props: any) => props.titleContent && css`
+		margin-left: ${() => props.isBusinessesSearchList ? '0' : '40px'};
+	`}
+`

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

@@ -144,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) => {

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

@@ -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
 				})

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: -37,
+                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)

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

@@ -0,0 +1,87 @@
+import React from 'react'
+import { useTheme } from 'styled-components/native'
+import { StyleSheet } from 'react-native'
+import { SubCategoriesContainer, ContainerButton } from './styles'
+import { OButton } from '../../shared'
+import { useLanguage } from 'ordering-components/native'
+
+function SubcategoriesComponentPropsAreEqual(prev: any, next: any) {
+    return prev.subcategoriesSelected === next.subcategoriesSelected &&
+        prev.category === next.category
+}
+
+interface SubcategoriesComponentParams {
+    subcategoriesSelected?: any,
+    category?: any,
+    onClickSubcategory: any
+}
+
+const SubcategoriesComponent = (props : SubcategoriesComponentParams) => {
+    const {
+        subcategoriesSelected,
+        category,
+        onClickSubcategory
+    } = props
+
+    const theme = useTheme()
+    const [, t] = useLanguage()
+    const allsubcategorySelected = !subcategoriesSelected?.some((subcategory: any) => category?.id === subcategory?.parent_category_id)
+
+    const bpStyles = StyleSheet.create({
+        catWrap: { flexDirection: 'row', alignItems: 'center', marginBottom: 19 },
+        catIcon: {
+            borderRadius: 7.6,
+            shadowColor: '#000000',
+            shadowOpacity: 0.1,
+            shadowOffset: { width: 0, height: 0 },
+            shadowRadius: 1,
+            marginEnd: 13,
+        },
+        categoryButtonStyle: {
+            borderWidth: 0,
+            marginLeft: 5,
+            marginRight: 5,
+            marginBottom: 10,
+            height: 35,
+            paddingLeft: 3,
+            paddingRight: 3,
+        }
+    });
+
+
+    return (
+        <SubCategoriesContainer>
+            <ContainerButton
+                isSelected={allsubcategorySelected}
+            >
+                <OButton
+                    onClick={() => onClickSubcategory(null, category)}
+                    bgColor={allsubcategorySelected ? theme.colors.primary : theme.colors.backgroundGray}
+                    text={`${t('ALL', 'All')} ${allsubcategorySelected ? 'X' : ''}`}
+                    style={bpStyles.categoryButtonStyle}
+                    textStyle={{ color: allsubcategorySelected ? theme.colors.white : theme.colors.textNormal, fontSize: 12 }}
+                />
+            </ContainerButton>
+            {category?.subcategories?.map((subcategory: any) => {
+                const isSubcategorySelected = subcategoriesSelected?.find((_subcategory: any) => _subcategory?.id === subcategory?.id)
+                return (
+                    <ContainerButton
+                        key={subcategory?.id}
+                        isSelected={isSubcategorySelected}
+                    >
+                        <OButton
+                            onClick={() => onClickSubcategory(subcategory, category)}
+                            bgColor={isSubcategorySelected ? theme.colors.primary : theme.colors.backgroundGray}
+                            text={`${subcategory?.name} ${isSubcategorySelected ? 'X' : ''}`}
+                            style={bpStyles.categoryButtonStyle}
+                            textStyle={{ color: isSubcategorySelected ? theme.colors.white : theme.colors.textNormal, fontSize: 12 }}
+                        />
+                    </ContainerButton>
+                )
+            }
+            )}
+        </SubCategoriesContainer>
+    )
+}
+
+export const SubcategoriesComponentMemoized = React.memo(SubcategoriesComponent, SubcategoriesComponentPropsAreEqual)

package/themes/original/src/components/BusinessProductsList/SubcategoriesComponent/styles.tsx

@@ -0,0 +1,12 @@
+import styled from "styled-components/native";
+
+export const SubCategoriesContainer = styled.View`
+  flex-direction: row;
+  flex-wrap: wrap;
+  margin-bottom: 10px;
+`
+
+export const ContainerButton = styled.View`
+`
+
+export const HeaderWrapper = styled.View``