Merge branch 'release/3.1.0'

prestarocket-agence · May 27, 2021 · 8644dcc · 8644dcc
2 parents 6465728 + 6777c00
commit 8644dcc
Show file tree

Hide file tree

Showing 25 changed files with 2,005 additions and 2,180 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ With the same server (gzip, PrestaShop performance settings properly adjusted)
 - JS: 155 Ko (with Classic theme) to 86 Ko
 
 You can also see the web quality and performance comparison report on [Dareboost](https://www.dareboost.com/en/comparison/d_5b51dc70e967906045fd3683/d_5b51dc70e967906045fd3684)
-### Twitter Bootstrap 4.3.x
+### Twitter Bootstrap 4.4.x
 
 - Almost all tpl files are edited to use new BS classes (ex: col-xs-12 => col-12)
 - For retrocompatibility and third modules, we keep some important old classes in bs_alpha.scss      

diff --git a/_dev/css/partials/_commons.scss b/_dev/css/partials/_commons.scss
@@ -86,6 +86,12 @@ h1,.h1{
     box-shadow: none;
     text-align: center;
     font-weight: 700;
+
+    &::-webkit-outer-spin-button,
+    &::-webkit-inner-spin-button {
+      -webkit-appearance: none;
+      margin: 0; 
+    }
   }
   .btn {
     position: relative;

diff --git a/_dev/js/cart.js b/_dev/js/cart.js
@@ -160,7 +160,8 @@ $(document).ready(() => {
 
       // Refresh cart preview
       prestashop.emit('updateCart', {
-        reason: dataset
+        reason: dataset,
+        resp: resp
       });
     }).fail((resp) => {
       prestashop.emit('handleError', {
@@ -205,7 +206,8 @@ $(document).ready(() => {
 
       // Refresh cart preview
       prestashop.emit('updateCart', {
-        reason: dataset
+        reason: dataset,
+        resp: resp
       });
     }).fail((resp) => {
       prestashop.emit('handleError', {eventType: 'updateProductQuantityInCart', resp: resp})

diff --git a/_dev/js/components/form.js b/_dev/js/components/form.js
@@ -79,6 +79,8 @@ export default class Form {
                            divToScroll = _parent;
                        }
                   });
+                  $(this).data('disabled', false);
+                  $('button[type="submit"]', form).removeClass('disabled');
               }
               form.classList.add('was-validated');
               if(divToScroll){

diff --git a/_dev/js/theme.js b/_dev/js/theme.js
@@ -62,7 +62,6 @@ for (var i in EventEmitter.prototype) {
 }
 
 $(document).ready(() => {
-  const test = 270479;
   const form = new Form();
   let slickSlider = new SlickSlider();
   let topMenuEl = $('#_desktop_top_menu #top-menu');

diff --git a/_dev/package-lock.json b/_dev/package-lock.json
diff --git a/_dev/package.json b/_dev/package.json
@@ -13,21 +13,21 @@
   "author": "Prestarocket",
   "license": "AFL-3.0",
   "devDependencies": {
-    "@babel/core": "^7.8.7",
-    "@babel/preset-env": "^7.8.7",
-    "autoprefixer": "^9.7.4",
-    "babel-loader": "^8.0.6",
-    "css-loader": "^3.4.2",
+    "@babel/core": "^7.10.4",
+    "@babel/preset-env": "^7.10.4",
+    "autoprefixer": "^9.8.5",
+    "babel-loader": "^8.1.0",
+    "css-loader": "^3.6.0",
     "file-loader": "^5.1.0",
-    "jquery": "^3.4.1",
+    "jquery": "^3.5.1",
     "mini-css-extract-plugin": "^0.9.0",
-    "node-sass": "^4.13.1",
+    "node-sass": "^4.14.1",
     "optimize-css-assets-webpack-plugin": "^5.0.3",
     "postcss-loader": "^3.0.0",
     "sass-loader": "^8.0.2",
-    "terser-webpack-plugin": "^2.3.5",
-    "webpack": "^4.42.0",
-    "webpack-cli": "^3.3.11"
+    "terser-webpack-plugin": "^2.3.7",
+    "webpack": "^4.43.0",
+    "webpack-cli": "^3.3.12"
   },
   "dependencies": {
     "bootstrap": "^4.4.1",

diff --git a/_dev/webpack.config.js b/_dev/webpack.config.js
@@ -100,7 +100,7 @@ module.exports = (env, argv) => {
                     }
                 },
                 {
-                    test: /\.(png|jp(e)g|gif|svg|webp)$/,
+                    test: /\.(png|jpe?g|gif|svg|webp)$/,
                     use: [
                         {
                             loader: 'file-loader',
@@ -158,7 +158,14 @@ module.exports = (env, argv) => {
                         }
                     }
                 }),
-                new OptimizeCSSAssetsPlugin({})
+                new OptimizeCSSAssetsPlugin({
+                    cssProcessorOptions: {
+                        map: {
+                            annotation: true,
+                            inline: IS_DEV
+                        }
+                    }
+               }),
             ]
         },
         plugins: [

diff --git a/assets/css/theme.css b/assets/css/theme.css
diff --git a/assets/js/theme.js b/assets/js/theme.js
diff --git a/config/theme.yml b/config/theme.yml
@@ -1,14 +1,14 @@
 name: classic-rocket
 display_name: Classic Rocket
-version: 3.0.4
+version: 3.1.0
 author:
   name: "Prestarocket"
   email: "contact@prestarocket.com"
   url: "http://www.prestarocket.com"
 
 meta:
   compatibility:
-      from: 1.7.6.5
+      from: 1.7.7.x
       to: ~
 
   available_layouts:

diff --git a/dependencies/modules/ps_searchbarjqauto/Readme.md b/dependencies/modules/ps_searchbarjqauto/Readme.md
@@ -0,0 +1,37 @@
+# Search bar autocomplete
+
+## About
+
+Adds a quick search field to your website with autosuggestions using [https://github.com/Pixabay/jQuery-autoComplete](https://github.com/Pixabay/jQuery-autoComplete)
+Contributed by [Prestarocket](//www.prestarocket.com/blog/) (Twitter: [@prestarocket](https://twitter.com/prestarocket))
+
+## Contributing
+
+PrestaShop modules are open-source extensions to the PrestaShop e-commerce solution. Everyone is welcome and even encouraged to contribute with their own improvements.
+
+### Requirements
+
+Contributors **must** follow the following rules:
+
+* **Make your Pull Request on the "dev" branch**, NOT the "master" branch.
+* Do not update the module's version number.
+* Follow [the coding standards][1].
+
+### Process in details
+
+Contributors wishing to edit a module's files should follow the following process:
+
+1. Create your GitHub account, if you do not have one already.
+2. Fork the ps_searchbar project to your GitHub account.
+3. Clone your fork to your local machine in the ```/modules``` directory of your PrestaShop installation.
+4. Create a branch in your local clone of the module for your changes.
+5. Change the files in your branch. Be sure to follow [the coding standards][1]!
+6. Push your changed branch to your fork in your GitHub account.
+7. Create a pull request for your changes **on the _'dev'_ branch** of the module's project. Be sure to follow [the commit message norm][2] in your pull request. If you need help to make a pull request, read the [Github help page about creating pull requests][3].
+8. Wait for one of the core developers either to include your change in the codebase, or to comment on possible improvements you should make to your code.
+
+That's it: you have contributed to this open-source project! Congratulations!
+
+[1]: http://doc.prestashop.com/display/PS16/Coding+Standards
+[2]: http://doc.prestashop.com/display/PS16/How+to+write+a+commit+message
+[3]: https://help.github.com/articles/using-pull-requests
diff --git a/dependencies/modules/ps_searchbarjqauto/views/js/ps_searchbarjqauto.js b/dependencies/modules/ps_searchbarjqauto/views/js/ps_searchbarjqauto.js
@@ -23,7 +23,8 @@ $(document).ready(function () {
                 '</div>';
         },
         onSelect: function (e, term, item) {
+            e.preventDefault();
             window.location.href = item.data('url');
         }
     });
-});
+});
diff --git a/dependencies/modules/ps_searchbarjqauto/views/templates/hook/ps_searchbarjqauto.tpl b/dependencies/modules/ps_searchbarjqauto/views/templates/hook/ps_searchbarjqauto.tpl
@@ -26,13 +26,11 @@
 <div class="search-widget" data-search-widget data-search-controller-url="{$search_controller_url}">
 	<form method="get" action="{$search_controller_url}">
 		<input type="hidden" name="controller" value="search">
-		<div class="input-group">
-			<input class="form-control" type="search" name="s" value="{$search_string}" placeholder="{l s='Search our catalog' d='Shop.Theme.Catalog'}" aria-label="{l s='Search' d='Shop.Theme.Catalog'}">
-			<button type="submit" class="btn btn-link">
-				<i class="material-icons search">&#xE8B6;</i>
-				<span class="d-none">{l s='Search' d='Shop.Theme.Catalog'}</span>
-			</button>
-		</div>
+		<input type="text" name="s" value="{$search_string}" placeholder="{l s='Search our catalog' d='Shop.Theme.Catalog'}" aria-label="{l s='Search' d='Shop.Theme.Catalog'}">
+		<button type="submit">
+			<i class="material-icons search">&#xE8B6;</i>
+			<span class="hidden-xl-down">{l s='Search' d='Shop.Theme.Catalog'}</span>
+		</button>
 	</form>
 </div>
 <!-- /Block search module TOP -->
diff --git a/dependencies/modules/ps_searchbarjqauto/views/templates/index.php b/dependencies/modules/ps_searchbarjqauto/views/templates/index.php
@@ -0,0 +1,35 @@
+<?php
+/*
+* 2007-2015 PrestaShop
+*
+* NOTICE OF LICENSE
+*
+* This source file is subject to the Academic Free License (AFL 3.0)
+* that is bundled with this package in the file LICENSE.txt.
+* It is also available through the world-wide-web at this URL:
+* http://opensource.org/licenses/afl-3.0.php
+* 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 license@prestashop.com 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 <contact@prestashop.com>
+*  @copyright  2007-2015 PrestaShop SA
+*  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
+*  International Registered Trademark & Property of PrestaShop SA
+*/
+
+header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
+
+header("Cache-Control: no-store, no-cache, must-revalidate");
+header("Cache-Control: post-check=0, pre-check=0", false);
+header("Pragma: no-cache");
+
+header("Location: ../");
+exit;
diff --git a/modules/productcomments/views/js/list-comments.js b/modules/productcomments/views/js/list-comments.js
@@ -51,9 +51,30 @@ jQuery(document).ready(function () {
     reportCommentPostErrorModal.modal('show');
   }
 
+  // Productcomments 4.2.1 and newer return json. older return html string
+  // which is parsed, helper method for checking if the response is json and
+  // should not be parsed
+  function isJson(str) {
+    if (typeof str !== 'string') return false;
+    try {
+        const result = JSON.parse(str);
+        const type = Object.prototype.toString.call(result);
+        return type === '[object Object]'
+            || type === '[object Array]';
+    } catch (err) {
+        return false;
+    }
+  }
+
+
   function paginateComments(page) {
     $.get(commentsListUrl, {page: page}, function(result) {
-      const jsonResponse = JSON.parse(result);
+      let jsonResponse;
+      if(isJson(result)) {
+        jsonResponse = JSON.parse(result);
+      } else {
+        jsonResponse = result;
+      }
       if (jsonResponse.comments && jsonResponse.comments.length > 0) {
         populateComments(jsonResponse.comments);
         if (jsonResponse.comments_nb > jsonResponse.comments_per_page) {
@@ -130,10 +151,11 @@ jQuery(document).ready(function () {
 
   function updateCommentUsefulness($comment, commentId, usefulness) {
     $.post(updateCommentUsefulnessUrl, {id_product_comment: commentId, usefulness: usefulness}, function(jsonResponse){
-      var jsonData = false;
-      try {
-        jsonData = JSON.parse(jsonResponse);
-      } catch (e) {
+      let jsonData;
+      if(isJson(jsonResponse)) {
+         jsonData = JSON.parse(jsonResponse);
+      } else {
+         jsonData = jsonResponse;
       }
       if (jsonData) {
         if (jsonData.success) {
@@ -158,10 +180,11 @@ jQuery(document).ready(function () {
         return;
       }
       $.post(reportCommentUrl, {id_product_comment: commentId}, function(jsonResponse){
-        var jsonData = false;
-        try {
+        let jsonData;
+        if(isJson(jsonResponse)) {
           jsonData = JSON.parse(jsonResponse);
-        } catch (e) {
+        } else {
+          jsonData = jsonResponse;
         }
         if (jsonData) {
           if (jsonData.success) {

diff --git a/modules/productcomments/views/js/post-comment.js b/modules/productcomments/views/js/post-comment.js
@@ -78,17 +78,33 @@ jQuery(document).ready(function () {
     $('#post-product-comment-form').submit(submitCommentForm);
   }
 
+  // Productcomments 4.2.1 and newer return json. older return html string
+  // which is parsed, helper method for checking if the response is json and
+  // should not be parsed
+  function isJson(str) {
+    if (typeof str !== 'string') return false;
+    try {
+        const result = JSON.parse(str);
+        const type = Object.prototype.toString.call(result);
+        return type === '[object Object]'
+            || type === '[object Array]';
+    } catch (err) {
+        return false;
+    }
+  }
+
   function submitCommentForm(event) {
     event.preventDefault();
     var formData = $(this).serializeArray();
     if (!validateFormData(formData)) {
       return;
     }
     $.post($(this).attr('action'), $(this).serialize(), function(jsonResponse) {
-      var jsonData = false;
-      try {
+      let jsonData;
+      if (isJson(jsonResponse)) {
         jsonData = JSON.parse(jsonResponse);
-      } catch (e) {
+      } else {
+        jsonData = jsonResponse;
       }
       if (jsonData) {
         if (jsonData.success) {

diff --git a/modules/productcomments/views/templates/hook/product-comment-item-prototype.tpl b/modules/productcomments/views/templates/hook/product-comment-item-prototype.tpl
@@ -36,7 +36,7 @@
   </div>
 
   <div class="col-sm-9 comment-content">
-    <p class="h4 comment__title">@COMMENT_TITLE@</ph4>
+    <p class="h4 comment__title">@COMMENT_TITLE@</p>
     <p>@COMMENT_COMMENT@</p>
     <div class="comment-buttons btn-group btn-group-sm">
       {if $usefulness_enabled}

diff --git a/modules/productcomments/views/templates/hook/product-comments-list.tpl b/modules/productcomments/views/templates/hook/product-comments-list.tpl
@@ -24,8 +24,8 @@
  *}
 
 <script type="text/javascript">
-  var productCommentUpdatePostErrorMessage = '{l s='Sorry, your review appreciation cannot be sent.' d='Modules.Productcomments.Shop' js=1}';
-  var productCommentAbuseReportErrorMessage = '{l s='Sorry, your abuse report cannot be sent.' d='Modules.Productcomments.Shop' js=1}';
+  var productCommentUpdatePostErrorMessage = '{l|escape:'javascript' s='Sorry, your review appreciation cannot be sent.' d='Modules.Productcomments.Shop'}';
+  var productCommentAbuseReportErrorMessage = '{l|escape:'javascript' s='Sorry, your abuse report cannot be sent.' d='Modules.Productcomments.Shop'}';
 </script>
 <div class="product-comments">
 <div class="comments__header" id="product-comments-list-header">

diff --git a/templates/_partials/head.tpl b/templates/_partials/head.tpl
@@ -44,7 +44,9 @@
     <meta name="robots" content="none">
   {/if}
 
-  {if $page.canonical}
+  {if $page.page_name == 'product'}
+    <link rel="canonical" href="{$product.canonical_url}">
+  {elseif $page.canonical}
     <link rel="canonical" href="{$page.canonical}">
   {/if}
   {block name='head_hreflang'}

diff --git a/templates/_partials/microdata-jsonld.tpl b/templates/_partials/microdata-jsonld.tpl
@@ -125,7 +125,7 @@
     {/if}
     {if $product_manufacturer->name OR $shop.name}"brand": {
         "@type": "Thing",
-        "name": "{if $product_manufacturer->name}{$product_manufacturer->name|escape:'html':'UTF-8'}{else}$shop.name{/if}"
+        "name": "{if $product_manufacturer->name}{$product_manufacturer->name|escape:'html':'UTF-8'}{else}{$shop.name}{/if}"
     },{/if}
     {if isset($nbComments) && $nbComments && $ratings.avg}"aggregateRating": {
         "@type": "AggregateRating",