From 17af3776d1964325dcc5af231187011195752ae7 Mon Sep 17 00:00:00 2001
From: Blake Matthes <cowchmonkey@gmail.com>
Date: Tue, 29 Apr 2025 17:09:21 -0500
Subject: [PATCH] fix(abbott): fix to properly remove the space in the middle
 of the po

---
 .../dm/ordersIn/mappings/abbottTruckList.ts   | 19 +++++++++++--------
 .../controller/dm/ordersIn/ordersIn.ts        |  9 +++++++++
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/server/services/logistics/controller/dm/ordersIn/mappings/abbottTruckList.ts b/server/services/logistics/controller/dm/ordersIn/mappings/abbottTruckList.ts
index 9ed954a..dc91048 100644
--- a/server/services/logistics/controller/dm/ordersIn/mappings/abbottTruckList.ts
+++ b/server/services/logistics/controller/dm/ordersIn/mappings/abbottTruckList.ts
@@ -100,9 +100,9 @@ export const abbottOrders = async (data: any, user: any) => {
         .map((o: any) => ({
             date: excelDateStuff(o.date, o.time),
             po:
-                o.newton8oz.replace(" ", "") !== ""
-                    ? o.newton8oz.replace(" ", "")
-                    : o.newton10oz.replace(" ", ""),
+                o.newton8oz.replace(/\s+/g, "") !== ""
+                    ? o.newton8oz.replace(/\s+/g, "")
+                    : o.newton10oz.replace(/\s+/g, ""),
             customerArticlenumber:
                 o.newton8oz != ""
                     ? a.filter((a: any) => a.av === 118)[0]
@@ -129,16 +129,18 @@ export const abbottOrders = async (data: any, user: any) => {
     const filterOrders: any = correctedOrders;
     filterOrders.forEach((oo: any) => {
         const isMatch = openOrders.some(
-            (o: any) =>
-                String(o.CustomerOrderNumber).trim() ===
-                String(oo.CustomerOrderNumber).trim()
+            (o: any) => String(o.po).trim() === String(oo.po).trim()
         );
         if (!isMatch) {
-            console.log(`ok to update: ${oo.CustomerOrderNumber}`);
+            console.log(`ok to update: ${oo.po}`);
 
+            // oo = {
+            //     ...oo,
+            //     CustomerOrderNumber: oo.CustomerOrderNumber.replace(" ", ""),
+            // };
             postedOrders.push(oo);
         } else {
-            console.log(`Not valid order to update: ${oo.CustomerOrderNumber}`);
+            console.log(`Not valid order to update: ${oo.po}`);
             //console.log(oo)
         }
     });
@@ -169,6 +171,7 @@ export const abbottOrders = async (data: any, user: any) => {
         orders: [...predefinedObject.orders, ...orders],
     };
 
+    console.log(updatedPredefinedObject);
     // post the orders to the server
     const posting = await postOrders(updatedPredefinedObject, user);
 
diff --git a/server/services/logistics/controller/dm/ordersIn/ordersIn.ts b/server/services/logistics/controller/dm/ordersIn/ordersIn.ts
index 7eee56d..404a8e5 100644
--- a/server/services/logistics/controller/dm/ordersIn/ordersIn.ts
+++ b/server/services/logistics/controller/dm/ordersIn/ordersIn.ts
@@ -1,5 +1,6 @@
 import { abbottOrders } from "./mappings/abbottTruckList.js";
 import { energizerOrders } from "./mappings/energizerOrdersIn.js";
+import { macroImportOrders } from "./mappings/macroImport.js";
 import { standardOrders } from "./mappings/standardOrders.js";
 
 export const ordersIn = async (data: any, user: any) => {
@@ -44,6 +45,14 @@ export const ordersIn = async (data: any, user: any) => {
         // orders in
     }
 
+    if (data["fileType"] === "macro") {
+        // orders in
+        const macro = await macroImportOrders(data["postOrders"], user);
+        success = macro.success ?? false;
+        message = macro.message ?? "Error posting Macro Orders";
+        orderData = macro.data;
+    }
+
     return {
         success,
         message,