ordering-ui-react-native 0.17.85 → 0.17.86

package/themes/original/src/components/BusinessesListing/Layout/Original/index.tsx

@@ -18,8 +18,7 @@ import {
 	useSession,
 	useOrder,
 	useConfig,
-	useUtils,
-	useOrderingTheme
+	useUtils
 } from 'ordering-components/native';
 import { useTheme } from 'styled-components/native';
 import Ionicons from 'react-native-vector-icons/Ionicons'
@@ -74,13 +73,25 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 		logosLayout
 	} = props;
 	const theme = useTheme();
-	const [orderingTheme] = useOrderingTheme()
 	const isFocused = useIsFocused();
+
+	const [, t] = useLanguage();
+	const [{ user, auth }] = useSession();
+	const [orderState, { changeCityFilter }] = useOrder();
+	const [{ configs }] = useConfig();
+	const [{ parseDate }] = useUtils();
+
 	const appState = useRef(AppState.currentState)
 	const isChewLayout = theme?.header?.components?.layout?.type === 'chew'
-	const hideCities = theme?.business_listing_view?.components?.cities?.hidden ?? true
 	const [refreshing] = useState(false);
-	const bgHeader = orderingTheme?.theme?.business_listing_view?.components?.business_hero?.components?.image
+	const hideCities = (theme?.business_listing_view?.components?.cities?.hidden || orderState?.options?.type !== 2) ?? true
+	const hideHero = theme?.business_listing_view?.components?.business_hero?.hidden
+	const hidePreviousOrders = theme?.business_listing_view?.components?.previous_orders_block?.hidden
+	const hideHighestBusiness = theme?.business_listing_view?.components?.highest_rated_business_block?.hidden
+	const isAllCategoriesHidden = theme?.business_listing_view?.components?.categories?.hidden
+	const bgHeader = theme?.business_listing_view?.components?.business_hero?.components?.image
+	const bgHeaderHeight = theme?.business_listing_view?.components?.business_hero?.components?.style?.height
+
 	const styles = StyleSheet.create({
 		container: {
 			marginBottom: 0,
@@ -144,13 +155,6 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 		},
 	});
 
-
-	const [, t] = useLanguage();
-	const [{ user, auth }] = useSession();
-	const [orderState, { changeCityFilter }] = useOrder();
-	const [{ configs }] = useConfig();
-	const [{ parseDate }] = useUtils();
-
 	const { top } = useSafeAreaInsets();
 
 	const [featuredBusiness, setFeaturedBusinesses] = useState(Array);
@@ -466,18 +470,30 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 				)}
 			</View>
 			{!isChewLayout ? (
-				<HeaderWrapper
-					source={bgHeader ? { uri: bgHeader } : theme.images.backgrounds.business_list_header}
-					style={{ paddingTop: top + 20 }}
-					resizeMode='cover'
-				>
-					{!auth && (
-
-						<TouchableOpacity onPress={() => navigation?.canGoBack() && navigation.goBack()} style={{ position: 'absolute', marginStart: 40, paddingVertical: 20 }}>
-							<OIcon src={theme.images.general.arrow_left} color={theme.colors.textNormal} />
-						</TouchableOpacity>
+				<>
+					{!hideHero ? (
+						<HeaderWrapper
+							source={bgHeader ? { uri: bgHeader } : theme.images.backgrounds.business_list_header}
+							style={{ paddingTop: top + 20 }}
+							resizeMode='cover'
+							bgHeaderHeight={bgHeaderHeight}
+						>
+							{!auth && (
+								<TouchableOpacity onPress={() => navigation?.canGoBack() && navigation.goBack()} style={{ position: 'absolute', marginStart: 40, paddingVertical: 20 }}>
+									<OIcon src={theme.images.general.arrow_left} color={theme.colors.textNormal} />
+								</TouchableOpacity>
+							)}
+						</HeaderWrapper>
+					) : (
+						<>
+							{!auth && (
+								<TouchableOpacity onPress={() => navigation?.canGoBack() && navigation.goBack()} style={{ position: 'absolute', marginStart: 40, paddingVertical: 20 }}>
+									<OIcon src={theme.images.general.arrow_left} color={theme.colors.textNormal} />
+								</TouchableOpacity>
+							)}
+						</>
 					)}
-				</HeaderWrapper>
+				</>
 			) : (
 				<OrderTypesContainer>
 					<OrderTypeSelector
@@ -502,10 +518,12 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 					</TouchableOpacity>
 				</View>
 			)}
-			<OrderProgress
-				{...props}
-				isFocused={isFocused}
-			/>
+			{!hidePreviousOrders && (
+				<OrderProgress
+					{...props}
+					isFocused={isFocused}
+				/>
+			)}
 			{
 				!businessId && !props.franchiseId && featuredBusiness && featuredBusiness.length > 0 && (
 					<FeaturedWrapper>
@@ -538,7 +556,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 					</FeaturedWrapper>
 				)
 			}
-			{!isChewLayout && (
+			{!isChewLayout && !hideHighestBusiness && (
 				<>
 					<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100 }} />
 					{
@@ -558,7 +576,7 @@ const BusinessesListingUI = (props: BusinessesListingParams) => {
 
 			<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100 }} />
 			<ListWrapper style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}>
-				{!businessId && (
+				{!businessId && !isAllCategoriesHidden && (
 					<BusinessTypeFilter
 						images={props.images}
 						businessTypes={props.businessTypes}

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

@@ -70,7 +70,8 @@ const CartUI = (props: any) => {
   const business: any = (orderState?.carts && Object.values(orderState.carts).find((_cart: any) => _cart?.uuid === props.cartuuid)) ?? {}
   const businessId = business?.business_id ?? null
   const placeSpotTypes = [4]
-
+  const hideCartComments = theme?.business_view?.components?.cart?.components?.comments?.hidden
+  const hideCartDiscount = theme?.business_view?.components?.cart?.components?.discount?.hidden
   const driverTipsOptions = typeof configs?.driver_tip_options?.value === 'string'
     ? JSON.parse(configs?.driver_tip_options?.value) || []
     : configs?.driver_tip_options?.value || []
@@ -251,6 +252,7 @@ const CartUI = (props: any) => {
             offsetDisabled={offsetDisabled}
             onDeleteProduct={handleDeleteClick}
             onEditProduct={handleEditProduct}
+            viewString='business_view'
           />
         ))}
 
@@ -262,7 +264,7 @@ const CartUI = (props: any) => {
                 {parsePrice(cart?.subtotal + getIncludedTaxes())}
               </OText>
             </OSTable>
-            {cart?.discount > 0 && cart?.total >= 0 && cart?.offers?.length === 0 && (
+            {!hideCartDiscount && cart?.discount > 0 && cart?.total >= 0 && cart?.offers?.length === 0 && (
               <OSTable>
                 {cart?.discount_type === 1 ? (
                   <OText size={12} lineHeight={18}>
@@ -276,7 +278,7 @@ const CartUI = (props: any) => {
               </OSTable>
             )}
             {
-              cart?.offers?.length > 0 && cart?.offers?.filter((offer: any) => offer?.target === 1)?.map((offer: any, i: number) => (
+              !hideCartDiscount && cart?.offers?.length > 0 && cart?.offers?.filter((offer: any) => offer?.target === 1)?.map((offer: any, i: number) => (
                 <OSTable key={`${offer.id}_${i}`}>
                   <OSRow>
                     <OText size={12} lineHeight={18}>{offer.name}</OText>
@@ -297,7 +299,7 @@ const CartUI = (props: any) => {
               ))
             }
             {/* <Divider /> */}
-            {cart?.subtotal_with_discount > 0 && cart?.discount > 0 && cart?.total >= 0 && (
+            {!hideCartDiscount && cart?.subtotal_with_discount > 0 && cart?.discount > 0 && cart?.total >= 0 && (
               <OSTable>
                 <OText size={12} lineHeight={18} numberOfLines={1}>{t('SUBTOTAL_WITH_DISCOUNT', 'Subtotal with discount')}</OText>
                 {cart?.business?.tax_type === 1 ? (
@@ -363,7 +365,7 @@ const CartUI = (props: any) => {
             {orderState?.options?.type === 1 && cart?.delivery_price > 0 && !hideDeliveryFee && (
               <OSTable>
                 <OText size={12} lineHeight={18}>{t('DELIVERY_FEE', 'Delivery Fee')}</OText>
-                <OText size={12} lineHeight={18}>{parsePrice(cart?.delivery_price_with_discount ?? cart?.delivery_price)}</OText>
+                <OText size={12} lineHeight={18}>{parsePrice(cart?.delivery_price)}</OText>
               </OSTable>
             )}
             {
@@ -474,7 +476,7 @@ const CartUI = (props: any) => {
                 </TouchableOpacity>
               </OSTable>
             )}
-            {cart?.status !== 2 && (
+            {cart?.status !== 2 && !hideCartComments && (
               <OSTable>
                 <View style={{ width: '100%', marginTop: 20 }}>
                   <OText size={16} lineHeight={18}>{t('COMMENTS', 'Comments')}</OText>

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

@@ -155,6 +155,10 @@ const CheckoutUI = (props: any) => {
 	const isWalletEnabled = configs?.cash_wallet?.value && configs?.wallet_enabled?.value === '1' && (isWalletCashEnabled || isWalletCreditPointsEnabled)
 	const isBusinessChangeEnabled = configs?.cart_change_business_validation?.value === '1'
 	const isChewLayout = theme?.header?.components?.layout?.type === 'chew'
+	const hideBusinessAddress = theme?.checkout?.components?.business?.components?.address?.hidden
+	const hideBusinessDetails = theme?.checkout?.components?.business?.hidden
+	const hideBusinessMap = theme?.checkout?.components?.business?.components?.map?.hidden
+	const hideCustomerDetails = theme?.checkout?.components?.customer?.hidden
 
 	const isPreOrder = configs?.preorder_status_enabled?.value === '1'
 	const subtotalWithTaxes = cart?.taxes?.reduce((acc: any, item: any) => {
@@ -353,7 +357,7 @@ const CheckoutUI = (props: any) => {
 						<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginTop: 18, marginHorizontal: -40 }} />
 					</ChSection>
 
-					{!isGiftCardCart && (
+					{!isGiftCardCart && !hideBusinessDetails && (
 						<ChSection>
 							<ChBusinessDetails>
 								{
@@ -384,9 +388,11 @@ const CheckoutUI = (props: any) => {
 												<OText size={12} lineHeight={18} weight={'400'}>
 													{businessDetails?.business?.cellphone}
 												</OText>
-												<OText size={12} lineHeight={18} weight={'400'}>
-													{businessDetails?.business?.address}
-												</OText>
+												{!hideBusinessAddress && (
+													<OText size={12} lineHeight={18} weight={'400'}>
+														{businessDetails?.business?.address}
+													</OText>
+												)}
 											</View>
 										</>
 									)}
@@ -402,33 +408,35 @@ const CheckoutUI = (props: any) => {
 							<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginHorizontal: -40 }} />
 						</ChSection>
 					)}
+					{!hideCustomerDetails && (
 
-					<ChSection>
-						<ChUserDetails>
-							{cartState.loading ? (
-								<Placeholder Animation={Fade}>
-									<PlaceholderLine height={20} />
-									<PlaceholderLine height={12} />
-									<PlaceholderLine height={12} />
-									<PlaceholderLine height={12} style={{ marginBottom: 20 }} />
-								</Placeholder>
-							) : (
-								<UserDetails
-									isUserDetailsEdit={isUserDetailsEdit}
-									HeaderTitle={<HeaderTitle text={t('CUSTOMER_DETAILS', 'Customer Details')} mb={0} />}
-									cartStatus={cart?.status}
-									businessId={cart?.business_id}
-									useValidationFields
-									useDefualtSessionManager
-									useSessionUser
-									isCheckout
-									phoneUpdate={phoneUpdate}
-									togglePhoneUpdate={togglePhoneUpdate}
-								/>
-							)}
-						</ChUserDetails>
-						<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginHorizontal: -40 }} />
-					</ChSection>
+						<ChSection>
+							<ChUserDetails>
+								{cartState.loading ? (
+									<Placeholder Animation={Fade}>
+										<PlaceholderLine height={20} />
+										<PlaceholderLine height={12} />
+										<PlaceholderLine height={12} />
+										<PlaceholderLine height={12} style={{ marginBottom: 20 }} />
+									</Placeholder>
+								) : (
+									<UserDetails
+										isUserDetailsEdit={isUserDetailsEdit}
+										HeaderTitle={<HeaderTitle text={t('CUSTOMER_DETAILS', 'Customer Details')} mb={0} />}
+										cartStatus={cart?.status}
+										businessId={cart?.business_id}
+										useValidationFields
+										useDefualtSessionManager
+										useSessionUser
+										isCheckout
+										phoneUpdate={phoneUpdate}
+										togglePhoneUpdate={togglePhoneUpdate}
+									/>
+								)}
+							</ChUserDetails>
+							<View style={{ height: 8, backgroundColor: theme.colors.backgroundGray100, marginHorizontal: -40 }} />
+						</ChSection>
+					)}
 
 					{options?.type === 1 && !isGiftCardCart && (
 						<DeliveryOptionsContainer>
@@ -509,7 +517,7 @@ const CheckoutUI = (props: any) => {
 						</ChSection>
 					)}
 
-					{!isGiftCardCart && (
+					{!isGiftCardCart && !hideBusinessMap && (
 						<ChSection>
 							<ChAddress>
 								{(businessDetails?.loading || cartState.loading) ? (

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

@@ -13,6 +13,7 @@ import { Header, TitleHeader, Wrapper, QuickMessageContainer, ProfileMessageHead
 import { MessagesParams } from '../../types'
 import { useWindowDimensions } from 'react-native'
 import { useSafeAreaInsets } from 'react-native-safe-area-context'
+import { getLogisticTag } from '../../utils'
 
 const ORDER_STATUS: any = {
 	0: 'ORDER_STATUS_PENDING',
@@ -127,7 +128,7 @@ const MessagesUI = (props: MessagesParams) => {
 			?
 			`${t('ORDER', 'Order')} ${t(message.change.attribute.toUpperCase(), message.change.attribute.replace('_', ' '))} ${t('CHANGED_FROM', 'Changed from')} ${filterSpecialStatus.includes(message.change.attribute) ?
 				`${message.change.old === null ? '0' : message.change.old} ${t('TO', 'to')} ${message.change.new} ${t('MINUTES', 'Minutes')}` :
-				`${message.change.old !== null && t(ORDER_STATUS[parseInt(message.change.old, 10)])} ${t('TO', 'to')} ${t(ORDER_STATUS[parseInt(message.change.new, 10)])}`
+				`${message.change?.attribute !== 'logistic_status' ? message.change.old !== null && t(ORDER_STATUS[parseInt(message.change.old, 10)]) : message.change.old !== null && getLogisticTag(message.change.old)} ${t('TO', 'to')} ${message.change?.attribute !== 'logistic_status' ? t(ORDER_STATUS[parseInt(message.change.new, 10)]) : getLogisticTag(message.change.new)}`
 			}`
 			: message.change.new
 				?
@@ -155,9 +156,9 @@ const MessagesUI = (props: MessagesParams) => {
 					image: message.source,
 					system: message.type === 1,
 					user: {
-						_id: message.author.id,
-						name: message.author.name,
-						avatar: message.author.id !== user.id && type === USER_TYPE.DRIVER ? order?.driver?.photo : order?.business?.logo
+						_id: message.author && message.author.id,
+						name: message.author && message.author.name,
+						avatar: message.author && (message.author.id !== user.id && type === USER_TYPE.DRIVER ? order?.driver?.photo : order?.business?.logo)
 					}
 				});
 			}
@@ -170,9 +171,9 @@ const MessagesUI = (props: MessagesParams) => {
 					image: message.source,
 					system: message.type === 1,
 					user: {
-						_id: message.author.id,
-						name: message.author.name,
-						avatar: message.author.id !== user.id && type === USER_TYPE.DRIVER ? order?.driver?.photo : order?.business?.logo
+						_id: message.author && message.author.id ,
+						name: message.author && message.author.name,
+						avatar: message.author && (message.author.id !== user.id && type === USER_TYPE.DRIVER ? order?.driver?.photo : order?.business?.logo)
 					}
 				});
 			}

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

@@ -65,9 +65,7 @@ const MultiCheckoutUI = (props: any) => {
       paddingLeft: 40,
       paddingRight: 40
     },
-    wrapperNavbar: Platform.OS === 'ios'
-      ? { paddingVertical: 0, paddingHorizontal: 40 }
-      : { paddingVertical: 20, paddingHorizontal: 40 }
+    wrapperNavbar: { paddingHorizontal: 40 }
   })
 
   const [, { showToast }] = useToast();
@@ -150,15 +148,12 @@ const MultiCheckoutUI = (props: any) => {
       <Container noPadding>
         <View style={styles.wrapperNavbar}>
           <NavBar
-            isVertical
             title={t('CHECKOUT', 'Checkout')}
             titleAlign={'center'}
             onActionLeft={() => navigation?.canGoBack() && navigation.goBack()}
             showCall={false}
+            paddingTop={Platform.OS === 'ios' ? 0 : 4}
             btnStyle={{ paddingLeft: 0 }}
-            style={{ marginTop: Platform.OS === 'ios' ? 0 : 30 }}
-            titleWrapStyle={{ paddingHorizontal: 0 }}
-            titleStyle={{ marginRight: 0, marginLeft: 0 }}
           />
         </View>
         <ChContainer style={styles.pagePadding}>

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

@@ -30,15 +30,17 @@ export const MyOrders = (props: any) => {
 
   const notOrderOptions = ['business', 'products']
   const allEmpty = (ordersLength?.activeOrdersLength === 0 && ordersLength?.previousOrdersLength === 0) || ((isEmptyBusinesses || businessOrderIds?.length === 0) && hideOrders)
-  const MyOrdersMenu = [
-    { key: 'orders', value: t('ORDERS', 'Orders') },
-    { key: 'business', value: t('BUSINESS', 'Business') },
-    { key: 'products', value: t('PRODUCTS', 'Products') }
-  ]
+
   const isChewLayout = theme?.header?.components?.layout?.type === 'chew'
   const showNavbar = theme?.bar_menu?.components?.orders?.hidden
   const hideOrdersTheme = theme?.bar_menu?.components?.orders?.hidden
-
+  const hideProductsTab = theme?.orders?.components?.products_tab?.hidden
+  const hideBusinessTab = theme?.orders?.components?.business_tab?.hidden
+  const MyOrdersMenu = [
+    { key: 'orders', value: t('ORDERS', 'Orders'), disabled: false },
+    { key: 'business', value: t('BUSINESS', 'Business'), disabled: hideBusinessTab },
+    { key: 'products', value: t('PRODUCTS', 'Products'), disabled: hideProductsTab }
+  ]
   const goToBack = () => navigation?.canGoBack() && navigation.goBack()
 
   const handleOnRefresh = () => {
@@ -125,7 +127,7 @@ export const MyOrders = (props: any) => {
           showsHorizontalScrollIndicator={false}
           scrollEventThrottle={16}
         >
-          {MyOrdersMenu.filter(option => !hideOrders || option.key !== 'orders').map(option => (
+          {MyOrdersMenu.filter(option => (!hideOrders || option.key !== 'orders') && !option.disabled).map(option => (
             <Tab
               key={option.key}
               onPress={() => setSelectedOption(option.key)}