wickes-css2 2.111.0-complete-your-project.9 → 2.111.0-develop.2

package/src/data/data_shopping-cart-with-energy.json

@@ -42,24 +42,24 @@
       ],
       "discounts": [
         {
-          "text": "Voucher abcd applies and giving 20% off",
+          "displayDescription": "Voucher abcd applies and giving 20% off",
           "isDeletable": true
         },
         {
-          "text": "Voucher 20% off",
+          "displayDescription": "Voucher 20% off",
           "isDeletable": true
         },
         {
-          "text": "Buy 4 for 3"
+          "displayDescription": "Buy 4 for 3"
         },
         {
-          "text": "Online only offer"
+          "displayDescription": "Online only offer"
         },
         {
-          "text": "2 for £35"
+          "displayDescription": "2 for £35"
         },
         {
-          "text": "Offer price equivalent to £17.50 per item"
+          "displayDescription": "Offer price equivalent to £17.50 per item"
         }
       ],
       "total": {
@@ -749,24 +749,24 @@
       ],
       "discounts": [
         {
-          "text": "Voucher abcd applies and giving 20% off",
+          "displayDescription": "Voucher abcd applies and giving 20% off",
           "isDeletable": true
         },
         {
-          "text": "Voucher 20% off",
+          "displayDescription": "Voucher 20% off",
           "isDeletable": true
         },
         {
-          "text": "Buy 4 for 3"
+          "displayDescription": "Buy 4 for 3"
         },
         {
-          "text": "Online only offer"
+          "displayDescription": "Online only offer"
         },
         {
-          "text": "2 for £35"
+          "displayDescription": "2 for £35"
         },
         {
-          "text": "Offer price equivalent to £17.50 per item"
+          "displayDescription": "Offer price equivalent to £17.50 per item"
         }
       ],
       "total": {

package/src/data/data_wismo.json

@@ -68,7 +68,8 @@
       },
       {
         "name": "Voucher:",
-        "value": "-"
+        "value": "<div>Wickes TradePro 10% Saving</div><div>20% off <br> Discount applied at checkout</div><div>Buy 3 get 1 free</div><div>Buy 2 for £30 <br>Not Available for Mix &amp; Match</div><div>Buy 2 get 1 free <br>Not Available for Mix &amp; Match</div><div>Buy any Product_103178 or 542003  with any Product_543265 or 148268 &amp; save up to £6.5</div>",
+        "valueExcVat": "<div>Wickes TradePro 10% Saving</div><div>20% off <br> Discount applied at checkout</div><div>Buy 3 get 1 free</div><div>Buy 2 for £25 <br>Not Available for Mix &amp; Match</div><div>Buy 2 get 1 free <br>Not Available for Mix &amp; Match</div><div>Buy any Product_103178 or 542003  with any Product_543265 or 148268 &amp; save up to £5.42</div>"
       }
     ]
   },

package/src/elements/checkbox.hbs

@@ -1,11 +1,4 @@
-<label 
-  for="{{id}}" 
-  class="chb 
-  {{#if required}}form-row__label_required{{/if}} 
-  {{#if inactive-message}}chb-inactive{{/if}}
-  {{#if action}}chb--action{{/if}}
-  "
-  >
+<label for="{{id}}" class="chb {{#if required}}form-row__label_required{{/if}} {{#if inactive-message}}chb-inactive{{/if}}">
   <input
     type="checkbox"
     value="{{value}}"

package/src/js/components/general/cart-slider.js

@@ -5,30 +5,17 @@ createPopupSlider({
     sliderSelector: '.custom-slider.just-added',
     onAppendEvent: 'productAddedToCart',
     onAppend: function (event, { showSlider, handleScroll, el }) {
-        Wick.MiniBasketSliderFE.isMiniBasketLoaded = false;
-
-        if (event.detail.bulkAddToCartData) {
-            return;
-        }
-
         if (!$('.custom-slider.just-added').length) {
             $('body').append(cartSliderHTML);
         }
-
         const htmlContent = event.detail.html;
-
-        if (htmlContent) {
-            $(el.slider).append(htmlContent);
-        }
-
+        $(el.slider).append(htmlContent);
         showSlider();
-
-        if ($(el.sliderWrap).length) {
-            $(el.sliderWrap).on(
-                'scroll',
-                _.debounce(() => handleScroll(el.sliderWrap), 100)
-            );
-        }
+        Wick.MiniBasketSliderFE.isMiniBasketLoaded = false;
+        $(el.sliderWrap).on(
+            'scroll',
+            _.debounce(() => handleScroll(el.sliderWrap), 100)
+        );
     },
     onClose: function () {
         Wick.MiniBasketSliderFE.cartEntries = [];

package/src/js/components/general/switchVat.js

@@ -61,6 +61,14 @@ Wick.VatToggle = {
         return !!Wick.VatToggle.getCookie(Wick.VatToggle.VAT_COOKIE);
     },
 
+    isActive: function () {
+        if (Wick.VatToggle.getSwitcherState() !== null) {
+            return Wick.VatToggle.getSwitcherState();
+        } else {
+            return Wick.VatToggle.isOn();
+        }
+    },
+
     toggleDisplayClass: function () {
         const includingVatEl = Wick.VatToggle.el.includingVat;
         const excludingVat = Wick.VatToggle.el.excludingVat;
@@ -74,14 +82,8 @@ Wick.VatToggle = {
         const excludingVatEl = Wick.VatToggle.el.excludingVat;
         const hiddenClassName = Wick.VatToggle.HIDDEN_CLASS_NAME;
 
-        let vatState = null;
-
         // check switcher state for web or cookie for app
-        if (Wick.VatToggle.getSwitcherState() !== null) {
-            vatState = Wick.VatToggle.getSwitcherState();
-        } else {
-            vatState = Wick.VatToggle.isOn();
-        }
+        const vatState = Wick.VatToggle.isActive();
 
         if (vatState) {
             $(includingVatEl).addClass(hiddenClassName);

package/src/js/components/general/tradepro-discount-banner.js

@@ -0,0 +1,69 @@
+var Wick = Wick || {};
+
+Wick.TradeProDiscountBanner = {
+    COOKIE_NAME: 'showTradeProPricingBanner',
+    BANNER_HTML: `
+    <div class="tradepro-discount-banner">
+      <span class="tradepro-discount-banner__content">
+        Your TradePro discount is already applied to all prices
+      </span>
+      <span class="icon notification__close notification__close_white notification__close_stripbanner">
+        <span class="fas fa-times"></span>
+      </span>
+    </div>`,
+    getCookie: function (cookieName) {
+        var cookie = decodeURIComponent(document.cookie)
+            .split(';')
+            .map(function (c) {
+                return c.trim();
+            })
+            .find(function (c) {
+                return c.startsWith(cookieName + '=');
+            });
+
+        return cookie ? cookie.replace(cookieName + '=', '') : '';
+    },
+    isOn: function () {
+        return (
+            Wick.TradeProDiscountBanner.getCookie(Wick.TradeProDiscountBanner.COOKIE_NAME) ===
+            'true'
+        );
+    },
+    turnOff: function () {
+        Wick.TradeProDiscountBanner.setCookie(Wick.TradeProDiscountBanner.COOKIE_NAME, 'false');
+    },
+    setCookie: function (cookieName, value) {
+        document.cookie =
+            cookieName + '=' + encodeURIComponent(value) + ';domain=.wickes.co.uk;path=/';
+    },
+    onClose: function (e) {
+        e.stopPropagation();
+        $('.tradepro-discount-banner').remove();
+        $('.global-search--has-tradepro-banner').removeClass('global-search--has-tradepro-banner');
+        Wick.TradeProDiscountBanner.turnOff();
+    },
+    bindEvents: function () {
+        $(document).on(
+            'click',
+            '.tradepro-discount-banner .notification__close',
+            Wick.TradeProDiscountBanner.onClose
+        );
+    },
+    init: function () {
+        Wick.TradeProDiscountBanner.bindEvents();
+        var $globalSearch = $('.header-global-search__content.global-search');
+
+        if ($globalSearch.length && !$globalSearch.find('.tradepro-discount-banner').length) {
+            $globalSearch.prepend(Wick.TradeProDiscountBanner.BANNER_HTML);
+            $globalSearch.addClass('global-search--has-tradepro-banner');
+        }
+    },
+};
+
+$(function () {
+    if (!Wick.TradeProDiscountBanner.isOn()) {
+        return;
+    }
+
+    Wick.TradeProDiscountBanner.init();
+});

package/src/js/emulation/basket-data.js

@@ -20,6 +20,9 @@ Wick.BasketData = (function () {
             promotionsInfo: [
                 {
                     description: 'Spend over £10 and get £2 fixed discount',
+                    displayDescription: 'Spend over £10 and get £2 fixed discount',
+                    displayDescriptionExclusiveVat:
+                        'Spend over £10 and get £1.67 fixed discount (ex. VAT)',
                     usedCouponCode: 'RT_02',
                 },
             ],
@@ -949,7 +952,14 @@ Wick.BasketData = (function () {
             potentialProductPromotions: [],
             appliedProductPromotions: [],
             appliedOrderPromotions: [],
-            promotionsInfo: null,
+            promotionsInfo: [
+                {
+                    description: 'Spend over £10 and get £2 fixed discount',
+                    displayDescription: 'Spend over £10 and get £2 fixed discount',
+                    displayDescriptionExclusiveVat:
+                        'Spend over £10 and get £1.67 fixed discount (ex. VAT)',
+                },
+            ],
             clickAndCollectOnly: false,
             deliveryItemsQuantity: 1,
             pickupItemsQuantity: 2,

package/src/js/emulation/checkout-data.js

@@ -19,6 +19,9 @@ Wick.CheckoutData = (function () {
             promotionsInfo: [
                 {
                     description: 'Spend over £10 and get £2 fixed discount',
+                    displayDescription: 'Spend over £10 and get £2 fixed discount',
+                    displayDescriptionExclusiveVat:
+                        'Spend over £10 and get £1.67 fixed discount (ex. VAT)',
                     usedCouponCode: 'RT_02',
                 },
             ],

package/src/js/emulation/mini-basket-data.js

@@ -460,6 +460,18 @@ Wick.MiniBasketData = (function () {
                                 currencyIso: 'GBP',
                                 formattedPriceWithoutCurrencySymbol: '10',
                             },
+                            displayBasePrice: {
+                                value: 90.0,
+                                formattedValue: '£90.00',
+                                currencyIso: 'GBP',
+                                formattedPriceWithoutCurrencySymbol: '90.00',
+                            },
+                            displayBasePriceExclusiveVat: {
+                                value: 75.0,
+                                formattedValue: '£75.00',
+                                currencyIso: 'GBP',
+                                formattedPriceWithoutCurrencySymbol: '75.00',
+                            },
                             product: {
                                 code: '221100',
                                 name: 'Blue Circle Ready To Use Postcrete - 20kg',
@@ -547,6 +559,18 @@ Wick.MiniBasketData = (function () {
                                 currencyIso: 'GBP',
                                 formattedPriceWithoutCurrencySymbol: '9',
                             },
+                            displayBasePrice: {
+                                value: 8.1,
+                                formattedValue: '£8.10',
+                                currencyIso: 'GBP',
+                                formattedPriceWithoutCurrencySymbol: '8.10',
+                            },
+                            displayBasePriceExclusiveVat: {
+                                value: 6.75,
+                                formattedValue: '£6.75',
+                                currencyIso: 'GBP',
+                                formattedPriceWithoutCurrencySymbol: '6.75',
+                            },
                             product: {
                                 code: '109450',
                                 name: 'Knauf Insulation Space Standard Top Up 170mm Loft Roll - 6.47m²',
@@ -633,6 +657,18 @@ Wick.MiniBasketData = (function () {
                                 currencyIso: 'GBP',
                                 formattedPriceWithoutCurrencySymbol: '8',
                             },
+                            displayBasePrice: {
+                                value: 22.5,
+                                formattedValue: '£22.50',
+                                currencyIso: 'GBP',
+                                formattedPriceWithoutCurrencySymbol: '22.50',
+                            },
+                            displayBasePriceExclusiveVat: {
+                                value: 18.75,
+                                formattedValue: '£18.75',
+                                currencyIso: 'GBP',
+                                formattedPriceWithoutCurrencySymbol: '18.75',
+                            },
                             product: {
                                 code: '123143',
                                 name: '6 Wickes General Purpose Claw test',
@@ -816,6 +852,9 @@ Wick.MiniBasketData = (function () {
             potentialProductPromotions: [
                 {
                     description: 'Buy more to qualify for our buy 3 get 1 free offer',
+                    displayDescription: 'Buy more to qualify for our buy 3 get 1 free offer',
+                    displayDescriptionExclusiveVat:
+                        'Buy more to qualify for our buy 3 get 1 free offer',
                     promotionData: {
                         code: 'TD_ProductBOGOFPromotionPotential',
                         title: null,
@@ -840,6 +879,10 @@ Wick.MiniBasketData = (function () {
                 {
                     description:
                         'These item qualify for our buy 3 get 1 free offer - You have saved £36.00',
+                    displayDescription:
+                        'These item qualify for our buy 3 get 1 free offer - You have saved £36.00',
+                    displayDescriptionExclusiveVat:
+                        'These item qualify for our buy 3 get 1 free offer - You have saved £30.00 Exc.VAT',
                     promotionData: {
                         code: 'TD_ProductBOGOFPromotion',
                         title: null,
@@ -868,6 +911,7 @@ Wick.MiniBasketData = (function () {
             promotionsInfo: [
                 {
                     description: 'Buy 3 get 1 free',
+                    displayDescription: 'Buy 3 get 1 free',
                     usedCouponCode: '',
                 },
             ],
@@ -900,6 +944,18 @@ Wick.MiniBasketData = (function () {
                                 currencyIso: 'GBP',
                                 formattedPriceWithoutCurrencySymbol: '18',
                             },
+                            displayBasePrice: {
+                                value: 14.4,
+                                formattedValue: '£14.40',
+                                currencyIso: 'GBP',
+                                formattedPriceWithoutCurrencySymbol: '14.40',
+                            },
+                            displayBasePriceExclusiveVat: {
+                                value: 12.0,
+                                formattedValue: '£12.00',
+                                currencyIso: 'GBP',
+                                formattedPriceWithoutCurrencySymbol: '12.00',
+                            },
                             product: {
                                 code: '109450',
                                 name: 'Knauf Insulation Space Standard Top Up 170mm Loft Roll - 6.47m²',
@@ -986,6 +1042,18 @@ Wick.MiniBasketData = (function () {
                                 currencyIso: 'GBP',
                                 formattedPriceWithoutCurrencySymbol: '24',
                             },
+                            displayBasePrice: {
+                                value: 22.5,
+                                formattedValue: '£22.50',
+                                currencyIso: 'GBP',
+                                formattedPriceWithoutCurrencySymbol: '22.50',
+                            },
+                            displayBasePriceExclusiveVat: {
+                                value: 18.75,
+                                formattedValue: '£18.75',
+                                currencyIso: 'GBP',
+                                formattedPriceWithoutCurrencySymbol: '18.75',
+                            },
                             product: {
                                 code: '109451',
                                 name: 'Knauf Insulation Super Top Up 200mm Loft Roll - 5.61m²',