After-Review-10738-Third-Party-Google-Analytics-and-AdWords

Author: ivanhrytsaim

Model/Config.php

@@ -59,7 +59,7 @@ class Config
      * Speed optimization config
      */
     public const XML_PATH_SPEED_OPTIMIZATION_ENABLED = 'mfgoogletagmanager/page_speed_optimization/enabled';
-    public const XML_PATH_GOOGLE_ANALYTICS_AND_ADWORDS = 'mfgoogletagmanager/google_analytics_and_adwords/enabled';
+    public const XML_PATH_THIRD_PARTY_GA = 'mfgoogletagmanager/third_party_ga/enabled';
 
     /**
      * @var ScopeConfigInterface
@@ -306,8 +306,8 @@ public function isSpeedOptimizationEnabled(string $storeId = null): bool
      * @param string|null $storeId
      * @return bool
      */
-    public function isGoogleAnalyticsAndAdWordsEnabled(string $storeId = null): bool
+    public function isThirdPartyGaEnabled(string $storeId = null): bool
     {
-        return (bool)$this->getConfig(self::XML_PATH_GOOGLE_ANALYTICS_AND_ADWORDS, $storeId);
+        return (bool)$this->getConfig(self::XML_PATH_THIRD_PARTY_GA, $storeId);
     }
 }

Plugin/Magento/Framework/App/Config/ScopeConfig.php

@@ -48,8 +48,8 @@ public function afterGetValue(
         $scopeCode = null
     )
     {
-        if (in_array($path,self::PATHS)) {
-            if ($this->config->isEnabled() && !$this->config->isGoogleAnalyticsAndAdWordsEnabled()) {
+        if (in_array($path, self::PATHS)) {
+            if ($this->config->isEnabled() && !$this->config->isThirdPartyGaEnabled()) {
                 $result = '0';
             }
         }

etc/adminhtml/system.xml

@@ -370,7 +370,7 @@ To create a new secret, navigate in the
                     <source_model>Magento\Config\Model\Config\Source\Yesno</source_model>
                 </field>
             </group>
-            <group id="google_analytics_and_adwords" translate="label" type="text" sortOrder="65" showInDefault="1" showInWebsite="1" showInStore="1">
+            <group id="third_party_ga" translate="label" type="text" sortOrder="65" showInDefault="1" showInWebsite="1" showInStore="1">
                 <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>

etc/config.xml

@@ -71,9 +71,9 @@
             <page_speed_optimization>
                 <enabled>0</enabled>
             </page_speed_optimization>
-            <google_analytics_and_adwords>
+            <third_party_ga>
                 <enabled>0</enabled>
-            </google_analytics_and_adwords>
+            </third_party_ga>
             <customer_data>
                 <protect>0</protect>
                 <load_before_consent>0</load_before_consent>