Merge pull request #132 from Hlavtox/last-polish

Last improvements

Author: Hlavtox

classes/Form/ConfigurationForm.php

@@ -227,7 +227,6 @@ public function treat()
         // Check if multistore is active
         $is_multistore_active = Shop::isFeatureActive();
 
-        $treatmentResult = '';
         $gaAccountId = Tools::getValue('GA_ACCOUNT_ID');
         $gaV4Enabled = Tools::getValue('GA_V4_ENABLED');
         $gaUserIdEnabled = Tools::getValue('GA_USERID_ENABLED');
@@ -239,41 +238,34 @@ public function treat()
         if (!empty($gaAccountId)) {
             Configuration::updateValue('GA_ACCOUNT_ID', $gaAccountId);
             Configuration::updateValue('GANALYTICS_CONFIGURATION_OK', true);
-            $treatmentResult .= $this->module->displayConfirmation($this->module->trans('Account ID updated successfully', [], 'Modules.GAnalytics.Admin'));
         }
 
         if (null !== $gaV4Enabled) {
             Configuration::updateValue('GA_V4_ENABLED', (bool) $gaV4Enabled);
-            $treatmentResult .= $this->module->displayConfirmation($this->module->trans('Settings for Google Analytics 4 updated successfully'));
         }
 
         if (null !== $gaUserIdEnabled) {
             Configuration::updateValue('GA_USERID_ENABLED', (bool) $gaUserIdEnabled);
-            $treatmentResult .= $this->module->displayConfirmation($this->module->trans('Settings for User ID updated successfully', [], 'Modules.GAnalytics.Admin'));
         }
 
         if ($is_multistore_active) {
             Configuration::updateValue('GA_CROSSDOMAIN_ENABLED', (bool) $gaCrossdomainEnabled);
-            $treatmentResult .= $this->module->displayConfirmation($this->module->trans('Settings for Cross-Domain updated successfully', [], 'Modules.GAnalytics.Admin'));
         }
 
         if (null !== $gaAnonymizeEnabled) {
             Configuration::updateValue('GA_ANONYMIZE_ENABLED', (bool) $gaAnonymizeEnabled);
-            $treatmentResult .= $this->module->displayConfirmation($this->module->trans('Settings for Anonymize IP updated successfully', [], 'Modules.GAnalytics.Admin'));
         }
 
         if (null !== $gaTrackBackOffice) {
             Configuration::updateValue('GA_TRACK_BACKOFFICE_ENABLED', (bool) $gaTrackBackOffice);
-            $treatmentResult .= $this->module->displayConfirmation($this->module->trans('Settings for Enable Back Office tracking updated successfully.', [], 'Modules.GAnalytics.Admin'));
         }
 
         if ($gaCancelledStates === false) {
             Configuration::updateValue('GA_CANCELLED_STATES', '');
         } else {
             Configuration::updateValue('GA_CANCELLED_STATES', json_encode($gaCancelledStates));
         }
-        $treatmentResult .= $this->module->displayConfirmation($this->module->trans('Settings for canceled order states updated successfully.', [], 'Modules.GAnalytics.Admin'));
 
-        return $treatmentResult;
+        return $this->module->displayConfirmation($this->module->trans('Settings updated successfully.', [], 'Modules.GAnalytics.Admin'));
     }
 }

classes/GoogleAnalyticsTools.php

@@ -20,6 +20,8 @@
 
 namespace PrestaShop\Module\Ps_Googleanalytics;
 
+use Configuration;
+
 class GoogleAnalyticsTools
 {
     /**
@@ -163,6 +165,13 @@ public function addProductClick($products, $currencyIsoCode)
                     ],
                 ];
 
+                // Add send_to parameter to avoid sending extra events
+                // to other gtag configs (Ads for example).
+                $eventData = array_merge(
+                    ['send_to' => Configuration::get('GA_ACCOUNT_ID')],
+                    $eventData
+                );
+
                 $productId = explode('-', $product['id']);
                 $js .= '$(\'article[data-id-product="' . $productId[0] . '"] a.quick-view\').on(
                 "click",
@@ -282,6 +291,13 @@ public function jsonEncodeWithBlacklist($data, $ignoredKeys = [])
      */
     public function renderEvent($eventName, $eventData, $ignoredKeys = [])
     {
+        // Automatically add send_to parameter to all events to avoid sending extra events
+        // to other gtag configs (Ads for example).
+        $eventData = array_merge(
+            ['send_to' => Configuration::get('GA_ACCOUNT_ID')],
+            $eventData
+        );
+
         return sprintf(
             'gtag("event", "%1$s", %2$s);',
             $eventName,

ps_googleanalytics.php

@@ -74,15 +74,16 @@ public function __construct()
     public function getContent()
     {
         $configurationForm = new PrestaShop\Module\Ps_Googleanalytics\Form\ConfigurationForm($this);
-        $formOutput = '';
+        $output = '';
 
         if (Tools::isSubmit('submit' . $this->name)) {
-            $formOutput = $configurationForm->treat();
+            $output .= $configurationForm->treat();
         }
 
-        $formOutput .= $configurationForm->generate();
+        $output .= $this->display(__FILE__, './views/templates/admin/configuration.tpl');
+        $output .= $configurationForm->generate();
 
-        return $this->display(__FILE__, './views/templates/admin/configuration.tpl') . $formOutput;
+        return $output;
     }
 
     public function hookDisplayHeader($params, $back_office = false)

views/css/ganalytics.css

@@ -16,11 +16,6 @@
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
  * International Registered Trademark & Property of PrestaShop SA
  */
-#content .panel {
-	margin: 0 auto;
-	max-width: 1300px;
-}
-
 .google-analytics-advantages-list, .google-analytics-create {
 	margin-bottom: 1rem;
 }