Labels change

Author: ihorvansach

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

@@ -23,7 +23,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 made and saved all the configurations,
+            <strong>Attention!</strong> Once you change and save the 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

@@ -168,6 +168,7 @@ public function isCookieRestrictionModeEnabled(string $storeId = null)
         return (bool)$this->getConfig(Custom::XML_PATH_WEB_COOKIE_RESTRICTION, $storeId);
     }
 
+    /*
      * Retrieve Magento product categories
      *
      * @param string|null $storeId

etc/adminhtml/system.xml

@@ -33,8 +33,8 @@
                     <label>Public ID</label>
                     <comment><![CDATA[
                         E.g. <strong>GTM-XXXXXXX</strong><br/>
-                        Please note that we do not allow pasting the GTM JavaScript code directly for security reasons. Public ID is used to automatically insert the GTM code to your pages:
-                        <pre>
+                        Please note that we do not allow pasting the GTM JavaScript code directly for security reasons. Public ID is used to automatically insert the code to your pages:
+                        <pre style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;">
 &lt;!-- Google Tag Manager --&gt;
 &lt;script&gt;(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({&#39;gtm.start&#39;:
 new Date().getTime(),event:&#39;gtm.js&#39;});var f=d.getElementsByTagName(s)[0],
@@ -43,7 +43,7 @@ j=d.createElement(s),dl=l!=&#39;dataLayer&#39;?&#39;&amp;l=&#39;+l:&#39;&#39;;j.
 })(window,document,&#39;script&#39;,&#39;dataLayer&#39;,&#39;<strong>GTM-XXXXXXX</strong>&#39;);&lt;/script&gt;
 &lt;!-- End Google Tag Manager --&gt;
 </pre>
-<pre>
+<pre style="border: 1px dashed #5f5f5f;padding: 5px;background: #f4f4f4;">
 &lt;!-- Google Tag Manager (noscript) --&gt;
 &lt;noscript&gt;&lt;iframe src=&quot;https://www.googletagmanager.com/ns.html?id=<strong>GTM-XXXXXXX</strong>&quot;
 height=&quot;0&quot; width=&quot;0&quot; style=&quot;display:none;visibility:hidden&quot;&gt;&lt;/iframe&gt;&lt;/noscript&gt;
@@ -106,20 +106,20 @@ height=&quot;0&quot; width=&quot;0&quot; style=&quot;display:none;visibility:hid
                     <comment><![CDATA[<strong class="colorRed">Warning!</strong> Enabling this option may cause the performance impact.]]></comment>
                 </field>
             </group>
-            <group id="container" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
-                <label>Export Container</label>
-                <field id="export" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
-                    <frontend_model>Magefan\GoogleTagManager\Block\Adminhtml\System\Config\Form\Button</frontend_model>
-                </field>
-            </group>
-            <group id="customer_data" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+            <group id="customer_data" translate="label" type="text" sortOrder="70" showInDefault="1" showInWebsite="1" showInStore="1">
                 <label>GDPR/CCPA/LGPD (Customer Data Protection Regulation)</label>
                 <field id="protect" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Protect Customer Data</label>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                     <frontend_model>Magefan\GoogleTagManager\Block\Adminhtml\System\Config\Form\ProtectCustomerData</frontend_model>
                 </field>
             </group>
+            <group id="container" translate="label" type="text" sortOrder="80" showInDefault="1" showInWebsite="1" showInStore="1">
+                <label>Export Container</label>
+                <field id="export" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1">
+                    <frontend_model>Magefan\GoogleTagManager\Block\Adminhtml\System\Config\Form\Button</frontend_model>
+                </field>
+            </group>
         </section>
     </system>
 </config>

etc/config.xml

@@ -26,7 +26,7 @@
                 <categories/>
             </attributes>
             <customer_data>
-                <protect>1</protect>
+                <protect>0</protect>
             </customer_data>
         </mfgoogletagmanager>
     </default>