Merge pull request #1284 from Adyen/release/25.2.1

Release/25.2.1

Author: amihajlovski

cartridges/app_adyen_SFRA/.project

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
     <projectDescription>
       <name>app_adyen_SFRA</name>
-      <comment>v25.2.0</comment>
+      <comment>v25.2.1</comment>
       <projects></projects>
       <buildSpec>
         <buildCommand>

cartridges/bm_adyen/.project

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
     <projectDescription>
       <name>bm_adyen</name>
-      <comment>v25.2.0</comment>
+      <comment>v25.2.1</comment>
       <projects></projects>
       <buildSpec>
         <buildCommand>

cartridges/bm_adyen/cartridge/controllers/AdyenSettings.js

@@ -4,6 +4,7 @@ var server = require('server');
 var Transaction = require('dw/system/Transaction');
 var csrfProtection = require('dw/web/CSRFProtection');
 var URLUtils = require('dw/web/URLUtils');
+var PaymentMgr = require('dw/order/PaymentMgr');
 var AdyenConfigs = require('*/cartridge/adyen/utils/adyenConfigs');
 var AdyenHelper = require('*/cartridge/adyen/utils/adyenHelper');
 var constants = require('*/cartridge/adyen/config/constants');
@@ -77,19 +78,23 @@ server.post('TestConnection', server.middleware.https, function (req, res, next)
   return next();
 });
 server.get('GetStores', server.middleware.https, function (req, res, next) {
-  try {
-    var stores = managementApi.fetchAllStores();
-    bmHelper.saveMetadataField('Adyen_StoreId', stores);
-    res.json({
-      success: true,
-      stores: stores
-    });
-  } catch (error) {
-    AdyenLogs.error_log('Error while fetching stores:', error);
-    res.json({
-      success: false
-    });
+  if (PaymentMgr.getPaymentMethod(constants.METHOD_ADYEN_POS).isActive()) {
+    try {
+      bmHelper.saveMetadataField('Adyen_StoreId', []);
+      var stores = managementApi.fetchAllStores();
+      bmHelper.saveMetadataField('Adyen_StoreId', stores);
+      res.json({
+        success: true,
+        stores: stores
+      });
+    } catch (error) {
+      AdyenLogs.error_log('Error while fetching stores:', error);
+      res.json({
+        success: false
+      });
+    }
+    return next();
   }
-  return next();
+  return {};
 });
 module.exports = server.exports();

cartridges/bm_adyen/cartridge/static/default/js/adyenSettings.js

@@ -97,16 +97,18 @@ document.addEventListener('DOMContentLoaded', () => {
   const listItems = [];
   let dragStartIndex;
   function renderStores() {
-    const stores = JSON.parse(availableStores);
-    stores.forEach(store => {
-      const option = document.createElement('option');
-      option.value = store.reference;
-      option.textContent = `${store.reference} (${store.id})`;
-      terminalDropdown.appendChild(option);
-      if (activeSelectedStores.includes(store.reference)) {
-        option.selected = true;
-      }
-    });
+    if (availableStores) {
+      const stores = JSON.parse(availableStores);
+      stores.forEach(store => {
+        const option = document.createElement('option');
+        option.value = store.reference;
+        option.textContent = `${store.reference} (${store.id})`;
+        terminalDropdown.appendChild(option);
+        if (activeSelectedStores.includes(store.reference)) {
+          option.selected = true;
+        }
+      });
+    }
   }
   function settingChanged(key, value) {
     const settingIndex = changedSettings.findIndex(setting => setting.key === key);

cartridges/int_adyen_SFRA/.project

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
     <projectDescription>
       <name>int_adyen_SFRA</name>
-      <comment>v25.2.0</comment>
+      <comment>v25.2.1</comment>
       <projects></projects>
       <buildSpec>
         <buildCommand>

cartridges/int_adyen_SFRA/cartridge/adyen/config/constants.js

@@ -120,5 +120,5 @@ module.exports = {
   EXTERNAL_PLATFORM_VERSION: 'SFRA',
   APPLE_DOMAIN_URL: '/.well-known/apple-developer-merchantid-domain-association',
   CHECKOUT_COMPONENT_VERSION: '5.68.0',
-  VERSION: '25.2.0'
+  VERSION: '25.2.1'
 };

cartridges/int_adyen_SFRA/cartridge/adyen/scripts/pos/adyenTerminalApi.js

@@ -135,10 +135,6 @@ function createTerminalPayment(order, paymentInstrument, terminalId) {
       }
       if (paymentResponse.result === constants.RESULTCODES.SUCCESS) {
         order.custom.Adyen_eventCode = constants.RESULTCODES.AUTHORISATION;
-        // Set payment status and export status
-        order.setPaymentStatus(Order.PAYMENT_STATUS_PAID);
-        order.setConfirmationStatus(Order.CONFIRMATION_STATUS_CONFIRMED);
-        order.setExportStatus(Order.EXPORT_STATUS_READY);
         result = {
           error: false,
           authorized: true

cartridges/int_custom_cartridge/.project

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
     <projectDescription>
       <name>int_custom_cartridge</name>
-      <comment>v25.2.0</comment>
+      <comment>v25.2.1</comment>
       <projects></projects>
       <buildSpec>
         <buildCommand>

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "app_adyen_SFRA",
-  "version": "25.2.0",
+  "version": "25.2.1",
   "description": "Adyen's official cartridge for SFRA",
   "main": "index.js",
   "paths": {