Merge pull request #205 from PrestaShop/dev

Release 3.6.0
PrestaShop · Sep 8, 2020 · 0f75dba · 0f75dba
2 parents 6f7b97e + a578fd7
commit 0f75dba
Show file tree

Hide file tree

Showing 116 changed files with 5,038 additions and 4,700 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.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! -->
diff --git a/.github/dependabot.yml b/.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
diff --git a/.prettyci.composer.json b/.prettyci.composer.json
diff --git a/.travis.yml b/.travis.yml
@@ -7,9 +7,9 @@ notifications:
 jobs:
   include:
     - stage: "JS"
-      node_js: 8
-    - node_js: 9
-    - node_js: 10
+      node_js: 10
+    - node_js: 11
+    - node_js: 12
     - stage: "PHP"
       name: "PHPStan on PS nightly and unit tests"
       language: php

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
@@ -0,0 +1,67 @@
+GitHub contributors:
+--------------------------------
+ - 123monsite-regis
+ - Alex Even
+ - Alex Sampaio
+ - André
+ - Bastien Bieri
+ - Clotaire 202 ecommerce
+ - Damien Metzger
+ - David Gonzalez
+ - Edvinas Gurevicius
+ - Francois Gaillard
+ - François-Marie de Jouvencel
+ - GoT
+ - Gregory Roussac
+ - Gytis Škėma
+ - Hashem
+ - Hendrik Luup
+ - Jerome Nadaud
+ - Jonathan Lelievre
+ - Julien Bourdeau
+ - Julius Zukauskas
+ - Jérôme Nadaud
+ - Krystian Podemski
+ - MathiasReker
+ - Mathieu Ferment
+ - Matthieu Rolland
+ - Maxime Biloé
+ - Michel ANTOINE
+ - Mickaël Andrieu
+ - Nico
+ - Pablo Borowicz
+ - Pavel Novitsky
+ - PeNov
+ - Pierre RAMBAUD
+ - PrestaSafe
+ - Progi1984
+ - Quetzacoalt91
+ - Robert Keresnyei
+ - Rokas Zygmantas
+ - Rémi Gaillard
+ - Sacha Froment
+ - Samir Shah
+ - Stomp9
+ - Thibaud Chauviere
+ - Thierry Marianne
+ - Thomas
+ - Thomas Nabord
+ - Veebipoed.ee
+ - Xavier
+ - Zebx
+ - alex4102
+ - djfm
+ - fojt-cz
+ - gRoussac
+ - indesign47
+ - iqit-commerce
+ - iqit-commerce (Marcin Sz)
+ - joce
+ - jocelyn fournier
+ - jolelievre
+ - kermes
+ - marionf
+ - matks
+ - matrix
+ - raph
+ - sadlyblue
diff --git a/README.md b/README.md
@@ -1,5 +1,11 @@
 # Faceted search module
 
+[![Build Status](https://travis-ci.com/PrestaShop/ps_facetedsearch.svg?branch=master)](https://travis-ci.com/PrestaShop/ps_facetedsearch)
+[![Latest Stable Version](https://poser.pugx.org/PrestaShop/ps_facetedsearch/v)](//packagist.org/packages/PrestaShop/ps_facetedsearch)
+[![Total Downloads](https://poser.pugx.org/PrestaShop/ps_facetedsearch/downloads)](//packagist.org/packages/PrestaShop/ps_facetedsearch)
+[![GitHub license](https://img.shields.io/github/license/PrestaShop/ps_facetedsearch)](https://github.com/PrestaShop/ps_facetedsearch/LICENSE.md)
+
+
 ## About
 
 Displays a block with layered navigation filters.
@@ -21,7 +27,7 @@ Required only for development:
 
 ## Installation
 
-Install all dependencies.
+Install all dependencies. Be careful, you need NodeJs 10+.
 ```
 npm install
 composer install

diff --git a/_dev/back/blocklayered.scss b/_dev/back/blocklayered.scss
@@ -1,26 +1,20 @@
 /**
- * 2007-2019 PrestaShop.
+ * 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.txt.
+ * 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.
  *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to http://www.prestashop.com for more information.
- *
  * @author    PrestaShop SA <[email protected]>
- * @copyright 2007-2019 PrestaShop SA
+ * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
- * International Registered Trademark & Property of PrestaShop SA
  */
 .bootstrap {
   .filter_list .filter_list_item {

diff --git a/_dev/back/index.js b/_dev/back/index.js
@@ -1,26 +1,20 @@
 /**
- * 2007-2019 PrestaShop.
+ * 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.txt.
+ * 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.
  *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to http://www.prestashop.com for more information.
- *
  * @author    PrestaShop SA <[email protected]>
- * @copyright 2007-2019 PrestaShop SA
+ * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
- * International Registered Trademark & Property of PrestaShop SA
  */
 import './blocklayered.scss';
 
@@ -119,6 +113,7 @@ $(document).ready(() => {
     return false;
   });
 
+  let totalCount = 0;
   $('.ajaxcall-recurcive').each((it, elm) => {
     $(elm).click(function onAjaxRecursiveCall(e) {
       e.preventDefault();
@@ -159,15 +154,22 @@ $(document).ready(() => {
           this.running = false;
           if (res.result) {
             this.cursor = 0;
+            totalCount = 0;
             $('#indexing-warning').hide();
             $(this).html(this.legend);
             $('#ajax-message-ok span').html(translations.price_indexation_finished);
             $('#ajax-message-ok').show();
             return;
           }
 
+          totalCount += parseInt(res.count, 10);
           this.cursor = parseInt(res.cursor, 10);
-          $(this).html(this.legend + translations.price_indexation_in_progress.replace('%s', res.count));
+          $(this).html(
+            this.legend + translations.price_indexation_in_progress.replace(
+              '%s',
+              `${totalCount}/${res.total}`,
+            ),
+          );
           $(this).click();
         },
         error(res) {

diff --git a/_dev/cldr/exception/localization.js b/_dev/cldr/exception/localization.js
@@ -1,26 +1,20 @@
 /**
- * 2007-2019 PrestaShop.
+ * 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.txt.
+ * 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.
  *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to http://www.prestashop.com for more information.
- *
  * @author    PrestaShop SA <[email protected]>
- * @copyright 2007-2019 PrestaShop SA
+ * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
- * International Registered Trademark & Property of PrestaShop SA
  */
 class LocalizationException {
   constructor(message) {

diff --git a/_dev/cldr/index.js b/_dev/cldr/index.js
@@ -1,26 +1,20 @@
 /**
- * 2007-2019 PrestaShop.
+ * 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.txt.
+ * 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.
  *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to http://www.prestashop.com for more information.
- *
  * @author    PrestaShop SA <[email protected]>
- * @copyright 2007-2019 PrestaShop SA
+ * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
- * International Registered Trademark & Property of PrestaShop SA
  */
 import NumberFormatter from './number-formatter';
 import NumberSymbol from './number-symbol';

diff --git a/_dev/cldr/number-formatter.js b/_dev/cldr/number-formatter.js
@@ -1,26 +1,20 @@
 /**
- * 2007-2019 PrestaShop.
+ * 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.txt.
+ * 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.
  *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to http://www.prestashop.com for more information.
- *
  * @author    PrestaShop SA <[email protected]>
- * @copyright 2007-2019 PrestaShop SA
+ * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
- * International Registered Trademark & Property of PrestaShop SA
  */
 /**
  * These placeholders are used in CLDR number formatting templates.

diff --git a/_dev/cldr/number-symbol.js b/_dev/cldr/number-symbol.js
@@ -1,26 +1,20 @@
 /**
- * 2007-2019 PrestaShop.
+ * 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.txt.
+ * 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.
  *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to http://www.prestashop.com for more information.
- *
  * @author    PrestaShop SA <[email protected]>
- * @copyright 2007-2019 PrestaShop SA
+ * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
- * International Registered Trademark & Property of PrestaShop SA
  */
 import LocalizationException from './exception/localization';
 

diff --git a/_dev/cldr/specifications/number.js b/_dev/cldr/specifications/number.js
@@ -1,26 +1,20 @@
 /**
- * 2007-2019 PrestaShop.
+ * 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.txt.
+ * 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.
  *
- * DISCLAIMER
- *
- * Do not edit or add to this file if you wish to upgrade PrestaShop to newer
- * versions in the future. If you wish to customize PrestaShop for your
- * needs please refer to http://www.prestashop.com for more information.
- *
  * @author    PrestaShop SA <[email protected]>
- * @copyright 2007-2019 PrestaShop SA
+ * @copyright Since 2007 PrestaShop SA and Contributors
  * @license   https://opensource.org/licenses/AFL-3.0 Academic Free License 3.0 (AFL-3.0)
- * International Registered Trademark & Property of PrestaShop SA
  */
 import LocalizationException from '../exception/localization';
 import NumberSymbol from '../number-symbol';