ordering-ui-react-native 0.16.12 → 0.16.13-release

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

@@ -1,56 +1,206 @@
 import React, { useState, useEffect } from 'react'
 import { useLanguage } from 'ordering-components/native';
-import { View, StyleSheet, Platform, I18nManager } from 'react-native';
+import { View, StyleSheet, RefreshControl, Platform } from 'react-native';
+import AntDesignIcon from 'react-native-vector-icons/AntDesign'
 
 import { OrdersOption } from '../OrdersOption'
-import { OText } from '../shared'
+import { HeaderTitle, OButton, OText } from '../shared'
 import { ScrollView } from 'react-native-gesture-handler';
-
-const PIXELS_TO_SCROLL = 1000;
+import { Tab } from './styles'
+import { useTheme } from 'styled-components/native';
+import { Container } from '../../layouts/Container';
 
 export const MyOrders = (props: any) => {
-  const [, t] = useLanguage();
-  const [loadMore, setLoadMore] = useState(false)
-
+  const {
+    navigation,
+    hideOrders,
+    businessesSearchList
+  } = props
+  const [, t] = useLanguage()
+  const theme = useTheme()
+  const [refreshing] = useState(false);
+  const [refreshOrders, setRefreshOrders] = useState(false)
+  const [isEmptyBusinesses, setIsEmptyBusinesses] = useState(false)
+  const [businessOrderIds, setBusinessOrderIds] = useState([])
   const [ordersLength, setOrdersLength] = useState({
     activeOrdersLength: 0,
     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 MyOrdersMenu = [
+    { key: 'orders', value: t('ORDERS', 'Orders') },
+    { key: 'business', value: t('BUSINESS', 'Business') },
+    { key: 'products', value: t('PRODUCTS', 'Products') }
+  ]
+  const isChewLayout = theme?.business_view?.components?.header?.components?.layout?.type === 'chew'
+
+  const goToBack = () => navigation?.canGoBack() && navigation.goBack()
 
-  const handleScroll = ({ nativeEvent }: any) => {
-		const y = nativeEvent.contentOffset.y
-		const height = nativeEvent.contentSize.height
+  const handleOnRefresh = () => {
+    setRefreshOrders(true);
+  }
 
-    if (y + PIXELS_TO_SCROLL > height ) {
-      setLoadMore(true)
+  const styles = StyleSheet.create({
+    container: {
+      paddingVertical: 5,
+      borderColor: theme.colors.clear,
+      backgroundColor: '#FFF'
+    },
+    featuredStyle: {
+      display: 'none',
+    },
+    tabStyle: {
+      marginTop: 10,
+      height: 4,
+      borderTopStartRadius: 4,
+      borderTopEndRadius: 4,
+      backgroundColor: theme.colors.textPrimary,
+    },
+    tabDeactived: {
+      marginTop: 10,
+      height: 4
     }
-	}
+  });
 
   return (
-    <ScrollView onScroll={(e: any) => handleScroll(e)}>
-      <OText
-        size={20}
-        mBottom={15}
-        style={{ marginTop: 25, paddingHorizontal: 40 }}>
-        {t('MY_ORDERS', 'My Orders')}
-      </OText>
-      <View style={{ paddingLeft: 40, paddingRight: 40 }}>
+    <Container noPadding refreshControl={
+      <RefreshControl
+        refreshing={refreshing}
+        onRefresh={() => handleOnRefresh()}
+      />
+    }>
+      {isChewLayout && (
+        <View style={{
+          width: '100%',
+          display: 'flex',
+          flexDirection: 'row',
+          alignItems: 'center',
+          paddingHorizontal: 40
+        }}>
+          <OText
+              size={24}
+              style={{
+                marginTop: Platform.OS === 'android' ? 50 : 30,
+                paddingHorizontal: 20,
+                textTransform: 'capitalize'
+              }}
+            >
+              <OButton
+                imgLeftStyle={{ width: 18 }}
+                imgRightSrc={null}
+                style={{
+                  borderWidth: 0,
+                  width: 26,
+                  height: 26,
+                  backgroundColor: '#FFF',
+                  borderColor: '#FFF',
+                  shadowColor: '#FFF',
+                  paddingLeft: 0,
+                  paddingRight: 0,
+                }}
+                onClick={goToBack}
+                icon={AntDesignIcon}
+                iconProps={{
+                  name: 'arrowleft',
+                  size: 26
+                }}
+              />
+              {t('MY_ORDERS', 'My Orders')}
+            </OText>
+        </View>
+      )}
+      {!hideOrders && !isChewLayout && (
+        <HeaderTitle text={t('MY_ORDERS', 'My Orders')} />
+      )}
+      {!allEmpty && (
+        <ScrollView
+          horizontal
+          style={{ ...styles.container, borderBottomWidth: 1 }}
+          contentContainerStyle={{ paddingHorizontal: !!businessesSearchList ? 0 : 40 }}
+          showsHorizontalScrollIndicator={false}
+          scrollEventThrottle={16}
+        >
+          {MyOrdersMenu.filter(option => !hideOrders || option.key !== 'orders').map(option => (
+            <Tab
+              key={option.key}
+              onPress={() => setSelectedOption(option.key)}
+              style={
+                {
+                  borderBottomColor:
+                    selectedOption === option.key
+                      ? theme.colors.textNormal
+                      : theme.colors.border,
+                }
+              }
+            >
+              <OText>{option?.value}</OText>
+            </Tab>
+          ))}
+        </ScrollView>
+      )}
+      {selectedOption === 'orders' && (
+        <>
+          <View style={{ paddingLeft: 40, paddingRight: 40 }}>
+            <OrdersOption
+              {...props}
+              activeOrders
+              ordersLength={ordersLength}
+              setOrdersLength={setOrdersLength}
+              setRefreshOrders={setRefreshOrders}
+              refreshOrders={refreshOrders}
+            />
+          </View>
+          <View style={{ paddingLeft: 40, paddingRight: 40 }}>
+            <OrdersOption
+              {...props}
+              ordersLength={ordersLength}
+              setOrdersLength={setOrdersLength}
+              setRefreshOrders={setRefreshOrders}
+              refreshOrders={refreshOrders}
+            />
+          </View>
+        </>
+      )}
+      {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}
-          loadMoreStatus={loadMore}
-          setLoadMoreStatus={setLoadMore}
         />
-      </View>
-      <View style={{ paddingLeft: 40, paddingRight: 40 }}>
+      )}
+      {selectedOption === 'products' && (
         <OrdersOption
           {...props}
+          isProducts
+          titleContent={t('PREVIOUSLY_ORDERED', 'Previously ordered')}
+          hideOrders
+          horizontal
+          activeOrders
+          pastOrders
+          preOrders
+          businessesSearchList={businessesSearchList}
+          setIsEmptyBusinesses={setIsEmptyBusinesses}
+          businessOrderIds={businessOrderIds}
+          setBusinessOrderIds={setBusinessOrderIds}
           ordersLength={ordersLength}
           setOrdersLength={setOrdersLength}
         />
-      </View>
-    </ScrollView>
+      )}
+    </Container>
+
   )
 }

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

@@ -3,4 +3,11 @@ import styled, { css } from 'styled-components/native'
 export const Wrapper = styled.View`
   flex: 1;
   background-color: ${(props: any) => props.theme.colors.white};
-`
+`
+
+export const Tab = styled.TouchableOpacity`
+  padding-horizontal: 10px;
+  padding-vertical: 10px;
+  justify-content: center;
+	border-bottom-width: 1px;
+`

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

@@ -2,6 +2,7 @@ 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;
@@ -61,11 +62,16 @@ 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={props.leftImg}
+				imgLeftStyle={{ width: 18 }}
 				imgRightSrc={null}
 				style={{ ...btnBackArrow, ...props.btnStyle, ...props.isVertical ? (I18nManager.isRTL ? { paddingRight: 0 } : { paddingLeft: 0 }) : {} }}
 				onClick={props?.onActionLeft}
+				icon={AntDesignIcon}
+				iconProps={{
+					name: 'arrowleft',
+					size: 26
+				}}
 			/>
 			<TitleTopWrapper>
 				{props.withIcon
@@ -126,9 +132,9 @@ NavBar.defaultProps = {
 	textAlign: 'center'
 };
 
-const areEqual=(prevProps: { route?: any; }, nextProps: { route?: any; })=>{
-  return prevProps.route === nextProps.route
-  return true
+const areEqual = (prevProps: { route?: any; }, nextProps: { route?: any; }) => {
+	return prevProps.route === nextProps.route
+	return true
 }
 
 export default React.memo(NavBar, areEqual);

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/OrderDetails/OrderHistory.tsx

@@ -0,0 +1,167 @@
+import React from 'react'
+import { useTheme } from 'styled-components/native'
+import { ScrollView, StyleSheet, View } from 'react-native'
+import { useLanguage, useUtils } from 'ordering-components/native'
+import MaterialCommunityIcons from 'react-native-vector-icons/MaterialCommunityIcons'
+import { OText, OButton } from '../shared'
+
+export const OrderHistory = (props: any) => {
+  const {
+    order,
+    messages,
+    enableReview,
+    onClose,
+    handleTriggerReview
+  } = props
+
+  const [, t] = useLanguage()
+  const [{ parseDate }] = useUtils()
+  const theme = useTheme()
+
+  const styles = StyleSheet.create({
+    historyItem: {
+      display: 'flex',
+      alignItems: 'center',
+      flexDirection: 'row',
+      borderBottomWidth: 1,
+      borderColor: theme.colors.border
+    },
+    detailWrapper: {
+      marginLeft: 20,
+      paddingHorizontal: 13,
+      paddingVertical: 16
+    },
+    container: {
+      paddingHorizontal: 40,
+      paddingVertical: 15
+    }
+  });
+
+  const ORDER_STATUS: any = {
+    0: 'ORDER_STATUS_PENDING',
+    1: 'ORDERS_COMPLETED',
+    2: 'ORDER_REJECTED',
+    3: 'ORDER_STATUS_IN_BUSINESS',
+    4: 'ORDER_READY',
+    5: 'ORDER_REJECTED_RESTAURANT',
+    6: 'ORDER_STATUS_CANCELLEDBYDRIVER',
+    7: 'ORDER_STATUS_ACCEPTEDBYRESTAURANT',
+    8: 'ORDER_CONFIRMED_ACCEPTED_BY_DRIVER',
+    9: 'ORDER_PICKUP_COMPLETED_BY_DRIVER',
+    10: 'ORDER_PICKUP_FAILED_BY_DRIVER',
+    11: 'ORDER_DELIVERY_COMPLETED_BY_DRIVER',
+    12: 'ORDER_DELIVERY_FAILED_BY_DRIVER',
+    13: 'PREORDER',
+    14: 'ORDER_NOT_READY',
+    15: 'ORDER_PICKEDUP_COMPLETED_BY_CUSTOMER',
+    16: 'ORDER_STATUS_CANCELLED_BY_CUSTOMER',
+    17: 'ORDER_NOT_PICKEDUP_BY_CUSTOMER',
+    18: 'ORDER_DRIVER_ALMOST_ARRIVED_BUSINESS',
+    19: 'ORDER_DRIVER_ALMOST_ARRIVED_CUSTOMER',
+    20: 'ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS',
+    21: 'ORDER_CUSTOMER_ARRIVED_BUSINESS',
+    22: 'ORDER_LOOKING_FOR_DRIVER',
+      23: 'ORDER_DRIVER_ON_WAY'
+  }
+
+  const getLogisticTagStatus = (status: any) => {
+    switch (status) {
+      case 0:
+        return t('PENDING', 'Pending')
+      case 1:
+        return t('IN_PROGRESS', 'In Progress')
+      case 2:
+        return t('IN_QUEUE', 'In Queue')
+      case 3:
+        return t('EXPIRED', 'Logistic expired')
+      case 4:
+        return t('RESOLVED', 'Resolved')
+      default:
+        return status
+    }
+  }
+
+  const handleReview = () => {
+    if (enableReview) handleTriggerReview()
+    else onClose()
+  }
+
+  return (
+    <ScrollView contentContainerStyle={styles.container}>
+      <OText size={20} style={{ alignSelf: 'center', textAlign: 'center' }} mBottom={10}>
+        {t('DETAILS_OF_ORDER', 'Details of Order_NUMBER_').replace('_NUMBER_', ` # ${order?.id}`)}
+      </OText>
+      {!messages?.loading && order && (
+        <View style={styles.historyItem}>
+          <MaterialCommunityIcons
+            name="checkbox-marked-circle"
+            size={20}
+            color={theme.colors.primary}
+          />
+          <View style={styles.detailWrapper}>
+            <OText
+              size={14}
+              weight='bold'
+              numberOfLines={1}
+              ellipsizeMode='tail'
+            >
+              {t('ORDER_PLACED', 'Order placed')} {' '}
+              {t('VIA', 'Via')}{' '}
+              {order.app_id ? t(order.app_id.toUpperCase(), order.app_id) : t('OTHER', 'Other')}
+            </OText>
+            <OText size={12}>{parseDate(order?.created_at, { outputFormat: 'MMM DD, hh:mm A' })}</OText>
+          </View>
+        </View>
+      )}
+      {messages && messages?.messages.map((message: any, i: number) => message.type === 1 && (
+        <View
+          style={styles.historyItem}
+          key={i}
+        >
+          <MaterialCommunityIcons
+            name="checkbox-marked-circle"
+            size={20}
+            color={theme.colors.primary}
+          />
+          <View style={styles.detailWrapper}>
+            {message.change?.attribute !== 'driver_id' ? (
+              <OText
+                size={14}
+                weight='bold'
+                numberOfLines={1}
+                ellipsizeMode='tail'
+              >
+                {message.change?.attribute === 'logistic_status'
+                  ? getLogisticTagStatus(parseInt(message.change.new, 10))
+                  : t(ORDER_STATUS[parseInt(message.change.new, 10)])
+                }
+              </OText>
+            ) : (
+              <OText
+                size={14}
+                weight='bold'
+                numberOfLines={1}
+                ellipsizeMode='tail'
+              >
+                {message.change.new
+                  ? (`${message.driver?.name} ${!!message.driver?.lastname ? message.driver.lastname : ''} ${t('WAS_ASSIGNED_AS_DRIVER', 'Was assigned as driver')}`)
+                  : t('DRIVER_UNASSIGNED', 'Driver unassigned')}
+              </OText>
+            )}
+            <OText size={12}>{parseDate(message?.created_at, { outputFormat: 'MMM DD, hh:mm A' })}</OText>
+          </View>
+        </View>
+      ))}
+      <OButton
+        text={enableReview ? t('REVIEW_ORDER', 'Review order') : t('CONTINUE', 'Continue')}
+        textStyle={{ fontSize: 14, color: theme.colors.white }}
+        imgRightSrc={theme.images.general.arrow_right}
+        imgRightStyle={{ tintColor: theme.colors.white, right: 5, margin: 5 }}
+        borderColor='transparent'
+        bgColor={theme.colors.primary}
+        style={{ borderRadius: 7.6, borderWidth: 1, height: 44, shadowOpacity: 0, marginBottom: 30, marginTop: 20 }}
+        onClick={() => handleReview()}
+      />
+    </ScrollView>
+  )
+}