Merge pull request #184 from PrestaShop/dev

thank you @sLorenzini && @NeOMakinG

_dev/front/js/components/Button/Button.vue

@@ -173,8 +173,8 @@
 
           // eslint-disable-next-line
           const itemsFiltered = productsAlreadyTagged.filter(
-            (e) => e.id_product === this.productId.toString()
-              && e.quantity === quantity.value
+            (e) => parseInt(e.id_product, 10) === this.productId
+              && e.quantity.toString() === quantity.value
               && parseInt(e.id_product_attribute, 10) === this.productAttributeId,
           );
 

blockwishlist.php

@@ -72,7 +72,7 @@ public function __construct()
     {
         $this->name = 'blockwishlist';
         $this->tab = 'front_office_features';
-        $this->version = '2.1.1';
+        $this->version = '2.1.2';
         $this->author = 'PrestaShop';
         $this->need_instance = 0;
 

config.xml

@@ -2,7 +2,7 @@
 <module>
     <name>blockwishlist</name>
     <displayName><![CDATA[Wishlist block]]></displayName>
-    <version><![CDATA[2.1.1]]></version>
+    <version><![CDATA[2.1.2]]></version>
     <description><![CDATA[Adds a block containing the customer&#039;s wishlists.]]></description>
     <author><![CDATA[PrestaShop]]></author>
     <tab><![CDATA[front_office_features]]></tab>

controllers/front/action.php

@@ -125,6 +125,18 @@ private function addProductToWishListAction($params)
     private function createNewWishListAction($params)
     {
         if (isset($params['name'])) {
+            if (!Validate::isGenericName($params['name'])) {
+                return $this->ajaxRender(
+                    json_encode([
+                        'success' => false,
+                        'message' => $this->trans('The list name is invalid.', [], 'Modules.Blockwishlist.Shop'),
+                        'datas' => [
+                            'name' => $params['name'],
+                        ],
+                    ])
+                );
+            }
+
             $wishlist = new WishList();
             $wishlist->name = $params['name'];
             $wishlist->id_shop_group = $this->context->shop->id_shop_group;
@@ -164,6 +176,19 @@ private function createNewWishListAction($params)
     private function renameWishListAction($params)
     {
         if (isset($params['idWishList'], $params['name'])) {
+            if (!Validate::isGenericName($params['name'])) {
+                return $this->ajaxRender(
+                    json_encode([
+                        'success' => false,
+                        'message' => $this->trans('The list name is invalid', [], 'Modules.Blockwishlist.Shop'),
+                        'datas' => [
+                            'name' => $params['name'],
+                            'id_whishlist' => $params['idWishList'],
+                        ],
+                    ])
+                );
+            }
+
             $wishlist = new WishList($params['idWishList']);
             // Exit if not owner of the wishlist
             $this->assertWriteAccess($wishlist);

controllers/front/view.php

@@ -85,7 +85,7 @@ public function init()
                 [],
                 'Modules.Blockwishlist.Shop'
             );
-            $this->setTemplate('errors/forbidden');
+            $this->template = 'module:blockwishlist/views/templates/errors/forbidden.tpl';
 
             return;
         }

views/templates/errors/forbidden.tpl

@@ -0,0 +1,29 @@
+{**
+ * 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.
+ *
+ * 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 https://devdocs.prestashop.com/ for more information.
+ *
+ * @author    PrestaShop SA and Contributors <[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)
+ *}
+{extends file='errors/forbidden.tpl'}
+
+{block name='content'}
+
+{/block}