@shushed/helpers 0.0.202-bug-erp-770-20251202013645 → 0.0.202-bug-erp-770-20251202150612

package/dist/index.js

@@ -111320,6 +111320,8 @@ function transformMasterOrder(payload) {
     // Groups Authorisation/Capture together
     payment_refund_number: p.payment_refund_number,
     // Groups refunds together
+    original_payment_refund_id: p.original_payment_refund_id,
+    // Links refunds to original payments
     created_by: p.created_by || invoice0?.created_by || sale0?.created_by,
     source: "payment",
     order_no: p.master_order_no,
@@ -111380,6 +111382,20 @@ function transformMasterOrder(payload) {
       cardPaymentsByToken.set(cp.transaction_id, cp);
     }
   });
+  const paymentsByOriginalRefundId = /* @__PURE__ */ new Map();
+  const paymentsByPaymentNumber = /* @__PURE__ */ new Map();
+  const paymentsByPaymentRefundNumber = /* @__PURE__ */ new Map();
+  normalPays.forEach((p) => {
+    if (p.original_payment_refund_id) {
+      paymentsByOriginalRefundId.set(p.original_payment_refund_id, p);
+    }
+    if (p.payment_number) {
+      paymentsByPaymentNumber.set(p.payment_number, p);
+    }
+    if (p.payment_refund_number) {
+      paymentsByPaymentRefundNumber.set(p.payment_refund_number, p);
+    }
+  });
   const payments = Array.from(groupsMap.values()).map((g) => {
     const sortedEntries = [...g.entries].sort((a, b) => {
       if (a.source === "card_payment" && b.source !== "card_payment") return -1;
@@ -111411,6 +111427,23 @@ function transformMasterOrder(payload) {
     if (!cardPaymentEntryForTransaction && primary.payment_gateway_token) {
       cardPaymentEntryForTransaction = cardPaymentsByToken.get(primary.payment_gateway_token);
     }
+    if (!cardPaymentEntryForTransaction && !primary.payment_gateway_token && g.type === "REFUND") {
+      let originalPayment;
+      if (primary.payment_number) {
+        originalPayment = paymentsByPaymentNumber.get(primary.payment_number);
+      }
+      if (!originalPayment && primary.payment_refund_number) {
+        originalPayment = paymentsByPaymentRefundNumber.get(primary.payment_refund_number);
+      }
+      if (!originalPayment && primary.original_payment_refund_id) {
+        originalPayment = Array.from(normalPays).find(
+          (p) => p.ledger_entry_no === primary.original_payment_refund_id
+        );
+      }
+      if (originalPayment?.payment_gateway_token) {
+        cardPaymentEntryForTransaction = cardPaymentsByToken.get(originalPayment.payment_gateway_token);
+      }
+    }
     const transaction_id = cardPaymentEntryForTransaction?.transaction_id || primary.transaction_id || null;
     const psp_reference = primary.psp_reference || transaction_id || null;
     const paymentCreatedByRaw = primary.created_by || invoice0?.created_by || sale0?.created_by || "";
@@ -111420,8 +111453,14 @@ function transformMasterOrder(payload) {
     const isValidEnum = validEnumValues.includes(paymentCreatedByUpper);
     const created_by = isEmail ? paymentCreatedByRaw : isValidEnum ? paymentCreatedByUpper : "MOTO";
     const journey_label = null;
-    const card_number = sortedEntries.find((e) => e.source === "card_payment" && e.card_number)?.card_number || primary.card_number || null;
-    const cardPaymentForBrand = sortedEntries.find((e) => e.source === "card_payment" && e.service_type);
+    let card_number = sortedEntries.find((e) => e.source === "card_payment" && e.card_number)?.card_number || primary.card_number || null;
+    if (!card_number && g.type === "REFUND" && cardPaymentEntryForTransaction) {
+      card_number = cardPaymentEntryForTransaction.card_number || null;
+    }
+    let cardPaymentForBrand = sortedEntries.find((e) => e.source === "card_payment" && e.service_type);
+    if (!cardPaymentForBrand && g.type === "REFUND" && cardPaymentEntryForTransaction) {
+      cardPaymentForBrand = cardPaymentEntryForTransaction;
+    }
     const card_brand = cardPaymentForBrand?.service_type ? String(cardPaymentForBrand.service_type).trim() || null : null;
     let status2 = "CAPTURED";
     const isVoucher = pm === "GIFT-CARD" || sortedEntries.some((e) => e.gift_certificate_id) || sortedEntries.some((e) => /(GVOUCHER|VOUCHER|GIFT|EGIFT)/.test(String(e.payment_method_code || "").toUpperCase())) || sortedEntries.some((e) => String(e.service_type || "").toUpperCase().includes("VOUCHER"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shushed/helpers",
-  "version": "0.0.202-bug-erp-770-20251202013645",
+  "version": "0.0.202-bug-erp-770-20251202150612",
   "author": "",
   "license": "UNLICENSED",
   "description": "",