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

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

@@ -53,6 +53,7 @@ export const MultiOrdersDetailsUI = (props: any) => {
   const [{ configs }] = useConfig()
 
   const isTaxIncludedOnPrice = orders.every((_order: any) => _order.taxes?.length ? _order.taxes?.every((_tax: any) => _tax.type === 1) : true)
+  const deliveryType = orders.find((order: any) => order.delivery_type)?.delivery_type
   const progressBarStyle = configs.multi_business_checkout_progress_bar_style?.value
   const showBarInOrder = ['group', 'both']
   const showBarInIndividual = ['individual', 'both']
@@ -71,7 +72,7 @@ export const MultiOrdersDetailsUI = (props: any) => {
       navigation?.canGoBack() && navigation.goBack();
       return;
     }
-    navigation.navigate('BusinessList');
+    navigation.navigate('BottomTab');
     return true
   }
 
@@ -93,7 +94,7 @@ export const MultiOrdersDetailsUI = (props: any) => {
   }, [])
 
   return (
-    <OrdersDetailsContainer keyboardShouldPersistTaps="handled" contentContainerStyle={{ paddingHorizontal: 40 }}>
+    <OrdersDetailsContainer keyboardShouldPersistTaps="handled" contentContainerStyle={{ paddingHorizontal: 20 }}>
       <View style={{ flexDirection: 'row' }}>
         <OButton
           imgRightSrc={null}
@@ -171,19 +172,23 @@ export const MultiOrdersDetailsUI = (props: any) => {
         ))}
       </Section>
       <Divider />
-      <Section>
-        <OText size={16} lineHeight={24} weight={'500'} color={theme.colors.textNormal} mBottom={20}>
-          {t('DELIVERYA_V21', 'Delivery address')}
-        </OText>
-        {loading ? (
-          <PlaceholderLine height={18} noMargin style={{ borderRadius: 2 }} />
-        ) : (
-          <OText size={12} lineHeight={18} color={theme.colors.textNormal} mBottom={2}>
-            {customer?.address}
-          </OText>
-        )}
-      </Section>
-      <Divider />
+      {deliveryType === 1 && (
+        <>
+          <Section>
+            <OText size={16} lineHeight={24} weight={'500'} color={theme.colors.textNormal} mBottom={20}>
+              {t('DELIVERYA_V21', 'Delivery address')}
+            </OText>
+            {loading ? (
+              <PlaceholderLine height={18} noMargin style={{ borderRadius: 2 }} />
+            ) : (
+              <OText size={12} lineHeight={18} color={theme.colors.textNormal} mBottom={2}>
+                {customer?.address}
+              </OText>
+            )}
+          </Section>
+          <Divider />
+        </>
+      )}
       {loading ? (
         <Placeholder Animation={Fade}>
           <PlaceholderLine

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

@@ -2,13 +2,14 @@ import React, { useState, useEffect } from 'react'
 import { useLanguage } from 'ordering-components/native';
 import { View, StyleSheet, RefreshControl, Platform } from 'react-native';
 import AntDesignIcon from 'react-native-vector-icons/AntDesign'
-
+import { GiftCardOrdersList } from '../GiftCard/GiftCardOrdersList'
 import { OrdersOption } from '../OrdersOption'
 import { HeaderTitle, OButton, OText } from '../shared'
 import { ScrollView } from 'react-native-gesture-handler';
 import { Tab } from './styles'
 import { useTheme } from 'styled-components/native';
 import { Container } from '../../layouts/Container';
+import NavBar from '../NavBar'
 
 export const MyOrders = (props: any) => {
   const {
@@ -40,7 +41,8 @@ export const MyOrders = (props: any) => {
   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 }
+    { key: 'products', value: t('PRODUCTS', 'Products'), disabled: hideProductsTab },
+    { key: 'giftCards', value: t('GIFT_CARD', 'Gift card'), disabled: false }
   ]
   const goToBack = () => navigation?.canGoBack() && navigation.goBack()
 
@@ -87,34 +89,20 @@ export const MyOrders = (props: any) => {
             display: 'flex',
             flexDirection: 'row',
             alignItems: 'center',
-            paddingHorizontal: isChewLayout ? 20 : 40,
+            paddingHorizontal: 20,
           },
           ...props.titleStyle
         }}>
           {!props.hideBackBtn && (!isChewLayout || (isChewLayout && hideOrdersTheme)) && (
-            <OButton
-              imgLeftStyle={{ width: 18 }}
-              imgRightSrc={null}
-              style={{
-                borderWidth: 0,
-                width: 26,
-                height: 26,
-                backgroundColor: '#FFF',
-                borderColor: '#FFF',
-                shadowColor: '#FFF',
-                paddingLeft: 0,
-                paddingRight: 0,
-                marginTop: 30,
-              }}
-              onClick={goToBack}
-              icon={AntDesignIcon}
-              iconProps={{
-                name: 'arrowleft',
-                size: 26
-              }}
+            <NavBar
+              title={t('MY_ORDERS', 'My Orders')}
+              titleAlign={'center'}
+              onActionLeft={goToBack}
+              showCall={false}
+              paddingTop={30}
+              btnStyle={{ paddingLeft: 0 }}
             />
           )}
-          <HeaderTitle ph={10} text={t('MY_ORDERS', 'My Orders')} />
         </View>
       )}
       {!hideOrders && !isChewLayout && !showNavbar && (
@@ -124,7 +112,7 @@ export const MyOrders = (props: any) => {
         <ScrollView
           horizontal
           style={{ ...styles.container, borderBottomWidth: 1 }}
-          contentContainerStyle={{ paddingHorizontal: !!businessesSearchList ? 0 : isChewLayout ? 20 : 40 }}
+          contentContainerStyle={{ paddingHorizontal: !!businessesSearchList ? 0 : 20 }}
           showsHorizontalScrollIndicator={false}
           scrollEventThrottle={16}
         >
@@ -148,7 +136,7 @@ export const MyOrders = (props: any) => {
       )}
       {selectedOption === 'orders' && (
         <>
-          <View style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}>
+          <View style={{ paddingHorizontal: 20 }}>
             <OrdersOption
               {...props}
               preOrders
@@ -158,7 +146,7 @@ export const MyOrders = (props: any) => {
               refreshOrders={refreshOrders}
             />
           </View>
-          <View style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}>
+          <View style={{ paddingHorizontal: 20 }}>
             <OrdersOption
               {...props}
               activeOrders
@@ -168,7 +156,7 @@ export const MyOrders = (props: any) => {
               refreshOrders={refreshOrders}
             />
           </View>
-          <View style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}>
+          <View style={{ paddingHorizontal: 20 }}>
             <OrdersOption
               {...props}
               ordersLength={ordersLength}
@@ -215,7 +203,14 @@ export const MyOrders = (props: any) => {
           setOrdersLength={setOrdersLength}
         />
       )}
+      
+      {selectedOption === 'giftCards' && (
+        <View style={{ paddingHorizontal: 20  }}>
+          <GiftCardOrdersList
+            onNavigationRedirect={props?.onNavigationRedirect}
+          />
+        </View>
+      )}
     </Container>
-
   )
 }

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

@@ -1,3 +1,6 @@
+
+
+
 import * as React from 'react'
 import styled, { useTheme } from 'styled-components/native'
 import { OButton, OIcon, OText } from '../shared'
@@ -92,7 +95,6 @@ const NavBar = (props: Props) => {
 				<TitleWrapper style={{ ...{ paddingHorizontal: props.isVertical ? 0 : 10 }, ...props.titleWrapStyle }}>
 					<OText
 						size={20}
-						lineHeight={36}
 						weight={Platform.OS === 'ios' ? '600' : 'bold'}
 						style={
 							{

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

@@ -1,5 +1,5 @@
 import React from 'react'
-import { useLanguage, useOrderingTheme } from 'ordering-components/native'
+import { useLanguage } from 'ordering-components/native'
 import { Dimensions } from 'react-native'
 import RNRestart from 'react-native-restart'
 import { OText, OIcon, OButton } from '../shared'
@@ -16,8 +16,7 @@ export const NetworkError = (props: NoNetworkParams) => {
   } = props
   const theme = useTheme()
   const [, t] = useLanguage()
-  const [orderingTheme] = useOrderingTheme()
-  const urlimage = orderingTheme?.theme?.no_internet?.components?.image
+  const urlimage = theme?.no_internet?.components?.image
   const noNetworkImage = image || theme.images.general.noNetwork
   const deviceWidth = Dimensions.get('screen').width
 

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

@@ -2,10 +2,10 @@ import styled from 'styled-components/native'
 
 export const Container = styled.View`
   flex: 1;
-  padding: 20px 40px;
+  padding: 20px;
 `
 export const ImageContainer = styled.View`
   flex: 1;
   align-items: center;
   justify-content: center;
-`
+`

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

@@ -3,7 +3,6 @@ import {
 	UserFormDetails as NotificationsController,
 	useLanguage,
 	useSession,
-	useOrderingTheme,
 	useToast,
 	ToastType,
 } from 'ordering-components/native'
@@ -28,7 +27,6 @@ const NotificationsUI = (props: any) => {
 	const [{ user: userSession }] = useSession()
 	const [, t] = useLanguage();
 	const [, { showToast }] = useToast();
-	const [orderingTheme] = useOrderingTheme()
 
 	const user = userData || userSession
 
@@ -45,8 +43,8 @@ const NotificationsUI = (props: any) => {
 	})
 
 	const goToBack = () => navigation?.canGoBack() && navigation.goBack()
-	const showCustomerPromotions = !orderingTheme?.theme?.profile?.components?.promotions?.hidden
-	const showNotifications = !orderingTheme?.theme?.profile?.components?.notification_settings?.hidden
+	const showCustomerPromotions = !theme?.profile?.components?.promotions?.hidden
+	const showNotifications = !theme?.profile?.components?.notification_settings?.hidden
 
 	const handleEditNotifications = (key: any, value: any) => {
 		setNotificationsList({
@@ -75,10 +73,8 @@ const NotificationsUI = (props: any) => {
 				titleAlign={'center'}
 				onActionLeft={goToBack}
 				showCall={false}
-				style={{
-					paddingHorizontal: 40,
-					paddingVertical: 0,
-				}}
+				style={{ paddingVertical: 0 }}
+				btnStyle={{ paddingLeft: 0 }}
 			/>
 			{showCustomerPromotions && showNotifications && (
 				<>

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

@@ -9,7 +9,6 @@ export const Container = styled.ScrollView`
 export const NotificationsGroupSwitchWrapper = styled.View`
   flex-grow: 1;
   justify-content: space-between;
-	padding: 0 20px;
 `
 
 export const SwitchWrapper = styled.View`

package/themes/original/src/components/OrderDetails/OrderHistory.tsx

@@ -33,7 +33,7 @@ export const OrderHistory = (props: any) => {
       paddingVertical: 16
     },
     container: {
-      paddingHorizontal: 40,
+      paddingHorizontal: 20,
       paddingVertical: 15
     }
   });