From 65368a6df379db515a29d29bf4455d07657ac7bd Mon Sep 17 00:00:00 2001
From: Yash Maheshwari <yashmaheshwari551@gmail.com>
Date: Tue, 28 Jun 2022 12:18:34 +0530
Subject: [PATCH] Improved: the query for fulfillmentStatus to not include
 orders whose fulfillment status is either Cancelled or Rejected(#2h194jz)

---
 src/store/modules/order/actions.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/store/modules/order/actions.ts b/src/store/modules/order/actions.ts
index 826a00f4e..d6e89d867 100644
--- a/src/store/modules/order/actions.ts
+++ b/src/store/modules/order/actions.ts
@@ -19,7 +19,7 @@ const actions: ActionTree<OrderState , RootState> ={
       ...payload,
       shipmentMethodTypeId: !store.state.user.preference.showShippingOrders ? 'STOREPICKUP' : '',
       '-shipmentStatusId': '*',
-      '-fulfillmentStatus': 'Cancelled',
+      '-fulfillmentStatus': '(Cancelled OR Rejected)',
       orderStatusId: 'ORDER_APPROVED',
       orderTypeId: 'SALES_ORDER'
     })
@@ -107,7 +107,7 @@ const actions: ActionTree<OrderState , RootState> ={
       ...payload,
       shipmentMethodTypeId: !store.state.user.preference.showShippingOrders ? 'STOREPICKUP' : '',
       '-shipmentStatusId': '*',
-      '-fulfillmentStatus': 'Cancelled',
+      '-fulfillmentStatus': '(Cancelled OR Rejected)',
       orderStatusId: 'ORDER_APPROVED',
       orderTypeId: 'SALES_ORDER'
     })
@@ -179,7 +179,7 @@ const actions: ActionTree<OrderState , RootState> ={
       shipmentMethodTypeId: !store.state.user.preference.showShippingOrders ? 'STOREPICKUP' : '',
       shipmentStatusId: "SHIPMENT_PACKED",
       orderTypeId: 'SALES_ORDER',
-      '-fulfillmentStatus': 'Cancelled',
+      '-fulfillmentStatus': '(Cancelled OR Rejected)',
     })
 
     try {