wickes-css2 2.102.0-lg-788-improve-mini-basket.6 → 2.102.0

package/src/js/page/plp-cards-v2.js

@@ -6,9 +6,7 @@ $(document).ready(function () {
     }
 
     function cardsContent(itemsInRow) {
-        let card = $('.content .product-card, .content .card-product-banner, .content .card-sponsor-banner, .content .card-sponsor-product').filter(function() {
-            return $(this).parents('.product-card, .card-product-banner, .card-sponsor-banner, .card-sponsor-product').length === 0;
-        });
+        let card = $('.content .product-card, .content .card-product-banner');
         let priceSelectors = [
             '.including-vat .product-card__price__old-price',
             '.excluding-vat .product-card__price__old-price',
@@ -19,7 +17,6 @@ $(document).ready(function () {
         revealAll(card, ['.product-card__price__old-price',
                                     '.product-card__price-sqm',
                                     '.product-card__price-value',
-                                    '.product-card__sponsored',
                                     '.energy-efficiency',
                                     '.energy-efficiency__link']);
 
@@ -36,8 +33,6 @@ $(document).ready(function () {
                 hideEmptiness(currentRow, '.product-card__price-sqm');
             }
             hideEmptiness(currentRow, '.product-card__price-value');
-            hideEmptiness(currentRow, '.product-card__sponsored');
-            hideEmptiness(currentRow, '.product-card__price__old-price');
             hideEmptiness(currentRow, '.energy-efficiency');
             hideEmptiness(currentRow, '.energy-efficiency__link');
 
@@ -48,15 +43,11 @@ $(document).ready(function () {
     function hideEmptiness(query, className) {
         let currentQuery = query.find(className);
         let rowContent = currentQuery.text();
-        const classEmptyCheckMap = {
-            '.energy-efficiency': 'energy-efficiency--empty',
-            '.product-card__sponsored': 'product-card__sponsored--empty',
-            '.product-card__price__old-price': 'product-card__price_empty'
-        };
-
-        if (classEmptyCheckMap[className]) {
-            let isClassEmpty = isClassPresentInQuery(currentQuery, classEmptyCheckMap[className]);
-            if (isClassEmpty) {
+
+        if (className === '.energy-efficiency') {
+            let isEnergyQueryEmpty = isClassPresentInQuery(currentQuery, "energy-efficiency--empty");
+
+            if (isEnergyQueryEmpty) {
                 currentQuery.hide();
             }
             return;

package/src/js/page/plp-load-more.js

@@ -43,7 +43,7 @@ Wick.PLPLoadMore = {
       .finally(() => {
         hideLoader(Wick.PLPLoadMore.el.loader);
         Wick.PLPLoadMore.el.$loadMoreBtn.blur();
-        Wick.BannerPlacementManager.checkProductsInColumn();
+        Wick.ProductBanner.checkProductsInColumn();
         $(window).trigger('productBannerPositionChanged');
         Wick.EnergyEfficiency.drawEnergyLabels();
         Wick.PLP?.bindEvents();

package/src/layouts/base.hbs

@@ -39,6 +39,12 @@
       {{> footer }}
     {{/block}}
 
+    {{#if miniBasketEmpty}}
+      {{> mini-basket/mini-basket-empty }}
+    {{else}}
+      {{> mini-basket/mini-basket }}
+    {{/if}}
+
     {{#block "foot"}}
       {{> scripts }}
     {{/block}}

package/src/page_plp_v2.html

@@ -1,4 +1,4 @@
-{{#extend "base" hybrisClass="hybris-class" pageClass="products-list-page retail-media" title="Products list" globalSearchV2="true" pagePlp=true}}
+{{#extend "base" hybrisClass="hybris-class" pageClass="products-list-page" title="Products list" globalSearchV2="true" pagePlp=true}}
 {{#content "head" mode="append" pagePlp=true}}
 <link type="text/css" rel="stylesheet" href="./css/components/global-search.css">
 {{/content}}
@@ -32,23 +32,13 @@
                         </div>
 
                         <div class="products-list products-list-v2">
-                            {{#each search-result_v2.products}}
-                                {{>card_product_v2}}
+                            {{#each plp_load-more.results}}
+                            {{>card_product_v2}}
                             {{/each}}
                             {{#if search-result_v2.product-banner}}
-                                {{#each search-result_v2.product-banner}}
-                                    {{>card_product_banner_v2}}
-                                {{/each}}
-                            {{/if}}
-                            {{#if search-result_v2.sponsor-banner}}
-                                {{#each search-result_v2.sponsor-banner}}
-                                    {{>card_sponsor_banner}}
-                                {{/each}}
-                            {{/if}}
-                            {{#if search-result_v2.sponsor-product}}
-                                {{#each search-result_v2.sponsor-product}}
-                                    {{>card_sponsor_product}}
-                                {{/each}}
+                            {{#each search-result_v2.product-banner}}
+                            {{>card_product_banner_v2}}
+                            {{/each}}
                             {{/if}}
                         </div>
                         <div class="load-more-wrap">

package/src/page_search-results.html

@@ -42,19 +42,9 @@
         </div>
 
         <div class="products-list products-list-v2">
-          {{#each search-result_v2.products}}
-            {{>card_product_v2}}
+          {{#each plp_energy-efficiency.products}}
+            {{> card_product_v2}}
           {{/each}}
-          {{#if search-result_v2.sponsor-banner}}
-            {{#each search-result_v2.sponsor-banner}}
-              {{>card_sponsor_banner}}
-            {{/each}}
-          {{/if}}
-          {{#if search-result_v2.sponsor-product}}
-            {{#each search-result_v2.sponsor-product}}
-              {{>card_sponsor_product}}
-            {{/each}}
-          {{/if}}
         </div>
 
         <div class="sort-products-list">

package/src/page_tradePro_rewards_home_installer_message.html

@@ -0,0 +1,56 @@
+{{#extend "my-account-v2"
+  pageClass="page_tradePro-rewards my-account"
+  title="TradePro Rewards (Installer message)"
+  logo-tp=true
+  tradepro-nav=true
+  pageMyAcc=true
+  myAccV2=true
+  isLoggedIn=true
+  mainClass="pt-0"
+  dataBreadcrumbs=my_account.tradeProRewards.breadcrumbsHomePage
+}}
+{{#content "head" mode="append"}}
+<link type="text/css" rel="stylesheet" href="./css/pages/tradePro-rewards.css">
+{{/content}}
+{{#content "main"}}
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      {{> my-account/mobile-nav
+          menu=my_account.tradepro.menu
+          active-index=4
+          page-name=my_account.tradepro.menu.[4].title
+      }}
+    </div>
+  </div>
+</div>
+
+<div class="my-account__banner-wrapper my-account__banner-wrapper--background">
+  <div class="container">
+    <div class="row">
+      <div class="col-12">
+        {{> notifications my_account.tradepro.banner withCloseBtn="true"}}
+      </div>
+    </div>
+  </div>
+</div>
+
+{{#extend "cards-slider"
+  title="TradePro Rewards"
+}}
+  {{#content "cards"}}
+    {{#each page_tradePro_cards.reward_cards}}
+      {{> reward_card
+        modificator="swiper-slide"
+        imgSrc=imgSrc
+        title=title
+        description=description
+        btnText=btnText
+        btnUrl=btnUrl
+      }}
+    {{/each}}
+  {{/content}}
+{{/extend}}
+
+{{/content}}
+{{/extend}}

package/src/page_tradePro_rewards_instore_installer_message.html

@@ -0,0 +1,77 @@
+{{#extend
+  "my-account-v2"
+  pageClass="page_tradePro-rewards my-account"
+  title="TradePro Rewards (Installer message)"
+  logo-tp=true
+  tradepro-nav=true
+  pageMyAcc=true
+  myAccV2=true
+  isLoggedIn=true
+  mainClass="pt-0"
+  dataBreadcrumbs=my_account.tradeProRewards.breadcrumbsDetailsPage
+}}
+{{#content "head" mode="append"}}
+<link type="text/css" rel="stylesheet" href="./css/pages/tradePro-rewards.css">
+{{/content}}
+{{#content "main"}}
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      {{> my-account/mobile-nav
+          menu=my_account.tradepro.menu
+          active-index=4
+          page-name=my_account.tradepro.menu.[4].title
+      }}
+    </div>
+  </div>
+</div>
+
+<div class="my-account__banner-wrapper">
+  <div class="container">
+    <div class="row">
+      <div class="col-12">
+        {{> notifications my_account.tradepro.banner withCloseBtn="true"}}
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="container top-indent">
+  <div class="row">
+    <div class="col-12">
+      {{#with page_tradePro_vouchers.instore}}
+        <h1 class="text-start">{{title}}</h1>
+        {{> voucher
+          mod="mb-1"
+        }}
+      {{/with}}
+      {{#extend "accordion" header=page_tradePro_vouchers.terms.title collapsed="accordion_collapsed voucher--terms" hidden="hidden-state"}}
+        {{#content "content"}}{{page_tradePro_vouchers.terms.text}}{{/content}}
+      {{/extend}}
+    </div>
+  </div>
+</div>
+
+{{#extend "cards-slider"
+  title="Other TradePro Rewards"
+  secondary=true
+}}
+  {{#content "cards"}}
+    {{#each page_tradePro_cards.reward_cards}}
+      {{> reward_card
+        modificator="swiper-slide"
+        imgSrc=imgSrc
+        title=title
+        description=description
+        btnText=btnText
+        btnUrl=btnUrl
+      }}
+    {{/each}}
+  {{/content}}
+{{/extend}}
+
+{{/content}}
+{{#content "foot" mode="append"}}
+  <script defer src="./js/tradePro-rewards.min.js"></script>
+{{/content}}
+{{/extend}}

package/src/partials/scripts.hbs

@@ -14,7 +14,6 @@
   <script src="./js/basket.min.js"></script>
 {{/ifCond}}
 {{!-- BUNDLES END --}}
-<script src="./js/mini-basket-slider.min.js"></script>
 <script src="./js/emulation.min.js"></script>
 <script defer src="https://kit.fontawesome.com/b73abc6840.js" crossorigin="anonymous"></script>
 {{#if pagePdp}}

package/src/scss/components/_custom-slider.scss

@@ -80,19 +80,6 @@
     }
   }
 
-  &__notifications {
-    &:has(.notification) {
-      margin-top: 16px;
-    }
-
-    .notification:only-child {
-      @include font-size(14);
-      @include line-height(24);
-      margin-bottom: 0;
-      border-bottom: none;
-    }
-  }
-
   &__message {
     margin-top: 8px;
     display: flex;
@@ -172,32 +159,6 @@
     &__details {
       flex: 1;
 
-      &-header {
-        display: flex;
-        align-items: flex-start;
-        justify-content: space-between;
-        grid-gap: 8px;
-
-        .btn--remove {
-          min-width: 24px;
-          padding: 4px;
-          background: 0 0;
-          border: none;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-
-          .remove-icon {
-            color: $blue;
-            font-size: 1rem;
-          }
-        }
-      }
-
-      &-body {
-        margin-top: 4px;
-      }
-
       .item,
       .price {
         margin-bottom: 0;
@@ -229,8 +190,8 @@
       }
 
       .price {
-        @include font-size(16);
-        @include line-height(20);
+        @include font-size(18);
+        @include line-height(24);
         margin-top: 8px;
         font-weight: 700;
         color: $blue-dark;
@@ -245,54 +206,6 @@
       &.product-card__content {
         margin-top: 0;
         padding: 0;
-        height: 100%;
-        display: flex;
-        flex-direction: column;
-      }
-    }
-
-    &__quantity-control {
-      display: flex;
-      align-items: center;
-      margin-top: 8px;
-
-      .quantity {
-        margin-bottom: 0;
-        min-width: 40px;
-        text-align: center;
-        padding: 0 5px;
-
-        .product-card__quantity-value {
-          margin: 0;
-          font-weight: 400;
-        }
-      }
-
-      .btn--quantity {
-        background: none;
-        padding: 0;
-        width: 24px;
-        min-height: 24px;
-        display: inline-flex;
-        align-items: center;
-        justify-content: center;
-
-        .quantity-cta-icon {
-          font-size: 1.35rem;
-          color: $blue;
-        }
-
-        &[disabled] {
-          border: none;
-          opacity: 0.6;
-        }
-      }
-    }
-
-    .btn--remove,
-    .btn--quantity {
-      &:hover {
-        opacity: 0.7;
       }
     }
 
@@ -305,17 +218,6 @@
         }
       }
     }
-
-    &__offers {
-      margin-top: 4px;
-
-      .products__promo {
-        @include font-size(12);
-        @include line-height(16);
-        color: $red;
-        font-weight: 400;
-      }
-    }
   }
 
   &__footer {
@@ -422,7 +324,7 @@
           font-weight: 500;
         }
 
-        &-value {
+        .value {
           @include font-size(18);
           @include line-height(24);
           font-weight: 700;
@@ -552,30 +454,6 @@
   }
 }
 
-@include media-breakpoint-up(sm) {
-  .custom-slider {
-    .products__details {
-      .price {
-        @include font-size(18);
-        @include line-height(24);
-
-        .inc {
-          @include font-size(12);
-          @include line-height(16);
-          font-weight: 500;
-        }
-      }
-
-      &-footer {
-        display: flex;
-        align-items: center;
-        justify-content: space-between;
-        margin-top: auto;
-      }
-    }
-  }
-}
-
 @include media-breakpoint-up(sm) {
   .custom-slider {
     &__wrap {

package/src/scss/components/_popover-mini-basket.scss

@@ -173,6 +173,10 @@
         .card__img {
           border: 0;
         }
+
+        .product-card__content {
+          height: auto;
+        }
       }
     }
   }

package/src/scss/components/card-product-banner.scss

@@ -4,7 +4,7 @@
   @include make-col(4);
   margin-bottom: 30px;
 
-  @include media-breakpoint-down(md) {
+  @include media-breakpoint-down(md) { 
     @include make-col(6);
   }
 
@@ -39,7 +39,7 @@
     padding: 0 15px;
 
     @include media-breakpoint-down(sm) {
-      display: inline-block;
+      display: inline-block; 
       padding: 0;
       width: 100%;
     }
@@ -49,92 +49,4 @@
     display: inline-block;
     width: 100%;
   }
-}
-
-.products-list {
-  .card-sponsor-product,
-  .card-sponsor-banner {
-    @include make-col(4);
-    margin-bottom: 0;
-  }
-
-  .card-sponsor-banner {
-    &__link {
-      display: inline-block;
-      width: 100%;
-      height: 100%;
-      padding: 0 15px;
-    }
-
-    &__image {
-      display: inline-block;
-      width: 100%;
-    }
-  }
-
-  .card-sponsor-product {
-    .product-card {
-      max-width: 100%;
-    }
-  }
-
-  .product-card__sponsored {
-    @include font-size(12);
-    @include line-height(16);
-    color: $squant;
-    font-weight: 400;
-    margin-top: -3px;
-    margin-bottom: 15px;
-    padding: 2px 4px;
-
-    &:not(.product-card__sponsored--empty) {
-      width: max-content;
-      background: $gray-light;
-    }
-  }
-}
-
-@include media-breakpoint-down(md) {
-  .products-list {
-    .card-sponsor-product,
-    .card-sponsor-banner {
-      @include make-col(6);
-
-      .card {
-        max-width: 100%;
-      }
-    }
-  }
-
-  .products-list-v2 {
-    .card-sponsor-product:nth-of-type(n+3) {
-      .card {
-        &:before {
-          content: none;
-        }
-      }
-    }
-  }
-}
-
-@include media-breakpoint-down(sm) {
-  .products-list {
-    .product-card__sponsored {
-      margin-right: auto;
-      margin-left: auto;
-    }
-
-    .card-sponsor-banner {
-      position: relative;
-
-      &::after {
-        content: '';
-        position: absolute;
-        bottom: 20px;
-        left: 5px;
-        width: calc(100% - 10px);
-        border-bottom: 1px solid $gray;
-      }
-    }
-  }
-}
+} 

package/src/scss/pages/my-account-v2.scss

@@ -137,6 +137,27 @@
       margin-bottom: 0;
     }
   }
+
+  &__banner-wrapper {
+    padding-top: 16px;
+
+    &--background {
+      background-color: $ma-white;
+    }
+
+    .notification {
+      margin: 0;
+
+      &.notification_general {
+        margin: 0;
+      }
+
+      &_link {
+        color: $white;
+        text-decoration: none;
+      }
+    }
+  }
 }
 
 .tooltip {
@@ -214,6 +235,10 @@
         }
       }
     }
+
+    &__banner-wrapper {
+      padding-top: 24px;
+    }
   }
 }
 
@@ -232,6 +257,10 @@
       margin-top: 16px;
       margin-bottom: 16px;
     }
+
+    &__banner-wrapper {
+      padding-top: 40px;
+    }
   }
 }
 

package/src/scss/pages/page_products-list-combined.scss

@@ -47,17 +47,6 @@ $color-bar-radius: 3px;
     }
   }
 
-  .sponsor-top-banner {
-    margin-bottom: 20px;
-    margin-top: 10px;
-
-    &__image {
-      display: block;
-      max-width: 100%;
-      margin-bottom: 20px;
-    }
-  }
-
   .color-pick {
     &__wrap {
       display: none;

package/src/scss/pages/page_products-list.scss

@@ -37,14 +37,6 @@
       }
     }
   }
-
-  .sponsor-top-banner {
-    &__image {
-      margin-bottom: 20px;
-      display: block;
-      max-width: 100%;
-    }
-  }
 }
 
 .products-list {

package/src/sitemap.html

@@ -697,10 +697,18 @@
                             <span class="page-id">10.13</span>
                             <a href="page_tradePro_rewards_home_single.html" target="_blank">TradePro Rewards Home Single Carousel Element</a>
                         </li>
+                        <li>
+                            <span class="page-id"></span>
+                            <a href="page_tradePro_rewards_home_installer_message.html" target="_blank">TradePro Rewards Home (Installer message)</a>
+                        </li>
                         <li>
                             <span class="page-id">10.14</span>
                             <a href="page_tradePro_rewards_instore.html" target="_blank">TradePro Rewards In-store only</a>
                         </li>
+                        <li>
+                            <span class="page-id"></span>
+                            <a href="page_tradePro_rewards_instore_installer_message.html" target="_blank">TradePro Rewards In-store only (Installer message)</a>
+                        </li>
                         <li>
                             <span class="page-id">10.15</span>
                             <a href="page_tradePro_rewards_online.html" target="_blank">TradePro Rewards Online only</a>