Improved: logic to exclude tracking required and missing label orders (…

…hotwax#281)
ymaheshwari1 · Oct 17, 2023 · 0515ff0 · 0515ff0
1 parent d0f4518
commit 0515ff0
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/views/Completed.vue b/src/views/Completed.vue
@@ -329,13 +329,13 @@ export default defineComponent({
             text: translate("Ship"),
             handler: async () => {
               let orderList = JSON.parse(JSON.stringify(this.completedOrders.list))
-
-              // if there are orders with tracking required and label image present
+              // orders with tracking required and missing label must be excluded
               const trackingRequiredOrders = orderList.filter((order: any) => this.isTrackingRequiredForAnyShipmentPackage(order))
               if (trackingRequiredOrders.length) {
-                const isTrackingCodeRequired = orderList.some((order: any) => order.missingLabelImage)
-                if (!isTrackingCodeRequired) {
-                  orderList = trackingRequiredOrders
+                // filtering and excluding orders having missing label image with tracking required
+                const trackingRequiredAndMissingLabelOrders = trackingRequiredOrders.filter((order: any) => order.missingLabelImage).map((order: any) => order.orderId)
+                if (trackingRequiredAndMissingLabelOrders.length) {
+                  orderList = orderList.filter((order: any) => !trackingRequiredAndMissingLabelOrders.includes(order.orderId))
                 }
               }