Release 2.0.3

changelog.md

@@ -196,4 +196,10 @@
 ## [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
+
+## [2.0.3]
+- Optimized database performance
+- Dynamic termimal selection
+- Removed uneccesary inputs from admin settings
+- Checked overall module stability

composer.json

@@ -18,7 +18,10 @@
     "config": {
         "prepend-autoloader": false,
         "platform": {
-            "php": "5.6"
+            "php": "7.1"
+        },
+        "audit": {
+            "ignore": ["PKSA-wws7-mr54-jsny"]
         }
     },
     "repositories": {
@@ -33,22 +36,23 @@
         }
     },
     "require": {
+        "php": ">=7.1",
         "vlucas/phpdotenv": "^3.6",
-
         "symfony/config": "^3.4",
         "symfony/dependency-injection": "^3.4",
         "symfony/filesystem": "^3.4",
         "apimatic/unirest-php": "^2.3",
         "symfony/yaml": "^3.4",
-        "league/container": "2.5.0",
+        "league/container": "^3.0",
         "invertus/lock": "^1.0.0",
         "invertus/knapsack": "^10.0"
     },
     "require-dev": {
-        "friendsofphp/php-cs-fixer": "*",
-        "phpunit/phpunit": "*",
-        "behat/behat": "*",
-        "symfony/translation": "*",
+        "friendsofphp/php-cs-fixer": "^2.16.7",
+        "phpunit/phpunit": "^7.5",
+        "behat/behat": "^3.7",
+        "symfony/translation": "^3.4",
+        "symfony/process": "^3.4",
         "prestashop/php-dev-tools": "^3.16"
     },
     "scripts": {

controllers/admin/AdminSaferPayOfficialPaymentController.php

@@ -160,8 +160,10 @@ protected function renderShoppingPointOptions()
         $restrictionRepository = $this->module->getService(SaferPayRestrictionRepository::class);
 
         $paymentMethods = $this->getPaymentMethods();
-        if (is_null($paymentMethods)) {
-            return;
+        if (is_null($paymentMethods) || empty($paymentMethods)) {
+            $this->errors[] = $this->module->l('No payment methods available. Please check your SaferPay account configuration.');
+
+            return '';
         }
 
         $this->initForm();
@@ -204,6 +206,12 @@ protected function renderShoppingPointOptions()
                     $this->module->getLocalPath() . 'views/templates/admin/payment_method.tpl'
                 );
         }
+        $this->context->smarty->assign([
+            'countryOptions' => $this->getActiveCountriesList(),
+            'countrySelect' => [],
+            'currencyOptions' => [0 => $this->module->l('All')],
+            'currencySelect' => [],
+        ]);
         $referralOptionsForm->fields_value['all'] =
             $this->context->smarty->fetch(
                 $this->module->getLocalPath() . 'views/templates/admin/payment_method_all.tpl'

controllers/admin/AdminSaferPayOfficialSettingsController.php

@@ -24,6 +24,8 @@
 use Invertus\SaferPay\Config\SaferPayConfig;
 use Invertus\SaferPay\Repository\SaferPaySavedCreditCardRepository;
 use Invertus\SaferPay\Adapter\Configuration;
+use Invertus\SaferPay\Service\SaferPayTerminalService;
+use Invertus\SaferPay\Logger\LoggerInterface;
 
 require_once dirname(__FILE__) . '/../../vendor/autoload.php';
 
@@ -75,9 +77,71 @@ public function postProcess()
             $this->errors[] = $this->module->l('Field Access Token is required to use business license');
         }
 
+        $this->validateTerminalId();
+
         return true;
     }
 
+    private function validateTerminalId()
+    {
+        try {
+            /** @var Configuration $configuration */
+            $configuration = $this->module->getService(Configuration::class);
+
+            $suffix = SaferPayConfig::getConfigSuffix();
+
+            $terminalId = Tools::getValue(SaferPayConfig::TERMINAL_ID . $suffix);
+            $customerId = Tools::getValue(SaferPayConfig::CUSTOMER_ID . $suffix)
+                ?: $configuration->get(SaferPayConfig::CUSTOMER_ID . $suffix);
+            $username = Tools::getValue(SaferPayConfig::USERNAME . $suffix)
+                ?: $configuration->get(SaferPayConfig::USERNAME . $suffix);
+            $password = Tools::getValue(SaferPayConfig::PASSWORD . $suffix)
+                ?: $configuration->get(SaferPayConfig::PASSWORD . $suffix);
+
+            if (empty($terminalId) || empty($customerId) || empty($username) || empty($password)) {
+                return;
+            }
+
+            $originalCustomerId = \Configuration::get(SaferPayConfig::CUSTOMER_ID . $suffix);
+            $originalUsername = \Configuration::get(SaferPayConfig::USERNAME . $suffix);
+            $originalPassword = \Configuration::get(SaferPayConfig::PASSWORD . $suffix);
+
+            try {
+                \Configuration::updateValue(SaferPayConfig::CUSTOMER_ID . $suffix, $customerId);
+                \Configuration::updateValue(SaferPayConfig::USERNAME . $suffix, $username);
+                \Configuration::updateValue(SaferPayConfig::PASSWORD . $suffix, $password);
+
+                /** @var SaferPayTerminalService $terminalService */
+                $terminalService = $this->module->getService(SaferPayTerminalService::class);
+
+                $terminals = $terminalService->getAvailableTerminals();
+
+                $isValid = false;
+                foreach ($terminals as $terminal) {
+                    if ($terminal['TerminalId'] === $terminalId) {
+                        $isValid = true;
+                        break;
+                    }
+                }
+
+                if (!$isValid && !empty($terminals)) {
+                    $this->warnings[] = $this->module->l('Warning: The Terminal ID you entered was not found in the list of available terminals. Please verify the Terminal ID is correct.');
+                }
+            } finally {
+                \Configuration::updateValue(SaferPayConfig::CUSTOMER_ID . $suffix, $originalCustomerId);
+                \Configuration::updateValue(SaferPayConfig::USERNAME . $suffix, $originalUsername);
+                \Configuration::updateValue(SaferPayConfig::PASSWORD . $suffix, $originalPassword);
+            }
+        } catch (Exception $e) {
+            /** @var LoggerInterface $logger */
+            $logger = $this->module->getService(LoggerInterface::class);
+            $logger->error(sprintf('%s - Failed to validate terminal ID: %s', self::FILE_NAME, $e->getMessage()), [
+                'context' => [],
+                'exception' => $e,
+            ]);
+        }
+    }
+
     public function initOptions()
     {
         $this->context->smarty->assign(SaferPayConfig::PASSWORD, SaferPayConfig::WEB_SERVICE_PASSWORD_PLACEHOLDER);
@@ -104,6 +168,57 @@ public function setMedia($isNewTheme = false)
         $this->addJS('modules/' . $this->module->name . '/views/js/admin/saferpay_settings.js');
     }
 
+    /**
+     * @param string $environment 'test' or 'live'
+     * @return array
+     */
+    private function getTerminalsForEnvironment($environment = 'live')
+    {
+        $suffix = ($environment === 'test') ? SaferPayConfig::TEST_SUFFIX : '';
+
+        $customerId = Tools::getValue(SaferPayConfig::CUSTOMER_ID . $suffix)
+            ?: \Configuration::get(SaferPayConfig::CUSTOMER_ID . $suffix);
+        $username = Tools::getValue(SaferPayConfig::USERNAME . $suffix)
+            ?: \Configuration::get(SaferPayConfig::USERNAME . $suffix);
+        $password = Tools::getValue(SaferPayConfig::PASSWORD . $suffix)
+            ?: \Configuration::get(SaferPayConfig::PASSWORD . $suffix);
+
+        if (empty($customerId) || empty($username) || empty($password)) {
+            return [];
+        }
+
+        $originalCustomerId = \Configuration::get(SaferPayConfig::CUSTOMER_ID . $suffix);
+        $originalUsername = \Configuration::get(SaferPayConfig::USERNAME . $suffix);
+        $originalPassword = \Configuration::get(SaferPayConfig::PASSWORD . $suffix);
+        $originalTestMode = \Configuration::get(SaferPayConfig::TEST_MODE);
+
+        try {
+            \Configuration::updateValue(SaferPayConfig::CUSTOMER_ID . $suffix, $customerId);
+            \Configuration::updateValue(SaferPayConfig::USERNAME . $suffix, $username);
+            \Configuration::updateValue(SaferPayConfig::PASSWORD . $suffix, $password);
+            \Configuration::updateValue(SaferPayConfig::TEST_MODE, $environment === 'test' ? 1 : 0);
+
+            /** @var SaferPayTerminalService $terminalService */
+            $terminalService = $this->module->getService(SaferPayTerminalService::class);
+            $terminals = $terminalService->getAvailableTerminals($customerId);
+
+            return $terminals;
+        } catch (Exception $e) {
+            /** @var LoggerInterface $logger */
+            $logger = $this->module->getService(LoggerInterface::class);
+            $logger->error(sprintf('%s - Failed to get terminals: %s', self::FILE_NAME, $e->getMessage()), [
+                'context' => [],
+                'exception' => $e,
+            ]);
+            return [];
+        } finally {
+            \Configuration::updateValue(SaferPayConfig::CUSTOMER_ID . $suffix, $originalCustomerId);
+            \Configuration::updateValue(SaferPayConfig::USERNAME . $suffix, $originalUsername);
+            \Configuration::updateValue(SaferPayConfig::PASSWORD . $suffix, $originalPassword);
+            \Configuration::updateValue(SaferPayConfig::TEST_MODE, $originalTestMode);
+        }
+    }
+
     /**
      * @return array
      */
@@ -384,8 +499,11 @@ private function displayTestEnvironmentConfiguration()
                 ],
                 SaferPayConfig::TERMINAL_ID . SaferPayConfig::TEST_SUFFIX => [
                     'title' => $this->module->l('Terminal ID'),
-                    'type' => 'text',
+                    'type' => 'terminal_selector',
                     'class' => 'fixed-width-xl',
+                    'value' => \Configuration::get(SaferPayConfig::TERMINAL_ID . SaferPayConfig::TEST_SUFFIX),
+                    'environment' => 'test',
+                    'terminals' => $this->getTerminalsForEnvironment('test'),
                 ],
                 SaferPayConfig::MERCHANT_EMAILS . SaferPayConfig::TEST_SUFFIX => [
                     'title' => $this->module->l('Merchant emails'),
@@ -402,16 +520,6 @@ private function displayTestEnvironmentConfiguration()
                     'type' => 'text',
                     'class' => 'fixed-width-xxl',
                 ],
-                SaferPayConfig::FIELDS_LIBRARY . SaferPayConfig::TEST_SUFFIX . '_description' => [
-                    'type' => 'desc',
-                    'class' => 'col-lg-12',
-                    'template' => 'field-javascript-library-desc.tpl',
-                ],
-                SaferPayConfig::FIELDS_LIBRARY . SaferPayConfig::TEST_SUFFIX => [
-                    'title' => $this->module->l('Field Javascript library url'),
-                    'type' => 'text',
-                    'class' => 'fixed-width-xxl',
-                ],
                 SaferPayConfig::BUSINESS_LICENSE . SaferPayConfig::TEST_SUFFIX => [
                     'title' => $this->module->l('I have Business license'),
                     'validation' => 'isBool',
@@ -459,8 +567,11 @@ private function displayLiveEnvironmentConfiguration()
                 ],
                 SaferPayConfig::TERMINAL_ID => [
                     'title' => $this->module->l('Terminal ID'),
-                    'type' => 'text',
+                    'type' => 'terminal_selector',
                     'class' => 'fixed-width-xl',
+                    'value' => \Configuration::get(SaferPayConfig::TERMINAL_ID),
+                    'environment' => 'live',
+                    'terminals' => $this->getTerminalsForEnvironment('live'),
                 ],
                 SaferPayConfig::MERCHANT_EMAILS => [
                     'title' => $this->module->l('Merchant emails'),
@@ -477,16 +588,6 @@ private function displayLiveEnvironmentConfiguration()
                     'type' => 'text',
                     'class' => 'fixed-width-xxl',
                 ],
-                SaferPayConfig::FIELDS_LIBRARY . '_description' => [
-                    'type' => 'desc',
-                    'class' => 'col-lg-12',
-                    'template' => 'field-javascript-library-desc.tpl',
-                ],
-                SaferPayConfig::FIELDS_LIBRARY => [
-                    'title' => $this->module->l('Field Javascript library url'),
-                    'type' => 'text',
-                    'class' => 'fixed-width-xxl',
-                ],
                 SaferPayConfig::BUSINESS_LICENSE => [
                     'title' => $this->module->l('I have Business license'),
                     'validation' => 'isBool',

controllers/front/hostedIframe.php

@@ -80,7 +80,7 @@ public function setMedia()
 
         $this->context->controller->registerJavascript(
             'remote-saferpay-fields-js-lib',
-            Configuration::get(SaferPayConfig::FIELDS_LIBRARY . SaferPayConfig::getConfigSuffix()),
+            SaferPayConfig::FIELDS_LIBRARY_DEFAULT_VALUE,
             ['server' => 'remote', 'position' => 'bottom', 'priority' => 20]
         );
 

controllers/front/notify.php

@@ -136,8 +136,8 @@ public function postProcess()
 
             $orderId = Order::getIdByCartId($cartId);
 
-            //TODO look into pipeline design pattern to use when object is modified in multiple places to avoid this issue.
-            //NOTE must be left below assert action to get newest information.
+            // @NOTE: Pipeline design pattern could improve readability when order is modified in multiple places.
+            // Must be left below assert action to get newest information.
             $order = new Order($orderId);
 
             if (!$assertResponseBody->getLiability()->getLiabilityShift() &&