Refactor 10738-Third-Party-Google-Analytics-and-AdWords

Author: ihorvansach

etc/adminhtml/system.xml

@@ -374,7 +374,7 @@ To create a new secret, navigate in the
                 <label>Third-Party Google Analytics and AdWords</label>
                 <field id="enabled" translate="label comment" type="select" sortOrder="10" showInDefault="1" showInWebsite="1" showInStore="1" canRestore="1">
                     <label>Enable</label>
-                    <comment>If enabled Magefan Google Tag Manager Extension will not prevent the execution of default Magento and custom javascripts for Google Analytics, AdWords, and GTM. Please note that this can lead to event duplications and double tracking.</comment>
+                    <comment>If disabled, Magefan Google Tag Manager Extension prevents the execution of default Magento and custom JavaScripts for Google Analytics, AdWords, and GTM. Please note that enabling this option can lead to event duplications and double tracking.</comment>
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
             </group>

etc/di.xml

@@ -22,10 +22,4 @@
             <argument name="container" xsi:type="object">Magefan\GoogleTagManager\Model\WebContainer</argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\App\Config\ScopeConfigInterface">
-        <plugin name="Plugin_Magefan_GoogleTagManager_ScopeConfigInterface" type="Magefan\GoogleTagManager\Plugin\Magento\Framework\App\Config\ScopeConfig" sortOrder="10" disabled="false"/>
-    </type>
-    <type name="Magento\Customer\CustomerData\Customer">
-        <plugin name="Magefan_GoogleTagManager_Plugin_Magento_Customer_CustomerData_Customer" type="Magefan\GoogleTagManager\Plugin\Magento\Customer\CustomerData\Customer" sortOrder="10" disabled="false"/>
-    </type>
 </config>

etc/frontend/di.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" ?>
+<!--
+/**
+ * Copyright © Magefan ([email protected]). All rights reserved.
+ * Please visit Magefan.com for license details (https://magefan.com/end-user-license-agreement).
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\App\Config\ScopeConfigInterface">
+        <plugin name="Plugin_Magefan_GoogleTagManager_ScopeConfigInterface" type="Magefan\GoogleTagManager\Plugin\Magento\Framework\App\Config\ScopeConfig" sortOrder="10" disabled="false"/>
+    </type>
+    <type name="Magento\Customer\CustomerData\Customer">
+        <plugin name="Magefan_GoogleTagManager_Plugin_Magento_Customer_CustomerData_Customer" type="Magefan\GoogleTagManager\Plugin\Magento\Customer\CustomerData\Customer" sortOrder="10" disabled="false"/>
+    </type>
+</config>