PIPRES-468 "Title" multilanguage functionality

src/Config/Config.php

@@ -169,6 +169,7 @@ 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_';

src/Entity/MolPaymentMethod.php

@@ -31,7 +31,7 @@ class MolPaymentMethod extends ObjectModel
     public $method_name;
 
     /**
-     * @var string
+     * @var string|array
      */
     public $title;
 

src/Entity/MolPaymentMethodLang.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * Mollie       https://www.mollie.nl
+ *
+ * @author      Mollie B.V. <[email protected]>
+ * @copyright   Mollie B.V.
+ * @license     https://github.com/mollie/PrestaShop/blob/master/LICENSE.md
+ *
+ * @see        https://github.com/mollie/PrestaShop
+ * @codingStandardsIgnoreStart
+ */
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+class MolPaymentMethodLang extends ObjectModel
+{
+    /** @var int */
+    public $id;
+
+    /** @var string 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_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,
+                'validate' => 'isString',
+                'size' => 255,
+            ],
+        ],
+    ];
+}

src/Install/DatabaseTableInstaller.php

@@ -151,6 +151,16 @@ 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,
+                `id_method` VARCHAR(64) NOT NULL,
+                `id_lang` INT(11),
+                `id_shop` INT(11),
+                `text` TINYTEXT,
+                INDEX (`id_method`)
+            ) ENGINE=' . _MYSQL_ENGINE_ . ' DEFAULT CHARSET=utf8;';
+
         return $sql;
     }
 

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,20 +83,25 @@ 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;
         $this->creditCardLogoProvider = $creditCardLogoProvider;
         $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',

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,21 +81,25 @@ class BasePaymentOptionProvider implements PaymentOptionProviderInterface
     private $languageService;
     /** @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;
         $this->creditCardLogoProvider = $creditCardLogoProvider;
         $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',

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,8 @@ class CreditCardPaymentOptionProvider implements PaymentOptionProviderInterface
     private $customerRepository;
     /** @var ConfigurationAdapter */
     private $configurationAdapter;
+    /** @var PaymentMethodLangService $multiLangService */
+    private $multiLangService;
 
     public function __construct(
         LegacyContext $context,
@@ -109,7 +112,8 @@ public function __construct(
         Customer $customer,
         MolCustomerRepository $customerRepository,
         Mollie $module,
-        ConfigurationAdapter $configurationAdapter
+        ConfigurationAdapter $configurationAdapter,
+        PaymentMethodLangService $multiLangService
     ) {
         $this->context = $context;
         $this->creditCardLogoProvider = $creditCardLogoProvider;
@@ -120,6 +124,7 @@ public function __construct(
         $this->customerRepository = $customerRepository;
         $this->module = $module;
         $this->configurationAdapter = $configurationAdapter;
+        $this->multiLangService = $multiLangService;
     }
 
     /**
@@ -128,10 +133,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',

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',

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',

src/Repository/MultiLangRepository.php

@@ -0,0 +1,50 @@
+<?php
+/**
+ * Mollie       https://www.mollie.nl
+ *
+ * @author      Mollie B.V. <[email protected]>
+ * @copyright   Mollie B.V.
+ * @license     https://github.com/mollie/PrestaShop/blob/master/LICENSE.md
+ *
+ * @see        https://github.com/mollie/PrestaShop
+ * @codingStandardsIgnoreStart
+ */
+
+namespace Mollie\Repository;
+
+use Mollie\Shared\Infrastructure\Repository\AbstractRepository;
+
+if (!defined('_PS_VERSION_')) {
+    exit;
+}
+
+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();
+        $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) ?? [];
+    }
+}