ordering-ui-react-native 0.19.0-testing → 0.19.1-release

package/themes/business/src/components/PreviousMessages/index.tsx

@@ -1,17 +1,31 @@
-import React from 'react';
-import { StyleSheet, TouchableOpacity, ScrollView } from 'react-native';
+import React, { useState } from 'react';
+import { StyleSheet, TouchableOpacity, FlatList, RefreshControl } from 'react-native';
 import { useTheme } from 'styled-components/native';
 import { useLanguage, useUtils } from 'ordering-components/native';
 import { Card, Logo, Information, Header, Badge } from './styles';
 import { OIcon, OText } from '../shared';
 import { PreviousMessagesParams } from '../../types';
+import { FooterComponent } from './FooterMessageComponent';
 
 export const PreviousMessages = (props: PreviousMessagesParams) => {
-  const { orders, onNavigationRedirect, setOrders } = props;
+  const {
+    orders,
+    onNavigationRedirect,
+    setOrders,
+    getOrders,
+    pagination,
+    loading,
+    reload,
+    tabs,
+    loadMore,
+    tabsFilter,
+    error
+  } = props;
 
   const [, t] = useLanguage();
   const theme = useTheme();
   const [{ parseDate, optimizeImage }] = useUtils();
+  const [refreshing] = useState(false);
 
   const handlePressOrder = (order: any) => {
     const uuid = order?.id;
@@ -253,63 +267,91 @@ export const PreviousMessages = (props: PreviousMessagesParams) => {
       fontStyle: 'normal',
       fontWeight: 'normal',
       color: theme.colors.orderTypeColor,
-    },
+    }
   });
 
-  return (
-    <>
-      {orders?.length > 0 &&
-        orders?.map((order: any) => (
-          <TouchableOpacity
-            key={order?.id}
-            onPress={() => handlePressOrder(order)}
-            style={styles.cardButton}
-            activeOpacity={1}>
-            <Card key={order?.id}>
-              <Logo style={styles.logo}>
-                <OIcon
-                  url={optimizeImage(order?.business?.logo, 'h_300,c_limit')}
-                  src={!order?.business?.logo && theme?.images?.dummies?.businessLogo}
-                  style={styles.icon}
-                />
-              </Logo>
-              <Information>
-                <Header>
-                  <OText numberOfLines={1} style={styles.title}>
-                    {order?.business?.name}
-                  </OText>
+  const MessageComponent = (props : any) => {
+    const order = props.item
+    return (
+      <>
+        {!reload &&
+          !error &&
+          JSON.stringify(tabsFilter) === JSON.stringify(tabs[0].tags) && (
+            <TouchableOpacity
+              key={order?.id}
+              onPress={() => handlePressOrder(order)}
+              style={styles.cardButton}
+              activeOpacity={1}>
+              <Card key={order?.id}>
+                <Logo style={styles.logo}>
+                  <OIcon
+                    url={optimizeImage(order?.business?.logo, 'h_300,c_limit')}
+                    src={!order?.business?.logo && theme?.images?.dummies?.businessLogo}
+                    style={styles.icon}
+                  />
+                </Logo>
+                <Information>
+                  <Header>
+                    <OText numberOfLines={1} style={styles.title}>
+                      {order?.business?.name}
+                    </OText>
 
-                  {order?.unread_count > 0 && (
-                    <Badge>
-                      <OText size={14} style={styles.badge}>
-                        {order?.unread_count}
-                      </OText>
-                    </Badge>
-                  )}
-                </Header>
+                    {order?.unread_count > 0 && (
+                      <Badge>
+                        <OText size={14} style={styles.badge}>
+                          {order?.unread_count}
+                        </OText>
+                      </Badge>
+                    )}
+                  </Header>
 
-                <OText
-                  style={styles.date}
-                  numberOfLines={1}
-                  adjustsFontSizeToFit
-                  size={20}>
-                  {t('INVOICE_ORDER_NO', 'Order No.') + order.id + ' · '}
-                  {order?.delivery_datetime_utc
-                    ? parseDate(order?.delivery_datetime_utc)
-                    : parseDate(order?.delivery_datetime, { utc: false })}
-                </OText>
+                  <OText
+                    style={styles.date}
+                    numberOfLines={1}
+                    adjustsFontSizeToFit
+                    size={20}>
+                    {t('INVOICE_ORDER_NO', 'Order No.') + order.id + ' · '}
+                    {order?.delivery_datetime_utc
+                      ? parseDate(order?.delivery_datetime_utc)
+                      : parseDate(order?.delivery_datetime, { utc: false })}
+                  </OText>
 
-                <OText
-                  style={styles.orderType}
-                  mRight={5}
-                  numberOfLines={1}
-                  adjustsFontSizeToFit>
-                  {getOrderStatus(order?.status)?.value}
-                </OText>
-              </Information>
-            </Card>
-          </TouchableOpacity>
-        ))}
+                  <OText
+                    style={styles.orderType}
+                    mRight={5}
+                    numberOfLines={1}
+                    adjustsFontSizeToFit>
+                    {getOrderStatus(order?.status)?.value}
+                  </OText>
+                </Information>
+              </Card>
+            </TouchableOpacity>
+          )}
+      </>
+    )
+  }
+
+  return (
+    <>
+      <FlatList
+        data={orders}
+        renderItem={MessageComponent}
+        keyExtractor={(order) => order?.id}
+        showsVerticalScrollIndicator={false}
+        style={{ flex: 1 }}
+        refreshControl={<RefreshControl
+          refreshing={refreshing}
+          onRefresh={() => getOrders?.()}
+        />}
+        ListFooterComponent={<FooterComponent
+          loading={loading}
+          reload={reload}
+          pagination={pagination}
+          tabsFilter={tabsFilter}
+          tabs={tabs}
+          loadMore={loadMore}
+        />}
+      />
     </>
   );
 };

package/themes/business/src/components/PreviousOrders/OrderItem.tsx

@@ -21,7 +21,13 @@ import { DeviceOrientationMethods } from '../../../../../src/hooks/DeviceOrienta
 
 const { useDeviceOrientation, PORTRAIT } = DeviceOrientationMethods
 
-export const OrderItem = (props: any) => {
+function OrderItemPropsAreEqual(prevProps: any, nextProps: any) {
+  return JSON.stringify(prevProps.order) === JSON.stringify(nextProps.order) &&
+    JSON.stringify(prevProps._order) === JSON.stringify(nextProps._order) &&
+    prevProps.currentTabSelected === nextProps.currentTabSelected
+}
+
+export const OrderItem = React.memo((props: any) => {
   const {
     order,
     _order,
@@ -94,12 +100,13 @@ export const OrderItem = (props: any) => {
   });
 
   const getDelayMinutes = (order: any) => {
-    const cdtToutc = moment(order?.delivery_datetime).utc().format('YYYY-MM-DD HH:mm:ss')
+    const offset = 300
+    const cdtToutc = moment(order?.delivery_datetime).add(offset, 'minutes').format('YYYY-MM-DD HH:mm:ss')
     const _delivery = order?.delivery_datetime_utc
-      ? parseDate(order?.delivery_datetime_utc, { outputFormat: 'YYYY-MM-DD hh:mm A' })
-      : parseDate(cdtToutc, { outputFormat: 'YYYY-MM-DD hh:mm A' })
+      ? parseDate(order?.delivery_datetime_utc, { outputFormat: 'YYYY-MM-DD HH:mm:ss' })
+      : parseDate(cdtToutc, { outputFormat: 'YYYY-MM-DD HH:mm:ss' })
     const _eta = order?.eta_time
-    const diffTimeAsSeconds = moment(_delivery, 'YYYY-MM-DD hh:mm A').add(_eta, 'minutes').diff(moment().utc(), 'seconds')
+    const diffTimeAsSeconds = moment(_delivery).add(_eta, 'minutes').diff(moment().utc(), 'seconds')
     return Math.ceil(diffTimeAsSeconds / 60)
   }
 
@@ -121,12 +128,6 @@ export const OrderItem = (props: any) => {
     return finalTaget
   }
 
-  const getStatusClassName = (minutes: number) => {
-    if (isNaN(Number(minutes))) return 'in_time'
-    const delayTime = configState?.configs?.order_deadlines_delayed_time?.value
-    return minutes > 0 ? 'in_time' : Math.abs(minutes) <= delayTime ? 'at_risk' : 'delayed'
-  }
-
   useEffect(() => {
     const slaSettings = configState?.configs?.order_deadlines_enabled?.value === '1'
     setAllowColumns({
@@ -146,15 +147,7 @@ export const OrderItem = (props: any) => {
       <Card key={order.id}>
         {!!allowColumns?.slaBar && (
           <Timestatus
-            style={{
-              backgroundColor: getStatusClassName(getDelayMinutes(order)) === 'in_time'
-                ? '#00D27A'
-                : getStatusClassName(getDelayMinutes(order)) === 'at_risk'
-                  ? '#FFC700'
-                  : getStatusClassName(getDelayMinutes(order)) === 'delayed'
-                    ? '#E63757'
-                    : ''
-            }}
+            timeState={order?.time_status}
           />
         )}
         <Logo style={styles.logo}>
@@ -195,11 +188,11 @@ export const OrderItem = (props: any) => {
               adjustsFontSizeToFit
             >
               {(!!order?.order_group_id && order?.order_group && isLogisticOrder
-                  ? `${order?.order_group?.orders?.length} ${t('ORDERS', 'Orders')}`
-                  : (t('NO', 'Order No.') + order.id)
-                ) + ' · '}
+                ? `${order?.order_group?.orders?.length} ${t('ORDERS', 'Orders')}`
+                : (t('NO', 'Order No.') + order.id)
+              ) + ' · '}
               {order?.delivery_datetime_utc
-                ? parseDate(order?.delivery_datetime_utc, { outputFormat: 'MM/DD/YY · HH:mm a' })
+                ? parseDate(order?.delivery_datetime_utc)
                 : parseDate(order?.delivery_datetime, { utc: false })}
             </OText>
             {((currentTabSelected === 'pending' || currentTabSelected === 'inProgress') && allowColumns?.timer) && (
@@ -208,11 +201,11 @@ export const OrderItem = (props: any) => {
                 <OText
                   style={styles.date}
                   color={
-                    getStatusClassName(getDelayMinutes(order)) === 'in_time'
+                    order?.time_status === 'in_time'
                       ? '#00D27A'
-                      : getStatusClassName(getDelayMinutes(order)) === 'at_risk'
+                      : order?.time_status === 'at_risk'
                         ? '#FFC700'
-                        : getStatusClassName(getDelayMinutes(order)) === 'delayed'
+                        : order?.time_status === 'delayed'
                           ? '#E63757'
                           : ''}
                 >
@@ -246,4 +239,4 @@ export const OrderItem = (props: any) => {
       </Card>
     </TouchableOpacity>
   )
-}
+}, OrderItemPropsAreEqual)

package/themes/business/src/components/PreviousOrders/OrderList.tsx

@@ -0,0 +1,93 @@
+import React from 'react'
+import { View } from 'react-native'
+import { useTheme } from 'styled-components/native'
+import { OButton } from '../shared';
+import { useLanguage, useConfig } from 'ordering-components/native'
+import { OrderItem } from './OrderItem';
+import { AcceptOrRejectOrder as AcceptOrRejectOrderStyle } from './styles';
+
+function OrderListPropsAreEqual(prevProps: any, nextProps: any) {
+	return JSON.stringify(prevProps.order) === JSON.stringify(nextProps.order) &&
+        JSON.stringify(prevProps._order) === JSON.stringify(nextProps._order) &&
+        JSON.stringify(prevProps.currentOrdenSelected) === JSON.stringify(nextProps.currentOrdenSelected) &&
+        prevProps.currentTabSelected === nextProps.currentTabSelected
+}
+
+export const OrdersList = React.memo((props: any) => {
+    const {
+        order,
+        _order,
+        hideBtns,
+        currentOrdenSelected,
+        isLogisticOrder,
+        handlePressOrder,
+        currentTabSelected,
+        getOrderStatus,
+        handleClickLogisticOrder
+    } = props
+
+    const theme = useTheme()
+    const [, t] = useLanguage()
+    const [{ configs }] = useConfig();
+
+    const isHideRejectButtons = configs?.reject_orders_enabled && configs?.reject_orders_enabled?.value !== '1'
+
+    return (
+        <View
+            style={{
+                backgroundColor: currentOrdenSelected === order?.id ? theme.colors.gray100 : order?.locked && isLogisticOrder ? '#ccc' : '#fff',
+                marginBottom: isLogisticOrder ? 10 : 0
+            }}
+        >
+            <OrderItem
+                order={order}
+                _order={_order}
+                isLogisticOrder={isLogisticOrder}
+                handlePressOrder={handlePressOrder}
+                currentTabSelected={currentTabSelected}
+                getOrderStatus={getOrderStatus}
+            />
+            {isLogisticOrder && !hideBtns && (
+                <AcceptOrRejectOrderStyle>
+                    {!!order?.order_group_id && !!order?.order_group ? (
+                        <OButton
+                            text={t('VIEW_ORDER', 'View order')}
+                            onClick={() => handlePressOrder({ ...order, logistic_order_id: _order?.id })}
+                            bgColor={theme.colors.blueLight}
+                            borderColor={theme.colors.blueLight}
+                            imgRightSrc={null}
+                            style={{ borderRadius: 7, height: 40 }}
+                            parentStyle={{ width: '100%' }}
+                            textStyle={{ color: theme?.colors?.white }}
+                        />
+                    ) : (
+                        <>
+                            {!isHideRejectButtons && (
+                                <OButton
+                                    text={t('REJECT', 'Reject')}
+                                    onClick={() => handleClickLogisticOrder(2, _order?.id)}
+                                    bgColor={theme.colors.red}
+                                    borderColor={theme.colors.red}
+                                    imgRightSrc={null}
+                                    style={{ borderRadius: 7, height: 40 }}
+                                    parentStyle={{ width: '45%' }}
+                                    textStyle={{ color: theme.colors.white }}
+                                />
+                            )}
+                            <OButton
+                                text={t('ACCEPT', 'Accept')}
+                                onClick={() => handleClickLogisticOrder(1, _order?.id)}
+                                bgColor={theme.colors.green}
+                                borderColor={theme.colors.green}
+                                imgRightSrc={null}
+                                style={{ borderRadius: 7, height: 40 }}
+                                parentStyle={{ width: isHideRejectButtons ? '100%' : '45%' }}
+                                textStyle={{ color: theme.colors.white }}
+                            />
+                        </>
+                    )}
+                </AcceptOrRejectOrderStyle>
+            )}
+        </View>
+    )
+}, OrderListPropsAreEqual)

package/themes/business/src/components/PreviousOrders/OrdersGroupedItem.tsx

@@ -88,7 +88,7 @@ export const OrdersGroupedItem = (props: any) => {
                 adjustsFontSizeToFit
               >
                 {orders[0]?.delivery_datetime_utc
-                  ? parseDate(orders[0]?.delivery_datetime_utc, { outputFormat: 'MM/DD/YY · HH:mm a' })
+                  ? parseDate(orders[0]?.delivery_datetime_utc)
                   : parseDate(orders[0]?.delivery_datetime, { utc: false })}
               </OText>
             </View>