Merge pull request #424 from PrestaShop/develop

Merge develop on master
PrestaShop · Jan 7, 2023 · 747e7c0 · 747e7c0
2 parents 4f50b19 + 5b759ec
commit 747e7c0
Show file tree

Hide file tree

Showing 133 changed files with 2,276 additions and 849 deletions.
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Hummingbird theme
 
-This is a PrestaShop's theme we are working on. Please, if you work on this theme, use the `1.7.8.x` branch of PrestaShop to make sure this theme is compatible with the latest `1.7` version.
+This is a PrestaShop's theme we are working on. Please, if you work on this theme, use the `8.0.x` branch of PrestaShop to make sure this theme is compatible with the latest `8.x` version.
 
 [Read more](https://build.prestashop.com/news/new-theme-announce/) about this theme on the blog.
 

diff --git a/config/theme.yml b/config/theme.yml
@@ -8,7 +8,7 @@ author:
 
 meta:
   compatibility:
-      from: 1.7.0.0
+      from: 8.0.0
       to: ~
 
   available_layouts:
@@ -85,7 +85,7 @@ global_settings:
         - ps_linklist
         - ps_customeraccountlinks
         - ps_contactinfo
-        - ~
+        - blockwishlist
       displayLeftColumn:
         - ps_categorytree
         - ps_facetedsearch
@@ -135,6 +135,43 @@ global_settings:
       width: 170
       height: 115
       scope: [stores]
+    default_xs:
+      width: 120
+      height: 120
+      scope: [products, manufacturers, suppliers, categories]
+    default_s:
+      width: 160
+      height: 160
+      scope: [categories, products]
+    default_m:
+      width: 200
+      height: 200
+      scope: [stores, manufacturers, suppliers, products]
+    default_md:
+      width: 320
+      height: 320
+      scope: [categories, products]
+    default_xl:
+      width: 400
+      height: 400
+      scope: [stores, products]
+    product_main:
+      width: 720
+      height: 720
+      scope: [products]
+    category_cover:
+      width: 1000
+      height: 200
+      scope: [categories]
+    product_main_2x:
+      width: 1440
+      height: 1440
+      scope: [products]
+    category_cover_2x:
+      width: 2000
+      height: 400
+      scope: [categories]
+
 
 theme_settings:
   rtl_generation: false
@@ -145,3 +182,5 @@ theme_settings:
     new-products: layout-left-column
     prices-drop: layout-left-column
     contact: layout-left-column
+    manufacturer: layout-left-column
+    supplier: layout-left-column
diff --git a/modules/blockwishlist/views/templates/components/modals/add-to-wishlist.tpl b/modules/blockwishlist/views/templates/components/modals/add-to-wishlist.tpl
@@ -0,0 +1,62 @@
+{**
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *}
+
+<div
+ class="wishlist-add-to"
+ data-url="{$url}"
+>
+  <div
+    class="wishlist-modal modal fade"
+    {literal}
+      :class="{show: !isHidden}"
+    {/literal}
+    tabindex="-1"
+    role="dialog"
+    aria-modal="true"
+  >
+    <div class="modal-dialog modal-dialog-centered" role="document">
+      <div class="modal-content">
+        <div class="modal-header px-3">
+          <h5 class="modal-title">{l s='Add to wishlist' d='Modules.Blockwishlist.Shop'}</h5>
+          <button
+            type="button"
+            class="btn-close"
+            @click="toggleModal"
+            data-dismiss="modal"
+            aria-label="{l s='Close' d='Modules.Blockwishlist.Shop'}"
+          >
+          </button>
+        </div>
+
+        <div class="modal-body">
+          <choose-list
+            @hide="toggleModal"
+            :product-id="productId"
+            :product-attribute-id="productAttributeId"
+            :quantity="quantity"
+            url="{$url}"
+            add-url="{$addUrl}"
+            empty-text="{l s='No list found.' d='Modules.Blockwishlist.Shop'}"
+          >
+          </choose-list>
+        </div>
+
+        <div class="modal-footer">
+          <a @click="openNewWishlistModal" class="wishlist-add-to-new text-primary">
+            <i class="material-icons text-primary">add_circle_outline</i> {$newWishlistCTA}
+          </a>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div 
+    class="modal-backdrop fade"
+    {literal}
+      :class="{in: !isHidden}"
+    {/literal}
+  >
+  </div>
+</div>
diff --git a/modules/blockwishlist/views/templates/components/modals/create.tpl b/modules/blockwishlist/views/templates/components/modals/create.tpl
@@ -0,0 +1,79 @@
+{**
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *}
+
+<div
+  class="wishlist-create"
+  data-url="{$url}"
+  data-title="{l s='Create wishlist' d='Modules.Blockwishlist.Shop'}"
+  data-label="{l s='Wishlist name' d='Modules.Blockwishlist.Shop'}"
+  data-placeholder="{l s='Add name' d='Modules.Blockwishlist.Shop'}"
+  data-cancel-text="{l s='Cancel' d='Modules.Blockwishlist.Shop'}"
+  data-create-text="{l s='Create wishlist' d='Modules.Blockwishlist.Shop'}"
+  data-length-text="{l s='List title is too short' d='Modules.Blockwishlist.Shop'}"
+>
+  <div
+    class="wishlist-modal modal fade"
+    {literal}
+      :class="{show: !isHidden}"
+    {/literal}
+    tabindex="-1"
+    role="dialog"
+    aria-modal="true"
+  >
+    <div class="modal-dialog modal-dialog-centered" role="document">
+      <div class="modal-content">
+        <div class="modal-header px-3">
+          <h5 class="modal-title">((title))</h5>
+          <button
+            type="button"
+            class="btn-close"
+            @click="toggleModal"
+            data-dismiss="modal"
+            aria-label="Close"
+          >
+          </button>
+        </div>
+        <div class="modal-body">
+          <div class="form-group form-group-lg">
+            <label class="form-label" for="input2">((label))</label>
+            <input
+              type="text"
+              class="form-control form-control-lg"
+              v-model="value"
+              id="input2"
+              :placeholder="placeholder"
+            >
+          </div>
+        </div>
+        <div class="modal-footer">
+          <button
+            type="button"
+            class="modal-cancel btn btn-secondary"
+            data-dismiss="modal"
+            @click="toggleModal"
+          >
+            ((cancelText))
+          </button>
+
+          <button
+            type="button"
+            class="btn btn-primary"
+            @click="createWishlist"
+          >
+            ((createText))
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div 
+    class="modal-backdrop fade"
+    {literal}
+      :class="{in: !isHidden}"
+    {/literal}
+  >
+  </div>
+</div>
diff --git a/modules/blockwishlist/views/templates/components/modals/delete.tpl b/modules/blockwishlist/views/templates/components/modals/delete.tpl
@@ -0,0 +1,75 @@
+{**
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *}
+
+<div
+  class="wishlist-delete"
+  {if isset($listUrl)}
+    data-delete-list-url="{$listUrl}"
+  {/if}
+  {if isset($deleteProductUrl)}
+    data-delete-product-url="{$deleteProductUrl}"
+  {/if}
+  data-title="{l s='Remove product from wishlist' d='Modules.Blockwishlist.Shop'}"
+  data-title-list="{l s='Delete wishlist' d='Modules.Blockwishlist.Shop'}"
+  data-placeholder='{l s='The product will be removed from "%nameofthewishlist%".' d='Modules.Blockwishlist.Shop'}'
+  data-cancel-text="{l s='Cancel' d='Modules.Blockwishlist.Shop'}"
+  data-delete-text="{l s='Remove' d='Modules.Blockwishlist.Shop'}"
+  data-delete-text-list="{l s='Delete' d='Modules.Blockwishlist.Shop'}"
+>
+  <div
+    class="wishlist-modal modal fade"
+    {literal}
+      :class="{show: !isHidden}"
+    {/literal}
+    tabindex="-1"
+    role="dialog"
+    aria-modal="true"
+  >
+    <div class="modal-dialog modal-dialog-centered" role="document">
+      <div class="modal-content">
+        <div class="modal-header px-3">
+          <h5 class="modal-title">((modalTitle))</h5>
+          <button
+            type="button"
+            class="btn-close"
+            @click="toggleModal"
+            data-dismiss="modal"
+            aria-label="Close"
+          >
+          </button>
+        </div>
+        <div class="modal-body" v-if="productId">
+          <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>
+
+          <button
+            type="button"
+            class="btn btn-primary"
+            @click="deleteWishlist"
+          >
+            ((modalDeleteText))
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div 
+    class="modal-backdrop fade"
+    {literal}
+      :class="{in: !isHidden}"
+    {/literal}
+  >
+  </div>
+</div>
diff --git a/modules/blockwishlist/views/templates/components/modals/login.tpl b/modules/blockwishlist/views/templates/components/modals/login.tpl
@@ -0,0 +1,64 @@
+{**
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *}
+
+<div
+  class="wishlist-login"
+  data-login-text="{l s='Sign in' d='Modules.Blockwishlist.Shop'}"
+  data-cancel-text="{l s='Cancel' d='Modules.Blockwishlist.Shop'}"
+>
+  <div
+    class="wishlist-modal modal fade"
+    {literal}
+      :class="{show: !isHidden}"
+    {/literal}
+    tabindex="-1"
+    role="dialog"
+    aria-modal="true"
+  >
+    <div class="modal-dialog modal-dialog-centered" role="document">
+      <div class="modal-content">
+        <div class="modal-header px-3">
+          <h5 class="modal-title">{l s='Sign in' d='Modules.Blockwishlist.Shop'}</h5>
+          <button
+            type="button"
+            class="btn-close"
+            @click="toggleModal"
+            data-dismiss="modal"
+            aria-label="Close"
+          >
+          </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>
+        </div>
+        <div class="modal-footer">
+          <button
+            type="button"
+            class="modal-cancel btn btn-secondary"
+            data-dismiss="modal"
+            @click="toggleModal"
+          >
+            ((cancelText))
+          </button>
+
+          <a
+            class="btn btn-primary"
+            :href="prestashop.urls.pages.authentication"
+          >
+            ((loginText))
+          </a>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <div
+    class="modal-backdrop fade"
+    {literal}
+      :class="{in: !isHidden}"
+    {/literal}
+  >
+  </div>
+</div>