Implemented: logic to remove rejected order items from state manually (#638)

src/store/modules/order/actions.ts

@@ -310,7 +310,7 @@
     // fetching the additional information like shipmentRoute, carrierParty information
     // If no orders then no need to fetch any additional information
     if(orders.length){      
-      dispatch('fetchInProgressOrdersAdditionalInformation');
+      await dispatch('fetchInProgressOrdersAdditionalInformation');
     }
 
     emitter.emit('dismissLoader');
@@ -331,6 +331,14 @@
     commit(types.ORDER_INPROGRESS_UPDATED, {orders, total: state.inProgress.total})
   },
 
+  updateAllInProgressOrder ({ commit, state }, payload) {
+    const inProgressQuery = JSON.parse(JSON.stringify(state.inProgress.query))
+
+    inProgressQuery.viewSize = payload.total
+    commit(types.ORDER_INPROGRESS_QUERY_UPDATED, { ...inProgressQuery })
+    commit(types.ORDER_INPROGRESS_UPDATED, payload)
+  },
+
   // get open orders
   async findOpenOrders ({ commit, state }, payload = {}) {
     emitter.emit('presentLoader');
@@ -898,7 +906,7 @@
     try {
       resp = await OrderService.findOrderShipGroup(orderQueryPayload);
       if (resp.status === 200 && !hasError(resp) && resp.data.grouped?.shipGroupSeqId.matches > 0) {
         total = resp.data.grouped.shipGroupSeqId.ngroups
         shipGroups = resp.data.grouped.shipGroupSeqId.groups
 
         // creating the key as orders as the product information action accept only the orders as a param

src/views/InProgress.vue

@@ -741,6 +741,8 @@ export default defineComponent({
 
       // creating updated data for items
       const rejectedOrderItems = [] as any;
+      const rejectedProductIds = [] as any;
+      const rejectedItems = [] as any;
       items.map((item: any, index: number) => {
         const shipmentPackage = order.shipmentPackages.find((shipmentPackage: any) => shipmentPackage.packageName === item.selectedBox)
 
@@ -751,6 +753,9 @@ export default defineComponent({
             "shipmentItemSeqId": item.shipmentItemSeqId,
             "reason": item.rejectReason
           })
+
+          if(!rejectedProductIds.includes(item.productId)) rejectedProductIds.push(item.productId);
+          if(!rejectedItems.includes(`${item.orderId}-${item.orderItemSeqId}`)) rejectedItems.push(`${item.orderId}-${item.orderItemSeqId}`);
           //prefix = 'rej'
           //form.append(`${prefix}_rejectionReason_${index}`, item.rejectReason)
         } else {
@@ -804,7 +809,8 @@ export default defineComponent({
 
         if(!hasError(resp)) {
           if (order.hasRejectedItem) {
-            this.updateOrderQuery()
+            await this.updateOrderQuery()
+            this.removeRejectedOrder(rejectedProductIds, rejectedItems);
           } else {
             order.isModified = false;
 
@@ -832,6 +838,37 @@ export default defineComponent({
         logger.error('Failed to update order', err)
       }
     },
+    removeRejectedOrder(rejectedProductIds: any, rejectedItems: any) {
+      const orders = JSON.parse(JSON.stringify(this.getInProgressOrders()))
+      const updatedOrders = orders.filter((order: any) => {
+        let rejectWholeOrder = false;
+
+        // If the EntireOrderRejection setting is true, check if any item in the order needs rejection
+        if(this.isEntierOrderRejectionEnabled()) {
+          rejectWholeOrder = order.items.some((item: any) => rejectedItems.includes(`${item.orderId}-${item.orderItemSeqId}`));
+        }
+
+        // If both collateralRejection and entireOrderRejection settings are true, reject the whole order if any item matches the productId
+        if(this.isEntierOrderRejectionEnabled() && (this.collateralRejectionConfig?.settingValue === 'true')) {
+          rejectWholeOrder = order.items.some((item: any) => rejectedProductIds.includes(item.productId))
+        }
+
+        // If the EntireRejection setting is true and any item in the order needs rejection, remove the order
+        if(rejectWholeOrder) return false;
+
+        // If the CollateralRejection setting is true, reject all items with the same productId
+        if(this.collateralRejectionConfig?.settingValue === 'true') {
+          order.items = order.items.filter((item: any) => !rejectedProductIds.includes(item.productId));
+        }
+
+        // Otherwise, reject only the specific items
+        order.items = order.items.filter((item: any) => !rejectedItems.includes(`${order.orderId}-${item.orderItemSeqId}`));
+
+        // Keep the order if it still has items
+        return order.items.length > 0;
+      })
+      this.store.dispatch("order/updateAllInProgressOrder", { orders: updatedOrders, total: updatedOrders.length })
+    },
     save(order: any) {
       if(order.hasRejectedItem) {
         const itemsToReject = order.items.filter((item: any) => item.rejectReason)
@@ -850,8 +887,12 @@ export default defineComponent({
       order.hasRejectedItem = true
       this.store.dispatch('order/updateInProgressOrder', order)
     },
-    isEntierOrderRejectionEnabled(order: any) {
-      return (!this.partialOrderRejectionConfig || !this.partialOrderRejectionConfig.settingValue || !JSON.parse(this.partialOrderRejectionConfig.settingValue)) && order.hasRejectedItem
+    isEntierOrderRejectionEnabled(order?: any) {
+      if(order) {
+        return (!this.partialOrderRejectionConfig || !this.partialOrderRejectionConfig.settingValue || !JSON.parse(this.partialOrderRejectionConfig.settingValue)) && order.hasRejectedItem
+      }
+
+      return (!this.partialOrderRejectionConfig || !this.partialOrderRejectionConfig.settingValue || !JSON.parse(this.partialOrderRejectionConfig.settingValue))
     },
     updateBox(updatedBox: string, item: any, order: any) {
       item.selectedBox = updatedBox;