cs fixer and stan fix

mollie · Dec 10, 2024 · 4e4ac07 · 4e4ac07
1 parent cdc8abb
commit 4e4ac07
Show file tree

Hide file tree

Showing 12 changed files with 43 additions and 22 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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,25 +237,37 @@ private function getMethodsObjForConfig($apiMethods)
 
                 $result = $this->paymentMethodLangRepository->findAllBy([
                     'id_method' => $apiMethod['id'],
-                    'id_shop' => $this->context->getShopId()
+                    'id_shop' => $this->context->getShopId(),
                 ]);
 
                 $mappedMethodTitles = [];
                 foreach ($result->getResults() as $value) {
                     $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;
             }
 
             $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
@@ -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
@@ -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
@@ -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'}
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,6 @@ @@
      * @see        https://github.com/mollie/PrestaShop
      * @codingStandardsIgnoreStart
      */
     if (!defined('_PS_VERSION_')) {
         exit;
     }
@@ Expand Down @@