ordering-ui-react-native 0.16.69 → 0.16.70-release

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

@@ -1,9 +1,10 @@
 import React, { useState, useEffect } from 'react'
 import { useLanguage } from 'ordering-components/native';
-import { View, StyleSheet, RefreshControl } from 'react-native';
+import { View, StyleSheet, RefreshControl, Platform } from 'react-native';
+import AntDesignIcon from 'react-native-vector-icons/AntDesign'
 
 import { OrdersOption } from '../OrdersOption'
-import { HeaderTitle, OText } from '../shared'
+import { HeaderTitle, OButton, OText } from '../shared'
 import { ScrollView } from 'react-native-gesture-handler';
 import { Tab } from './styles'
 import { useTheme } from 'styled-components/native';
@@ -11,6 +12,7 @@ import { Container } from '../../layouts/Container';
 
 export const MyOrders = (props: any) => {
   const {
+    navigation,
     hideOrders,
     businessesSearchList
   } = props
@@ -21,18 +23,25 @@ export const MyOrders = (props: any) => {
   const [isEmptyBusinesses, setIsEmptyBusinesses] = useState(false)
   const [businessOrderIds, setBusinessOrderIds] = useState([])
   const [ordersLength, setOrdersLength] = useState({
-    activeOrdersLength: 0,
+    activeOrdersLength: null,
     previousOrdersLength: 0,
   });
   const [selectedOption, setSelectedOption] = useState(!hideOrders ? 'orders' : 'business')
 
   const notOrderOptions = ['business', 'products']
   const allEmpty = (ordersLength?.activeOrdersLength === 0 && ordersLength?.previousOrdersLength === 0) || ((isEmptyBusinesses || businessOrderIds?.length === 0) && hideOrders)
+
+  const isChewLayout = theme?.header?.components?.layout?.type?.toLowerCase() === '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') },
-    { key: 'business', value: t('BUSINESS', 'Business') },
-    { key: 'products', value: t('PRODUCTS', 'Products') }
+    { 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 = () => {
     setRefreshOrders(true);
@@ -61,24 +70,64 @@ export const MyOrders = (props: any) => {
   });
 
   return (
-    <Container noPadding refreshControl={
-      <RefreshControl
-        refreshing={refreshing}
-        onRefresh={() => handleOnRefresh()}
-      />
-    }>
-      {!hideOrders && (
+    <Container
+      noPadding
+      refreshControl={
+        <RefreshControl
+          refreshing={refreshing}
+          onRefresh={() => handleOnRefresh()}
+        />
+      }
+    >
+      {(isChewLayout || showNavbar) && (
+        <View style={{
+          ...{
+            width: '100%',
+            display: 'flex',
+            flexDirection: 'row',
+            alignItems: 'center',
+            paddingHorizontal: isChewLayout ? 20 : 40,
+          },
+          ...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
+              }}
+            />
+          )}
+          <HeaderTitle ph={10} text={t('MY_ORDERS', 'My Orders')} />
+        </View>
+      )}
+      {!hideOrders && !isChewLayout && !showNavbar && (
         <HeaderTitle text={t('MY_ORDERS', 'My Orders')} />
       )}
       {!allEmpty && (
         <ScrollView
           horizontal
           style={{ ...styles.container, borderBottomWidth: 1 }}
-          contentContainerStyle={{ paddingHorizontal: !!businessesSearchList ? 0 : 40 }}
+          contentContainerStyle={{ paddingHorizontal: !!businessesSearchList ? 0 : isChewLayout ? 20 : 40 }}
           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)}
@@ -98,7 +147,7 @@ export const MyOrders = (props: any) => {
       )}
       {selectedOption === 'orders' && (
         <>
-          <View style={{ paddingLeft: 40, paddingRight: 40 }}>
+          <View style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}>
             <OrdersOption
               {...props}
               activeOrders
@@ -108,7 +157,7 @@ export const MyOrders = (props: any) => {
               refreshOrders={refreshOrders}
             />
           </View>
-          <View style={{ paddingLeft: 40, paddingRight: 40 }}>
+          <View style={{ paddingHorizontal: isChewLayout ? 20 : 40 }}>
             <OrdersOption
               {...props}
               ordersLength={ordersLength}
@@ -119,14 +168,31 @@ export const MyOrders = (props: any) => {
           </View>
         </>
       )}
-      {notOrderOptions.includes(selectedOption) && (
+      {selectedOption === 'business' && (
+        <OrdersOption
+          {...props}
+          isBusiness
+          titleContent={t('PREVIOUSLY_ORDERED', 'Previously ordered')}
+          hideOrders
+          horizontal
+          activeOrders
+          pastOrders
+          preOrders
+          businessesSearchList={businessesSearchList}
+          setIsEmptyBusinesses={setIsEmptyBusinesses}
+          businessOrderIds={businessOrderIds}
+          setBusinessOrderIds={setBusinessOrderIds}
+          ordersLength={ordersLength}
+          setOrdersLength={setOrdersLength}
+        />
+      )}
+      {selectedOption === 'products' && (
         <OrdersOption
           {...props}
+          isProducts
           titleContent={t('PREVIOUSLY_ORDERED', 'Previously ordered')}
           hideOrders
           horizontal
-          isBusiness={selectedOption === 'business'}
-          isProducts={selectedOption === 'products'}
           activeOrders
           pastOrders
           preOrders

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

@@ -2,13 +2,14 @@ import * as React from 'react'
 import styled, { useTheme } from 'styled-components/native'
 import { OButton, OIcon, OText } from '../shared'
 import { Platform, TextStyle, ViewStyle, I18nManager, TouchableOpacity } from 'react-native'
+import AntDesignIcon from 'react-native-vector-icons/AntDesign'
 
 const TitleWrapper = styled.View`
   flex-direction: column;
   padding-horizontal: 10px;
 `
 const TitleTopWrapper = styled.View`
-  flex-grow: 1;
+  flex: 1;
   flex-direction: row;
   align-items: center;
 `
@@ -39,7 +40,8 @@ interface Props {
 	style?: ViewStyle,
 	titleWrapStyle?: ViewStyle,
 	paddingTop?: number,
-	isVertical?: boolean
+	isVertical?: boolean,
+	noMargin?: any
 }
 
 const NavBar = (props: Props) => {
@@ -61,8 +63,8 @@ const NavBar = (props: Props) => {
 	return (
 		<Wrapper style={{ paddingTop: props.paddingTop, ...{ flexDirection: props.isVertical ? 'column' : 'row', alignItems: props.isVertical ? 'flex-start' : 'center' }, ...props.style }}>
 			<OButton
-				imgLeftSrc={props.leftImg || theme.images.general.arrow_left}
-				imgLeftStyle={{ width: 18 }}
+				imgLeftSrc={theme.images.general.arrow_left}
+				imgLeftStyle={{ width: 26 }}
 				imgRightSrc={null}
 				style={{ ...btnBackArrow, ...props.btnStyle, ...props.isVertical ? (I18nManager.isRTL ? { paddingRight: 0 } : { paddingLeft: 0 }) : {} }}
 				onClick={props?.onActionLeft}
@@ -90,10 +92,9 @@ const NavBar = (props: Props) => {
 						style={
 							{
 								textAlign: props.titleAlign ? props.titleAlign : 'center',
-								marginRight: props.showCall ? 0 : 40,
+								marginRight: (props.showCall || !!props.noMargin) ? 0 : 40,
 								color: props.titleColor || theme.colors.textNormal,
 								paddingHorizontal: props.titleAlign == 'left' ? 12 : 0,
-								width: '100%',
 								...props.titleStyle,
 							}
 						}

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

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

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

@@ -20,12 +20,13 @@ export const NotFoundSource = (props: NotFoundSourceParams) => {
 	const theme = useTheme();
 
 	const errorImage = image || theme.images.general.notFound
+	const isUrl = typeof errorImage === 'string' && errorImage.includes('http')
 
 	return (
 		<NotFound>
 			{errorImage && (
 				<NotFoundImage>
-					<OIcon src={errorImage} width={260} height={220} />
+					<OIcon url={isUrl && errorImage} src={!isUrl && errorImage} width={260} height={220} />
 				</NotFoundImage>
 			)}
 			{content && conditioned && !errorImage && <OText color={theme.colors.disabled} size={18} style={{ textAlign: 'center' }}>{content}</OText>}

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

@@ -0,0 +1,144 @@
+import React, { useEffect } from 'react'
+import {
+	UserFormDetails as NotificationsController,
+	useLanguage,
+	useSession,
+	useOrderingTheme,
+	useToast,
+	ToastType,
+} from 'ordering-components/native'
+import { NotificationsGroupSwitchWrapper, SwitchWrapper, Container } from './styles'
+import { StyleSheet, View } from 'react-native'
+import { useState } from 'react'
+import { useTheme } from 'styled-components/native';
+import Spinner from 'react-native-loading-spinner-overlay';
+import ToggleSwitch from 'toggle-switch-react-native'
+import NavBar from '../NavBar'
+import { OText } from '../shared'
+
+const NotificationsUI = (props: any) => {
+	const {
+		navigation,
+		singleNotifications,
+		handleChangePromotions,
+		userData
+	} = props
+
+	const theme = useTheme();
+	const [{ user: userSession }] = useSession()
+	const [, t] = useLanguage();
+	const [, { showToast }] = useToast();
+	const [orderingTheme] = useOrderingTheme()
+
+	const user = userData || userSession
+
+	const [notificationsList, setNotificationsList] = useState({
+		email: singleNotifications?.result?.result
+			? !!singleNotifications?.result?.result?.settings?.email?.newsletter
+			: !!(singleNotifications?.changes?.settings?.email?.newsletter ?? (user && user?.settings?.email?.newsletter)),
+		sms: singleNotifications?.result?.result
+			? !!singleNotifications?.result?.result?.settings?.sms?.newsletter
+			: !!(singleNotifications?.changes?.settings?.sms?.newsletter ?? (user && user?.settings?.sms?.newsletter)),
+		notification: singleNotifications?.result?.result
+			? !!singleNotifications?.result?.result?.settings?.notification?.newsletter
+			: !!(singleNotifications?.changes?.settings?.notification?.newsletter ?? (user && user?.settings?.notification?.newsletter))
+	})
+
+	const goToBack = () => navigation?.canGoBack() && navigation.goBack()
+	const showCustomerPromotions = !orderingTheme?.theme?.profile?.components?.promotions?.hidden
+	const showNotifications = !orderingTheme?.theme?.profile?.components?.notification_settings?.hidden
+
+	const handleEditNotifications = (key: any, value: any) => {
+		setNotificationsList({
+			...notificationsList,
+			[key]: value
+		})
+	}
+
+	useEffect(() => {
+		if (singleNotifications.result.result && !singleNotifications.loading) {
+			if (!singleNotifications.result?.error) {
+				showToast(ToastType.Success, t('UPDATE_SUCCESSFULLY', 'Update successfully'));
+			}
+		}
+	}, [singleNotifications.result])
+
+	useEffect(() => {
+		const isSingle = true
+		handleChangePromotions(notificationsList, isSingle)
+	}, [notificationsList])
+
+	return (
+		<Container>
+			<NavBar
+				title={t('NOTIFICATIONS', 'Notifications')}
+				titleAlign={'center'}
+				onActionLeft={goToBack}
+				showCall={false}
+				style={{
+					paddingHorizontal: 40,
+					paddingVertical: 0,
+				}}
+			/>
+			{showCustomerPromotions && showNotifications && (
+				<>
+					<Spinner visible={singleNotifications?.loading} />
+					<NotificationsGroupSwitchWrapper>
+						<OText style={{ ...styles.title }}>{t('MARKETING_NOTIFICATIONS', 'Marketing Notifications')}</OText>
+						<SwitchWrapper>
+							<OText>{t('EMAILS', 'Emails')}</OText>
+							<ToggleSwitch
+								isOn={notificationsList?.email}
+								onColor={theme.colors.primary}
+								size="small"
+								disabled={singleNotifications?.loading}
+								offColor={theme.colors.disabled}
+								animationSpeed={400}
+								onToggle={() => handleEditNotifications('email', !notificationsList?.email)}
+							/>
+						</SwitchWrapper>
+						<SwitchWrapper>
+							<OText>{t('SMS', 'Sms')}</OText>
+							<ToggleSwitch
+								isOn={notificationsList?.sms}
+								onColor={theme.colors.primary}
+								size="small"
+								disabled={singleNotifications?.loading}
+								offColor={theme.colors.disabled}
+								animationSpeed={400}
+								onToggle={() => handleEditNotifications('sms', !notificationsList?.sms)}
+							/>
+						</SwitchWrapper>
+						<SwitchWrapper>
+							<OText>{t('PUSH_NOTIFICATIONS', 'Push Notifications')}</OText>
+							<ToggleSwitch
+								isOn={notificationsList?.notification}
+								onColor={theme.colors.primary}
+								size="small"
+								disabled={singleNotifications?.loading}
+								offColor={theme.colors.disabled}
+								animationSpeed={400}
+								onToggle={() => handleEditNotifications('notification', !notificationsList?.notification)}
+							/>
+						</SwitchWrapper>
+					</NotificationsGroupSwitchWrapper>
+				</>
+			)}
+		</Container>
+	)
+}
+
+const styles = StyleSheet.create({
+	title: {
+		marginBottom: 24,
+		fontWeight: 'bold',
+	}
+});
+
+export const NotificationsList = (props: any) => {
+	const notificationsListProps = {
+		...props,
+		UIComponent: NotificationsUI
+	}
+	return <NotificationsController {...notificationsListProps} />
+}

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

@@ -0,0 +1,20 @@
+import styled from 'styled-components/native'
+
+export const Container = styled.ScrollView`
+    position: relative;
+    flex: 1;
+	  padding: 20px;
+`
+
+export const NotificationsGroupSwitchWrapper = styled.View`
+  flex-grow: 1;
+  justify-content: space-between;
+	padding: 0 20px;
+`
+
+export const SwitchWrapper = styled.View`
+  flex-direction: row;
+	justify-content: space-between;
+	align-items: center;
+	margin-bottom: 12px;
+`