[SFI-415] setPaymentTransactionType not working for giftcards (#1014)

Adyen · Nov 27, 2023 · 9aadc50 · 9aadc50
1 parent 3c5e50b
commit 9aadc50
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 19 deletions.
diff --git a/jest/sfccCartridgeMocks.js b/jest/sfccCartridgeMocks.js
@@ -249,6 +249,7 @@ jest.mock('*/cartridge/scripts/util/adyenHelper', () => ({
       return request
     }),
     getAdyenComponentType : jest.fn(() => {}),
+    setPaymentTransactionType : jest.fn(() => {}),
     getOrderMainPaymentInstrumentType: jest.fn(() => {}),
     getPaymentInstrumentType: jest.fn((isCreditCard) => isCreditCard ? 'CREDIT_CARD' : 'AdyenComponent'),
   }), {virtual: true});

diff --git a/src/cartridges/int_adyen_overlay/cartridge/scripts/adyenCheckout.js b/src/cartridges/int_adyen_overlay/cartridge/scripts/adyenCheckout.js
@@ -37,18 +37,6 @@ const adyenLevelTwoThreeData = require('*/cartridge/scripts/adyenLevelTwoThreeDa
 const constants = require('*/cartridge/adyenConstants/constants');
 const AdyenLogs = require('*/cartridge/scripts/adyenCustomLogs');
 
-//SALE payment methods require payment transaction type to be Capture
-function setPaymentTransactionType(paymentInstrument, paymentMethod) {
-  const salePaymentMethods = AdyenConfigs.getAdyenSalePaymentMethods();
-  if (salePaymentMethods.indexOf(paymentMethod.type) > -1) {
-    Transaction.wrap(function () {
-      paymentInstrument
-        .getPaymentTransaction()
-        .setType(dw.order.PaymentTransaction.TYPE_CAPTURE);
-    });
-  }
-}
-
 function createPaymentRequest(args) {
   try {
     const order = args.Order;
@@ -160,8 +148,7 @@ function createPaymentRequest(args) {
         paymentRequest.storePaymentMethod = true;
         paymentRequest.recurringProcessingModel = constants.RECURRING_PROCESSING_MODEL.CARD_ON_FILE;
     }
-    setPaymentTransactionType(paymentInstrument, paymentRequest.paymentMethod);
-
+    AdyenHelper.setPaymentTransactionType(paymentInstrument, paymentRequest.paymentMethod);
     // make API call
     return doPaymentsCall(order, paymentInstrument, paymentRequest);
   } catch (e) {

diff --git a/src/cartridges/int_adyen_overlay/cartridge/scripts/util/adyenConfigs.js b/src/cartridges/int_adyen_overlay/cartridge/scripts/util/adyenConfigs.js
@@ -105,10 +105,6 @@ const adyenConfigsObj = {
     return getCustomPreference('AdyenTokenisationEnabled');
   },
 
-  getAdyenSalePaymentMethods: function () {
-    return getCustomPreference('AdyenSalePaymentMethods') ? getCustomPreference('AdyenSalePaymentMethods').toString().split(',') : '';
-  },
-
   getAdyenBasketFieldsEnabled() {
     return getCustomPreference('AdyenBasketFieldsEnabled');
   },
@@ -127,7 +123,7 @@ const adyenConfigsObj = {
 
   getAdyenSalePaymentMethods: function () {
     return getCustomPreference('AdyenSalePaymentMethods')
-      ? getCustomPreference('AdyenSalePaymentMethods').toString().split(',')
+      ? getCustomPreference('AdyenSalePaymentMethods').replace(/\s/g, '').toString().split(',')
       : [];
   },
 

diff --git a/src/cartridges/int_adyen_overlay/cartridge/scripts/util/adyenHelper.js b/src/cartridges/int_adyen_overlay/cartridge/scripts/util/adyenHelper.js
@@ -860,6 +860,23 @@ var adyenHelperObj = {
     };
   },
 
+  getPaymentMethodType(paymentMethod){
+    return paymentMethod.type === constants.ACTIONTYPES.GIFTCARD ? paymentMethod.brand : paymentMethod.type;
+  },
+
+//SALE payment methods require payment transaction type to be Capture
+  setPaymentTransactionType(paymentInstrument, paymentMethod) {
+    const salePaymentMethods = AdyenConfigs.getAdyenSalePaymentMethods();
+    const paymentMethodType = this.getPaymentMethodType(paymentMethod);
+    if (salePaymentMethods.indexOf(paymentMethodType) > -1) {
+      Transaction.wrap(function () {
+        paymentInstrument
+          .getPaymentTransaction()
+          .setType(dw.order.PaymentTransaction.TYPE_CAPTURE);
+      });
+    }
+  },
+
   executeCall(serviceType, requestObject) {
     const service = this.getService(serviceType);
     if (service === null) {

diff --git a/src/cartridges/int_adyen_overlay/cartridge/scripts/util/giftCardsHelper.js b/src/cartridges/int_adyen_overlay/cartridge/scripts/util/giftCardsHelper.js
@@ -17,6 +17,7 @@
  * See the LICENSE file for more info.
  */
 const constants = require('*/cartridge/adyenConstants/constants');
+const AdyenHelper = require('*/cartridge/scripts/util/adyenHelper');
 const Transaction = require('dw/system/Transaction');
 //script includes
 const PaymentMgr = require('dw/order/PaymentMgr');
@@ -49,6 +50,7 @@ let giftCardsHelper = {
       paymentInstrument.paymentTransaction.custom.Adyen_log = JSON.stringify(parsedGiftCardObj);
       paymentInstrument.paymentTransaction.custom.Adyen_pspReference = parsedGiftCardObj.giftCard.pspReference;
     })
+    AdyenHelper.setPaymentTransactionType(paymentInstrument, parsedGiftCardObj.giftCard);
   }
 };