Merge pull request #117 from PrestaShop/dev

Release version 2.0.1

_dev/front/js/components/Delete/Delete.vue

@@ -42,6 +42,11 @@
         required: true,
         default: 'Delete',
       },
+      titleList: {
+        type: String,
+        required: true,
+        default: 'Delete',
+      },
       placeholder: {
         type: String,
         required: true,
@@ -57,16 +62,33 @@
         required: true,
         default: 'Delete',
       },
+      deleteTextList: {
+        type: String,
+        required: true,
+        default: 'Delete',
+      },
     },
     data() {
       return {
         value: '',
         isHidden: true,
         listId: null,
+        listName: '',
         productId: null,
         productAttributeId: null,
       };
     },
+    computed: {
+      confirmMessage() {
+        return this.placeholder.replace('%nameofthewishlist%', this.listName);
+      },
+      modalTitle() {
+        return this.productId ? this.title : this.titleList;
+      },
+      modalDeleteText() {
+        return this.productId ? this.deleteText : this.deleteTextList;
+      },
+    },
     methods: {
       /**
        * Toggle the modal
@@ -120,6 +142,7 @@
       EventBus.$on('showDeleteWishlist', (event) => {
         this.value = '';
         this.listId = event.detail.listId;
+        this.listName = event.detail.listName;
         this.productId = null;
         this.productAttributeId = null;
 

_dev/front/js/components/Delete/index.js

@@ -32,6 +32,10 @@ const props = [
     name: 'title',
     type: String,
   },
+  {
+    name: 'titleList',
+    type: String,
+  },
   {
     name: 'placeholder',
     type: String,
@@ -44,6 +48,10 @@ const props = [
     name: 'deleteText',
     type: String,
   },
+  {
+    name: 'deleteTextList',
+    type: String,
+  },
 ];
 
 initApp(Delete, '.wishlist-delete', props);

_dev/front/js/components/Product/Product.vue

@@ -32,6 +32,15 @@
             'wishlist-product-unavailable': !product.add_to_cart_url
           }"
         >
+        <img
+          v-else-if="product.cover"
+          :src="product.cover.large.url"
+          :alt="product.cover.legend"
+          :title="product.cover.legend"
+          :class="{
+            'wishlist-product-unavailable': !product.add_to_cart_url
+          }"
+        >
         <img
           v-else
           :src="prestashop.urls.no_picture_image.bySize.home_default.url"
@@ -175,6 +184,11 @@
         required: true,
         default: null,
       },
+      listName: {
+        type: String,
+        required: true,
+        default: '',
+      },
       isShare: {
         type: Boolean,
         required: false,
@@ -227,6 +241,7 @@
         EventBus.$emit('showDeleteWishlist', {
           detail: {
             listId: this.listId,
+            listName: this.listName,
             productId: this.product.id,
             productAttributeId: this.product.id_product_attribute,
           },

_dev/front/js/container/ProductsListContainer/ProductsListContainer.vue

@@ -79,6 +79,7 @@
             :add-to-cart="addToCart"
             :customize-text="customizeText"
             :quantity-text="quantityText"
+            :list-name="title"
             :list-id="
               listId ? listId : parseInt(currentWishlist.id_wishlist, 10)
             "

blockwishlist.php

@@ -69,7 +69,7 @@ public function __construct()
     {
         $this->name = 'blockwishlist';
         $this->tab = 'front_office_features';
-        $this->version = '2.0.0';
+        $this->version = '2.0.1';
         $this->author = 'PrestaShop';
         $this->need_instance = 0;
 
@@ -151,15 +151,15 @@ public function hookActionFrontControllerSetMedia(array $params)
             'modules/' . $this->name . '/public/wishlist.css',
             [
               'media' => 'all',
-              'priority' => 200,
+              'priority' => 100,
             ]
         );
 
         $this->context->controller->registerJavascript(
             'blockwishlistController',
             'modules/' . $this->name . '/public/product.bundle.js',
             [
-              'priority' => 200,
+              'priority' => 100,
             ]
         );
     }

config.xml

@@ -2,7 +2,7 @@
 <module>
     <name>blockwishlist</name>
     <displayName><![CDATA[Wishlist block]]></displayName>
-    <version><![CDATA[2.0.0]]></version>
+    <version><![CDATA[2.0.1]]></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

@@ -75,7 +75,7 @@ private function addProductToWishListAction($params)
             return $this->ajaxRender(
                 json_encode([
                     'success' => false,
-                    'message' => $this->trans('There was an error adding the product attributes', [], 'Modules.Blockwishlist.Shop'),
+                    'message' => $this->trans('There was an error while adding the product attributes', [], 'Modules.Blockwishlist.Shop'),
                 ])
             );
         }