Merge pull request #108 from ymaheshwari1/#2h194jz

Improved: the query to not include orders whose fulfillment status is either Cancelled or Rejected(#2h194jz)
hotwax · Jun 28, 2022 · 8e96c91 · 8e96c91
2 parents aa57ff9 + 65368a6
commit 8e96c91
Showing 1 changed file with 3 additions and 3 deletions.
diff --git 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 {