ordering-ui-react-native 0.21.86-release → 0.21.87-release

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ordering-ui-react-native",
-  "version": "0.21.86-release",
+  "version": "0.21.87-release",
   "description": "Reusable components made in react native",
   "main": "src/index.tsx",
   "author": "ordering.inc",

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

@@ -69,7 +69,7 @@ const ChatUI = (props: MessagesParams) => {
   const [, { showToast }] = useToast();
   const theme = useTheme();
   const [messageList, setMessageList] = useState<any>([])
-  const previousStatus = [1, 2, 5, 6, 10, 11, 12, 16, 17]
+  const previousStatus = [1, 2, 5, 6, 10, 11, 12, 15, 16, 17]
   const chatDisabled = previousStatus.includes(order?.status)
 
   const ORDER_STATUS: any = {
@@ -98,7 +98,8 @@ const ChatUI = (props: MessagesParams) => {
     22: t('ORDER_LOOKING_FOR_DRIVER', 'Order looking for driver'),
     23: t('ORDER_DRIVER_ON_WAY', 'Driver on way'),
     24: t('ORDER_DRIVER_WAITING_FOR_ORDER', 'Driver waiting for order'),
-    25: t('ORDER_ACCEPTED_BY_DRIVER_COMPANY', 'Accepted by driver company')
+    25: t('ORDER_ACCEPTED_BY_DRIVER_COMPANY', 'Accepted by driver company'),
+    26: t('ORDER_DRIVER_ARRIVED_CUSTOMER', 'Driver arrived to customer')
   }
 
   const getLogisticTag = (status: any) => {

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

@@ -236,6 +236,11 @@ export const DriverMap = (props: GoogleMapsParams) => {
     19: theme.colors.statusOrderBlue,
     20: theme.colors.statusOrderBlue,
     21: theme.colors.statusOrderBlue,
+    22: theme.colors.statusOrderBlue,
+    23: theme.colors.statusOrderBlue,
+    24: theme.colors.statusOrderBlue,
+    25: theme.colors.statusOrderBlue,
+    26: theme.colors.statusOrderBlue,
     //GREEN
     1: theme.colors.statusOrderGreen,
     11: theme.colors.statusOrderGreen,

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

@@ -178,21 +178,11 @@ const NewOrderNotificationUI = (props: any) => {
       handleEventNotification(3, o, orderStatus)
     }
 
-    if (!events?._events?.message_added_notification || events?._events?.message_added_notification?.length < 2) {
-      events.on('message_added_notification', handleEventTypeOne)
-    }
-    if (!events?._events?.order_added_notification || events?._events?.order_added_notification?.length < 2) {
-      events.on('order_added_notification', handleEventTypeTwo)
-    }
-    if (!events?._events?.order_updated_notification || events?._events?.order_updated_notification?.length < 2) {
-      events.on('order_updated_notification', handleEventTypeThree)
-    }
-    if (!events?._events?.request_register_notification || events?._events?.request_register_notification?.length < 2) {
-      events.on('request_register_notification', handleEventTypeTwo)
-    }
-    if (!events?._events?.request_update_notification || events?._events?.request_update_notification?.length < 2) {
-      events.on('request_update_notification', handleEventTypeThree)
-    }
+    events.on('message_added_notification', handleEventTypeOne)
+    events.on('order_added_notification', handleEventTypeTwo)
+    events.on('order_updated_notification', handleEventTypeThree)
+    events.on('request_register_notification', handleEventTypeTwo)
+    events.on('request_update_notification', handleEventTypeThree)
 
     return () => {
       events.off('message_added_notification', handleEventTypeOne)

package/themes/business/src/components/OrderDetails/Business.tsx

@@ -81,6 +81,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
 
   const orderToComplete = [4, 20, 21]
   const orderToReady = [7, 14]
+  const deliveryTypes = [1, 7]
 
   if (order?.status === 7 || order?.status === 4) {
     if (drivers?.length > 0 && drivers) {
@@ -211,7 +212,13 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
             ? 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')
       }\n`
       : '';
 
@@ -497,7 +504,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
             <>
               <OrderContentComponent order={order} />
               {(order?.status === 7 || order?.status === 4) &&
-                order?.delivery_type === 1 && configs?.assign_driver_enabled?.value === '1' && (
+                deliveryTypes.includes(order?.delivery_type) && configs?.assign_driver_enabled?.value === '1' && (
                   <AssignDriver>
                     <OText style={{ marginBottom: 5 }} size={16} weight="600">
                       {t('ASSIGN_DRIVER', 'Assign driver')}
@@ -665,7 +672,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
               disabled={loading}
             />
           )}
-          {orderToComplete.includes(order?.status) && ![1].includes(order?.delivery_type) && (
+          {orderToComplete.includes(order?.status) && !deliveryTypes.includes(order?.delivery_type) && (
             <FloatingButton
               btnText={t(
                 'ORDER_NOT_PICKEDUP_BY_CUSTOMER',

package/themes/business/src/components/OrderDetails/Delivery.tsx

@@ -1,12 +1,10 @@
-//React & React Native
 import React, { useState, useEffect } from 'react';
 import { StyleSheet, View } from 'react-native';
 
-// Thirds
 import { Placeholder, PlaceholderLine, Fade } from 'rn-placeholder';
 import Clipboard from '@react-native-clipboard/clipboard';
+import MCIcon from 'react-native-vector-icons/MaterialCommunityIcons';
 
-//OrderingComponent
 import {
   useLanguage,
   OrderDetails as OrderDetailsConTableoller,
@@ -17,13 +15,12 @@ import {
   useConfig
 } from 'ordering-components/native';
 
-//Components
 import Alert from '../../providers/AlertProvider';
 import { AcceptOrRejectOrder } from '../AcceptOrRejectOrder';
 import { Chat } from '../Chat';
 import { FloatingButton } from '../FloatingButton';
 import { DriverMap } from '../DriverMap';
-import { OButton } from '../shared';
+import { OButton, OText } from '../shared';
 import { OModal } from '../shared';
 import { OrderDetailsParams } from '../../types';
 import { USER_TYPE } from '../../config/constants';
@@ -32,8 +29,8 @@ import { NotFoundSource } from '../NotFoundSource';
 import { verifyDecimals, getProductPrice, getOrderStatus } from '../../utils';
 import { OrderHeaderComponent } from './OrderHeaderComponent';
 import { OrderContentComponent } from './OrderContentComponent';
-//Styles
 import { OrderDetailsContainer, Pickup } from './styles';
+import { useOfflineActions } from '../../../../../src/context/OfflineActions';
 
 export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const {
@@ -42,7 +39,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     setMessages,
     readMessages,
     messagesReadList,
-    handleChangeOrderStatus,
     permissions,
     askLocationPermission,
     driverLocation,
@@ -56,8 +52,9 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     forceUpdate,
     getPermissions,
     orderAssingId,
-    isGrantedPermissions,
+    isGrantedPermissions
   } = props;
+
   const [, { showToast }] = useToast();
   const [{ parsePrice, parseNumber }] = useUtils();
   const [{ configs }] = useConfig();
@@ -72,6 +69,8 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const theme = useTheme();
   const [, t] = useLanguage();
   const [session] = useSession();
+  const [{ isNetConnected, canSaveChangesOffline }, { applyOffAction, registerOffOrder }] = useOfflineActions()
+
   const [actionOrder, setActionOrder] = useState('');
   const [unreadAlert, setUnreadAlert] = useState({
     business: false,
@@ -86,12 +85,16 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     key?: string | null;
   }>({ open: false, content: [], key: null });
 
-  const validStatusComplete = [9, 19, 23]
+  const disabledActionsByInternet = !isNetConnected && canSaveChangesOffline === false
+
+  const validStatusComplete = [9, 19, 23, 26]
 
   const pendingOrderStatus = [1, 4, 7, 13]
 
   const logisticOrderStatus = [4, 6, 7]
 
+  const deliveryTypes = [1, 7]
+
   const showFloatButtonsPickUp: any = {
     8: !isHideRejectButtons,
     3: true,
@@ -105,13 +108,23 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     14: true
   };
 
-  const marginContainer: any = {
-    0: true,
-    3: true,
-    7: true,
-    8: true,
-    9: true,
-  };
+  const handleChangeOrderStatus = async (status: number) => {
+    if (!isNetConnected && canSaveChangesOffline !== false) {
+      const result = applyOffAction({
+        event: 'evt_off_change_order_status',
+        data: { orderId: order?.id, body: { status } }
+      })
+    }
+
+    const dataToSave: any = !isNetConnected && canSaveChangesOffline !== false
+      ? { dataToSave: { status, unsync: true } }
+      : null
+    const orderUpdated = await props.handleChangeOrderStatus(status, {}, dataToSave)
+
+    if (!isNetConnected && canSaveChangesOffline !== false) {
+      await registerOffOrder(orderUpdated)
+    }
+  }
 
   const handleOpenMessagesForBusiness = () => {
     setOpenModalForBusiness(true);
@@ -222,7 +235,13 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
             ? 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')
       }\n`
       : '';
 
@@ -449,8 +468,9 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   let locationMarker: any;
   let isToFollow = false;
   let isBusinessMarker = false;
-
-  if (order?.status === 7 || order?.status === 8 || order?.status === 18) {
+  const customerStatusses = [3, 9, 19, 23, 26]
+  const businessStatusses = [7, 8, 18]
+  if (businessStatusses?.includes(order?.status)) {
     const markerBusiness = 'Business';
     isBusinessMarker = true;
     locationMarker = locations.find(
@@ -460,7 +480,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     if (order?.status === 8 || order?.status === 18) {
       isToFollow = true;
     }
-  } else if (order?.status === 3 || order?.status === 9 || order?.status === 19 || order?.status === 23) {
+  } else if (customerStatusses?.includes(order?.status)) {
     const markerCustomer = 'Customer';
     isToFollow = true;
     isBusinessMarker = false;
@@ -488,20 +508,36 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
           isOrderGroup={isOrderGroup}
           lastOrder={lastOrder}
         />
-        {(order?.status === 8 || order?.status === 18) && order?.delivery_type === 1 && !props.order?.loading && (
+        {(order?.status === 8 || order?.status === 18) && deliveryTypes?.includes(order?.delivery_type) && !props.order?.loading && (
           <Pickup>
             <OButton
               style={styles.btnPickUp}
               textStyle={{ color: theme.colors.primary }}
               text={t('ARRIVED_TO_BUSINESS', 'Arrived to bussiness')}
+              isDisabled={disabledActionsByInternet}
               onClick={() =>
-                handleChangeOrderStatus && isGrantedPermissions ? handleChangeOrderStatus(3) : goToPermissionPage()
+                isGrantedPermissions ? handleChangeOrderStatus(3) : goToPermissionPage()
               }
               imgLeftStyle={{ tintColor: theme.colors.backArrow }}
             />
           </Pickup>
         )}
-        {order?.status === 3 && order?.delivery_type === 1 && !isHideRejectButtons && isEnabledOrderNotReady && !props.order?.loading && (
+
+        {(order?.status === 9 || order?.status === 19) && deliveryTypes?.includes(order?.delivery_type) && !props.order?.loading && (
+          <View style={{ paddingVertical: 20, marginBottom: 20 }}>
+            <OButton
+              style={styles.btnPickUp}
+              textStyle={{ color: theme.colors.primary }}
+              text={t('ARRIVED_TO_CUSTOMER', 'Arrived to customer')}
+              isDisabled={disabledActionsByInternet}
+              onClick={() =>
+                isGrantedPermissions ? handleChangeOrderStatus(26) : goToPermissionPage()
+              }
+              imgLeftStyle={{ tintColor: theme.colors.backArrow }}
+            />
+          </View>
+        )}
+        {order?.status === 3 && deliveryTypes?.includes(order?.delivery_type) && !isHideRejectButtons && isEnabledOrderNotReady && !props.order?.loading && (
           <View style={{ paddingVertical: 20, marginBottom: 20 }}>
             <OButton
               style={styles.btnPickUp}
@@ -518,7 +554,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
         <View
           style={{
             height:
-              order?.status === 8 && order?.delivery_type === 1 ? 50 : 35,
+              order?.status === 8 && deliveryTypes?.includes(order?.delivery_type) ? 50 : 35,
           }}
         />
 
@@ -548,6 +584,28 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
       {!((!order || Object.keys(order).length === 0) &&
         (props.order?.error?.length < 1 || !props.order?.error)) && order?.id && (
           <View style={{ flex: 1 }}>
+            {order?.unsync && (
+              <View
+                style={{
+                  flexDirection: 'row',
+                  justifyContent: 'flex-start',
+                  alignItems: 'center'
+                }}
+              >
+                <MCIcon
+                  name={'cloud-sync'}
+                  color={'#444'}
+                  size={16}
+                />
+                <OText
+                  size={14}
+                  color={theme.colors.textGray}
+                  style={{ marginLeft: 5 }}
+                >
+                  {t('PENDING_SYNC_CHANGES', 'Pending sync changes')}
+                </OText>
+              </View>
+            )}
             <OrderHeaderComponent
               order={order}
               handleOpenMapView={handleOpenMapView}
@@ -571,11 +629,11 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                 </OrderDetailsContainer>
                 {showFloatButtonsPickUp[order?.status] && (
                   <FloatingButton
-                    disabled={props.order?.loading}
+                    disabled={props.order?.loading || disabledActionsByInternet}
                     btnText={t('PICKUP_FAILED', 'Pickup failed')}
                     isSecondaryBtn={false}
                     secondButtonClick={() =>
-                      handleChangeOrderStatus && isGrantedPermissions ? handleChangeOrderStatus(9) : goToPermissionPage()
+                      isGrantedPermissions ? handleChangeOrderStatus(9) : goToPermissionPage()
                     }
                     firstButtonClick={() =>
                       handleViewActionOrder && handleViewActionOrder('pickupFailed')
@@ -591,11 +649,11 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                 {(validStatusComplete.includes(order?.status)) && (
                   <>
                     <FloatingButton
-                      disabled={props.order?.loading}
+                      disabled={props.order?.loading || disabledActionsByInternet}
                       btnText={t('DELIVERY_FAILED', 'Delivery Failed')}
                       isSecondaryBtn={false}
                       secondButtonClick={() =>
-                        handleChangeOrderStatus && isGrantedPermissions ? handleChangeOrderStatus(11) : goToPermissionPage()
+                        isGrantedPermissions ? handleChangeOrderStatus(11) : goToPermissionPage()
                       }
                       firstButtonClick={() =>
                         handleViewActionOrder && handleViewActionOrder('deliveryFailed')
@@ -611,17 +669,24 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                 )}
                 {showFloatButtonsAcceptOrReject[order?.status] && (
                   <FloatingButton
-                    disabled={props.order?.loading}
+                    disabled={props.order?.loading || disabledActionsByInternet}
+                    widthButton={isHideRejectButtons ? '100%' : '45%'}
+                    isHideRejectButtons={isHideRejectButtons}
                     btnText={t('REJECT', 'Reject')}
+                    firstColorCustom={theme.colors.red}
+                    firstButtonClick={() => order?.isLogistic && (order?.order_group || logisticOrderStatus.includes(order?.status))
+                      ? handleRejectLogisticOrder()
+                      : handleViewActionOrder('reject')
+                    }
                     isSecondaryBtn={false}
-                    secondButtonClick={() => hideTimer ? handleChangeOrderStatus && handleChangeOrderStatus(8) : (order?.isLogistic && (order?.order_group || logisticOrderStatus.includes(order?.status))) ? handleAcceptLogisticOrder(order) : handleViewActionOrder('accept')}
-                    firstButtonClick={() => order?.isLogistic && (order?.order_group || logisticOrderStatus.includes(order?.status)) ? handleRejectLogisticOrder() : handleViewActionOrder('reject')}
-                    secondBtnText={t('ACCEPT', 'Accept')}
                     secondButton={true}
-                    firstColorCustom={theme.colors.red}
+                    secondBtnText={t('ACCEPT', 'Accept')}
+                    secondButtonClick={() => hideTimer
+                      ? handleChangeOrderStatus(8)
+                      : (order?.isLogistic && (order?.order_group || logisticOrderStatus.includes(order?.status)))
+                        ? handleAcceptLogisticOrder(order)
+                        : handleViewActionOrder('accept')}
                     secondColorCustom={theme.colors.green}
-                    widthButton={isHideRejectButtons ? '100%' : '45%'}
-                    isHideRejectButtons={isHideRejectButtons}
                   />
                 )}
               </>
@@ -676,7 +741,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                 entireModal
                 customClose>
                 <AcceptOrRejectOrder
-                  handleUpdateOrder={handleChangeOrderStatus}
+                  handleUpdateOrder={props.handleChangeOrderStatus}
                   closeModal={setOpenModalForAccept}
                   customerCellphone={order?.customer?.cellphone}
                   loading={props.order?.loading}

package/themes/business/src/components/OrderDetails/OrderContentComponent.tsx

@@ -68,6 +68,7 @@ export const OrderContentComponent = (props: OrderContent) => {
   })
 
   const pastOrderStatuses = [1, 2, 5, 6, 10, 11, 12, 16, 17]
+  const deliveryTypes = [1, 7]
 
   const walletName: any = {
     cash: {
@@ -412,9 +413,9 @@ export const OrderContentComponent = (props: OrderContent) => {
             {t('ON_BEHALF_OF', 'On behalf of')}{': '} {order?.on_behalf_of}
           </OText>
         )}
-        {(order?.delivery_option !== undefined && order?.delivery_type === 1) && (
+        {(order?.delivery_option !== undefined && deliveryTypes.includes(order?.delivery_type)) && (
           <View style={{ marginTop: 10 }}>
-            {order?.delivery_option !== undefined && order?.delivery_type === 1 && (
+            {order?.delivery_option !== undefined && deliveryTypes.includes(order?.delivery_type) && (
               <OText>
                 {t(order?.delivery_option?.name?.toUpperCase?.()?.replace(/ /g, '_'), order?.delivery_option?.name)}
               </OText>

package/themes/business/src/components/OrderDetails/OrderHeaderComponent.tsx

@@ -102,6 +102,11 @@ export const OrderHeaderComponent = (props: OrderHeader) => {
     19: theme.colors.statusOrderBlue,
     20: theme.colors.statusOrderBlue,
     21: theme.colors.statusOrderBlue,
+    22: theme.colors.statusOrderBlue,
+    23: theme.colors.statusOrderBlue,
+    24: theme.colors.statusOrderBlue,
+    25: theme.colors.statusOrderBlue,
+    26: theme.colors.statusOrderBlue,
     //GREEN
     1: theme.colors.statusOrderGreen,
     11: theme.colors.statusOrderGreen,

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

@@ -44,6 +44,7 @@ export const OrderDetailsLogisticUI = (props: OrderDetailsLogisticParams) => {
     }>({ open: false, content: [], key: null });
 
     const logisticOrderStatus = [4, 6, 7]
+    const deliveryTypes = [1, 7]
     const isHideRejectButtons = configs?.reject_orders_enabled && configs?.reject_orders_enabled?.value !== '1'
 
     const showFloatButtonsAcceptOrReject: any = {
@@ -99,7 +100,7 @@ export const OrderDetailsLogisticUI = (props: OrderDetailsLogisticParams) => {
                 <View
                     style={{
                         height:
-                            order?.status === 8 && order?.delivery_type === 1 ? 50 : 35,
+                            order?.status === 8 && deliveryTypes?.includes(order?.delivery_type) ? 50 : 35,
                     }}
                 />
 
@@ -170,7 +171,7 @@ export const OrderDetailsLogisticUI = (props: OrderDetailsLogisticParams) => {
                                         secondButton={true}
                                         firstColorCustom={theme.colors.red}
                                         secondColorCustom={theme.colors.green}
-                                        widthButton={isHideRejectButtons ? '100%': '45%'}
+                                        widthButton={isHideRejectButtons ? '100%' : '45%'}
                                         isHideRejectButtons={isHideRejectButtons}
                                     />
                                 )}

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

@@ -854,6 +854,10 @@ export const OrdersListManager = (props: OrdersOptionParams) => {
       {
         key: 25,
         text: t('ORDER_ACCEPTED_BY_DRIVER_COMPANY', 'Accepted by driver company')
+      },
+      {
+        key: 26,
+        text: t('ORDER_DRIVER_ARRIVED_CUSTOMER', 'Driver arrived to customer')
       }
     ],
     tabs: [
@@ -866,7 +870,7 @@ export const OrdersListManager = (props: OrdersOptionParams) => {
       {
         key: 1,
         text: t('IN_PROGRESS', 'In Progress'),
-        tags: props?.orderGroupStatusCustom?.inProgress ?? [3, 4, 7, 8, 9, 14, 18, 19, 20, 21, 22, 23, 24, 25],
+        tags: props?.orderGroupStatusCustom?.inProgress ?? [3, 4, 7, 8, 9, 14, 18, 19, 20, 21, 22, 23, 24, 25, 26],
         title: 'inProgress',
       },
       {

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

@@ -1123,13 +1123,17 @@ export const OrdersOption = (props: OrdersOptionParams) => {
       {
         key: 25,
         text: t('ORDER_ACCEPTED_BY_DRIVER_COMPANY', 'Accepted by driver company')
+      },
+      {
+        key: 26,
+        text: t('ORDER_DRIVER_ARRIVED_CUSTOMER', 'Driver arrived to customer')
       }
     ],
     tabs: combineTabs ? [
       {
         key: 0,
         text: t('ACTIVE', 'Active'),
-        tags: props?.orderGroupStatusCustom?.active ?? [0, 3, 4, 7, 8, 9, 13, 14, 18, 19, 20, 21, 22, 23, 24, 25],
+        tags: props?.orderGroupStatusCustom?.active ?? [0, 3, 4, 7, 8, 9, 13, 14, 18, 19, 20, 21, 22, 23, 24, 25, 26],
         title: 'active',
       },
       {
@@ -1155,7 +1159,7 @@ export const OrdersOption = (props: OrdersOptionParams) => {
         {
           key: 1,
           text: t('IN_PROGRESS', 'In Progress'),
-          tags: props?.orderGroupStatusCustom?.inProgress ?? [3, 4, 7, 8, 9, 14, 18, 19, 20, 21, 22, 23, 24, 25],
+          tags: props?.orderGroupStatusCustom?.inProgress ?? [3, 4, 7, 8, 9, 14, 18, 19, 20, 21, 22, 23, 24, 25, 26],
           title: 'inProgress',
         },
         {

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

@@ -214,6 +214,12 @@ export const PreviousMessages = (props: PreviousMessagesParams) => {
         value: t('ORDER_ACCEPTED_BY_DRIVER_COMPANY', 'Accepted by driver company'),
         slug: 'ORDER_ACCEPTED_BY_DRIVER_COMPANY',
         percentage: 25
+      },
+      {
+        key: 26,
+        value: t('ORDER_DRIVER_ARRIVED_CUSTOMER', 'Driver arrived to customer'),
+        slug: 'ORDER_DRIVER_ARRIVED_CUSTOMER',
+        percentage: 80
       }
     ];
 

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

@@ -58,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
+          : theme.colors.primaryContrast
     },
     icon: {
       borderRadius: 7.6,
@@ -207,7 +212,7 @@ export const OrderItem = React.memo((props: any) => {
                 : parseDate(order?.delivery_datetime, { utc: false })}`)}
             </OText>
             )}
-            {((currentTabSelected === 'pending' || currentTabSelected === 'inProgress') && allowColumns?.timer) && (
+            {((currentTabSelected === 'pending' || currentTabSelected === 'inProgress' || currentTabSelected === 'active') && allowColumns?.timer) && (
               <>
                 <OText
                   style={styles.date}
@@ -241,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,12 +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
@@ -172,7 +175,7 @@ export const PreviousOrders = (props: any) => {
                       }
                       )
                   }
-                  {_ordersGrouped[k][0]?.status === 0 && (
+                  {_ordersGrouped[k][0]?.status === 0 && !disabledActionsByInternet && (
                     <AcceptOrRejectOrderStyle>
                       {!isHideRejectButtons && (
                         <OButton
@@ -208,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')}
@@ -226,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
@@ -244,7 +247,8 @@ export const PreviousOrders = (props: any) => {
                         />
                       </AcceptOrRejectOrderStyle>
                     )}
-                  {_ordersGrouped[k][0]?.status === 3 && _ordersGrouped[k][0]?.delivery_type === 1 && !isHideRejectButtons && isEnabledOrderNotReady &&
+                  {_ordersGrouped[k][0]?.status === 3 && deliveryTypes?.includes(_ordersGrouped[k][0]?.delivery_type) && !isHideRejectButtons && isEnabledOrderNotReady &&
+                    !disabledActionsByInternet &&
                     (
                       <AcceptOrRejectOrderStyle>
                         <OButton
@@ -282,6 +286,7 @@ export const PreviousOrders = (props: any) => {
                     )}
                   {_ordersGrouped[k][0]?.status === 4 &&
                     ![1].includes(_ordersGrouped[k][0]?.delivery_type) &&
+                    !disabledActionsByInternet &&
                     (
                       <AcceptOrRejectOrderStyle>
                         {!isHideRejectButtons && (
@@ -316,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')}
@@ -332,74 +338,76 @@ export const PreviousOrders = (props: any) => {
                         })}
                       />
                     )}
-                  {!!deliveryPickupBtn && deliveryPickupBtn?.includes(_ordersGrouped[k][0]?.status) && isEnabledFailedPickupDriver && (
-                    <AcceptOrRejectOrderStyle>
-                      {!isHideRejectButtons && isEnabledOrderNotReady && (
+                  {!!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/utils/index.tsx

@@ -356,6 +356,12 @@ export const getOrderStatus = (s: string, t: any) => {
       value: t('ORDER_ACCEPTED_BY_DRIVER_COMPANY', 'Accepted by driver company'),
       slug: 'ORDER_ACCEPTED_BY_DRIVER_COMPANY',
       percentage: 25
+    },
+    {
+      key: 26,
+      value: t('ORDER_DRIVER_ARRIVED_CUSTOMER', 'Driver arrived to customer'),
+      slug: 'ORDER_DRIVER_ARRIVED_CUSTOMER',
+      percentage: 80
     }
   ];
 

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

@@ -1047,6 +1047,7 @@ const CheckoutUI = (props: any) => {
 					<OModal
 						open={isOpen}
 						onClose={() => setIsOpen(false)}
+						showToastInsideModal
 					>
 						<View style={styles.detailWrapper}>
 							<UserDetails

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

@@ -200,7 +200,7 @@ export const OrderListing = (props: OrdersOptionParams) => {
 	const OrderListingProps = {
 		...props,
 		UIComponent: OrdersOptionUI,
-		orderStatus: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23],
+		orderStatus: [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26],
 		useDefualtSessionManager: true,
 		paginationSettings: {
 			initialPage: 1,

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

@@ -39,7 +39,10 @@ const ORDER_STATUS: any = {
 	20: 'ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS',
 	21: 'ORDER_CUSTOMER_ARRIVED_BUSINESS',
 	22: 'ORDER_LOOKING_FOR_DRIVER',
-	23: 'ORDER_DRIVER_ON_WAY'
+	23: 'ORDER_DRIVER_ON_WAY',
+	24: 'ORDER_DRIVER_WAITING_FOR_ORDER',
+	25: 'ORDER_ACCEPTED_BY_DRIVER_COMPANY',
+	26: 'ORDER_DRIVER_ARRIVED_CUSTOMER'
 }
 
 const filterSpecialStatus = ['prepared_in', 'delivered_in', 'delivery_datetime']
@@ -73,7 +76,7 @@ const MessagesUI = (props: MessagesParams) => {
 
 	const [formattedMessages, setFormattedMessages] = useState<Array<any>>([])
 	const [isKeyboardShow, setIsKeyboardShow] = useState(false)
-	const previousStatus = [1, 2, 5, 6, 10, 11, 12, 16, 17]
+	const previousStatus = [1, 2, 5, 6, 10, 11, 12, 15, 16, 17]
 	const chatDisabled = previousStatus.includes(order?.status)
 	const { height } = useWindowDimensions();
 	const { top, bottom } = useSafeAreaInsets();

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

@@ -10,13 +10,14 @@ export const OrderEta = (props: any) => {
 
   const [{ parseDate }] = useUtils()
   const [estimatedDeliveryTime, setEstimatedDeliveryTime] = useState(null)
-
+  const deliveryTypes = [1, 7]
+  
   const getEstimatedDeliveryTime = () => {
     let estimatedUtcTime = null
     let totalEta = 0
     if (order?.delivered_in) totalEta += order?.delivered_in
     if (order?.prepared_in) totalEta += order?.prepared_in
-    if (order?.delivery_type === 1 && order?.eta_drive_time) {
+    if (deliveryTypes?.includes?.(order?.delivery_type) && order?.eta_drive_time) {
       totalEta += order?.eta_drive_time
     }
 

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

@@ -64,7 +64,10 @@ export const OrderHistory = (props: any) => {
     20: 'ORDER_CUSTOMER_ALMOST_ARRIVED_BUSINESS',
     21: 'ORDER_CUSTOMER_ARRIVED_BUSINESS',
     22: 'ORDER_LOOKING_FOR_DRIVER',
-    23: 'ORDER_DRIVER_ON_WAY'
+    23: 'ORDER_DRIVER_ON_WAY',
+    24: 'ORDER_DRIVER_WAITING_FOR_ORDER',
+    25: 'ORDER_ACCEPTED_BY_DRIVER_COMPANY',
+    26: 'ORDER_DRIVER_ARRIVED_CUSTOMER'
   }
 
   const getLogisticTagStatus = (status: any) => {

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

@@ -129,11 +129,13 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
   const [showTitle, setShowTitle] = useState(false)
 
   const { order, businessData } = props.order;
-  const mapValidStatuses = [9, 19, 23]
+  const mapValidStatuses = [9, 19, 23, 26]
   const placeSpotTypes = [3, 4, 5]
   const directionTypes = [2, 3, 4, 5]
-  const activeStatus = [0, 3, 4, 7, 8, 9, 13, 14, 18, 19, 20, 21, 22, 23]
+  const activeStatus = [0, 3, 4, 7, 8, 9, 13, 14, 18, 19, 20, 21, 22, 23, 24, 25, 26]
   const reorderStatus = [1, 2, 5, 6, 10, 11, 12]
+  const cateringTypes = [7, 8]
+  const deliveryTypes = [1, 7]
   const [isPickup, setIsPickup] = useState(order?.delivery_type === 2)
   const enabledPoweredByOrdering = configs?.powered_by_ordering_module?.value
   const isGiftCardOrder = !order?.business_id
@@ -363,7 +365,6 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
     }
   }, [props?.order?.error, props?.order?.loading])
 
-
   useEffect(() => {
     if (!order?.delivery_type) return
     setIsPickup(order?.delivery_type === 2)
@@ -468,10 +469,13 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                 btnStyle={{ paddingLeft: 0 }}
                 style={{ marginTop: Platform.OS === 'ios' ? 0 : 20 }}
                 titleWrapStyle={{ paddingHorizontal: 0 }}
-                titleStyle={{ marginRight: 0, marginLeft: 0 }}
+                titleStyle={{ marginRight: 0, marginLeft: 0, paddingHorizontal: 0 }}
                 subTitle={!hideDeliveryDate && <OText size={12} lineHeight={18} color={theme.colors.textNormal}>
                   {activeStatus.includes(order?.status) ? (
-                    <OrderEta order={order} />
+                    <>
+                      {cateringTypes.includes(order?.delivery_type) ? `${t('CREATED_AT', 'Created at')}: ${parseDate(order?.created_at)}\n` : ''}
+                      {cateringTypes.includes(order?.delivery_type) ? `${t('PLACED_TO', 'Placed to')}:` : ''} <OrderEta order={order} />
+                    </>
                   ) : (
                     parseDate(order?.reporting_data?.at[`status:${order.status}`])
                   )}
@@ -720,7 +724,7 @@ export const OrderDetailsUI = (props: OrderDetailsParams) => {
                     )}
                   </InfoBlock>
                 </Customer>
-                {!isGiftCardOrder && order?.delivery_option !== undefined && order?.delivery_type === 1 && (
+                {!isGiftCardOrder && order?.delivery_option !== undefined && deliveryTypes?.includes?.(order?.delivery_type) && (
                   <View style={{ marginTop: 15 }}>
                     <OText size={16} style={{ textAlign: 'left' }} color={theme.colors.textNormal}>
                       {t('DELIVERY_PREFERENCE', 'Delivery Preference')}

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

@@ -41,7 +41,8 @@ const OrderProgressUI = (props: any) => {
   const [lastOrder, setLastOrder] = useState<any>(null)
   const imageFails = theme.images.general.emptyActiveOrders
   const [initialLoaded, setInitialLoaded] = useState(false)
-  const statusToShow = [0, 3, 4, 7, 8, 9, 13, 14, 18, 19, 20, 21, 22, 23]
+  const statusToShow = [0, 3, 4, 7, 8, 9, 13, 14, 18, 19, 20, 21, 22, 23, 24, 25, 26]
+  const deliveryTypes = [1, 7]
 
   const styles = StyleSheet.create({
     main: {
@@ -172,7 +173,7 @@ const OrderProgressUI = (props: any) => {
               <ProgressTextWrapper>
                 <OText size={12} style={{ width: '50%' }}>{progressBarObjt(lastOrder.status)?.value}</OText>
                 <TimeWrapper>
-                  <OText size={11}>{lastOrder?.delivery_type === 1 ? t('ESTIMATED_DELIVERY', 'Estimated delivery') : t('ESTIMATED_TIME', 'Estimated time')}</OText>
+                  <OText size={11}>{deliveryTypes?.includes?.(lastOrder?.delivery_type) ? t('ESTIMATED_DELIVERY', 'Estimated delivery') : t('ESTIMATED_TIME', 'Estimated time')}</OText>
                   <OText size={11}>
                     {lastOrder?.delivery_datetime_utc
                       ? parseTime(lastOrder?.delivery_datetime_utc, { outputFormat: configs?.general_hour_format?.value || 'HH:mm' })
@@ -205,7 +206,7 @@ export const OrderProgress = (props: any) => {
   const orderProgressProps = {
     ...props,
     UIComponent: OrderProgressUI,
-    orderStatus: [0, 3, 4, 7, 8, 9, 13, 14, 18, 19, 20, 21, 22, 23],
+    orderStatus: [0, 3, 4, 7, 8, 9, 13, 14, 18, 19, 20, 21, 22, 23, 24, 25, 26],
     useDefualtSessionManager: true,
     paginationSettings: {
       initialPage: 1,

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

@@ -352,9 +352,9 @@ export const OrdersOption = (props: OrdersOptionParams) => {
 		UIComponent: OrdersOptionUI,
 		noGiftCardOrders: true,
 		orderStatus: getAllOrders
-			? [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23]
+			? [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26]
 			: props.preOrders ? [13] : props.activeOrders
-				? [0, 3, 4, 7, 8, 9, 14, 18, 19, 20, 21, 22, 23]
+				? [0, 3, 4, 7, 8, 9, 14, 18, 19, 20, 21, 22, 23, 24, 25, 26]
 				: [1, 2, 5, 6, 10, 11, 12, 15, 16, 17],
 		useDefualtSessionManager: true,
 		paginationSettings: {

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

@@ -123,7 +123,7 @@ export const UserFormDetailsUI = (props: any) => {
 		};
 		if (field.code && field.code === 'email') {
 			rules.pattern = {
-				value: /[&,()%";:ç?<>{}\\[\]\s]/g,
+				value: /^[A-Z0-9._%+-]+@[A-Z0-9.-]+\.[A-Z]{2,}$/i,
 				message: t('INVALID_ERROR_EMAIL', 'Invalid email address').replace(
 					'_attribute_',
 					t('EMAIL', 'Email'),

package/themes/original/src/components/shared/OModal.tsx

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { Modal, StyleSheet, Text, SafeAreaView, View, TouchableOpacity, Platform } from "react-native";
 import styled from 'styled-components/native';
 import AntDesignIcon from 'react-native-vector-icons/AntDesign'
-
+import { Toast } from '../../../../../src/components/shared/OToast'
 interface Props {
 	open?: boolean;
 	title?: string;
@@ -22,6 +22,7 @@ interface Props {
 	styleCloseButton?: any,
 	isAvoidKeyBoardView?: boolean;
 	styleContainerCloseButton?: any;
+	showToastInsideModal?: boolean;
 }
 const KeyboardView = styled.KeyboardAvoidingView`
   flex-grow: 1;
@@ -47,7 +48,8 @@ const OModal = (props: Props): React.ReactElement => {
 		style,
 		styleCloseButton,
 		styleContainerCloseButton,
-		isAvoidKeyBoardView
+		isAvoidKeyBoardView,
+		showToastInsideModal
 	} = props
 
 	const renderSafeAreaView = () => (
@@ -94,6 +96,9 @@ const OModal = (props: Props): React.ReactElement => {
 			onRequestClose={() => onClose && onClose()}
 			style={{ height: '100%', flex: 1, position: 'absolute', ...style, zIndex: 9999 }}
 		>
+			{showToastInsideModal && (
+				<Toast />
+			)}
 			{isAvoidKeyBoardView ? (
 				<KeyboardView
 					enabled

package/themes/original/src/utils/index.tsx

@@ -568,6 +568,24 @@ export const getOrderStatus = (s: string) => {
       slug: 'ORDER_DRIVER_ON_WAY',
       percentage: 0.8,
       image: theme.images.order.status8
+    },
+    {
+      key: 24,
+      value: t('ORDER_DRIVER_WAITING_FOR_ORDER', 'Driver waiting for order'),
+      slug: 'ORDER_DRIVER_WAITING_FOR_ORDER',
+      percentage: 0.25
+    },
+    {
+      key: 25,
+      value: t('ORDER_ACCEPTED_BY_DRIVER_COMPANY', 'Accepted by driver company'),
+      slug: 'ORDER_ACCEPTED_BY_DRIVER_COMPANY',
+      percentage: 0.25
+    },
+    {
+      key: 26,
+      value: t('ORDER_DRIVER_ARRIVED_CUSTOMER', 'Driver arrived to customer'),
+      slug: 'ORDER_DRIVER_ARRIVED_CUSTOMER',
+      percentage: 0.8
     }
   ];