wickes-css2 2.111.0-develop.2 → 2.111.0-why-not-add.2

package/src/components/mini-basket/mini-basket-order-item.hbs

@@ -47,24 +47,24 @@
             <i class="fal fa-plus quantity-cta-icon"></i>
           </button>
         </div>
-        {{#if (eq item.displayBasePrice.value 0)}}
+        {{#if (eq item.basePrice.value 0)}}
           <span class="order-item__value product-card__price-value">FREE</span>
         {{else}}
           {{#if (isToggleVatAvailable)}}
             <div class="price including-vat-inherit">
               <span class="product-card__price-value">
-                <span class="order-item__value">{{item.displayBasePrice.formattedValue}}</span>
+                <span class="order-item__value">{{item.basePrice.formattedValue}}</span>
                 <span class="inc">Inc.VAT</span>
               </span>
             </div>
             <div class="price excluding-vat-inherit">
               <span class="product-card__price-value">
-                <span class="order-item__value">{{item.displayBasePriceExclusiveVat.formattedValue}}</span>
+                <span class="order-item__value">{{item.basePriceExcVat.formattedValue}}</span>
                 <span class="inc">Exc.VAT</span>
               </span>
             </div>
           {{else}}
-            <span class="price product-card__price-value">{{item.displayBasePrice.formattedValue}}</span>
+            <span class="price product-card__price-value">{{item.basePrice.formattedValue}}</span>
           {{/if}}
         {{/if}}
       </div>

package/src/components/wismo-payment.hbs

@@ -4,14 +4,7 @@
         {{#each wismo-order-payment-klarna.items}}
             <div class="wrap-item">
                 <div class="wrap-item__name">{{{name}}}</div>
-                <div class="wrap-item__value">
-                    {{#ifCond ../switch-vat '&&' valueExcVat}}
-                        <span class="including-vat">{{{value}}}</span>
-                        <span class="excluding-vat d-none">{{{valueExcVat}}}</span>
-                    {{else}}
-                        {{{value}}}
-                    {{/ifCond}}
-                </div>
+                <div class="wrap-item__value">{{{value}}}</div>
             </div>
         {{/each}}
     {{else if payment-apple}}
@@ -19,12 +12,7 @@
         <div class="wrap-item">
             <div class="wrap-item__name">{{{name}}}</div>
             <div class="wrap-item__value">
-              {{#ifCond ../switch-vat '&&' valueExcVat}}
-                <span class="including-vat">{{{value}}}</span>
-                <span class="excluding-vat d-none">{{{valueExcVat}}}</span>
-              {{else}}
-                {{{value}}}
-              {{/ifCond}}
+              {{{value}}}
               <p class="pt-3">{{additional-value}}</p>
             </div>
         </div>
@@ -34,12 +22,7 @@
         <div class="wrap-item">
             <div class="wrap-item__name">{{{name}}}</div>
             <div class="wrap-item__value">
-              {{#ifCond ../switch-vat '&&' valueExcVat}}
-                <span class="including-vat">{{{value}}}</span>
-                <span class="excluding-vat d-none">{{{valueExcVat}}}</span>
-              {{else}}
-                {{{value}}}
-              {{/ifCond}}
+              {{{value}}}
               <p class="pt-3">{{additional-value}}</p>
             </div>
         </div>
@@ -49,12 +32,7 @@
           <div class="wrap-item">
             <div class="wrap-item__name">{{{name}}}</div>
             <div class="wrap-item__value">
-              {{#ifCond ../switch-vat '&&' valueExcVat}}
-                <span class="including-vat">{{{value}}}</span>
-                <span class="excluding-vat d-none">{{{valueExcVat}}}</span>
-              {{else}}
-                {{{value}}}
-              {{/ifCond}}
+              {{{value}}}
               <p class="pt-3">{{additional-value}}</p>
             </div>
           </div>
@@ -71,14 +49,7 @@
         {{else}}
           <div class="wrap-item">
             <div class="wrap-item__name">{{{this.name}}}</div>
-            <div class="wrap-item__value">
-                {{#ifCond ../switch-vat '&&' this.valueExcVat}}
-                    <span class="including-vat">{{{this.value}}}</span>
-                    <span class="excluding-vat d-none">{{{this.valueExcVat}}}</span>
-                {{else}}
-                    {{{this.value}}}
-                {{/ifCond}}
-            </div>
+            <div class="wrap-item__value">{{{this.value}}}</div>
           </div>
         {{/if}}
       {{/each}}
@@ -86,28 +57,14 @@
       {{#each wismo-order-payment-clearpay.items}}
         <div class="wrap-item">
           <div class="wrap-item__name">{{{name}}}</div>
-          <div class="wrap-item__value">
-            {{#ifCond ../switch-vat '&&' valueExcVat}}
-              <span class="including-vat">{{{value}}}</span>
-              <span class="excluding-vat d-none">{{{valueExcVat}}}</span>
-            {{else}}
-              {{{value}}}
-            {{/ifCond}}
-          </div>
+          <div class="wrap-item__value">{{{value}}}</div>
         </div>
       {{/each}}
     {{else}}
         {{#each wismo-order-payment.items}}
             <div class="wrap-item">
                 <div class="wrap-item__name">{{{name}}}</div>
-                <div class="wrap-item__value">
-                    {{#ifCond ../switch-vat '&&' valueExcVat}}
-                        <span class="including-vat">{{{value}}}</span>
-                        <span class="excluding-vat d-none">{{{valueExcVat}}}</span>
-                    {{else}}
-                        {{{value}}}
-                    {{/ifCond}}
-                </div>
+                <div class="wrap-item__value">{{{value}}}</div>
             </div>
         {{/each}}
     {{/if}}

package/src/data/data_delivery-address-v2.json

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

package/src/data/data_discounts.json

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

package/src/data/data_shopping-cart-v2.json

@@ -44,52 +44,31 @@
       ],
       "discounts": [
         {
-          "displayDescription": "Voucher abcd applies and giving 20% off",
-          "displayDescriptionExclusiveVat": "Voucher abcd applies and giving 18% off",
+          "text": "Voucher abcd applies and giving 20% off",
+          "textExcVat": "Voucher abcd applies and giving 18% off",
           "isDeletable": true
         },
         {
-          "displayDescription": "Voucher 20% off",
-          "displayDescriptionExclusiveVat": "Voucher 18% off",
+          "text": "Voucher 20% off",
+          "textExcVat": "Voucher 18% off",
           "isDeletable": true
         },
         {
-          "displayDescription": "Buy 4 for 3",
-          "displayDescriptionExclusiveVat": "Buy 5 for 3"
+          "text": "Buy 4 for 3",
+          "textExcVat": "Buy 5 for 3"
         },
         {
-          "displayDescription": "Online only offer"
+          "text": "Online only offer"
         },
         {
-          "displayDescription": "2 for £35",
-          "displayDescriptionExclusiveVat": "2 for £30"
+          "text": "2 for £35",
+          "textExcVat": "2 for £30"
         },
         {
-          "displayDescription": "Offer price equivalent to £17.50 per item",
-          "displayDescriptionExclusiveVat": "Offer price equivalent to £15.50 per item"
+          "text": "Offer price equivalent to £17.50 per item",
+          "textExcVat": "Offer price equivalent to £15.50 per item"
         }
       ],
-      "voucher-remove-popup": {
-        "title": "Remove {coupon name} discount?",
-        "headerIcon": "fas fa-exclamation-circle",
-        "description": "Are you sure you want to remove your {coupon name} discount from this order? The total cost of your order will increase.",
-        "actions": {
-          "mod": "actions",
-          "buttons": [
-            {
-              "title": "Cancel",
-              "isPrimary": true,
-              "close-modal": true
-            },
-            {
-              "mod": "btn-continue",
-              "data-action": "confirm-voucher-remove",
-              "title": "Yes, continue",
-              "isSecondary": true
-            }
-          ]
-        }
-      },
       "total": {
         "title": "Total:",
         "value": "£430.95"

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

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

package/src/data/data_wismo.json

@@ -68,8 +68,7 @@
       },
       {
         "name": "Voucher:",
-        "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>"
+        "value": "-"
       }
     ]
   },

package/src/elements/checkbox.hbs

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

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

@@ -5,17 +5,30 @@ 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;
-        $(el.slider).append(htmlContent);
+
+        if (htmlContent) {
+            $(el.slider).append(htmlContent);
+        }
+
         showSlider();
-        Wick.MiniBasketSliderFE.isMiniBasketLoaded = false;
-        $(el.sliderWrap).on(
-            'scroll',
-            _.debounce(() => handleScroll(el.sliderWrap), 100)
-        );
+
+        if ($(el.sliderWrap).length) {
+            $(el.sliderWrap).on(
+                'scroll',
+                _.debounce(() => handleScroll(el.sliderWrap), 100)
+            );
+        }
     },
     onClose: function () {
         Wick.MiniBasketSliderFE.cartEntries = [];

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

@@ -61,14 +61,6 @@ 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;
@@ -82,8 +74,14 @@ 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
-        const vatState = Wick.VatToggle.isActive();
+        if (Wick.VatToggle.getSwitcherState() !== null) {
+            vatState = Wick.VatToggle.getSwitcherState();
+        } else {
+            vatState = Wick.VatToggle.isOn();
+        }
 
         if (vatState) {
             $(includingVatEl).addClass(hiddenClassName);

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

@@ -20,9 +20,6 @@ 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',
                 },
             ],
@@ -952,14 +949,7 @@ Wick.BasketData = (function () {
             potentialProductPromotions: [],
             appliedProductPromotions: [],
             appliedOrderPromotions: [],
-            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)',
-                },
-            ],
+            promotionsInfo: null,
             clickAndCollectOnly: false,
             deliveryItemsQuantity: 1,
             pickupItemsQuantity: 2,

package/src/js/emulation/bloomreach-widget-calculations.js

@@ -0,0 +1,132 @@
+let addToCartResponseIndex = 0;
+
+function formatBundlePrice(value) {
+    return new Intl.NumberFormat('en-GB', {
+        style: 'currency',
+        currency: 'GBP',
+        minimumFractionDigits: 2,
+        maximumFractionDigits: 2,
+    }).format(value);
+}
+
+function getPriceData(product) {
+    return product.price || product.displayPrice || {};
+}
+
+function getBundleProductPrice(product) {
+    const price = getPriceData(product);
+
+    return typeof price.value === 'number' ? price.value : 0;
+}
+
+function getBundleProductWasPrice(product) {
+    const price = getPriceData(product);
+
+    return typeof price.wasPrice === 'number' ? price.wasPrice : null;
+}
+
+function getBundleProductExcVatPrice(product) {
+    const priceExcVat = product.displayPriceExclusiveVat || product.priceExclusiveVat;
+    if (priceExcVat && typeof priceExcVat.value === 'number') return priceExcVat.value;
+    const price = getPriceData(product);
+    if (typeof price.value !== 'number') return 0;
+    const vatRate = price.vatRatePercentage || 20;
+    return price.value / (1 + vatRate / 100);
+}
+
+function getBundleProductExcVatWasPrice(product) {
+    const display = product.displayPriceExclusiveVat;
+    const raw = product.priceExclusiveVat;
+    if (display && typeof display.wasPrice === 'number') return display.wasPrice;
+    if (raw && typeof raw.wasPrice === 'number') return raw.wasPrice;
+    const price = getPriceData(product);
+    if (typeof price.wasPrice !== 'number') return null;
+    const vatRate = price.vatRatePercentage || 20;
+    return price.wasPrice / (1 + vatRate / 100);
+}
+
+function calculateBundleTotal(entries) {
+    let totalPrice = 0;
+    let totalWasPrice = 0;
+    let totalExcVatPrice = 0;
+    let totalExcVatWasPrice = 0;
+    let hasWasPrice = false;
+
+    entries.forEach(function (entry) {
+        const quantity = entry.quantity || 1;
+        const price = getBundleProductPrice(entry.product);
+        const wasPrice = getBundleProductWasPrice(entry.product);
+        const excVatPrice = getBundleProductExcVatPrice(entry.product);
+        const excVatWasPrice = getBundleProductExcVatWasPrice(entry.product);
+
+        totalPrice += price * quantity;
+        totalWasPrice += (wasPrice || price) * quantity;
+        totalExcVatPrice += excVatPrice * quantity;
+        totalExcVatWasPrice += (excVatWasPrice || excVatPrice) * quantity;
+
+        if (wasPrice) {
+            hasWasPrice = true;
+        }
+    });
+
+    return {
+        totalPrice: formatBundlePrice(totalPrice),
+        totalWasPrice: hasWasPrice ? formatBundlePrice(totalWasPrice) : null,
+        totalExcVatPrice: formatBundlePrice(totalExcVatPrice),
+        totalExcVatWasPrice: hasWasPrice ? formatBundlePrice(totalExcVatWasPrice) : null,
+    };
+}
+
+function bindCalculateProductBundleTotalEvent() {
+    $(window).on('calculateProductBundleTotal', function ({ detail: { payload, resolve } }) {
+        const entries = payload.entries || [];
+
+        setTimeout(function () {
+            resolve(calculateBundleTotal(entries));
+        }, 200);
+    });
+}
+
+function getAddProductBundleResponse() {
+    const responses = [
+        {
+            bulkAddToCartData: {
+                messageType: 'success',
+                messageText: 'Selected product(s) were added to basket',
+            },
+        },
+        {
+            bulkAddToCartData: {
+                messageType: 'warning',
+                messageText: 'Selected product(s) were partially added to basket',
+            },
+        },
+        {
+            bulkAddToCartData: {
+                messageType: 'error',
+                messageText: 'Selected product(s) were not added to basket',
+            },
+        },
+    ];
+
+    const response = responses[addToCartResponseIndex % responses.length];
+
+    addToCartResponseIndex++;
+
+    return response;
+}
+
+function bindAddProductBundleToCartEvent() {
+    $(window).on('bulkAddToCart', function ({ detail: { payload, resolve } }) {
+        const entries = payload.entries || [];
+
+        setTimeout(function () {
+            resolve(getAddProductBundleResponse(entries));
+        }, 1200);
+    });
+}
+
+$(document).ready(function () {
+    bindCalculateProductBundleTotalEvent();
+    bindAddProductBundleToCartEvent();
+});

package/src/js/emulation/bloomreach-widget-loading.js

@@ -0,0 +1,11 @@
+var Wick = window.Wick || {};
+
+$(document).ready(function () {
+    window.setTimeout(function () {
+        const $container = $('[data-complete-widget]');
+        const contextKey = $container.data('context-key');
+        const payloadData = Wick.FEMock.dataBloomreach[contextKey];
+
+        Wick.BloomreachWidget.init(payloadData);
+    }, 3000);
+});

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

@@ -19,9 +19,6 @@ 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',
                 },
             ],