Merge pull request #584 from SharakPL/fix-blockwishlist

Fix missing add to wishlist button and modals backdrop
PrestaShop · Feb 6, 2024 · 5d33762 · 5d33762
2 parents 2262c67 + d602e92
commit 5d33762
Show file tree

Hide file tree

Showing 7 changed files with 48 additions and 101 deletions.
diff --git a/modules/blockwishlist/views/templates/components/modals/add-to-wishlist.tpl b/modules/blockwishlist/views/templates/components/modals/add-to-wishlist.tpl
@@ -9,9 +9,7 @@
 >
   <div
     class="wishlist-modal modal fade"
-    {literal}
-      :class="{show: !isHidden}"
-    {/literal}
+    :class="{ldelim}show: !isHidden{rdelim}"
     tabindex="-1"
     role="dialog"
     aria-modal="true"
@@ -26,8 +24,7 @@
             @click="toggleModal"
             data-dismiss="modal"
             aria-label="{l s='Close' d='Modules.Blockwishlist.Shop'}"
-          >
-          </button>
+          ></button>
         </div>
 
         <div class="modal-body">
@@ -39,8 +36,7 @@
             url="{$url}"
             add-url="{$addUrl}"
             empty-text="{l s='No list found.' d='Modules.Blockwishlist.Shop'}"
-          >
-          </choose-list>
+          ></choose-list>
         </div>
 
         <div class="modal-footer">
@@ -52,11 +48,8 @@
     </div>
   </div>
 
-  <div 
+  <div
     class="modal-backdrop fade"
-    {literal}
-      :class="{in: !isHidden}"
-    {/literal}
-  >
-  </div>
+    :class="{ldelim}show: !isHidden{rdelim}"
+  ></div>
 </div>
diff --git a/modules/blockwishlist/views/templates/components/modals/create.tpl b/modules/blockwishlist/views/templates/components/modals/create.tpl
@@ -15,9 +15,7 @@
 >
   <div
     class="wishlist-modal modal fade"
-    {literal}
-      :class="{show: !isHidden}"
-    {/literal}
+    :class="{ldelim}show: !isHidden{rdelim}"
     tabindex="-1"
     role="dialog"
     aria-modal="true"
@@ -32,8 +30,7 @@
             @click="toggleModal"
             data-dismiss="modal"
             aria-label="Close"
-          >
-          </button>
+          ></button>
         </div>
         <div class="modal-body">
           <div class="form-group form-group-lg">
@@ -53,27 +50,20 @@
             class="modal-cancel btn btn-secondary"
             data-dismiss="modal"
             @click="toggleModal"
-          >
-            ((cancelText))
-          </button>
+          >((cancelText))</button>
 
           <button
             type="button"
             class="btn btn-primary"
             @click="createWishlist"
-          >
-            ((createText))
-          </button>
+          >((createText))</button>
         </div>
       </div>
     </div>
   </div>
 
-  <div 
+  <div
     class="modal-backdrop fade"
-    {literal}
-      :class="{in: !isHidden}"
-    {/literal}
-  >
-  </div>
+    :class="{ldelim}show: !isHidden{rdelim}"
+  ></div>
 </div>
diff --git a/modules/blockwishlist/views/templates/components/modals/delete.tpl b/modules/blockwishlist/views/templates/components/modals/delete.tpl
@@ -20,9 +20,7 @@
 >
   <div
     class="wishlist-modal modal fade"
-    {literal}
-      :class="{show: !isHidden}"
-    {/literal}
+    :class="{ldelim}show: !isHidden{rdelim}"
     tabindex="-1"
     role="dialog"
     aria-modal="true"
@@ -37,39 +35,31 @@
             @click="toggleModal"
             data-dismiss="modal"
             aria-label="Close"
-          >
-          </button>
+          ></button>
         </div>
         <div class="modal-body" v-if="productId">
-          <p class="modal-text">((confirmMessage))</p> 
+          <p class="modal-text">((confirmMessage))</p>
         </div>
         <div class="modal-footer">
           <button
             type="button"
             class="modal-cancel btn btn-secondary"
             data-dismiss="modal"
             @click="toggleModal"
-          >
-            ((cancelText))
-          </button>
+          >((cancelText))</button>
 
           <button
             type="button"
             class="btn btn-primary"
             @click="deleteWishlist"
-          >
-            ((modalDeleteText))
-          </button>
+          >((modalDeleteText))</button>
         </div>
       </div>
     </div>
   </div>
 
-  <div 
+  <div
     class="modal-backdrop fade"
-    {literal}
-      :class="{in: !isHidden}"
-    {/literal}
-  >
-  </div>
+    :class="{ldelim}show: !isHidden{rdelim}"
+  ></div>
 </div>
diff --git a/modules/blockwishlist/views/templates/components/modals/login.tpl b/modules/blockwishlist/views/templates/components/modals/login.tpl
@@ -10,9 +10,7 @@
 >
   <div
     class="wishlist-modal modal fade"
-    {literal}
-      :class="{show: !isHidden}"
-    {/literal}
+    :class="{ldelim}show: !isHidden{rdelim}"
     tabindex="-1"
     role="dialog"
     aria-modal="true"
@@ -27,8 +25,7 @@
             @click="toggleModal"
             data-dismiss="modal"
             aria-label="Close"
-          >
-          </button>
+          ></button>
         </div>
         <div class="modal-body">
           <p class="modal-text">{l s='You need to be logged in to save products in your wishlist.' d='Modules.Blockwishlist.Shop'}</p>
@@ -39,26 +36,19 @@
             class="modal-cancel btn btn-secondary"
             data-dismiss="modal"
             @click="toggleModal"
-          >
-            ((cancelText))
-          </button>
+          >((cancelText))</button>
 
           <a
             class="btn btn-primary"
             :href="prestashop.urls.pages.authentication"
-          >
-            ((loginText))
-          </a>
+          >((loginText))</a>
         </div>
       </div>
     </div>
   </div>
 
   <div
     class="modal-backdrop fade"
-    {literal}
-      :class="{in: !isHidden}"
-    {/literal}
-  >
-  </div>
+    :class="{ldelim}show: !isHidden{rdelim}"
+  ></div>
 </div>
diff --git a/modules/blockwishlist/views/templates/components/modals/rename.tpl b/modules/blockwishlist/views/templates/components/modals/rename.tpl
@@ -14,9 +14,7 @@
 >
   <div
     class="wishlist-modal modal fade"
-    {literal}
-      :class="{show: !isHidden}"
-    {/literal}
+    :class="{ldelim}show: !isHidden{rdelim}"
     tabindex="-1"
     role="dialog"
     aria-modal="true"
@@ -31,8 +29,7 @@
             @click="toggleModal"
             data-dismiss="modal"
             aria-label="Close"
-          >
-          </button>
+          ></button>
         </div>
         <div class="modal-body">
           <div class="form-group form-group-lg">
@@ -51,26 +48,19 @@
             class="modal-cancel btn btn-secondary"
             data-dismiss="modal"
             @click="toggleModal"
-          >
-            ((cancelText))
-          </button>
+          >((cancelText))</button>
           <button
             type="button"
             class="btn btn-primary"
             @click="renameWishlist"
-          >
-            ((renameText))
-          </button>
+          >((renameText))</button>
         </div>
       </div>
     </div>
   </div>
 
-  <div 
+  <div
     class="modal-backdrop fade"
-    {literal}
-      :class="{in: !isHidden}"
-    {/literal}
-  >
-  </div>
+    :class="{ldelim}show: !isHidden{rdelim}"
+  ></div>
 </div>
diff --git a/modules/blockwishlist/views/templates/components/modals/share.tpl b/modules/blockwishlist/views/templates/components/modals/share.tpl
@@ -14,9 +14,7 @@
 >
   <div
     class="wishlist-modal modal fade"
-    {literal}
-      :class="{show: !isHidden}"
-    {/literal}
+    :class="{ldelim}show: !isHidden{rdelim}"
     tabindex="-1"
     role="dialog"
     aria-modal="true"
@@ -31,8 +29,7 @@
             @click="toggleModal"
             data-dismiss="modal"
             aria-label="Close"
-          >
-          </button>
+          ></button>
         </div>
         <div class="modal-body">
           <div class="form-group form-group-lg">
@@ -52,27 +49,20 @@
             class="modal-cancel btn btn-secondary"
             data-dismiss="modal"
             @click="toggleModal"
-          >
-            ((cancelText))
-          </button>
+          >((cancelText))</button>
 
           <button
             type="button"
             class="btn btn-primary"
             @click="copyLink"
-          >
-            (( actionText ))
-          </button>
+          >(( actionText ))</button>
         </div>
       </div>
     </div>
   </div>
 
-  <div 
+  <div
     class="modal-backdrop fade"
-    {literal}
-      :class="{in: !isHidden}"
-    {/literal}
-  >
-  </div>
+    :class="{ldelim}show: !isHidden{rdelim}"
+  ></div>
 </div>
diff --git a/templates/catalog/_partials/miniatures/product.tpl b/templates/catalog/_partials/miniatures/product.tpl
@@ -5,13 +5,17 @@
 {$componentName = 'product-miniature'}
 
 {block name='product_miniature_item'}
-  <article class="{$componentName} js-{$componentName} thumbnail-container {if !empty($productClasses)} {$productClasses}{/if}" data-id-product="{$product.id_product}" data-id-product-attribute="{$product.id_product_attribute}">
+  <article
+    class="{$componentName} js-{$componentName}{if !empty($productClasses)} {$productClasses}{/if}"
+    data-id-product="{$product.id_product}"
+    data-id-product-attribute="{$product.id_product_attribute}"
+  >
     <div class="card">
       <a href="{$product.url}" class="{$componentName}__link">
         {include file='catalog/_partials/product-flags.tpl'}
 
         {block name='product_miniature_image'}
-          <div class="{$componentName}__image-container">
+          <div class="{$componentName}__image-container thumbnail-container">
             {if $product.cover}
               <picture>
                 {if isset($product.cover.bySize.default_md.sources.avif)}
@@ -102,7 +106,7 @@
 
             {block name='quick_view_touch'}
               <button class="{$componentName}__quickview_touch btn js-quickview" data-link-action="quickview">
-                  <i class="material-icons">&#xE417;</i>
+                <i class="material-icons">&#xE417;</i>
               </button>
             {/block}
           </div>