Merge pull request #17 from PrestaShop/dev

Release 2.0.1

.github/PULL_REQUEST_TEMPLATE.md

@@ -0,0 +1,19 @@
+<!-----------------------------------------------------------------------------
+Thank you for contributing to the PrestaShop project! 
+
+Please take the time to edit the "Answers" rows below with the necessary information.
+
+Check out our contribution guidelines to find out how to complete it:
+https://devdocs.prestashop.com/1.7/contribute/contribution-guidelines/#pull-requests
+------------------------------------------------------------------------------>
+
+| Questions     | Answers
+| ------------- | -------------------------------------------------------
+| Description?  | Please be specific when describing the PR. <br> Every detail helps: versions, browser/server configuration, specific module/theme, etc. Feel free to add more information below this table.
+| Type?         | bug fix / improvement / new feature / refacto / critical
+| BC breaks?    | yes / no
+| Deprecations? | yes / no
+| Fixed ticket? | Fixes PrestaShop/Prestashop#{issue number here}.
+| How to test?  | Please indicate how to best verify that this PR is correct.
+
+<!-- Click the form's "Preview" button to make sure the table is functional in GitHub. Thank you! -->

.github/dependabot.yml

@@ -0,0 +1,16 @@
+version: 2
+updates:
+- package-ecosystem: npm
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
+  target-branch: dev
+- package-ecosystem: composer
+  directory: "/"
+  schedule:
+    interval: daily
+    time: "04:00"
+  open-pull-requests-limit: 10
+  target-branch: dev

.github/release-drafter.yml

@@ -0,0 +1,14 @@
+branches:
+  - master
+name-template: v$NEXT_PATCH_VERSION
+tag-template: v$NEXT_PATCH_VERSION
+categories:
+  - title: 🚀 Improvements
+    label: enhancement
+  - title: 🐛 Bug Fixes
+    label: bug
+change-template: '- #$NUMBER: $TITLE by @$AUTHOR'
+template: |
+  # Changes
+
+  $CHANGES

CONTRIBUTORS.md

@@ -0,0 +1,16 @@
+GitHub contributors:
+--------------------------------
+ - AntoineMille
+ - Caleydon
+ - Francois Gaillard
+ - Gregory Roussac
+ - Jerome Nadaud
+ - Jérôme Nadaud
+ - Maxime Biloé
+ - Quetzacoalt91
+ - aleeks
+ - antoin-m
+ - eternoendless
+ - gaillafr
+ - maximebiloe
+ - xBorderie

Readme.md

@@ -2,7 +2,7 @@
 
 ## About
 
-Adds a tab to the Stats dashboard, showing the pages requested by your visitors that have not been found.
+Enrich your stats, display the pages requested by your visitors that could not be found.
 
 ## Reporting issues
 

config.xml

@@ -2,7 +2,7 @@
 <module>
 	<name>pagesnotfound</name>
 	<displayName><![CDATA[Pages not found]]></displayName>
-	<version><![CDATA[2.0.0]]></version>
+	<version><![CDATA[2.0.1]]></version>
 	<description><![CDATA[Displays the pages requested by your visitors that have not been found.]]></description>
 	<author><![CDATA[PrestaShop]]></author>
 	<tab><![CDATA[analytics_stats]]></tab>

pagesnotfound.php

@@ -35,26 +35,25 @@ public function __construct()
 	{
 		$this->name = 'pagesnotfound';
 		$this->tab = 'analytics_stats';
-		$this->version = '2.0.0';
+		$this->version = '2.0.1';
 		$this->author = 'PrestaShop';
 		$this->need_instance = 0;
 
 		parent::__construct();
 
 		$this->displayName = $this->trans('Pages not found', array(), 'Modules.Pagesnotfound.Admin');
-		$this->description = $this->trans('Adds a tab to the Stats dashboard, showing the pages requested by your visitors that have not been found.', array(), 'Modules.Pagesnotfound.Admin');
+		$this->description = $this->trans('Enrich your stats, display the pages requested by your visitors that could not be found.', array(), 'Modules.Pagesnotfound.Admin');
 		$this->ps_versions_compliancy = array('min' => '1.7.1.0', 'max' => _PS_VERSION_);
 	}
 
 	public function install()
 	{
-		if (defined(_PS_VERSION_) && version_compare(_PS_VERSION_, '1.5.0.1', '>=')) {
-			$hookName = 'displayTop';
-		} else {
-			$hookName = 'top';
-		}
-		if (!parent::install() || !$this->registerHook($hookName) || !$this->registerHook('AdminStatsModules'))
+		if (!parent::install()
+            || !$this->registerHook('displayTop')
+            || !$this->registerHook('AdminStatsModules')
+        ) {
 			return false;
+        }
 
 		return Db::getInstance()->execute(
 			'CREATE TABLE `'._DB_PREFIX_.'pagenotfound` (
@@ -178,7 +177,7 @@ public function hookAdminStatsModules()
 		return $this->html;
 	}
 
-	public function hookTop($params)
+	public function hookDisplayTop($params)
 	{
 		if (strstr($_SERVER['REQUEST_URI'], '404.php') && isset($_SERVER['REDIRECT_URL']))
 			$_SERVER['REQUEST_URI'] = $_SERVER['REDIRECT_URL'];

upgrade/upgrade-2.0.1.php

@@ -0,0 +1,32 @@
+<?php
+/**
+ * Copyright since 2007 PrestaShop SA and Contributors
+ * PrestaShop is an International Registered Trademark & Property of PrestaShop SA
+ *
+ * NOTICE OF LICENSE
+ *
+ * This source file is subject to the Academic Free License 3.0 (AFL-3.0)
+ * that is bundled with this package in the file LICENSE.md.
+ * It is also available through the world-wide-web at this URL:
+ * https://opensource.org/licenses/AFL-3.0
+ * If you did not receive a copy of the license and are unable to
+ * obtain it through the world-wide-web, please send an email
+ * to [email protected] so we can send you a copy immediately.
+ *
+ * @author    PrestaShop SA <[email protected]>
+ * @copyright Since 2007 PrestaShop SA and Contributors
+ * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
+ */
+
+/**
+ * @param Module $module
+ *
+ * @return bool
+ */
+function upgrade_module_2_0_1($module)
+{
+    $module->unregisterHook('top');
+    $module->registerHook('displayTop');
+
+    return true;
+}