@shushed/helpers 0.0.202-bug-erp-770-20251202173534 → 0.0.202-bug-erp-770-20251203140812

package/dist/index.js

@@ -111278,11 +111278,26 @@ function transformMasterOrder(payload) {
   const shipping_from = invoice0 || sale0 || null;
   const mapPaymentMethod = (code, card) => {
     const c = String(code || "").toUpperCase();
-    if (/(GVOUCHER|VOUCHER|GIFT|EGIFT)/.test(c) || String(card?.service_type || "").toUpperCase().includes("VOUCHER")) return "GIFT-CARD";
-    if (c.includes("PAYPAL")) return "PAYPAL";
-    if (c.includes("APPLE") || String(card?.service_type || "").toUpperCase().includes("APPLE")) return "APPLE-PAY";
+    const processorId = String(card?.processor_id || "").toUpperCase();
+    const giftCertId = String(card?.gift_certificate_id || "").trim();
+    const cardType = String(card?.type || "").trim().toLowerCase();
+    if (giftCertId.length > 0) return "GIFT-CARD";
+    if (cardType === "gift certificate") return "GIFT-CARD";
+    if (processorId.includes("GIFT_CERTIFICATE") || processorId.includes("GIFT-CERTIFICATE")) return "GIFT-CARD";
+    if (/(GVOUCHER|VOUCHER|GIFT|EGIFT)/.test(c)) return "GIFT-CARD";
+    if (c.includes("APPLE")) return "APPLE-PAY";
+    if ((c.includes("PAYPAL") || processorId === "PAYPAL") && giftCertId.length === 0) {
+      return "PAYPAL";
+    }
     if (c.includes("MOTO")) return "MOTO";
-    if (card?.transaction_id || card?.card_number) return "CREDIT-CARD";
+    if (c.includes("ADYEN") && cardType === "credit card" && giftCertId.length === 0) {
+      return "CREDIT-CARD";
+    }
+    const serviceType = String(card?.service_type || "").toUpperCase();
+    if (serviceType.includes("VOUCHER") && giftCertId.length === 0 && processorId !== "PAYPAL") {
+      return "GIFT-CARD";
+    }
+    if (card?.card_number) return "CREDIT-CARD";
     return "OTHER";
   };
   const cardPays = (payload.card_payments || []).map((c) => ({
@@ -111300,6 +111315,8 @@ function transformMasterOrder(payload) {
     // For gift voucher grouping
     service_type: c.service_type,
     // Store for card_brand mapping
+    processor_id: c.processor_id,
+    // Store processor_id for payment method detection
     created_by: invoice0?.created_by || sale0?.created_by,
     source: "card_payment",
     order_no: c.order_no,
@@ -111425,7 +111442,10 @@ function transformMasterOrder(payload) {
     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
+      service_type: cardPaymentEntryForMethod?.service_type || sortedEntries.find((e) => e.service_type)?.service_type,
+      processor_id: cardPaymentEntryForMethod?.processor_id || sortedEntries.find((e) => e.processor_id)?.processor_id,
+      gift_certificate_id: cardPaymentEntryForMethod?.gift_certificate_id || sortedEntries.find((e) => e.gift_certificate_id)?.gift_certificate_id,
+      type: cardPaymentEntryForMethod?.type || sortedEntries.find((e) => e.type && e.source === "card_payment")?.type
     };
     let pm;
     if (cardPaymentEntryForMethod?.type && String(cardPaymentEntryForMethod.type).trim().toLowerCase() === "apple pay") {
@@ -111467,7 +111487,10 @@ function transformMasterOrder(payload) {
             const refundCardData = {
               card_number: cardPaymentEntryForMethod?.card_number,
               transaction_id: cardPaymentEntryForMethod?.transaction_id,
-              service_type: cardPaymentEntryForMethod?.service_type
+              service_type: cardPaymentEntryForMethod?.service_type,
+              processor_id: cardPaymentEntryForMethod?.processor_id,
+              gift_certificate_id: cardPaymentEntryForMethod?.gift_certificate_id,
+              type: cardPaymentEntryForMethod?.type
             };
             pm = mapPaymentMethod(paymentMethodCode, refundCardData);
           }

package/package.json

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