wickes-css2 2.102.0-lg-788-improve-mini-basket.7 → 2.103.0-0.3.0-legends.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wickes-css2",
-  "version": "2.102.0-lg-788-improve-mini-basket.7",
+  "version": "2.103.0-0.3.0-legends.1",
   "description": "CSS and JS and page templates in use by Wickes",
   "main": "index.js",
   "scripts": {
@@ -108,7 +108,7 @@
     "branches": [
       "alt-master",
       {
-        "name": "custom-tag/lg-788-improve-mini-basket",
+        "name": "custom-tag/0.3.0-legends",
         "prerelease": "${name.replace(/^custom-tag\\//g, '')}"
       }
     ],

package/src/data/my-account/data_my-account.json

@@ -243,6 +243,12 @@
         "tradeproID": "fas fa-user-hard-hat"
       },
       "bannerText": "TradePro discount is automatically applied to all prices",
+      "banner": {
+        "classModifier": "notification_reminder",
+        "text": "You could be eligible for <b>10% off</b> TradePro discount.<a href='#' class='notification_link'><b>Learn More ></b></a>",
+        "reminder": true,
+        "mod": "_white"
+      },
       "activeOrders": {
         "sectionTitle": "My Active Orders",
         "orderList": [

package/src/js/components/banner-placement-manager.js

@@ -212,7 +212,16 @@ Wick.BannerPlacementManager = {
   },
   getListSlots() {
     return $(Wick.BannerPlacementManager.el.productsWrap)
-      .children(Wick.BannerPlacementManager.el.allListSlots);
+      .children(Wick.BannerPlacementManager.el.allListSlots)
+      .filter(function() {
+        if ($(this).hasClass(Wick.BannerPlacementManager.classes.productBanners)) {
+          const position = Wick.BannerPlacementManager.getBannerPosition(this);
+          const productsCount = Wick.BannerPlacementManager.getListLength();
+          return position <= productsCount;
+        }
+
+        return true;
+      });
   },
   getBannerPriority(banner) {
     if ($(banner).hasClass(Wick.BannerPlacementManager.classes.sponsorProducts)) {

package/src/js/page/components/mini-basket-slider.js

@@ -95,15 +95,15 @@ Wick.MiniBasketSliderFE = {
       {
         item: Wick.MiniBasketSliderFE.el.subtotal,
         itemValue: Wick.MiniBasketSliderFE.el.value,
-        dataValue: data.subtotalWithoutCharity.formattedValue,
-        value: data.subTotal.value,
+        dataValue: data.subtotalWithoutCharity?.formattedValue,
+        value: data.subTotal?.value,
         title: 'Items subtotal:'
       },
       {
         item: Wick.MiniBasketSliderFE.el.vat,
         itemValue: Wick.MiniBasketSliderFE.el.value,
-        dataValue: data.totalTax.formattedValue,
-        value: data.totalTax.value,
+        dataValue: data.totalTax?.formattedValue,
+        value: data.totalTax?.value,
         title: 'VAT:'
       },
       {
@@ -115,29 +115,29 @@ Wick.MiniBasketSliderFE = {
       {
         item: Wick.MiniBasketSliderFE.el.delivery,
         itemValue: Wick.MiniBasketSliderFE.el.value,
-        dataValue: data.deliveryCost.formattedValue,
-        value: data.deliveryCost.value,
+        dataValue: data.deliveryCost?.formattedValue,
+        value: data.deliveryCost?.value,
         title: 'Delivery:'
       },
       {
         item: Wick.MiniBasketSliderFE.el.charity,
         itemValue: Wick.MiniBasketSliderFE.el.value,
-        dataValue: data.charityPrice.formattedValue,
-        value: data.charityPrice.value,
+        dataValue: data.charityPrice?.formattedValue,
+        value: data.charityPrice?.value,
         title: 'Charity donation:'
       },
       {
         item: Wick.MiniBasketSliderFE.el.discountItem,
         itemValue: Wick.MiniBasketSliderFE.el.value,
-        dataValue: data.totalDiscounts ? data.totalDiscounts.formattedValue : '',
-        value: data.totalDiscounts ? data.totalDiscounts.value : '',
+        dataValue: data.totalDiscounts ? data.totalDiscounts?.formattedValue : '',
+        value: data.totalDiscounts ? data.totalDiscounts?.value : '',
         title: 'Discount(s):'
       },
       {
         item: Wick.MiniBasketSliderFE.el.totalToggle,
         itemValue: Wick.MiniBasketSliderFE.el.totalToggleValue,
-        dataValue: data.totalPrice.formattedValue,
-        value: data.totalPrice.value,
+        dataValue: data.totalPrice?.formattedValue,
+        value: data.totalPrice?.value,
       },
     ];
   },
@@ -289,9 +289,9 @@ Wick.MiniBasketSliderFE = {
   fireMiniBasketActionEvent(eventType, cartData) {
     if (!eventType) return;
     const payload = {
-      orderType: cartData.orderType,
-      deliveryOrderGroups: cartData.deliveryOrderGroups,
-      pickupOrderGroups: cartData.pickupOrderGroups
+      orderType: cartData.orderType || '',
+      deliveryOrderGroups: cartData.deliveryOrderGroups || [],
+      pickupOrderGroups: cartData.pickupOrderGroups || []
     };
     const event = createEvent(
       eventType,

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/scss/components/_custom-slider.scss

@@ -89,7 +89,6 @@
       @include font-size(14);
       @include line-height(24);
       margin-bottom: 0;
-      border-bottom: none;
     }
   }
 
@@ -240,6 +239,11 @@
           @include line-height(16);
           font-weight: 500;
         }
+
+        .product-card__price-value {
+          font-size: inherit;
+          line-height: inherit;
+        }
       }
 
       &.product-card__content {
@@ -299,6 +303,7 @@
     &.popover-mini-basket__cards-holder {
       .card {
         margin-bottom: 0;
+        display: flex;
 
         & + .card {
           border-top: 1px solid $gray-light;

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/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>