@shushed/helpers 0.0.289 → 0.0.291

package/dist/cjs/src-public/bcOrder.js

@@ -7,6 +7,7 @@ exports.BCOrderHelper = void 0;
 exports.buildLineGrouping = buildLineGrouping;
 exports.transformMasterOrder = transformMasterOrder;
 exports.validateOrder = validateOrder;
+const currency_js_1 = __importDefault(require("currency.js"));
 const order_schema_json_1 = __importDefault(require("../contracts/order.schema.json"));
 const runtime_1 = __importDefault(require("./runtime"));
 const validate_1 = __importDefault(require("./validate"));
@@ -14,10 +15,7 @@ const GBP = "GBP";
 function toMinorUnits(amount) {
     if (typeof amount !== "number" || !isFinite(amount))
         return 0;
-    if (Math.abs(amount) > Number.MAX_SAFE_INTEGER / 100) {
-        return Math.round(Number((amount * 100).toPrecision(15)));
-    }
-    return Math.round(amount * 100);
+    return (0, currency_js_1.default)(amount).intValue;
 }
 function money(value) {
     const v = toMinorUnits(value);
@@ -40,6 +38,12 @@ function moneyFromMinor(minor) {
         lcy_decimal_places: 2,
     };
 }
+function trimAddr(val) {
+    if (val === null || val === undefined)
+        return null;
+    const s = String(val).replace(/[,\s]+$/g, '').replace(/^[\s]+/, '');
+    return s.length > 0 ? s : null;
+}
 function buildLineGrouping(payload) {
     const group = {};
     const makeKey = (orderNo, lineNo) => `${orderNo}:${lineNo}`;
@@ -102,8 +106,10 @@ function buildLineGrouping(payload) {
 }
 function transformMasterOrder(payload) {
     const erp_order_id = payload.no || payload.system_id || "";
-    const sale0 = Array.isArray(payload.sales) && payload.sales.length > 0 ? payload.sales[0] : undefined;
+    const allSales = Array.isArray(payload.sales) ? payload.sales : [];
+    const sale0 = allSales.find((s) => (s.sale_lines || []).length > 0) || allSales[0] || undefined;
     const invoice0 = Array.isArray(payload.invoices) && payload.invoices.length > 0 ? payload.invoices[0] : undefined;
+    const allSaleLines = allSales.flatMap((s) => s.sale_lines || []);
     const normalizeIntegerOrNull = (value) => {
         if (value === null || value === undefined)
             return null;
@@ -169,7 +175,7 @@ function transformMasterOrder(payload) {
     const is_gift = Boolean((sale0?.gift_message && String(sale0?.gift_message).trim().length > 0) ||
         (payload.invoices?.some((i) => (i.gift_message || "").trim().length > 0)));
     const invoiceLinesForReturn = payload.invoices?.flatMap((i) => i.invoice_lines || []) || [];
-    const salesLinesFallbackForReturn = (sale0?.sale_lines || []);
+    const salesLinesFallbackForReturn = allSaleLines;
     const sourceLinesForReturn = invoiceLinesForReturn.length > 0 ? invoiceLinesForReturn : salesLinesFallbackForReturn;
     const skuByDescription = {};
     sourceLinesForReturn.forEach((line) => {
@@ -225,7 +231,7 @@ function transformMasterOrder(payload) {
         });
     });
     const invoiceLines = payload.invoices?.flatMap((i) => i.invoice_lines || []) || [];
-    const salesLinesFallback = (sale0?.sale_lines || []).map((l) => ({
+    const salesLinesFallback = allSaleLines.map((l) => ({
         type: l.type || "Item",
         no: l.no,
         variant_code: l.variant_code,
@@ -292,30 +298,30 @@ function transformMasterOrder(payload) {
             vatRate = vatPercent / 100;
         }
         else if (netTotal > 0 && grossTotal > 0) {
-            vatRate = Math.max(0, (grossTotal - netTotal) / netTotal);
+            vatRate = Math.max(0, (0, currency_js_1.default)(grossTotal).subtract(netTotal).divide(netTotal).value);
         }
         let unitNet = 0;
         let unitGross = 0;
         if (unitPriceRaw > 0) {
             if (headerPricesInclVat) {
                 unitGross = unitPriceRaw;
-                unitNet = vatRate > 0 ? (unitGross / (1 + vatRate)) : unitGross;
+                unitNet = vatRate > 0 ? (0, currency_js_1.default)(unitGross).divide(1 + vatRate).value : unitGross;
             }
             else {
                 unitNet = unitPriceRaw;
-                unitGross = vatRate > 0 ? (unitNet * (1 + vatRate)) : unitNet;
+                unitGross = vatRate > 0 ? (0, currency_js_1.default)(unitNet).multiply(1 + vatRate).value : unitNet;
             }
         }
         else {
             unitNet = quantity > 0
                 ? (netTotal > 0
-                    ? netTotal / quantity
-                    : (grossTotal > 0 && vatRate > 0 ? (grossTotal / (1 + vatRate)) / quantity : 0))
+                    ? (0, currency_js_1.default)(netTotal).divide(quantity).value
+                    : (grossTotal > 0 && vatRate > 0 ? (0, currency_js_1.default)(grossTotal).divide(1 + vatRate).divide(quantity).value : 0))
                 : 0;
             unitGross = quantity > 0
                 ? (grossTotal > 0
-                    ? grossTotal / quantity
-                    : (netTotal > 0 && vatRate > 0 ? (netTotal * (1 + vatRate)) / quantity : 0))
+                    ? (0, currency_js_1.default)(grossTotal).divide(quantity).value
+                    : (netTotal > 0 && vatRate > 0 ? (0, currency_js_1.default)(netTotal).multiply(1 + vatRate).divide(quantity).value : 0))
                 : 0;
         }
         const discountCode = (line.salesforce_promotion_id && line.salesforce_promotion_id.trim().length > 0)
@@ -336,22 +342,22 @@ function transformMasterOrder(payload) {
         if (discountAmountRaw > 0) {
             if (headerPricesInclVat) {
                 discountGross = discountAmountRaw;
-                discountNet = vatRate > 0 ? (discountGross / (1 + vatRate)) : discountGross;
+                discountNet = vatRate > 0 ? (0, currency_js_1.default)(discountGross).divide(1 + vatRate).value : discountGross;
             }
             else {
                 discountNet = discountAmountRaw;
-                discountGross = vatRate > 0 ? (discountNet * (1 + vatRate)) : discountNet;
+                discountGross = vatRate > 0 ? (0, currency_js_1.default)(discountNet).multiply(1 + vatRate).value : discountNet;
             }
         }
         else if (discountPercent > 0) {
             if (netTotal > 0)
-                discountNet = (netTotal * discountPercent) / 100;
+                discountNet = (0, currency_js_1.default)(netTotal).multiply(discountPercent).divide(100).value;
             if (grossTotal > 0)
-                discountGross = (grossTotal * discountPercent) / 100;
+                discountGross = (0, currency_js_1.default)(grossTotal).multiply(discountPercent).divide(100).value;
             if (grossTotal === 0 && discountNet > 0 && vatRate > 0)
-                discountGross = discountNet * (1 + vatRate);
+                discountGross = (0, currency_js_1.default)(discountNet).multiply(1 + vatRate).value;
             if (netTotal === 0 && discountGross > 0 && vatRate > 0)
-                discountNet = discountGross / (1 + vatRate);
+                discountNet = (0, currency_js_1.default)(discountGross).divide(1 + vatRate).value;
         }
         const take = Math.min(shippedRemainingBySku[sku] || 0, quantity);
         const remaining = quantity - take;
@@ -375,10 +381,10 @@ function transformMasterOrder(payload) {
                 ...baseFields,
                 quantity: qty,
                 returned_quantity: Math.max(0, Number(returnedQtyForLine || 0)),
-                amount_net: money(unitNet * qty),
-                amount_gross: money(unitGross * qty),
-                discount_amount_net: money(discountNet * (qty / Math.max(1, quantity))),
-                discount_amount_gross: money(discountGross * (qty / Math.max(1, quantity))),
+                amount_net: money((0, currency_js_1.default)(unitNet).multiply(qty).value),
+                amount_gross: money((0, currency_js_1.default)(unitGross).multiply(qty).value),
+                discount_amount_net: money((0, currency_js_1.default)(discountNet).multiply(qty).divide(Math.max(1, quantity)).value),
+                discount_amount_gross: money((0, currency_js_1.default)(discountGross).multiply(qty).divide(Math.max(1, quantity)).value),
                 discount_amount_percent: line.line_discount_percent || 0,
             });
         };
@@ -414,10 +420,10 @@ function transformMasterOrder(payload) {
         });
     });
     if (invoicesGrossMinor === 0 && (payload.invoices || []).length > 0) {
-        invoicesGrossMinor = toMinorUnits((payload.invoices || []).reduce((acc, inv) => acc + (inv.amount_incl_vat || 0), 0));
+        invoicesGrossMinor = toMinorUnits((payload.invoices || []).reduce((acc, inv) => (0, currency_js_1.default)(acc).add(inv.amount_incl_vat || 0).value, 0));
     }
-    if (invoicesGrossMinor === 0 && invoicedLineNos.size > 0 && sale0?.sale_lines) {
-        const invoicedSaleLines = (sale0?.sale_lines || []).filter((l) => {
+    if (invoicesGrossMinor === 0 && invoicedLineNos.size > 0 && allSaleLines.length > 0) {
+        const invoicedSaleLineItems = allSaleLines.filter((l) => {
             if (isDeliveryItem(l))
                 return false;
             if (String(l?.type || '').toLowerCase() !== 'item')
@@ -425,18 +431,18 @@ function transformMasterOrder(payload) {
             const lineNo = Number(l?.line_no || -1);
             return invoicedLineNos.has(lineNo);
         });
-        invoicesGrossMinor = toMinorUnits(invoicedSaleLines.reduce((acc, l) => acc + (Number(l?.amount_including_vat || 0)), 0));
+        invoicesGrossMinor = toMinorUnits(invoicedSaleLineItems.reduce((acc, l) => (0, currency_js_1.default)(acc).add(Number(l?.amount_including_vat || 0)).value, 0));
     }
     let nonInvSalesGrossMinor = 0;
-    if (sale0?.sale_lines && sale0.sale_lines.length > 0) {
-        const allSaleLines = (sale0.sale_lines || []).filter((l) => {
+    if (allSaleLines.length > 0) {
+        const saleLinesNoDelivery = allSaleLines.filter((l) => {
             if (isDeliveryItem(l))
                 return false;
             if (String(l?.type || '').toLowerCase() !== 'item')
                 return false;
             return true;
         });
-        const totalSaleGrossMinor = toMinorUnits(allSaleLines.reduce((acc, l) => acc + (Number(l?.amount_including_vat || 0)), 0));
+        const totalSaleGrossMinor = toMinorUnits(saleLinesNoDelivery.reduce((acc, l) => (0, currency_js_1.default)(acc).add(Number(l?.amount_including_vat || 0)).value, 0));
         if (invoicesGrossMinor > 0) {
             nonInvSalesGrossMinor = Math.max(0, totalSaleGrossMinor - invoicesGrossMinor);
         }
@@ -445,7 +451,7 @@ function transformMasterOrder(payload) {
         }
     }
     else if (sale0 && (sale0.amount_excl_vat || sale0.amount_incl_vat)) {
-        const saleGrossMinor = toMinorUnits(sale0.amount_incl_vat || 0);
+        const saleGrossMinor = toMinorUnits(allSales.reduce((acc, s) => (0, currency_js_1.default)(acc).add(s.amount_incl_vat || 0).value, 0));
         if (invoicesGrossMinor > 0) {
             nonInvSalesGrossMinor = Math.max(0, saleGrossMinor - invoicesGrossMinor);
         }
@@ -454,7 +460,7 @@ function transformMasterOrder(payload) {
         }
     }
     else {
-        const nonInvoicedSales = (sale0?.sale_lines || []).filter((l) => {
+        const nonInvoicedSaleItems = allSaleLines.filter((l) => {
             if (isDeliveryItem(l))
                 return false;
             if (String(l?.type || '').toLowerCase() !== 'item')
@@ -462,21 +468,21 @@ function transformMasterOrder(payload) {
             const lineNo = Number(l?.line_no || -1);
             return !invoicedLineNos.has(lineNo);
         });
-        nonInvSalesGrossMinor = toMinorUnits(nonInvoicedSales.reduce((acc, l) => acc + (Number(l?.amount_including_vat || 0)), 0));
+        nonInvSalesGrossMinor = toMinorUnits(nonInvoicedSaleItems.reduce((acc, l) => (0, currency_js_1.default)(acc).add(Number(l?.amount_including_vat || 0)).value, 0));
     }
     const totalGrossMinor = invoicesGrossMinor + nonInvSalesGrossMinor;
-    const invoicesNetMinorWithDelivery = toMinorUnits((payload.invoices || []).reduce((acc, inv) => acc + (inv.amount_excl_vat || 0), 0));
-    const invoicesGrossMinorWithDelivery = toMinorUnits((payload.invoices || []).reduce((acc, inv) => acc + (inv.amount_incl_vat || 0), 0));
+    const invoicesNetMinorWithDelivery = toMinorUnits((payload.invoices || []).reduce((acc, inv) => (0, currency_js_1.default)(acc).add(inv.amount_excl_vat || 0).value, 0));
+    const invoicesGrossMinorWithDelivery = toMinorUnits((payload.invoices || []).reduce((acc, inv) => (0, currency_js_1.default)(acc).add(inv.amount_incl_vat || 0).value, 0));
     let nonInvSalesNetMinorWithDelivery = 0;
     let nonInvSalesGrossMinorWithDelivery = 0;
-    if (sale0?.sale_lines && sale0.sale_lines.length > 0) {
-        const allSaleLinesWithDelivery = (sale0.sale_lines || []).filter((l) => {
+    if (allSaleLines.length > 0) {
+        const saleLinesWithDelivery = allSaleLines.filter((l) => {
             if (String(l?.type || '').toLowerCase() !== 'item')
                 return false;
             return true;
         });
-        const totalSaleNetMinorWithDelivery = toMinorUnits(allSaleLinesWithDelivery.reduce((acc, l) => acc + (Number(l?.amount || 0)), 0));
-        const totalSaleGrossMinorWithDelivery = toMinorUnits(allSaleLinesWithDelivery.reduce((acc, l) => acc + (Number(l?.amount_including_vat || 0)), 0));
+        const totalSaleNetMinorWithDelivery = toMinorUnits(saleLinesWithDelivery.reduce((acc, l) => (0, currency_js_1.default)(acc).add(Number(l?.amount || 0)).value, 0));
+        const totalSaleGrossMinorWithDelivery = toMinorUnits(saleLinesWithDelivery.reduce((acc, l) => (0, currency_js_1.default)(acc).add(Number(l?.amount_including_vat || 0)).value, 0));
         if (invoicesGrossMinorWithDelivery > 0) {
             nonInvSalesNetMinorWithDelivery = Math.max(0, totalSaleNetMinorWithDelivery - invoicesNetMinorWithDelivery);
             nonInvSalesGrossMinorWithDelivery = Math.max(0, totalSaleGrossMinorWithDelivery - invoicesGrossMinorWithDelivery);
@@ -487,8 +493,8 @@ function transformMasterOrder(payload) {
         }
     }
     else if (sale0 && (sale0.amount_excl_vat || sale0.amount_incl_vat)) {
-        const saleNetMinor = toMinorUnits(sale0.amount_excl_vat || 0);
-        const saleGrossMinor = toMinorUnits(sale0.amount_incl_vat || 0);
+        const saleNetMinor = toMinorUnits(allSales.reduce((acc, s) => (0, currency_js_1.default)(acc).add(s.amount_excl_vat || 0).value, 0));
+        const saleGrossMinor = toMinorUnits(allSales.reduce((acc, s) => (0, currency_js_1.default)(acc).add(s.amount_incl_vat || 0).value, 0));
         if (invoicesGrossMinorWithDelivery > 0) {
             nonInvSalesNetMinorWithDelivery = Math.max(0, saleNetMinor - invoicesNetMinorWithDelivery);
             nonInvSalesGrossMinorWithDelivery = Math.max(0, saleGrossMinor - invoicesGrossMinorWithDelivery);
@@ -499,14 +505,14 @@ function transformMasterOrder(payload) {
         }
     }
     else {
-        const nonInvoicedSalesWithDelivery = (sale0?.sale_lines || []).filter((l) => {
+        const nonInvoicedSalesWithDelivery = allSaleLines.filter((l) => {
             if (String(l?.type || '').toLowerCase() !== 'item')
                 return false;
             const lineNo = Number(l?.line_no || -1);
             return !invoicedLineNos.has(lineNo);
         });
-        nonInvSalesNetMinorWithDelivery = toMinorUnits(nonInvoicedSalesWithDelivery.reduce((acc, l) => acc + (Number(l?.amount || 0)), 0));
-        nonInvSalesGrossMinorWithDelivery = toMinorUnits(nonInvoicedSalesWithDelivery.reduce((acc, l) => acc + (Number(l?.amount_including_vat || 0)), 0));
+        nonInvSalesNetMinorWithDelivery = toMinorUnits(nonInvoicedSalesWithDelivery.reduce((acc, l) => (0, currency_js_1.default)(acc).add(Number(l?.amount || 0)).value, 0));
+        nonInvSalesGrossMinorWithDelivery = toMinorUnits(nonInvoicedSalesWithDelivery.reduce((acc, l) => (0, currency_js_1.default)(acc).add(Number(l?.amount_including_vat || 0)).value, 0));
     }
     const totalNetMinorWithDelivery = invoicesNetMinorWithDelivery + nonInvSalesNetMinorWithDelivery;
     const totalGrossMinorWithDelivery = invoicesGrossMinorWithDelivery + nonInvSalesGrossMinorWithDelivery;
@@ -542,7 +548,26 @@ function transformMasterOrder(payload) {
         }
         return 'STANDARD';
     };
-    const mappedShipments = (payload.shipments || []).map((s) => {
+    let deliveryGrossMinor = 0;
+    let deliveryNetMinor = 0;
+    let deliveryDiscountGrossMinor = 0;
+    let deliveryDiscountNetMinor = 0;
+    const deliverySourceLines = invoiceLines.length > 0 ? invoiceLines : allSaleLines;
+    deliverySourceLines.forEach((line) => {
+        if (!isDeliveryItem(line))
+            return;
+        const gross = toMinorUnits(Number(line?.amount_including_vat || line?.amount_incl_vat || 0));
+        const net = toMinorUnits(Number(line?.amount || line?.amount_excl_vat || 0));
+        deliveryGrossMinor += gross;
+        deliveryNetMinor += net;
+        const lineDiscGross = toMinorUnits(Number(line?.line_discount_amount || 0));
+        const lineDiscNet = headerPricesInclVat
+            ? (0, currency_js_1.default)(lineDiscGross, { fromCents: true }).divide(1.2).intValue
+            : lineDiscGross;
+        deliveryDiscountGrossMinor += lineDiscGross;
+        deliveryDiscountNetMinor += lineDiscNet;
+    });
+    const mappedShipments = (payload.shipments || []).map((s, shipIdx) => {
         const rawLines = (s.shipment_lines || [])
             .filter((l) => isShippableItem(l));
         const qtyBySku = new Map();
@@ -559,6 +584,11 @@ function transformMasterOrder(payload) {
             sku,
             quantity: Math.max(1, qtyBySku.get(sku) || 0),
         }));
+        const isFirstShipment = shipIdx === 0;
+        const shipGross = isFirstShipment ? deliveryGrossMinor : 0;
+        const shipNet = isFirstShipment ? deliveryNetMinor : 0;
+        const shipDiscGross = isFirstShipment ? deliveryDiscountGrossMinor : 0;
+        const shipDiscNet = isFirstShipment ? deliveryDiscountNetMinor : 0;
         const statusVal = shipmentLines.length > 0 ? "SHIPPED" : "PENDING";
         return {
             erp_id: s.no || s.system_id || "",
@@ -570,10 +600,10 @@ function transformMasterOrder(payload) {
             tracking_code: (s.torque_tracking_id && typeof s.torque_tracking_id === 'string') ? s.torque_tracking_id : null,
             class_name: mapClassName(s.shipping_agent_service_code),
             items: shipmentLines,
-            amount_net: money(0),
-            amount_gross: money(0),
-            discount_amount_net: money(0),
-            discount_amount_gross: money(0),
+            amount_net: moneyFromMinor(shipNet),
+            amount_gross: moneyFromMinor(shipGross),
+            discount_amount_net: moneyFromMinor(shipDiscNet),
+            discount_amount_gross: moneyFromMinor(shipDiscGross),
             discount_amount_percent: 0,
         };
     });
@@ -660,7 +690,7 @@ function transformMasterOrder(payload) {
             const isRefund = itemNo.toUpperCase() === 'REFUND';
             if ((l?.quantity || 0) > 0 && isItemish && !isRefund && !isDeliveryItem(l)) {
                 hasQualifying = true;
-                return s + (l?.amount_including_vat || 0);
+                return (0, currency_js_1.default)(s).add(l?.amount_including_vat || 0).value;
             }
             return s;
         }, 0);
@@ -672,16 +702,16 @@ function transformMasterOrder(payload) {
             const isItemish = typeStr.includes('item') || looksProduct;
             const isRefund = itemNo.toUpperCase() === 'REFUND';
             if ((l?.quantity || 0) > 0 && isItemish && !isRefund && !isDeliveryItem(l)) {
-                return s + (l?.amount || l?.amount_excl_vat || 0);
+                return (0, currency_js_1.default)(s).add(l?.amount || l?.amount_excl_vat || 0).value;
             }
             return s;
         }, 0);
         if (!hasQualifying)
             return acc;
         if (cm?.amount_incl_vat != null && cm.amount_incl_vat > 0) {
-            return { gross: acc.gross + cm.amount_incl_vat, net: acc.net + (cm.amount_excl_vat || 0) };
+            return { gross: (0, currency_js_1.default)(acc.gross).add(cm.amount_incl_vat).value, net: (0, currency_js_1.default)(acc.net).add(cm.amount_excl_vat || 0).value };
         }
-        return { gross: acc.gross + sumGross, net: acc.net + sumNet };
+        return { gross: (0, currency_js_1.default)(acc.gross).add(sumGross).value, net: (0, currency_js_1.default)(acc.net).add(sumNet).value };
     }, { gross: 0, net: 0 });
     const merchReturnGrossFromReturnSales = (payload.sales || []).reduce((acc, sale) => {
         const docTypeRaw = String(sale?.document_type || sale?.documentType || "");
@@ -689,7 +719,7 @@ function transformMasterOrder(payload) {
         if (!isReturnOrder)
             return acc;
         if (sale?.amount_incl_vat != null && sale.amount_incl_vat > 0) {
-            return { gross: acc.gross + sale.amount_incl_vat, net: acc.net + (sale.amount_excl_vat || sale.amount || 0) };
+            return { gross: (0, currency_js_1.default)(acc.gross).add(sale.amount_incl_vat).value, net: (0, currency_js_1.default)(acc.net).add(sale.amount_excl_vat || sale.amount || 0).value };
         }
         const lines = sale?.sale_lines || [];
         let hasQualifying = false;
@@ -702,7 +732,7 @@ function transformMasterOrder(payload) {
             const isRefund = itemNo.toUpperCase() === 'REFUND';
             if ((l?.quantity || 0) > 0 && isItemish && !isRefund && !isDeliveryItem(l)) {
                 hasQualifying = true;
-                return s + (l?.amount_including_vat || 0);
+                return (0, currency_js_1.default)(s).add(l?.amount_including_vat || 0).value;
             }
             return s;
         }, 0);
@@ -714,22 +744,22 @@ function transformMasterOrder(payload) {
             const isItemish = typeStr.includes('item') || looksProduct;
             const isRefund = itemNo.toUpperCase() === 'REFUND';
             if ((l?.quantity || 0) > 0 && isItemish && !isRefund && !isDeliveryItem(l)) {
-                return s + (l?.amount || l?.amount_excl_vat || 0);
+                return (0, currency_js_1.default)(s).add(l?.amount || l?.amount_excl_vat || 0).value;
             }
             return s;
         }, 0);
         if (sumGross > 0) {
-            return { gross: acc.gross + sumGross, net: acc.net + sumNet };
+            return { gross: (0, currency_js_1.default)(acc.gross).add(sumGross).value, net: (0, currency_js_1.default)(acc.net).add(sumNet).value };
         }
         if (hasQualifying) {
-            return { gross: acc.gross + (sale?.amount_incl_vat || sale?.amount_including_vat || 0), net: acc.net + (sale?.amount_excl_vat || sale?.amount || 0) };
+            return { gross: (0, currency_js_1.default)(acc.gross).add(sale?.amount_incl_vat || sale?.amount_including_vat || 0).value, net: (0, currency_js_1.default)(acc.net).add(sale?.amount_excl_vat || sale?.amount || 0).value };
         }
         return acc;
     }, { gross: 0, net: 0 });
-    const merchReturnGross = merchReturnGrossFromCreditMemos.gross + merchReturnGrossFromReturnSales.gross;
+    const merchReturnGross = (0, currency_js_1.default)(merchReturnGrossFromCreditMemos.gross).add(merchReturnGrossFromReturnSales.gross).value;
     const hasMerchReturn = merchReturnGross > 0;
-    const returnsNetMinor = toMinorUnits((payload.credit_memos || []).reduce((acc, cm) => acc + (cm.amount_excl_vat || 0), 0));
-    const returnsGrossMinor = toMinorUnits((payload.credit_memos || []).reduce((acc, cm) => acc + (cm.amount_incl_vat || 0), 0));
+    const returnsNetMinor = toMinorUnits((payload.credit_memos || []).reduce((acc, cm) => (0, currency_js_1.default)(acc).add(cm.amount_excl_vat || 0).value, 0));
+    const returnsGrossMinor = toMinorUnits((payload.credit_memos || []).reduce((acc, cm) => (0, currency_js_1.default)(acc).add(cm.amount_incl_vat || 0).value, 0));
     const return_total = (returnsGrossMinor > 0)
         ? {
             amount_net: moneyFromMinor(returnsNetMinor),
@@ -754,7 +784,7 @@ function transformMasterOrder(payload) {
             sourceLineMap.set(lineNo, line);
         }
     });
-    (sale0?.sale_lines || []).forEach((line) => {
+    allSaleLines.forEach((line) => {
         const lineNo = Number(line.line_no || -1);
         if (lineNo > 0) {
             const existing = sourceLineMap.get(lineNo);
@@ -779,7 +809,7 @@ function transformMasterOrder(payload) {
             }
         }
     });
-    (sale0?.sale_lines || []).forEach((line) => {
+    allSaleLines.forEach((line) => {
         if (line.type === "Item") {
             const itemNo = String(line.no || "");
             const variant = String(line.variant_code || "");
@@ -797,7 +827,7 @@ function transformMasterOrder(payload) {
     });
     const shippedGrossDecimal = (payload.shipments || []).reduce((acc, s) => {
         if (s.amount_incl_vat != null && s.amount_incl_vat > 0) {
-            return acc + (s.amount_incl_vat || 0);
+            return (0, currency_js_1.default)(acc).add(s.amount_incl_vat || 0).value;
         }
         const lineAmounts = (s.shipment_lines || []).reduce((lineAcc, l) => {
             if (!isShippableItem(l))
@@ -815,18 +845,18 @@ function transformMasterOrder(payload) {
                 const sourceGross = Number(sourceLine.amount_including_vat || sourceLine.amount_incl_vat || 0);
                 const shippedQty = Number(l?.quantity || 0);
                 if (sourceQty > 0 && sourceGross > 0) {
-                    const unitPrice = sourceGross / sourceQty;
-                    return lineAcc + (unitPrice * shippedQty);
+                    const unitPrice = (0, currency_js_1.default)(sourceGross).divide(sourceQty).value;
+                    return (0, currency_js_1.default)(lineAcc).add((0, currency_js_1.default)(unitPrice).multiply(shippedQty)).value;
                 }
             }
-            return lineAcc + (l?.amount_including_vat || l?.amount_incl_vat || 0);
+            return (0, currency_js_1.default)(lineAcc).add(l?.amount_including_vat || l?.amount_incl_vat || 0).value;
         }, 0);
-        return acc + lineAmounts;
+        return (0, currency_js_1.default)(acc).add(lineAmounts).value;
     }, 0);
     const shippedGrossMinor = toMinorUnits(shippedGrossDecimal);
     let status = "PROCESSED";
     if (hasMerchReturn) {
-        const totalOrderGrossDecimal = totalOrderGrossMinor / 100;
+        const totalOrderGrossDecimal = (0, currency_js_1.default)(totalOrderGrossMinor, { fromCents: true }).value;
         status = totalOrderGrossDecimal > 0 && merchReturnGross >= totalOrderGrossDecimal ? "RETURNED" : "PARTIALLY-RETURNED";
     }
     else if (shippedGrossMinor > 0 && totalOrderGrossMinor > 0) {
@@ -857,7 +887,7 @@ function transformMasterOrder(payload) {
         }
         if (c.includes('MOTO'))
             return 'MOTO';
-        if (c.includes('ADYEN') && cardType === 'credit card' && giftCertId.length === 0) {
+        if (c.includes('ADYEN') && giftCertId.length === 0) {
             return 'CREDIT-CARD';
         }
         const serviceType = String(card?.service_type || '').toUpperCase();
@@ -884,23 +914,27 @@ function transformMasterOrder(payload) {
         order_no: c.order_no,
         captured: c.captured,
     }));
-    const normalPays = (payload.payments || []).map((p) => ({
-        created_at: p.created_at,
-        amount: p.amount,
-        type: p.type,
-        payment_method_code: p.payment_method_code,
-        transaction_id: p.transaction_id,
-        card_number: undefined,
-        psp_reference: p.psp_reference,
-        payment_gateway_token: p.payment_gateway_token,
-        payment_number: p.payment_number,
-        payment_refund_number: p.payment_refund_number,
-        original_payment_refund_id: p.original_payment_refund_id,
-        created_by: p.created_by || invoice0?.created_by || sale0?.created_by,
-        source: 'payment',
-        order_no: p.master_order_no,
-        ledger_entry_no: p.ledger_entry_no,
-    }));
+    const normalPays = (payload.payments || []).map((p) => {
+        const pc = (p.payment_cards || [])[0];
+        return {
+            created_at: p.created_at,
+            amount: p.amount,
+            type: p.type,
+            payment_method_code: p.payment_method_code,
+            transaction_id: p.transaction_id,
+            card_number: pc?.card_number || undefined,
+            psp_reference: p.psp_reference,
+            payment_gateway_token: p.payment_gateway_token,
+            payment_number: p.payment_number || p.payment_no,
+            payment_refund_number: p.payment_refund_number || p.payment_reference_no,
+            original_payment_refund_id: p.original_payment_refund_id,
+            created_by: p.created_by || invoice0?.created_by || sale0?.created_by,
+            source: 'payment',
+            order_no: p.master_order_no,
+            ledger_entry_no: p.ledger_entry_no,
+            service_type: pc?.card_type || p.card_type || undefined,
+        };
+    });
     const flat = [...cardPays, ...normalPays];
     const groupsMap = new Map();
     flat.forEach((p) => {
@@ -1105,13 +1139,15 @@ function transformMasterOrder(payload) {
             }
             if (originalPaymentForTransaction?.payment_gateway_token) {
                 const originalCardPayment = cardPaymentsByToken.get(originalPaymentForTransaction.payment_gateway_token);
-                transaction_id = originalCardPayment?.transaction_id || null;
+                transaction_id = originalCardPayment?.transaction_id || originalPaymentForTransaction.payment_gateway_token || null;
             }
         }
         else {
-            transaction_id = cardPaymentEntryForTransaction?.transaction_id || primary.transaction_id || null;
+            transaction_id = cardPaymentEntryForTransaction?.transaction_id || primary.transaction_id || primary.payment_gateway_token || null;
         }
-        const psp_reference = transaction_id;
+        const psp_reference = transaction_id
+            || sortedEntries.find(e => e.payment_gateway_token)?.payment_gateway_token
+            || null;
         const paymentCreatedByRaw = invoice0?.created_by || primary.created_by || sale0?.created_by || "";
         const paymentCreatedByUpper = String(paymentCreatedByRaw).toUpperCase();
         const isEmail = typeof paymentCreatedByRaw === 'string' && paymentCreatedByRaw.includes('@');
@@ -1130,12 +1166,16 @@ function transformMasterOrder(payload) {
             card_number = cardPaymentEntryForTransaction.card_number || null;
         }
         let cardPaymentForBrand = sortedEntries.find(e => e.source === 'card_payment' && e.service_type);
+        if (!cardPaymentForBrand) {
+            cardPaymentForBrand = sortedEntries.find(e => e.service_type);
+        }
         if (!cardPaymentForBrand && g.type === 'REFUND' && cardPaymentEntryForTransaction) {
             cardPaymentForBrand = cardPaymentEntryForTransaction;
         }
-        const card_brand = cardPaymentForBrand?.service_type
+        const rawBrand = cardPaymentForBrand?.service_type
             ? String(cardPaymentForBrand.service_type).trim() || null
             : null;
+        const card_brand = (pm === 'PAYPAL' || pm === 'GIFT-CARD' || rawBrand === 'VOUCHER') ? null : rawBrand;
         let status = 'CAPTURED';
         const isVoucher = pm === 'GIFT-CARD' ||
             sortedEntries.some(e => e.gift_certificate_id) ||
@@ -1199,39 +1239,6 @@ function transformMasterOrder(payload) {
         };
     });
     const shipmentsWithItems = shipments.filter((s) => s.items && s.items.length > 0);
-    shipmentsWithItems.forEach((shipment) => {
-        let shipmentNetMinor = 0;
-        let shipmentGrossMinor = 0;
-        let shipmentDiscountNetMinor = 0;
-        let shipmentDiscountGrossMinor = 0;
-        let maxDiscountPercent = 0;
-        (shipment.items || []).forEach((shipItem) => {
-            const sku = shipItem.sku;
-            const shipQty = Number(shipItem.quantity || 0);
-            const matchingItems = itemsList.filter((item) => item.sku === sku);
-            let remainingQty = shipQty;
-            for (const item of matchingItems) {
-                if (remainingQty <= 0)
-                    break;
-                const itemQty = Number(item.quantity || 0);
-                if (itemQty > 0) {
-                    const takeQty = Math.min(remainingQty, itemQty);
-                    const ratio = takeQty / itemQty;
-                    shipmentNetMinor += item.amount_net.value * ratio;
-                    shipmentGrossMinor += item.amount_gross.value * ratio;
-                    shipmentDiscountNetMinor += item.discount_amount_net.value * ratio;
-                    shipmentDiscountGrossMinor += item.discount_amount_gross.value * ratio;
-                    maxDiscountPercent = Math.max(maxDiscountPercent, item.discount_amount_percent || 0);
-                    remainingQty -= takeQty;
-                }
-            }
-        });
-        shipment.amount_net = moneyFromMinor(shipmentNetMinor);
-        shipment.amount_gross = moneyFromMinor(shipmentGrossMinor);
-        shipment.discount_amount_net = moneyFromMinor(shipmentDiscountNetMinor);
-        shipment.discount_amount_gross = moneyFromMinor(shipmentDiscountGrossMinor);
-        shipment.discount_amount_percent = maxDiscountPercent;
-    });
     let totalDiscountNetMinor = 0;
     let totalDiscountGrossMinor = 0;
     let maxTotalDiscountPercent = 0;
@@ -1252,45 +1259,51 @@ function transformMasterOrder(payload) {
         centra_order_id,
         sfcc_order_id,
         globale_order_id: (() => {
-            const v = (invoice0?.globale_order_id ?? sale0?.globale_order_id ?? null);
+            const v = (invoice0?.globale_order_id ?? sale0?.globale_order_id ?? payload.glopal_order_id ?? null);
             if (typeof v !== 'string')
                 return v;
             const s = v.trim();
             return s.length > 0 ? s : null;
         })(),
-        sitoo_order_id: null,
+        sitoo_order_id: (() => {
+            const v = payload.sitoo_order_id ?? sale0?.sitoo_order_id ?? null;
+            if (v === null || v === undefined)
+                return null;
+            const s = String(v).trim();
+            return s.length > 0 ? s : null;
+        })(),
         system_created_by,
         ordered_at,
         is_gift,
         is_pos: created_by_raw === "SITOO",
         billing_address: billing_from ? (() => {
             const billToName = billing_from.bill_to_name || "";
-            const firstName = billing_from.bill_to_first_name || (billToName ? billToName.split(' ')[0] : "");
-            const lastName = billing_from.bill_to_surname || (billToName ? billToName.split(' ').slice(1).join(' ') : "");
+            const firstName = trimAddr(billing_from.bill_to_first_name) || trimAddr(billToName ? billToName.split(' ')[0] : "");
+            const lastName = trimAddr(billing_from.bill_to_surname) || trimAddr(billToName ? billToName.split(' ').slice(1).join(' ') : "");
             return {
-                first_name: firstName,
-                last_name: lastName,
-                address1: billing_from.bill_to_address || "",
-                address2: billing_from.bill_to_address_2 || null,
-                city: billing_from.bill_to_city || "",
-                post_code: billing_from.bill_to_post_code || null,
-                country_code: billing_from.bill_to_country_region_code || "",
-                phone: billing_from.sell_to_phone_no || null,
+                first_name: firstName || null,
+                last_name: lastName || null,
+                address1: trimAddr(billing_from.bill_to_address) || "",
+                address2: trimAddr(billing_from.bill_to_address_2) || null,
+                city: trimAddr(billing_from.bill_to_city) || null,
+                post_code: trimAddr(billing_from.bill_to_post_code) || null,
+                country_code: trimAddr(billing_from.bill_to_country_region_code) || "",
+                phone: trimAddr(billing_from.sell_to_phone_no) || null,
                 created_at: (typeof billing_from.system_created_at === 'string' && billing_from.system_created_at) || undefined,
             };
         })() : null,
         shipping_address: shipping_from ? (() => {
             const shipToName = shipping_from.ship_to_name || "";
-            const firstName = shipping_from.ship_to_first_name || (shipToName ? shipToName.split(' ')[0] : "");
-            const lastName = shipping_from.ship_to_surname || (shipToName ? shipToName.split(' ').slice(1).join(' ') : "");
+            const firstName = trimAddr(shipping_from.ship_to_first_name) || trimAddr(shipToName ? shipToName.split(' ')[0] : "");
+            const lastName = trimAddr(shipping_from.ship_to_surname) || trimAddr(shipToName ? shipToName.split(' ').slice(1).join(' ') : "");
             return {
-                first_name: firstName,
-                last_name: lastName,
-                address1: shipping_from.ship_to_address || "",
-                address2: shipping_from.ship_to_address_2 || null,
-                city: shipping_from.ship_to_city || "",
-                post_code: shipping_from.ship_to_post_code || null,
-                country_code: shipping_from.ship_to_country_region_code || "",
+                first_name: firstName || null,
+                last_name: lastName || null,
+                address1: trimAddr(shipping_from.ship_to_address) || "",
+                address2: trimAddr(shipping_from.ship_to_address_2) || null,
+                city: trimAddr(shipping_from.ship_to_city) || null,
+                post_code: trimAddr(shipping_from.ship_to_post_code) || null,
+                country_code: trimAddr(shipping_from.ship_to_country_region_code) || "",
                 phone: shipping_from.ship_to_phone_no || null,
                 created_at: (typeof shipping_from.system_created_at === 'string' && shipping_from.system_created_at) || undefined,
             };
@@ -1313,14 +1326,14 @@ function transformMasterOrder(payload) {
             if (c.no || payload.customer_no)
                 mapped.bc_customer_id = String(c.no || payload.customer_no);
             const buildAddr = (src) => src ? {
-                first_name: src.bill_to_first_name || src.ship_to_first_name || "",
-                last_name: src.bill_to_surname || src.ship_to_surname || "",
-                address1: (src.bill_to_address || src.ship_to_address || ""),
-                address2: (src.bill_to_address_2 || src.ship_to_address_2 || null),
-                city: (src.bill_to_city || src.ship_to_city || ""),
-                post_code: (src.bill_to_post_code || src.ship_to_post_code || null),
-                country_code: (src.bill_to_country_region_code || src.ship_to_country_region_code || ""),
-                phone: (src.sell_to_phone_no || src.ship_to_phone_no || null),
+                first_name: trimAddr(src.bill_to_first_name || src.ship_to_first_name) || null,
+                last_name: trimAddr(src.bill_to_surname || src.ship_to_surname) || null,
+                address1: trimAddr(src.bill_to_address || src.ship_to_address) || "",
+                address2: trimAddr(src.bill_to_address_2 || src.ship_to_address_2) || null,
+                city: trimAddr(src.bill_to_city || src.ship_to_city) || null,
+                post_code: trimAddr(src.bill_to_post_code || src.ship_to_post_code) || null,
+                country_code: trimAddr(src.bill_to_country_region_code || src.ship_to_country_region_code) || "",
+                phone: trimAddr(src.sell_to_phone_no || src.ship_to_phone_no) || null,
                 created_at: (typeof src.system_created_at === 'string' && src.system_created_at) || undefined,
             } : null;
             const custBilling = buildAddr(billing_from);