SL-355: add Capture option to 3D Secure failure behavior setting

changelog.md

@@ -196,4 +196,7 @@
 ## [2.0.2]
 - Remove WL Crypto payment method
 - Added setting to toggle order confirmation email sending
-- Added feature to group card payment methods into unified "Card" payment method
+- Added feature to group card payment methods into unified "Card" payment method
+- Fixed issue when newly enabled payment methods did not appear in checkout because default "all countries/currencies" restriction was not created on save
+- Fixed issue when payment method country/currency dropdowns showed "0" instead of indicating that all countries/currencies are allowed
+- BO : Added validation for Merchant Emails field (frontend + backend) to prevent saving invalid addresses

controllers/admin/AdminSaferPayOfficialSettingsController.php

@@ -40,6 +40,7 @@
 use Invertus\SaferPay\Service\SaferPayRestrictionCreator;
 use Invertus\SaferPay\Exception\Api\SaferPayApiException;
 use Invertus\SaferPay\Exception\Restriction\RestrictionException;
+use Invertus\SaferPay\Logger\LoggerInterface;
 
 require_once dirname(__FILE__) . '/../../vendor/autoload.php';
 
@@ -178,6 +179,17 @@ public function ajaxProcessSaveCredentials()
             }
         }
 
+        $testMerchantEmails = $this->getStringValue($data, 'testMerchantEmails');
+        $liveMerchantEmails = $this->getStringValue($data, 'liveMerchantEmails');
+        $invalidEmail = $this->findInvalidEmail($testMerchantEmails) ?: $this->findInvalidEmail($liveMerchantEmails);
+        if ($invalidEmail !== null) {
+            $this->ajaxResponse(false, sprintf(
+                $this->module->l('Invalid merchant email address: %s', self::FILE_NAME),
+                $invalidEmail
+            ));
+            return;
+        }
+
         // Credentials validated — now save
         $configuration->set(SaferPayConfig::TEST_MODE, $isTestMode ? 1 : 0);
 
@@ -209,8 +221,8 @@ public function ajaxProcessSaveCredentials()
 
         // Auto-detect license features from Saferpay Management API
         $suffix = $isTestMode ? SaferPayConfig::TEST_SUFFIX : '';
-        $licenseMessage = '';
         $hasBusinessLicense = false;
+        $licenseFetchFailed = false;
 
         if (!empty($activeUsername) && !empty($activePassword) && !empty($activeCustomerId)) {
             try {
@@ -227,18 +239,29 @@ public function ajaxProcessSaveCredentials()
                 $configuration->set(SaferPayConfig::BUSINESS_LICENSE . $suffix, $hasBusinessLicense ? 1 : 0);
             } catch (\Exception $e) {
                 $configuration->set(SaferPayConfig::BUSINESS_LICENSE . $suffix, 0);
+                $licenseFetchFailed = true;
 
-                $licenseMessage = ' ' . $this->module->l('Could not retrieve license information. Please verify your credentials.', self::FILE_NAME);
+                /** @var LoggerInterface $logger */
+                $logger = $this->module->getService(LoggerInterface::class);
+                $logger->error('License fetch failed on credentials save: ' . $e->getMessage(), [
+                    'context' => ['exception_class' => get_class($e)],
+                ]);
             }
         } else {
             $configuration->set(SaferPayConfig::BUSINESS_LICENSE . $suffix, 0);
         }
 
+        $message = $licenseFetchFailed
+            ? $this->module->l('Settings saved, but Saferpay Fields availability could not be confirmed. Please try again later or check the module Logs for details.', self::FILE_NAME)
+            : $this->module->l('Settings saved successfully.', self::FILE_NAME);
+
         $this->ajaxResponse(
             true,
-            $this->module->l('Settings saved successfully.', self::FILE_NAME) . $licenseMessage,
+            $message,
             [
-                'hasBusinessLicense' => $hasBusinessLicense,
+                'testHasBusinessLicense' => (bool) $configuration->get(SaferPayConfig::BUSINESS_LICENSE . SaferPayConfig::TEST_SUFFIX),
+                'liveHasBusinessLicense' => (bool) $configuration->get(SaferPayConfig::BUSINESS_LICENSE),
+                'warning' => $licenseFetchFailed,
             ]
         );
     }
@@ -312,7 +335,19 @@ public function ajaxProcessSaveGeneralSettings()
 
         $configuration->set(SaferPayConfig::SAFERPAY_ORDER_STATE_CHOICE_AWAITING_PAYMENT, $this->getIntValue($data, 'orderStateAwaitingPayment'));
         $configuration->set(SaferPayConfig::SAFERPAY_PAYMENT_DESCRIPTION, $this->getStringValue($data, 'paymentDescription'));
-        $configuration->set(SaferPayConfig::CONFIGURATION_NAME, $this->getStringValue($data, 'configurationName'));
+
+        $configurationName = $this->getStringValue($data, 'configurationName');
+        if ($configurationName !== '' && (strlen($configurationName) > 20 || !preg_match('/^[A-Za-z0-9.:\-_]+$/', $configurationName))) {
+            $this->ajaxResponse(false, $this->module->l('Only letters, numbers, dots, colons, hyphens, and underscores are allowed. Max 20 characters.', self::FILE_NAME));
+            return;
+        }
+        $configuration->set(SaferPayConfig::CONFIGURATION_NAME, $configurationName);
+        $hostedFieldsTemplate = $this->getIntValue($data, 'hostedFieldsTemplate');
+        if ($hostedFieldsTemplate < 1 || $hostedFieldsTemplate > 3) {
+            $hostedFieldsTemplate = SaferPayConfig::HOSTED_FIELDS_TEMPLATE_DEFAULT;
+        }
+        $configuration->set(SaferPayConfig::HOSTED_FIELDS_TEMPLATE, $hostedFieldsTemplate);
+        $configuration->set(SaferPayConfig::SAFERPAY_ORDER_ID_OPTION, $this->getIntValue($data, 'orderIdOption'));
         $configuration->set(SaferPayConfig::SAFERPAY_DEBUG_MODE, !empty($data['debugMode']) ? 1 : 0);
 
         $this->ajaxResponse(true, $this->module->l('General settings saved successfully', self::FILE_NAME));
@@ -366,6 +401,13 @@ public function ajaxProcessSavePaymentMethods()
                 $countries = isset($method['countries']) ? $method['countries'] : [];
                 $currencies = isset($method['currencies']) ? $method['currencies'] : [];
 
+                if (empty($countries)) {
+                    $countries = [SaferPayRestrictionCreator::RESTRICTION_ALL];
+                }
+                if (empty($currencies)) {
+                    $currencies = [SaferPayRestrictionCreator::RESTRICTION_ALL];
+                }
+
                 $success = $restrictionCreator->updateRestriction(
                     $paymentName,
                     SaferPayRestrictionCreator::RESTRICTION_COUNTRY,
@@ -522,8 +564,9 @@ private function collectSettingsData()
             'liveFieldAccessToken' => (string) $configuration->get(SaferPayConfig::FIELDS_ACCESS_TOKEN),
             'liveFieldJsUrl' => (string) $configuration->get(SaferPayConfig::FIELDS_LIBRARY),
 
-            // License (auto-detected)
-            'hasBusinessLicense' => (bool) $configuration->get(SaferPayConfig::BUSINESS_LICENSE . SaferPayConfig::getConfigSuffix()),
+            // License (auto-detected, per environment)
+            'testHasBusinessLicense' => (bool) $configuration->get(SaferPayConfig::BUSINESS_LICENSE . SaferPayConfig::TEST_SUFFIX),
+            'liveHasBusinessLicense' => (bool) $configuration->get(SaferPayConfig::BUSINESS_LICENSE),
 
             // Payment Processing
             'paymentBehavior' => (int) $configuration->get(SaferPayConfig::PAYMENT_BEHAVIOR),
@@ -543,6 +586,9 @@ private function collectSettingsData()
             'orderStateAwaitingPayment' => (int) $configuration->get(SaferPayConfig::SAFERPAY_ORDER_STATE_CHOICE_AWAITING_PAYMENT),
             'paymentDescription' => (string) $configuration->get(SaferPayConfig::SAFERPAY_PAYMENT_DESCRIPTION),
             'configurationName' => (string) $configuration->get(SaferPayConfig::CONFIGURATION_NAME),
+            'hostedFieldsTemplate' => (int) $configuration->get(SaferPayConfig::HOSTED_FIELDS_TEMPLATE),
+            'modulePath' => $this->module->getPathUri(),
+            'orderIdOption' => (int) $configuration->get(SaferPayConfig::SAFERPAY_ORDER_ID_OPTION),
             'debugMode' => (bool) $configuration->get(SaferPayConfig::SAFERPAY_DEBUG_MODE),
 
             // Reference data
@@ -757,4 +803,24 @@ private function getIntValue($data, $key)
     {
         return isset($data[$key]) ? (int) $data[$key] : 0;
     }
+
+    /**
+     * Returns the first invalid email in a comma-separated list, or null if all are valid.
+     */
+    private function findInvalidEmail($emails)
+    {
+        if ($emails === '') {
+            return null;
+        }
+        foreach (explode(',', $emails) as $email) {
+            $email = trim($email);
+            if ($email === '') {
+                continue;
+            }
+            if (!\Validate::isEmail($email)) {
+                return $email;
+            }
+        }
+        return null;
+    }
 }

controllers/front/notify.php

@@ -140,27 +140,50 @@ public function postProcess()
             //NOTE must be left below assert action to get newest information.
             $order = new Order($orderId);
 
+            $paymentBehaviorWithout3D = (int) Configuration::get(SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D);
+
             if (!$assertResponseBody->getLiability()->getLiabilityShift() &&
-                in_array($order->payment, SaferPayConfig::SUPPORTED_3DS_PAYMENT_METHODS) &&
-                (int) Configuration::get(SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D) === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_CANCEL
+                in_array($order->payment, SaferPayConfig::SUPPORTED_3DS_PAYMENT_METHODS)
             ) {
                 /** @var SaferPayOrderStatusService $orderStatusService */
                 $orderStatusService = $this->module->getService(SaferPayOrderStatusService::class);
-                $orderStatusService->cancel($order);
 
-                $logger->debug(sprintf('%s - Liability shift is false', self::FILE_NAME), [
-                    'context' => [
-                        'id_order' => $order->id,
-                    ],
-                ]);
+                if ($paymentBehaviorWithout3D === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_CANCEL) {
+                    $orderStatusService->cancel($order);
 
-                $logger->debug(sprintf('%s - liability shift is false', self::FILE_NAME), [
-                    'context' => [
-                        'id_order' => $order->id,
-                    ],
-                ]);
+                    $logger->debug(sprintf('%s - Liability shift is false, canceling order', self::FILE_NAME), [
+                        'context' => [
+                            'id_order' => $order->id,
+                        ],
+                    ]);
 
-                die($this->module->l('Liability shift is false', self::FILE_NAME));
+                    die($this->module->l('Liability shift is false', self::FILE_NAME));
+                }
+
+                if ($paymentBehaviorWithout3D === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_AUTHORIZE) {
+                    $logger->debug(sprintf('%s - Liability shift is false, order left authorized', self::FILE_NAME), [
+                        'context' => [
+                            'id_order' => $order->id,
+                        ],
+                    ]);
+
+                    die($this->module->l('Liability shift is false, order left authorized', self::FILE_NAME));
+                }
+
+                if ($paymentBehaviorWithout3D === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_CAPTURE
+                    && SaferPayConfig::supportsOrderCapture($order->payment)
+                    && $transactionStatus !== TransactionStatus::CAPTURED
+                ) {
+                    $orderStatusService->capture($order);
+
+                    $logger->debug(sprintf('%s - Liability shift is false, capturing order', self::FILE_NAME), [
+                        'context' => [
+                            'id_order' => $order->id,
+                        ],
+                    ]);
+
+                    die($this->module->l('Liability shift is false, capturing order', self::FILE_NAME));
+                }
             }
 
             //NOTE to get latest information possible and not override new information.

controllers/front/return.php

@@ -274,15 +274,17 @@ private function executeTransaction($orderId, $selectedCard)
      */
     private function getRedirectionToControllerUrl($controllerName)
     {
-        $cartId = $this->context->cart->id ? $this->context->cart->id : Tools::getValue('cartId');
+        $cartId = (int) Tools::getValue('cartId') ?: (int) $this->context->cart->id;
+        $cart = new Cart($cartId);
+        $secureKey = Validate::isLoadedObject($cart) ? $cart->secure_key : $this->context->cart->secure_key;
 
         return $this->context->link->getModuleLink(
             $this->module->name,
             $controllerName,
             [
                 'cartId' => $cartId,
                 'orderId' => Order::getIdByCartId($cartId),
-                'secureKey' => $this->context->cart->secure_key,
+                'secureKey' => $secureKey,
                 'moduleId' => $this->module->id,
             ]
         );
@@ -329,19 +331,39 @@ private function createAndValidateOrder($assertResponseBody, $transactionStatus,
         $orderId = Order::getIdByCartId($cartId);
 
         $order = new Order($orderId);
+        $paymentBehaviorWithout3D = (int) Configuration::get(SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D);
+
         if (!$assertResponseBody->getLiability()->getLiabilityShift() &&
-            in_array($order->payment, SaferPayConfig::SUPPORTED_3DS_PAYMENT_METHODS) &&
-            (int) Configuration::get(SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D) === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_CANCEL
+            in_array($order->payment, SaferPayConfig::SUPPORTED_3DS_PAYMENT_METHODS)
         ) {
             /** @var SaferPayOrderStatusService $orderStatusService */
             $orderStatusService = $this->module->getService(SaferPayOrderStatusService::class);
-            $orderStatusService->cancel($order);
+
+            if ($paymentBehaviorWithout3D === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_CANCEL) {
+                $orderStatusService->cancel($order);
+
+                return;
+            }
+
+            if ($paymentBehaviorWithout3D === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_AUTHORIZE) {
+                return;
+            }
+
+            if ($paymentBehaviorWithout3D === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_CAPTURE
+                && SaferPayConfig::supportsOrderCapture($order->payment)
+                && $transactionStatus !== TransactionStatus::CAPTURED
+            ) {
+                $orderStatusService->capture($order);
+
+                return;
+            }
         }
 
         //NOTE to get latest information possible and not override new information.
 
-        $paymentMethod = $assertResponseBody->getPaymentMeans()->getBrand()->getPaymentMethod();// if payment does not support order capture, it means it always auto-captures it (at least with accountToAccount payment),
+        $paymentMethod = $assertResponseBody->getPaymentMeans()->getBrand()->getPaymentMethod();
 
+        // if payment does not support order capture, it means it always auto-captures it (at least with accountToAccount payment),
         // so in this case if status comes back "captured" we just update the order state accordingly
         if (!SaferPayConfig::supportsOrderCapture($paymentMethod) &&
             $transactionStatus === TransactionStatus::CAPTURED

cypress/integration/01_ps1764.Module.Configure.cy.js

@@ -117,14 +117,6 @@ it('04 Fields and Logs tabs are shown OK', () => {
     cy.get('.pstaggerAddTagInput').type('saferpay')
     cy.get('#module-search-button').click()
     cy.get('.btn-group > .btn-primary-reverse').click()  //clicking the Congifure
-    cy.get('#subtab-AdminSaferPayOfficialFields').click()
-    cy.get('[id="configuration_form"]').should('be.visible')
-    cy.get('.field-container > :nth-child(1) > img').click()
-    cy.get(':nth-child(2) > img').click()
-    cy.get(':nth-child(3) > img').click()
-    cy.get('[class="alert alert-info"]').should('be.visible')
-    cy.get('[name="submitOptionsconfiguration"]').click()
-    cy.get('[class="alert alert-success"]').should('be.visible')
     cy.get('#subtab-AdminSaferPayOfficialLogs').click()
     cy.get('[id="form-saferpay_log"]').should('be.visible')
 })