ordering-ui-react-native 0.18.55 → 0.18.56-crash-driver-1

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

@@ -1,36 +1,25 @@
 import React, { useEffect, useState } from 'react'
 import { useLanguage, BusinessSearchList, useOrder, useUtils, useEvent, showToast, ToastType } from 'ordering-components/native'
-import { ScrollView, StyleSheet, TouchableOpacity, View, Dimensions } from 'react-native'
-import { useSafeAreaInsets } from 'react-native-safe-area-context'
+import { ScrollView, StyleSheet, Dimensions, FlatList } from 'react-native'
 import { useTheme } from 'styled-components/native'
-import { HeaderTitle, OButton, OModal, OText } from '../shared'
-import { SearchBar } from '../SearchBar';
-import { NotFoundSource } from '../NotFoundSource'
+import { OButton, OText } from '../shared'
+
 import { SingleProductCard } from '../SingleProductCard'
-import AntDesignIcon from 'react-native-vector-icons/AntDesign'
 import {
-  SearchWrapper,
-  ProductsList,
   SingleBusinessSearch,
   BusinessInfo,
   BusinessInfoItem,
   Metadata,
   SingleBusinessContainer,
-  TagsContainer,
-  SortContainer,
-  BrandContainer,
-  BrandItem,
-  PriceFilterWrapper,
   BContainer,
-  WrapperButtons
 } 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 { useIsFocused } from '@react-navigation/native';
-import { MaxSectionItem } from './MaxSectionItem'
-import { IOScrollView } from 'react-native-intersection-observer'
+
+import { BusinessSearchHeader } from './BusinessSearchHeader'
+import { BusinessSearchFooter } from './BusinessSearchFooter'
 
 const PIXELS_TO_SCROLL = 1000
 
@@ -47,97 +36,24 @@ export const BusinessListingSearchUI = (props: BusinessSearchParams) => {
     businessTypes,
     setFilters,
     brandList,
+    paginationProps,
     handleUpdateProducts
   } = props
 
-  const screenHeight = Dimensions.get('window').height;
   const screenWidth = Dimensions.get('window').width;
   const theme = useTheme()
   const [orderState] = useOrder()
   const [events] = useEvent()
-  const { top } = useSafeAreaInsets();
   const [, t] = useLanguage()
   const [{ parsePrice, parseDistance, optimizeImage }] = useUtils();
 
   const [openFilters, setOpenFilters] = useState(false)
-  const noResults = (!businessesSearchList.loading && !businessesSearchList.lengthError && businessesSearchList?.businesses?.length === 0)
-  const maxDeliveryFeeOptions = [15, 25, 35, 'default']
-  // const maxProductPriceOptions = [5, 10, 15, 'default']
-  const maxDistanceOptions = [1000, 2000, 5000, 'default']
-  const maxTimeOptions = [5, 15, 30, 'default']
-  const sortItems = [
-    { text: t('PICKED_FOR_YOU', 'Picked for you (default)'), value: 'distance' },
-    { text: t('DELIVERY_TIME', 'Delivery time'), value: 'delivery_time' },
-    { text: t('PICKUP_TIME', 'Pickup time'), value: 'pickup_time' }
-  ]
-
-  const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
-  const hideBrowse = theme?.bar_menu?.components?.browse?.hidden
-
-  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: 12,
-      height: 44
-    },
     productsContainer: {
       marginTop: 20
-    },
-    businessTypesContainer: {
-      width: '100%',
-      flexDirection: 'row',
-      flexWrap: 'wrap',
-      justifyContent: 'center'
-    },
-    priceContainer: {
-      width: '100%',
-      flexDirection: 'row',
-      flexWrap: 'wrap',
-      justifyContent: 'space-between'
-    },
-    categoryStyle: {
-      marginRight: 10,
-      marginTop: 10,
-      borderRadius: 50,
-      paddingHorizontal: 10,
-      paddingVertical: 4,
-      paddingLeft: 0,
-      paddingRight: 0,
-      height: 28,
-      borderWidth: 0
-    },
-    priceItem: {
-      marginRight: 10,
-      marginTop: 10,
-      borderRadius: 50,
-      paddingVertical: 4,
-      paddingLeft: 5,
-      paddingRight: 5,
-      height: 27,
-      borderWidth: 0
-    },
-    applyButton: {
-      paddingHorizontal: 10,
-      width: '100%',
-      marginTop: 20
     }
   });
 
@@ -249,71 +165,37 @@ export const BusinessListingSearchUI = (props: BusinessSearchParams) => {
   }, [isFocused])
 
   return (
-    <IOScrollView
-      onScroll={(e: any) => handleScroll(e)}
-      showsVerticalScrollIndicator={false}
-    >
-      <View style={{
-        width: '100%',
-        display: 'flex',
-        flexDirection: 'row',
-        alignItems: 'center',
-        paddingHorizontal: hideBrowse && !isChewLayout ? 40 : 20,
-      }}>
-        {hideBrowse && !isChewLayout && (
-          <OButton
-            imgLeftStyle={{ width: 18 }}
-            imgRightSrc={null}
-            style={{
-              borderWidth: 0,
-              width: 26,
-              height: 26,
-              backgroundColor: '#FFF',
-              borderColor: '#FFF',
-              shadowColor: '#FFF',
-              paddingLeft: 0,
-              paddingRight: 0,
-              marginTop: 50,
-            }}
-            onClick={() => props.navigation.goBack()}
-            icon={AntDesignIcon}
-            iconProps={{
-              name: 'arrowleft',
-              size: 26
-            }}
-          />
-        )}
-        <HeaderTitle ph={20} text={t('SEARCH', 'Search')} />
-        <AntDesignIcon name='filter' size={18} style={{ marginLeft: 'auto', marginTop: 55, paddingHorizontal: 20 }} onPress={() => handleOpenfilters()} />
-      </View>
-      <BContainer
-        style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}
-      >
-        <SearchWrapper>
-          <SearchBar
-            lazyLoad
-            {...(isChewLayout && { height: 55 })}
-            inputStyle={{ ...styles.searchInput }}
-            placeholder={t('SEARCH_BUSINESSES', 'Search Businesses')}
-            onSearch={(val: string) => onChangeTermValue(val)}
-            value={termValue}
-          />
-        </SearchWrapper>
-        <OText size={12} lineHeight={20} color={theme.colors.textThird} mLeft={5}>
-          {t('TYPE_AT_LEAST_2_CHARACTERS', 'Type at least 2 characters')}
-        </OText>
-        {
-          noResults && (
-            <View>
-              <NotFoundSource
-                content={t('NOT_FOUND_BUSINESSES', 'No businesses to delivery / pick up at this address, please change filters or change address.')}
-              />
-            </View>
-          )
-        }
-        <ProductsList>
-          {businessesSearchList.businesses?.filter((business: any) => business?.categories?.length > 0).map((business: any) => (
-            <SingleBusinessSearch key={`card-${business?.id}`}>
+    <>
+      <FlatList
+        data={businessesSearchList.businesses?.filter((business: any) => business?.categories?.length > 0)}
+        ListFooterComponent={<BusinessSearchFooter
+          businessesSearchList={businessesSearchList}
+          handleCloseFilters={handleCloseFilters}
+          handleChangeFilters={handleChangeFilters}
+          brandList={brandList}
+          filters={filters}
+          handleChangeBrandFilter={handleChangeBrandFilter}
+          handleChangePriceRange={handleChangePriceRange}
+          businessTypes={businessTypes}
+          handleApplyFilters={handleApplyFilters}
+          clearFilters={clearFilters}
+          handleChangeActiveBusinessType={handleChangeActiveBusinessType}
+          openFilters={openFilters}
+        />}
+        ListHeaderComponent={<BusinessSearchHeader
+          businessesSearchList={businessesSearchList}
+          onChangeTermValue={onChangeTermValue}
+          termValue={termValue}
+          handleOpenfilters={handleOpenfilters}
+        />}
+        onScroll={(e: any) => handleScroll(e)}
+        showsVerticalScrollIndicator={false}
+        keyExtractor={(business: any, index: number) => `card-${business?.id}-${index}`}
+        renderItem={({ item: business }: any) => (
+          <BContainer
+            style={{ paddingHorizontal: 20, paddingTop: 0, paddingBottom: 0 }}
+          >
+            <SingleBusinessSearch>
               <SingleBusinessContainer>
                 <BusinessInfo>
                   {(business?.logo || theme.images?.dummies?.businessLogo) && (
@@ -350,9 +232,15 @@ export const BusinessListingSearchUI = (props: BusinessSearchParams) => {
                   onClick={() => onBusinessClick(business)}
                   textStyle={{ color: theme.colors.primary, fontSize: 10 }}
                   text={t('GO_TO_STORE', 'Go to store')}
-                  bgColor='#F5F9FF'
-                  borderColor='#fff'
-                  style={{ borderRadius: 50, paddingLeft: 5, paddingRight: 5, height: 20 }}
+                  style={{
+                    borderRadius: 23,
+                    paddingLeft: 10,
+                    paddingRight: 10,
+                    height: 23,
+                    shadowOpacity: 0,
+                    backgroundColor: theme.colors.primaryContrast,
+                    borderWidth: 0
+                  }}
                 />
               </SingleBusinessContainer>
               <ScrollView horizontal style={styles.productsContainer} contentContainerStyle={{ flexGrow: 1 }}>
@@ -373,210 +261,18 @@ export const BusinessListingSearchUI = (props: BusinessSearchParams) => {
                     }}
                   />
                 )))}
-
               </ScrollView>
             </SingleBusinessSearch>
-          ))}
-          {businessesSearchList?.loading && (
-            <>
-              {[...Array(3).keys()].map(
-                (item, i) => (
-                  <View key={`skeleton:${i}`} style={{ width: '100%', marginTop: 20 }}>
-                    <Placeholder key={i} style={{ paddingHorizontal: 5 }} Animation={Fade}>
-                      <View style={{ flexDirection: 'row' }}>
-                        <PlaceholderLine
-                          width={24}
-                          height={70}
-                          style={{ marginRight: 10, marginBottom: 10 }}
-                        />
-                        <Placeholder style={{ paddingVertical: 10 }}>
-                          <PlaceholderLine width={20} style={{ marginBottom: 25 }} />
-                          <PlaceholderLine width={60} />
-                        </Placeholder>
-                      </View>
-                    </Placeholder>
-                    <Placeholder style={{ paddingHorizontal: 5, bottom: 10 }} Animation={Fade}>
-                      <View style={{ flexDirection: 'row-reverse', overflow: 'hidden' }}>
-                        <PlaceholderLine
-                          width={24}
-                          height={70}
-                          style={{ marginRight: 10, marginBottom: 5 }}
-                        />
-                        <Placeholder style={{ paddingVertical: 10 }}>
-                          <PlaceholderLine width={60} height={10} />
-                          <PlaceholderLine width={50} height={10} />
-                          <PlaceholderLine width={70} height={10} />
-                        </Placeholder>
-                      </View>
-                    </Placeholder>
-                  </View>
-                ),
-              )}
-            </>
-          )}
-        </ProductsList>
-        <OModal
-          open={openFilters}
-          onCancel={() => handleCloseFilters()}
-          onClose={() => handleCloseFilters()}
-        >
-          <ScrollView style={styles.filterContainer}>
-            <OText
-              size={20}
-              mBottom={15}
-              style={{ marginTop: 10 }}
-            >
-              {t('FILTER', 'Filter')}
-            </OText>
-            <SortContainer>
-              <OText weight='bold' mBottom={7} size={16}>
-                {t('SORT', 'Sort')}
-              </OText>
-              {sortItems?.filter(item => !(orderState?.options?.type === 1 && item?.value === 'pickup_time') && !(orderState?.options?.type === 2 && item?.value === 'delivery_time'))?.map(item => (
-                <TouchableOpacity
-                  key={item?.value}
-                  onPress={() => handleChangeFilters('orderBy', item?.value)}
-                  style={{ marginBottom: 7 }}
-                >
-                  <OText
-                    weight={filters?.orderBy?.includes(item?.value) ? 'bold' : '500'}
-                    mBottom={filters?.orderBy?.includes(item?.value) ? 5 : 0}
-                  >
-                    {item?.text}  {(filters?.orderBy?.includes(item?.value)) && <>{filters?.orderBy?.includes('-') ? <AntDesignIcon name='caretup' /> : <AntDesignIcon name='caretdown' />}</>}
-                  </OText>
-                </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
-                filters={filters}
-                title={t('MAX_DELIVERY_FEE', 'Max delivery fee')}
-                options={maxDeliveryFeeOptions}
-                filter='max_delivery_price'
-                handleChangeFilters={handleChangeFilters}
-              />
-            )}
-            {[1, 2].includes(orderState?.options?.type) && (
-              <MaxSectionItem
-                filters={filters}
-                title={orderState?.options?.type === 1 ? t('MAX_DELIVERY_TIME', 'Max delivery time') : t('MAX_PICKUP_TIME', 'Max pickup time')}
-                options={maxTimeOptions}
-                filter='max_eta'
-                handleChangeFilters={handleChangeFilters}
-              />
-            )}
-            <MaxSectionItem
-              filters={filters}
-              title={t('MAX_DISTANCE', 'Max distance')}
-              options={maxDistanceOptions}
-              filter='max_distance'
-              handleChangeFilters={handleChangeFilters}
-            />
-            {businessTypes?.length > 0 && (
-              <TagsContainer>
-                <OText weight='bold' mBottom={7} size={16}>{t('BUSINESS_CATEGORIES', 'Business categories')}</OText>
-                <View style={styles.businessTypesContainer}>
-                  {businessTypes.map((type: any, i: number) => type.enabled && (
-                    <OButton
-                      key={type?.id}
-                      bgColor={(filters?.business_types?.includes(type?.id) || (type?.id === null && filters?.business_types?.length === 0)) ? theme.colors.primary : theme.colors.backgroundGray200}
-                      onClick={() => handleChangeActiveBusinessType(type)}
-                      text={`${t(`BUSINESS_TYPE_${type.name.replace(/\s/g, '_').toUpperCase()}`, type.name)} ${filters?.business_types?.includes(type?.id) ? 'X' : ''}`}
-                      style={styles.categoryStyle}
-                      textStyle={{ fontSize: 10, color: (filters?.business_types?.includes(type?.id) || (type?.id === null && filters?.business_types?.length === 0)) ? '#fff' : theme.colors.textNormal }}
-                    />
-                  ))}
-                </View>
-              </TagsContainer>
-            )}
-          </ScrollView>
-          <WrapperButtons>
-            <View style={{ width: '50%' }}>
-              <OButton
-                text={t('APPLY', 'Apply')}
-                parentStyle={styles.applyButton}
-                textStyle={{ color: '#fff' }}
-                onClick={() => handleApplyFilters()}
-              />
-            </View>
-            <View style={{ width: '50%' }}>
-              <OButton
-                text={t('CLEAR_FILTERS', 'Clear')}
-                bgColor={theme.colors.white}
-                borderColor={theme.colors.primary}
-                parentStyle={styles.applyButton}
-                textStyle={{ color: theme.colors.primary }}
-                onClick={() => clearFilters()}
-              />
-            </View>
-          </WrapperButtons>
-        </OModal>
-      </BContainer>
-    </IOScrollView>
+          </BContainer>
+        )}
+      />
+      {/* <IOScrollView
+        onScroll={(e: any) => handleScroll(e)}
+        showsVerticalScrollIndicator={false}
+      >
+
+      </IOScrollView> */}
+    </>
   )
 }
 

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

@@ -1,7 +1,7 @@
 import styled, { css } from 'styled-components/native'
 
 export const BContainer = styled.View`
-  padding: 20px 40px;
+  padding: 20px;
 `
 
 export const SearchWrapper = styled.View`

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

@@ -1,4 +1,5 @@
 import React, { useState, useEffect } from 'react'
+import { useFocusEffect } from '@react-navigation/native'
 import { TouchableOpacity, StyleSheet, View, Dimensions, Platform } from 'react-native'
 import { useLanguage, useUtils, useConfig, useOrder, MomentOption } from 'ordering-components/native'
 import { OButton, OIcon, OText } from '../shared'
@@ -55,7 +56,7 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
   const [datesWhitelist, setDateWhitelist] = useState<any>([{ start: null, end: null }])
   const [isEnabled, setIsEnabled] = useState(false)
   const { top } = useSafeAreaInsets()
-  const is12hours = configs?.dates_moment_format?.value?.includes('hh:mm')
+  const is12hours = configs?.general_hour_format?.value?.includes('hh:mm')
 
   const showOrderTime = (selectedPreorderType === 1 && Object.keys(menu)?.length > 0) || selectedPreorderType === 0
   const isPreOrderSetting = configs?.preorder_status_enabled?.value === '1'
@@ -63,7 +64,7 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
     container: {
       height: windowHeight,
       paddingVertical: 30,
-      paddingHorizontal: 40
+      paddingHorizontal: 20
     },
     businessLogo: {
       backgroundColor: 'white',
@@ -310,17 +311,18 @@ const BusinessPreorderUI = (props: BusinessPreorderParams) => {
     }
   }, [dateSelected])
 
-  useEffect(() => {
-    handleAsap && handleAsap()
-  }, [])
+  useFocusEffect(
+    React.useCallback(() => {
+      handleAsap && handleAsap()
+    }, [])
+  )
 
   return (
     <>
-      <PreOrderContainer contentContainerStyle={{ paddingVertical: 32, paddingHorizontal: 40 }}>
+      <PreOrderContainer contentContainerStyle={{ paddingVertical: 32, paddingHorizontal: 20 }}>
         <TouchableOpacity onPress={() => goToBack && goToBack()} style={{ marginBottom: 12 }}>
           <IconAntDesign
             name='close'
-            color={theme.colors.textThird}
             size={24}
             style={{ marginLeft: -4 }}
           />

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

@@ -92,7 +92,7 @@ const BusinessProductsCategoriesUI = (props: any) => {
 			ref={tabsRef}
 			horizontal
 			style={{ ...styles.container, borderBottomWidth: loading ? 0 : 1 }}
-			contentContainerStyle={{ paddingHorizontal: 40 }}
+			contentContainerStyle={{ paddingHorizontal: 20 }}
 			showsHorizontalScrollIndicator={false}
 			onScroll={(e: any) => setScrollOffsetX(e.nativeEvent.contentOffset.x)}
 			scrollEventThrottle={16}
@@ -107,8 +107,7 @@ const BusinessProductsCategoriesUI = (props: any) => {
 				</Placeholder>
 			)}
 			{!loading &&
-				categories &&
-				categories.length &&
+				categories?.length > 0 &&
 				categories.map((category: any) => (
 					<Tab
 						key={category.id}

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

@@ -106,7 +106,7 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
             <SingleProductCard
               key={'prod_' + product.id + `_${i}`}
               isSoldOut={product.inventoried && !product.quantity}
-              enableIntersection={!isFiltMode}
+              // enableIntersection={!isFiltMode}
               product={product}
               businessId={businessId}
               categoryState={categoryState}
@@ -135,7 +135,7 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
                       key={'feat_' + product.id + `_${i}`}
                       isSoldOut={product.inventoried && !product.quantity}
                       product={product}
-                      enableIntersection={!isFiltMode}
+                      // enableIntersection={!isFiltMode}
                       businessId={businessId}
                       categoryState={categoryState}
                       onProductClick={onProductClick}
@@ -237,7 +237,7 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
                   {products.sort((a: any, b: any) => a.rank - b.rank).map((product: any, i: any) => (
                     <SingleProductCard
                       key={`${product?.id}_${i}`}
-                      enableIntersection={!isFiltMode}
+                      // enableIntersection={!isFiltMode}
                       isSoldOut={product.inventoried && !product.quantity}
                       businessId={businessId}
                       product={product}
@@ -309,10 +309,11 @@ const BusinessProductsListUI = (props: BusinessProductsListParams) => {
                   ? t('SEARCH_REDIRECT', 'Go to Businesses')
                   : t('CLEAR_FILTERS', 'Clear filters')
               }
-              onClickButton={() =>
+              onClickButton={!businessSingleId ? () =>
                 !searchValue
                   ? handleSearchRedirect && handleSearchRedirect()
                   : handleCancelSearch && handleCancelSearch()
+                : null
               }
             />
           </WrapperNotFound>