Code refactor

Author: ihorvansach

Block/Adminhtml/System/Config/Form/Attention.php

@@ -4,6 +4,8 @@
  * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
  */
 
+declare(strict_types=1);
+
 namespace Magefan\GoogleTagManager\Block\Adminhtml\System\Config\Form;
 
 use Magento\Framework\Data\Form\Element\AbstractElement;
@@ -23,7 +25,7 @@ class Attention extends \Magefan\Community\Block\Adminhtml\System\Config\Form\In
     public function render(\Magento\Framework\Data\Form\Element\AbstractElement $element)
     {
         return '<div style="padding:10px;background-color:#ffe5e5;border:1px solid #ddd;margin-bottom:7px;">
-            <strong>Attention!</strong> Once you change and save the settings,
+            <strong>Attention!</strong> Once you change and save the "Web Container" or "Google Analytics 4" settings,
             please don\'t forget to scroll down to the "Export Container" section
             and click the "Generate JSON Container & Download File" button to export container data.
             After you save the file, <a target="_blank" title="Create GTM tags" href="https://magefan.com/blog/add-google-tag-manager-to-magento-2#5-create-gtm-tags">

Model/Config.php

@@ -197,23 +197,23 @@ public function getCategoriesAttribute(string $storeId = null): string
     }
 
     /**
-     * Retrieve store config value
-     *
-     * @param string $path
      * @param string|null $storeId
-     * @return mixed
+     * @return int
      */
-    public function getConfig(string $path, string $storeId = null)
+    public function getGTMLoaderType(string $storeId = null): string
     {
-        return $this->scopeConfig->getValue($path, ScopeInterface::SCOPE_STORE, $storeId);
+        return (string)$this->getConfig(self::XML_PATH_GTM_LOADER_TYPE, $storeId);
     }
 
     /**
+     * Retrieve store config value
+     *
+     * @param string $path
      * @param string|null $storeId
-     * @return int
+     * @return mixed
      */
-    public function getGTMLoaderType(string $storeId = null): string
+    public function getConfig(string $path, string $storeId = null)
     {
-        return (string)$this->getConfig(self::XML_PATH_GTM_LOADER_TYPE, $storeId);
+        return $this->scopeConfig->getValue($path, ScopeInterface::SCOPE_STORE, $storeId);
     }
 }

Model/LoaderPool.php

@@ -20,7 +20,7 @@ class LoaderPool
     /**
      * LoaderPool constructor.
      * @param array $loaders
-//     */
+     */
     public function __construct(array $loaders)
     {
         $this->loaders = $loaders;

Setup/Patch/Schema/ChangePath.php

@@ -46,8 +46,11 @@ public function apply()
         ];
 
         foreach ($changedConfigurationFields as $oldPath => $newPath) {
-            $sql = 'UPDATE ' . $table . ' SET `path` = "' . $newPath . '" WHERE `path` = "' . $oldPath . '";';
-            $this->schemaSetup->run($sql);
+            $connection->update(
+                $table,
+                ['path' => $newPath],
+                ['path = ?' => $oldPath]
+            );
         }
 
         $this->schemaSetup->endSetup();

composer.json

@@ -9,9 +9,9 @@
             "email": "[email protected]"
         }
     ],
-    "version": "2.1.0",
+    "version": "2.2.0",
     "require": {
-        "magefan/module-community" : ">=2.1.13"
+        "magefan/module-community" : ">=2.1.16"
     },
     "autoload": {
         "files": [

etc/adminhtml/system.xml

@@ -30,10 +30,10 @@
                     <frontend_model>Magefan\Community\Block\Adminhtml\System\Config\Form\ProductKeyField</frontend_model>
                 </field>
             </group>
-            <group id="web_container" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
+            <group id="web_container" translate="label" type="text" sortOrder="20" showInDefault="1" showInWebsite="1" showInStore="1" >
                 <label>Web Container</label>
                 <attribute type="expanded">1</attribute>
-                <field id="enable" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                <field id="enable" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Enable</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>

etc/config.xml

@@ -10,17 +10,18 @@
         <mfgoogletagmanager>
             <general>
                 <enabled>0</enabled>
+                <loader_type/>
                 <mfmodule>GoogleTagManager</mfmodule>
                 <mftype>1</mftype>
             </general>
             <web_container>
-                <enable>0</enable>
+                <enable>1</enable>
                 <account_id/>
                 <container_id/>
                 <public_id/>
             </web_container>
             <analytics>
-                <enable>0</enable>
+                <enable>1</enable>
                 <measurement_id/>
             </analytics>
             <attributes>