SL-353/SL-354: fields settings block logic

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

@@ -29,6 +29,7 @@
 use Invertus\SaferPay\Repository\SaferPaySavedCreditCardRepository;
 use Invertus\SaferPay\Adapter\Configuration as SaferPayConfiguration;
 use Invertus\SaferPay\Service\SaferPayFieldCreator;
+use Invertus\SaferPay\Service\SaferPayGenerateFieldAccessToken;
 use Invertus\SaferPay\Service\SaferPayGetLicense;
 use Invertus\SaferPay\Service\SaferPayGetTerminals;
 use Invertus\SaferPay\Service\SaferPayLogoCreator;
@@ -39,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';
 
@@ -58,6 +60,7 @@ class AdminSaferPayOfficialSettingsController extends ModuleAdminController
         'saveGeneralSettings',
         'savePaymentMethods',
         'getTerminals',
+        'generateFieldAccessToken',
         'refreshData',
     ];
 
@@ -176,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);
 
@@ -207,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 {
@@ -225,17 +239,29 @@ public function ajaxProcessSaveCredentials()
                 $configuration->set(SaferPayConfig::BUSINESS_LICENSE . $suffix, $hasBusinessLicense ? 1 : 0);
             } catch (\Exception $e) {
                 $configuration->set(SaferPayConfig::BUSINESS_LICENSE . $suffix, 0);
-                $licenseMessage = ' ' . $this->module->l('Could not retrieve license information. Please verify your credentials.', self::FILE_NAME);
+                $licenseFetchFailed = true;
+
+                /** @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('API Credentials 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,
             ]
         );
     }
@@ -309,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));
@@ -363,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,
@@ -425,6 +470,60 @@ public function ajaxProcessGetTerminals()
         }
     }
 
+    /**
+     * AJAX: Generate Saferpay Fields access token
+     */
+    public function ajaxProcessGenerateFieldAccessToken()
+    {
+        $data = $this->getJsonInput();
+        $isTestMode = isset($data['env']) && $data['env'] === 'test';
+        $suffix = $isTestMode ? SaferPayConfig::TEST_SUFFIX : '';
+
+        $username = isset($data['username']) ? trim($data['username']) : '';
+        $password = isset($data['password']) ? $data['password'] : '';
+        $terminalId = isset($data['terminalId']) ? trim($data['terminalId']) : '';
+        $customerId = $this->parseCustomerIdFromUsername($username);
+
+        if ($password === self::PASSWORD_PLACEHOLDER) {
+            /** @var SaferPayConfiguration $configuration */
+            $configuration = $this->module->getService(SaferPayConfiguration::class);
+            $password = (string) $configuration->get(SaferPayConfig::PASSWORD . $suffix);
+        }
+
+        if (empty($username) || empty($password) || empty($customerId) || empty($terminalId)) {
+            $this->ajaxResponse(false, $this->module->l('Please enter valid credentials and select a terminal first.', self::FILE_NAME));
+            return;
+        }
+
+        try {
+            /** @var SaferPayGenerateFieldAccessToken $tokenGenerator */
+            $tokenGenerator = $this->module->getService(SaferPayGenerateFieldAccessToken::class);
+            $shopUrl = $this->context->link->getBaseLink();
+            $token = $tokenGenerator->generateWithCredentials($username, $password, $customerId, $terminalId, $isTestMode, $shopUrl);
+
+            /** @var SaferPayConfiguration $configuration */
+            $configuration = $this->module->getService(SaferPayConfiguration::class);
+            $configuration->set(SaferPayConfig::FIELDS_ACCESS_TOKEN . $suffix, $token);
+
+            $this->sendJsonResponse([
+                'success' => true,
+                'message' => $this->module->l('Access token generated successfully.', self::FILE_NAME),
+                'token' => $token,
+            ]);
+        } catch (\Exception $e) {
+            \PrestaShopLogger::addLog(
+                'SaferPay: Failed to generate field access token - ' . $e->getMessage(),
+                3,
+                null,
+                null,
+                null,
+                true
+            );
+
+            $this->ajaxResponse(false, $this->module->l('Failed to generate access token.', self::FILE_NAME));
+        }
+    }
+
     /**
      * AJAX: Refresh all data
      */
@@ -465,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),
@@ -486,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
@@ -700,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.