Merge pull request #77 from Hlavtox/patch-2

Fix backoffice JS code, fix doubled and tripled pageviews, fix echo in hook, fix default BO tracking - for versions up to 1.7.6

Author: matks

classes/Form/ConfigurationForm.php

@@ -129,9 +129,9 @@ public function generate()
                 ],
                 [
                     'type' => 'switch',
-                    'label' => $this->module->l('Disable Back Office Tracking'),
-                    'name' => 'GA_TRACK_BACKOFFICE_DISABLED',
-                    'hint' => $this->module->l('Use this option to disable the tracking inside the Back Office'),
+                    'label' => $this->module->l('Enable Back Office Tracking'),
+                    'name' => 'GA_TRACK_BACKOFFICE_ENABLED',
+                    'hint' => $this->module->l('Use this option to enable the tracking inside the Back Office'),
                     'values' => [
                         [
                             'id' => 'ga_track_backoffice',
@@ -176,7 +176,7 @@ public function generate()
         $helper->fields_value['GA_USERID_ENABLED'] = Configuration::get('GA_USERID_ENABLED');
         $helper->fields_value['GA_CROSSDOMAIN_ENABLED'] = Configuration::get('GA_CROSSDOMAIN_ENABLED');
         $helper->fields_value['GA_ANONYMIZE_ENABLED'] = Configuration::get('GA_ANONYMIZE_ENABLED');
-        $helper->fields_value['GA_TRACK_BACKOFFICE_DISABLED'] = Configuration::get('GA_TRACK_BACKOFFICE_DISABLED');
+        $helper->fields_value['GA_TRACK_BACKOFFICE_ENABLED'] = Configuration::get('GA_TRACK_BACKOFFICE_ENABLED');
 
         return $helper->generateForm($fields_form);
     }
@@ -193,7 +193,7 @@ public function treat()
         $gaUserIdEnabled = Tools::getValue('GA_USERID_ENABLED');
         $gaCrossdomainEnabled = Tools::getValue('GA_CROSSDOMAIN_ENABLED');
         $gaAnonymizeEnabled = Tools::getValue('GA_ANONYMIZE_ENABLED');
-        $gaTrackBackOffice = Tools::getValue('GA_TRACK_BACKOFFICE_DISABLED');
+        $gaTrackBackOffice = Tools::getValue('GA_TRACK_BACKOFFICE_ENABLED');
 
         if (!empty($gaAccountId)) {
             Configuration::updateValue('GA_ACCOUNT_ID', $gaAccountId);
@@ -217,8 +217,8 @@ public function treat()
         }
 
         if (null !== $gaTrackBackOffice) {
-            Configuration::updateValue('GA_TRACK_BACKOFFICE_DISABLED', (bool) $gaTrackBackOffice);
-            $treatmentResult .= $this->module->displayConfirmation($this->module->l('Settings for Disable Back Office tracking updated successfully'));
+            Configuration::updateValue('GA_TRACK_BACKOFFICE_ENABLED', (bool) $gaTrackBackOffice);
+            $treatmentResult .= $this->module->displayConfirmation($this->module->l('Settings for Enable Back Office tracking updated successfully'));
         }
 
         return $treatmentResult;

classes/Hook/HookDisplayBackOfficeHeader.php

@@ -48,10 +48,6 @@ public function __construct(Ps_Googleanalytics $module, Context $context)
      */
     public function run()
     {
-        if (Configuration::get('GA_TRACK_BACKOFFICE_DISABLED')) {
-            return '';
-        }
-
         $js = '';
         if (strcmp(Tools::getValue('configure'), $this->module->name) === 0) {
             $this->context->controller->addCSS($this->module->getPathUri() . 'views/css/ganalytics.css');

classes/Hook/HookDisplayHeader.php

@@ -54,10 +54,6 @@ public function run()
             return '';
         }
 
-        if (Configuration::get('GA_TRACK_BACKOFFICE_DISABLED') && $this->backOffice) {
-            return '';
-        }
-
         $this->context->controller->addJs($this->module->getPathUri() . 'views/js/GoogleAnalyticActionLib.js');
 
         $shops = Shop::getShops();
@@ -81,6 +77,7 @@ public function run()
         $this->context->smarty->assign(
             [
                 'backOffice' => $this->backOffice,
+                'trackBackOffice' => Configuration::get('GA_TRACK_BACKOFFICE_ENABLED'),
                 'currentShopId' => $currentShopId,
                 'userId' => $userId,
                 'gaAccountId' => Tools::safeOutput(Configuration::get('GA_ACCOUNT_ID')),

ps_googleanalytics.php

@@ -144,11 +144,14 @@ public function hookDisplayAdminOrder()
     {
         $gaTagHandler = new PrestaShop\Module\Ps_Googleanalytics\Handler\GanalyticsJsHandler($this, $this->context);
 
-        echo $gaTagHandler->generate(
+        $output = $gaTagHandler->generate(
             $this->context->cookie->__get('ga_admin_refund'),
             true
         );
         $this->context->cookie->__unset('ga_admin_refund');
+        $this->context->cookie->write();
+
+        return $output;
     }
 
     /**

views/templates/hook/ga_tag.tpl

@@ -28,11 +28,3 @@
     </script>
     {/literal}
 {/if}
-
-{if ($jsState != 1 && $isBackoffice === true)}
-    {literal}
-    <script type="text/javascript">
-        ga('send', 'pageview');
-    </script>
-    {/literal}
-{/if}

views/templates/hook/ps_googleanalytics.tpl

@@ -44,7 +44,7 @@
     {if $gaAnonymizeEnabled}
         ga('set', 'anonymizeIp', true);
     {/if}
-    {if $backOffice}
+    {if $backOffice && !$trackBackOffice}
         ga('set', 'nonInteraction', true);
     {else}
         ga('send', 'pageview');