PIPRES-306: Configuration updateValue multishop context fix (#808)

* PIPRES-306: Configuration updateValue multishop context fix * tests fix * stan fix
mollie · Sep 12, 2023 · e5bba27 · e5bba27
1 parent 1171d24
commit e5bba27
Show file tree

Hide file tree

Showing 11 changed files with 121 additions and 128 deletions.
diff --git a/mollie.php b/mollie.php
@@ -176,7 +176,13 @@ public function install()
 
         $subscriptionInstaller = new Installer(
             new DatabaseTableInstaller(),
-            new AttributeInstaller(new NullLogger(), new ConfigurationAdapter(), $this, new LanguageAdapter(), new ProductAttributeAdapter()),
+            new AttributeInstaller(
+                new NullLogger(),
+                $this->getService(ConfigurationAdapter::class),
+                $this,
+                new LanguageAdapter(),
+                new ProductAttributeAdapter()
+            ),
             new HookInstaller($this)
         );
 

diff --git a/src/Adapter/ConfigurationAdapter.php b/src/Adapter/ConfigurationAdapter.php
@@ -12,59 +12,51 @@
 
 namespace Mollie\Adapter;
 
-use Context;
 use Mollie\Config\Config;
-use Shop;
 
 class ConfigurationAdapter
 {
-    public function get($key, $idShop = null, $idLang = null, $idShopGroup = null)
+    /** @var Context */
+    private $context;
+
+    public function __construct(Context $context)
     {
-        if (is_array($key)) {
-            if ((int) $this->get(Config::MOLLIE_ENVIRONMENT)) {
-                $key = $key['production'];
-            } else {
-                $key = $key['sandbox'];
-            }
-        }
+        $this->context = $context;
+    }
+
+    /**
+     * @param string|array{production: string, sandbox: string} $key
+     */
+    public function get($key, $idShop = null, $idLang = null, $idShopGroup = null): ?string
+    {
+        $key = $this->parseKeyByEnvironment($key);
 
         if (!$idShop) {
-            $idShop = Context::getContext()->shop->id;
+            $idShop = $this->context->getShopId();
         }
 
         if (!$idShopGroup) {
-            $idShopGroup = Context::getContext()->shop->id_shop_group;
+            $idShopGroup = $this->context->getShopGroupId();
         }
 
-        return \Configuration::get($key, $idLang, $idShopGroup, $idShop);
+        $result = \Configuration::get($key, $idLang, $idShopGroup, $idShop);
+
+        return !empty($result) ? $result : null;
     }
 
     /**
      * @param string|array{production: string, sandbox: string} $key
-     * @param mixed $value
-     * @param ?int $idShop
-     * @param bool $html
-     * @param ?int $idShopGroup
-     *
-     * @return void
      */
-    public function updateValue($key, $value, $idShop = null, $html = false, $idShopGroup = null)
+    public function updateValue($key, $value, $idShop = null, $html = false, $idShopGroup = null): void
     {
-        if (is_array($key)) {
-            if ((int) $this->get(Config::MOLLIE_ENVIRONMENT)) {
-                $key = $key['production'];
-            } else {
-                $key = $key['sandbox'];
-            }
-        }
+        $key = $this->parseKeyByEnvironment($key);
 
-        if ($idShop === null) {
-            $shops = Shop::getShops(true);
-            foreach ($shops as $shop) {
-                \Configuration::updateValue($key, $value, $html, $shop['id_shop_group'], $shop['id_shop']);
-            }
+        if (!$idShop) {
+            $idShop = $this->context->getShopId();
+        }
 
-            return;
+        if (!$idShopGroup) {
+            $idShopGroup = $this->context->getShopGroupId();
         }
 
         \Configuration::updateValue($key, $value, $html, $idShopGroup, $idShop);
@@ -73,7 +65,15 @@ public function updateValue($key, $value, $idShop = null, $html = false, $idShop
     /**
      * @param string|array{production: string, sandbox: string} $key
      */
-    public function delete($key)
+    public function delete($key): void
+    {
+        \Configuration::deleteByName($this->parseKeyByEnvironment($key));
+    }
+
+    /**
+     * @param string|array{production: string, sandbox: string} $key
+     */
+    private function parseKeyByEnvironment($key): string
     {
         if (is_array($key)) {
             if ((int) $this->get(Config::MOLLIE_ENVIRONMENT)) {
@@ -83,6 +83,6 @@ public function delete($key)
             }
         }
 
-        \Configuration::deleteByName($key);
+        return $key;
     }
 }
diff --git a/src/Adapter/Context.php b/src/Adapter/Context.php
@@ -125,4 +125,9 @@ public function getCountryId(): int
     {
         return (int) PrestashopContext::getContext()->country->id;
     }
+
+    public function getShopGroupId(): int
+    {
+        return (int) PrestashopContext::getContext()->shop->id_shop_group;
+    }
 }
diff --git a/src/Adapter/ToolsAdapter.php b/src/Adapter/ToolsAdapter.php
@@ -16,11 +16,6 @@
 
 class ToolsAdapter
 {
-    public function strtoupper($str): string
-    {
-        return Tools::strtoupper($str);
-    }
-
     public function strlen($str): string
     {
         return Tools::strlen($str);
@@ -39,6 +34,13 @@ public function displayPrice($price, $currency): string
 
     public function getValue(string $key, string $defaultValue = null)
     {
-        return Tools::getValue($key, $defaultValue);
+        $result = Tools::getValue($key, $defaultValue);
+
+        return !empty($result) ? $result : null;
+    }
+
+    public function isSubmit(string $string): bool
+    {
+        return (bool) Tools::isSubmit($string);
     }
 }
diff --git a/src/Service/CartLinesService.php b/src/Service/CartLinesService.php
@@ -481,7 +481,7 @@ private function convertToLineArray(array $newItems, $currencyIsoCode, $apiRound
             $line->setQuantity((int) $item['quantity']);
             $line->setSku(isset($item['sku']) ? $item['sku'] : '');
 
-            $currency = $this->tools->strtoupper($currencyIsoCode);
+            $currency = strtoupper(strtolower($currencyIsoCode));
 
             if (isset($item['discount'])) {
                 $line->setDiscountAmount(new Amount(