@shushed/helpers 0.0.202-bug-erp-770-20251202153836 → 0.0.202-bug-erp-770-20251202172248

package/dist/index.js

@@ -111387,14 +111387,17 @@ function transformMasterOrder(payload) {
   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 isRefund = String(p.type || "").toLowerCase() === "refund";
+    if (!isRefund) {
+      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) => {
@@ -111417,43 +111420,77 @@ function transformMasterOrder(payload) {
     const primary = sortedEntries[0] || {};
     const paymentEntryForMethod = sortedEntries.find((e) => e.source === "payment" && e.payment_method_code);
     const paymentMethodCode = paymentEntryForMethod?.payment_method_code || primary.payment_method_code;
-    const cardPaymentEntryForMethod = sortedEntries.find((e) => e.source === "card_payment");
+    let cardPaymentEntryForMethod = sortedEntries.find((e) => e.source === "card_payment");
     const groupCardData = {
       card_number: cardPaymentEntryForMethod?.card_number || sortedEntries.find((e) => e.card_number)?.card_number,
       transaction_id: cardPaymentEntryForMethod?.transaction_id || sortedEntries.find((e) => e.transaction_id)?.transaction_id,
       service_type: cardPaymentEntryForMethod?.service_type || sortedEntries.find((e) => e.service_type)?.service_type
     };
-    const pm = mapPaymentMethod(paymentMethodCode, groupCardData);
+    let pm = mapPaymentMethod(paymentMethodCode, groupCardData);
     let cardPaymentEntryForTransaction = sortedEntries.find((e) => e.source === "card_payment" && e.transaction_id);
     if (!cardPaymentEntryForTransaction && primary.payment_gateway_token) {
       cardPaymentEntryForTransaction = cardPaymentsByToken.get(primary.payment_gateway_token);
     }
     if (!cardPaymentEntryForTransaction && g.type === "REFUND") {
       let originalPayment;
-      if (primary.payment_number) {
-        const foundByNumber = paymentsByPaymentNumber.get(primary.payment_number);
-        if (foundByNumber && String(foundByNumber.type || "").toLowerCase() !== "refund") {
-          originalPayment = foundByNumber;
+      const refundEntryWithPaymentNumber = sortedEntries.find((e) => e.payment_number && String(e.payment_number).trim().length > 0);
+      if (refundEntryWithPaymentNumber?.payment_number) {
+        originalPayment = paymentsByPaymentNumber.get(refundEntryWithPaymentNumber.payment_number);
+      }
+      if (!originalPayment) {
+        const refundEntryWithOriginalId = sortedEntries.find((e) => e.original_payment_refund_id);
+        if (refundEntryWithOriginalId?.original_payment_refund_id) {
+          originalPayment = Array.from(normalPays).find(
+            (p) => p.ledger_entry_no === refundEntryWithOriginalId.original_payment_refund_id && String(p.type || "").toLowerCase() !== "refund"
+          );
+        }
+      }
+      if (!originalPayment) {
+        const refundEntryWithRefundNumber = sortedEntries.find((e) => e.payment_refund_number && String(e.payment_refund_number).trim().length > 0);
+        if (refundEntryWithRefundNumber?.payment_refund_number) {
+          originalPayment = paymentsByPaymentRefundNumber.get(refundEntryWithRefundNumber.payment_refund_number);
         }
       }
-      if (!originalPayment && primary.payment_refund_number) {
-        const foundByRefundNumber = paymentsByPaymentRefundNumber.get(primary.payment_refund_number);
-        if (foundByRefundNumber && String(foundByRefundNumber.type || "").toLowerCase() !== "refund") {
-          originalPayment = foundByRefundNumber;
+      if (originalPayment?.payment_gateway_token) {
+        cardPaymentEntryForTransaction = cardPaymentsByToken.get(originalPayment.payment_gateway_token);
+        if (!cardPaymentEntryForMethod && cardPaymentEntryForTransaction) {
+          cardPaymentEntryForMethod = cardPaymentEntryForTransaction;
+          const refundCardData = {
+            card_number: cardPaymentEntryForMethod?.card_number,
+            transaction_id: cardPaymentEntryForMethod?.transaction_id,
+            service_type: cardPaymentEntryForMethod?.service_type
+          };
+          pm = mapPaymentMethod(paymentMethodCode, refundCardData);
         }
       }
-      if (!originalPayment && primary.original_payment_refund_id) {
-        originalPayment = Array.from(normalPays).find(
+    }
+    let transaction_id = null;
+    if (g.type === "REFUND" && !cardPaymentEntryForTransaction && !primary.transaction_id && !primary.payment_gateway_token) {
+      let originalPaymentForTransaction;
+      const refundEntryWithPaymentNumber = sortedEntries.find((e) => e.payment_number && String(e.payment_number).trim().length > 0);
+      if (refundEntryWithPaymentNumber?.payment_number) {
+        originalPaymentForTransaction = paymentsByPaymentNumber.get(refundEntryWithPaymentNumber.payment_number);
+      }
+      if (!originalPaymentForTransaction && primary.original_payment_refund_id) {
+        originalPaymentForTransaction = Array.from(normalPays).find(
           (p) => p.ledger_entry_no === primary.original_payment_refund_id && String(p.type || "").toLowerCase() !== "refund"
         );
       }
-      if (originalPayment?.payment_gateway_token) {
-        cardPaymentEntryForTransaction = cardPaymentsByToken.get(originalPayment.payment_gateway_token);
+      if (!originalPaymentForTransaction && primary.payment_refund_number) {
+        const refundEntryWithRefundNumber = sortedEntries.find((e) => e.payment_refund_number && String(e.payment_refund_number).trim().length > 0);
+        if (refundEntryWithRefundNumber?.payment_refund_number) {
+          originalPaymentForTransaction = paymentsByPaymentRefundNumber.get(refundEntryWithRefundNumber.payment_refund_number);
+        }
       }
+      if (originalPaymentForTransaction?.payment_gateway_token) {
+        const originalCardPayment = cardPaymentsByToken.get(originalPaymentForTransaction.payment_gateway_token);
+        transaction_id = originalCardPayment?.transaction_id || null;
+      }
+    } else {
+      transaction_id = cardPaymentEntryForTransaction?.transaction_id || primary.transaction_id || null;
     }
-    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 || "";
+    const psp_reference = transaction_id;
+    const paymentCreatedByRaw = invoice0?.created_by || primary.created_by || sale0?.created_by || "";
     const paymentCreatedByUpper = String(paymentCreatedByRaw).toUpperCase();
     const isEmail = typeof paymentCreatedByRaw === "string" && paymentCreatedByRaw.includes("@");
     const validEnumValues = ["CUSTOMER", "SYSTEM", "CENTRA", "SITOO", "STOREFRONT", "MOTO"];

package/package.json

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