From 2bc9e88588b564e0728ab66c95d1597ed7da7656 Mon Sep 17 00:00:00 2001
From: Blake Matthes <cowchmonkey@gmail.com>
Date: Thu, 24 Apr 2025 22:58:07 -0500
Subject: [PATCH] fix(abbott orders): corrected the ignore function for already
 in progress orders

---
 .../dm/ordersIn/mappings/abbottTruckList.ts   | 26 ++++++++++++++++---
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/server/services/logistics/controller/dm/ordersIn/mappings/abbottTruckList.ts b/server/services/logistics/controller/dm/ordersIn/mappings/abbottTruckList.ts
index 4143b69..9ed954a 100644
--- a/server/services/logistics/controller/dm/ordersIn/mappings/abbottTruckList.ts
+++ b/server/services/logistics/controller/dm/ordersIn/mappings/abbottTruckList.ts
@@ -90,6 +90,7 @@ export const abbottOrders = async (data: any, user: any) => {
         orders: [],
     };
     const oOrders: any = openOrders;
+
     let correctedOrders: any = orderData
         .filter(
             (o: any) =>
@@ -121,12 +122,29 @@ export const abbottOrders = async (data: any, user: any) => {
     });
 
     // last map to remove orders that have already been started
-    correctedOrders = correctedOrders.filter((oo: any) =>
-        oOrders.some((o: any) => o.CustomerOrderNumber === oo.po)
-    );
+    // correctedOrders = correctedOrders.filter((oo: any) =>
+    //     oOrders.some((o: any) => o.CustomerOrderNumber === oo.po)
+    // );
+    let postedOrders: any = [];
+    const filterOrders: any = correctedOrders;
+    filterOrders.forEach((oo: any) => {
+        const isMatch = openOrders.some(
+            (o: any) =>
+                String(o.CustomerOrderNumber).trim() ===
+                String(oo.CustomerOrderNumber).trim()
+        );
+        if (!isMatch) {
+            console.log(`ok to update: ${oo.CustomerOrderNumber}`);
+
+            postedOrders.push(oo);
+        } else {
+            console.log(`Not valid order to update: ${oo.CustomerOrderNumber}`);
+            //console.log(oo)
+        }
+    });
 
     // Map Excel data to predefinedObject format
-    const orders = correctedOrders.map((o: any) => {
+    const orders = filterOrders.map((o: any) => {
         return {
             customerId: customerID,
             invoiceAddressId: invoiceID,