fix(scac check): changes to also ignore if user put in [

server/services/logistics/controller/dm/ordersIn/createTemplate.ts

@@ -14,6 +14,7 @@ export const standardTemplate = async () => {
             "Quantity",
             "DeliveryDate",
             "CustomerID",
+            "Remark",
             // "InvoiceID",
         ],
     ];

server/services/logistics/controller/dm/ordersIn/mappings/energizerOrdersIn.ts

@@ -71,6 +71,7 @@ export const energizerOrders = async (data: any, user: any) => {
         "COMMENTS",
         "What changed",
         "CUSTOMERID",
+        "Remark",
     ];
     const orderData = XLSX.utils.sheet_to_json(sheet, {
         defval: "",
@@ -136,6 +137,7 @@ export const energizerOrders = async (data: any, user: any) => {
                     deliveryDate: o.DELDATE, //excelDateStuff(o.DELDATE),
                     customerLineItemNo: o.ReleaseNo, // this is how it is currently sent over from abbott
                     customerReleaseNo: o.ReleaseNo, // same as above
+                    remark: o.remark === "" ? null : o.remark,
                 },
             ],
         };

server/services/logistics/controller/dm/ordersIn/mappings/macroImport.ts

@@ -165,6 +165,7 @@ export const macroImportOrders = async (data: any, user: any) => {
                         deliveryDate: excelDateStuff(o.DeliveryDate),
                         customerLineItemNo: o.CustomerLineNumber, // this is how it is currently sent over from abbott
                         customerReleaseNo: o.CustomerRealeaseNumber, // same as above
+                        remark: o.remark === "" ? null : o.remark,
                     },
                 ],
             };

server/services/logistics/controller/dm/ordersIn/mappings/standardOrders.ts

@@ -70,6 +70,7 @@ export const standardOrders = async (data: any, user: any) => {
         "Quantity",
         "DeliveryDate",
         "CustomerID",
+        "Remark",
     ];
     const orderData = XLSX.utils.sheet_to_json(sheet, {
         defval: "",
@@ -156,6 +157,7 @@ export const standardOrders = async (data: any, user: any) => {
                         deliveryDate: excelDateStuff(o.DeliveryDate),
                         customerLineItemNo: o.CustomerLineNumber, // this is how it is currently sent over from abbott
                         customerReleaseNo: o.CustomerRealeaseNumber, // same as above
+                        remark: o.remark === "" ? null : o.remark,
                     },
                 ],
             };

server/services/notifications/controller/notifications/tiFullFlow/scacCodeCheck.ts

@@ -11,7 +11,9 @@ export const scacCheck = async (data: any) => {
     const priceSheet = `
         <PriceSheets>
             <PriceSheet type="Carrier" isSelected="${
-                data[0].remark.includes("SCAC") && data[0].remark.split(",")[0]
+                data[0].remark.includes("SCAC") && // make sure we have the word scac
+                data[0].remark.split(",")[0] && // and its valid as well
+                !data[0].remark.includes("[") // if they funny and put [carrier] just ignore it.
                     ? "true"
                     : "false"
             }">

server/services/server/utils/serverData.json

@@ -29,8 +29,8 @@
             "streetAddress": "2120 Spillman Dr",
             "cityState": "Bethlehem, PA",
             "zipcode": "18015",
-            "contactEmail": "blake.matthes@alpla.com",
-            "contactPhone": "6366970253",
+            "contactEmail": "ShippingReceivingBethlehem@groups.alpla.com",
+            "contactPhone": "6103902380",
             "customerTiAcc": "ALPL01BETHINT",
             "lstServerPort": "3000",
             "active": true,