ordering-ui-react-native 0.21.21 → 0.21.22-release

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

@@ -23,7 +23,10 @@ export const BusinessItemAccordion = (props: any) => {
 		handleClickCheckout,
 		checkoutButtonDisabled,
 		isMultiCheckout,
-		isFromUpselling
+		isFromUpselling,
+		changeActiveState,
+		isActive,
+		isGiftCart
 	} = props
 
 	const [orderState] = useOrder();
@@ -38,14 +41,13 @@ export const BusinessItemAccordion = (props: any) => {
 	const isProducts = cart?.products?.length
 	const isBusinessChangeEnabled = configs?.cart_change_business_validation?.value === '1'
 
-	const [isActive, setActiveState] = useState(!!singleBusiness)
 	const [viewedCart, setViewedCart] = useState<any>(null)
 
 	useEffect(() => {
 		const cartsArray = Object.values(orderState?.carts)
 		const cartsLength = cartsArray.filter((cart: any) => cart.products.length > 0).length ?? 0
 		if (cartsLength === 1) {
-			setActiveState(!isClosed)
+			changeActiveState && changeActiveState(!isClosed, cart?.uuid)
 		}
 	}, [orderState?.carts, isClosed])
 
@@ -68,14 +70,14 @@ export const BusinessItemAccordion = (props: any) => {
 		<BIContainer isClosed={isClosed} isMultiCheckout={isMultiCheckout} checkoutVisible={!isActive && !isClosed && !!isProducts && !checkoutButtonDisabled}>
 			<BIHeader
 				isClosed={isClosed}
-				onPress={() => !isClosed ? setActiveState(!isActive) : isClosed}
+				onPress={() => !isClosed ? changeActiveState && changeActiveState(!isClosed, cart?.uuid) : isClosed}
 				activeOpacity={1}
 			>
 				<BIInfo>
 					<BIContentInfo>
 						<OText size={16} lineHeight={24} weight={'600'}>{cart?.business?.name}</OText>
 						<View style={{ flexDirection: 'row' }}>
-							{props.onNavigationRedirect && !isClosed && (
+							{props.onNavigationRedirect && !isClosed && !isGiftCart && (
 								<>
 									<TouchableOpacity onPress={() => props.onNavigationRedirect('Business', { store: cart?.business?.slug })}>
 										<OText color={theme.colors.primary} size={12} lineHeight={18} style={{ textDecorationLine: 'underline' }}>{t('GO_TO_STORE', 'Go to store')}</OText>
@@ -84,7 +86,9 @@ export const BusinessItemAccordion = (props: any) => {
 							)}
 							{!isCartPending && (
 								<>
-									<OText color={theme.colors.textSecondary}>{' \u2022 '}</OText>
+									{!isGiftCart && (
+										<OText color={theme.colors.textSecondary}>{' \u2022 '}</OText>
+									)}
 									<OAlert
 										title={t('DELETE_CART', 'Delete Cart')}
 										message={t('QUESTION_DELETE_CART', 'Are you sure to you wants delete the selected cart')}
@@ -94,7 +98,7 @@ export const BusinessItemAccordion = (props: any) => {
 									</OAlert>
 								</>
 							)}
-							{isBusinessChangeEnabled && props.handleChangeStore && (
+							{isBusinessChangeEnabled && props.handleChangeStore && !isGiftCart && (
 								<>
 									<OText color={theme.colors.textSecondary}>{' \u2022 '}</OText>
 									<TouchableOpacity

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

@@ -0,0 +1,317 @@
+import React, { useState } from 'react'
+import { useLanguage, useOrder } from 'ordering-components/native'
+import { ScrollView, StyleSheet, TouchableOpacity, View, Dimensions } from 'react-native'
+import { useTheme } from 'styled-components/native'
+import { OButton, OModal, OText } from '../shared'
+import AntDesignIcon from 'react-native-vector-icons/AntDesign'
+import {
+    ProductsList,
+    TagsContainer,
+    SortContainer,
+    BrandContainer,
+    BrandItem,
+    PriceFilterWrapper,
+    BContainer,
+    WrapperButtons
+} from './styles'
+import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder'
+import { MaxSectionItem } from './MaxSectionItem'
+
+export const BusinessSearchFooter = (props: any) => {
+    const {
+        businessesSearchList,
+        handleCloseFilters,
+        handleChangeFilters,
+        brandList,
+        filters,
+        handleChangeBrandFilter,
+        handleChangePriceRange,
+        businessTypes,
+        handleApplyFilters,
+        clearFilters,
+        handleChangeActiveBusinessType,
+        openFilters
+    } = props
+
+    const screenHeight = Dimensions.get('window').height;
+    const theme = useTheme()
+    const [orderState] = useOrder()
+
+    const [, t] = useLanguage()
+
+    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 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: 20,
+            width: '100%'
+        },
+        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
+        }
+    });
+
+    return (
+        <>
+            <BContainer
+                style={{ paddingHorizontal: 20 }}
+            >
+                <ProductsList>
+                    {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>
+            </BContainer>
+            <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>
+        </>
+    )
+}

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

@@ -0,0 +1,96 @@
+import React, { useEffect, useState } from 'react'
+import { useLanguage } from 'ordering-components/native'
+import { View, Platform, StyleSheet, Dimensions } from 'react-native'
+import { HeaderTitle, OButton, OText } from '../shared'
+import { SearchBar } from '../SearchBar';
+import { NotFoundSource } from '../NotFoundSource'
+import AntDesignIcon from 'react-native-vector-icons/AntDesign'
+import {
+    SearchWrapper,
+    BContainer,
+} from './styles'
+import { useTheme } from 'styled-components/native'
+
+export const BusinessSearchHeader = (props: any) => {
+    const {
+        businessesSearchList,
+        onChangeTermValue,
+        termValue,
+        handleOpenfilters
+    } = props
+    const theme = useTheme()
+    const [, t] = useLanguage()
+    const noResults = (!businessesSearchList.loading && !businessesSearchList.lengthError && businessesSearchList?.businesses?.length === 0)
+    const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === 'chew'
+    const hideBrowse = theme?.bar_menu?.components?.browse?.hidden
+
+    const styles = StyleSheet.create({
+        searchInput: {
+            fontSize: 12,
+            height: 44
+        }
+    });
+
+    return (
+        <>
+            <View style={{
+                width: '100%',
+                display: 'flex',
+                flexDirection: 'row',
+                alignItems: 'center',
+            }}>
+                {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: Platform.OS === 'ios' ? 35 : 55, paddingHorizontal: 20 }} onPress={() => handleOpenfilters()} />
+            </View>
+            <BContainer
+                style={{ paddingHorizontal: 20 }}
+            >
+                <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>
+                    )
+                }
+            </BContainer>
+        </>
+    )
+}

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

@@ -28,7 +28,7 @@ export const MaxSectionItem = (props: any) => {
         return filter === 'max_distance'
             ? `${option / 1000} ${t('KM', 'Km')}`
             : filter === 'max_eta'
-                ? `${option} ${t('MIN', 'min')}`
+                ? `${option} ${t('TIME_MIN', 'min')}`
                 : parsePrice(option)
     }
     return (