Merge pull request #116 from Progi1984/issue28004

Moved some code from footer to head tag

Author: Progi1984

classes/Database/Install.php

@@ -101,7 +101,6 @@ public function registerHooks()
         return $this->module->registerHook('displayHeader') &&
             $this->module->registerHook('displayAdminOrder') &&
             $this->module->registerHook('displayFooter') &&
-            $this->module->registerHook('displayHome') &&
             $this->module->registerHook('displayFooterProduct') &&
             $this->module->registerHook('displayOrderConfirmation') &&
             $this->module->registerHook('actionProductCancel') &&

classes/Hook/HookDisplayHeader.php

@@ -20,16 +20,31 @@
 
 namespace PrestaShop\Module\Ps_Googleanalytics\Hooks;
 
+use Category;
 use Configuration;
 use Context;
+use Customer;
+use PrestaShop\Module\Ps_Googleanalytics\GoogleAnalyticsTools;
+use PrestaShop\Module\Ps_Googleanalytics\Handler\GanalyticsJsHandler;
+use PrestaShop\Module\Ps_Googleanalytics\Handler\ModuleHandler;
+use PrestaShop\Module\Ps_Googleanalytics\Wrapper\ProductWrapper;
 use Ps_Googleanalytics;
 use Shop;
 use Tools;
 
 class HookDisplayHeader implements HookInterface
 {
+    /**
+     * @var Ps_Googleanalytics
+     */
     private $module;
+    /**
+     * @var Context
+     */
     private $context;
+    /**
+     * @var mixed
+     */
     private $params;
 
     /**
@@ -44,9 +59,7 @@ public function __construct(Ps_Googleanalytics $module, Context $context)
     }
 
     /**
-     * run
-     *
-     * @return void|string
+     * @return false|string
      */
     public function run()
     {
@@ -62,8 +75,9 @@ public function run()
         $userId = null;
         $gaCrossdomainEnabled = false;
 
-        if (Configuration::get('GA_USERID_ENABLED') &&
-            $this->context->customer && $this->context->customer->isLogged()
+        if (Configuration::get('GA_USERID_ENABLED')
+            && $this->context->customer instanceof Customer
+            && $this->context->customer->isLogged()
         ) {
             $userId = (int) $this->context->customer->id;
         }
@@ -91,6 +105,38 @@ public function run()
         return $this->module->display(
             $this->module->getLocalPath() . $this->module->name,
             'ps_googleanalytics.tpl'
+        ) . $this->displayGaTag();
+    }
+
+    private function displayGaTag()
+    {
+        $moduleHandler = new ModuleHandler();
+        $gaTools = new GoogleAnalyticsTools();
+        $gaTagHandler = new GanalyticsJsHandler($this->module, $this->context);
+        $gaScripts = '';
+
+        // Home featured products
+        if ($moduleHandler->isModuleEnabledAndHookedOn('ps_featuredproducts', 'displayHome')
+            && $this->context->customer instanceof Customer) {
+            $category = new Category($this->context->shop->getCategory(), $this->context->language->id);
+            $productWrapper = new ProductWrapper($this->context);
+            $homeFeaturedProducts = $productWrapper->wrapProductList(
+                $category->getProducts(
+                    (int) $this->context->language->id,
+                    1,
+                    (Configuration::get('HOME_FEATURED_NBR') ? (int) Configuration::get('HOME_FEATURED_NBR') : 8),
+                    'position'
+                ),
+                [],
+                true
+            );
+            $gaScripts .= $gaTools->addProductImpression($homeFeaturedProducts) . $gaTools->addProductClick($homeFeaturedProducts);
+        }
+
+        $this->module->js_state = 1;
+
+        return $gaTagHandler->generate(
+            $gaTools->filter($gaScripts, $this->module->filterable)
         );
     }
 
@@ -101,7 +147,7 @@ public function run()
      */
     public function setParams($params)
     {
-        $this->module->params = $params;
+        $this->params = $params;
     }
 
     /**

classes/Hook/HookDisplayHome.php

@@ -116,17 +116,6 @@ public function hookDisplayFooter()
         return $hook->run();
     }
 
-    /**
-     * Homepage hook.
-     * This function is run to manage analytics for product list associated to home featured, news products and best sellers Modules
-     */
-    public function hookDisplayHome()
-    {
-        $hook = new PrestaShop\Module\Ps_Googleanalytics\Hooks\HookDisplayHome($this, $this->context);
-
-        return $hook->run();
-    }
-
     /**
      * Product page footer hook
      * This function is run to load JS for product details view

ps_googleanalytics.php

@@ -4,3 +4,4 @@ includes:
 parameters:
 	ignoreErrors:
 		- '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'
+		- '#Parameter \#1 \$idCategory of class Category constructor expects null, int given.#'

tests/phpstan/phpstan-1.7.1.2.neon

@@ -4,3 +4,4 @@ includes:
 parameters:
 	ignoreErrors:
 		- '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'
+		- '#Parameter \#1 \$idCategory of class Category constructor expects null, int given.#'

tests/phpstan/phpstan-1.7.2.5.neon

@@ -4,3 +4,4 @@ includes:
 parameters:
 	ignoreErrors:
 		- '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'
+		- '#Parameter \#1 \$idCategory of class Category constructor expects null, int given.#'

tests/phpstan/phpstan-1.7.3.4.neon

@@ -4,3 +4,4 @@ includes:
 parameters:
 	ignoreErrors:
 		- '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'
+		- '#Parameter \#1 \$idCategory of class Category constructor expects null, int given.#'

tests/phpstan/phpstan-1.7.4.4.neon

@@ -4,3 +4,4 @@ includes:
 parameters:
 	ignoreErrors:
 		- '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'
+		- '#Parameter \#1 \$idCategory of class Category constructor expects null, int given.#'

tests/phpstan/phpstan-1.7.5.1.neon

@@ -4,3 +4,4 @@ includes:
 parameters:
 	ignoreErrors:
 		- '#PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler::uninstallModule\(\) calls parent::uninstall\(\) but PrestaShop\\Module\\Ps_Googleanalytics\\Handler\\ModuleHandler does not extend any class.#'
+		- '#Parameter \#1 \$idCategory of class Category constructor expects null, int given.#'