PIPRES-427: ideal v2 improvements

changelog.md

@@ -2,6 +2,9 @@
 
 # Changelog #
 
+## Changes in release 6.2.1 ##
++ Ideal v2 payment method improvement
+
 ## Changes in release 6.2.0 ##
 + New payment methods: Bancomat and Alma
 + Apple certificate update

src/Builder/FormBuilder.php

@@ -372,31 +372,6 @@ protected function getAccountSettingsSection($isApiKeyProvided)
             ],
         ];
 
-        $input = array_merge($input, [
-                [
-                    'type' => 'select',
-                    'label' => $this->module->l('Issuer list', self::FILE_NAME),
-                    'tab' => $generalSettings,
-                    'desc' => $this->module->l('Some payment methods (e.g. iDEAL) have an issuer list. Select where to display the list.', self::FILE_NAME),
-                    'name' => Config::MOLLIE_ISSUERS[(int) $this->configuration->get(Config::MOLLIE_ENVIRONMENT) ? 'production' : 'sandbox'],
-                    'options' => [
-                        'query' => [
-                            [
-                                'id' => Config::ISSUERS_ON_CLICK,
-                                'name' => $this->module->l('In the shop checkout', self::FILE_NAME),
-                            ],
-                            [
-                                'id' => Config::ISSUERS_PAYMENT_PAGE,
-                                'name' => $this->module->l('In the Mollie Checkout', self::FILE_NAME),
-                            ],
-                        ],
-                        'id' => 'id',
-                        'name' => 'name',
-                    ],
-                ],
-            ]
-        );
-
         $input[] = [
             'type' => 'mollie-h2',
             'tab' => $generalSettings,

src/Config/Config.php

@@ -82,8 +82,6 @@ class Config
     const LOGOS_NORMAL = 'normal';
     const LOGOS_HIDE = 'hide';
 
-    const ISSUERS_ON_CLICK = 'on-click';
-    const ISSUERS_PAYMENT_PAGE = 'payment-page';
     const METHODS_CONFIG = 'MOLLIE_METHODS_CONFIG';
 
     const ENVIRONMENT_TEST = 0;
@@ -113,10 +111,7 @@ class Config
 
     const MOLLIE_IMAGES = 'MOLLIE_IMAGES';
     const MOLLIE_SHOW_RESEND_PAYMENT_LINK = 'MOLLIE_SHOW_RESEND_PAYMENT_LINK';
-    const MOLLIE_ISSUERS = [
-        'sandbox' => 'MOLLIE_SANDBOX_ISSUERS',
-        'production' => 'MOLLIE_PRODUCTION_ISSUERS',
-    ];
+
     const MOLLIE_CSS = 'MOLLIE_CSS';
     const MOLLIE_DEBUG_LOG = 'MOLLIE_DEBUG_LOG';
     const MOLLIE_METHOD_COUNTRIES = 'MOLLIE_METHOD_COUNTRIES';

src/Handler/PaymentOption/PaymentOptionHandler.php

@@ -125,10 +125,6 @@ private function isIdealPaymentMethod(MolPaymentMethod $paymentMethod)
             return false;
         }
 
-        if ($this->configurationAdapter->get(Config::MOLLIE_ISSUERS) !== Config::ISSUERS_ON_CLICK) {
-            return false;
-        }
-
         return true;
     }
 

src/Install/Installer.php

@@ -187,7 +187,6 @@ protected function initConfig()
         $this->configurationAdapter->updateValue(Config::MOLLIE_PAYMENTSCREEN_LOCALE, Config::PAYMENTSCREEN_LOCALE_BROWSER_LOCALE);
         $this->configurationAdapter->updateValue(Config::MOLLIE_IFRAME, true);
         $this->configurationAdapter->updateValue(Config::MOLLIE_IMAGES, Config::LOGOS_NORMAL);
-        $this->configurationAdapter->updateValue(Config::MOLLIE_ISSUERS, Config::ISSUERS_ON_CLICK);
         $this->configurationAdapter->updateValue(Config::MOLLIE_CSS, '');
         $this->configurationAdapter->updateValue(Config::MOLLIE_TRACKING_URLS, '');
         $this->configurationAdapter->updateValue(Config::MOLLIE_DEBUG_LOG, Config::DEBUG_LOG_ERRORS);

src/Install/Uninstall.php

@@ -75,7 +75,6 @@ private function deleteConfig()
             Config::MOLLIE_SEND_ORDER_CONFIRMATION,
             Config::MOLLIE_IFRAME,
             Config::MOLLIE_IMAGES,
-            Config::MOLLIE_ISSUERS,
             Config::MOLLIE_CSS,
             Config::MOLLIE_DEBUG_LOG,
             Config::MOLLIE_DISPLAY_ERRORS,

src/Provider/PaymentOption/IdealPaymentOptionProvider.php

@@ -38,7 +38,6 @@
 
 use Mollie;
 use Mollie\Adapter\LegacyContext;
-use Mollie\Builder\Content\PaymentOption\IdealDropdownInfoBlock;
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
@@ -81,11 +80,6 @@ class IdealPaymentOptionProvider implements PaymentOptionProviderInterface
      */
     private $templateParser;
 
-    /**
-     * @var IdealDropdownInfoBlock
-     */
-    private $idealDropdownInfoBlock;
-
     /**
      * @var LanguageService
      */
@@ -99,7 +93,6 @@ public function __construct(
         CreditCardLogoProvider $creditCardLogoProvider,
         PaymentFeeProviderInterface $paymentFeeProvider,
         TemplateParserInterface $templateParser,
-        IdealDropdownInfoBlock $idealDropdownInfoBlock,
         LanguageService $languageService,
         OrderTotalProviderInterface $orderTotalProvider
     ) {
@@ -108,7 +101,6 @@ public function __construct(
         $this->creditCardLogoProvider = $creditCardLogoProvider;
         $this->paymentFeeProvider = $paymentFeeProvider;
         $this->templateParser = $templateParser;
-        $this->idealDropdownInfoBlock = $idealDropdownInfoBlock;
         $this->languageService = $languageService;
         $this->orderTotalProvider = $orderTotalProvider;
     }
@@ -131,31 +123,14 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
             ['method' => $paymentMethod->getPaymentMethodName(), 'rand' => Mollie\Utility\TimeUtility::getCurrentTimeStamp()],
             true
         ));
-        $paymentOption->setInputs([
-            'token' => [
-                'name' => 'issuer',
-                'type' => 'hidden',
-                'value' => '',
-            ],
-        ]);
-
-        $paymentOption->setAdditionalInformation($this->templateParser->parseTemplate(
-            $this->context->getSmarty(),
-            $this->idealDropdownInfoBlock,
-            $this->module->getLocalPath() . 'views/templates/hook/ideal_dropdown.tpl'
-        ));
+
         $paymentOption->setLogo($this->creditCardLogoProvider->getMethodOptionLogo($paymentMethod));
 
         $paymentFeeData = $this->paymentFeeProvider->getPaymentFee($paymentMethod, $this->orderTotalProvider->getOrderTotal());
 
         if ($paymentFeeData->isActive()) {
             $paymentOption->setInputs(
                 [
-                    [
-                        'name' => 'issuer',
-                        'type' => 'hidden',
-                        'value' => '',
-                    ],
                     [
                         'type' => 'hidden',
                         'name' => 'payment-fee-price',

src/Service/ConfigFieldService.php

@@ -68,7 +68,6 @@ public function getConfigFieldsValues()
             Config::MOLLIE_CSS => $this->configurationAdapter->get(Config::MOLLIE_CSS),
             Config::MOLLIE_IMAGES => $this->configurationAdapter->get(Config::MOLLIE_IMAGES),
             Config::MOLLIE_SHOW_RESEND_PAYMENT_LINK => $this->configurationAdapter->get(Config::MOLLIE_SHOW_RESEND_PAYMENT_LINK),
-            Config::MOLLIE_ISSUERS[(int) $this->configurationAdapter->get(Config::MOLLIE_ENVIRONMENT) ? 'production' : 'sandbox'] => $this->configurationAdapter->get(Config::MOLLIE_ISSUERS),
 
             Config::MOLLIE_METHOD_COUNTRIES => $this->configurationAdapter->get(Config::MOLLIE_METHOD_COUNTRIES),
             Config::MOLLIE_METHOD_COUNTRIES_DISPLAY => $this->configurationAdapter->get(Config::MOLLIE_METHOD_COUNTRIES_DISPLAY),

src/Service/SettingsSaveService.php

@@ -246,7 +246,6 @@ public function saveSettings(&$errors = [])
 
         $mollieImages = $this->tools->getValue(Config::MOLLIE_IMAGES);
         $showResentPayment = $this->tools->getValue(Config::MOLLIE_SHOW_RESEND_PAYMENT_LINK);
-        $mollieIssuers = $this->tools->getValue(Config::MOLLIE_ISSUERS[$environment ? 'production' : 'sandbox']);
         $mollieCss = $this->tools->getValue(Config::MOLLIE_CSS);
 
         if (!isset($mollieCss)) {
@@ -308,7 +307,6 @@ public function saveSettings(&$errors = [])
             $this->configurationAdapter->updateValue(Config::MOLLIE_SINGLE_CLICK_PAYMENT, $mollieSingleClickPaymentEnabled);
             $this->configurationAdapter->updateValue(Config::MOLLIE_IMAGES, $mollieImages);
             $this->configurationAdapter->updateValue(Config::MOLLIE_SHOW_RESEND_PAYMENT_LINK, $showResentPayment);
-            $this->configurationAdapter->updateValue(Config::MOLLIE_ISSUERS, $mollieIssuers);
             $this->configurationAdapter->updateValue(Config::MOLLIE_METHOD_COUNTRIES, (int) $mollieMethodCountriesEnabled);
             $this->configurationAdapter->updateValue(Config::MOLLIE_METHOD_COUNTRIES_DISPLAY, (int) $mollieMethodCountriesDisplayEnabled);
             $this->configurationAdapter->updateValue(Config::MOLLIE_CSS, $mollieCss);

upgrade/Upgrade-2.0.0.php

@@ -22,7 +22,6 @@
 function upgrade_module_2_0_0()
 {
     Configuration::deleteByName('MOLLIE_VERSION');
-    Configuration::updateValue('MOLLIE_ISSUERS', 'payment-page');
 
     return true;
 }

upgrade/Upgrade-6.0.1.php

@@ -24,9 +24,6 @@ function upgrade_module_6_0_1(Mollie $module): bool
     $configuration->updateValue(Config::MOLLIE_IFRAME['production'], Configuration::get('MOLLIE_IFRAME'));
     $configuration->updateValue(Config::MOLLIE_IFRAME['sandbox'], Configuration::get('MOLLIE_IFRAME'));
 
-    $configuration->updateValue(Config::MOLLIE_ISSUERS['production'], Configuration::get('MOLLIE_ISSUERS'));
-    $configuration->updateValue(Config::MOLLIE_ISSUERS['sandbox'], Configuration::get('MOLLIE_ISSUERS'));
-
     $configuration->updateValue(Config::MOLLIE_SINGLE_CLICK_PAYMENT['production'], Configuration::get('MOLLIE_SINGLE_CLICK_PAYMENT'));
     $configuration->updateValue(Config::MOLLIE_SINGLE_CLICK_PAYMENT['sandbox'], Configuration::get('MOLLIE_SINGLE_CLICK_PAYMENT'));
 

upgrade/Upgrade-6.2.1.php

@@ -0,0 +1,24 @@
+<?php
+/**
+ * Mollie       https://www.mollie.nl
+ *
+ * @author      Mollie B.V. <[email protected]>
+ * @copyright   Mollie B.V.
+ * @license     https://github.com/mollie/PrestaShop/blob/master/LICENSE.md
+ *
+ * @see        https://github.com/mollie/PrestaShop
+ */
+
+use Mollie\Adapter\ConfigurationAdapter;
+use Mollie\Config\Config;
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+function upgrade_module_6_2_1(Mollie $module): bool
+{
+    //todo remove issuers list config
+    //todo remove table with issuers
+    return true;
+}

views/css/mollie.css

@@ -30,33 +30,6 @@
     color: #747474;
 }
 
-/****Mollie issuers****/
-.mollie_issuer {
-    margin-left: auto;
-    margin-right: auto;
-    max-width: 400px;
-}
-
-.mollie_issuer_page {
-    box-shadow: 2px 2px 8px 0 rgba(0, 0, 0, .2);
-    margin-top: 2rem;
-    margin-bottom: 2rem;
-    background: #fff;
-    padding: 1.25rem 1.875rem;
-}
-
-.mollie_issuers {
-    font-size: 16px;
-    margin-top: 1.25rem;
-}
-
-.mollie_issuers select, .mollie_issuers input {
-    border: 1px solid #D6D4D4;
-    border-radius: 4px;
-    background: #FBFBFB;
-    height: 20px;
-}
-
 .sortable-helper {
     border-width: 2px!important;
     -webkit-box-shadow: 2px 2px 16px -2px rgba(0,0,0,0.75);