ordering-ui-react-native 0.21.53 → 0.21.54-release

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

@@ -21,7 +21,7 @@ export const AppleLogin = (props: any) => {
   const [{ configs }] = useConfig();
   const [credentialStateForUser, updateCredentialStateForUser] = useState<any>(-1);
 
-  let user : any= null
+  let user: any = null
 
   const buttonText = auth
     ? t('CONTINUE_WITH_APPLE', 'Logout with Apple')
@@ -53,7 +53,7 @@ export const AppleLogin = (props: any) => {
     }
   }
 
-  const fetchAndUpdateCredentialState = async (updateCredentialStateForUser : any) => {
+  const fetchAndUpdateCredentialState = async (updateCredentialStateForUser: any) => {
     if (user === null) {
       updateCredentialStateForUser('N/A');
     } else {
@@ -66,7 +66,7 @@ export const AppleLogin = (props: any) => {
     }
   }
 
-  const onIOSButtonPress = async (updateCredentialStateForUser : any) => {
+  const onIOSButtonPress = async (updateCredentialStateForUser: any) => {
     try {
       const appleAuthRequestResponse = await appleAuth.performRequest({
         requestedOperation: appleAuth.Operation.LOGIN,
@@ -79,7 +79,7 @@ export const AppleLogin = (props: any) => {
         identityToken,
         authorizationCode
       } = appleAuthRequestResponse;
-  
+
       user = newUser;
 
       fetchAndUpdateCredentialState(updateCredentialStateForUser).catch(error =>

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

@@ -26,7 +26,6 @@ import {
 	SocialListWrapper
 } from './styles';
 import { Fade, Placeholder, PlaceholderLine } from 'rn-placeholder';
-const types = ['food', 'laundry', 'alcohol', 'groceries'];
 
 let BusinessInformation: null | React.ElementType = null
 let BusinessReviews: null | React.ElementType = null
@@ -36,6 +35,7 @@ export const BusinessBasicInformation = (
 ) => {
 	const { navigation, businessState, isBusinessInfoShow, logo, header, isPreOrder } = props;
 	const { business, loading } = businessState;
+	const types = business?.types && business?.types?.filter(({ enabled }) => (enabled)).map(({ name }) => (name))
 
 	const theme = useTheme();
 	const [orderState] = useOrder();
@@ -146,14 +146,11 @@ export const BusinessBasicInformation = (
 	}
 
 	const getBusinessType = () => {
-		if (Object.keys(business || {}).length <= 0) return t('GENERAL', 'General');
+		if (!types) return t('GENERAL', 'General');
 		const _types: any = [];
 		types.forEach(
-			(type) =>
-				business[type] &&
-				_types.push(
-					t(`BUSINESS_TYPE_${type?.replace(/\s/g, '_')?.toUpperCase()}`, type),
-				),
+			(type: any) =>
+				_types.push(type)
 		);
 		return _types.join(', ');
 	};
@@ -247,7 +244,7 @@ export const BusinessBasicInformation = (
 								<View style={styles.tiktokIcon}>
 									<OIcon
 										src={theme.images.general.tiktok}
-										style={{ width: 10, height: 12 }}
+										style={{ width: 10, height: 12, bottom: 1 }}
 										cover
 									/>
 								</View>
@@ -455,7 +452,7 @@ export const BusinessBasicInformation = (
 							</BusinessInfoItem>
 						</View>
 						<WrapReviews>
-							{!isBusinessInfoShow && (
+							{!isBusinessInfoShow && !loading && (
 								<>
 									{isPreOrder && (!business?.professionals || business?.professionals?.length === 0) && (
 										<>

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

@@ -35,7 +35,12 @@ import FastImage from 'react-native-fast-image'
 import { LottieAnimation } from '../LottieAnimation';
 import { CardAnimation } from '../shared/CardAnimation';
 
-export const BusinessControllerUI = (props: BusinessControllerParams) => {
+function BusinessControllerPropsAreEqual(prevProps: any, nextProps: any) {
+	return JSON.stringify(prevProps.business) === JSON.stringify(nextProps.business) &&
+		prevProps.isBusinessOpen === nextProps.isBusinessOpen
+}
+
+export const BusinessControllerUI = React.memo((props: BusinessControllerParams) => {
 	const {
 		business,
 		handleClick,
@@ -76,7 +81,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 	const hideBusinessFavoriteBadge = theme?.business_listing_view?.components?.business?.components?.featured_badge?.hidden
 
 	const textSize = 12
-	const cardHeight = windowHeight * 0.3
+	const cardHeight = windowHeight * 0.34
 
 	const styles = StyleSheet.create({
 		container: {
@@ -184,7 +189,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 	}
 
 	return (
-		<InView style={{ minHeight: 200 }} triggerOnce={true} onChange={(inView: boolean) => handleChangeInterSection(inView)}>
+		<View style={{ minHeight: 200 }}>
 			{isIntersectionObserver ? (
 				<CardAnimation
 					style={[style, styles.container]}
@@ -227,7 +232,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 							</View>
 						)}
 						{!hideBusinessOffer && (
-							getBusinessOffer((business?.offers)) &&
+							!!getBusinessOffer((business?.offers)) &&
 							<OfferBox
 								isClosed={!isBusinessOpen && (configState?.configs?.preorder_status_enabled?.value === '1')}
 								isRibbon={business?.ribbon?.enabled && !!business?.ribbon?.text}
@@ -239,7 +244,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 									numberOfLines={2}
 									ellipsizeMode='tail'
 									lineHeight={13}
-								>{getBusinessOffer((business?.offers)) || parsePrice(0)}</OText>
+								>{t('DISCOUNT', 'Discount')}{' '}{getBusinessOffer((business?.offers))}</OText>
 							</OfferBox>
 						)}
 						<BusinessState isRibbon={business?.ribbon?.enabled && !!business?.ribbon?.text}>
@@ -256,7 +261,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 						</BusinessState>
 					</BusinessHero>
 					<BusinessContent>
-						<BusinessInfo style={{ position: 'absolute', bottom: 85, left: 15 }}>
+						<BusinessInfo style={{ position: 'absolute', top: -26, left: 15 }}>
 							{!hideBusinessLogo && (
 								<BusinessLogo style={styles.businessLogo}>
 									<FastImage
@@ -274,7 +279,10 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 							<OText
 								size={textSize + 2}
 								style={{ lineHeight: 18, marginBottom: 6, width: '90%' }}
-								weight={'500'}>
+								weight={'500'}
+								numberOfLines={1}
+								ellipsizeMode='tail'
+							>
 								{business?.name}
 							</OText>
 							{(!hideBusinessFavorite || !hideBusinessReviews) && (
@@ -301,7 +309,7 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 								</ReviewAndFavorite>
 							)}
 						</View>
-						<OText size={textSize} style={{ lineHeight: 15, marginBottom: 3 }} numberOfLines={1}>
+						<OText size={textSize} style={{ lineHeight: 15, marginBottom: 3, fontFamily: undefined }} numberOfLines={1}>
 							{business?.address}
 						</OText>
 						<Metadata>
@@ -373,9 +381,9 @@ export const BusinessControllerUI = (props: BusinessControllerParams) => {
 					</View>
 				</Placeholder>
 			)}
-		</InView>
+		</View>
 	);
-};
+}, BusinessControllerPropsAreEqual);
 
 export const BusinessController = (props: BusinessControllerParams) => {
 	const BusinessControllerProps = {

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

@@ -8,13 +8,14 @@ export const BusinessHero = styled.View`
 `
 
 export const BusinessContent = styled.View`
-    padding-horizontal: 18px;
-    padding-bottom: 10px;
-    border-bottom-left-radius: 7.6px;
-    border-bottom-right-radius: 7.6px;
-    border-width: 1px;
-    border-color: ${(props: any) => props.theme.colors.border};
-	 overflow: visible;
+  position: relative;
+  padding-horizontal: 18px;
+  padding-bottom: 10px;
+  border-bottom-left-radius: 7.6px;
+  border-bottom-right-radius: 7.6px;
+  border-width: 1px;
+  border-color: ${(props: any) => props.theme.colors.border};
+	overflow: visible;
 `;
 
 export const BusinessInfo = styled.View`

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

@@ -1,5 +1,5 @@
 import React, { useState, useRef, useEffect } from 'react';
-import { TouchableOpacity, View } from 'react-native';
+import { TouchableOpacity, View, Vibration } from 'react-native';
 import { useOrder, useLanguage, useUtils, useConfig, useEvent } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 import {
@@ -47,7 +47,7 @@ export const BusinessItemAccordion = (props: any) => {
 		const cartsArray = Object.values(orderState?.carts)
 		const cartsLength = cartsArray.filter((cart: any) => cart.products.length > 0).length ?? 0
 		if (cartsLength === 1) {
-			changeActiveState(!isClosed, cart?.uuid)
+			changeActiveState && changeActiveState(!isClosed, cart?.uuid)
 		}
 	}, [orderState?.carts, isClosed])
 
@@ -57,6 +57,9 @@ export const BusinessItemAccordion = (props: any) => {
 		return acc = acc
 	}, cart?.subtotal)
 
+	const bgStyle = (subtotalWithTaxes < cart?.minimum || !cart?.valid_address) ? theme.colors.secundary : theme.colors.primary
+	const textStyles = (subtotalWithTaxes < cart?.minimum || !cart?.valid_address) ? theme.colors.black : theme.colors.white
+
 	useEffect(() => {
 		if (isActive && !isFromUpselling) {
 			if (cart?.uuid !== viewedCart?.uuid) {
@@ -66,11 +69,16 @@ export const BusinessItemAccordion = (props: any) => {
 		}
 	}, [isActive, viewedCart])
 
+	const handleGoToStore = () => {
+		Vibration.vibrate(100)
+		props.onNavigationRedirect('Business', { store: cart?.business?.slug })
+	}
+
 	return (
 		<BIContainer isClosed={isClosed} isMultiCheckout={isMultiCheckout} checkoutVisible={!isActive && !isClosed && !!isProducts && !checkoutButtonDisabled}>
 			<BIHeader
 				isClosed={isClosed}
-				onPress={() => !isClosed ? changeActiveState(!isClosed, cart?.uuid) : isClosed}
+				onPress={() => !isClosed ? changeActiveState && changeActiveState(!isClosed, cart?.uuid) : isClosed}
 				activeOpacity={1}
 			>
 				<BIInfo>
@@ -79,7 +87,7 @@ export const BusinessItemAccordion = (props: any) => {
 						<View style={{ flexDirection: 'row' }}>
 							{props.onNavigationRedirect && !isClosed && !isGiftCart && (
 								<>
-									<TouchableOpacity onPress={() => props.onNavigationRedirect('Business', { store: cart?.business?.slug })}>
+									<TouchableOpacity onPress={() => handleGoToStore()}>
 										<OText color={theme.colors.primary} size={12} lineHeight={18} style={{ textDecorationLine: 'underline' }}>{t('GO_TO_STORE', 'Go to store')}</OText>
 									</TouchableOpacity>
 								</>
@@ -153,11 +161,11 @@ export const BusinessItemAccordion = (props: any) => {
 					{cart?.valid_products && (
 						<OButton
 							onClick={handleClickCheckout}
-							textStyle={{ color: 'white', textAlign: 'center', flex: 1 }}
+							textStyle={{ color: textStyles, textAlign: 'center', flex: 1 }}
 							style={{ width: 180, flexDirection: 'row', justifyContent: 'center', borderRadius: 7.6, shadowOpacity: 0 }}
 							text={t('CHECKOUT', 'Checkout')}
-							bgColor={(subtotalWithTaxes < cart?.minimum || !cart?.valid_address) ? theme.colors.secundary : theme.colors.primary}
-							borderColor={theme.colors.primary}
+							bgColor={bgStyle}
+							borderColor={bgStyle}
 							isDisabled={checkoutButtonDisabled}
 						/>
 					)}

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

@@ -0,0 +1,316 @@
+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.white : 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)) ? theme.colors.white : theme.colors.textNormal }}
+                                    />
+                                ))}
+                            </View>
+                        </TagsContainer>
+                    )}
+                </ScrollView>
+                <WrapperButtons>
+                    <View style={{ width: '50%' }}>
+                        <OButton
+                            text={t('APPLY', 'Apply')}
+                            parentStyle={styles.applyButton}
+                            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>
+        </>
+    )
+}