ordering-ui-react-native 0.22.2 → 0.22.3-release

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

@@ -47,6 +47,7 @@ export const OrderItem = React.memo((props: any) => {
     timer: configState?.configs?.order_deadlines_enabled?.value === '1',
     slaBar: configState?.configs?.order_deadlines_enabled?.value === '1',
   })
+  const showExternalId = configState?.configs?.change_order_id?.value === '1'
 
   const IS_PORTRAIT = orientationState.orientation === PORTRAIT
   const platformIOS = Platform as PlatformIOSStatic
@@ -57,9 +58,14 @@ export const OrderItem = React.memo((props: any) => {
   const styles = StyleSheet.create({
     cardButton: {
       flex: 1,
-      paddingVertical: (isIpad || isTablet) ? 20 : 0,
-      marginBottom: IS_PORTRAIT ? 25 : 0,
+      paddingVertical: (isIpad || isTablet) ? 20 : 15,
+      marginBottom: IS_PORTRAIT ? 15 : 0,
       marginLeft: 3,
+      backgroundColor: order?.time_status === 'delayed'
+        ? theme.colors.danger100
+        : order?.time_status === 'at_risk'
+          ? theme.colors.warning100
+          : '#fff'
     },
     icon: {
       borderRadius: 7.6,
@@ -76,7 +82,6 @@ export const OrderItem = React.memo((props: any) => {
       marginLeft: 3,
     },
     title: {
-      marginBottom: 6,
       fontFamily: 'Poppins',
       fontStyle: 'normal',
       fontWeight: '600',
@@ -84,7 +89,6 @@ export const OrderItem = React.memo((props: any) => {
       color: theme.colors.textGray,
     },
     date: {
-      marginBottom: 6,
       fontFamily: 'Poppins',
       fontStyle: 'normal',
       fontWeight: 'normal',
@@ -120,7 +124,7 @@ export const OrderItem = React.memo((props: any) => {
     let restHours: string | number = Math.floor(restMinOfTargetedMin / 60)
     let restMins: string | number = restMinOfTargetedMin - 60 * restHours
     // make standard time format
-    day = day === 0 ? '' : day + 'day  '
+    day = day === 0 ? '' : `${day + ' ' + t('DAY', 'day') + ' '}`
     restHours = restHours < 10 ? '0' + restHours : restHours
     restMins = restMins < 10 ? '0' + restMins : restMins
 
@@ -154,7 +158,8 @@ export const OrderItem = React.memo((props: any) => {
             style={styles.icon}
             source={order.business?.logo?.includes('https') ? {
               uri: order.business?.logo,
-              priority: FastImage.priority.normal,
+              priority: FastImage.priority.high,
+              cache: FastImage.cacheControl.immutable
             } : order.business?.logo ?? theme?.images?.dummies?.businessLogo}
             resizeMode={FastImage.resizeMode.cover}
           />
@@ -179,24 +184,36 @@ export const OrderItem = React.memo((props: any) => {
               />
             </NotificationIcon>
           )}
-          <View style={{ flexDirection: 'row', flexWrap: 'wrap' }}>
-            <OText
+          <View>
+            {!order?.order_group_id && showExternalId && !order?.order_group && (
+              <OText
+                style={styles.date}
+                color={theme.colors.unselectText}
+                numberOfLines={1}
+                adjustsFontSizeToFit
+              >
+                {`${order?.external_id ?? t('NO_EXTERNAL_ID', 'No external Id ') + t('NO', 'Order No.') + order?.id}` + ' · ' + `${order?.delivery_datetime_utc
+                  ? parseDate(order?.delivery_datetime_utc)
+                  : parseDate(order?.delivery_datetime, { utc: false })
+                  }`}
+              </OText>
+            )}
+            {!showExternalId && (<OText
               style={styles.date}
               color={theme.colors.unselectText}
               numberOfLines={1}
               adjustsFontSizeToFit
             >
-              {(!!order?.order_group_id && order?.order_group && isLogisticOrder
+              {((!!order?.order_group_id && order?.order_group && isLogisticOrder
                 ? `${order?.order_group?.orders?.length} ${t('ORDERS', 'Orders')}`
-                : (t('NO', 'Order No.') + order.id)
-              ) + ' · '}
-              {order?.delivery_datetime_utc
+                : (t('NO', 'Order No.') + order?.id)
+              ) + ' · ' + `${order?.delivery_datetime_utc
                 ? parseDate(order?.delivery_datetime_utc)
-                : parseDate(order?.delivery_datetime, { utc: false })}
+                : parseDate(order?.delivery_datetime, { utc: false })}`)}
             </OText>
-            {((currentTabSelected === 'pending' || currentTabSelected === 'inProgress') && allowColumns?.timer) && (
+            )}
+            {((currentTabSelected === 'pending' || currentTabSelected === 'inProgress' || currentTabSelected === 'active') && allowColumns?.timer) && (
               <>
-                <OText> · </OText>
                 <OText
                   style={styles.date}
                   color={
@@ -229,7 +246,13 @@ export const OrderItem = React.memo((props: any) => {
                       ? t('EAT_IN', 'Eat in')
                       : order.delivery_type === 4
                         ? t('CURBSIDE', 'Curbside')
-                        : t('DRIVER_THRU', 'Driver thru')}
+                        : order.delivery_type === 5
+                          ? t('DRIVER_THRU', 'Driver thru')
+                          : order.delivery_type === 7
+                            ? t('CATERING_DELIVERY', 'Catering delivery')
+                            : order.delivery_type === 8
+                              ? t('CATERING_PICKUP', 'Catering pickup')
+                              : t('DELIVERY', 'Delivery')}
                 {` · ${getOrderStatus(order.status)}`}
               </OText>
             </MyOrderOptions>

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

@@ -11,6 +11,7 @@ import { OrdersList } from './OrderList';
 import { AcceptOrRejectOrder } from '../AcceptOrRejectOrder';
 import { ReviewCustomer } from '../ReviewCustomer';
 import { GoogleMap } from '../GoogleMap';
+import { useOfflineActions } from '../../../../../src/context/OfflineActions';
 
 export const PreviousOrders = (props: any) => {
   const {
@@ -32,7 +33,7 @@ export const PreviousOrders = (props: any) => {
   const [, t] = useLanguage();
   const theme = useTheme();
   const [{ configs }] = useConfig();
-
+  const [{ isNetConnected, canSaveChangesOffline }] = useOfflineActions()
 
   // const [, setCurrentTime] = useState()
   const [openModal, setOpenModal] = useState(false)
@@ -41,10 +42,14 @@ export const PreviousOrders = (props: any) => {
   const [orderUpdateStatus, setOrderUpdateStatus] = useState<any>({ action: '', ids: [], body: {}, order: {} })
 
   const pastOrderStatuses = [1, 2, 5, 6, 10, 11, 12, 16, 17]
-  const viewMapStatus = [9, 18, 19, 23]
+  const viewMapStatus = [9, 18, 19, 23, 26]
+  const deliveryTypes = [1, 7]
   const deliveryPickupBtn = props.appTitle?.text?.includes('Delivery') && [3, 8, 18]
-  const deliveryStatusCompleteBtn = props.appTitle?.text?.includes('Delivery') && [9, 19, 23]
+  const deliveryStatusCompleteBtn = props.appTitle?.text?.includes('Delivery') && [9, 19, 23, 26]
   const isHideRejectButtons = configs?.reject_orders_enabled && configs?.reject_orders_enabled?.value !== '1' && !isBusinessApp
+  const isEnabledOrderNotReady = configs?.order_not_ready_enabled?.value === '1'
+  const isEnabledFailedPickupDriver = configs?.failed_pickup_by_driver_enabled?.value === '1'
+  const disabledActionsByInternet = !isNetConnected && canSaveChangesOffline === false
 
   const handlePressOrder = (order: any) => {
     if (order?.locked && isLogisticOrder) return
@@ -170,7 +175,7 @@ export const PreviousOrders = (props: any) => {
                       }
                       )
                   }
-                  {_ordersGrouped[k][0]?.status === 0 && (
+                  {_ordersGrouped[k][0]?.status === 0 && !disabledActionsByInternet && (
                     <AcceptOrRejectOrderStyle>
                       {!isHideRejectButtons && (
                         <OButton
@@ -206,7 +211,7 @@ export const PreviousOrders = (props: any) => {
                       />
                     </AcceptOrRejectOrderStyle>
                   )}
-                  {_ordersGrouped[k][0]?.status === 7 && (
+                  {_ordersGrouped[k][0]?.status === 7 && !disabledActionsByInternet && (
                     <View>
                       <OButton
                         text={t('READY_FOR_PICKUP', 'Ready for pickup')}
@@ -224,7 +229,7 @@ export const PreviousOrders = (props: any) => {
                     </View>
                   )}
                   {(_ordersGrouped[k][0]?.status === 8 || _ordersGrouped[k][0]?.status === 18) &&
-                    _ordersGrouped[k][0]?.delivery_type === 1 &&
+                    deliveryTypes?.includes(_ordersGrouped[k][0]?.delivery_type) && !disabledActionsByInternet &&
                     (
                       <AcceptOrRejectOrderStyle>
                         <OButton
@@ -242,7 +247,8 @@ export const PreviousOrders = (props: any) => {
                         />
                       </AcceptOrRejectOrderStyle>
                     )}
-                  {_ordersGrouped[k][0]?.status === 3 && _ordersGrouped[k][0]?.delivery_type === 1 && !isHideRejectButtons &&
+                  {_ordersGrouped[k][0]?.status === 3 && deliveryTypes?.includes(_ordersGrouped[k][0]?.delivery_type) && !isHideRejectButtons && isEnabledOrderNotReady &&
+                    !disabledActionsByInternet &&
                     (
                       <AcceptOrRejectOrderStyle>
                         <OButton
@@ -280,6 +286,7 @@ export const PreviousOrders = (props: any) => {
                     )}
                   {_ordersGrouped[k][0]?.status === 4 &&
                     ![1].includes(_ordersGrouped[k][0]?.delivery_type) &&
+                    !disabledActionsByInternet &&
                     (
                       <AcceptOrRejectOrderStyle>
                         {!isHideRejectButtons && (
@@ -314,6 +321,7 @@ export const PreviousOrders = (props: any) => {
                     )}
                   {!_ordersGrouped[k][0]?.user_review &&
                     pastOrderStatuses.includes(_ordersGrouped[k][0]?.status) &&
+                    !disabledActionsByInternet &&
                     (
                       <OButton
                         text={t('REVIEW_CUSTOMER', 'Review customer')}
@@ -330,74 +338,76 @@ export const PreviousOrders = (props: any) => {
                         })}
                       />
                     )}
-                  {!!deliveryPickupBtn && deliveryPickupBtn?.includes(_ordersGrouped[k][0]?.status) && (
-                    <AcceptOrRejectOrderStyle>
-                      {!isHideRejectButtons && (
+                  {!!deliveryPickupBtn && deliveryPickupBtn?.includes(_ordersGrouped[k][0]?.status) && isEnabledFailedPickupDriver &&
+                    !disabledActionsByInternet && (
+                      <AcceptOrRejectOrderStyle>
+                        {!isHideRejectButtons && isEnabledOrderNotReady && (
+                          <OButton
+                            text={t('PICKUP_FAILED', 'Pickup failed')}
+                            bgColor={theme.colors.danger100}
+                            borderColor={theme.colors.danger100}
+                            imgRightSrc={null}
+                            style={{ borderRadius: 7, height: 40, paddingLeft: 10, paddingRight: 10 }}
+                            parentStyle={{ width: '45%' }}
+                            textStyle={{ color: theme.colors.danger500, fontSize: 12, textAlign: 'center' }}
+                            onClick={() => onNavigationRedirect('AcceptOrRejectOrder', {
+                              action: 'pickupFailed',
+                              order: _ordersGrouped[k][0],
+                              ids: _ordersGrouped[k].map((o: any) => o.id),
+                              handleChangeOrderStatus
+                            })}
+                          />
+                        )}
                         <OButton
-                          text={t('PICKUP_FAILED', 'Pickup failed')}
-                          bgColor={theme.colors.danger100}
-                          borderColor={theme.colors.danger100}
+                          text={t('PICKUP_COMPLETE', 'Pickup complete')}
+                          bgColor={theme.colors.success100}
+                          borderColor={theme.colors.success100}
                           imgRightSrc={null}
                           style={{ borderRadius: 7, height: 40, paddingLeft: 10, paddingRight: 10 }}
-                          parentStyle={{ width: '45%' }}
-                          textStyle={{ color: theme.colors.danger500, fontSize: 12, textAlign: 'center' }}
-                          onClick={() => onNavigationRedirect('AcceptOrRejectOrder', {
-                            action: 'pickupFailed',
-                            order: _ordersGrouped[k][0],
-                            ids: _ordersGrouped[k].map((o: any) => o.id),
-                            handleChangeOrderStatus
-                          })}
+                          parentStyle={{ width: isHideRejectButtons ? '100%' : '45%' }}
+                          textStyle={{ color: theme.colors.success500, fontSize: 12, textAlign: 'center' }}
+                          onClick={() => handleChangeOrderStatus(
+                            9,
+                            _ordersGrouped[k].map((o: any) => o.id),
+                          )}
                         />
-                      )}
-                      <OButton
-                        text={t('PICKUP_COMPLETE', 'Pickup complete')}
-                        bgColor={theme.colors.success100}
-                        borderColor={theme.colors.success100}
-                        imgRightSrc={null}
-                        style={{ borderRadius: 7, height: 40, paddingLeft: 10, paddingRight: 10 }}
-                        parentStyle={{ width: isHideRejectButtons ? '100%' : '45%' }}
-                        textStyle={{ color: theme.colors.success500, fontSize: 12, textAlign: 'center' }}
-                        onClick={() => handleChangeOrderStatus(
-                          9,
-                          _ordersGrouped[k].map((o: any) => o.id),
+                      </AcceptOrRejectOrderStyle>
+                    )}
+                  {!!deliveryStatusCompleteBtn && deliveryStatusCompleteBtn.includes(_ordersGrouped[k][0]?.status) &&
+                    !disabledActionsByInternet && (
+                      <AcceptOrRejectOrderStyle>
+                        {!isHideRejectButtons && (
+                          <OButton
+                            text={t('DELIVERY_FAILED', 'Delivery Failed')}
+                            bgColor={theme.colors.danger100}
+                            borderColor={theme.colors.danger100}
+                            imgRightSrc={null}
+                            style={{ borderRadius: 7, height: 40, paddingLeft: 10, paddingRight: 10 }}
+                            parentStyle={{ width: '45%' }}
+                            textStyle={{ color: theme.colors.danger500, fontSize: 12, textAlign: 'center' }}
+                            onClick={() => onNavigationRedirect('AcceptOrRejectOrder', {
+                              action: 'deliveryFailed',
+                              order: _ordersGrouped[k][0],
+                              ids: _ordersGrouped[k].map((o: any) => o.id),
+                              handleChangeOrderStatus
+                            })}
+                          />
                         )}
-                      />
-                    </AcceptOrRejectOrderStyle>
-                  )}
-                  {!!deliveryStatusCompleteBtn && deliveryStatusCompleteBtn.includes(_ordersGrouped[k][0]?.status) && (
-                    <AcceptOrRejectOrderStyle>
-                      {!isHideRejectButtons && (
                         <OButton
-                          text={t('DELIVERY_FAILED', 'Delivery Failed')}
-                          bgColor={theme.colors.danger100}
-                          borderColor={theme.colors.danger100}
+                          text={t('DELIVERY_COMPLETE', 'Delivery complete')}
+                          bgColor={theme.colors.success100}
+                          borderColor={theme.colors.success100}
                           imgRightSrc={null}
                           style={{ borderRadius: 7, height: 40, paddingLeft: 10, paddingRight: 10 }}
-                          parentStyle={{ width: '45%' }}
-                          textStyle={{ color: theme.colors.danger500, fontSize: 12, textAlign: 'center' }}
-                          onClick={() => onNavigationRedirect('AcceptOrRejectOrder', {
-                            action: 'deliveryFailed',
-                            order: _ordersGrouped[k][0],
-                            ids: _ordersGrouped[k].map((o: any) => o.id),
-                            handleChangeOrderStatus
-                          })}
+                          parentStyle={{ width: isHideRejectButtons ? '100%' : '45%' }}
+                          textStyle={{ color: theme.colors.success500, fontSize: 12, textAlign: 'center' }}
+                          onClick={() => handleChangeOrderStatus(
+                            11,
+                            _ordersGrouped[k].map((o: any) => o.id),
+                          )}
                         />
-                      )}
-                      <OButton
-                        text={t('DELIVERY_COMPLETE', 'Delivery complete')}
-                        bgColor={theme.colors.success100}
-                        borderColor={theme.colors.success100}
-                        imgRightSrc={null}
-                        style={{ borderRadius: 7, height: 40, paddingLeft: 10, paddingRight: 10 }}
-                        parentStyle={{ width: isHideRejectButtons ? '100%' : '45%' }}
-                        textStyle={{ color: theme.colors.success500, fontSize: 12, textAlign: 'center' }}
-                        onClick={() => handleChangeOrderStatus(
-                          11,
-                          _ordersGrouped[k].map((o: any) => o.id),
-                        )}
-                      />
-                    </AcceptOrRejectOrderStyle>
-                  )}
+                      </AcceptOrRejectOrderStyle>
+                    )}
                 </OrdersGroupedItem>
               ))}
             </View>

package/themes/business/src/components/PrinterEdition/MessageAlert.tsx

@@ -0,0 +1,33 @@
+import React, { useEffect, useState } from 'react'
+import { useTheme } from 'styled-components/native'
+import { OText } from '../shared'
+
+export const MessageAlert = ({ message, resetMsg }: any) => {
+  const theme = useTheme()
+
+  const [text, setText] = useState(message)
+
+  useEffect(() => {
+    setText(message)
+  }, [message])
+
+  useEffect(() => {
+    if (text) {
+      setTimeout(() => {
+        setText(null)
+        resetMsg()
+      }, 2000);
+    }
+  }, [text])
+
+  return (
+    text ? (
+      <OText
+        size={14}
+        color={theme.colors.danger500}
+      >
+        {text}
+      </OText>
+    ) : null
+  )
+}