From dc0311f1512f1174146dc1845a1176be11900d6b Mon Sep 17 00:00:00 2001
From: Gytautas <gytautas.zumaras@invertus.eu>
Date: Tue, 12 Nov 2024 17:33:55 +0200
Subject: [PATCH 01/69] PIPRES-468: frontend implementation by reusing
 prestashop multilang form

---
 .../admin/_configure/helpers/form/form.tpl    | 75 ++++++++++++++++++-
 1 file changed, 71 insertions(+), 4 deletions(-)

diff --git a/views/templates/admin/_configure/helpers/form/form.tpl b/views/templates/admin/_configure/helpers/form/form.tpl
index c160578c6..294c7b352 100644
--- a/views/templates/admin/_configure/helpers/form/form.tpl
+++ b/views/templates/admin/_configure/helpers/form/form.tpl
@@ -179,16 +179,83 @@
                                 </div>
                             </div>
                         {/if}
+
+
+
                         <div class="form-group">
                             <label class="control-label col-lg-3">
                                 {l s='Title' mod='mollie'}
                             </label>
-                            <div class="col-lg-9">
-                                <input type="text" name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}"
-                                       class="fixed-width-xl"
-                                       value="{$methodObj->title|escape:'html':'UTF-8'}">
+                            <div class="col-lg-8">
+                                {foreach from=$languages item=language}
+                                    {if $languages|count > 1}
+                                        <div class="row">
+                                        <div class="translatable-field lang-{$language.id_lang}" {if $language.id_lang != $defaultFormLanguage}style="display:none"{/if}>
+                                        <div class="col-lg-4">
+                                    {/if}
+                                    <input type="text"  name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]" value="{$methodObj->title[$language.id_lang]|default:''|escape:'html':'UTF-8'}"">
+                                    {if $languages|count > 1}
+                                        </div>
+                                        <div class="col-lg-2">
+                                            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+                                                {$language.iso_code}
+                                                <span class="caret"></span>
+                                            </button>
+                                            <ul class="dropdown-menu">
+                                                {foreach from=$languages item=language}
+                                                    <li><a href="javascript:hideOtherLanguage({$language.id_lang});" tabindex="-1">{$language.name}</a></li>
+                                                {/foreach}
+                                            </ul>
+                                        </div>
+                                        </div>
+                                        </div>
+                                    {/if}
+                                {/foreach}
                             </div>
                         </div>
+
+                        {*                                    <div class="input-group translatable-field lang-{$language.id_lang}"{if $language.id_lang != $defaultFormLanguage} style="display:none;"{/if}>*}
+                        {*                                        <input type="text"*}
+                        {*                                               name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]"*}
+                        {*                                               class="fixed-width-xl"*}
+                        {*                                               value="{$methodObj->title[$language.id_lang]|default:''|escape:'html':'UTF-8'}">*}
+                        {*                                    </div>*}
+
+{*                        <div class="form-group">*}
+{*                            <label class="control-label col-lg-3">*}
+{*                                {l s='Title' mod='mollie'}*}
+{*                            </label>*}
+
+{*                            <!-- Wrapper for each language's input field -->*}
+{*                            <div class="col-lg-9">*}
+{*                                {foreach from=$languages item=language}*}
+{*                                    <div class="input-group translatable-field lang-{$language.id_lang}"{if $language.id_lang != $defaultFormLanguage} style="display:none;"{/if}>*}
+{*                                        <input type="text"*}
+{*                                               name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]"*}
+{*                                               class="fixed-width-xl"*}
+{*                                               value="{$methodObj->title[$language.id_lang]|default:''|escape:'html':'UTF-8'}">*}
+{*                                    </div>*}
+{*                            </div>*}
+
+{*                            <!-- Language dropdown for switching between languages -->*}
+{*                            <div class="col-lg-2">*}
+{*                                <button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown" id="languageDropdown">*}
+{*                                    {$language.iso_code}  <!-- Default Language ISO code -->*}
+{*                                    <span class="caret"></span>*}
+{*                                </button>*}
+{*                                <ul class="dropdown-menu">*}
+{*                                    {foreach from=$languages item=language}*}
+{*                                        <li>*}
+{*                                            <a href="javascript:hideOtherLanguage({$language.id_lang});" tabindex="-1">{$language.name}</a>*}
+{*                                        </li>*}
+{*                                    {/foreach}*}
+{*                                </ul>*}
+{*                            </div>*}
+{*                        </div>*}
+{*                        {/foreach}*}
+
+
+
                         <div class="form-group">
                             <label class="control-label col-lg-3">
                                 {l s='Method' mod='mollie'}

From 460aa450865c390e1bbc2a9d49cb84162242ae7e Mon Sep 17 00:00:00 2001
From: Gytautas <gytautas.zumaras@invertus.eu>
Date: Tue, 12 Nov 2024 17:34:25 +0200
Subject: [PATCH 02/69] comments deleted

---
 .../admin/_configure/helpers/form/form.tpl    | 44 -------------------
 1 file changed, 44 deletions(-)

diff --git a/views/templates/admin/_configure/helpers/form/form.tpl b/views/templates/admin/_configure/helpers/form/form.tpl
index 294c7b352..50095fd4e 100644
--- a/views/templates/admin/_configure/helpers/form/form.tpl
+++ b/views/templates/admin/_configure/helpers/form/form.tpl
@@ -180,8 +180,6 @@
                             </div>
                         {/if}
 
-
-
                         <div class="form-group">
                             <label class="control-label col-lg-3">
                                 {l s='Title' mod='mollie'}
@@ -214,48 +212,6 @@
                             </div>
                         </div>
 
-                        {*                                    <div class="input-group translatable-field lang-{$language.id_lang}"{if $language.id_lang != $defaultFormLanguage} style="display:none;"{/if}>*}
-                        {*                                        <input type="text"*}
-                        {*                                               name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]"*}
-                        {*                                               class="fixed-width-xl"*}
-                        {*                                               value="{$methodObj->title[$language.id_lang]|default:''|escape:'html':'UTF-8'}">*}
-                        {*                                    </div>*}
-
-{*                        <div class="form-group">*}
-{*                            <label class="control-label col-lg-3">*}
-{*                                {l s='Title' mod='mollie'}*}
-{*                            </label>*}
-
-{*                            <!-- Wrapper for each language's input field -->*}
-{*                            <div class="col-lg-9">*}
-{*                                {foreach from=$languages item=language}*}
-{*                                    <div class="input-group translatable-field lang-{$language.id_lang}"{if $language.id_lang != $defaultFormLanguage} style="display:none;"{/if}>*}
-{*                                        <input type="text"*}
-{*                                               name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]"*}
-{*                                               class="fixed-width-xl"*}
-{*                                               value="{$methodObj->title[$language.id_lang]|default:''|escape:'html':'UTF-8'}">*}
-{*                                    </div>*}
-{*                            </div>*}
-
-{*                            <!-- Language dropdown for switching between languages -->*}
-{*                            <div class="col-lg-2">*}
-{*                                <button type="button" class="btn btn-default dropdown-toggle" tabindex="-1" data-toggle="dropdown" id="languageDropdown">*}
-{*                                    {$language.iso_code}  <!-- Default Language ISO code -->*}
-{*                                    <span class="caret"></span>*}
-{*                                </button>*}
-{*                                <ul class="dropdown-menu">*}
-{*                                    {foreach from=$languages item=language}*}
-{*                                        <li>*}
-{*                                            <a href="javascript:hideOtherLanguage({$language.id_lang});" tabindex="-1">{$language.name}</a>*}
-{*                                        </li>*}
-{*                                    {/foreach}*}
-{*                                </ul>*}
-{*                            </div>*}
-{*                        </div>*}
-{*                        {/foreach}*}
-
-
-
                         <div class="form-group">
                             <label class="control-label col-lg-3">
                                 {l s='Method' mod='mollie'}

From 398eb366d7fa68e8d9d6d97957cdf117f7e060b9 Mon Sep 17 00:00:00 2001
From: Gytautas <gytautas.zumaras@invertus.eu>
Date: Tue, 12 Nov 2024 17:49:52 +0200
Subject: [PATCH 03/69] added todos to finish functionality

---
 src/Config/Config.php                         |  1 +
 src/Service/PaymentMethodService.php          | 35 +++++++++++++++++++
 .../admin/_configure/helpers/form/form.tpl    |  2 +-
 3 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/src/Config/Config.php b/src/Config/Config.php
index 27abc82aa..160b17c0d 100644
--- a/src/Config/Config.php
+++ b/src/Config/Config.php
@@ -169,6 +169,7 @@ class Config
     const MOLLIE_SUBSCRIPTION_ENABLED = 'MOLLIE_SUBSCRIPTION_ENABLED';
 
     const MOLLIE_METHOD_ENABLED = 'MOLLIE_METHOD_ENABLED_';
+    //todo array
     const MOLLIE_METHOD_TITLE = 'MOLLIE_METHOD_TITLE_';
     const MOLLIE_METHOD_API = 'MOLLIE_METHOD_API_';
     const MOLLIE_METHOD_DESCRIPTION = 'MOLLIE_METHOD_DESCRIPTION_';
diff --git a/src/Service/PaymentMethodService.php b/src/Service/PaymentMethodService.php
index ecf936f67..8334aab63 100644
--- a/src/Service/PaymentMethodService.php
+++ b/src/Service/PaymentMethodService.php
@@ -167,6 +167,41 @@ public function savePaymentMethod($method)
         $paymentMethod->id_method = $method['id'];
         $paymentMethod->method_name = $method['name'];
         $paymentMethod->enabled = Tools::getValue(Mollie\Config\Config::MOLLIE_METHOD_ENABLED . $method['id']);
+        //todo logic to save title
+        // data comes likes this {lang_id: title}
+        //result = {string[12]} ["a", "b", "c", "d", "", +7 more]
+        // 1 = "a"
+        // 2 = "b"
+        // 3 = "c"
+        // 4 = "d"
+        // 5 = ""
+        // 6 = ""
+        // 7 = ""
+        // 8 = ""
+        // 9 = ""
+        // 10 = ""
+        // 11 = ""
+        // 12 = ""
+
+        // todo next steps is db table like mol_payment_title_lang
+        // todo check is it complient with multishop as we might need to save shop id as well
+        // todo make get logic to show correct titles.
+        // todo prestashop has multilang maybe we can connect this functionality with it
+        // todo update method and install method
+        // todo add logic to show correct title in payment step
+
+        // todo check is it relevant
+        // todo add logic to show correct title in order history
+        // todo add logic to show correct title in order details
+        // todo add logic to show correct title in order confirmation email
+        // todo add logic to show correct title in order invoice
+        // todo add logic to show correct title in order pdf
+        // todo add logic to show correct title in order admin order list
+        // todo add logic to show correct title in order admin order details
+        // todo add logic to show correct title in order admin order invoice
+        // todo add logic to show correct title in order admin order pdf
+        // todo add logic to show correct title in order admin order history
+        // todo add logic to show correct title in order admin order confirmation email
         $paymentMethod->title = Tools::getValue(Mollie\Config\Config::MOLLIE_METHOD_TITLE . $method['id']);
         $paymentMethod->method = Tools::getValue(Mollie\Config\Config::MOLLIE_METHOD_API . $method['id']);
         $paymentMethod->description = Tools::getValue(Mollie\Config\Config::MOLLIE_METHOD_DESCRIPTION . $method['id']);
diff --git a/views/templates/admin/_configure/helpers/form/form.tpl b/views/templates/admin/_configure/helpers/form/form.tpl
index 50095fd4e..3acc8de85 100644
--- a/views/templates/admin/_configure/helpers/form/form.tpl
+++ b/views/templates/admin/_configure/helpers/form/form.tpl
@@ -191,7 +191,7 @@
                                         <div class="translatable-field lang-{$language.id_lang}" {if $language.id_lang != $defaultFormLanguage}style="display:none"{/if}>
                                         <div class="col-lg-4">
                                     {/if}
-                                    <input type="text"  name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]" value="{$methodObj->title[$language.id_lang]|default:''|escape:'html':'UTF-8'}"">
+                                    <input type="text"  name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]" value="{$methodObj->title[$language.id_lang]|default:''|escape:'html':'UTF-8'}>
                                     {if $languages|count > 1}
                                         </div>
                                         <div class="col-lg-2">

From e5003b10b375b80ae546860395fc57b52e1cddfb Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 19 Nov 2024 12:08:17 +0200
Subject: [PATCH 04/69] [PIP-RES-468] closing string

---
 views/templates/admin/_configure/helpers/form/form.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/templates/admin/_configure/helpers/form/form.tpl b/views/templates/admin/_configure/helpers/form/form.tpl
index 3acc8de85..d5c645fdf 100644
--- a/views/templates/admin/_configure/helpers/form/form.tpl
+++ b/views/templates/admin/_configure/helpers/form/form.tpl
@@ -191,7 +191,7 @@
                                         <div class="translatable-field lang-{$language.id_lang}" {if $language.id_lang != $defaultFormLanguage}style="display:none"{/if}>
                                         <div class="col-lg-4">
                                     {/if}
-                                    <input type="text"  name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]" value="{$methodObj->title[$language.id_lang]|default:''|escape:'html':'UTF-8'}>
+                                    <input type="text"  name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]" value="{$methodObj->title[$language.id_lang]|default:''|escape:'html':'UTF-8'}">
                                     {if $languages|count > 1}
                                         </div>
                                         <div class="col-lg-2">

From 1bd4f8f03eb1f7dc4e141a2e38581c426750657b Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 19 Nov 2024 13:46:42 +0200
Subject: [PATCH 05/69] [PIPRES-468] small fixes

---
 .../admin/_configure/helpers/form/form.tpl        | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/views/templates/admin/_configure/helpers/form/form.tpl b/views/templates/admin/_configure/helpers/form/form.tpl
index d5c645fdf..4efcc9600 100644
--- a/views/templates/admin/_configure/helpers/form/form.tpl
+++ b/views/templates/admin/_configure/helpers/form/form.tpl
@@ -72,17 +72,7 @@
                    onclick="togglePaymentMethod(this, '{$paymentMethod.id|escape:'html':'UTF-8'}'); return false;">
                 <i class="icon-check text-success"></i>
               </a>
-
-
-
-
-
-{else}
-
-
-
-
-
+            {else}
                 <a href="#" class="payment-check-link"
                    data-action="activate"
                    onclick="togglePaymentMethod(this, '{$paymentMethod.id|escape:'html':'UTF-8'}'); return false;">
@@ -191,8 +181,9 @@
                                         <div class="translatable-field lang-{$language.id_lang}" {if $language.id_lang != $defaultFormLanguage}style="display:none"{/if}>
                                         <div class="col-lg-4">
                                     {/if}
-                                    <input type="text"  name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]" value="{$methodObj->title[$language.id_lang]|default:''|escape:'html':'UTF-8'}">
+                                    <input type="text" name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]" value="{$methodObj->title[$language.id_lang]|default:''|escape:'html':'UTF-8'}">
                                     {if $languages|count > 1}
+
                                         </div>
                                         <div class="col-lg-2">
                                             <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">

From 640759546340204f1620b010548d2da80534a920 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 19 Nov 2024 15:18:42 +0200
Subject: [PATCH 06/69] [PIPRES-468] db

---
 src/Install/DatabaseTableInstaller.php | 9 +++++++++
 src/Service/PaymentMethodService.php   | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/Install/DatabaseTableInstaller.php b/src/Install/DatabaseTableInstaller.php
index 6489402c9..7bc68aaac 100644
--- a/src/Install/DatabaseTableInstaller.php
+++ b/src/Install/DatabaseTableInstaller.php
@@ -151,6 +151,15 @@ private function getCommands()
                 INDEX (`id_shop`)
             ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8;';
 
+        $sql[] = '
+            CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'mol_payment_method_lang` (
+                `id` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                `payment_method` INT(11),
+                `id_lang` INT(11),
+                `id_shop` INT(11),
+                `text` TINYTEXT
+            ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8;';
+
         return $sql;
     }
 
diff --git a/src/Service/PaymentMethodService.php b/src/Service/PaymentMethodService.php
index 8334aab63..3e721c9ef 100644
--- a/src/Service/PaymentMethodService.php
+++ b/src/Service/PaymentMethodService.php
@@ -202,7 +202,7 @@ public function savePaymentMethod($method)
         // todo add logic to show correct title in order admin order pdf
         // todo add logic to show correct title in order admin order history
         // todo add logic to show correct title in order admin order confirmation email
-        $paymentMethod->title = Tools::getValue(Mollie\Config\Config::MOLLIE_METHOD_TITLE . $method['id']);
+        $paymentMethod->title = $method['name'];
         $paymentMethod->method = Tools::getValue(Mollie\Config\Config::MOLLIE_METHOD_API . $method['id']);
         $paymentMethod->description = Tools::getValue(Mollie\Config\Config::MOLLIE_METHOD_DESCRIPTION . $method['id']);
         $paymentMethod->is_countries_applicable = Tools::getValue(Mollie\Config\Config::MOLLIE_METHOD_APPLICABLE_COUNTRIES . $method['id']);

From 067cf8327a88c46d95c7d28e75ca30a1e6d7daa1 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 19 Nov 2024 17:16:53 +0200
Subject: [PATCH 07/69] [PIPRES-468] repo

---
 src/Install/DatabaseTableInstaller.php |  5 +++--
 src/Repository/MultiLangRepository.php | 27 ++++++++++++++++++++++++++
 src/Service/PaymentMethodService.php   |  1 -
 3 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 src/Repository/MultiLangRepository.php

diff --git a/src/Install/DatabaseTableInstaller.php b/src/Install/DatabaseTableInstaller.php
index 7bc68aaac..ab6599719 100644
--- a/src/Install/DatabaseTableInstaller.php
+++ b/src/Install/DatabaseTableInstaller.php
@@ -154,10 +154,11 @@ private function getCommands()
         $sql[] = '
             CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'mol_payment_method_lang` (
                 `id` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                `payment_method` INT(11),
+                `id_method` INT(11),
                 `id_lang` INT(11),
                 `id_shop` INT(11),
-                `text` TINYTEXT
+                `text` TINYTEXT,
+                INDEX (`payment_method`),
             ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8;';
 
         return $sql;
diff --git a/src/Repository/MultiLangRepository.php b/src/Repository/MultiLangRepository.php
new file mode 100644
index 000000000..624958731
--- /dev/null
+++ b/src/Repository/MultiLangRepository.php
@@ -0,0 +1,27 @@
+<?php
+/**
+ * Mollie       https://www.mollie.nl
+ *
+ * @author      Mollie B.V. <info@mollie.nl>
+ * @copyright   Mollie B.V.
+ * @license     https://github.com/mollie/PrestaShop/blob/master/LICENSE.md
+ *
+ * @see        https://github.com/mollie/PrestaShop
+ * @codingStandardsIgnoreStart
+ */
+
+namespace Mollie\Repository;
+
+class MultiLangRepository
+{
+    public function getTextByLanguageId(int $idLanguage): string
+    {
+        $sql = new \DbQuery();
+        $sql->select('`text`');
+        $sql->from('mol_payment_method_lang');
+        $sql->where('`id_lang` = "' . (int) $idLanguage . '"');
+        $sql->limit(1);
+
+        return \Db::getInstance()->getValue($sql) ?: '';
+    }
+}
diff --git a/src/Service/PaymentMethodService.php b/src/Service/PaymentMethodService.php
index 3e721c9ef..93cdacfea 100644
--- a/src/Service/PaymentMethodService.php
+++ b/src/Service/PaymentMethodService.php
@@ -183,7 +183,6 @@ public function savePaymentMethod($method)
         // 11 = ""
         // 12 = ""
 
-        // todo next steps is db table like mol_payment_title_lang
         // todo check is it complient with multishop as we might need to save shop id as well
         // todo make get logic to show correct titles.
         // todo prestashop has multilang maybe we can connect this functionality with it

From 3d695be314c7651cc3afa41a1388096ce193d9fc Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 19 Nov 2024 17:23:44 +0200
Subject: [PATCH 08/69] [PIPRES-468] object model

---
 src/Entity/MolPaymentMethodLang.php | 63 +++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 src/Entity/MolPaymentMethodLang.php

diff --git a/src/Entity/MolPaymentMethodLang.php b/src/Entity/MolPaymentMethodLang.php
new file mode 100644
index 000000000..a68323241
--- /dev/null
+++ b/src/Entity/MolPaymentMethodLang.php
@@ -0,0 +1,63 @@
+<?php
+/**
+ * Mollie       https://www.mollie.nl
+ *
+ * @author      Mollie B.V. <info@mollie.nl>
+ * @copyright   Mollie B.V.
+ * @license     https://github.com/mollie/PrestaShop/blob/master/LICENSE.md
+ *
+ * @see        https://github.com/mollie/PrestaShop
+ * @codingStandardsIgnoreStart
+ */
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+class MolPaymentMethodLang extends ObjectModel
+{
+    /** @var int */
+    public $id;
+
+    /** @var int name of the payment method */
+    public $id_method;
+
+    /** @var int */
+    public $id_lang;
+
+    /** @var int */
+    public $id_shop;
+
+    /** @var string payment title */
+    public $text;
+
+    /**
+     * Definition of the ObjectModel
+     */
+    public static $definition = [
+        'table' => 'mol_payment_method_lang',
+        'primary' => 'id',
+        'fields' => [
+            'id_method' => [
+                'type' => self::TYPE_INT,
+                'validate' => 'isUnsignedInt',
+                'required' => true,
+            ],
+            'id_lang' => [
+                'type' => self::TYPE_INT,
+                'validate' => 'isUnsignedInt',
+                'required' => true,
+            ],
+            'id_shop' => [
+                'type' => self::TYPE_INT,
+                'validate' => 'isUnsignedInt',
+                'required' => true,
+            ],
+            'text' => [
+                'type' => self::TYPE_STRING,
+                'validate' => 'isString',
+                'size' => 255,
+            ],
+        ],
+    ];
+}

From dca8157223e72d9c25ed5e219e80dd7b919c11ab Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 19 Nov 2024 17:59:57 +0200
Subject: [PATCH 09/69] [PIPRES-468] wip

---
 src/Service/PaymentMethodLangService.php | 45 ++++++++++++++++++++++++
 src/Service/PaymentMethodService.php     | 10 +++++-
 2 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 src/Service/PaymentMethodLangService.php

diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
new file mode 100644
index 000000000..cd98e0f7a
--- /dev/null
+++ b/src/Service/PaymentMethodLangService.php
@@ -0,0 +1,45 @@
+<?php
+/**
+ * Mollie       https://www.mollie.nl
+ *
+ * @author      Mollie B.V. <info@mollie.nl>
+ * @copyright   Mollie B.V.
+ * @license     https://github.com/mollie/PrestaShop/blob/master/LICENSE.md
+ *
+ * @see        https://github.com/mollie/PrestaShop
+ * @codingStandardsIgnoreStart
+ */
+
+namespace Mollie\Service;
+
+use Mollie\Adapter\Context;
+use Mollie\Repository\MultiLangRepository;
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+class PaymentMethodLangService
+{
+    /** @var MultiLangRepository */
+    private $multiLangRepository;
+
+    /** @var Context */
+    private $context;
+
+    public function __construct(MultiLangRepository $multiLangRepository, Context $context)
+    {
+        $this->multiLangRepository = $multiLangRepository;
+        $this->context = $context;
+    }
+
+    public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId, string $translation)
+    {
+        $multiLangObject = new \MolPaymentMethodLang();
+        $multiLangObject->id_lang = $langId;
+        $multiLangObject->id_method = $idPaymentMethod;
+        $multiLangObject->id_shop = $this->context->getShopId();
+        $multiLangObject->text = $translation;
+        $multiLangObject->save();
+    }
+}
diff --git a/src/Service/PaymentMethodService.php b/src/Service/PaymentMethodService.php
index 93cdacfea..e8de2a8af 100644
--- a/src/Service/PaymentMethodService.php
+++ b/src/Service/PaymentMethodService.php
@@ -116,6 +116,8 @@ class PaymentMethodService
     private $context;
     /** @var OrderTotalProviderInterface */
     private $orderTotalProvider;
+    /** @var PaymentMethodLangService */
+    private $paymentMethodLangService;
 
     public function __construct(
         Mollie $module,
@@ -134,7 +136,8 @@ public function __construct(
         GenderRepositoryInterface $genderRepository,
         PaymentFeeProviderInterface $paymentFeeProvider,
         Context $context,
-        OrderTotalProviderInterface $orderTotalProvider
+        OrderTotalProviderInterface $orderTotalProvider,
+        PaymentMethodLangService $paymentMethodLandService
     ) {
         $this->module = $module;
         $this->methodRepository = $methodRepository;
@@ -153,6 +156,7 @@ public function __construct(
         $this->paymentFeeProvider = $paymentFeeProvider;
         $this->context = $context;
         $this->orderTotalProvider = $orderTotalProvider;
+        $this->paymentMethodLangService = $paymentMethodLangService;
     }
 
     public function savePaymentMethod($method)
@@ -222,6 +226,10 @@ public function savePaymentMethod($method)
 
         $paymentMethod->save();
 
+        foreach(Tools::getAllValues() as $idLang => $title) {
+            $this->paymentMethodLangService->savePaymentTitleTranslation($method['id'],  $idLang, $title);
+        }
+
         return $paymentMethod;
     }
 

From d74d88d75f04a4d26b48997e93f70686b4742396 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 19 Nov 2024 18:04:56 +0200
Subject: [PATCH 10/69] [PIPRES-468] wip

---
 src/Service/PaymentMethodService.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Service/PaymentMethodService.php b/src/Service/PaymentMethodService.php
index e8de2a8af..8d867b136 100644
--- a/src/Service/PaymentMethodService.php
+++ b/src/Service/PaymentMethodService.php
@@ -137,7 +137,7 @@ public function __construct(
         PaymentFeeProviderInterface $paymentFeeProvider,
         Context $context,
         OrderTotalProviderInterface $orderTotalProvider,
-        PaymentMethodLangService $paymentMethodLandService
+        PaymentMethodLangService $paymentMethodLangService
     ) {
         $this->module = $module;
         $this->methodRepository = $methodRepository;
@@ -226,7 +226,7 @@ public function savePaymentMethod($method)
 
         $paymentMethod->save();
 
-        foreach(Tools::getAllValues() as $idLang => $title) {
+        foreach(Tools::getValue(Config::MOLLIE_METHOD_TITLE . $method['id']) as $idLang => $title) {
             $this->paymentMethodLangService->savePaymentTitleTranslation($method['id'],  $idLang, $title);
         }
 

From 8a3397426fae3e9293fe940b5f2aeeeb28ffa598 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 19 Nov 2024 19:00:53 +0200
Subject: [PATCH 11/69] [PIPRES-468] typo

---
 src/Service/PaymentMethodService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Service/PaymentMethodService.php b/src/Service/PaymentMethodService.php
index 8d867b136..a421ba537 100644
--- a/src/Service/PaymentMethodService.php
+++ b/src/Service/PaymentMethodService.php
@@ -227,7 +227,7 @@ public function savePaymentMethod($method)
         $paymentMethod->save();
 
         foreach(Tools::getValue(Config::MOLLIE_METHOD_TITLE . $method['id']) as $idLang => $title) {
-            $this->paymentMethodLangService->savePaymentTitleTranslation($method['id'],  $idLang, $title);
+            $this->paymentMethodLangService->savePaymentTitleTranslation($method['id'], $idLang, $title);
         }
 
         return $paymentMethod;

From 20c2a20efbcabff02336f92e8695c6bd71837ad4 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 08:52:43 +0200
Subject: [PATCH 12/69] [PIPRES-468] wip

---
 src/Service/PaymentMethodLangService.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
index cd98e0f7a..9e3f17276 100644
--- a/src/Service/PaymentMethodLangService.php
+++ b/src/Service/PaymentMethodLangService.php
@@ -35,6 +35,10 @@ public function __construct(MultiLangRepository $multiLangRepository, Context $c
 
     public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId, string $translation)
     {
+        if (empty($translation)) {
+            return;
+        }
+
         $multiLangObject = new \MolPaymentMethodLang();
         $multiLangObject->id_lang = $langId;
         $multiLangObject->id_method = $idPaymentMethod;

From 6fa8d36ec7e883fb54687b295b63c61bddd6dfa3 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 08:56:55 +0200
Subject: [PATCH 13/69] [PIPRES-468] changed type

---
 src/Entity/MolPaymentMethodLang.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Entity/MolPaymentMethodLang.php b/src/Entity/MolPaymentMethodLang.php
index a68323241..b727a013b 100644
--- a/src/Entity/MolPaymentMethodLang.php
+++ b/src/Entity/MolPaymentMethodLang.php
@@ -19,7 +19,7 @@ class MolPaymentMethodLang extends ObjectModel
     /** @var int */
     public $id;
 
-    /** @var int name of the payment method */
+    /** @var string name of the payment method */
     public $id_method;
 
     /** @var int */
@@ -39,8 +39,8 @@ class MolPaymentMethodLang extends ObjectModel
         'primary' => 'id',
         'fields' => [
             'id_method' => [
-                'type' => self::TYPE_INT,
-                'validate' => 'isUnsignedInt',
+                'type' => self::TYPE_STRING,
+                'validate' => 'isString',
                 'required' => true,
             ],
             'id_lang' => [

From f83eaa9cebdcceb2a2b8d6b4f109aa7ba809119e Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 09:24:59 +0200
Subject: [PATCH 14/69] [PIPRES-468] edit table schema and rendering title

---
 src/Install/DatabaseTableInstaller.php                 | 4 ++--
 views/templates/admin/_configure/helpers/form/form.tpl | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/Install/DatabaseTableInstaller.php b/src/Install/DatabaseTableInstaller.php
index ab6599719..906251838 100644
--- a/src/Install/DatabaseTableInstaller.php
+++ b/src/Install/DatabaseTableInstaller.php
@@ -154,11 +154,11 @@ private function getCommands()
         $sql[] = '
             CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'mol_payment_method_lang` (
                 `id` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                `id_method` INT(11),
+                `id_method` TINYTEXT,
                 `id_lang` INT(11),
                 `id_shop` INT(11),
                 `text` TINYTEXT,
-                INDEX (`payment_method`),
+                INDEX (`id_method`)
             ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8;';
 
         return $sql;
diff --git a/views/templates/admin/_configure/helpers/form/form.tpl b/views/templates/admin/_configure/helpers/form/form.tpl
index 4efcc9600..3bab5d8ee 100644
--- a/views/templates/admin/_configure/helpers/form/form.tpl
+++ b/views/templates/admin/_configure/helpers/form/form.tpl
@@ -181,9 +181,8 @@
                                         <div class="translatable-field lang-{$language.id_lang}" {if $language.id_lang != $defaultFormLanguage}style="display:none"{/if}>
                                         <div class="col-lg-4">
                                     {/if}
-                                    <input type="text" name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]" value="{$methodObj->title[$language.id_lang]|default:''|escape:'html':'UTF-8'}">
+                                    <input type="text" name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]" value="{$methodObj->title|default:''|escape:'html':'UTF-8'}">
                                     {if $languages|count > 1}
-
                                         </div>
                                         <div class="col-lg-2">
                                             <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">

From d6b045132161c127b3b5a2de37ce814d73bb3391 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 11:06:28 +0200
Subject: [PATCH 15/69] [PIPRES-468] working MVP

---
 .../BancontactPaymentOptionProvider.php         | 12 +++++++++---
 .../PaymentOption/BasePaymentOptionProvider.php | 11 ++++++++---
 .../CreditCardPaymentOptionProvider.php         | 11 ++++++++---
 ...editCardSingleClickPaymentOptionProvider.php | 11 ++++++++---
 .../IdealPaymentOptionProvider.php              | 11 ++++++++---
 src/Repository/MultiLangRepository.php          | 17 ++++++++++++++---
 src/Service/PaymentMethodLangService.php        |  8 ++++++++
 7 files changed, 63 insertions(+), 18 deletions(-)

diff --git a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
index 9c4a0ddd2..82a3d12c8 100644
--- a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
@@ -43,6 +43,7 @@
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
 use Mollie\Service\LanguageService;
+use Mollie\Service\PaymentMethodLangService;
 use MolPaymentMethod;
 use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
 use Tools;
@@ -82,13 +83,17 @@ class BancontactPaymentOptionProvider implements PaymentOptionProviderInterface
     /** @var OrderTotalProviderInterface */
     private $orderTotalProvider;
 
+    /** @var PaymentMethodLangService $multiLangService */
+    private $multiLangService;
+
     public function __construct(
         Mollie $module,
         LegacyContext $context,
         CreditCardLogoProvider $creditCardLogoProvider,
         PaymentFeeProviderInterface $paymentFeeProvider,
         LanguageService $languageService,
-        OrderTotalProviderInterface $orderTotalProvider
+        OrderTotalProviderInterface $orderTotalProvider,
+        PaymentMethodLangService $multiLangService
     ) {
         $this->module = $module;
         $this->context = $context;
@@ -96,6 +101,7 @@ public function __construct(
         $this->paymentFeeProvider = $paymentFeeProvider;
         $this->languageService = $languageService;
         $this->orderTotalProvider = $orderTotalProvider;
+        $this->multiLangService = $multiLangService;
     }
 
     /**
@@ -106,9 +112,9 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $paymentMethod->title ?:
-                $this->languageService->lang($paymentMethod->method_name)
+            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->title
         );
+
         $paymentOption->setModuleName($this->module->name);
         $paymentOption->setAction($this->context->getLink()->getModuleLink(
             'mollie',
diff --git a/src/Provider/PaymentOption/BasePaymentOptionProvider.php b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
index 4e5dcd064..24081c9c2 100644
--- a/src/Provider/PaymentOption/BasePaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
@@ -42,6 +42,7 @@
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
 use Mollie\Service\LanguageService;
+use Mollie\Service\PaymentMethodLangService;
 use MolPaymentMethod;
 use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
 use Tools;
@@ -80,6 +81,8 @@ class BasePaymentOptionProvider implements PaymentOptionProviderInterface
     private $languageService;
     /** @var OrderTotalProviderInterface */
     private $orderTotalProvider;
+    /** @var PaymentMethodLangService $multiLangService */
+    private $multiLangService;
 
     public function __construct(
         Mollie $module,
@@ -87,7 +90,8 @@ public function __construct(
         CreditCardLogoProvider $creditCardLogoProvider,
         PaymentFeeProviderInterface $paymentFeeProvider,
         LanguageService $languageService,
-        OrderTotalProviderInterface $orderTotalProvider
+        OrderTotalProviderInterface $orderTotalProvider,
+        PaymentMethodLangService $multiLangService
     ) {
         $this->module = $module;
         $this->context = $context;
@@ -95,6 +99,7 @@ public function __construct(
         $this->paymentFeeProvider = $paymentFeeProvider;
         $this->languageService = $languageService;
         $this->orderTotalProvider = $orderTotalProvider;
+        $this->multiLangService = $multiLangService;
     }
 
     /**
@@ -105,9 +110,9 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $paymentMethod->title ?:
-                $this->languageService->lang($paymentMethod->method_name)
+            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->title
         );
+
         $paymentOption->setModuleName($this->module->name);
         $paymentOption->setAction($this->context->getLink()->getModuleLink(
             'mollie',
diff --git a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
index e43a7d299..0030c1cc3 100644
--- a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
@@ -47,6 +47,7 @@
 use Mollie\Provider\PaymentFeeProviderInterface;
 use Mollie\Repository\MolCustomerRepository;
 use Mollie\Service\LanguageService;
+use Mollie\Service\PaymentMethodLangService;
 use Mollie\Utility\CustomerUtility;
 use MolPaymentMethod;
 use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
@@ -99,6 +100,7 @@ class CreditCardPaymentOptionProvider implements PaymentOptionProviderInterface
     private $customerRepository;
     /** @var ConfigurationAdapter */
     private $configurationAdapter;
+    /** @var PaymentMethodLangService $multiLangService */
 
     public function __construct(
         LegacyContext $context,
@@ -109,7 +111,8 @@ public function __construct(
         Customer $customer,
         MolCustomerRepository $customerRepository,
         Mollie $module,
-        ConfigurationAdapter $configurationAdapter
+        ConfigurationAdapter $configurationAdapter,
+        PaymentMethodLangService $multiLangService
     ) {
         $this->context = $context;
         $this->creditCardLogoProvider = $creditCardLogoProvider;
@@ -120,6 +123,7 @@ public function __construct(
         $this->customerRepository = $customerRepository;
         $this->module = $module;
         $this->configurationAdapter = $configurationAdapter;
+        $this->multiLangService = $multiLangService;
     }
 
     /**
@@ -128,10 +132,11 @@ public function __construct(
     public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
     {
         $paymentOption = new PaymentOption();
+
         $paymentOption->setCallToActionText(
-            $paymentMethod->title ?:
-                $this->languageService->lang($paymentMethod->method_name)
+            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->title
         );
+
         $paymentOption->setModuleName($this->module->name);
         $paymentOption->setAction($this->context->getLink()->getModuleLink(
             'mollie',
diff --git a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
index b3163165d..396fa61bb 100644
--- a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
@@ -46,6 +46,7 @@
 use Mollie\Provider\PaymentFeeProviderInterface;
 use Mollie\Repository\MolCustomerRepository;
 use Mollie\Service\LanguageService;
+use Mollie\Service\PaymentMethodLangService;
 use Mollie\Utility\CustomerUtility;
 use MolPaymentMethod;
 use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
@@ -96,6 +97,8 @@ class CreditCardSingleClickPaymentOptionProvider implements PaymentOptionProvide
     private $customer;
     /** @var ConfigurationAdapter */
     private $configurationAdapter;
+    /** @var PaymentMethodLangService $multiLangService */
+    private $multiLangService;
 
     public function __construct(
         Mollie $module,
@@ -106,7 +109,8 @@ public function __construct(
         LanguageService $languageService,
         MolCustomerRepository $customerRepository,
         Mollie\Adapter\Customer $customer,
-        ConfigurationAdapter $configurationAdapter
+        ConfigurationAdapter $configurationAdapter,
+        PaymentMethodLangService $multiLangService
     ) {
         $this->module = $module;
         $this->context = $context;
@@ -117,6 +121,7 @@ public function __construct(
         $this->customerRepository = $customerRepository;
         $this->customer = $customer;
         $this->configurationAdapter = $configurationAdapter;
+        $this->multiLangService = $multiLangService;
     }
 
     /**
@@ -127,9 +132,9 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $paymentMethod->title ?:
-                $this->languageService->lang($paymentMethod->method_name)
+            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->title
         );
+
         $paymentOption->setModuleName($this->module->name);
         $paymentOption->setAction($this->context->getLink()->getModuleLink(
             'mollie',
diff --git a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
index 61d6ce1d9..6ae3de1c6 100644
--- a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
@@ -43,6 +43,7 @@
 use Mollie\Provider\PaymentFeeProviderInterface;
 use Mollie\Service\Content\TemplateParserInterface;
 use Mollie\Service\LanguageService;
+use Mollie\Service\PaymentMethodLangService;
 use MolPaymentMethod;
 use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
 use Tools;
@@ -86,6 +87,8 @@ class IdealPaymentOptionProvider implements PaymentOptionProviderInterface
     private $languageService;
     /** @var OrderTotalProviderInterface */
     private $orderTotalProvider;
+    /** PaymentMethodLangService $multiLangService */
+    private $multiLangService;
 
     public function __construct(
         Mollie $module,
@@ -94,7 +97,8 @@ public function __construct(
         PaymentFeeProviderInterface $paymentFeeProvider,
         TemplateParserInterface $templateParser,
         LanguageService $languageService,
-        OrderTotalProviderInterface $orderTotalProvider
+        OrderTotalProviderInterface $orderTotalProvider,
+        PaymentMethodLangService $multiLangService
     ) {
         $this->module = $module;
         $this->context = $context;
@@ -103,6 +107,7 @@ public function __construct(
         $this->templateParser = $templateParser;
         $this->languageService = $languageService;
         $this->orderTotalProvider = $orderTotalProvider;
+        $this->multiLangService = $multiLangService;
     }
 
     /**
@@ -113,9 +118,9 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $paymentMethod->title ?:
-            $this->languageService->lang($paymentMethod->method_name)
+            $this->multiLangService->trans($paymentMethod->id_method) ?? $paymentMethod->title
         );
+
         $paymentOption->setModuleName($this->module->name);
         $paymentOption->setAction($this->context->getLink()->getModuleLink(
             'mollie',
diff --git a/src/Repository/MultiLangRepository.php b/src/Repository/MultiLangRepository.php
index 624958731..3c1c710a7 100644
--- a/src/Repository/MultiLangRepository.php
+++ b/src/Repository/MultiLangRepository.php
@@ -14,14 +14,25 @@
 
 class MultiLangRepository
 {
-    public function getTextByLanguageId(int $idLanguage): string
+    public function getTextByLanguageAndMethod(int $idLanguage, string $idMethod): string
     {
         $sql = new \DbQuery();
         $sql->select('`text`');
         $sql->from('mol_payment_method_lang');
-        $sql->where('`id_lang` = "' . (int) $idLanguage . '"');
-        $sql->limit(1);
+        $sql->where('`id_method` = "' . pSQL($idMethod) . '"');
+        $sql->where('`id_lang` = ' . (int) $idLanguage);
 
         return \Db::getInstance()->getValue($sql) ?: '';
     }
+
+    public function getExistingRecordId(string $idPaymentMethod, int $langId): ?string
+    {
+        $sql = new \DbQuery();
+        $sql->select('`id`');
+        $sql->from('mol_payment_method_lang');
+        $sql->where('`id_method` = "' . pSQL($idPaymentMethod) . '"');
+        $sql->where('`id_lang` = ' . (int) $langId);
+
+        return \Db::getInstance()->getValue($sql) ?: null;
+    }
 }
diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
index 9e3f17276..818c7f651 100644
--- a/src/Service/PaymentMethodLangService.php
+++ b/src/Service/PaymentMethodLangService.php
@@ -39,11 +39,19 @@ public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId
             return;
         }
 
+        $id = $this->multiLangRepository->getExistingRecordId($idPaymentMethod, $langId) ?: 0;
+
         $multiLangObject = new \MolPaymentMethodLang();
+        $multiLangObject->id = $id;
         $multiLangObject->id_lang = $langId;
         $multiLangObject->id_method = $idPaymentMethod;
         $multiLangObject->id_shop = $this->context->getShopId();
         $multiLangObject->text = $translation;
         $multiLangObject->save();
     }
+
+    public function trans(string $idMethod)
+    {
+        return $this->multiLangRepository->getTextByLanguageAndMethod($this->context->getLanguageId(), $idMethod);
+    }
 }

From 690c460c3e22d04500d2ab76351b1a674ecfce41 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 11:15:51 +0200
Subject: [PATCH 16/69] [PIPRES-468] improvements

---
 .../PaymentOption/IdealPaymentOptionProvider.php     |  2 +-
 src/Repository/MultiLangRepository.php               | 12 +++++++-----
 src/Service/PaymentMethodLangService.php             |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
index 6ae3de1c6..f283a36a5 100644
--- a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
@@ -118,7 +118,7 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $this->multiLangService->trans($paymentMethod->id_method) ?? $paymentMethod->title
+            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->title
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Repository/MultiLangRepository.php b/src/Repository/MultiLangRepository.php
index 3c1c710a7..11461c1c9 100644
--- a/src/Repository/MultiLangRepository.php
+++ b/src/Repository/MultiLangRepository.php
@@ -14,24 +14,26 @@
 
 class MultiLangRepository
 {
-    public function getTextByLanguageAndMethod(int $idLanguage, string $idMethod): string
+    public function getTextByLanguageAndMethod(int $idLanguage, string $idMethod, int $idShop): ?string
     {
         $sql = new \DbQuery();
         $sql->select('`text`');
         $sql->from('mol_payment_method_lang');
         $sql->where('`id_method` = "' . pSQL($idMethod) . '"');
-        $sql->where('`id_lang` = ' . (int) $idLanguage);
+        $sql->where('`id_lang` = ' . $idLanguage);
+        $sql->where('`id_shop` = ' . $idShop);
 
-        return \Db::getInstance()->getValue($sql) ?: '';
+        return \Db::getInstance()->getValue($sql) ?: null;
     }
 
-    public function getExistingRecordId(string $idPaymentMethod, int $langId): ?string
+    public function getExistingRecordId(string $idPaymentMethod, int $langId, int $idShop): ?string
     {
         $sql = new \DbQuery();
         $sql->select('`id`');
         $sql->from('mol_payment_method_lang');
         $sql->where('`id_method` = "' . pSQL($idPaymentMethod) . '"');
-        $sql->where('`id_lang` = ' . (int) $langId);
+        $sql->where('`id_lang` = ' . $langId);
+        $sql->where('`id_shop` = ' . $idShop);
 
         return \Db::getInstance()->getValue($sql) ?: null;
     }
diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
index 818c7f651..32e51379e 100644
--- a/src/Service/PaymentMethodLangService.php
+++ b/src/Service/PaymentMethodLangService.php
@@ -52,6 +52,6 @@ public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId
 
     public function trans(string $idMethod)
     {
-        return $this->multiLangRepository->getTextByLanguageAndMethod($this->context->getLanguageId(), $idMethod);
+        return $this->multiLangRepository->getTextByLanguageAndMethod($this->context->getLanguageId(), $idMethod, $this->context->getShopId());
     }
 }

From 734803791be5892d94cc0d2d90968873d5fa139a Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 11:27:49 +0200
Subject: [PATCH 17/69] [PIPRES-468] improvements

---
 src/Service/PaymentMethodLangService.php | 4 ++--
 src/Service/PaymentMethodService.php     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
index 32e51379e..94de2d3f8 100644
--- a/src/Service/PaymentMethodLangService.php
+++ b/src/Service/PaymentMethodLangService.php
@@ -33,13 +33,13 @@ public function __construct(MultiLangRepository $multiLangRepository, Context $c
         $this->context = $context;
     }
 
-    public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId, string $translation)
+    public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId, string $translation, int $idShop)
     {
         if (empty($translation)) {
             return;
         }
 
-        $id = $this->multiLangRepository->getExistingRecordId($idPaymentMethod, $langId) ?: 0;
+        $id = $this->multiLangRepository->getExistingRecordId($idPaymentMethod, $langId, $this->context->getShopId()) ?: 0;
 
         $multiLangObject = new \MolPaymentMethodLang();
         $multiLangObject->id = $id;
diff --git a/src/Service/PaymentMethodService.php b/src/Service/PaymentMethodService.php
index a421ba537..ae684d0e5 100644
--- a/src/Service/PaymentMethodService.php
+++ b/src/Service/PaymentMethodService.php
@@ -227,7 +227,7 @@ public function savePaymentMethod($method)
         $paymentMethod->save();
 
         foreach(Tools::getValue(Config::MOLLIE_METHOD_TITLE . $method['id']) as $idLang => $title) {
-            $this->paymentMethodLangService->savePaymentTitleTranslation($method['id'], $idLang, $title);
+            $this->paymentMethodLangService->savePaymentTitleTranslation($method['id'], $idLang, $title, $this->context->getShopId());
         }
 
         return $paymentMethod;

From 87e531f851c13c30cd0801f2d74849f2d15a93ed Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 13:26:01 +0200
Subject: [PATCH 18/69] [PIPRES-468] update invertus contact address

---
 src/Repository/MultiLangRepository.php             | 12 ++++++++++++
 src/Service/ApiService.php                         |  7 ++++++-
 src/Service/PaymentMethodLangService.php           | 14 +++++++++++++-
 .../admin/_configure/helpers/form/form.tpl         |  2 +-
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/Repository/MultiLangRepository.php b/src/Repository/MultiLangRepository.php
index 11461c1c9..404a2d51d 100644
--- a/src/Repository/MultiLangRepository.php
+++ b/src/Repository/MultiLangRepository.php
@@ -37,4 +37,16 @@ public function getExistingRecordId(string $idPaymentMethod, int $langId, int $i
 
         return \Db::getInstance()->getValue($sql) ?: null;
     }
+
+    public function getAllTranslationsByMethod(string $idPaymentMethod, int $langId, int $idShop): ?array
+    {
+        $sql = new \DbQuery();
+        $sql->select('`text`');
+        $sql->from('mol_payment_method_lang');
+        $sql->where('`id_method` = "' . pSQL($idPaymentMethod) . '"');
+        $sql->where('`id_lang` = ' . $langId);
+        $sql->where('`id_shop` = ' . $idShop);
+
+        return \Db::getInstance()->executeS($sql) ?: null;
+    }
 }
diff --git a/src/Service/ApiService.php b/src/Service/ApiService.php
index 4f557430c..f6a014010 100644
--- a/src/Service/ApiService.php
+++ b/src/Service/ApiService.php
@@ -81,6 +81,8 @@ class ApiService implements ApiServiceInterface
     private $taxProvider;
     /** @var Context */
     private $context;
+    /** @var PaymentMethodLangService */
+    private $multiLangService;
 
     public function __construct(
         PaymentMethodRepository $methodRepository,
@@ -90,7 +92,8 @@ public function __construct(
         TransactionService $transactionService,
         Shop $shop,
         TaxCalculatorProvider $taxProvider,
-        Context $context
+        Context $context,
+        PaymentMethodLangService $multiLangService
     ) {
         $this->countryRepository = $countryRepository;
         $this->paymentMethodSortProvider = $paymentMethodSortProvider;
@@ -101,6 +104,7 @@ public function __construct(
         $this->shop = $shop;
         $this->taxProvider = $taxProvider;
         $this->context = $context;
+        $this->multiLangService = $multiLangService;
     }
 
     /**
@@ -232,6 +236,7 @@ private function getMethodsObjForConfig($apiMethods)
                 }
 
                 $methods[$apiMethod['id']] = $apiMethod;
+                $paymentMethod->title = $this->multiLangService->trans($apiMethod['id']);
                 $methods[$apiMethod['id']]['obj'] = $paymentMethod;
 
                 continue;
diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
index 94de2d3f8..1e205d3fd 100644
--- a/src/Service/PaymentMethodLangService.php
+++ b/src/Service/PaymentMethodLangService.php
@@ -50,8 +50,20 @@ public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId
         $multiLangObject->save();
     }
 
-    public function trans(string $idMethod)
+    public function trans(string $idMethod): string
     {
         return $this->multiLangRepository->getTextByLanguageAndMethod($this->context->getLanguageId(), $idMethod, $this->context->getShopId());
     }
+
+
+    /**
+     * Gets all translations for a payment method title
+     *
+     * @param string $idMethod
+     * @return array For instance: [74 => 'Apelo Pay', 68 => 'Apella Pia']
+     */
+    public function getTransList(string $idMethod): array
+    {
+        return $this->multiLangRepository->getAllTranslationsByMethod();
+    }
 }
diff --git a/views/templates/admin/_configure/helpers/form/form.tpl b/views/templates/admin/_configure/helpers/form/form.tpl
index 3bab5d8ee..b1f428431 100644
--- a/views/templates/admin/_configure/helpers/form/form.tpl
+++ b/views/templates/admin/_configure/helpers/form/form.tpl
@@ -34,7 +34,7 @@
                         </td>
                         <td>
                             <div class="icon2"></div>
-                            <a href="https://www.invertus.eu/contacts/"
+                            <a href="https://www.invertus.eu/en/contact/"
                                target="_blank">{l s='Contact Invertus' mod='mollie'}</a>
                         </td>
                     </tr>

From 1a50e17dca6d33ab54dad36099804a3cae6da9f6 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 14:16:39 +0200
Subject: [PATCH 19/69] [PIPRES-468] rendering titles by language logic

---
 src/Repository/MultiLangRepository.php                 | 3 +--
 src/Service/ApiService.php                             | 2 +-
 src/Service/PaymentMethodLangService.php               | 9 ++++++++-
 views/templates/admin/_configure/helpers/form/form.tpl | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/Repository/MultiLangRepository.php b/src/Repository/MultiLangRepository.php
index 404a2d51d..a37f0a494 100644
--- a/src/Repository/MultiLangRepository.php
+++ b/src/Repository/MultiLangRepository.php
@@ -41,10 +41,9 @@ public function getExistingRecordId(string $idPaymentMethod, int $langId, int $i
     public function getAllTranslationsByMethod(string $idPaymentMethod, int $langId, int $idShop): ?array
     {
         $sql = new \DbQuery();
-        $sql->select('`text`');
+        $sql->select('`id_lang`, `text`');
         $sql->from('mol_payment_method_lang');
         $sql->where('`id_method` = "' . pSQL($idPaymentMethod) . '"');
-        $sql->where('`id_lang` = ' . $langId);
         $sql->where('`id_shop` = ' . $idShop);
 
         return \Db::getInstance()->executeS($sql) ?: null;
diff --git a/src/Service/ApiService.php b/src/Service/ApiService.php
index f6a014010..316a36ca5 100644
--- a/src/Service/ApiService.php
+++ b/src/Service/ApiService.php
@@ -236,7 +236,7 @@ private function getMethodsObjForConfig($apiMethods)
                 }
 
                 $methods[$apiMethod['id']] = $apiMethod;
-                $paymentMethod->title = $this->multiLangService->trans($apiMethod['id']);
+                $paymentMethod->title = $this->multiLangService->getTransList($apiMethod['id'], $paymentMethod->title);
                 $methods[$apiMethod['id']]['obj'] = $paymentMethod;
 
                 continue;
diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
index 1e205d3fd..66dabf19b 100644
--- a/src/Service/PaymentMethodLangService.php
+++ b/src/Service/PaymentMethodLangService.php
@@ -64,6 +64,13 @@ public function trans(string $idMethod): string
      */
     public function getTransList(string $idMethod): array
     {
-        return $this->multiLangRepository->getAllTranslationsByMethod();
+        $result = $this->multiLangRepository->getAllTranslationsByMethod($idMethod, $this->context->getLanguageId(), $this->context->getShopId());
+
+        $mappedArray = [];
+        foreach ($result as $value) {
+            $mappedArray[$value['id_lang']] = $value['text'];
+        }
+
+        return $mappedArray;
     }
 }
diff --git a/views/templates/admin/_configure/helpers/form/form.tpl b/views/templates/admin/_configure/helpers/form/form.tpl
index b1f428431..c3f0f209d 100644
--- a/views/templates/admin/_configure/helpers/form/form.tpl
+++ b/views/templates/admin/_configure/helpers/form/form.tpl
@@ -181,7 +181,7 @@
                                         <div class="translatable-field lang-{$language.id_lang}" {if $language.id_lang != $defaultFormLanguage}style="display:none"{/if}>
                                         <div class="col-lg-4">
                                     {/if}
-                                    <input type="text" name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]" value="{$methodObj->title|default:''|escape:'html':'UTF-8'}">
+                                    <input type="text" name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]" value="{$methodObj->title[$language.id_lang]|default:''|escape:'html':'UTF-8'}">
                                     {if $languages|count > 1}
                                         </div>
                                         <div class="col-lg-2">

From 834f0a4aade7e734196a5ac32012468c9cb6e121 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 14:26:23 +0200
Subject: [PATCH 20/69] [PIPRES-468] typo return

---
 src/Service/PaymentMethodLangService.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
index 66dabf19b..5101c521d 100644
--- a/src/Service/PaymentMethodLangService.php
+++ b/src/Service/PaymentMethodLangService.php
@@ -50,7 +50,7 @@ public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId
         $multiLangObject->save();
     }
 
-    public function trans(string $idMethod): string
+    public function trans(string $idMethod): ?string
     {
         return $this->multiLangRepository->getTextByLanguageAndMethod($this->context->getLanguageId(), $idMethod, $this->context->getShopId());
     }
@@ -60,7 +60,7 @@ public function trans(string $idMethod): string
      * Gets all translations for a payment method title
      *
      * @param string $idMethod
-     * @return array For instance: [74 => 'Apelo Pay', 68 => 'Apella Pia']
+     * @return array [id_lang => text] for instance: [74 => 'Apelo Pay', 68 => 'Apella Pia']
      */
     public function getTransList(string $idMethod): array
     {

From ac1d4df0dd1019b73edeb4ca28b54a4fbd87f551 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 14:30:07 +0200
Subject: [PATCH 21/69] [PIPRES-468] interface

---
 src/Repository/MultiLangRepository.php        |  4 ++-
 .../MultiLangRepositoryInterface.php          | 28 +++++++++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 src/Repository/MultiLangRepositoryInterface.php

diff --git a/src/Repository/MultiLangRepository.php b/src/Repository/MultiLangRepository.php
index a37f0a494..697fc4a87 100644
--- a/src/Repository/MultiLangRepository.php
+++ b/src/Repository/MultiLangRepository.php
@@ -12,7 +12,9 @@
 
 namespace Mollie\Repository;
 
-class MultiLangRepository
+use Mollie\Shared\Infrastructure\Repository\AbstractRepository;
+
+class MultiLangRepository extends AbstractRepository implements MultiLangRepositoryInterface
 {
     public function getTextByLanguageAndMethod(int $idLanguage, string $idMethod, int $idShop): ?string
     {
diff --git a/src/Repository/MultiLangRepositoryInterface.php b/src/Repository/MultiLangRepositoryInterface.php
new file mode 100644
index 000000000..e1cfc30cd
--- /dev/null
+++ b/src/Repository/MultiLangRepositoryInterface.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Mollie       https://www.mollie.nl
+ *
+ * @author      Mollie B.V. <info@mollie.nl>
+ * @copyright   Mollie B.V.
+ * @license     https://github.com/mollie/PrestaShop/blob/master/LICENSE.md
+ *
+ * @see        https://github.com/mollie/PrestaShop
+ * @codingStandardsIgnoreStart
+ */
+
+namespace Mollie\Repository;
+
+use Mollie\Shared\Infrastructure\Repository\ReadOnlyRepositoryInterface;
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+interface MultiLangRepositoryInterface extends ReadOnlyRepositoryInterface
+{
+    public function getTextByLanguageAndMethod(int $idLanguage, string $idMethod, int $idShop): ?string;
+
+    public function getExistingRecordId(string $idPaymentMethod, int $langId, int $idShop): ?string;
+
+    public function getAllTranslationsByMethod(string $idPaymentMethod, int $langId, int $idShop): ?array;
+}

From 0d318a1e50015c4f209447b71a2c06c0d0af6ca2 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 14:51:47 +0200
Subject: [PATCH 22/69] [PIPRES-468] added interface and dependencies

---
 src/Repository/MultiLangRepository.php      | 5 +++++
 src/ServiceProvider/BaseServiceProvider.php | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/src/Repository/MultiLangRepository.php b/src/Repository/MultiLangRepository.php
index 697fc4a87..86b582a66 100644
--- a/src/Repository/MultiLangRepository.php
+++ b/src/Repository/MultiLangRepository.php
@@ -16,6 +16,11 @@
 
 class MultiLangRepository extends AbstractRepository implements MultiLangRepositoryInterface
 {
+    public function __construct()
+    {
+        parent::__construct(\MolPaymentMethodLang::class);
+    }
+
     public function getTextByLanguageAndMethod(int $idLanguage, string $idMethod, int $idShop): ?string
     {
         $sql = new \DbQuery();
diff --git a/src/ServiceProvider/BaseServiceProvider.php b/src/ServiceProvider/BaseServiceProvider.php
index 2fd5701bf..96444b19b 100644
--- a/src/ServiceProvider/BaseServiceProvider.php
+++ b/src/ServiceProvider/BaseServiceProvider.php
@@ -84,6 +84,8 @@
 use Mollie\Repository\MolLogRepositoryInterface;
 use Mollie\Repository\MolOrderPaymentFeeRepository;
 use Mollie\Repository\MolOrderPaymentFeeRepositoryInterface;
+use Mollie\Repository\MultiLangRepository;
+use Mollie\Repository\MultiLangRepositoryInterface;
 use Mollie\Repository\OrderRepository;
 use Mollie\Repository\OrderRepositoryInterface;
 use Mollie\Repository\PaymentMethodRepository;
@@ -215,6 +217,7 @@ public function register(Container $container)
         $this->addService($container, TaxRuleRepositoryInterface::class, $container->get(TaxRuleRepository::class));
         $this->addService($container, TaxRepositoryInterface::class, $container->get(TaxRepository::class));
         $this->addService($container, CartRepositoryInterface::class, $container->get(CartRepository::class));
+        $this->addService($container, MultiLangRepositoryInterface::class, $container->get(MultiLangRepository::class));
 
         $this->addService($container, OrderTotalProviderInterface::class, $container->get(OrderTotalProvider::class));
         $this->addService($container, PaymentFeeProviderInterface::class, $container->get(PaymentFeeProvider::class));

From cb4e4eb7ca0c561078764a9ab5448acc3d80848b Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 14:57:05 +0200
Subject: [PATCH 23/69] [PIPRES-468] use interface

---
 src/Service/PaymentMethodLangService.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
index 5101c521d..d912d03f6 100644
--- a/src/Service/PaymentMethodLangService.php
+++ b/src/Service/PaymentMethodLangService.php
@@ -13,7 +13,7 @@
 namespace Mollie\Service;
 
 use Mollie\Adapter\Context;
-use Mollie\Repository\MultiLangRepository;
+use Mollie\Repository\MultiLangRepositoryInterface;
 
 if (!defined('_PS_VERSION_')) {
     exit;
@@ -21,13 +21,13 @@
 
 class PaymentMethodLangService
 {
-    /** @var MultiLangRepository */
+    /** @var MultiLangRepositoryInterface */
     private $multiLangRepository;
 
     /** @var Context */
     private $context;
 
-    public function __construct(MultiLangRepository $multiLangRepository, Context $context)
+    public function __construct(MultiLangRepositoryInterface $multiLangRepository, Context $context)
     {
         $this->multiLangRepository = $multiLangRepository;
         $this->context = $context;

From 90c620e60c83a398559be224dfd4611292da1729 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 15:17:02 +0200
Subject: [PATCH 24/69] [PIPRES-468] add upgrade file

---
 upgrade/Upgrade-6.2.5.php | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 upgrade/Upgrade-6.2.5.php

diff --git a/upgrade/Upgrade-6.2.5.php b/upgrade/Upgrade-6.2.5.php
new file mode 100644
index 000000000..a98cb6f85
--- /dev/null
+++ b/upgrade/Upgrade-6.2.5.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Mollie       https://www.mollie.nl
+ *
+ * @author      Mollie B.V. <info@mollie.nl>
+ * @copyright   Mollie B.V.
+ * @license     https://github.com/mollie/PrestaShop/blob/master/LICENSE.md
+ *
+ * @see        https://github.com/mollie/PrestaShop
+ */
+
+use PrestaShop\PrestaShop\Adapter\Module\Tab\ModuleTabRegister;
+use Symfony\Component\HttpFoundation\ParameterBag;
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+function upgrade_module_6_2_5(Mollie $module): bool
+{
+    // Create the new mol_payment_method_lang table
+    $sql = 'CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'mol_payment_method_lang` (
+                `id` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+                `id_method` TINYTEXT,
+                `id_lang` INT(11),
+                `id_shop` INT(11),
+                `text` TINYTEXT,
+                INDEX (`id_method`)
+    ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8;';
+
+    $isTableCreated = Db::getInstance()->execute($sql);
+    if (!$isTableCreated) {
+        return false; // If the table creation fails, return false
+    }
+
+    return $isTableCreated;
+}

From b213c5b69b68561eaee76e95788fb2dc11bdd519 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 15:17:29 +0200
Subject: [PATCH 25/69] [PIPRES-468] removed useless dependencies

---
 upgrade/Upgrade-6.2.5.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/upgrade/Upgrade-6.2.5.php b/upgrade/Upgrade-6.2.5.php
index a98cb6f85..58ac2f2a9 100644
--- a/upgrade/Upgrade-6.2.5.php
+++ b/upgrade/Upgrade-6.2.5.php
@@ -9,9 +9,6 @@
  * @see        https://github.com/mollie/PrestaShop
  */
 
-use PrestaShop\PrestaShop\Adapter\Module\Tab\ModuleTabRegister;
-use Symfony\Component\HttpFoundation\ParameterBag;
-
 if (!defined('_PS_VERSION_')) {
     exit;
 }

From 203204ba3b694dbfdbbfbe3e8b4e8e0c991b94d1 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 15:19:27 +0200
Subject: [PATCH 26/69] [PIPRES-468] removed dependency

---
 .../PaymentOption/CreditCardPaymentOptionProvider.php        | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
index 0030c1cc3..ef9308549 100644
--- a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
@@ -100,7 +100,6 @@ class CreditCardPaymentOptionProvider implements PaymentOptionProviderInterface
     private $customerRepository;
     /** @var ConfigurationAdapter */
     private $configurationAdapter;
-    /** @var PaymentMethodLangService $multiLangService */
 
     public function __construct(
         LegacyContext $context,
@@ -111,8 +110,7 @@ public function __construct(
         Customer $customer,
         MolCustomerRepository $customerRepository,
         Mollie $module,
-        ConfigurationAdapter $configurationAdapter,
-        PaymentMethodLangService $multiLangService
+        ConfigurationAdapter $configurationAdapter
     ) {
         $this->context = $context;
         $this->creditCardLogoProvider = $creditCardLogoProvider;
@@ -123,7 +121,6 @@ public function __construct(
         $this->customerRepository = $customerRepository;
         $this->module = $module;
         $this->configurationAdapter = $configurationAdapter;
-        $this->multiLangService = $multiLangService;
     }
 
     /**

From d44e4388b3a7e9d98487df8532ce1c1da228734f Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 15:21:51 +0200
Subject: [PATCH 27/69] [PIPRES-468] comments on interface

---
 src/Repository/MultiLangRepositoryInterface.php | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/Repository/MultiLangRepositoryInterface.php b/src/Repository/MultiLangRepositoryInterface.php
index e1cfc30cd..85e8b7f3b 100644
--- a/src/Repository/MultiLangRepositoryInterface.php
+++ b/src/Repository/MultiLangRepositoryInterface.php
@@ -20,9 +20,22 @@
 
 interface MultiLangRepositoryInterface extends ReadOnlyRepositoryInterface
 {
+
+    /**
+     * Gets translated text by language and method id
+     */
     public function getTextByLanguageAndMethod(int $idLanguage, string $idMethod, int $idShop): ?string;
 
+    /**
+     * Gets auto increment ID for specific payment method
+     */
     public function getExistingRecordId(string $idPaymentMethod, int $langId, int $idShop): ?string;
 
+    /**
+     * Gets all translations for a payment method title
+     *
+     * @param string $idMethod
+     * @return array [id_lang => text] for instance: [74 => 'Apelo Pay', 68 => 'Apella Pia']
+     */
     public function getAllTranslationsByMethod(string $idPaymentMethod, int $langId, int $idShop): ?array;
 }

From 937adb1dcd8a822fbeb8b6d9891375584515d561 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 15:58:45 +0200
Subject: [PATCH 28/69] [PIPRES-468] fix

---
 src/Service/PaymentMethodService.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Service/PaymentMethodService.php b/src/Service/PaymentMethodService.php
index ae684d0e5..5cc25d288 100644
--- a/src/Service/PaymentMethodService.php
+++ b/src/Service/PaymentMethodService.php
@@ -194,8 +194,6 @@ public function savePaymentMethod($method)
         // todo add logic to show correct title in payment step
 
         // todo check is it relevant
-        // todo add logic to show correct title in order history
-        // todo add logic to show correct title in order details
         // todo add logic to show correct title in order confirmation email
         // todo add logic to show correct title in order invoice
         // todo add logic to show correct title in order pdf

From 39f87403144b428d5d7d4e8d32776145b38762ce Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 16:39:46 +0200
Subject: [PATCH 29/69] [PIPRES-468] optimized and gived default EN title

---
 src/Repository/MultiLangRepository.php                 | 4 ++--
 views/templates/admin/_configure/helpers/form/form.tpl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Repository/MultiLangRepository.php b/src/Repository/MultiLangRepository.php
index 86b582a66..94b8730b2 100644
--- a/src/Repository/MultiLangRepository.php
+++ b/src/Repository/MultiLangRepository.php
@@ -45,7 +45,7 @@ public function getExistingRecordId(string $idPaymentMethod, int $langId, int $i
         return \Db::getInstance()->getValue($sql) ?: null;
     }
 
-    public function getAllTranslationsByMethod(string $idPaymentMethod, int $langId, int $idShop): ?array
+    public function getAllTranslationsByMethod(string $idPaymentMethod, int $langId, int $idShop): array
     {
         $sql = new \DbQuery();
         $sql->select('`id_lang`, `text`');
@@ -53,6 +53,6 @@ public function getAllTranslationsByMethod(string $idPaymentMethod, int $langId,
         $sql->where('`id_method` = "' . pSQL($idPaymentMethod) . '"');
         $sql->where('`id_shop` = ' . $idShop);
 
-        return \Db::getInstance()->executeS($sql) ?: null;
+        return \Db::getInstance()->executeS($sql);
     }
 }
diff --git a/views/templates/admin/_configure/helpers/form/form.tpl b/views/templates/admin/_configure/helpers/form/form.tpl
index c3f0f209d..31cfda7c0 100644
--- a/views/templates/admin/_configure/helpers/form/form.tpl
+++ b/views/templates/admin/_configure/helpers/form/form.tpl
@@ -181,7 +181,7 @@
                                         <div class="translatable-field lang-{$language.id_lang}" {if $language.id_lang != $defaultFormLanguage}style="display:none"{/if}>
                                         <div class="col-lg-4">
                                     {/if}
-                                    <input type="text" name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]" value="{$methodObj->title[$language.id_lang]|default:''|escape:'html':'UTF-8'}">
+                                    <input type="text" name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]" value="{$methodObj->title[$language.id_lang]|default:$paymentMethod.name|escape:'html':'UTF-8'}">
                                     {if $languages|count > 1}
                                         </div>
                                         <div class="col-lg-2">

From 978195c091ff6d2c99ade2a5746fe5d091d987ad Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 16:51:38 +0200
Subject: [PATCH 30/69] [PIPRES-468] delete comments

---
 src/Service/PaymentMethodService.php | 32 ----------------------------
 1 file changed, 32 deletions(-)

diff --git a/src/Service/PaymentMethodService.php b/src/Service/PaymentMethodService.php
index 5cc25d288..e055bcc71 100644
--- a/src/Service/PaymentMethodService.php
+++ b/src/Service/PaymentMethodService.php
@@ -171,38 +171,6 @@ public function savePaymentMethod($method)
         $paymentMethod->id_method = $method['id'];
         $paymentMethod->method_name = $method['name'];
         $paymentMethod->enabled = Tools::getValue(Mollie\Config\Config::MOLLIE_METHOD_ENABLED . $method['id']);
-        //todo logic to save title
-        // data comes likes this {lang_id: title}
-        //result = {string[12]} ["a", "b", "c", "d", "", +7 more]
-        // 1 = "a"
-        // 2 = "b"
-        // 3 = "c"
-        // 4 = "d"
-        // 5 = ""
-        // 6 = ""
-        // 7 = ""
-        // 8 = ""
-        // 9 = ""
-        // 10 = ""
-        // 11 = ""
-        // 12 = ""
-
-        // todo check is it complient with multishop as we might need to save shop id as well
-        // todo make get logic to show correct titles.
-        // todo prestashop has multilang maybe we can connect this functionality with it
-        // todo update method and install method
-        // todo add logic to show correct title in payment step
-
-        // todo check is it relevant
-        // todo add logic to show correct title in order confirmation email
-        // todo add logic to show correct title in order invoice
-        // todo add logic to show correct title in order pdf
-        // todo add logic to show correct title in order admin order list
-        // todo add logic to show correct title in order admin order details
-        // todo add logic to show correct title in order admin order invoice
-        // todo add logic to show correct title in order admin order pdf
-        // todo add logic to show correct title in order admin order history
-        // todo add logic to show correct title in order admin order confirmation email
         $paymentMethod->title = $method['name'];
         $paymentMethod->method = Tools::getValue(Mollie\Config\Config::MOLLIE_METHOD_API . $method['id']);
         $paymentMethod->description = Tools::getValue(Mollie\Config\Config::MOLLIE_METHOD_DESCRIPTION . $method['id']);

From 61bc86d60d24fa24c74935f4ba1b51a9a0dfbc51 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 21:02:10 +0200
Subject: [PATCH 31/69] [PIPRES-468] stable

---
 src/Repository/MultiLangRepository.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Repository/MultiLangRepository.php b/src/Repository/MultiLangRepository.php
index 94b8730b2..8f64cb652 100644
--- a/src/Repository/MultiLangRepository.php
+++ b/src/Repository/MultiLangRepository.php
@@ -14,6 +14,10 @@
 
 use Mollie\Shared\Infrastructure\Repository\AbstractRepository;
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class MultiLangRepository extends AbstractRepository implements MultiLangRepositoryInterface
 {
     public function __construct()
@@ -53,6 +57,6 @@ public function getAllTranslationsByMethod(string $idPaymentMethod, int $langId,
         $sql->where('`id_method` = "' . pSQL($idPaymentMethod) . '"');
         $sql->where('`id_shop` = ' . $idShop);
 
-        return \Db::getInstance()->executeS($sql);
+        return \Db::getInstance()->executeS($sql) ?? [];
     }
 }

From 745eecf54d804682122cca6881798d200e120c3b Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 21:03:22 +0200
Subject: [PATCH 32/69] [PIPRES-468] stable

---
 src/Config/Config.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Config/Config.php b/src/Config/Config.php
index 160b17c0d..fd9edd30d 100644
--- a/src/Config/Config.php
+++ b/src/Config/Config.php
@@ -169,7 +169,7 @@ class Config
     const MOLLIE_SUBSCRIPTION_ENABLED = 'MOLLIE_SUBSCRIPTION_ENABLED';
 
     const MOLLIE_METHOD_ENABLED = 'MOLLIE_METHOD_ENABLED_';
-    //todo array
+
     const MOLLIE_METHOD_TITLE = 'MOLLIE_METHOD_TITLE_';
     const MOLLIE_METHOD_API = 'MOLLIE_METHOD_API_';
     const MOLLIE_METHOD_DESCRIPTION = 'MOLLIE_METHOD_DESCRIPTION_';

From 63516f82d418ea7c77daa79053c7d96c0173c20d Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 21:06:10 +0200
Subject: [PATCH 33/69] [PIPRES-468] stable

---
 src/Entity/MolPaymentMethodLang.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Entity/MolPaymentMethodLang.php b/src/Entity/MolPaymentMethodLang.php
index b727a013b..ee35912b7 100644
--- a/src/Entity/MolPaymentMethodLang.php
+++ b/src/Entity/MolPaymentMethodLang.php
@@ -42,16 +42,19 @@ class MolPaymentMethodLang extends ObjectModel
                 'type' => self::TYPE_STRING,
                 'validate' => 'isString',
                 'required' => true,
+                'size' => 64,
             ],
             'id_lang' => [
                 'type' => self::TYPE_INT,
                 'validate' => 'isUnsignedInt',
                 'required' => true,
+                'size' => 11,
             ],
             'id_shop' => [
                 'type' => self::TYPE_INT,
                 'validate' => 'isUnsignedInt',
                 'required' => true,
+                'size' => 11,
             ],
             'text' => [
                 'type' => self::TYPE_STRING,

From 6bcf5483ba980629fe858deeff08c69b888381bc Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 21:10:01 +0200
Subject: [PATCH 34/69] [PIPRES-468] stable

---
 src/Install/DatabaseTableInstaller.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Install/DatabaseTableInstaller.php b/src/Install/DatabaseTableInstaller.php
index 906251838..19f7057cd 100644
--- a/src/Install/DatabaseTableInstaller.php
+++ b/src/Install/DatabaseTableInstaller.php
@@ -154,7 +154,7 @@ private function getCommands()
         $sql[] = '
             CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'mol_payment_method_lang` (
                 `id` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
-                `id_method` TINYTEXT,
+                `id_method` VARCHAR(64) NOT NULL,
                 `id_lang` INT(11),
                 `id_shop` INT(11),
                 `text` TINYTEXT,

From 86d1bc3b76e8fded05c69d4b557ca0aa02254bcb Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 21:12:27 +0200
Subject: [PATCH 35/69] [PIPRES-468] stable

---
 src/Repository/MultiLangRepository.php          | 2 +-
 src/Repository/MultiLangRepositoryInterface.php | 2 +-
 src/Service/PaymentMethodLangService.php        | 2 +-
 upgrade/Upgrade-6.2.5.php                       | 7 +------
 4 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/Repository/MultiLangRepository.php b/src/Repository/MultiLangRepository.php
index 8f64cb652..4fb0de6f1 100644
--- a/src/Repository/MultiLangRepository.php
+++ b/src/Repository/MultiLangRepository.php
@@ -49,7 +49,7 @@ public function getExistingRecordId(string $idPaymentMethod, int $langId, int $i
         return \Db::getInstance()->getValue($sql) ?: null;
     }
 
-    public function getAllTranslationsByMethod(string $idPaymentMethod, int $langId, int $idShop): array
+    public function getAllTranslationsByMethod(string $idPaymentMethod, int $idShop): array
     {
         $sql = new \DbQuery();
         $sql->select('`id_lang`, `text`');
diff --git a/src/Repository/MultiLangRepositoryInterface.php b/src/Repository/MultiLangRepositoryInterface.php
index 85e8b7f3b..fe2544576 100644
--- a/src/Repository/MultiLangRepositoryInterface.php
+++ b/src/Repository/MultiLangRepositoryInterface.php
@@ -37,5 +37,5 @@ public function getExistingRecordId(string $idPaymentMethod, int $langId, int $i
      * @param string $idMethod
      * @return array [id_lang => text] for instance: [74 => 'Apelo Pay', 68 => 'Apella Pia']
      */
-    public function getAllTranslationsByMethod(string $idPaymentMethod, int $langId, int $idShop): ?array;
+    public function getAllTranslationsByMethod(string $idPaymentMethod, int $idShop): ?array;
 }
diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
index d912d03f6..a3fd02e0f 100644
--- a/src/Service/PaymentMethodLangService.php
+++ b/src/Service/PaymentMethodLangService.php
@@ -64,7 +64,7 @@ public function trans(string $idMethod): ?string
      */
     public function getTransList(string $idMethod): array
     {
-        $result = $this->multiLangRepository->getAllTranslationsByMethod($idMethod, $this->context->getLanguageId(), $this->context->getShopId());
+        $result = $this->multiLangRepository->getAllTranslationsByMethod($idMethod, $this->context->getShopId());
 
         $mappedArray = [];
         foreach ($result as $value) {
diff --git a/upgrade/Upgrade-6.2.5.php b/upgrade/Upgrade-6.2.5.php
index 58ac2f2a9..dce0d289a 100644
--- a/upgrade/Upgrade-6.2.5.php
+++ b/upgrade/Upgrade-6.2.5.php
@@ -25,10 +25,5 @@ function upgrade_module_6_2_5(Mollie $module): bool
                 INDEX (`id_method`)
     ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8;';
 
-    $isTableCreated = Db::getInstance()->execute($sql);
-    if (!$isTableCreated) {
-        return false; // If the table creation fails, return false
-    }
-
-    return $isTableCreated;
+    return Db::getInstance()->execute($sql);
 }

From 2ee9e0dea23e0dafaa010a84173c7219024bc379 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 21:25:35 +0200
Subject: [PATCH 36/69] [PIPRES-468] stable

---
 src/Repository/MultiLangRepository.php          | 12 ------------
 src/Repository/MultiLangRepositoryInterface.php |  8 ++------
 src/Service/PaymentMethodLangService.php        | 11 +++++++++--
 upgrade/Upgrade-6.2.5.php                       |  2 +-
 4 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/src/Repository/MultiLangRepository.php b/src/Repository/MultiLangRepository.php
index 4fb0de6f1..056a101b4 100644
--- a/src/Repository/MultiLangRepository.php
+++ b/src/Repository/MultiLangRepository.php
@@ -37,18 +37,6 @@ public function getTextByLanguageAndMethod(int $idLanguage, string $idMethod, in
         return \Db::getInstance()->getValue($sql) ?: null;
     }
 
-    public function getExistingRecordId(string $idPaymentMethod, int $langId, int $idShop): ?string
-    {
-        $sql = new \DbQuery();
-        $sql->select('`id`');
-        $sql->from('mol_payment_method_lang');
-        $sql->where('`id_method` = "' . pSQL($idPaymentMethod) . '"');
-        $sql->where('`id_lang` = ' . $langId);
-        $sql->where('`id_shop` = ' . $idShop);
-
-        return \Db::getInstance()->getValue($sql) ?: null;
-    }
-
     public function getAllTranslationsByMethod(string $idPaymentMethod, int $idShop): array
     {
         $sql = new \DbQuery();
diff --git a/src/Repository/MultiLangRepositoryInterface.php b/src/Repository/MultiLangRepositoryInterface.php
index fe2544576..15a85c9de 100644
--- a/src/Repository/MultiLangRepositoryInterface.php
+++ b/src/Repository/MultiLangRepositoryInterface.php
@@ -26,15 +26,11 @@ interface MultiLangRepositoryInterface extends ReadOnlyRepositoryInterface
      */
     public function getTextByLanguageAndMethod(int $idLanguage, string $idMethod, int $idShop): ?string;
 
-    /**
-     * Gets auto increment ID for specific payment method
-     */
-    public function getExistingRecordId(string $idPaymentMethod, int $langId, int $idShop): ?string;
-
     /**
      * Gets all translations for a payment method title
      *
-     * @param string $idMethod
+     * @param string $idPaymentMethod
+     * @param int $idShop
      * @return array [id_lang => text] for instance: [74 => 'Apelo Pay', 68 => 'Apella Pia']
      */
     public function getAllTranslationsByMethod(string $idPaymentMethod, int $idShop): ?array;
diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
index a3fd02e0f..a8dd973ab 100644
--- a/src/Service/PaymentMethodLangService.php
+++ b/src/Service/PaymentMethodLangService.php
@@ -41,8 +41,13 @@ public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId
 
         $id = $this->multiLangRepository->getExistingRecordId($idPaymentMethod, $langId, $this->context->getShopId()) ?: 0;
 
-        $multiLangObject = new \MolPaymentMethodLang();
-        $multiLangObject->id = $id;
+        $obj = $this->multiLangRepository->findOneBy([
+            'id_method' => $idPaymentMethod,
+            'id_lang' => $langId,
+            'id_shop' => $this->context->getShopId(),
+        ]);
+
+        $multiLangObject = new \MolPaymentMethodLang($obj->id);
         $multiLangObject->id_lang = $langId;
         $multiLangObject->id_method = $idPaymentMethod;
         $multiLangObject->id_shop = $this->context->getShopId();
@@ -66,6 +71,8 @@ public function getTransList(string $idMethod): array
     {
         $result = $this->multiLangRepository->getAllTranslationsByMethod($idMethod, $this->context->getShopId());
 
+
+
         $mappedArray = [];
         foreach ($result as $value) {
             $mappedArray[$value['id_lang']] = $value['text'];
diff --git a/upgrade/Upgrade-6.2.5.php b/upgrade/Upgrade-6.2.5.php
index dce0d289a..2010164ab 100644
--- a/upgrade/Upgrade-6.2.5.php
+++ b/upgrade/Upgrade-6.2.5.php
@@ -21,7 +21,7 @@ function upgrade_module_6_2_5(Mollie $module): bool
                 `id_method` TINYTEXT,
                 `id_lang` INT(11),
                 `id_shop` INT(11),
-                `text` TINYTEXT,
+                `text` VARCHAR(64) NOT NULL,
                 INDEX (`id_method`)
     ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8;';
 

From 3c7482c63fd5c42a406a31f206644cd60e374595 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 21:31:41 +0200
Subject: [PATCH 37/69] [PIPRES-468] changed method to get object

---
 src/Service/PaymentMethodLangService.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
index a8dd973ab..408ffc146 100644
--- a/src/Service/PaymentMethodLangService.php
+++ b/src/Service/PaymentMethodLangService.php
@@ -39,8 +39,6 @@ public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId
             return;
         }
 
-        $id = $this->multiLangRepository->getExistingRecordId($idPaymentMethod, $langId, $this->context->getShopId()) ?: 0;
-
         $obj = $this->multiLangRepository->findOneBy([
             'id_method' => $idPaymentMethod,
             'id_lang' => $langId,

From 0f6945094498990582cae960134c6cb56293b26d Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 20 Nov 2024 21:34:19 +0200
Subject: [PATCH 38/69] [PIPRES-468] whitespace deletion

---
 src/Service/PaymentMethodLangService.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
index 408ffc146..3e0cca0bb 100644
--- a/src/Service/PaymentMethodLangService.php
+++ b/src/Service/PaymentMethodLangService.php
@@ -69,8 +69,6 @@ public function getTransList(string $idMethod): array
     {
         $result = $this->multiLangRepository->getAllTranslationsByMethod($idMethod, $this->context->getShopId());
 
-
-
         $mappedArray = [];
         foreach ($result as $value) {
             $mappedArray[$value['id_lang']] = $value['text'];

From 912a7684d72b41d4ee197d1fea90124e8da05ee3 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Thu, 21 Nov 2024 08:57:49 +0200
Subject: [PATCH 39/69] [PIPRES-468] Multishop compatibility fix

---
 src/Service/PaymentMethodLangService.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
index 3e0cca0bb..1152b2c6f 100644
--- a/src/Service/PaymentMethodLangService.php
+++ b/src/Service/PaymentMethodLangService.php
@@ -45,7 +45,7 @@ public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId
             'id_shop' => $this->context->getShopId(),
         ]);
 
-        $multiLangObject = new \MolPaymentMethodLang($obj->id);
+        $multiLangObject = new \MolPaymentMethodLang(isset($obj) ? $obj->id : null);
         $multiLangObject->id_lang = $langId;
         $multiLangObject->id_method = $idPaymentMethod;
         $multiLangObject->id_shop = $this->context->getShopId();

From ee70cc426b9801526251410a02160ebc10564c13 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Thu, 21 Nov 2024 13:44:22 +0200
Subject: [PATCH 40/69] [PIPRES-468] fixed comments

---
 src/Entity/MolPaymentMethod.php                           | 2 +-
 .../PaymentOption/CreditCardPaymentOptionProvider.php     | 6 +++++-
 src/Repository/MultiLangRepositoryInterface.php           | 2 +-
 src/Service/ApiService.php                                | 2 +-
 src/Service/PaymentMethodLangService.php                  | 2 +-
 views/templates/admin/_configure/helpers/form/form.tpl    | 8 ++++----
 6 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/Entity/MolPaymentMethod.php b/src/Entity/MolPaymentMethod.php
index 104e56343..bed0415ca 100644
--- a/src/Entity/MolPaymentMethod.php
+++ b/src/Entity/MolPaymentMethod.php
@@ -31,7 +31,7 @@ class MolPaymentMethod extends ObjectModel
     public $method_name;
 
     /**
-     * @var string
+     * @var string|array
      */
     public $title;
 
diff --git a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
index ef9308549..295095c88 100644
--- a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
@@ -100,6 +100,8 @@ class CreditCardPaymentOptionProvider implements PaymentOptionProviderInterface
     private $customerRepository;
     /** @var ConfigurationAdapter */
     private $configurationAdapter;
+    /** @var PaymentMethodLangService $multiLangService */
+    private $multiLangService;
 
     public function __construct(
         LegacyContext $context,
@@ -110,7 +112,8 @@ public function __construct(
         Customer $customer,
         MolCustomerRepository $customerRepository,
         Mollie $module,
-        ConfigurationAdapter $configurationAdapter
+        ConfigurationAdapter $configurationAdapter,
+        PaymentMethodLangService $multiLangService
     ) {
         $this->context = $context;
         $this->creditCardLogoProvider = $creditCardLogoProvider;
@@ -121,6 +124,7 @@ public function __construct(
         $this->customerRepository = $customerRepository;
         $this->module = $module;
         $this->configurationAdapter = $configurationAdapter;
+        $this->multiLangService = $multiLangService;
     }
 
     /**
diff --git a/src/Repository/MultiLangRepositoryInterface.php b/src/Repository/MultiLangRepositoryInterface.php
index 15a85c9de..c9561e62e 100644
--- a/src/Repository/MultiLangRepositoryInterface.php
+++ b/src/Repository/MultiLangRepositoryInterface.php
@@ -33,5 +33,5 @@ public function getTextByLanguageAndMethod(int $idLanguage, string $idMethod, in
      * @param int $idShop
      * @return array [id_lang => text] for instance: [74 => 'Apelo Pay', 68 => 'Apella Pia']
      */
-    public function getAllTranslationsByMethod(string $idPaymentMethod, int $idShop): ?array;
+    public function getAllTranslationsByMethod(string $idPaymentMethod, int $idShop): array;
 }
diff --git a/src/Service/ApiService.php b/src/Service/ApiService.php
index 316a36ca5..7860a5e57 100644
--- a/src/Service/ApiService.php
+++ b/src/Service/ApiService.php
@@ -236,7 +236,7 @@ private function getMethodsObjForConfig($apiMethods)
                 }
 
                 $methods[$apiMethod['id']] = $apiMethod;
-                $paymentMethod->title = $this->multiLangService->getTransList($apiMethod['id'], $paymentMethod->title);
+                $paymentMethod->title = $this->multiLangService->getTransList($apiMethod['id']);
                 $methods[$apiMethod['id']]['obj'] = $paymentMethod;
 
                 continue;
diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
index 1152b2c6f..fba218cae 100644
--- a/src/Service/PaymentMethodLangService.php
+++ b/src/Service/PaymentMethodLangService.php
@@ -48,7 +48,7 @@ public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId
         $multiLangObject = new \MolPaymentMethodLang(isset($obj) ? $obj->id : null);
         $multiLangObject->id_lang = $langId;
         $multiLangObject->id_method = $idPaymentMethod;
-        $multiLangObject->id_shop = $this->context->getShopId();
+        $multiLangObject->id_shop = $idShop;
         $multiLangObject->text = $translation;
         $multiLangObject->save();
     }
diff --git a/views/templates/admin/_configure/helpers/form/form.tpl b/views/templates/admin/_configure/helpers/form/form.tpl
index 31cfda7c0..7efbf9b6d 100644
--- a/views/templates/admin/_configure/helpers/form/form.tpl
+++ b/views/templates/admin/_configure/helpers/form/form.tpl
@@ -186,7 +186,7 @@
                                         </div>
                                         <div class="col-lg-2">
                                             <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                                                {$language.iso_code}
+                                                {$language.iso_code|escape:'html':'UTF-8'}
                                                 <span class="caret"></span>
                                             </button>
                                             <ul class="dropdown-menu">
@@ -217,7 +217,7 @@
                                     {/if}
                                 </select>
                                 <p class="help-block">
-                                    {$input.methodDescription}
+                                    {$input.methodDescription|escape:'html':'UTF-8'}
                                 </p>
                             </div>
                         </div>
@@ -393,7 +393,7 @@
                                         {if $paymentMethod.maximumAmount != false } max="{$paymentMethod.maximumAmount.value}" {/if}
                                        value="{if $methodObj->min_amount == 0}{$paymentMethod.minimumAmount.value}{else}{$methodObj->min_amount}{/if}">
                                 <p class="help-block">
-                                    {l s='Default min amount in mollie is: ' mod='mollie'} {$paymentMethod.minimumAmount.value}{$paymentMethod.minimumAmount.currency}
+                                    {l s='Default min amount in mollie is: ' mod='mollie'} {$paymentMethod.minimumAmount.value|escape:'html':'UTF-8'}{$paymentMethod.minimumAmount.currency|escape:'html':'UTF-8'}
                                 </p>
                             </div>
                         </div>
@@ -411,7 +411,7 @@
                                     {if $paymentMethod.maximumAmount == false}
                                         {l s='Default max amount has no limitation' mod='mollie'}
                                     {else}
-                                        {l s='Default max amount in mollie is: ' mod='mollie'}{$paymentMethod.maximumAmount.value}{$paymentMethod.maximumAmount.currency}
+                                        {l s='Default max amount in mollie is: ' mod='mollie'}{$paymentMethod.maximumAmount.value|escape:'html':'UTF-8'}{$paymentMethod.maximumAmount.currency|escape:'html':'UTF-8'}
                                     {/if}
                                 </p>
                             </div>

From 1827b0a409c1bbe199c526c93437f9d941081e95 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Mon, 25 Nov 2024 11:46:00 +0200
Subject: [PATCH 41/69] [PIPRES-468] rename services

---
 ...tiLangRepository.php => PaymentMethodLangRepository.php} | 2 +-
 ...terface.php => PaymentMethodLangRepositoryInterface.php} | 2 +-
 src/Service/PaymentMethodLangService.php                    | 6 +++---
 src/ServiceProvider/BaseServiceProvider.php                 | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename src/Repository/{MultiLangRepository.php => PaymentMethodLangRepository.php} (92%)
 rename src/Repository/{MultiLangRepositoryInterface.php => PaymentMethodLangRepositoryInterface.php} (91%)

diff --git a/src/Repository/MultiLangRepository.php b/src/Repository/PaymentMethodLangRepository.php
similarity index 92%
rename from src/Repository/MultiLangRepository.php
rename to src/Repository/PaymentMethodLangRepository.php
index 056a101b4..b2eea1bf6 100644
--- a/src/Repository/MultiLangRepository.php
+++ b/src/Repository/PaymentMethodLangRepository.php
@@ -18,7 +18,7 @@
     exit;
 }
 
-class MultiLangRepository extends AbstractRepository implements MultiLangRepositoryInterface
+class PaymentMethodLangRepository extends AbstractRepository implements PaymentMethodLangRepositoryInterface
 {
     public function __construct()
     {
diff --git a/src/Repository/MultiLangRepositoryInterface.php b/src/Repository/PaymentMethodLangRepositoryInterface.php
similarity index 91%
rename from src/Repository/MultiLangRepositoryInterface.php
rename to src/Repository/PaymentMethodLangRepositoryInterface.php
index c9561e62e..b41a2d0e0 100644
--- a/src/Repository/MultiLangRepositoryInterface.php
+++ b/src/Repository/PaymentMethodLangRepositoryInterface.php
@@ -18,7 +18,7 @@
     exit;
 }
 
-interface MultiLangRepositoryInterface extends ReadOnlyRepositoryInterface
+interface PaymentMethodLangRepositoryInterface extends ReadOnlyRepositoryInterface
 {
 
     /**
diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
index fba218cae..43072c958 100644
--- a/src/Service/PaymentMethodLangService.php
+++ b/src/Service/PaymentMethodLangService.php
@@ -13,7 +13,7 @@
 namespace Mollie\Service;
 
 use Mollie\Adapter\Context;
-use Mollie\Repository\MultiLangRepositoryInterface;
+use Mollie\Repository\PaymentMethodLangRepositoryInterface;
 
 if (!defined('_PS_VERSION_')) {
     exit;
@@ -21,13 +21,13 @@
 
 class PaymentMethodLangService
 {
-    /** @var MultiLangRepositoryInterface */
+    /** @var PaymentMethodLangRepositoryInterface */
     private $multiLangRepository;
 
     /** @var Context */
     private $context;
 
-    public function __construct(MultiLangRepositoryInterface $multiLangRepository, Context $context)
+    public function __construct(PaymentMethodLangRepositoryInterface $multiLangRepository, Context $context)
     {
         $this->multiLangRepository = $multiLangRepository;
         $this->context = $context;
diff --git a/src/ServiceProvider/BaseServiceProvider.php b/src/ServiceProvider/BaseServiceProvider.php
index 96444b19b..4af8a04e6 100644
--- a/src/ServiceProvider/BaseServiceProvider.php
+++ b/src/ServiceProvider/BaseServiceProvider.php
@@ -84,8 +84,8 @@
 use Mollie\Repository\MolLogRepositoryInterface;
 use Mollie\Repository\MolOrderPaymentFeeRepository;
 use Mollie\Repository\MolOrderPaymentFeeRepositoryInterface;
-use Mollie\Repository\MultiLangRepository;
-use Mollie\Repository\MultiLangRepositoryInterface;
+use Mollie\Repository\PaymentMethodLangRepository;
+use Mollie\Repository\PaymentMethodLangRepositoryInterface;
 use Mollie\Repository\OrderRepository;
 use Mollie\Repository\OrderRepositoryInterface;
 use Mollie\Repository\PaymentMethodRepository;
@@ -217,7 +217,7 @@ public function register(Container $container)
         $this->addService($container, TaxRuleRepositoryInterface::class, $container->get(TaxRuleRepository::class));
         $this->addService($container, TaxRepositoryInterface::class, $container->get(TaxRepository::class));
         $this->addService($container, CartRepositoryInterface::class, $container->get(CartRepository::class));
-        $this->addService($container, MultiLangRepositoryInterface::class, $container->get(MultiLangRepository::class));
+        $this->addService($container, PaymentMethodLangRepositoryInterface::class, $container->get(PaymentMethodLangRepository::class));
 
         $this->addService($container, OrderTotalProviderInterface::class, $container->get(OrderTotalProvider::class));
         $this->addService($container, PaymentFeeProviderInterface::class, $container->get(PaymentFeeProvider::class));

From 976a2f20c259602762e5445a03cc297dac8ce645 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Mon, 25 Nov 2024 12:31:28 +0200
Subject: [PATCH 42/69] [PIPRES-468] removed useless translation service,
 removed title from table, adapted logic to work without title

---
 src/Entity/MolPaymentMethod.php               |  6 ---
 .../BancontactPaymentOptionProvider.php       |  2 +-
 .../BasePaymentOptionProvider.php             |  2 +-
 .../CreditCardPaymentOptionProvider.php       |  2 +-
 ...itCardSingleClickPaymentOptionProvider.php |  2 +-
 .../IdealPaymentOptionProvider.php            |  2 +-
 src/Service/ApiService.php                    |  3 +-
 src/Service/PaymentMethodService.php          |  9 -----
 src/Service/PaymentsTranslationService.php    | 40 -------------------
 .../admin/_configure/helpers/form/form.tpl    |  2 +-
 10 files changed, 7 insertions(+), 63 deletions(-)
 delete mode 100644 src/Service/PaymentsTranslationService.php

diff --git a/src/Entity/MolPaymentMethod.php b/src/Entity/MolPaymentMethod.php
index bed0415ca..e3f134ec7 100644
--- a/src/Entity/MolPaymentMethod.php
+++ b/src/Entity/MolPaymentMethod.php
@@ -30,11 +30,6 @@ class MolPaymentMethod extends ObjectModel
      */
     public $method_name;
 
-    /**
-     * @var string|array
-     */
-    public $title;
-
     /**
      * @var string
      */
@@ -123,7 +118,6 @@ class MolPaymentMethod extends ObjectModel
             'id_method' => ['type' => self::TYPE_STRING, 'validate' => 'isString'],
             'method_name' => ['type' => self::TYPE_STRING, 'validate' => 'isString'],
             'enabled' => ['type' => self::TYPE_BOOL, 'validate' => 'isBool'],
-            'title' => ['type' => self::TYPE_STRING, 'validate' => 'isString'],
             'method' => ['type' => self::TYPE_STRING, 'validate' => 'isString'],
             'description' => ['type' => self::TYPE_STRING, 'validate' => 'isString'],
             'is_countries_applicable' => ['type' => self::TYPE_BOOL, 'validate' => 'isBool'],
diff --git a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
index 82a3d12c8..f5baf53d9 100644
--- a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
@@ -112,7 +112,7 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->title
+            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/BasePaymentOptionProvider.php b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
index 24081c9c2..dfc240a9b 100644
--- a/src/Provider/PaymentOption/BasePaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
@@ -110,7 +110,7 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->title
+            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
index 295095c88..5be6f9fa1 100644
--- a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
@@ -135,7 +135,7 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->title
+            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
index 396fa61bb..598f90db5 100644
--- a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
@@ -132,7 +132,7 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->title
+            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
index f283a36a5..644571e60 100644
--- a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
@@ -118,7 +118,7 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->title
+            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Service/ApiService.php b/src/Service/ApiService.php
index 7860a5e57..f5a9850c4 100644
--- a/src/Service/ApiService.php
+++ b/src/Service/ApiService.php
@@ -197,7 +197,6 @@ private function getMethodsObjForConfig($apiMethods)
         $methods = [];
         $emptyPaymentMethod = new MolPaymentMethod();
         $emptyPaymentMethod->enabled = false;
-        $emptyPaymentMethod->title = '';
         $emptyPaymentMethod->method = 'payments';
         $emptyPaymentMethod->description = '';
         $emptyPaymentMethod->is_countries_applicable = false;
@@ -236,7 +235,7 @@ private function getMethodsObjForConfig($apiMethods)
                 }
 
                 $methods[$apiMethod['id']] = $apiMethod;
-                $paymentMethod->title = $this->multiLangService->getTransList($apiMethod['id']);
+                $paymentMethod->method_name = $this->multiLangService->getTransList($apiMethod['id']);
                 $methods[$apiMethod['id']]['obj'] = $paymentMethod;
 
                 continue;
diff --git a/src/Service/PaymentMethodService.php b/src/Service/PaymentMethodService.php
index e055bcc71..5f36fd4ef 100644
--- a/src/Service/PaymentMethodService.php
+++ b/src/Service/PaymentMethodService.php
@@ -75,11 +75,6 @@ class PaymentMethodService
      */
     private $cartLinesService;
 
-    /**
-     * @var PaymentsTranslationService
-     */
-    private $paymentsTranslationService;
-
     /**
      * @var CustomerService
      */
@@ -123,7 +118,6 @@ public function __construct(
         Mollie $module,
         PaymentMethodRepositoryInterface $methodRepository,
         CartLinesService $cartLinesService,
-        PaymentsTranslationService $paymentsTranslationService,
         CustomerService $customerService,
         CreditCardLogoProvider $creditCardLogoProvider,
         PaymentMethodSortProviderInterface $paymentMethodSortProvider,
@@ -142,7 +136,6 @@ public function __construct(
         $this->module = $module;
         $this->methodRepository = $methodRepository;
         $this->cartLinesService = $cartLinesService;
-        $this->paymentsTranslationService = $paymentsTranslationService;
         $this->customerService = $customerService;
         $this->creditCardLogoProvider = $creditCardLogoProvider;
         $this->paymentMethodSortProvider = $paymentMethodSortProvider;
@@ -171,7 +164,6 @@ public function savePaymentMethod($method)
         $paymentMethod->id_method = $method['id'];
         $paymentMethod->method_name = $method['name'];
         $paymentMethod->enabled = Tools::getValue(Mollie\Config\Config::MOLLIE_METHOD_ENABLED . $method['id']);
-        $paymentMethod->title = $method['name'];
         $paymentMethod->method = Tools::getValue(Mollie\Config\Config::MOLLIE_METHOD_API . $method['id']);
         $paymentMethod->description = Tools::getValue(Mollie\Config\Config::MOLLIE_METHOD_DESCRIPTION . $method['id']);
         $paymentMethod->is_countries_applicable = Tools::getValue(Mollie\Config\Config::MOLLIE_METHOD_APPLICABLE_COUNTRIES . $method['id']);
@@ -254,7 +246,6 @@ public function getMethodsForCheckout()
             }
         }
 
-        $methods = $this->paymentsTranslationService->getTranslatedPaymentMethods($methods);
         $methods = $this->paymentMethodSortProvider->getSortedInAscendingWayForCheckout($methods);
 
         return $methods;
diff --git a/src/Service/PaymentsTranslationService.php b/src/Service/PaymentsTranslationService.php
deleted file mode 100644
index 4fe31e854..000000000
--- a/src/Service/PaymentsTranslationService.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Mollie       https://www.mollie.nl
- *
- * @author      Mollie B.V. <info@mollie.nl>
- * @copyright   Mollie B.V.
- * @license     https://github.com/mollie/PrestaShop/blob/master/LICENSE.md
- *
- * @see        https://github.com/mollie/PrestaShop
- * @codingStandardsIgnoreStart
- */
-
-namespace Mollie\Service;
-
-if (!defined('_PS_VERSION_')) {
-    exit;
-}
-
-class PaymentsTranslationService
-{
-    /**
-     * @var LanguageService
-     */
-    private $languageService;
-
-    public function __construct(
-        LanguageService $languageService
-    ) {
-        $this->languageService = $languageService;
-    }
-
-    public function getTranslatedPaymentMethods($paymentMethods)
-    {
-        foreach ($paymentMethods as $method) {
-            $method['method_name'] = $this->languageService->lang($method['method_name']);
-        }
-
-        return $paymentMethods;
-    }
-}
diff --git a/views/templates/admin/_configure/helpers/form/form.tpl b/views/templates/admin/_configure/helpers/form/form.tpl
index 7efbf9b6d..5936cd60e 100644
--- a/views/templates/admin/_configure/helpers/form/form.tpl
+++ b/views/templates/admin/_configure/helpers/form/form.tpl
@@ -181,7 +181,7 @@
                                         <div class="translatable-field lang-{$language.id_lang}" {if $language.id_lang != $defaultFormLanguage}style="display:none"{/if}>
                                         <div class="col-lg-4">
                                     {/if}
-                                    <input type="text" name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]" value="{$methodObj->title[$language.id_lang]|default:$paymentMethod.name|escape:'html':'UTF-8'}">
+                                    <input type="text" name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]" value="{$methodObj->method_name[$language.id_lang]|default:$paymentMethod.name|escape:'html':'UTF-8'}">
                                     {if $languages|count > 1}
                                         </div>
                                         <div class="col-lg-2">

From 056b7f61dd1cb3b11a4a01adf0bb86c386bbfd6e Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Mon, 25 Nov 2024 14:24:52 +0200
Subject: [PATCH 43/69] [PIPRES-468] updated upgrade logic to add all titles
 into new table on upgrade

---
 upgrade/Upgrade-6.2.5.php | 42 +++++++++++++++++++++++++++++++++++++--
 1 file changed, 40 insertions(+), 2 deletions(-)

diff --git a/upgrade/Upgrade-6.2.5.php b/upgrade/Upgrade-6.2.5.php
index 2010164ab..a550a2f3c 100644
--- a/upgrade/Upgrade-6.2.5.php
+++ b/upgrade/Upgrade-6.2.5.php
@@ -15,7 +15,6 @@
 
 function upgrade_module_6_2_5(Mollie $module): bool
 {
-    // Create the new mol_payment_method_lang table
     $sql = 'CREATE TABLE IF NOT EXISTS `' . _DB_PREFIX_ . 'mol_payment_method_lang` (
                 `id` INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY,
                 `id_method` TINYTEXT,
@@ -23,7 +22,46 @@ function upgrade_module_6_2_5(Mollie $module): bool
                 `id_shop` INT(11),
                 `text` VARCHAR(64) NOT NULL,
                 INDEX (`id_method`)
-    ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8;';
+        ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8;';
+
+    $result = Db::getInstance()->execute($sql);
+
+    if(!$result) {
+        return false;
+    }
+
+    try {
+        deleteAndUpdatePaymentMethodTitles();
+    } catch (Exception $e) {
+        return false;
+    }
+
+    $sql = 'ALTER TABLE `mol_payment_method` DROP COLUMN `title`;';
 
     return Db::getInstance()->execute($sql);
 }
+
+function deleteAndUpdatePaymentMethodTitles() {
+    $sql = 'SELECT `id_method`, `title` FROM `' . _DB_PREFIX_ . 'mol_payment_method`';
+
+    $methodsList = \Db::getInstance()->executeS($sql);
+
+    foreach ($methodsList as $method) {
+        if (empty($method['title'])) {
+            continue;
+        }
+
+        insertNewTitlesIntoDatabase($method);
+    }
+}
+
+function insertNewTitlesIntoDatabase($method) {
+    foreach (\Shop::getCompleteListOfShopsID() as $idShop) {
+        foreach (\Language::getLanguages() as $idLang) {
+            $sql = 'INSERT INTO `' . _DB_PREFIX_ . 'mol_payment_method_lang` (`id_method`, `id_lang`, `id_shop`, `text`)
+                    VALUES ("' . pSQL($method['id_method']) . '", ' . (int)$idLang['id_lang'] . ', ' . (int)$idShop . ', "' . pSQL($method['title']) . '")';
+
+            \Db::getInstance()->execute($sql);
+        }
+    }
+}

From a40cb8920e21101b3034b07c83d88efa8709f062 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Mon, 25 Nov 2024 15:49:20 +0200
Subject: [PATCH 44/69] [PIPRES-468] bump version, fixed upgrade failing

---
 mollie.php                | 2 +-
 upgrade/Upgrade-6.2.5.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mollie.php b/mollie.php
index 4e7c91505..5fc847418 100755
--- a/mollie.php
+++ b/mollie.php
@@ -89,7 +89,7 @@ public function __construct()
     {
         $this->name = 'mollie';
         $this->tab = 'payments_gateways';
-        $this->version = '6.2.4';
+        $this->version = '6.2.5';
         $this->author = 'Mollie B.V.';
         $this->need_instance = 1;
         $this->bootstrap = true;
diff --git a/upgrade/Upgrade-6.2.5.php b/upgrade/Upgrade-6.2.5.php
index a550a2f3c..e7d22dea4 100644
--- a/upgrade/Upgrade-6.2.5.php
+++ b/upgrade/Upgrade-6.2.5.php
@@ -36,7 +36,7 @@ function upgrade_module_6_2_5(Mollie $module): bool
         return false;
     }
 
-    $sql = 'ALTER TABLE `mol_payment_method` DROP COLUMN `title`;';
+    $sql = 'ALTER TABLE `' . _DB_PREFIX_ . 'mol_payment_method` DROP COLUMN `title`;';
 
     return Db::getInstance()->execute($sql);
 }

From 518fe5deb27464136ff6666304a6869c48ac4064 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Mon, 25 Nov 2024 16:08:40 +0200
Subject: [PATCH 45/69] [PIPRES-468] fix

---
 src/Install/DatabaseTableInstaller.php   |  9 +++++++++
 src/Service/PaymentMethodLangService.php | 14 +++++++-------
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/Install/DatabaseTableInstaller.php b/src/Install/DatabaseTableInstaller.php
index 19f7057cd..c8ff49bec 100644
--- a/src/Install/DatabaseTableInstaller.php
+++ b/src/Install/DatabaseTableInstaller.php
@@ -186,6 +186,15 @@ private function alterTableCommands(): bool
             return false;
         }
 
+        $query = '
+            ALTER TABLE ' . _DB_PREFIX_ . 'mol_payment_method
+            DROP COLUMN title;
+        ';
+
+        if (!Db::getInstance()->execute($query)) {
+            return false;
+        }
+
         return true;
     }
 }
diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
index 43072c958..8664a863e 100644
--- a/src/Service/PaymentMethodLangService.php
+++ b/src/Service/PaymentMethodLangService.php
@@ -22,14 +22,14 @@
 class PaymentMethodLangService
 {
     /** @var PaymentMethodLangRepositoryInterface */
-    private $multiLangRepository;
+    private $paymentMethodLangRepository;
 
     /** @var Context */
     private $context;
 
-    public function __construct(PaymentMethodLangRepositoryInterface $multiLangRepository, Context $context)
+    public function __construct(PaymentMethodLangRepositoryInterface $paymentMethodLangRepository, Context $context)
     {
-        $this->multiLangRepository = $multiLangRepository;
+        $this->paymentMethodLangRepository = $paymentMethodLangRepository;
         $this->context = $context;
     }
 
@@ -39,13 +39,13 @@ public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId
             return;
         }
 
-        $obj = $this->multiLangRepository->findOneBy([
+        $paymentMethodLangObject = $this->paymentMethodLangRepository->findOneBy([
             'id_method' => $idPaymentMethod,
             'id_lang' => $langId,
             'id_shop' => $this->context->getShopId(),
         ]);
 
-        $multiLangObject = new \MolPaymentMethodLang(isset($obj) ? $obj->id : null);
+        $multiLangObject = new \MolPaymentMethodLang(isset($paymentMethodLangObject) ? $paymentMethodLangObject->id : null);
         $multiLangObject->id_lang = $langId;
         $multiLangObject->id_method = $idPaymentMethod;
         $multiLangObject->id_shop = $idShop;
@@ -55,7 +55,7 @@ public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId
 
     public function trans(string $idMethod): ?string
     {
-        return $this->multiLangRepository->getTextByLanguageAndMethod($this->context->getLanguageId(), $idMethod, $this->context->getShopId());
+        return $this->paymentMethodLangRepository->getTextByLanguageAndMethod($this->context->getLanguageId(), $idMethod, $this->context->getShopId());
     }
 
 
@@ -67,7 +67,7 @@ public function trans(string $idMethod): ?string
      */
     public function getTransList(string $idMethod): array
     {
-        $result = $this->multiLangRepository->getAllTranslationsByMethod($idMethod, $this->context->getShopId());
+        $result = $this->paymentMethodLangRepository->getAllTranslationsByMethod($idMethod, $this->context->getShopId());
 
         $mappedArray = [];
         foreach ($result as $value) {

From f4145fff3d28b709230a870846cfb33a49443fb5 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Mon, 25 Nov 2024 21:30:54 +0200
Subject: [PATCH 46/69] [PIPRES-468] renamed services

---
 .../PaymentMethodLangRepository.php           | 20 +++++++++++++++++++
 .../PaymentMethodLangRepositoryInterface.php  |  2 ++
 src/Service/PaymentMethodLangService.php      | 20 -------------------
 src/Service/PaymentMethodService.php          | 11 +++++-----
 4 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/src/Repository/PaymentMethodLangRepository.php b/src/Repository/PaymentMethodLangRepository.php
index b2eea1bf6..e375d2a97 100644
--- a/src/Repository/PaymentMethodLangRepository.php
+++ b/src/Repository/PaymentMethodLangRepository.php
@@ -47,4 +47,24 @@ public function getAllTranslationsByMethod(string $idPaymentMethod, int $idShop)
 
         return \Db::getInstance()->executeS($sql) ?? [];
     }
+
+    public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId, string $translation, int $idShop)
+    {
+        if (empty($translation)) {
+            return;
+        }
+
+        $paymentMethodLangObject = $this->findOneBy([
+            'id_method' => $idPaymentMethod,
+            'id_lang' => $langId,
+            'id_shop' => $idShop,
+        ]);
+
+        $multiLangObject = new \MolPaymentMethodLang(isset($paymentMethodLangObject) ? $paymentMethodLangObject->id : null);
+        $multiLangObject->id_lang = $langId;
+        $multiLangObject->id_method = $idPaymentMethod;
+        $multiLangObject->id_shop = $idShop;
+        $multiLangObject->text = $translation;
+        $multiLangObject->save();
+    }
 }
diff --git a/src/Repository/PaymentMethodLangRepositoryInterface.php b/src/Repository/PaymentMethodLangRepositoryInterface.php
index b41a2d0e0..0a50e65c0 100644
--- a/src/Repository/PaymentMethodLangRepositoryInterface.php
+++ b/src/Repository/PaymentMethodLangRepositoryInterface.php
@@ -34,4 +34,6 @@ public function getTextByLanguageAndMethod(int $idLanguage, string $idMethod, in
      * @return array [id_lang => text] for instance: [74 => 'Apelo Pay', 68 => 'Apella Pia']
      */
     public function getAllTranslationsByMethod(string $idPaymentMethod, int $idShop): array;
+
+    public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId, string $translation, int $idShop);
 }
diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
index 8664a863e..d8f8fb633 100644
--- a/src/Service/PaymentMethodLangService.php
+++ b/src/Service/PaymentMethodLangService.php
@@ -33,26 +33,6 @@ public function __construct(PaymentMethodLangRepositoryInterface $paymentMethodL
         $this->context = $context;
     }
 
-    public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId, string $translation, int $idShop)
-    {
-        if (empty($translation)) {
-            return;
-        }
-
-        $paymentMethodLangObject = $this->paymentMethodLangRepository->findOneBy([
-            'id_method' => $idPaymentMethod,
-            'id_lang' => $langId,
-            'id_shop' => $this->context->getShopId(),
-        ]);
-
-        $multiLangObject = new \MolPaymentMethodLang(isset($paymentMethodLangObject) ? $paymentMethodLangObject->id : null);
-        $multiLangObject->id_lang = $langId;
-        $multiLangObject->id_method = $idPaymentMethod;
-        $multiLangObject->id_shop = $idShop;
-        $multiLangObject->text = $translation;
-        $multiLangObject->save();
-    }
-
     public function trans(string $idMethod): ?string
     {
         return $this->paymentMethodLangRepository->getTextByLanguageAndMethod($this->context->getLanguageId(), $idMethod, $this->context->getShopId());
diff --git a/src/Service/PaymentMethodService.php b/src/Service/PaymentMethodService.php
index 5f36fd4ef..e428bc893 100644
--- a/src/Service/PaymentMethodService.php
+++ b/src/Service/PaymentMethodService.php
@@ -40,6 +40,7 @@
 use Mollie\Provider\PaymentFeeProviderInterface;
 use Mollie\Provider\PhoneNumberProviderInterface;
 use Mollie\Repository\GenderRepositoryInterface;
+use Mollie\Repository\PaymentMethodLangRepositoryInterface;
 use Mollie\Repository\PaymentMethodRepositoryInterface;
 use Mollie\Service\PaymentMethod\PaymentMethodRestrictionValidationInterface;
 use Mollie\Service\PaymentMethod\PaymentMethodSortProviderInterface;
@@ -111,8 +112,8 @@ class PaymentMethodService
     private $context;
     /** @var OrderTotalProviderInterface */
     private $orderTotalProvider;
-    /** @var PaymentMethodLangService */
-    private $paymentMethodLangService;
+    /** @var PaymentMethodLangRepositoryInterface */
+    private $paymentMethodLangRepository;
 
     public function __construct(
         Mollie $module,
@@ -131,7 +132,7 @@ public function __construct(
         PaymentFeeProviderInterface $paymentFeeProvider,
         Context $context,
         OrderTotalProviderInterface $orderTotalProvider,
-        PaymentMethodLangService $paymentMethodLangService
+        PaymentMethodLangRepositoryInterface $paymentMethodLangRepository
     ) {
         $this->module = $module;
         $this->methodRepository = $methodRepository;
@@ -149,7 +150,7 @@ public function __construct(
         $this->paymentFeeProvider = $paymentFeeProvider;
         $this->context = $context;
         $this->orderTotalProvider = $orderTotalProvider;
-        $this->paymentMethodLangService = $paymentMethodLangService;
+        $this->paymentMethodLangRepository = $paymentMethodLangRepository;
     }
 
     public function savePaymentMethod($method)
@@ -185,7 +186,7 @@ public function savePaymentMethod($method)
         $paymentMethod->save();
 
         foreach(Tools::getValue(Config::MOLLIE_METHOD_TITLE . $method['id']) as $idLang => $title) {
-            $this->paymentMethodLangService->savePaymentTitleTranslation($method['id'], $idLang, $title, $this->context->getShopId());
+            $this->paymentMethodLangRepository->savePaymentTitleTranslation($method['id'], $idLang, $title, $this->context->getShopId());
         }
 
         return $paymentMethod;

From 4ed282c864f989df2abab852a6951e65aff1bc25 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 26 Nov 2024 09:07:09 +0200
Subject: [PATCH 47/69] [PIPRES-468] renamed service to provider

---
 .../admin/AdminMollieSettingsController.php   |  1 +
 src/Provider/PaymentMethodLangProvider.php    | 59 +++++++++++++++++++
 .../BancontactPaymentOptionProvider.php       | 12 ++--
 .../BasePaymentOptionProvider.php             | 11 ++--
 .../CreditCardPaymentOptionProvider.php       | 12 ++--
 ...itCardSingleClickPaymentOptionProvider.php | 12 ++--
 .../IdealPaymentOptionProvider.php            | 12 ++--
 src/Service/ApiService.php                    | 11 ++--
 8 files changed, 96 insertions(+), 34 deletions(-)
 create mode 100644 src/Provider/PaymentMethodLangProvider.php

diff --git a/controllers/admin/AdminMollieSettingsController.php b/controllers/admin/AdminMollieSettingsController.php
index f27d749ed..a1b0e8432 100644
--- a/controllers/admin/AdminMollieSettingsController.php
+++ b/controllers/admin/AdminMollieSettingsController.php
@@ -14,6 +14,7 @@
 
 use Mollie\Logger\Logger;
 use Mollie\Logger\LoggerInterface;
+use Mollie\Provider\PaymentMethodLangProvider;
 use Mollie\Utility\ExceptionUtility;
 
 if (!defined('_PS_VERSION_')) {
diff --git a/src/Provider/PaymentMethodLangProvider.php b/src/Provider/PaymentMethodLangProvider.php
new file mode 100644
index 000000000..9ab0d2856
--- /dev/null
+++ b/src/Provider/PaymentMethodLangProvider.php
@@ -0,0 +1,59 @@
+<?php
+/**
+ * Mollie       https://www.mollie.nl
+ *
+ * @author      Mollie B.V. <info@mollie.nl>
+ * @copyright   Mollie B.V.
+ * @license     https://github.com/mollie/PrestaShop/blob/master/LICENSE.md
+ *
+ * @see        https://github.com/mollie/PrestaShop
+ * @codingStandardsIgnoreStart
+ */
+
+namespace Mollie\Provider;
+
+use Mollie\Adapter\Context;
+use Mollie\Repository\PaymentMethodLangRepositoryInterface;
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+class PaymentMethodLangProvider
+{
+    /** @var PaymentMethodLangRepositoryInterface */
+    private $paymentMethodLangRepository;
+
+    /** @var Context */
+    private $context;
+
+    public function __construct(PaymentMethodLangRepositoryInterface $paymentMethodLangRepository, Context $context)
+    {
+        $this->paymentMethodLangRepository = $paymentMethodLangRepository;
+        $this->context = $context;
+    }
+
+    public function trans(string $idMethod): ?string
+    {
+        return $this->paymentMethodLangRepository->getTextByLanguageAndMethod($this->context->getLanguageId(), $idMethod, $this->context->getShopId());
+    }
+
+
+    /**
+     * Gets all translations for a payment method title
+     *
+     * @param string $idMethod
+     * @return array [id_lang => text] for instance: [74 => 'Apelo Pay', 68 => 'Apella Pia']
+     */
+    public function getTransList(string $idMethod): array
+    {
+        $result = $this->paymentMethodLangRepository->getAllTranslationsByMethod($idMethod, $this->context->getShopId());
+
+        $mappedArray = [];
+        foreach ($result as $value) {
+            $mappedArray[$value['id_lang']] = $value['text'];
+        }
+
+        return $mappedArray;
+    }
+}
diff --git a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
index f5baf53d9..c7ce9ba2d 100644
--- a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
@@ -42,8 +42,8 @@
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
+use Mollie\Provider\PaymentMethodLangProvider;
 use Mollie\Service\LanguageService;
-use Mollie\Service\PaymentMethodLangService;
 use MolPaymentMethod;
 use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
 use Tools;
@@ -83,8 +83,8 @@ class BancontactPaymentOptionProvider implements PaymentOptionProviderInterface
     /** @var OrderTotalProviderInterface */
     private $orderTotalProvider;
 
-    /** @var PaymentMethodLangService $multiLangService */
-    private $multiLangService;
+    /** @var PaymentMethodLangProvider $paymentMethodLangProvider */
+    private $paymentMethodLangProvider;
 
     public function __construct(
         Mollie $module,
@@ -93,7 +93,7 @@ public function __construct(
         PaymentFeeProviderInterface $paymentFeeProvider,
         LanguageService $languageService,
         OrderTotalProviderInterface $orderTotalProvider,
-        PaymentMethodLangService $multiLangService
+        PaymentMethodLangProvider $paymentMethodLangProvider
     ) {
         $this->module = $module;
         $this->context = $context;
@@ -101,7 +101,7 @@ public function __construct(
         $this->paymentFeeProvider = $paymentFeeProvider;
         $this->languageService = $languageService;
         $this->orderTotalProvider = $orderTotalProvider;
-        $this->multiLangService = $multiLangService;
+        $this->paymentMethodLangProvider = $paymentMethodLangProvider;
     }
 
     /**
@@ -112,7 +112,7 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
+            $this->paymentMethodLangProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/BasePaymentOptionProvider.php b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
index dfc240a9b..c880f1281 100644
--- a/src/Provider/PaymentOption/BasePaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
@@ -41,6 +41,7 @@
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
+use Mollie\Provider\PaymentMethodLangProvider;
 use Mollie\Service\LanguageService;
 use Mollie\Service\PaymentMethodLangService;
 use MolPaymentMethod;
@@ -81,8 +82,8 @@ class BasePaymentOptionProvider implements PaymentOptionProviderInterface
     private $languageService;
     /** @var OrderTotalProviderInterface */
     private $orderTotalProvider;
-    /** @var PaymentMethodLangService $multiLangService */
-    private $multiLangService;
+    /** @var PaymentMethodLangService $paymentMethodLangProvider */
+    private $paymentMethodLangProvider;
 
     public function __construct(
         Mollie $module,
@@ -91,7 +92,7 @@ public function __construct(
         PaymentFeeProviderInterface $paymentFeeProvider,
         LanguageService $languageService,
         OrderTotalProviderInterface $orderTotalProvider,
-        PaymentMethodLangService $multiLangService
+        PaymentMethodLangProvider $paymentMethodLangProvider
     ) {
         $this->module = $module;
         $this->context = $context;
@@ -99,7 +100,7 @@ public function __construct(
         $this->paymentFeeProvider = $paymentFeeProvider;
         $this->languageService = $languageService;
         $this->orderTotalProvider = $orderTotalProvider;
-        $this->multiLangService = $multiLangService;
+        $this->paymentMethodLangProvider = $paymentMethodLangProvider;
     }
 
     /**
@@ -110,7 +111,7 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
+            $this->paymentMethodLangProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
index 5be6f9fa1..a2fa2bd0b 100644
--- a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
@@ -45,9 +45,9 @@
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
+use Mollie\Provider\PaymentMethodLangProvider;
 use Mollie\Repository\MolCustomerRepository;
 use Mollie\Service\LanguageService;
-use Mollie\Service\PaymentMethodLangService;
 use Mollie\Utility\CustomerUtility;
 use MolPaymentMethod;
 use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
@@ -100,8 +100,8 @@ class CreditCardPaymentOptionProvider implements PaymentOptionProviderInterface
     private $customerRepository;
     /** @var ConfigurationAdapter */
     private $configurationAdapter;
-    /** @var PaymentMethodLangService $multiLangService */
-    private $multiLangService;
+    /** @var PaymentMethodLangProvider $paymentMethodLangProvider */
+    private $paymentMethodLangProvider;
 
     public function __construct(
         LegacyContext $context,
@@ -113,7 +113,7 @@ public function __construct(
         MolCustomerRepository $customerRepository,
         Mollie $module,
         ConfigurationAdapter $configurationAdapter,
-        PaymentMethodLangService $multiLangService
+        PaymentMethodLangProvider $paymentMethodLangProvider
     ) {
         $this->context = $context;
         $this->creditCardLogoProvider = $creditCardLogoProvider;
@@ -124,7 +124,7 @@ public function __construct(
         $this->customerRepository = $customerRepository;
         $this->module = $module;
         $this->configurationAdapter = $configurationAdapter;
-        $this->multiLangService = $multiLangService;
+        $this->paymentMethodLangProvider = $paymentMethodLangProvider;
     }
 
     /**
@@ -135,7 +135,7 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
+            $this->paymentMethodLangProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
index 598f90db5..050c04cda 100644
--- a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
@@ -44,9 +44,9 @@
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
+use Mollie\Provider\PaymentMethodLangProvider;
 use Mollie\Repository\MolCustomerRepository;
 use Mollie\Service\LanguageService;
-use Mollie\Service\PaymentMethodLangService;
 use Mollie\Utility\CustomerUtility;
 use MolPaymentMethod;
 use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
@@ -97,8 +97,8 @@ class CreditCardSingleClickPaymentOptionProvider implements PaymentOptionProvide
     private $customer;
     /** @var ConfigurationAdapter */
     private $configurationAdapter;
-    /** @var PaymentMethodLangService $multiLangService */
-    private $multiLangService;
+    /** @var PaymentMethodLangProvider $paymentMethodLangProvider */
+    private $paymentMethodLangProvider;
 
     public function __construct(
         Mollie $module,
@@ -110,7 +110,7 @@ public function __construct(
         MolCustomerRepository $customerRepository,
         Mollie\Adapter\Customer $customer,
         ConfigurationAdapter $configurationAdapter,
-        PaymentMethodLangService $multiLangService
+        PaymentMethodLangProvider $paymentMethodLangProvider
     ) {
         $this->module = $module;
         $this->context = $context;
@@ -121,7 +121,7 @@ public function __construct(
         $this->customerRepository = $customerRepository;
         $this->customer = $customer;
         $this->configurationAdapter = $configurationAdapter;
-        $this->multiLangService = $multiLangService;
+        $this->paymentMethodLangProvider = $paymentMethodLangProvider;
     }
 
     /**
@@ -132,7 +132,7 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
+            $this->paymentMethodLangProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
index 644571e60..3e0ce077f 100644
--- a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
@@ -41,9 +41,9 @@
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
+use Mollie\Provider\PaymentMethodLangProvider;
 use Mollie\Service\Content\TemplateParserInterface;
 use Mollie\Service\LanguageService;
-use Mollie\Service\PaymentMethodLangService;
 use MolPaymentMethod;
 use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
 use Tools;
@@ -87,8 +87,8 @@ class IdealPaymentOptionProvider implements PaymentOptionProviderInterface
     private $languageService;
     /** @var OrderTotalProviderInterface */
     private $orderTotalProvider;
-    /** PaymentMethodLangService $multiLangService */
-    private $multiLangService;
+    /** @var PaymentMethodLangProvider $paymentMethodLangProvider */
+    private $paymentMethodLangProvider;
 
     public function __construct(
         Mollie $module,
@@ -98,7 +98,7 @@ public function __construct(
         TemplateParserInterface $templateParser,
         LanguageService $languageService,
         OrderTotalProviderInterface $orderTotalProvider,
-        PaymentMethodLangService $multiLangService
+        PaymentMethodLangProvider $paymentMethodLangProvider
     ) {
         $this->module = $module;
         $this->context = $context;
@@ -107,7 +107,7 @@ public function __construct(
         $this->templateParser = $templateParser;
         $this->languageService = $languageService;
         $this->orderTotalProvider = $orderTotalProvider;
-        $this->multiLangService = $multiLangService;
+        $this->paymentMethodLangProvider = $paymentMethodLangProvider;
     }
 
     /**
@@ -118,7 +118,7 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $this->multiLangService->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
+            $this->paymentMethodLangProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Service/ApiService.php b/src/Service/ApiService.php
index f5a9850c4..cff9e606e 100644
--- a/src/Service/ApiService.php
+++ b/src/Service/ApiService.php
@@ -26,6 +26,7 @@
 use Mollie\Api\Resources\PaymentCollection;
 use Mollie\Config\Config;
 use Mollie\Exception\MollieApiException;
+use Mollie\Provider\PaymentMethodLangProvider;
 use Mollie\Provider\TaxCalculatorProvider;
 use Mollie\Repository\CountryRepository;
 use Mollie\Repository\PaymentMethodRepository;
@@ -81,8 +82,8 @@ class ApiService implements ApiServiceInterface
     private $taxProvider;
     /** @var Context */
     private $context;
-    /** @var PaymentMethodLangService */
-    private $multiLangService;
+    /** @var PaymentMethodLangProvider */
+    private $paymentMethodLangProvider;
 
     public function __construct(
         PaymentMethodRepository $methodRepository,
@@ -93,7 +94,7 @@ public function __construct(
         Shop $shop,
         TaxCalculatorProvider $taxProvider,
         Context $context,
-        PaymentMethodLangService $multiLangService
+        PaymentMethodLangProvider $paymentMethodLangProvider
     ) {
         $this->countryRepository = $countryRepository;
         $this->paymentMethodSortProvider = $paymentMethodSortProvider;
@@ -104,7 +105,7 @@ public function __construct(
         $this->shop = $shop;
         $this->taxProvider = $taxProvider;
         $this->context = $context;
-        $this->multiLangService = $multiLangService;
+        $this->paymentMethodLangProvider = $paymentMethodLangProvider;
     }
 
     /**
@@ -235,7 +236,7 @@ private function getMethodsObjForConfig($apiMethods)
                 }
 
                 $methods[$apiMethod['id']] = $apiMethod;
-                $paymentMethod->method_name = $this->multiLangService->getTransList($apiMethod['id']);
+                $paymentMethod->method_name = $this->paymentMethodLangProvider->getTransList($apiMethod['id']);
                 $methods[$apiMethod['id']]['obj'] = $paymentMethod;
 
                 continue;

From 5367ae4aa141e119ec586008fe17155cee17235a Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 26 Nov 2024 09:08:40 +0200
Subject: [PATCH 48/69] [PIPRES-468] deleted service

---
 .../BasePaymentOptionProvider.php             |  2 +-
 src/Service/PaymentMethodLangService.php      | 59 -------------------
 2 files changed, 1 insertion(+), 60 deletions(-)
 delete mode 100644 src/Service/PaymentMethodLangService.php

diff --git a/src/Provider/PaymentOption/BasePaymentOptionProvider.php b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
index c880f1281..5d2b7fa09 100644
--- a/src/Provider/PaymentOption/BasePaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
@@ -82,7 +82,7 @@ class BasePaymentOptionProvider implements PaymentOptionProviderInterface
     private $languageService;
     /** @var OrderTotalProviderInterface */
     private $orderTotalProvider;
-    /** @var PaymentMethodLangService $paymentMethodLangProvider */
+    /** @var PaymentMethodLangProvider $paymentMethodLangProvider */
     private $paymentMethodLangProvider;
 
     public function __construct(
diff --git a/src/Service/PaymentMethodLangService.php b/src/Service/PaymentMethodLangService.php
deleted file mode 100644
index d8f8fb633..000000000
--- a/src/Service/PaymentMethodLangService.php
+++ /dev/null
@@ -1,59 +0,0 @@
-<?php
-/**
- * Mollie       https://www.mollie.nl
- *
- * @author      Mollie B.V. <info@mollie.nl>
- * @copyright   Mollie B.V.
- * @license     https://github.com/mollie/PrestaShop/blob/master/LICENSE.md
- *
- * @see        https://github.com/mollie/PrestaShop
- * @codingStandardsIgnoreStart
- */
-
-namespace Mollie\Service;
-
-use Mollie\Adapter\Context;
-use Mollie\Repository\PaymentMethodLangRepositoryInterface;
-
-if (!defined('_PS_VERSION_')) {
-    exit;
-}
-
-class PaymentMethodLangService
-{
-    /** @var PaymentMethodLangRepositoryInterface */
-    private $paymentMethodLangRepository;
-
-    /** @var Context */
-    private $context;
-
-    public function __construct(PaymentMethodLangRepositoryInterface $paymentMethodLangRepository, Context $context)
-    {
-        $this->paymentMethodLangRepository = $paymentMethodLangRepository;
-        $this->context = $context;
-    }
-
-    public function trans(string $idMethod): ?string
-    {
-        return $this->paymentMethodLangRepository->getTextByLanguageAndMethod($this->context->getLanguageId(), $idMethod, $this->context->getShopId());
-    }
-
-
-    /**
-     * Gets all translations for a payment method title
-     *
-     * @param string $idMethod
-     * @return array [id_lang => text] for instance: [74 => 'Apelo Pay', 68 => 'Apella Pia']
-     */
-    public function getTransList(string $idMethod): array
-    {
-        $result = $this->paymentMethodLangRepository->getAllTranslationsByMethod($idMethod, $this->context->getShopId());
-
-        $mappedArray = [];
-        foreach ($result as $value) {
-            $mappedArray[$value['id_lang']] = $value['text'];
-        }
-
-        return $mappedArray;
-    }
-}

From 7f85c3a68becef796e1837f08da5c4f34b0de368 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 26 Nov 2024 09:11:38 +0200
Subject: [PATCH 49/69] [PIPRES-468] renamed provider

---
 controllers/admin/AdminMollieSettingsController.php         | 2 +-
 ...angProvider.php => PaymentMethodTranslationProvider.php} | 2 +-
 .../PaymentOption/BancontactPaymentOptionProvider.php       | 6 +++---
 src/Provider/PaymentOption/BasePaymentOptionProvider.php    | 6 +++---
 .../PaymentOption/CreditCardPaymentOptionProvider.php       | 6 +++---
 .../CreditCardSingleClickPaymentOptionProvider.php          | 6 +++---
 src/Provider/PaymentOption/IdealPaymentOptionProvider.php   | 6 +++---
 src/Service/ApiService.php                                  | 6 +++---
 8 files changed, 20 insertions(+), 20 deletions(-)
 rename src/Provider/{PaymentMethodLangProvider.php => PaymentMethodTranslationProvider.php} (97%)

diff --git a/controllers/admin/AdminMollieSettingsController.php b/controllers/admin/AdminMollieSettingsController.php
index a1b0e8432..445f30b0d 100644
--- a/controllers/admin/AdminMollieSettingsController.php
+++ b/controllers/admin/AdminMollieSettingsController.php
@@ -14,7 +14,7 @@
 
 use Mollie\Logger\Logger;
 use Mollie\Logger\LoggerInterface;
-use Mollie\Provider\PaymentMethodLangProvider;
+use Mollie\Provider\PaymentMethodTranslationProvider;
 use Mollie\Utility\ExceptionUtility;
 
 if (!defined('_PS_VERSION_')) {
diff --git a/src/Provider/PaymentMethodLangProvider.php b/src/Provider/PaymentMethodTranslationProvider.php
similarity index 97%
rename from src/Provider/PaymentMethodLangProvider.php
rename to src/Provider/PaymentMethodTranslationProvider.php
index 9ab0d2856..090c810d5 100644
--- a/src/Provider/PaymentMethodLangProvider.php
+++ b/src/Provider/PaymentMethodTranslationProvider.php
@@ -19,7 +19,7 @@
     exit;
 }
 
-class PaymentMethodLangProvider
+class PaymentMethodTranslationProvider
 {
     /** @var PaymentMethodLangRepositoryInterface */
     private $paymentMethodLangRepository;
diff --git a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
index c7ce9ba2d..06df4b21c 100644
--- a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
@@ -42,7 +42,7 @@
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
-use Mollie\Provider\PaymentMethodLangProvider;
+use Mollie\Provider\PaymentMethodTranslationProvider;
 use Mollie\Service\LanguageService;
 use MolPaymentMethod;
 use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
@@ -83,7 +83,7 @@ class BancontactPaymentOptionProvider implements PaymentOptionProviderInterface
     /** @var OrderTotalProviderInterface */
     private $orderTotalProvider;
 
-    /** @var PaymentMethodLangProvider $paymentMethodLangProvider */
+    /** @var PaymentMethodTranslationProvider $paymentMethodLangProvider */
     private $paymentMethodLangProvider;
 
     public function __construct(
@@ -93,7 +93,7 @@ public function __construct(
         PaymentFeeProviderInterface $paymentFeeProvider,
         LanguageService $languageService,
         OrderTotalProviderInterface $orderTotalProvider,
-        PaymentMethodLangProvider $paymentMethodLangProvider
+        PaymentMethodTranslationProvider $paymentMethodLangProvider
     ) {
         $this->module = $module;
         $this->context = $context;
diff --git a/src/Provider/PaymentOption/BasePaymentOptionProvider.php b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
index 5d2b7fa09..c6e840fff 100644
--- a/src/Provider/PaymentOption/BasePaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
@@ -41,7 +41,7 @@
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
-use Mollie\Provider\PaymentMethodLangProvider;
+use Mollie\Provider\PaymentMethodTranslationProvider;
 use Mollie\Service\LanguageService;
 use Mollie\Service\PaymentMethodLangService;
 use MolPaymentMethod;
@@ -82,7 +82,7 @@ class BasePaymentOptionProvider implements PaymentOptionProviderInterface
     private $languageService;
     /** @var OrderTotalProviderInterface */
     private $orderTotalProvider;
-    /** @var PaymentMethodLangProvider $paymentMethodLangProvider */
+    /** @var PaymentMethodTranslationProvider $paymentMethodLangProvider */
     private $paymentMethodLangProvider;
 
     public function __construct(
@@ -92,7 +92,7 @@ public function __construct(
         PaymentFeeProviderInterface $paymentFeeProvider,
         LanguageService $languageService,
         OrderTotalProviderInterface $orderTotalProvider,
-        PaymentMethodLangProvider $paymentMethodLangProvider
+        PaymentMethodTranslationProvider $paymentMethodLangProvider
     ) {
         $this->module = $module;
         $this->context = $context;
diff --git a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
index a2fa2bd0b..9c908b1b8 100644
--- a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
@@ -45,7 +45,7 @@
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
-use Mollie\Provider\PaymentMethodLangProvider;
+use Mollie\Provider\PaymentMethodTranslationProvider;
 use Mollie\Repository\MolCustomerRepository;
 use Mollie\Service\LanguageService;
 use Mollie\Utility\CustomerUtility;
@@ -100,7 +100,7 @@ class CreditCardPaymentOptionProvider implements PaymentOptionProviderInterface
     private $customerRepository;
     /** @var ConfigurationAdapter */
     private $configurationAdapter;
-    /** @var PaymentMethodLangProvider $paymentMethodLangProvider */
+    /** @var PaymentMethodTranslationProvider $paymentMethodLangProvider */
     private $paymentMethodLangProvider;
 
     public function __construct(
@@ -113,7 +113,7 @@ public function __construct(
         MolCustomerRepository $customerRepository,
         Mollie $module,
         ConfigurationAdapter $configurationAdapter,
-        PaymentMethodLangProvider $paymentMethodLangProvider
+        PaymentMethodTranslationProvider $paymentMethodLangProvider
     ) {
         $this->context = $context;
         $this->creditCardLogoProvider = $creditCardLogoProvider;
diff --git a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
index 050c04cda..b6302d57f 100644
--- a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
@@ -44,7 +44,7 @@
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
-use Mollie\Provider\PaymentMethodLangProvider;
+use Mollie\Provider\PaymentMethodTranslationProvider;
 use Mollie\Repository\MolCustomerRepository;
 use Mollie\Service\LanguageService;
 use Mollie\Utility\CustomerUtility;
@@ -97,7 +97,7 @@ class CreditCardSingleClickPaymentOptionProvider implements PaymentOptionProvide
     private $customer;
     /** @var ConfigurationAdapter */
     private $configurationAdapter;
-    /** @var PaymentMethodLangProvider $paymentMethodLangProvider */
+    /** @var PaymentMethodTranslationProvider $paymentMethodLangProvider */
     private $paymentMethodLangProvider;
 
     public function __construct(
@@ -110,7 +110,7 @@ public function __construct(
         MolCustomerRepository $customerRepository,
         Mollie\Adapter\Customer $customer,
         ConfigurationAdapter $configurationAdapter,
-        PaymentMethodLangProvider $paymentMethodLangProvider
+        PaymentMethodTranslationProvider $paymentMethodLangProvider
     ) {
         $this->module = $module;
         $this->context = $context;
diff --git a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
index 3e0ce077f..fd393cdf0 100644
--- a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
@@ -41,7 +41,7 @@
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
-use Mollie\Provider\PaymentMethodLangProvider;
+use Mollie\Provider\PaymentMethodTranslationProvider;
 use Mollie\Service\Content\TemplateParserInterface;
 use Mollie\Service\LanguageService;
 use MolPaymentMethod;
@@ -87,7 +87,7 @@ class IdealPaymentOptionProvider implements PaymentOptionProviderInterface
     private $languageService;
     /** @var OrderTotalProviderInterface */
     private $orderTotalProvider;
-    /** @var PaymentMethodLangProvider $paymentMethodLangProvider */
+    /** @var PaymentMethodTranslationProvider $paymentMethodLangProvider */
     private $paymentMethodLangProvider;
 
     public function __construct(
@@ -98,7 +98,7 @@ public function __construct(
         TemplateParserInterface $templateParser,
         LanguageService $languageService,
         OrderTotalProviderInterface $orderTotalProvider,
-        PaymentMethodLangProvider $paymentMethodLangProvider
+        PaymentMethodTranslationProvider $paymentMethodLangProvider
     ) {
         $this->module = $module;
         $this->context = $context;
diff --git a/src/Service/ApiService.php b/src/Service/ApiService.php
index cff9e606e..955eed0f9 100644
--- a/src/Service/ApiService.php
+++ b/src/Service/ApiService.php
@@ -26,7 +26,7 @@
 use Mollie\Api\Resources\PaymentCollection;
 use Mollie\Config\Config;
 use Mollie\Exception\MollieApiException;
-use Mollie\Provider\PaymentMethodLangProvider;
+use Mollie\Provider\PaymentMethodTranslationProvider;
 use Mollie\Provider\TaxCalculatorProvider;
 use Mollie\Repository\CountryRepository;
 use Mollie\Repository\PaymentMethodRepository;
@@ -82,7 +82,7 @@ class ApiService implements ApiServiceInterface
     private $taxProvider;
     /** @var Context */
     private $context;
-    /** @var PaymentMethodLangProvider */
+    /** @var PaymentMethodTranslationProvider */
     private $paymentMethodLangProvider;
 
     public function __construct(
@@ -94,7 +94,7 @@ public function __construct(
         Shop $shop,
         TaxCalculatorProvider $taxProvider,
         Context $context,
-        PaymentMethodLangProvider $paymentMethodLangProvider
+        PaymentMethodTranslationProvider $paymentMethodLangProvider
     ) {
         $this->countryRepository = $countryRepository;
         $this->paymentMethodSortProvider = $paymentMethodSortProvider;

From b70ecee1dae58156939efd2b3543f7a9e85edbfc Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 26 Nov 2024 09:14:35 +0200
Subject: [PATCH 50/69] [PIPRES-468] removed table

---
 src/Install/DatabaseTableUninstaller.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Install/DatabaseTableUninstaller.php b/src/Install/DatabaseTableUninstaller.php
index 2a92d160c..ddb0b0c57 100644
--- a/src/Install/DatabaseTableUninstaller.php
+++ b/src/Install/DatabaseTableUninstaller.php
@@ -42,6 +42,7 @@ private function getCommands(): array
         $sql[] = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'mol_excluded_country`;';
         $sql[] = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'mol_pending_order_cart_rule`;';
         $sql[] = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'mol_payment_method_order_total_restriction`;';
+        $sql[] = 'DROP TABLE IF EXISTS `' . _DB_PREFIX_ . 'mol_payment_method_lang`;';
 
         return $sql;
     }

From f113d60a2a2ca92280d2a7b996e9549c1172ab56 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 26 Nov 2024 09:17:15 +0200
Subject: [PATCH 51/69] [PIPRES-468] removed title from old database

---
 src/Install/DatabaseTableInstaller.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Install/DatabaseTableInstaller.php b/src/Install/DatabaseTableInstaller.php
index c8ff49bec..e2bd49099 100644
--- a/src/Install/DatabaseTableInstaller.php
+++ b/src/Install/DatabaseTableInstaller.php
@@ -66,7 +66,6 @@ private function getCommands()
 				`id_method`  VARCHAR(64) NOT NULL,
 				`method_name`  VARCHAR(64) NOT NULL,
 				`enabled`       TINYINT(1),
-				`title`      VARCHAR(64),
 				`method` VARCHAR(64),
 				`description` VARCHAR(255),
 				`is_countries_applicable` TINYINT(1),

From a097824b8a897f7e5d7f9e17585d56e186af5fe2 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 26 Nov 2024 09:27:07 +0200
Subject: [PATCH 52/69] [PIPRES-468] rename lang to translation

---
 .../PaymentOption/BancontactPaymentOptionProvider.php  | 10 +++++-----
 .../PaymentOption/BasePaymentOptionProvider.php        | 10 +++++-----
 .../PaymentOption/CreditCardPaymentOptionProvider.php  | 10 +++++-----
 .../CreditCardSingleClickPaymentOptionProvider.php     | 10 +++++-----
 .../PaymentOption/IdealPaymentOptionProvider.php       | 10 +++++-----
 src/Service/ApiService.php                             |  8 ++++----
 6 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
index 06df4b21c..63426e04e 100644
--- a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
@@ -83,8 +83,8 @@ class BancontactPaymentOptionProvider implements PaymentOptionProviderInterface
     /** @var OrderTotalProviderInterface */
     private $orderTotalProvider;
 
-    /** @var PaymentMethodTranslationProvider $paymentMethodLangProvider */
-    private $paymentMethodLangProvider;
+    /** @var PaymentMethodTranslationProvider $paymentMethodTranslationProvider */
+    private $paymentMethodTranslationProvider;
 
     public function __construct(
         Mollie $module,
@@ -93,7 +93,7 @@ public function __construct(
         PaymentFeeProviderInterface $paymentFeeProvider,
         LanguageService $languageService,
         OrderTotalProviderInterface $orderTotalProvider,
-        PaymentMethodTranslationProvider $paymentMethodLangProvider
+        PaymentMethodTranslationProvider $paymentMethodTranslationProvider
     ) {
         $this->module = $module;
         $this->context = $context;
@@ -101,7 +101,7 @@ public function __construct(
         $this->paymentFeeProvider = $paymentFeeProvider;
         $this->languageService = $languageService;
         $this->orderTotalProvider = $orderTotalProvider;
-        $this->paymentMethodLangProvider = $paymentMethodLangProvider;
+        $this->paymentMethodTranslationProvider = $paymentMethodTranslationProvider;
     }
 
     /**
@@ -112,7 +112,7 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $this->paymentMethodLangProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
+            $this->paymentMethodTranslationProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/BasePaymentOptionProvider.php b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
index c6e840fff..107016c60 100644
--- a/src/Provider/PaymentOption/BasePaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
@@ -82,8 +82,8 @@ class BasePaymentOptionProvider implements PaymentOptionProviderInterface
     private $languageService;
     /** @var OrderTotalProviderInterface */
     private $orderTotalProvider;
-    /** @var PaymentMethodTranslationProvider $paymentMethodLangProvider */
-    private $paymentMethodLangProvider;
+    /** @var PaymentMethodTranslationProvider $paymentMethodTranslationProvider */
+    private $paymentMethodTranslationProvider;
 
     public function __construct(
         Mollie $module,
@@ -92,7 +92,7 @@ public function __construct(
         PaymentFeeProviderInterface $paymentFeeProvider,
         LanguageService $languageService,
         OrderTotalProviderInterface $orderTotalProvider,
-        PaymentMethodTranslationProvider $paymentMethodLangProvider
+        PaymentMethodTranslationProvider $paymentMethodTranslationProvider
     ) {
         $this->module = $module;
         $this->context = $context;
@@ -100,7 +100,7 @@ public function __construct(
         $this->paymentFeeProvider = $paymentFeeProvider;
         $this->languageService = $languageService;
         $this->orderTotalProvider = $orderTotalProvider;
-        $this->paymentMethodLangProvider = $paymentMethodLangProvider;
+        $this->paymentMethodTranslationProvider = $paymentMethodTranslationProvider;
     }
 
     /**
@@ -111,7 +111,7 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $this->paymentMethodLangProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
+            $this->paymentMethodTranslationProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
index 9c908b1b8..7255d4f8b 100644
--- a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
@@ -100,8 +100,8 @@ class CreditCardPaymentOptionProvider implements PaymentOptionProviderInterface
     private $customerRepository;
     /** @var ConfigurationAdapter */
     private $configurationAdapter;
-    /** @var PaymentMethodTranslationProvider $paymentMethodLangProvider */
-    private $paymentMethodLangProvider;
+    /** @var PaymentMethodTranslationProvider $paymentMethodTranslationProvider */
+    private $paymentMethodTranslationProvider;
 
     public function __construct(
         LegacyContext $context,
@@ -113,7 +113,7 @@ public function __construct(
         MolCustomerRepository $customerRepository,
         Mollie $module,
         ConfigurationAdapter $configurationAdapter,
-        PaymentMethodTranslationProvider $paymentMethodLangProvider
+        PaymentMethodTranslationProvider $paymentMethodTranslationProvider
     ) {
         $this->context = $context;
         $this->creditCardLogoProvider = $creditCardLogoProvider;
@@ -124,7 +124,7 @@ public function __construct(
         $this->customerRepository = $customerRepository;
         $this->module = $module;
         $this->configurationAdapter = $configurationAdapter;
-        $this->paymentMethodLangProvider = $paymentMethodLangProvider;
+        $this->paymentMethodTranslationProvider = $paymentMethodTranslationProvider;
     }
 
     /**
@@ -135,7 +135,7 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $this->paymentMethodLangProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
+            $this->paymentMethodTranslationProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
index b6302d57f..2d175b0ec 100644
--- a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
@@ -97,8 +97,8 @@ class CreditCardSingleClickPaymentOptionProvider implements PaymentOptionProvide
     private $customer;
     /** @var ConfigurationAdapter */
     private $configurationAdapter;
-    /** @var PaymentMethodTranslationProvider $paymentMethodLangProvider */
-    private $paymentMethodLangProvider;
+    /** @var PaymentMethodTranslationProvider $paymentMethodTranslationProvider */
+    private $paymentMethodTranslationProvider;
 
     public function __construct(
         Mollie $module,
@@ -110,7 +110,7 @@ public function __construct(
         MolCustomerRepository $customerRepository,
         Mollie\Adapter\Customer $customer,
         ConfigurationAdapter $configurationAdapter,
-        PaymentMethodTranslationProvider $paymentMethodLangProvider
+        PaymentMethodTranslationProvider $paymentMethodTranslationProvider
     ) {
         $this->module = $module;
         $this->context = $context;
@@ -121,7 +121,7 @@ public function __construct(
         $this->customerRepository = $customerRepository;
         $this->customer = $customer;
         $this->configurationAdapter = $configurationAdapter;
-        $this->paymentMethodLangProvider = $paymentMethodLangProvider;
+        $this->paymentMethodTranslationProvider = $paymentMethodTranslationProvider;
     }
 
     /**
@@ -132,7 +132,7 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $this->paymentMethodLangProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
+            $this->paymentMethodTranslationProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
index fd393cdf0..dcec9c717 100644
--- a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
@@ -87,8 +87,8 @@ class IdealPaymentOptionProvider implements PaymentOptionProviderInterface
     private $languageService;
     /** @var OrderTotalProviderInterface */
     private $orderTotalProvider;
-    /** @var PaymentMethodTranslationProvider $paymentMethodLangProvider */
-    private $paymentMethodLangProvider;
+    /** @var PaymentMethodTranslationProvider $paymentMethodTranslationProvider */
+    private $paymentMethodTranslationProvider;
 
     public function __construct(
         Mollie $module,
@@ -98,7 +98,7 @@ public function __construct(
         TemplateParserInterface $templateParser,
         LanguageService $languageService,
         OrderTotalProviderInterface $orderTotalProvider,
-        PaymentMethodTranslationProvider $paymentMethodLangProvider
+        PaymentMethodTranslationProvider $paymentMethodTranslationProvider
     ) {
         $this->module = $module;
         $this->context = $context;
@@ -107,7 +107,7 @@ public function __construct(
         $this->templateParser = $templateParser;
         $this->languageService = $languageService;
         $this->orderTotalProvider = $orderTotalProvider;
-        $this->paymentMethodLangProvider = $paymentMethodLangProvider;
+        $this->paymentMethodTranslationProvider = $paymentMethodTranslationProvider;
     }
 
     /**
@@ -118,7 +118,7 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         $paymentOption = new PaymentOption();
 
         $paymentOption->setCallToActionText(
-            $this->paymentMethodLangProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
+            $this->paymentMethodTranslationProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Service/ApiService.php b/src/Service/ApiService.php
index 955eed0f9..ab57a1820 100644
--- a/src/Service/ApiService.php
+++ b/src/Service/ApiService.php
@@ -83,7 +83,7 @@ class ApiService implements ApiServiceInterface
     /** @var Context */
     private $context;
     /** @var PaymentMethodTranslationProvider */
-    private $paymentMethodLangProvider;
+    private $paymentMethodTranslationProvider;
 
     public function __construct(
         PaymentMethodRepository $methodRepository,
@@ -94,7 +94,7 @@ public function __construct(
         Shop $shop,
         TaxCalculatorProvider $taxProvider,
         Context $context,
-        PaymentMethodTranslationProvider $paymentMethodLangProvider
+        PaymentMethodTranslationProvider $paymentMethodTranslationProvider
     ) {
         $this->countryRepository = $countryRepository;
         $this->paymentMethodSortProvider = $paymentMethodSortProvider;
@@ -105,7 +105,7 @@ public function __construct(
         $this->shop = $shop;
         $this->taxProvider = $taxProvider;
         $this->context = $context;
-        $this->paymentMethodLangProvider = $paymentMethodLangProvider;
+        $this->paymentMethodTranslationProvider = $paymentMethodTranslationProvider;
     }
 
     /**
@@ -236,7 +236,7 @@ private function getMethodsObjForConfig($apiMethods)
                 }
 
                 $methods[$apiMethod['id']] = $apiMethod;
-                $paymentMethod->method_name = $this->paymentMethodLangProvider->getTransList($apiMethod['id']);
+                $paymentMethod->method_name = $this->paymentMethodTranslationProvider->getTransList($apiMethod['id']);
                 $methods[$apiMethod['id']]['obj'] = $paymentMethod;
 
                 continue;

From 01fc707c880584b2d9c3ea812ef0d7171fd6aad8 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 26 Nov 2024 10:00:23 +0200
Subject: [PATCH 53/69] [PIPRES-468] optimized querys

---
 .../PaymentMethodTranslationProvider.php        | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/Provider/PaymentMethodTranslationProvider.php b/src/Provider/PaymentMethodTranslationProvider.php
index 090c810d5..7c96a443c 100644
--- a/src/Provider/PaymentMethodTranslationProvider.php
+++ b/src/Provider/PaymentMethodTranslationProvider.php
@@ -35,7 +35,13 @@ public function __construct(PaymentMethodLangRepositoryInterface $paymentMethodL
 
     public function trans(string $idMethod): ?string
     {
-        return $this->paymentMethodLangRepository->getTextByLanguageAndMethod($this->context->getLanguageId(), $idMethod, $this->context->getShopId());
+        $result = $this->paymentMethodLangRepository->findOneBy([
+            'id_method' => $idMethod,
+            'id_lang' => $this->context->getLanguageId(),
+            'id_shop' => $this->context->getShopId()
+        ]);
+
+        return $result->text;
     }
 
 
@@ -47,11 +53,14 @@ public function trans(string $idMethod): ?string
      */
     public function getTransList(string $idMethod): array
     {
-        $result = $this->paymentMethodLangRepository->getAllTranslationsByMethod($idMethod, $this->context->getShopId());
+        $result = $this->paymentMethodLangRepository->findAllBy([
+            'id_method' => $idMethod,
+            'id_shop' => $this->context->getShopId()
+        ]);
 
         $mappedArray = [];
-        foreach ($result as $value) {
-            $mappedArray[$value['id_lang']] = $value['text'];
+        foreach ($result->getResults() as $value) {
+            $mappedArray[$value->id_lang] = $value->text;
         }
 
         return $mappedArray;

From cb0b08b38a23ab1b7495bfa620abd4ae013f1525 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 26 Nov 2024 10:05:21 +0200
Subject: [PATCH 54/69] [PIPRES-468] removed overengineered functions

---
 .../PaymentMethodLangRepository.php           | 23 -------------------
 .../PaymentMethodLangRepositoryInterface.php  | 15 ------------
 2 files changed, 38 deletions(-)

diff --git a/src/Repository/PaymentMethodLangRepository.php b/src/Repository/PaymentMethodLangRepository.php
index e375d2a97..26105afa4 100644
--- a/src/Repository/PaymentMethodLangRepository.php
+++ b/src/Repository/PaymentMethodLangRepository.php
@@ -25,29 +25,6 @@ public function __construct()
         parent::__construct(\MolPaymentMethodLang::class);
     }
 
-    public function getTextByLanguageAndMethod(int $idLanguage, string $idMethod, int $idShop): ?string
-    {
-        $sql = new \DbQuery();
-        $sql->select('`text`');
-        $sql->from('mol_payment_method_lang');
-        $sql->where('`id_method` = "' . pSQL($idMethod) . '"');
-        $sql->where('`id_lang` = ' . $idLanguage);
-        $sql->where('`id_shop` = ' . $idShop);
-
-        return \Db::getInstance()->getValue($sql) ?: null;
-    }
-
-    public function getAllTranslationsByMethod(string $idPaymentMethod, int $idShop): array
-    {
-        $sql = new \DbQuery();
-        $sql->select('`id_lang`, `text`');
-        $sql->from('mol_payment_method_lang');
-        $sql->where('`id_method` = "' . pSQL($idPaymentMethod) . '"');
-        $sql->where('`id_shop` = ' . $idShop);
-
-        return \Db::getInstance()->executeS($sql) ?? [];
-    }
-
     public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId, string $translation, int $idShop)
     {
         if (empty($translation)) {
diff --git a/src/Repository/PaymentMethodLangRepositoryInterface.php b/src/Repository/PaymentMethodLangRepositoryInterface.php
index 0a50e65c0..58f387763 100644
--- a/src/Repository/PaymentMethodLangRepositoryInterface.php
+++ b/src/Repository/PaymentMethodLangRepositoryInterface.php
@@ -20,20 +20,5 @@
 
 interface PaymentMethodLangRepositoryInterface extends ReadOnlyRepositoryInterface
 {
-
-    /**
-     * Gets translated text by language and method id
-     */
-    public function getTextByLanguageAndMethod(int $idLanguage, string $idMethod, int $idShop): ?string;
-
-    /**
-     * Gets all translations for a payment method title
-     *
-     * @param string $idPaymentMethod
-     * @param int $idShop
-     * @return array [id_lang => text] for instance: [74 => 'Apelo Pay', 68 => 'Apella Pia']
-     */
-    public function getAllTranslationsByMethod(string $idPaymentMethod, int $idShop): array;
-
     public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId, string $translation, int $idShop);
 }

From eb670feefb2960e0aeb07ea73aceac2de5675771 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 26 Nov 2024 10:48:36 +0200
Subject: [PATCH 55/69] [PIPRES-468] removed provider

---
 .../PaymentMethodTranslationProvider.php      | 68 -------------------
 .../BancontactPaymentOptionProvider.php       | 16 ++++-
 .../BasePaymentOptionProvider.php             | 16 ++++-
 .../CreditCardPaymentOptionProvider.php       | 16 ++++-
 ...itCardSingleClickPaymentOptionProvider.php | 16 ++++-
 .../IdealPaymentOptionProvider.php            | 16 ++++-
 src/Service/ApiService.php                    | 21 ++++--
 7 files changed, 91 insertions(+), 78 deletions(-)
 delete mode 100644 src/Provider/PaymentMethodTranslationProvider.php

diff --git a/src/Provider/PaymentMethodTranslationProvider.php b/src/Provider/PaymentMethodTranslationProvider.php
deleted file mode 100644
index 7c96a443c..000000000
--- a/src/Provider/PaymentMethodTranslationProvider.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-/**
- * Mollie       https://www.mollie.nl
- *
- * @author      Mollie B.V. <info@mollie.nl>
- * @copyright   Mollie B.V.
- * @license     https://github.com/mollie/PrestaShop/blob/master/LICENSE.md
- *
- * @see        https://github.com/mollie/PrestaShop
- * @codingStandardsIgnoreStart
- */
-
-namespace Mollie\Provider;
-
-use Mollie\Adapter\Context;
-use Mollie\Repository\PaymentMethodLangRepositoryInterface;
-
-if (!defined('_PS_VERSION_')) {
-    exit;
-}
-
-class PaymentMethodTranslationProvider
-{
-    /** @var PaymentMethodLangRepositoryInterface */
-    private $paymentMethodLangRepository;
-
-    /** @var Context */
-    private $context;
-
-    public function __construct(PaymentMethodLangRepositoryInterface $paymentMethodLangRepository, Context $context)
-    {
-        $this->paymentMethodLangRepository = $paymentMethodLangRepository;
-        $this->context = $context;
-    }
-
-    public function trans(string $idMethod): ?string
-    {
-        $result = $this->paymentMethodLangRepository->findOneBy([
-            'id_method' => $idMethod,
-            'id_lang' => $this->context->getLanguageId(),
-            'id_shop' => $this->context->getShopId()
-        ]);
-
-        return $result->text;
-    }
-
-
-    /**
-     * Gets all translations for a payment method title
-     *
-     * @param string $idMethod
-     * @return array [id_lang => text] for instance: [74 => 'Apelo Pay', 68 => 'Apella Pia']
-     */
-    public function getTransList(string $idMethod): array
-    {
-        $result = $this->paymentMethodLangRepository->findAllBy([
-            'id_method' => $idMethod,
-            'id_shop' => $this->context->getShopId()
-        ]);
-
-        $mappedArray = [];
-        foreach ($result->getResults() as $value) {
-            $mappedArray[$value->id_lang] = $value->text;
-        }
-
-        return $mappedArray;
-    }
-}
diff --git a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
index 63426e04e..971abd99a 100644
--- a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
@@ -36,6 +36,7 @@
 
 namespace Mollie\Provider\PaymentOption;
 
+use KlarnaPayment\Module\Infrastructure\Context\GlobalShopContext;
 use Mollie;
 use Mollie\Adapter\LegacyContext;
 use Mollie\Api\Types\PaymentMethod;
@@ -43,6 +44,7 @@
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
 use Mollie\Provider\PaymentMethodTranslationProvider;
+use Mollie\Repository\PaymentMethodLangRepositoryInterface;
 use Mollie\Service\LanguageService;
 use MolPaymentMethod;
 use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
@@ -111,8 +113,20 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
     {
         $paymentOption = new PaymentOption();
 
+        /** @var GlobalShopContext $globalShopContext */
+        $globalShopContext = $this->module->getService(GlobalShopContext::class);
+
+        /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
+        $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
+
+        $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
+            'id_method' => $paymentMethod->id_method,
+            'id_lang' => $globalShopContext->getLanguageId(),
+            'id_shop' => $globalShopContext->getShopId(),
+        ]);
+
         $paymentOption->setCallToActionText(
-            $this->paymentMethodTranslationProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
+            $paymentMethodLangObject->text ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/BasePaymentOptionProvider.php b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
index 107016c60..0b3735a26 100644
--- a/src/Provider/PaymentOption/BasePaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
@@ -36,12 +36,14 @@
 
 namespace Mollie\Provider\PaymentOption;
 
+use KlarnaPayment\Module\Infrastructure\Context\GlobalShopContext;
 use Mollie;
 use Mollie\Adapter\LegacyContext;
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
 use Mollie\Provider\PaymentMethodTranslationProvider;
+use Mollie\Repository\PaymentMethodLangRepositoryInterface;
 use Mollie\Service\LanguageService;
 use Mollie\Service\PaymentMethodLangService;
 use MolPaymentMethod;
@@ -110,8 +112,20 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
     {
         $paymentOption = new PaymentOption();
 
+        /** @var GlobalShopContext $globalShopContext */
+        $globalShopContext = $this->module->getService(GlobalShopContext::class);
+
+        /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
+        $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
+
+        $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
+            'id_method' => $paymentMethod->id_method,
+            'id_lang' => $globalShopContext->getLanguageId(),
+            'id_shop' => $globalShopContext->getShopId(),
+        ]);
+
         $paymentOption->setCallToActionText(
-            $this->paymentMethodTranslationProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
+            $paymentMethodLangObject->text ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
index 7255d4f8b..24c8c9dfc 100644
--- a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
@@ -36,6 +36,7 @@
 
 namespace Mollie\Provider\PaymentOption;
 
+use KlarnaPayment\Module\Infrastructure\Context\GlobalShopContext;
 use MolCustomer;
 use Mollie;
 use Mollie\Adapter\ConfigurationAdapter;
@@ -47,6 +48,7 @@
 use Mollie\Provider\PaymentFeeProviderInterface;
 use Mollie\Provider\PaymentMethodTranslationProvider;
 use Mollie\Repository\MolCustomerRepository;
+use Mollie\Repository\PaymentMethodLangRepositoryInterface;
 use Mollie\Service\LanguageService;
 use Mollie\Utility\CustomerUtility;
 use MolPaymentMethod;
@@ -134,8 +136,20 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
     {
         $paymentOption = new PaymentOption();
 
+        /** @var GlobalShopContext $globalShopContext */
+        $globalShopContext = $this->module->getService(GlobalShopContext::class);
+
+        /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
+        $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
+
+        $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
+            'id_method' => $paymentMethod->id_method,
+            'id_lang' => $globalShopContext->getLanguageId(),
+            'id_shop' => $globalShopContext->getShopId(),
+        ]);
+
         $paymentOption->setCallToActionText(
-            $this->paymentMethodTranslationProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
+            $paymentMethodLangObject->text ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
index 2d175b0ec..459cd8087 100644
--- a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
@@ -36,6 +36,7 @@
 
 namespace Mollie\Provider\PaymentOption;
 
+use KlarnaPayment\Module\Infrastructure\Context\GlobalShopContext;
 use MolCustomer;
 use Mollie;
 use Mollie\Adapter\ConfigurationAdapter;
@@ -46,6 +47,7 @@
 use Mollie\Provider\PaymentFeeProviderInterface;
 use Mollie\Provider\PaymentMethodTranslationProvider;
 use Mollie\Repository\MolCustomerRepository;
+use Mollie\Repository\PaymentMethodLangRepositoryInterface;
 use Mollie\Service\LanguageService;
 use Mollie\Utility\CustomerUtility;
 use MolPaymentMethod;
@@ -131,8 +133,20 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
     {
         $paymentOption = new PaymentOption();
 
+        /** @var GlobalShopContext $globalShopContext */
+        $globalShopContext = $this->module->getService(GlobalShopContext::class);
+
+        /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
+        $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
+
+        $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
+            'id_method' => $paymentMethod->id_method,
+            'id_lang' => $globalShopContext->getLanguageId(),
+            'id_shop' => $globalShopContext->getShopId(),
+        ]);
+
         $paymentOption->setCallToActionText(
-            $this->paymentMethodTranslationProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
+            $paymentMethodLangObject->text ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
index dcec9c717..8ff4c998a 100644
--- a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
@@ -36,12 +36,14 @@
 
 namespace Mollie\Provider\PaymentOption;
 
+use KlarnaPayment\Module\Infrastructure\Context\GlobalShopContext;
 use Mollie;
 use Mollie\Adapter\LegacyContext;
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
 use Mollie\Provider\PaymentMethodTranslationProvider;
+use Mollie\Repository\PaymentMethodLangRepositoryInterface;
 use Mollie\Service\Content\TemplateParserInterface;
 use Mollie\Service\LanguageService;
 use MolPaymentMethod;
@@ -117,8 +119,20 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
     {
         $paymentOption = new PaymentOption();
 
+        /** @var GlobalShopContext $globalShopContext */
+        $globalShopContext = $this->module->getService(GlobalShopContext::class);
+
+        /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
+        $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
+
+        $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
+            'id_method' => $paymentMethod->id_method,
+            'id_lang' => $globalShopContext->getLanguageId(),
+            'id_shop' => $globalShopContext->getShopId(),
+        ]);
+
         $paymentOption->setCallToActionText(
-            $this->paymentMethodTranslationProvider->trans($paymentMethod->id_method) ?: $paymentMethod->method_name
+            $paymentMethodLangObject->text ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Service/ApiService.php b/src/Service/ApiService.php
index ab57a1820..0a0b1af60 100644
--- a/src/Service/ApiService.php
+++ b/src/Service/ApiService.php
@@ -29,6 +29,7 @@
 use Mollie\Provider\PaymentMethodTranslationProvider;
 use Mollie\Provider\TaxCalculatorProvider;
 use Mollie\Repository\CountryRepository;
+use Mollie\Repository\PaymentMethodLangRepositoryInterface;
 use Mollie\Repository\PaymentMethodRepository;
 use Mollie\Service\PaymentMethod\PaymentMethodSortProviderInterface;
 use Mollie\Utility\NumberUtility;
@@ -82,8 +83,8 @@ class ApiService implements ApiServiceInterface
     private $taxProvider;
     /** @var Context */
     private $context;
-    /** @var PaymentMethodTranslationProvider */
-    private $paymentMethodTranslationProvider;
+    /** @var PaymentMethodLangRepositoryInterface */
+    private $paymentMethodLangRepository;
 
     public function __construct(
         PaymentMethodRepository $methodRepository,
@@ -94,7 +95,7 @@ public function __construct(
         Shop $shop,
         TaxCalculatorProvider $taxProvider,
         Context $context,
-        PaymentMethodTranslationProvider $paymentMethodTranslationProvider
+        PaymentMethodLangRepositoryInterface $paymentMethodLangRepository
     ) {
         $this->countryRepository = $countryRepository;
         $this->paymentMethodSortProvider = $paymentMethodSortProvider;
@@ -105,7 +106,7 @@ public function __construct(
         $this->shop = $shop;
         $this->taxProvider = $taxProvider;
         $this->context = $context;
-        $this->paymentMethodTranslationProvider = $paymentMethodTranslationProvider;
+        $this->paymentMethodLangRepository = $paymentMethodLangRepository;
     }
 
     /**
@@ -235,8 +236,18 @@ private function getMethodsObjForConfig($apiMethods)
                     );
                 }
 
+                $result = $this->paymentMethodLangRepository->findAllBy([
+                    'id_method' => $apiMethod['id'],
+                    'id_shop' => $this->context->getShopId()
+                ]);
+
+                $mappedMethodTitles = [];
+                foreach ($result->getResults() as $value) {
+                    $mappedMethodTitles[$value->id_lang] = $value->text;
+                }
+
                 $methods[$apiMethod['id']] = $apiMethod;
-                $paymentMethod->method_name = $this->paymentMethodTranslationProvider->getTransList($apiMethod['id']);
+                $paymentMethod->method_name = $mappedMethodTitles;
                 $methods[$apiMethod['id']]['obj'] = $paymentMethod;
 
                 continue;

From ccb1d49c2e4ce0eab1a46364814c248812cee4f7 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 26 Nov 2024 11:05:47 +0200
Subject: [PATCH 56/69] [PIPRES-468] removed privder

---
 .../PaymentOption/BancontactPaymentOptionProvider.php    | 9 ++-------
 src/Provider/PaymentOption/BasePaymentOptionProvider.php | 7 ++-----
 .../PaymentOption/CreditCardPaymentOptionProvider.php    | 7 +------
 .../CreditCardSingleClickPaymentOptionProvider.php       | 5 +----
 .../PaymentOption/IdealPaymentOptionProvider.php         | 7 +------
 5 files changed, 7 insertions(+), 28 deletions(-)

diff --git a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
index 971abd99a..7ae5d31dd 100644
--- a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
@@ -43,7 +43,6 @@
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
-use Mollie\Provider\PaymentMethodTranslationProvider;
 use Mollie\Repository\PaymentMethodLangRepositoryInterface;
 use Mollie\Service\LanguageService;
 use MolPaymentMethod;
@@ -82,20 +81,17 @@ class BancontactPaymentOptionProvider implements PaymentOptionProviderInterface
      * @var LanguageService
      */
     private $languageService;
+
     /** @var OrderTotalProviderInterface */
     private $orderTotalProvider;
 
-    /** @var PaymentMethodTranslationProvider $paymentMethodTranslationProvider */
-    private $paymentMethodTranslationProvider;
-
     public function __construct(
         Mollie $module,
         LegacyContext $context,
         CreditCardLogoProvider $creditCardLogoProvider,
         PaymentFeeProviderInterface $paymentFeeProvider,
         LanguageService $languageService,
-        OrderTotalProviderInterface $orderTotalProvider,
-        PaymentMethodTranslationProvider $paymentMethodTranslationProvider
+        OrderTotalProviderInterface $orderTotalProvider
     ) {
         $this->module = $module;
         $this->context = $context;
@@ -103,7 +99,6 @@ public function __construct(
         $this->paymentFeeProvider = $paymentFeeProvider;
         $this->languageService = $languageService;
         $this->orderTotalProvider = $orderTotalProvider;
-        $this->paymentMethodTranslationProvider = $paymentMethodTranslationProvider;
     }
 
     /**
diff --git a/src/Provider/PaymentOption/BasePaymentOptionProvider.php b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
index 0b3735a26..67cf90f61 100644
--- a/src/Provider/PaymentOption/BasePaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
@@ -82,10 +82,9 @@ class BasePaymentOptionProvider implements PaymentOptionProviderInterface
      * @var LanguageService
      */
     private $languageService;
+
     /** @var OrderTotalProviderInterface */
     private $orderTotalProvider;
-    /** @var PaymentMethodTranslationProvider $paymentMethodTranslationProvider */
-    private $paymentMethodTranslationProvider;
 
     public function __construct(
         Mollie $module,
@@ -93,8 +92,7 @@ public function __construct(
         CreditCardLogoProvider $creditCardLogoProvider,
         PaymentFeeProviderInterface $paymentFeeProvider,
         LanguageService $languageService,
-        OrderTotalProviderInterface $orderTotalProvider,
-        PaymentMethodTranslationProvider $paymentMethodTranslationProvider
+        OrderTotalProviderInterface $orderTotalProvider
     ) {
         $this->module = $module;
         $this->context = $context;
@@ -102,7 +100,6 @@ public function __construct(
         $this->paymentFeeProvider = $paymentFeeProvider;
         $this->languageService = $languageService;
         $this->orderTotalProvider = $orderTotalProvider;
-        $this->paymentMethodTranslationProvider = $paymentMethodTranslationProvider;
     }
 
     /**
diff --git a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
index 24c8c9dfc..90878ac65 100644
--- a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
@@ -46,7 +46,6 @@
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
-use Mollie\Provider\PaymentMethodTranslationProvider;
 use Mollie\Repository\MolCustomerRepository;
 use Mollie\Repository\PaymentMethodLangRepositoryInterface;
 use Mollie\Service\LanguageService;
@@ -102,8 +101,6 @@ class CreditCardPaymentOptionProvider implements PaymentOptionProviderInterface
     private $customerRepository;
     /** @var ConfigurationAdapter */
     private $configurationAdapter;
-    /** @var PaymentMethodTranslationProvider $paymentMethodTranslationProvider */
-    private $paymentMethodTranslationProvider;
 
     public function __construct(
         LegacyContext $context,
@@ -114,8 +111,7 @@ public function __construct(
         Customer $customer,
         MolCustomerRepository $customerRepository,
         Mollie $module,
-        ConfigurationAdapter $configurationAdapter,
-        PaymentMethodTranslationProvider $paymentMethodTranslationProvider
+        ConfigurationAdapter $configurationAdapter
     ) {
         $this->context = $context;
         $this->creditCardLogoProvider = $creditCardLogoProvider;
@@ -126,7 +122,6 @@ public function __construct(
         $this->customerRepository = $customerRepository;
         $this->module = $module;
         $this->configurationAdapter = $configurationAdapter;
-        $this->paymentMethodTranslationProvider = $paymentMethodTranslationProvider;
     }
 
     /**
diff --git a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
index 459cd8087..4c7e05cd6 100644
--- a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
@@ -45,7 +45,6 @@
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
-use Mollie\Provider\PaymentMethodTranslationProvider;
 use Mollie\Repository\MolCustomerRepository;
 use Mollie\Repository\PaymentMethodLangRepositoryInterface;
 use Mollie\Service\LanguageService;
@@ -111,8 +110,7 @@ public function __construct(
         LanguageService $languageService,
         MolCustomerRepository $customerRepository,
         Mollie\Adapter\Customer $customer,
-        ConfigurationAdapter $configurationAdapter,
-        PaymentMethodTranslationProvider $paymentMethodTranslationProvider
+        ConfigurationAdapter $configurationAdapter
     ) {
         $this->module = $module;
         $this->context = $context;
@@ -123,7 +121,6 @@ public function __construct(
         $this->customerRepository = $customerRepository;
         $this->customer = $customer;
         $this->configurationAdapter = $configurationAdapter;
-        $this->paymentMethodTranslationProvider = $paymentMethodTranslationProvider;
     }
 
     /**
diff --git a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
index 8ff4c998a..98d96272b 100644
--- a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
@@ -42,7 +42,6 @@
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
-use Mollie\Provider\PaymentMethodTranslationProvider;
 use Mollie\Repository\PaymentMethodLangRepositoryInterface;
 use Mollie\Service\Content\TemplateParserInterface;
 use Mollie\Service\LanguageService;
@@ -89,8 +88,6 @@ class IdealPaymentOptionProvider implements PaymentOptionProviderInterface
     private $languageService;
     /** @var OrderTotalProviderInterface */
     private $orderTotalProvider;
-    /** @var PaymentMethodTranslationProvider $paymentMethodTranslationProvider */
-    private $paymentMethodTranslationProvider;
 
     public function __construct(
         Mollie $module,
@@ -99,8 +96,7 @@ public function __construct(
         PaymentFeeProviderInterface $paymentFeeProvider,
         TemplateParserInterface $templateParser,
         LanguageService $languageService,
-        OrderTotalProviderInterface $orderTotalProvider,
-        PaymentMethodTranslationProvider $paymentMethodTranslationProvider
+        OrderTotalProviderInterface $orderTotalProvider
     ) {
         $this->module = $module;
         $this->context = $context;
@@ -109,7 +105,6 @@ public function __construct(
         $this->templateParser = $templateParser;
         $this->languageService = $languageService;
         $this->orderTotalProvider = $orderTotalProvider;
-        $this->paymentMethodTranslationProvider = $paymentMethodTranslationProvider;
     }
 
     /**

From 1488849a4e4a33b1647257b7b0988157746d099b Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 26 Nov 2024 11:09:05 +0200
Subject: [PATCH 57/69] [PIPRES-468] remove dependency

---
 controllers/admin/AdminMollieSettingsController.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/controllers/admin/AdminMollieSettingsController.php b/controllers/admin/AdminMollieSettingsController.php
index 445f30b0d..f27d749ed 100644
--- a/controllers/admin/AdminMollieSettingsController.php
+++ b/controllers/admin/AdminMollieSettingsController.php
@@ -14,7 +14,6 @@
 
 use Mollie\Logger\Logger;
 use Mollie\Logger\LoggerInterface;
-use Mollie\Provider\PaymentMethodTranslationProvider;
 use Mollie\Utility\ExceptionUtility;
 
 if (!defined('_PS_VERSION_')) {

From c630fd86ddb8a125fcc55e6d98240e9fd04e9bc3 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 26 Nov 2024 11:36:11 +0200
Subject: [PATCH 58/69] [PIPRES-468] whitespace

---
 src/Config/Config.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Config/Config.php b/src/Config/Config.php
index fd9edd30d..27abc82aa 100644
--- a/src/Config/Config.php
+++ b/src/Config/Config.php
@@ -169,7 +169,6 @@ class Config
     const MOLLIE_SUBSCRIPTION_ENABLED = 'MOLLIE_SUBSCRIPTION_ENABLED';
 
     const MOLLIE_METHOD_ENABLED = 'MOLLIE_METHOD_ENABLED_';
-
     const MOLLIE_METHOD_TITLE = 'MOLLIE_METHOD_TITLE_';
     const MOLLIE_METHOD_API = 'MOLLIE_METHOD_API_';
     const MOLLIE_METHOD_DESCRIPTION = 'MOLLIE_METHOD_DESCRIPTION_';

From d57a9c785791de25699502175a31e3183b1ba90f Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 26 Nov 2024 11:37:04 +0200
Subject: [PATCH 59/69] [PIPRES-468] removed useless altering

---
 src/Install/DatabaseTableInstaller.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/src/Install/DatabaseTableInstaller.php b/src/Install/DatabaseTableInstaller.php
index e2bd49099..6679aff11 100644
--- a/src/Install/DatabaseTableInstaller.php
+++ b/src/Install/DatabaseTableInstaller.php
@@ -185,15 +185,6 @@ private function alterTableCommands(): bool
             return false;
         }
 
-        $query = '
-            ALTER TABLE ' . _DB_PREFIX_ . 'mol_payment_method
-            DROP COLUMN title;
-        ';
-
-        if (!Db::getInstance()->execute($query)) {
-            return false;
-        }
-
         return true;
     }
 }

From 4cb2f2b2ae5fa7672b458bf4a46ad8d9ee858148 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 26 Nov 2024 11:40:18 +0200
Subject: [PATCH 60/69] [PIPRES-468] added return type

---
 src/Repository/PaymentMethodLangRepository.php          | 7 ++++---
 src/Repository/PaymentMethodLangRepositoryInterface.php | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Repository/PaymentMethodLangRepository.php b/src/Repository/PaymentMethodLangRepository.php
index 26105afa4..aee18af0a 100644
--- a/src/Repository/PaymentMethodLangRepository.php
+++ b/src/Repository/PaymentMethodLangRepository.php
@@ -25,10 +25,10 @@ public function __construct()
         parent::__construct(\MolPaymentMethodLang::class);
     }
 
-    public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId, string $translation, int $idShop)
+    public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId, string $translation, int $idShop): bool
     {
         if (empty($translation)) {
-            return;
+            return false;
         }
 
         $paymentMethodLangObject = $this->findOneBy([
@@ -42,6 +42,7 @@ public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId
         $multiLangObject->id_method = $idPaymentMethod;
         $multiLangObject->id_shop = $idShop;
         $multiLangObject->text = $translation;
-        $multiLangObject->save();
+
+        return $multiLangObject->save();
     }
 }
diff --git a/src/Repository/PaymentMethodLangRepositoryInterface.php b/src/Repository/PaymentMethodLangRepositoryInterface.php
index 58f387763..a317f6fe3 100644
--- a/src/Repository/PaymentMethodLangRepositoryInterface.php
+++ b/src/Repository/PaymentMethodLangRepositoryInterface.php
@@ -20,5 +20,5 @@
 
 interface PaymentMethodLangRepositoryInterface extends ReadOnlyRepositoryInterface
 {
-    public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId, string $translation, int $idShop);
+    public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId, string $translation, int $idShop): bool;
 }

From 81e1b6dfca115a4183c083680e9f0999b81b3b0d Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 26 Nov 2024 11:53:08 +0200
Subject: [PATCH 61/69] [PIPRES-468] add autoindex

---
 shared/Core/Shared/Repository/index.php | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 shared/Core/Shared/Repository/index.php

diff --git a/shared/Core/Shared/Repository/index.php b/shared/Core/Shared/Repository/index.php
new file mode 100644
index 000000000..88355f610
--- /dev/null
+++ b/shared/Core/Shared/Repository/index.php
@@ -0,0 +1,11 @@
+<?php
+
+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;

From 7e6a92733d4e7d1fa4f68a37bb1c332c57621c6f Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 26 Nov 2024 11:59:40 +0200
Subject: [PATCH 62/69] [PIPRES-468] validation

---
 .../admin/_configure/helpers/form/form.tpl    | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/views/templates/admin/_configure/helpers/form/form.tpl b/views/templates/admin/_configure/helpers/form/form.tpl
index 5936cd60e..012c6b88e 100644
--- a/views/templates/admin/_configure/helpers/form/form.tpl
+++ b/views/templates/admin/_configure/helpers/form/form.tpl
@@ -50,7 +50,7 @@
                 <li class="payment-method border border-bottom">
                     <input type="hidden"
                            name="payment_option_position[{$paymentMethod.obj->id_method|escape:'html':'UTF-8'}]"
-                           value="{$paymentMethod.obj->position}" class="js-payment-option-position">
+                           value="{$paymentMethod.obj->position|escape:'html':'UTF-8'}" class="js-payment-option-position">
                     <span class="js-sort-handle sort-handle">
           <span class="ui-icon ui-icon-arrowthick-2-n-s"></span>
           <a class="text collapsed payment-method__text" data-toggle="collapse"
@@ -125,7 +125,7 @@
                                     </label>
                                     <div class="col-lg-9">
                                         <div class="col-lg-2 col-md-3 col-sm-4 col-xs-9 text-center">
-                                            <img src="{$input.applePayButtonBlack}"
+                                            <img src="{$input.applePayButtonBlack|escape:'html':'UTF-8'}"
                                                  style="width: 100%;" alt="Black">
                                             <label>
                                                 <input type="radio" name="MOLLIE_APPLE_PAY_DIRECT_STYLE"
@@ -133,7 +133,7 @@
                                             </label>
                                         </div>
                                         <div class="col-lg-2 col-md-3 col-sm-4 col-xs-9 text-center">
-                                            <img src="{$input.applePayButtonOutline}"
+                                            <img src="{$input.applePayButtonOutline|escape:'html':'UTF-8'}"
                                                  style="width: 100%;" alt="White with Outline">
                                             <label>
                                                 <input type="radio" name="MOLLIE_APPLE_PAY_DIRECT_STYLE"
@@ -141,7 +141,7 @@
                                             </label>
                                         </div>
                                         <div class="col-lg-2 col-md-3 col-sm-4 col-xs-9 text-center">
-                                            <img src="{$input.applePayButtonWhite}"
+                                            <img src="{$input.applePayButtonWhite|escape:'html':'UTF-8'}"
                                                  style="width: 100%;" alt="White">
                                             <label>
                                                 <input type="radio" name="MOLLIE_APPLE_PAY_DIRECT_STYLE"
@@ -164,7 +164,7 @@
                                         <option value="1" {if $input.isBancontactQrCodeEnabled == 1} selected {/if}>{l s='Yes' mod='mollie'}</option>
                                     </select>
                                     <p class="help-block">
-                                        {$input.bancontactQRCodeDescription}
+                                        {$input.bancontactQRCodeDescription|escape:'html':'UTF-8'}
                                     </p>
                                 </div>
                             </div>
@@ -178,7 +178,7 @@
                                 {foreach from=$languages item=language}
                                     {if $languages|count > 1}
                                         <div class="row">
-                                        <div class="translatable-field lang-{$language.id_lang}" {if $language.id_lang != $defaultFormLanguage}style="display:none"{/if}>
+                                        <div class="translatable-field lang-{$language.id_lang|escape:'html':'UTF-8'}" {if $language.id_lang != $defaultFormLanguage}style="display:none"{/if}>
                                         <div class="col-lg-4">
                                     {/if}
                                     <input type="text" name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]" value="{$methodObj->method_name[$language.id_lang]|default:$paymentMethod.name|escape:'html':'UTF-8'}">
@@ -191,7 +191,7 @@
                                             </button>
                                             <ul class="dropdown-menu">
                                                 {foreach from=$languages item=language}
-                                                    <li><a href="javascript:hideOtherLanguage({$language.id_lang});" tabindex="-1">{$language.name}</a></li>
+                                                    <li><a href="javascript:hideOtherLanguage({$language.id_lang|escape:'html':'UTF-8'});" tabindex="-1">{$language.name|escape:'html':'UTF-8'}</a></li>
                                                 {/foreach}
                                             </ul>
                                         </div>
@@ -389,9 +389,9 @@
                                 <input type="text"
                                        name="MOLLIE_METHOD_MIN_AMOUNT_{$paymentMethod.id|escape:'html':'UTF-8'}"
                                        class="fixed-width-xl"
-                                       min="{$paymentMethod.minimumAmount.value}"
-                                        {if $paymentMethod.maximumAmount != false } max="{$paymentMethod.maximumAmount.value}" {/if}
-                                       value="{if $methodObj->min_amount == 0}{$paymentMethod.minimumAmount.value}{else}{$methodObj->min_amount}{/if}">
+                                       min="{$paymentMethod.minimumAmount.value|escape:'html':'UTF-8'}"
+                                        {if $paymentMethod.maximumAmount != false } max="{$paymentMethod.maximumAmount.value|escape:'html':'UTF-8'}" {/if}
+                                       value="{if $methodObj->min_amount == 0}{$paymentMethod.minimumAmount.value|escape:'html':'UTF-8'}{else}{$methodObj->min_amount|escape:'html':'UTF-8'}{/if}">
                                 <p class="help-block">
                                     {l s='Default min amount in mollie is: ' mod='mollie'} {$paymentMethod.minimumAmount.value|escape:'html':'UTF-8'}{$paymentMethod.minimumAmount.currency|escape:'html':'UTF-8'}
                                 </p>
@@ -405,8 +405,8 @@
                                 <input type="text"
                                        name="MOLLIE_METHOD_MAX_AMOUNT_{$paymentMethod.id|escape:'html':'UTF-8'}"
                                        class="fixed-width-xl"
-                                        {if $paymentMethod.maximumAmount != false } max='{$paymentMethod.maximumAmount.value}' {/if}
-                                       value="{if $methodObj->max_amount == 0}{($paymentMethod.maximumAmount) ? $paymentMethod.maximumAmount.value : ''}{else}{$methodObj->max_amount}{/if}">
+                                        {if $paymentMethod.maximumAmount != false } max='{$paymentMethod.maximumAmount.value|escape:'html':'UTF-8'}' {/if}
+                                       value="{if $methodObj->max_amount == 0}{($paymentMethod.maximumAmount|escape:'html':'UTF-8') ? $paymentMethod.maximumAmount.value : ''}{else}{$methodObj->max_amount|escape:'html':'UTF-8'}{/if}">
                                 <p class="help-block">
                                     {if $paymentMethod.maximumAmount == false}
                                         {l s='Default max amount has no limitation' mod='mollie'}
@@ -877,7 +877,7 @@
         </div>
     {elseif $input.type === 'mollie-hidden-input'}
         <div>
-            <input type="hidden" name="{$input.name}" value="{$input.value}">
+            <input type="hidden" name="{$input.name|escape:'html':'UTF-8'}" value="{$input.value|escape:'html':'UTF-8'}">
         </div>
     {else}
         {$smarty.block.parent}

From a1345fc82e294fa6e81cfbe560ba8cf459713260 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 26 Nov 2024 12:02:18 +0200
Subject: [PATCH 63/69] [PIPRES-468] added ps version checking

---
 shared/Infrastructure/Exception/MollieDatabaseException.php | 4 ++++
 src/Logger/LogFormatterInterface.php                        | 4 ++++
 src/Logger/Logger.php                                       | 4 ++++
 src/Logger/LoggerInterface.php                              | 4 ++++
 src/Utility/VersionUtility.php                              | 4 ++++
 5 files changed, 20 insertions(+)

diff --git a/shared/Infrastructure/Exception/MollieDatabaseException.php b/shared/Infrastructure/Exception/MollieDatabaseException.php
index c1865d521..924faa422 100644
--- a/shared/Infrastructure/Exception/MollieDatabaseException.php
+++ b/shared/Infrastructure/Exception/MollieDatabaseException.php
@@ -15,6 +15,10 @@
 use Mollie\Exception\Code\ExceptionCode;
 use Mollie\Exception\MollieException;
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class MollieDatabaseException extends MollieException
 {
     public static function failedToFindRecord(string $className, array $keyValues): self
diff --git a/src/Logger/LogFormatterInterface.php b/src/Logger/LogFormatterInterface.php
index ae2690e24..29fc45cde 100644
--- a/src/Logger/LogFormatterInterface.php
+++ b/src/Logger/LogFormatterInterface.php
@@ -12,6 +12,10 @@
 
 namespace Mollie\Logger;
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 interface LogFormatterInterface
 {
     /**
diff --git a/src/Logger/Logger.php b/src/Logger/Logger.php
index e8c6dd505..9189faf77 100644
--- a/src/Logger/Logger.php
+++ b/src/Logger/Logger.php
@@ -19,6 +19,10 @@
 use Mollie\Service\EntityManager\ObjectModelUnitOfWork;
 use Mollie\Utility\NumberIdempotencyProvider;
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class Logger implements LoggerInterface
 {
     public const FILE_NAME = 'Logger';
diff --git a/src/Logger/LoggerInterface.php b/src/Logger/LoggerInterface.php
index d6230e177..747f0c3ff 100644
--- a/src/Logger/LoggerInterface.php
+++ b/src/Logger/LoggerInterface.php
@@ -12,6 +12,10 @@
 
 namespace Mollie\Logger;
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 interface LoggerInterface extends \Psr\Log\LoggerInterface
 {
 }
diff --git a/src/Utility/VersionUtility.php b/src/Utility/VersionUtility.php
index c3c27468f..de8d36076 100644
--- a/src/Utility/VersionUtility.php
+++ b/src/Utility/VersionUtility.php
@@ -12,6 +12,10 @@
 
 namespace Mollie\Utility;
 
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
 class VersionUtility
 {
     public static function isPsVersionLessThan($version): int

From e067c74218d09f38422e2a2df8bc0b41ecc7a0d4 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Tue, 26 Nov 2024 14:02:59 +0200
Subject: [PATCH 64/69] [PIPRES-468] fix typos

---
 .../BancontactPaymentOptionProvider.php              | 10 +++++-----
 .../PaymentOption/BasePaymentOptionProvider.php      | 12 +++++-------
 .../CreditCardPaymentOptionProvider.php              | 10 +++++-----
 .../CreditCardSingleClickPaymentOptionProvider.php   | 12 +++++-------
 .../PaymentOption/IdealPaymentOptionProvider.php     | 10 +++++-----
 5 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
index 7ae5d31dd..eb3a3eeaf 100644
--- a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
@@ -36,8 +36,8 @@
 
 namespace Mollie\Provider\PaymentOption;
 
-use KlarnaPayment\Module\Infrastructure\Context\GlobalShopContext;
 use Mollie;
+use Mollie\Adapter\Context;
 use Mollie\Adapter\LegacyContext;
 use Mollie\Api\Types\PaymentMethod;
 use Mollie\Provider\CreditCardLogoProvider;
@@ -108,16 +108,16 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
     {
         $paymentOption = new PaymentOption();
 
-        /** @var GlobalShopContext $globalShopContext */
-        $globalShopContext = $this->module->getService(GlobalShopContext::class);
+        /** @var Context $shopContext */
+        $shopContext = $this->module->getService(Context::class);
 
         /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
         $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
 
         $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
             'id_method' => $paymentMethod->id_method,
-            'id_lang' => $globalShopContext->getLanguageId(),
-            'id_shop' => $globalShopContext->getShopId(),
+            'id_lang' => $shopContext->getLanguageId(),
+            'id_shop' => $shopContext->getShopId(),
         ]);
 
         $paymentOption->setCallToActionText(
diff --git a/src/Provider/PaymentOption/BasePaymentOptionProvider.php b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
index 67cf90f61..82df062da 100644
--- a/src/Provider/PaymentOption/BasePaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
@@ -36,16 +36,14 @@
 
 namespace Mollie\Provider\PaymentOption;
 
-use KlarnaPayment\Module\Infrastructure\Context\GlobalShopContext;
 use Mollie;
+use Mollie\Adapter\Context;
 use Mollie\Adapter\LegacyContext;
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
 use Mollie\Provider\PaymentFeeProviderInterface;
-use Mollie\Provider\PaymentMethodTranslationProvider;
 use Mollie\Repository\PaymentMethodLangRepositoryInterface;
 use Mollie\Service\LanguageService;
-use Mollie\Service\PaymentMethodLangService;
 use MolPaymentMethod;
 use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
 use Tools;
@@ -109,16 +107,16 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
     {
         $paymentOption = new PaymentOption();
 
-        /** @var GlobalShopContext $globalShopContext */
-        $globalShopContext = $this->module->getService(GlobalShopContext::class);
+        /** @var Context $shopContext */
+        $shopContext = $this->module->getService(Context::class);
 
         /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
         $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
 
         $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
             'id_method' => $paymentMethod->id_method,
-            'id_lang' => $globalShopContext->getLanguageId(),
-            'id_shop' => $globalShopContext->getShopId(),
+            'id_lang' => $shopContext->getLanguageId(),
+            'id_shop' => $shopContext->getShopId(),
         ]);
 
         $paymentOption->setCallToActionText(
diff --git a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
index 90878ac65..04cb58e2c 100644
--- a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
@@ -36,10 +36,10 @@
 
 namespace Mollie\Provider\PaymentOption;
 
-use KlarnaPayment\Module\Infrastructure\Context\GlobalShopContext;
 use MolCustomer;
 use Mollie;
 use Mollie\Adapter\ConfigurationAdapter;
+use Mollie\Adapter\Context;
 use Mollie\Adapter\Customer;
 use Mollie\Adapter\LegacyContext;
 use Mollie\Config\Config;
@@ -131,16 +131,16 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
     {
         $paymentOption = new PaymentOption();
 
-        /** @var GlobalShopContext $globalShopContext */
-        $globalShopContext = $this->module->getService(GlobalShopContext::class);
+        /** @var Context $shopContext */
+        $shopContext = $this->module->getService(Context::class);
 
         /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
         $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
 
         $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
             'id_method' => $paymentMethod->id_method,
-            'id_lang' => $globalShopContext->getLanguageId(),
-            'id_shop' => $globalShopContext->getShopId(),
+            'id_lang' => $shopContext->getLanguageId(),
+            'id_shop' => $shopContext->getShopId(),
         ]);
 
         $paymentOption->setCallToActionText(
diff --git a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
index 4c7e05cd6..da1caaa10 100644
--- a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
@@ -36,10 +36,10 @@
 
 namespace Mollie\Provider\PaymentOption;
 
-use KlarnaPayment\Module\Infrastructure\Context\GlobalShopContext;
 use MolCustomer;
 use Mollie;
 use Mollie\Adapter\ConfigurationAdapter;
+use Mollie\Adapter\Context;
 use Mollie\Adapter\LegacyContext;
 use Mollie\Config\Config;
 use Mollie\Provider\CreditCardLogoProvider;
@@ -98,8 +98,6 @@ class CreditCardSingleClickPaymentOptionProvider implements PaymentOptionProvide
     private $customer;
     /** @var ConfigurationAdapter */
     private $configurationAdapter;
-    /** @var PaymentMethodTranslationProvider $paymentMethodTranslationProvider */
-    private $paymentMethodTranslationProvider;
 
     public function __construct(
         Mollie $module,
@@ -130,16 +128,16 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
     {
         $paymentOption = new PaymentOption();
 
-        /** @var GlobalShopContext $globalShopContext */
-        $globalShopContext = $this->module->getService(GlobalShopContext::class);
+        /** @var Context $shopContext */
+        $shopContext = $this->module->getService(Context::class);
 
         /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
         $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
 
         $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
             'id_method' => $paymentMethod->id_method,
-            'id_lang' => $globalShopContext->getLanguageId(),
-            'id_shop' => $globalShopContext->getShopId(),
+            'id_lang' => $shopContext->getLanguageId(),
+            'id_shop' => $shopContext->getShopId(),
         ]);
 
         $paymentOption->setCallToActionText(
diff --git a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
index 98d96272b..109eb236c 100644
--- a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
@@ -36,8 +36,8 @@
 
 namespace Mollie\Provider\PaymentOption;
 
-use KlarnaPayment\Module\Infrastructure\Context\GlobalShopContext;
 use Mollie;
+use Mollie\Adapter\Context;
 use Mollie\Adapter\LegacyContext;
 use Mollie\Provider\CreditCardLogoProvider;
 use Mollie\Provider\OrderTotal\OrderTotalProviderInterface;
@@ -114,16 +114,16 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
     {
         $paymentOption = new PaymentOption();
 
-        /** @var GlobalShopContext $globalShopContext */
-        $globalShopContext = $this->module->getService(GlobalShopContext::class);
+        /** @var Context $shopContext */
+        $shopContext = $this->module->getService(Context::class);
 
         /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
         $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
 
         $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
             'id_method' => $paymentMethod->id_method,
-            'id_lang' => $globalShopContext->getLanguageId(),
-            'id_shop' => $globalShopContext->getShopId(),
+            'id_lang' => $shopContext->getLanguageId(),
+            'id_shop' => $shopContext->getShopId(),
         ]);
 
         $paymentOption->setCallToActionText(

From c5cbb629f1866a97f957cd1bfb90d6237aa0b21e Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 27 Nov 2024 15:18:58 +0200
Subject: [PATCH 65/69] [PIPRES-468] fix name

---
 upgrade/Upgrade-6.2.5.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/upgrade/Upgrade-6.2.5.php b/upgrade/Upgrade-6.2.5.php
index e7d22dea4..f72c25ce1 100644
--- a/upgrade/Upgrade-6.2.5.php
+++ b/upgrade/Upgrade-6.2.5.php
@@ -31,7 +31,7 @@ function upgrade_module_6_2_5(Mollie $module): bool
     }
 
     try {
-        deleteAndUpdatePaymentMethodTitles();
+        updatePaymentMethodTitles();
     } catch (Exception $e) {
         return false;
     }
@@ -41,7 +41,7 @@ function upgrade_module_6_2_5(Mollie $module): bool
     return Db::getInstance()->execute($sql);
 }
 
-function deleteAndUpdatePaymentMethodTitles() {
+function updatePaymentMethodTitles() {
     $sql = 'SELECT `id_method`, `title` FROM `' . _DB_PREFIX_ . 'mol_payment_method`';
 
     $methodsList = \Db::getInstance()->executeS($sql);

From e9f923e2b4570ddf8c1f842e1fd6925c8e33e18d Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Wed, 27 Nov 2024 15:20:34 +0200
Subject: [PATCH 66/69] [PIPRES-468] shopContext -> context

---
 .../PaymentOption/BancontactPaymentOptionProvider.php     | 8 ++++----
 src/Provider/PaymentOption/BasePaymentOptionProvider.php  | 8 ++++----
 .../PaymentOption/CreditCardPaymentOptionProvider.php     | 8 ++++----
 .../CreditCardSingleClickPaymentOptionProvider.php        | 8 ++++----
 src/Provider/PaymentOption/IdealPaymentOptionProvider.php | 8 ++++----
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
index eb3a3eeaf..5c998a587 100644
--- a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
@@ -108,16 +108,16 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
     {
         $paymentOption = new PaymentOption();
 
-        /** @var Context $shopContext */
-        $shopContext = $this->module->getService(Context::class);
+        /** @var Context $context */
+        $context = $this->module->getService(Context::class);
 
         /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
         $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
 
         $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
             'id_method' => $paymentMethod->id_method,
-            'id_lang' => $shopContext->getLanguageId(),
-            'id_shop' => $shopContext->getShopId(),
+            'id_lang' => $context->getLanguageId(),
+            'id_shop' => $context->getShopId(),
         ]);
 
         $paymentOption->setCallToActionText(
diff --git a/src/Provider/PaymentOption/BasePaymentOptionProvider.php b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
index 82df062da..f026e365d 100644
--- a/src/Provider/PaymentOption/BasePaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
@@ -107,16 +107,16 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
     {
         $paymentOption = new PaymentOption();
 
-        /** @var Context $shopContext */
-        $shopContext = $this->module->getService(Context::class);
+        /** @var Context $context */
+        $context = $this->module->getService(Context::class);
 
         /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
         $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
 
         $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
             'id_method' => $paymentMethod->id_method,
-            'id_lang' => $shopContext->getLanguageId(),
-            'id_shop' => $shopContext->getShopId(),
+            'id_lang' => $context->getLanguageId(),
+            'id_shop' => $context->getShopId(),
         ]);
 
         $paymentOption->setCallToActionText(
diff --git a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
index 04cb58e2c..6db0f3b09 100644
--- a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
@@ -131,16 +131,16 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
     {
         $paymentOption = new PaymentOption();
 
-        /** @var Context $shopContext */
-        $shopContext = $this->module->getService(Context::class);
+        /** @var Context $context */
+        $context = $this->module->getService(Context::class);
 
         /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
         $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
 
         $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
             'id_method' => $paymentMethod->id_method,
-            'id_lang' => $shopContext->getLanguageId(),
-            'id_shop' => $shopContext->getShopId(),
+            'id_lang' => $context->getLanguageId(),
+            'id_shop' => $context->getShopId(),
         ]);
 
         $paymentOption->setCallToActionText(
diff --git a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
index da1caaa10..e504e2d66 100644
--- a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
@@ -128,16 +128,16 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
     {
         $paymentOption = new PaymentOption();
 
-        /** @var Context $shopContext */
-        $shopContext = $this->module->getService(Context::class);
+        /** @var Context $context */
+        $context = $this->module->getService(Context::class);
 
         /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
         $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
 
         $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
             'id_method' => $paymentMethod->id_method,
-            'id_lang' => $shopContext->getLanguageId(),
-            'id_shop' => $shopContext->getShopId(),
+            'id_lang' => $context->getLanguageId(),
+            'id_shop' => $context->getShopId(),
         ]);
 
         $paymentOption->setCallToActionText(
diff --git a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
index 109eb236c..3698c6e0d 100644
--- a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
@@ -114,16 +114,16 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
     {
         $paymentOption = new PaymentOption();
 
-        /** @var Context $shopContext */
-        $shopContext = $this->module->getService(Context::class);
+        /** @var Context $context */
+        $context = $this->module->getService(Context::class);
 
         /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
         $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
 
         $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
             'id_method' => $paymentMethod->id_method,
-            'id_lang' => $shopContext->getLanguageId(),
-            'id_shop' => $shopContext->getShopId(),
+            'id_lang' => $context->getLanguageId(),
+            'id_shop' => $context->getShopId(),
         ]);
 
         $paymentOption->setCallToActionText(

From 19cdf48f721ad595a18b5374f83238bcbbe28934 Mon Sep 17 00:00:00 2001
From: MarijusCoding <marijusdilys9@gmail.com>
Date: Mon, 2 Dec 2024 11:44:06 +0200
Subject: [PATCH 67/69] [PIPRES-468] fix

---
 src/Repository/PaymentMethodLangRepository.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Repository/PaymentMethodLangRepository.php b/src/Repository/PaymentMethodLangRepository.php
index aee18af0a..223400541 100644
--- a/src/Repository/PaymentMethodLangRepository.php
+++ b/src/Repository/PaymentMethodLangRepository.php
@@ -37,7 +37,7 @@ public function savePaymentTitleTranslation(string $idPaymentMethod, int $langId
             'id_shop' => $idShop,
         ]);
 
-        $multiLangObject = new \MolPaymentMethodLang(isset($paymentMethodLangObject) ? $paymentMethodLangObject->id : null);
+        $multiLangObject = new \MolPaymentMethodLang($paymentMethodLangObject->id ?? null);
         $multiLangObject->id_lang = $langId;
         $multiLangObject->id_method = $idPaymentMethod;
         $multiLangObject->id_shop = $idShop;

From 4e4ac07a729e82303ef09d27ad6b784545da6abc Mon Sep 17 00:00:00 2001
From: Gytautas <gytautas.zumaras@invertus.eu>
Date: Tue, 10 Dec 2024 16:41:24 +0200
Subject: [PATCH 68/69] cs fixer and stan fix

---
 .../admin/AdminMollieSettingsController.php     |  3 ---
 src/Entity/MolPaymentMethod.php                 |  4 ++++
 src/Entity/MolPaymentMethodLang.php             |  1 -
 .../BancontactPaymentOptionProvider.php         |  6 ++++--
 .../PaymentOption/BasePaymentOptionProvider.php |  6 ++++--
 .../CreditCardPaymentOptionProvider.php         |  6 ++++--
 ...editCardSingleClickPaymentOptionProvider.php |  6 ++++--
 .../IdealPaymentOptionProvider.php              |  6 ++++--
 src/Service/ApiService.php                      | 17 ++++++++++++++---
 src/Service/PaymentMethodService.php            |  2 +-
 src/ServiceProvider/BaseServiceProvider.php     |  4 ++--
 .../admin/_configure/helpers/form/form.tpl      |  4 ++--
 12 files changed, 43 insertions(+), 22 deletions(-)

diff --git a/controllers/admin/AdminMollieSettingsController.php b/controllers/admin/AdminMollieSettingsController.php
index f27d749ed..4d7178a1b 100644
--- a/controllers/admin/AdminMollieSettingsController.php
+++ b/controllers/admin/AdminMollieSettingsController.php
@@ -205,9 +205,6 @@ public function postProcess()
         /** @var \Mollie\Builder\FormBuilder $settingsFormBuilder */
         $settingsFormBuilder = $this->module->getService(\Mollie\Builder\FormBuilder::class);
 
-        /** @var Logger $logger * */
-        $logger = $this->module->getService(LoggerInterface::class);
-
         try {
             $html .= $settingsFormBuilder->buildSettingsForm();
         } catch (PrestaShopDatabaseException $e) {
diff --git a/src/Entity/MolPaymentMethod.php b/src/Entity/MolPaymentMethod.php
index e3f134ec7..c1f303c95 100644
--- a/src/Entity/MolPaymentMethod.php
+++ b/src/Entity/MolPaymentMethod.php
@@ -107,6 +107,10 @@ class MolPaymentMethod extends ObjectModel
      * @var int
      */
     public $id_shop;
+    /**
+     * @var array
+     */
+    public $titles;
 
     /**
      * @var array
diff --git a/src/Entity/MolPaymentMethodLang.php b/src/Entity/MolPaymentMethodLang.php
index ee35912b7..c2b467ee9 100644
--- a/src/Entity/MolPaymentMethodLang.php
+++ b/src/Entity/MolPaymentMethodLang.php
@@ -9,7 +9,6 @@
  * @see        https://github.com/mollie/PrestaShop
  * @codingStandardsIgnoreStart
  */
-
 if (!defined('_PS_VERSION_')) {
     exit;
 }
diff --git a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
index 5c998a587..62dd4855c 100644
--- a/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BancontactPaymentOptionProvider.php
@@ -46,6 +46,7 @@
 use Mollie\Repository\PaymentMethodLangRepositoryInterface;
 use Mollie\Service\LanguageService;
 use MolPaymentMethod;
+use MolPaymentMethodLang;
 use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
 use Tools;
 
@@ -114,14 +115,15 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
         $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
 
-        $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
+        /** @var MolPaymentMethodLang $molPaymentMethodLang */
+        $molPaymentMethodLang = $paymentMethodLangRepository->findOneBy([
             'id_method' => $paymentMethod->id_method,
             'id_lang' => $context->getLanguageId(),
             'id_shop' => $context->getShopId(),
         ]);
 
         $paymentOption->setCallToActionText(
-            $paymentMethodLangObject->text ?: $paymentMethod->method_name
+            $molPaymentMethodLang->text ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/BasePaymentOptionProvider.php b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
index f026e365d..b1f6d9773 100644
--- a/src/Provider/PaymentOption/BasePaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/BasePaymentOptionProvider.php
@@ -45,6 +45,7 @@
 use Mollie\Repository\PaymentMethodLangRepositoryInterface;
 use Mollie\Service\LanguageService;
 use MolPaymentMethod;
+use MolPaymentMethodLang;
 use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
 use Tools;
 
@@ -113,14 +114,15 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
         $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
 
-        $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
+        /** @var MolPaymentMethodLang $molPaymentMethodLang */
+        $molPaymentMethodLang = $paymentMethodLangRepository->findOneBy([
             'id_method' => $paymentMethod->id_method,
             'id_lang' => $context->getLanguageId(),
             'id_shop' => $context->getShopId(),
         ]);
 
         $paymentOption->setCallToActionText(
-            $paymentMethodLangObject->text ?: $paymentMethod->method_name
+            $molPaymentMethodLang->text ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
index 6db0f3b09..0567ebda5 100644
--- a/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardPaymentOptionProvider.php
@@ -51,6 +51,7 @@
 use Mollie\Service\LanguageService;
 use Mollie\Utility\CustomerUtility;
 use MolPaymentMethod;
+use MolPaymentMethodLang;
 use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
 use Tools;
 
@@ -137,14 +138,15 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
         $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
 
-        $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
+        /** @var MolPaymentMethodLang $molPaymentMethodLang */
+        $molPaymentMethodLang = $paymentMethodLangRepository->findOneBy([
             'id_method' => $paymentMethod->id_method,
             'id_lang' => $context->getLanguageId(),
             'id_shop' => $context->getShopId(),
         ]);
 
         $paymentOption->setCallToActionText(
-            $paymentMethodLangObject->text ?: $paymentMethod->method_name
+            $molPaymentMethodLang->text ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
index e504e2d66..09d7a39a2 100644
--- a/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/CreditCardSingleClickPaymentOptionProvider.php
@@ -50,6 +50,7 @@
 use Mollie\Service\LanguageService;
 use Mollie\Utility\CustomerUtility;
 use MolPaymentMethod;
+use MolPaymentMethodLang;
 use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
 use Tools;
 
@@ -134,14 +135,15 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
         $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
 
-        $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
+        /** @var MolPaymentMethodLang $molPaymentMethodLang */
+        $molPaymentMethodLang = $paymentMethodLangRepository->findOneBy([
             'id_method' => $paymentMethod->id_method,
             'id_lang' => $context->getLanguageId(),
             'id_shop' => $context->getShopId(),
         ]);
 
         $paymentOption->setCallToActionText(
-            $paymentMethodLangObject->text ?: $paymentMethod->method_name
+            $molPaymentMethodLang->text ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
index 3698c6e0d..61109894c 100644
--- a/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
+++ b/src/Provider/PaymentOption/IdealPaymentOptionProvider.php
@@ -46,6 +46,7 @@
 use Mollie\Service\Content\TemplateParserInterface;
 use Mollie\Service\LanguageService;
 use MolPaymentMethod;
+use MolPaymentMethodLang;
 use PrestaShop\PrestaShop\Core\Payment\PaymentOption;
 use Tools;
 
@@ -120,14 +121,15 @@ public function getPaymentOption(MolPaymentMethod $paymentMethod): PaymentOption
         /** @var PaymentMethodLangRepositoryInterface $paymentMethodLangRepository */
         $paymentMethodLangRepository = $this->module->getService(PaymentMethodLangRepositoryInterface::class);
 
-        $paymentMethodLangObject = $paymentMethodLangRepository->findOneBy([
+        /** @var MolPaymentMethodLang $molPaymentMethodLang */
+        $molPaymentMethodLang = $paymentMethodLangRepository->findOneBy([
             'id_method' => $paymentMethod->id_method,
             'id_lang' => $context->getLanguageId(),
             'id_shop' => $context->getShopId(),
         ]);
 
         $paymentOption->setCallToActionText(
-            $paymentMethodLangObject->text ?: $paymentMethod->method_name
+            $molPaymentMethodLang->text ?: $paymentMethod->method_name
         );
 
         $paymentOption->setModuleName($this->module->name);
diff --git a/src/Service/ApiService.php b/src/Service/ApiService.php
index 0a0b1af60..77801d01f 100644
--- a/src/Service/ApiService.php
+++ b/src/Service/ApiService.php
@@ -26,7 +26,6 @@
 use Mollie\Api\Resources\PaymentCollection;
 use Mollie\Config\Config;
 use Mollie\Exception\MollieApiException;
-use Mollie\Provider\PaymentMethodTranslationProvider;
 use Mollie\Provider\TaxCalculatorProvider;
 use Mollie\Repository\CountryRepository;
 use Mollie\Repository\PaymentMethodLangRepositoryInterface;
@@ -238,7 +237,7 @@ private function getMethodsObjForConfig($apiMethods)
 
                 $result = $this->paymentMethodLangRepository->findAllBy([
                     'id_method' => $apiMethod['id'],
-                    'id_shop' => $this->context->getShopId()
+                    'id_shop' => $this->context->getShopId(),
                 ]);
 
                 $mappedMethodTitles = [];
@@ -246,8 +245,9 @@ private function getMethodsObjForConfig($apiMethods)
                     $mappedMethodTitles[$value->id_lang] = $value->text;
                 }
 
+                $paymentMethod->method_name = $apiMethod['name'];
+                $paymentMethod->titles = $mappedMethodTitles;
                 $methods[$apiMethod['id']] = $apiMethod;
-                $paymentMethod->method_name = $mappedMethodTitles;
                 $methods[$apiMethod['id']]['obj'] = $paymentMethod;
 
                 continue;
@@ -255,8 +255,19 @@ private function getMethodsObjForConfig($apiMethods)
 
             $defaultPaymentMethod = clone $emptyPaymentMethod;
 
+            $result = $this->paymentMethodLangRepository->findAllBy([
+                'id_method' => $apiMethod['id'],
+                'id_shop' => $this->context->getShopId(),
+            ]);
+
+            $mappedMethodTitles = [];
+            foreach ($result->getResults() as $value) {
+                $mappedMethodTitles[$value->id_lang] = $value->text;
+            }
+
             $defaultPaymentMethod->id_method = $apiMethod['id'];
             $defaultPaymentMethod->method_name = $apiMethod['name'];
+            $defaultPaymentMethod->titles = $mappedMethodTitles;
 
             $methods[$apiMethod['id']] = $apiMethod;
             $methods[$apiMethod['id']]['obj'] = $defaultPaymentMethod;
diff --git a/src/Service/PaymentMethodService.php b/src/Service/PaymentMethodService.php
index e428bc893..601df59ad 100644
--- a/src/Service/PaymentMethodService.php
+++ b/src/Service/PaymentMethodService.php
@@ -185,7 +185,7 @@ public function savePaymentMethod($method)
 
         $paymentMethod->save();
 
-        foreach(Tools::getValue(Config::MOLLIE_METHOD_TITLE . $method['id']) as $idLang => $title) {
+        foreach (Tools::getValue(Config::MOLLIE_METHOD_TITLE . $method['id']) as $idLang => $title) {
             $this->paymentMethodLangRepository->savePaymentTitleTranslation($method['id'], $idLang, $title, $this->context->getShopId());
         }
 
diff --git a/src/ServiceProvider/BaseServiceProvider.php b/src/ServiceProvider/BaseServiceProvider.php
index 4af8a04e6..76156e891 100644
--- a/src/ServiceProvider/BaseServiceProvider.php
+++ b/src/ServiceProvider/BaseServiceProvider.php
@@ -84,10 +84,10 @@
 use Mollie\Repository\MolLogRepositoryInterface;
 use Mollie\Repository\MolOrderPaymentFeeRepository;
 use Mollie\Repository\MolOrderPaymentFeeRepositoryInterface;
-use Mollie\Repository\PaymentMethodLangRepository;
-use Mollie\Repository\PaymentMethodLangRepositoryInterface;
 use Mollie\Repository\OrderRepository;
 use Mollie\Repository\OrderRepositoryInterface;
+use Mollie\Repository\PaymentMethodLangRepository;
+use Mollie\Repository\PaymentMethodLangRepositoryInterface;
 use Mollie\Repository\PaymentMethodRepository;
 use Mollie\Repository\PaymentMethodRepositoryInterface;
 use Mollie\Repository\PendingOrderCartRuleRepository;
diff --git a/views/templates/admin/_configure/helpers/form/form.tpl b/views/templates/admin/_configure/helpers/form/form.tpl
index 012c6b88e..818e40160 100644
--- a/views/templates/admin/_configure/helpers/form/form.tpl
+++ b/views/templates/admin/_configure/helpers/form/form.tpl
@@ -181,7 +181,7 @@
                                         <div class="translatable-field lang-{$language.id_lang|escape:'html':'UTF-8'}" {if $language.id_lang != $defaultFormLanguage}style="display:none"{/if}>
                                         <div class="col-lg-4">
                                     {/if}
-                                    <input type="text" name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]" value="{$methodObj->method_name[$language.id_lang]|default:$paymentMethod.name|escape:'html':'UTF-8'}">
+                                    <input type="text" name="MOLLIE_METHOD_TITLE_{$paymentMethod.id|escape:'html':'UTF-8'}[{$language.id_lang}]" value="{$methodObj->titles[$language.id_lang]|default:$paymentMethod.name|escape:'html':'UTF-8'}">
                                     {if $languages|count > 1}
                                         </div>
                                         <div class="col-lg-2">
@@ -406,7 +406,7 @@
                                        name="MOLLIE_METHOD_MAX_AMOUNT_{$paymentMethod.id|escape:'html':'UTF-8'}"
                                        class="fixed-width-xl"
                                         {if $paymentMethod.maximumAmount != false } max='{$paymentMethod.maximumAmount.value|escape:'html':'UTF-8'}' {/if}
-                                       value="{if $methodObj->max_amount == 0}{($paymentMethod.maximumAmount|escape:'html':'UTF-8') ? $paymentMethod.maximumAmount.value : ''}{else}{$methodObj->max_amount|escape:'html':'UTF-8'}{/if}">
+                                       value="{if $methodObj->max_amount == 0}{($paymentMethod.maximumAmount) ? $paymentMethod.maximumAmount.value : ''}{else}{$methodObj->max_amount|escape:'html':'UTF-8'}{/if}">
                                 <p class="help-block">
                                     {if $paymentMethod.maximumAmount == false}
                                         {l s='Default max amount has no limitation' mod='mollie'}

From 821c15e1a4f5252bff100f7b1f7c881de974d58d Mon Sep 17 00:00:00 2001
From: Gytautas <gytautas.zumaras@invertus.eu>
Date: Tue, 10 Dec 2024 16:48:09 +0200
Subject: [PATCH 69/69] changelog updated

---
 changelog.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/changelog.md b/changelog.md
index bf7f3bf8f..6870d1a4f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,12 @@
 
 # Changelog #
 
+## Changes in release 6.2.5 ##
++ Fixed issue with order status on multishop
++ Phone number validation improvements
++ Add to cart validation improvements on recurring orders
++ Code bawe improvements following prestashop standards
+
 ## Changes in release 6.2.4 ##
 + Workflow improvements
 + Satispay payment method added