@shushed/helpers 0.0.289 → 0.0.290

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

@@ -40,6 +40,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 +108,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 +177,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 +233,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,
@@ -416,8 +424,8 @@ function transformMasterOrder(payload) {
     if (invoicesGrossMinor === 0 && (payload.invoices || []).length > 0) {
         invoicesGrossMinor = toMinorUnits((payload.invoices || []).reduce((acc, inv) => acc + (inv.amount_incl_vat || 0), 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 +433,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) => acc + (Number(l?.amount_including_vat || 0)), 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) => acc + (Number(l?.amount_including_vat || 0)), 0));
         if (invoicesGrossMinor > 0) {
             nonInvSalesGrossMinor = Math.max(0, totalSaleGrossMinor - invoicesGrossMinor);
         }
@@ -445,7 +453,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) => acc + (s.amount_incl_vat || 0), 0));
         if (invoicesGrossMinor > 0) {
             nonInvSalesGrossMinor = Math.max(0, saleGrossMinor - invoicesGrossMinor);
         }
@@ -454,7 +462,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 +470,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) => acc + (Number(l?.amount_including_vat || 0)), 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));
     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) => acc + (Number(l?.amount || 0)), 0));
+        const totalSaleGrossMinorWithDelivery = toMinorUnits(saleLinesWithDelivery.reduce((acc, l) => acc + (Number(l?.amount_including_vat || 0)), 0));
         if (invoicesGrossMinorWithDelivery > 0) {
             nonInvSalesNetMinorWithDelivery = Math.max(0, totalSaleNetMinorWithDelivery - invoicesNetMinorWithDelivery);
             nonInvSalesGrossMinorWithDelivery = Math.max(0, totalSaleGrossMinorWithDelivery - invoicesGrossMinorWithDelivery);
@@ -487,8 +495,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) => acc + (s.amount_excl_vat || 0), 0));
+        const saleGrossMinor = toMinorUnits(allSales.reduce((acc, s) => acc + (s.amount_incl_vat || 0), 0));
         if (invoicesGrossMinorWithDelivery > 0) {
             nonInvSalesNetMinorWithDelivery = Math.max(0, saleNetMinor - invoicesNetMinorWithDelivery);
             nonInvSalesGrossMinorWithDelivery = Math.max(0, saleGrossMinor - invoicesGrossMinorWithDelivery);
@@ -499,7 +507,7 @@ 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);
@@ -542,7 +550,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
+            ? Math.round(lineDiscGross / (1 + 0.2))
+            : 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 +586,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 +602,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,
         };
     });
@@ -754,7 +786,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 +811,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 || "");
@@ -857,7 +889,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 +916,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 +1141,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 +1168,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 +1241,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 +1261,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 +1328,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);