Admin ps dependency

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

controllers/admin/AdminMollieSettingsController.php

@@ -100,7 +100,11 @@ public function postProcess()
             $this->module->getLocalPath() . 'views/templates/admin/logo.tpl'
         );
 
-        $this->initCloudSyncAndPsAccounts();
+        try {
+            $this->initCloudSyncAndPsAccounts();
+        } catch (Exception $e) {
+            // Note: we do not want to break the admin page if there is an error then initiating PS dependencies
+        }
 
         /** @var \Mollie\Repository\ModuleRepository $moduleRepository */
         $moduleRepository = $this->module->getService(\Mollie\Repository\ModuleRepository::class);

controllers/front/bancontactAjax.php

@@ -64,7 +64,6 @@ private function createTransaction()
             $cart->getOrderTotal(),
             $currency->iso_code,
             PaymentMethod::BANCONTACT,
-            null,
             $cart->id,
             $cart->secure_key,
             $paymentMethod,

controllers/front/payment.php

@@ -70,7 +70,6 @@ public function initContent()
         }
 
         $method = Tools::getValue('method');
-        $issuer = Tools::getValue('issuer') ?: null;
 
         $originalAmount = $cart->getOrderTotal(
             true,
@@ -105,7 +104,6 @@ public function initContent()
             $amount,
             Tools::strtoupper($this->context->currency->iso_code),
             $method,
-            $issuer,
             (int) $cart->id,
             $customer->secure_key,
             $paymentMethodObj,

mollie.php

@@ -931,7 +931,6 @@ public function hookActionValidateOrder($params)
                 $totalPaid,
                 $currency,
                 '',
-                null,
                 $cartId,
                 $customerKey,
                 $paymentMethodObj,

src/Application/CommandHandler/CreateApplePayOrderHandler.php

@@ -198,7 +198,6 @@ private function createMollieTransaction(Cart $cart, string $cardToken)
             $cart->getOrderTotal(true, Cart::BOTH, null, $cart->id_carrier),
             Tools::strtoupper($currency->iso_code),
             Config::APPLEPAY,
-            null,
             (int) $cart->id,
             $cart->secure_key,
             $paymentMethodObj,

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/DTO/Object/Payment.php

@@ -23,8 +23,6 @@ class Payment implements \JsonSerializable
     /** @var string */
     private $webhookUrl;
     /** @var ?string */
-    private $issuer;
-    /** @var ?string */
     private $customerId;
     /** @var ?string */
     private $applePayPaymentToken;
@@ -60,22 +58,6 @@ public function setWebhookUrl(string $webhookUrl): void
         $this->webhookUrl = $webhookUrl;
     }
 
-    /**
-     * @return ?string
-     */
-    public function getIssuer(): ?string
-    {
-        return $this->issuer;
-    }
-
-    /**
-     * @maps issuer
-     */
-    public function setIssuer(string $issuer): void
-    {
-        $this->issuer = $issuer;
-    }
-
     /**
      * @return ?string
      */
@@ -131,7 +113,6 @@ public function jsonSerialize()
         $result = [];
         $result['cardToken'] = $this->getCardToken();
         $result['webhookUrl'] = $this->getWebhookUrl();
-        $result['issuer'] = $this->getIssuer();
         $result['customerId'] = $this->getCustomerId();
         $result['applePayPaymentToken'] = $this->getApplePayPaymentToken();
         $result['company'] = $this->getCompany() ? $this->getCompany()->jsonSerialize() : null;

src/DTO/PaymentData.php

@@ -58,11 +58,6 @@ class PaymentData implements JsonSerializable
      */
     private $locale;
 
-    /**
-     * @var string
-     */
-    private $issuer;
-
     /**
      * @var string
      */
@@ -230,22 +225,6 @@ public function setLocale($locale)
         $this->locale = $locale;
     }
 
-    /**
-     * @return string
-     */
-    public function getIssuer()
-    {
-        return $this->issuer;
-    }
-
-    /**
-     * @param string $issuer
-     */
-    public function setIssuer($issuer)
-    {
-        $this->issuer = $issuer;
-    }
-
     /**
      * @return string
      */
@@ -387,7 +366,6 @@ public function jsonSerialize()
             'method' => $this->getMethod(),
             'metadata' => $this->getMetadata(),
             'locale' => $this->getLocale(),
-            'issuer' => $this->getIssuer(),
             'cardToken' => $this->getCardToken(),
             'customerId' => $this->getCustomerId(),
             'applePayPaymentToken' => $this->getApplePayToken(),

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/DatabaseTableInstaller.php

@@ -85,12 +85,6 @@ private function getCommands()
 			    `id_shop` INT(64) DEFAULT 1
 			) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8;';
 
-        $sql[] = 'CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'mol_payment_method_issuer` (
-				`id_payment_method_issuer`  INT(64)  NOT NULL PRIMARY KEY AUTO_INCREMENT,
-				`id_payment_method` INT(64) NOT NULL,
-				`issuers_json` TEXT NOT NULL
-			) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8;';
-
         $sql[] = 'CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'mol_order_payment_fee` (
 				`id_mol_order_payment_fee`  INT(64)  NOT NULL PRIMARY KEY AUTO_INCREMENT,
 				`id_cart` INT(64) NOT NULL,

src/Install/DatabaseTableUninstaller.php

@@ -37,7 +37,6 @@ private function getCommands(): array
 
         $sql[] = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'mol_country`;';
         $sql[] = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'mol_payment_method`;';
-        $sql[] = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'mol_payment_method_issuer`;';
         $sql[] = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'mol_carrier_information`;';
         $sql[] = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'mol_pending_order_cart`;';
         $sql[] = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'mol_excluded_country`;';

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,