Release v1.2.5

.github/PULL_REQUEST_TEMPLATE.yml

@@ -0,0 +1,23 @@
+## Self-Checks
+- [ ] I have performed a self-review of my code.
+- [ ] I have updated/added necessary technical documentation in the [README](/README.md) file.
+
+## Summary
+  <!-- Briefly explain the purpose of this PR in 1-2 sentences -->
+
+## QA Checklist Labels
+- [ ] Bug fix? <!-- Maps to "bug" label -->
+- [ ] New feature? <!-- Maps to "feature" label -->
+- [ ] Improvement? <!-- Maps to "improvement" label -->
+- [ ] Technical debt? <!-- Maps to "debt" label -->
+- [ ] Reusable? <!-- Maps to "reuse" label -->
+- [ ] Covered by tests? <!-- Maps to "tested" label -->
+
+## QA Checklist
+  <!-- Provide related ticket/PR's -->
+
+  ## Additional Context 
+  <!-- Provide a concise description of the changes made in this PR. -->
+
+  ## Frontend Changes
+  <!-- If applicable, provide visual elements such as screenshots, GIFs, or videos to demonstrate frontend changes. -->

.github/workflows/PULL_REQUEST_LABELS.yml

@@ -0,0 +1,10 @@
+name: Apply Labels Based on PR Template
+
+on:
+  pull_request:
+    types: [opened, edited]
+
+jobs:
+  label-management:
+    uses: Invertus/github-templates/.github/workflows/[email protected]
+    secrets: inherit

.github/workflows/PULL_REQUEST_NAMING_RULES.yml

@@ -0,0 +1,12 @@
+name: Names rules
+
+on: [pull_request, workflow_dispatch]
+
+jobs:
+  branch-name-check:
+    uses: Invertus/github-templates/.github/workflows/[email protected]
+    secrets: inherit
+
+  pr-title-check:
+    uses: Invertus/github-templates/.github/workflows/[email protected]
+    secrets: inherit

changelog.md

@@ -175,4 +175,10 @@
 - Implemented code logging
 - Requiring card holder name when entering card details
 - Removed depreciated feature for custom CSS
-- Compatibility with most popular OPC modules (The Checkout, Super Checkout, One Page Checkout PS)
+- Compatibility with most popular OPC modules (The Checkout, Super Checkout, One Page Checkout PS)
+
+## [1.2.5]
+- Fixed issue with JSON API Password escaping HTML entities
+- Added new payment methods: Blik, ClickToPay
+- Fixed performance issues when loading "Payments" tab in Back office.
+- Fixed issue when saferpay logic is executing on other payment methods which is not saferpay

controllers/admin/AdminSaferPayOfficialPaymentController.php

@@ -164,6 +164,11 @@ protected function renderShoppingPointOptions()
         $fieldsForm = [];
         $fieldsForm[0]['form'] = $this->fields_form;
 
+        /** @var \Invertus\SaferPay\Service\SaferPayObtainPaymentMethods $saferPayObtainPaymentMethods */
+        $saferPayObtainPaymentMethods = $this->module->getService(SaferPayObtainPaymentMethods::class);
+
+        $paymentMethodsList = $saferPayObtainPaymentMethods->obtainPaymentMethods();
+
         foreach ($paymentMethods as $paymentMethod) {
             $isActive = $paymentRepository->isActiveByName($paymentMethod);
             $isLogoActive = $logoRepository->isActiveByName($paymentMethod);
@@ -184,7 +189,7 @@ protected function renderShoppingPointOptions()
                     'paymentMethod' => $paymentMethod,
                     'countryOptions' => $this->getActiveCountriesList(),
                     'countrySelect' => $selectedCountries,
-                    'currencyOptions' => $this->getActiveCurrenciesList($paymentMethod),
+                    'currencyOptions' => $this->getActiveCurrenciesList($paymentMethod, $paymentMethodsList),
                     'currencySelect' => $selectedCurrencies,
                     'is_field_active' => $isFieldActive,
                     'supported_field_payments' => SaferPayConfig::FIELD_SUPPORTED_PAYMENT_METHODS,
@@ -219,14 +224,18 @@ public function getActiveCountriesList($onlyActive = true)
         return $countriesWithNames;
     }
 
-    public function getActiveCurrenciesList($paymentMethod)
+    public function getActiveCurrenciesList($paymentMethod, $paymentMethods)
     {
-        /** @var \Invertus\SaferPay\Service\SaferPayObtainPaymentMethods $saferPayObtainPaymentMethods */
-        $saferPayObtainPaymentMethods = $this->module->getService(SaferPayObtainPaymentMethods::class);
+        $currencyOptions[0] = $this->l('All');
 
-        $paymentMethods = $saferPayObtainPaymentMethods->obtainPaymentMethods();
+        if (!isset($paymentMethods[$paymentMethod]['currencies']) && in_array($paymentMethod, SaferPayConfig::WALLET_PAYMENT_METHODS)) {
+            foreach (Currency::getCurrencies() as $currency) {
+                $currencyOptions[$currency['id_currency']] = $currency['iso_code'];
+            }
+
+            return $currencyOptions;
+        }
 
-        $currencyOptions[0] = $this->l('All');
         foreach ($paymentMethods[$paymentMethod]['currencies'] as $currencyIso) {
             if (Currency::getIdByIsoCode($currencyIso)) {
                 $currencyOptions[Currency::getIdByIsoCode($currencyIso)] = $currencyIso;

controllers/admin/AdminSaferPayOfficialSettingsController.php

@@ -125,8 +125,9 @@ public function initOptions()
                     ],
                     SaferPayConfig::PASSWORD => [
                         'title' => $this->l('JSON API Password'),
-                        'type' => 'text',
+                        'type' => 'password_input',
                         'class' => 'fixed-width-xl',
+                        'value' => Configuration::get(SaferPayConfig::PASSWORD),
                     ],
                     SaferPayConfig::CUSTOMER_ID => [
                         'title' => $this->l('Customer ID'),
@@ -192,8 +193,9 @@ public function initOptions()
                     ],
                     SaferPayConfig::PASSWORD . SaferPayConfig::TEST_SUFFIX => [
                         'title' => $this->l('JSON API Password'),
-                        'type' => 'text',
+                        'type' => 'password_input',
                         'class' => 'fixed-width-xl',
+                        'value' => Configuration::get(SaferPayConfig::PASSWORD . SaferPayConfig::TEST_SUFFIX),
                     ],
                     SaferPayConfig::CUSTOMER_ID . SaferPayConfig::TEST_SUFFIX => [
                         'title' => $this->l('Customer ID'),

saferpayofficial.php

@@ -21,6 +21,8 @@
  *@license   SIX Payment Services
  */
 
+use Invertus\SaferPay\Config\SaferPayConfig;
+
 if (!defined('_PS_VERSION_')) {
     exit;
 }
@@ -40,7 +42,7 @@ public function __construct($name = null)
     {
         $this->name = 'saferpayofficial';
         $this->author = 'Invertus';
-        $this->version = '1.2.4';
+        $this->version = '1.2.5';
         $this->module_key = '3d3506c3e184a1fe63b936b82bda1bdf';
         $this->displayName = 'SaferpayOfficial';
         $this->description = 'Saferpay Payment module';
@@ -216,11 +218,16 @@ public function hookPaymentOptions($params)
         foreach ($paymentMethods as $paymentMethod) {
             $paymentMethod['paymentMethod'] = str_replace(' ', '', $paymentMethod['paymentMethod']);
 
-            if (!in_array($paymentMethod['paymentMethod'], $activePaymentMethods)) {
-                continue;
+            if (in_array($paymentMethod['paymentMethod'], SaferPayConfig::WALLET_PAYMENT_METHODS)) {
+                foreach (Currency::getCurrencies() as $currency) {
+                    $currencyOptions[$currency['id_currency']] = $currency['iso_code'];
+                }
+
+                $paymentMethod['currencies'] = $currencyOptions;
             }
 
-            if (!in_array($this->context->currency->iso_code, $paymentMethods[$paymentMethod['paymentMethod']]['currencies'])) {
+            if (!in_array($this->context->currency->iso_code, $paymentMethod['currencies'])
+                && !in_array($paymentMethod['paymentMethod'], SaferPayConfig::WALLET_PAYMENT_METHODS)) {
                 continue;
             }
 

src/Adapter/Cart.php

@@ -23,6 +23,10 @@
 
 namespace Invertus\SaferPay\Adapter;
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class Cart
 {
     /**

src/Config/SaferPayConfig.php

@@ -49,7 +49,7 @@ class SaferPayConfig
     const RESTRICT_REFUND_AMOUNT_TO_CAPTURED_AMOUNT = 'SAFERPAY_RESTRICT_REFUND_AMOUNT_TO_CAPTURED_AMOUNT';
     const CONFIGURATION_NAME = 'SAFERPAY_CONFIGURATION_NAME';
     const TEST_SUFFIX = '_TEST';
-    const API_VERSION = '1.40';
+    const API_VERSION = '1.43';
     const PAYMENT_METHODS = [
         self::PAYMENT_ALIPAY,
         self::PAYMENT_AMEX,
@@ -78,6 +78,7 @@ class SaferPayConfig
         self::PAYMENT_WLCRYPTOPAYMENTS,
         self::PAYMENT_WECHATPAY,
         self::PAYMENT_ACCOUNTTOACCOUNT,
+        self::PAYMENT_CLICKTOPAY,
     ];
 
     const PAYMENT_ALIPAY = 'ALIPAY';
@@ -113,10 +114,13 @@ class SaferPayConfig
     const PAYMENT_CARD = 'CARD';
     const PAYMENT_POSTFINANCE_PAY = 'POSTFINANCEPAY';
     const PAYMENT_WECHATPAY = 'WECHATPAY';
+    const PAYMENT_CLICKTOPAY = 'CLICKTOPAY';
+    const PAYMENT_BLIK = 'BLIK';
 
     const WALLET_PAYMENT_METHODS = [
         self::PAYMENT_APPLEPAY,
         self::PAYMENT_GOOGLEPAY,
+        self::PAYMENT_CLICKTOPAY,
     ];
 
     const PAYMENT_METHODS_KEYS = [
@@ -144,6 +148,7 @@ class SaferPayConfig
         'Card' => self::PAYMENT_CARD,
         'PostFinancePay' => self::PAYMENT_POSTFINANCE_PAY,
         'WeChatPay' => self::PAYMENT_WECHATPAY,
+        'Blik' => self::PAYMENT_BLIK,
     ];
 
     const FIELD_SUPPORTED_PAYMENT_METHODS = [
@@ -315,7 +320,9 @@ public static function isRedirectPayment($paymentMethod)
             self::PAYMENT_POSTFINANCE_PAY,
             self::PAYMENT_DIRECTDEBIT,
             self::PAYMENT_SOFORT,
-            self::PAYMENT_PAYPAL
+            self::PAYMENT_PAYPAL,
+            self::PAYMENT_CLICKTOPAY,
+            self::PAYMENT_BLIK,
         ];
 
         return in_array($paymentMethod, $paymentsAlwaysRedirect);

src/Context/index.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ *NOTICE OF LICENSE
+ *
+ *This source file is subject to the Open Software License (OSL 3.0)
+ *that is bundled with this package in the file LICENSE.txt.
+ *It is also available through the world-wide-web at this URL:
+ *http://opensource.org/licenses/osl-3.0.php
+ *If you did not receive a copy of the license and are unable to
+ *obtain it through the world-wide-web, please send an email
+ *to [email protected] so we can send you a copy immediately.
+ *
+ *DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ *versions in the future. If you wish to customize PrestaShop for your
+ *needs please refer to http://www.prestashop.com for more information.
+ *
+ *@author INVERTUS UAB www.invertus.eu  <[email protected]>
+ *@copyright SIX Payment Services
+ *@license   SIX Payment Services
+ */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;

src/Controller/AbstractAdminSaferPayController.php

@@ -27,6 +27,10 @@
 use Invertus\SaferPay\Response\JsonResponse;
 use Invertus\SaferPay\Utility\ExceptionUtility;
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class AbstractAdminSaferPayController extends \ModuleAdminController
 {
     const FILE_NAME = 'AbstractAdminSaferPayController';

src/EntityManager/index.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ *NOTICE OF LICENSE
+ *
+ *This source file is subject to the Open Software License (OSL 3.0)
+ *that is bundled with this package in the file LICENSE.txt.
+ *It is also available through the world-wide-web at this URL:
+ *http://opensource.org/licenses/osl-3.0.php
+ *If you did not receive a copy of the license and are unable to
+ *obtain it through the world-wide-web, please send an email
+ *to [email protected] so we can send you a copy immediately.
+ *
+ *DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ *versions in the future. If you wish to customize PrestaShop for your
+ *needs please refer to http://www.prestashop.com for more information.
+ *
+ *@author INVERTUS UAB www.invertus.eu  <[email protected]>
+ *@copyright SIX Payment Services
+ *@license   SIX Payment Services
+ */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;

src/Logger/Formatter/index.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ *NOTICE OF LICENSE
+ *
+ *This source file is subject to the Open Software License (OSL 3.0)
+ *that is bundled with this package in the file LICENSE.txt.
+ *It is also available through the world-wide-web at this URL:
+ *http://opensource.org/licenses/osl-3.0.php
+ *If you did not receive a copy of the license and are unable to
+ *obtain it through the world-wide-web, please send an email
+ *to [email protected] so we can send you a copy immediately.
+ *
+ *DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ *versions in the future. If you wish to customize PrestaShop for your
+ *needs please refer to http://www.prestashop.com for more information.
+ *
+ *@author INVERTUS UAB www.invertus.eu  <[email protected]>
+ *@copyright SIX Payment Services
+ *@license   SIX Payment Services
+ */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;

src/Logger/Logger.php

@@ -33,6 +33,10 @@
 use Invertus\SaferPay\Provider\BasicIdempotencyProvider;
 use Invertus\SaferPay\Repository\PrestashopLoggerRepositoryInterface;
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class Logger implements LoggerInterface
 {
     const FILE_NAME = 'Logger';

src/Logger/index.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ *NOTICE OF LICENSE
+ *
+ *This source file is subject to the Open Software License (OSL 3.0)
+ *that is bundled with this package in the file LICENSE.txt.
+ *It is also available through the world-wide-web at this URL:
+ *http://opensource.org/licenses/osl-3.0.php
+ *If you did not receive a copy of the license and are unable to
+ *obtain it through the world-wide-web, please send an email
+ *to [email protected] so we can send you a copy immediately.
+ *
+ *DISCLAIMER
+ *
+ * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
+ *versions in the future. If you wish to customize PrestaShop for your
+ *needs please refer to http://www.prestashop.com for more information.
+ *
+ *@author INVERTUS UAB www.invertus.eu  <[email protected]>
+ *@copyright SIX Payment Services
+ *@license   SIX Payment Services
+ */
+header('Expires: Mon, 26 Jul 1997 05:00:00 GMT');
+header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+
+header('Cache-Control: no-store, no-cache, must-revalidate');
+header('Cache-Control: post-check=0, pre-check=0', false);
+header('Pragma: no-cache');
+
+header('Location: ../');
+exit;

src/Service/LegacyTranslator.php

@@ -82,6 +82,9 @@ private function getTranslations()
             SaferPayConfig::PAYMENT_CARD => $this->module->l('Card', self::FILE_NAME),
             SaferPayConfig::PAYMENT_POSTFINANCE_PAY => $this->module->l('PostFinancePay', self::FILE_NAME),
             SaferPayConfig::PAYMENT_WECHATPAY => $this->module->l('WeChatPay', self::FILE_NAME),
+            SaferPayConfig::PAYMENT_BLIK => $this->module->l('Blik', self::FILE_NAME),
+            SaferPayConfig::PAYMENT_GOOGLEPAY => $this->module->l('Googlepay'),
+            SaferPayConfig::PAYMENT_CLICKTOPAY => $this->module->l('Clicktopay', self::FILE_NAME),
         ];
     }
 }

src/Service/SaferPayObtainPaymentMethods.php

@@ -87,7 +87,6 @@ public function obtainPaymentMethods()
                 $paymentMethods[$wallet->WalletName] = [
                     'paymentMethod' => $wallet->WalletName,
                     'logoUrl' => $wallet->LogoUrl,
-                    'currencies' => $paymentMethodObject->Currencies,
                 ];
             }
         }