Merge pull request #126 from leemyongpakvn/analytics-Multistore_confirmation_condition

kpodemski · web-flow · commit d22f38db2129 · 2022-11-30T11:39:39.000+01:00
Display Cross-Domain confirmation only when Multistore Active
diff --git a/classes/Form/ConfigurationForm.php b/classes/Form/ConfigurationForm.php
@@ -204,6 +204,9 @@ public function generate()
      */
     public function treat()
     {
+        // Check if multistore is active
+        $is_multistore_active = Shop::isFeatureActive();
+
         $treatmentResult = '';
         $gaAccountId = Tools::getValue('GA_ACCOUNT_ID');
         $gaUserIdEnabled = Tools::getValue('GA_USERID_ENABLED');
@@ -223,9 +226,9 @@ public function treat()
             $treatmentResult .= $this->module->displayConfirmation($this->module->getTranslator()->trans('Settings for User ID updated successfully', [], 'Modules.GAnalytics.Admin'));
         }
 
-        if (null !== $gaCrossdomainEnabled) {
+        if ($is_multistore_active) {
             Configuration::updateValue('GA_CROSSDOMAIN_ENABLED', (bool) $gaCrossdomainEnabled);
-            $treatmentResult .= $this->module->displayConfirmation($this->module->getTranslator()->trans('Settings for User ID updated successfully', [], 'Modules.GAnalytics.Admin'));
+            $treatmentResult .= $this->module->displayConfirmation($this->module->getTranslator()->trans('Settings for Cross-Domain updated successfully', [], 'Modules.GAnalytics.Admin'));
         }
 
         if (null !== $gaAnonymizeEnabled) {

Original file line number	Diff line number	Diff line change
`@@ -204,6 +204,9 @@ public function generate()`
`204`	`204`	`*/`
`205`	`205`	`public function treat()`
`206`	`206`	`{`
	`207`	`+ // Check if multistore is active`
	`208`	`+ $is_multistore_active = Shop::isFeatureActive();`
	`209`	`+`
`207`	`210`	`$treatmentResult = '';`
`208`	`211`	`$gaAccountId = Tools::getValue('GA_ACCOUNT_ID');`
`209`	`212`	`$gaUserIdEnabled = Tools::getValue('GA_USERID_ENABLED');`
`@@ -223,9 +226,9 @@ public function treat()`
`223`	`226`	`$treatmentResult .= $this->module->displayConfirmation($this->module->getTranslator()->trans('Settings for User ID updated successfully', [], 'Modules.GAnalytics.Admin'));`
`224`	`227`	`}`
`225`	`228`
`226`		`- if (null !== $gaCrossdomainEnabled) {`
	`229`	`+ if ($is_multistore_active) {`
`227`	`230`	`Configuration::updateValue('GA_CROSSDOMAIN_ENABLED', (bool) $gaCrossdomainEnabled);`
`228`		`- $treatmentResult .= $this->module->displayConfirmation($this->module->getTranslator()->trans('Settings for User ID updated successfully', [], 'Modules.GAnalytics.Admin'));`
	`231`	`+ $treatmentResult .= $this->module->displayConfirmation($this->module->getTranslator()->trans('Settings for Cross-Domain updated successfully', [], 'Modules.GAnalytics.Admin'));`
`229`	`232`	`}`
`230`	`233`
`231`	`234`	`if (null !== $gaAnonymizeEnabled) {`