wickes-css2 2.112.0-develop.4 → 2.112.0-develop.7

package/build/js/page/bloomreach-widget/why-not-add-widget.js

@@ -0,0 +1,198 @@
+var Wick = window.Wick || {};
+
+import { createLoadingButton } from '../utils/create-loading-button';
+
+const Handlebars = require('hbsfy/runtime');
+
+Handlebars.registerPartial('loader', require('../../../elements/loader.hbs'));
+Handlebars.registerPartial('button', require('../../../components/base/button.hbs'));
+Handlebars.registerPartial(
+    'bloomreach/why-not-add',
+    require('../../../components/bloomreach/why-not-add.hbs')
+);
+Handlebars.registerPartial(
+    'bloomreach/why-not-add-skeleton',
+    require('../../../components/bloomreach/why-not-add-skeleton.hbs')
+);
+Handlebars.registerPartial(
+    'bloomreach/why-not-add-card-skeleton',
+    require('../../../components/bloomreach/why-not-add-card-skeleton.hbs')
+);
+Handlebars.registerPartial(
+    'bloomreach/why-not-add-card',
+    require('../../../components/bloomreach/why-not-add-card.hbs')
+);
+Handlebars.registerPartial('reviews-rating', require('../../../components/reviews-rating.hbs'));
+
+const whyNotAddTemplate = require('../../../components/bloomreach/why-not-add-content.hbs');
+
+const WhyNotAddWidget = {
+    ADD_TO_CART_EVENT: 'addToCart',
+
+    products: [],
+    sliders: [],
+    loadingButton: null,
+
+    el: {
+        cta: '.why-not-add-card__cta',
+        next: '[data-why-not-add-next]',
+        pagination: '[data-why-not-add-pagination]',
+        prev: '[data-why-not-add-prev]',
+        root: '[data-why-not-add]',
+        slider: '[data-why-not-add-slider]',
+        widgetContainer: '[data-why-not-add-widget]',
+    },
+
+    normalizeProducts(payloadData) {
+        return Wick.BloomreachWidget.normalizePayload(payloadData)
+            .map(function (item) {
+                return item.baseProduct || item;
+            })
+            .slice(0, 5);
+    },
+
+    renderWidget($container, payloadData) {
+        const products = WhyNotAddWidget.normalizeProducts(payloadData);
+
+        if (!products.length) {
+            $container.empty().hide();
+            return;
+        }
+
+        WhyNotAddWidget.products = products;
+
+        $container
+            .html(
+                whyNotAddTemplate({
+                    products: products.map(Wick.BloomreachWidget.getProductRenderData),
+                    isSingleProduct: products.length === 1,
+                })
+            )
+            .show();
+    },
+
+    destroySliders() {
+        WhyNotAddWidget.sliders.forEach(function (slider) {
+            if (slider && slider.destroy) {
+                slider.destroy(true, true);
+            }
+        });
+
+        WhyNotAddWidget.sliders = [];
+    },
+
+    initSliders($root) {
+        WhyNotAddWidget.destroySliders();
+
+        $root.find(WhyNotAddWidget.el.slider).each(function () {
+            const $slider = $(this);
+            const $widget = $slider.closest(WhyNotAddWidget.el.root);
+            const slidesCount = $slider.find('.swiper-slide').length;
+
+            if (slidesCount <= 1) {
+                return;
+            }
+
+            const slider = new Swiper(this, {
+                roundLengths: true,
+                slidesPerView: 1,
+                spaceBetween: 12,
+                watchOverflow: true,
+                navigation: {
+                    nextEl: $widget.find(WhyNotAddWidget.el.next)[0],
+                    prevEl: $widget.find(WhyNotAddWidget.el.prev)[0],
+                    disabledClass: 'why-not-add__arrow--disabled',
+                },
+                pagination: {
+                    el: $widget.find(WhyNotAddWidget.el.pagination)[0],
+                    clickable: true,
+                    renderBullet(index, className) {
+                        return `<button class="${className}" type="button" aria-label="Go to slide ${
+                            index + 1
+                        }"></button>`;
+                    },
+                    bulletClass: 'why-not-add__pagination-item',
+                    bulletActiveClass: 'why-not-add__pagination-item--active',
+                },
+            });
+
+            WhyNotAddWidget.sliders.push(slider);
+        });
+    },
+    bindAddToCart($root) {
+        $root.off('click.whyNotAdd', WhyNotAddWidget.el.cta);
+        $root.on('click.whyNotAdd', WhyNotAddWidget.el.cta, function (event) {
+            event.preventDefault();
+
+            const $button = $(this);
+            const $card = $button.closest('.why-not-add-card');
+            const productCode = $card.attr('data-product-code');
+
+            if (!productCode || WhyNotAddWidget.loadingButton.isLoading($button)) {
+                return;
+            }
+
+            const payload = {
+                productCode,
+            };
+
+            WhyNotAddWidget.loadingButton.start($button);
+
+            Wick.BloomreachWidget.dispatchWidgetEvent(WhyNotAddWidget.ADD_TO_CART_EVENT, payload)
+                .then(function () {
+                    WhyNotAddWidget.loadingButton.stop($button);
+                    Wick.MiniBasketSliderFE.isMiniBasketLoaded = false;
+                })
+                .catch(function () {
+                    WhyNotAddWidget.loadingButton.stop($button);
+                });
+        });
+    },
+
+    bindVatToggle() {
+        if (Wick.BloomreachWidget.bindVatToggle) {
+            Wick.BloomreachWidget.bindVatToggle('whyNotAddVatToggle');
+        }
+    },
+
+    initRenderedWidget($container) {
+        const $root = $container.find(WhyNotAddWidget.el.root);
+
+        if (!$root.length) {
+            return;
+        }
+
+        if (!WhyNotAddWidget.loadingButton) {
+            WhyNotAddWidget.loadingButton = createLoadingButton({
+                text: Wick.BloomreachWidget.el.loadingButtonText,
+                loader: Wick.BloomreachWidget.el.loadingButtonLoader,
+            });
+        }
+
+        Wick.BloomreachWidget.removeBlankTargets($root);
+
+        Wick.BloomreachWidget.drawRating($root);
+        WhyNotAddWidget.initSliders($root);
+        WhyNotAddWidget.bindAddToCart($root);
+        WhyNotAddWidget.bindVatToggle();
+        Wick.BloomreachWidget.reapplyVatDisplay();
+    },
+
+    init(payloadData) {
+        const $containers = $(WhyNotAddWidget.el.widgetContainer);
+
+        if (!payloadData) {
+            $containers.empty().hide();
+            return;
+        }
+
+        $containers.each(function () {
+            const $container = $(this);
+
+            WhyNotAddWidget.renderWidget($container, payloadData);
+            WhyNotAddWidget.initRenderedWidget($container);
+        });
+    },
+};
+
+export default WhyNotAddWidget;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wickes-css2",
-  "version": "2.112.0-develop.4",
+  "version": "2.112.0-develop.7",
   "description": "CSS and JS and page templates in use by Wickes",
   "main": "index.js",
   "scripts": {
@@ -123,10 +123,6 @@
       {
         "name": "develop",
         "prerelease": true
-      },
-      {
-        "name": "custom-tag/*",
-        "prerelease": "${name.replace(/^custom-tag\\//g, '')}"
       }
     ],
     "plugins": [

package/src/components/bloomreach/complete-card.hbs

@@ -25,38 +25,10 @@
           {{name}}
         </a>
 
-        <div class="complete-card__reviews">
-          <div class="rating-bg">
-            <i class="fa fa-star star-in" aria-hidden="true"></i>
-            <i class="fa fa-star star-in" aria-hidden="true"></i>
-            <i class="fa fa-star star-in" aria-hidden="true"></i>
-            <i class="fa fa-star star-in" aria-hidden="true"></i>
-            <i class="fa fa-star star-in" aria-hidden="true"></i>
-
-            <div class="rating-overlay"
-                 data-rating="{{#if externalAverageRating}}{{externalAverageRating}}{{else}}0{{/if}}">
-                                <span class="star-overlay">
-                                    <i class="fa fa-star" aria-hidden="true"></i>
-                                </span>
-              <span class="star-overlay">
-                                    <i class="fa fa-star" aria-hidden="true"></i>
-                                </span>
-              <span class="star-overlay">
-                                    <i class="fa fa-star" aria-hidden="true"></i>
-                                </span>
-              <span class="star-overlay">
-                                    <i class="fa fa-star" aria-hidden="true"></i>
-                                </span>
-              <span class="star-overlay">
-                                    <i class="fa fa-star" aria-hidden="true"></i>
-                                </span>
-            </div>
-
-            <span class="complete-card__reviews-count">
-                (<span class="complete-card__reviews-count-value">{{externalReviewCount}}</span>)
-            </span>
-          </div>
-        </div>
+        {{> reviews-rating
+            externalAverageRating=externalAverageRating
+            externalReviewCount=externalReviewCount
+        }}
       </div>
       <div class="complete-card__options">
         {{#if dropdownOptions.length}}

package/src/components/bloomreach/why-not-add-card-skeleton.hbs

@@ -0,0 +1,14 @@
+<div class="why-not-add-card why-not-add-card--skeleton ssc">
+  <div class="ssc-square why-not-add-card__image"></div>
+
+  <div class="ssc-line why-not-add-card__skeleton-title"></div>
+  <div class="ssc-line why-not-add-card__skeleton-title-short"></div>
+
+  <div class="ssc-line why-not-add-card__skeleton-reviews"></div>
+
+  <div class="ssc-line why-not-add-card__skeleton-price"></div>
+
+  <div class="ssc-line why-not-add-card__skeleton-delivery"></div>
+
+  <div class="ssc-square why-not-add-card__skeleton-cta"></div>
+</div>

package/src/components/bloomreach/why-not-add-card.hbs

@@ -0,0 +1,73 @@
+<div class="why-not-add-card" data-product-code="{{code}}">
+  {{#if image.url}}
+    <img
+        class="why-not-add-card__image"
+        src="{{image.url}}"
+        alt="{{image.altText}}"
+    >
+  {{/if}}
+
+  <div class="why-not-add-card__content">
+    <a href="{{url}}" target="_blank" class="why-not-add-card__title">
+      {{name}}
+    </a>
+
+    {{> reviews-rating
+        externalAverageRating=externalAverageRating
+        externalReviewCount=externalReviewCount
+    }}
+
+    <div class="why-not-add-card__bottom">
+      <div class="why-not-add-card__price-wrap">
+        <div class="why-not-add-card__price {{#if wasPriceFormatted}}why-not-add-card__price--sale{{/if}}">
+          {{#if wasPriceFormatted}}
+            <span class="why-not-add-card__was-price">
+              {{#if switch-vat}}
+                <span class="including-vat-inherit">{{incVatWasPriceFormatted}}</span>
+                <span class="excluding-vat-inherit">{{excVatWasPriceFormatted}}</span>
+              {{else}}
+                {{wasPriceFormatted}}
+              {{/if}}
+            </span>
+
+            <span class="why-not-add-card__sale-price">
+              {{#if switch-vat}}
+                <span class="including-vat-inherit">{{incVatFormattedValue}}</span>
+                <span class="excluding-vat-inherit">{{excVatFormattedValue}}</span>
+              {{else}}
+                {{price.formattedValue}}
+              {{/if}}
+            </span>
+          {{else}}
+            <span class="why-not-add-card__regular-price">
+              {{#if switch-vat}}
+                <span class="including-vat-inherit">{{incVatFormattedValue}}</span>
+                <span class="excluding-vat-inherit">{{excVatFormattedValue}}</span>
+              {{else}}
+                {{price.formattedValue}}
+              {{/if}}
+            </span>
+          {{/if}}
+        </div>
+
+        {{#if switch-vat}}
+          <div class="why-not-add-card__vat-label">
+            <span class="including-vat-inherit">Inc.VAT</span>
+            <span class="excluding-vat-inherit">Exc.VAT</span>
+          </div>
+        {{/if}}
+
+        <div class="why-not-add-card__delivery">Excluding delivery</div>
+      </div>
+
+      {{> button
+          type="button"
+          action=true
+          icon="fas fa-shopping-basket"
+          showLoader=true
+          loaderModifier="why-not-add-card__loader"
+          modification="why-not-add-card__cta"
+      }}
+    </div>
+  </div>
+</div>

package/src/components/bloomreach/why-not-add-content.hbs

@@ -0,0 +1,41 @@
+<div class="why-not-add {{#if isSingleProduct}}why-not-add--single{{/if}}" data-why-not-add>
+  <div class="why-not-add__header">
+    <h3 class="why-not-add__title">Why not add</h3>
+
+    {{#unless isSingleProduct}}
+      <div class="why-not-add__arrows">
+        <button
+            class="why-not-add__arrow why-not-add__arrow-prev"
+            type="button"
+            aria-label="Previous slide"
+            data-why-not-add-prev
+        >
+          <i class="fas fa-chevron-left"></i>
+        </button>
+
+        <button
+            class="why-not-add__arrow why-not-add__arrow-next"
+            type="button"
+            aria-label="Next slide"
+            data-why-not-add-next
+        >
+          <i class="fas fa-chevron-right"></i>
+        </button>
+      </div>
+    {{/unless}}
+  </div>
+
+  <div class="swiper-container why-not-add__slider" data-why-not-add-slider>
+    <div class="swiper-wrapper">
+      {{#each products}}
+        <div class="swiper-slide why-not-add__slide">
+          {{> bloomreach/why-not-add-card this}}
+        </div>
+      {{/each}}
+    </div>
+  </div>
+
+  {{#unless isSingleProduct}}
+    <div class="why-not-add__pagination" data-why-not-add-pagination></div>
+  {{/unless}}
+</div>

package/src/components/bloomreach/why-not-add-skeleton.hbs

@@ -0,0 +1,9 @@
+<div class="why-not-add why-not-add--skeleton ssc">
+  <div class="why-not-add__header">
+    <div class="ssc-line why-not-add__skeleton-title"></div>
+  </div>
+
+  <div class="why-not-add__skeleton-cards">
+    {{> bloomreach/why-not-add-card-skeleton}}
+  </div>
+</div>

package/src/components/bloomreach/why-not-add.hbs

@@ -0,0 +1,6 @@
+<div
+    data-why-not-add-widget
+    data-mock-key="{{context}}"
+>
+  {{> bloomreach/why-not-add-skeleton}}
+</div>

package/src/components/my-account/order.hbs

@@ -2,7 +2,12 @@
   <div class="order__header">
     <h3 class="order__title">{{title}}</h3>
     <div class="order__subtotal-wrap">
-      <p class="order__subtotal">Item(s) subtotal: <b>{{subtotal}}</b></p>
+      {{#if switchVat}}
+        <p class="order__subtotal including-vat">Item(s) subtotal: <b>{{subtotal}}</b></p>
+        <p class="order__subtotal excluding-vat d-none">Item(s) subtotal: <b>{{subtotalExcVat}}</b></p>
+      {{else}}
+        <p class="order__subtotal">Item(s) subtotal: <b>{{subtotal}}</b></p>
+      {{/if}}
       {{> info-icon
           modification="icon-info"
           title=subtotalTooltip

package/src/components/order-item.hbs

@@ -91,20 +91,20 @@
             <div class="order-item__price">
                 <div class="order-item__price-title">Item price:</div>
                 <div class="order-item__price-value">
-                    {{#ifvalue price value='0'}}
+                    {{#ifvalue displayBasePrice value='0'}}
                         <span class="order-item__value">FREE</span>
                     {{else}}
                         {{#if switch-vat}}
                             <div class="including-vat">
-                                <span class="order-item__value">£{{price}}</span>
+                                <span class="order-item__value">£{{displayBasePrice}}</span>
                                 <div class="price-vat">Inc.VAT</div>
                             </div>
                             <div class="excluding-vat d-none">
-                                <span class="order-item__value">£{{priceExcVat}}</span>
+                                <span class="order-item__value">£{{displayBasePriceExclusiveVat}}</span>
                                 <div class="price-vat">Exc.VAT</div>
                             </div>
                         {{else}}
-                            <span class="order-item__value">£{{price}}</span>
+                            <span class="order-item__value">£{{displayBasePrice}}</span>
                         {{/if}}
                     {{/ifvalue}}
                 </div>
@@ -136,15 +136,15 @@
                     {{else}}
                         {{#if switch-vat}}
                             <div class="including-vat">
-                                <span class="order-item__value">£{{total}}</span>
+                                <span class="order-item__value">£{{displayItemTotalWithoutDiscount}}</span>
                                 <div class="price-vat">Inc.VAT</div>
                             </div>
                             <div class="excluding-vat d-none">
-                                <span class="order-item__value">£{{totalExcVat}}</span>
+                                <span class="order-item__value">£{{displayItemTotalWithoutDiscountExclusiveVat}}</span>
                                 <div class="price-vat">Exc.VAT</div>
                             </div>
                         {{else}}
-                            <span class="order-item__value">£{{total}}</span>
+                            <span class="order-item__value">£{{displayItemTotalWithoutDiscount}}</span>
                         {{/if}}
                     {{/ifvalue}}
                 </div>

package/src/components/pdp-price-actions.hbs

@@ -1,7 +1,7 @@
 {{#if c-and-c}}
 <div class="{{#if tile-measurement}}ti__total{{else}}pdp-price{{/if}}__control-holder">
-  <button class="btn btn-primary btn_full" data-toggle="modal" data-target="#modal-click-and-collect">
-    <span class="btn__text">FREE Click & Collect within 30 minutes</span>
+  <button class="btn btn-action btn_full" data-toggle="modal" data-target="#modal-click-and-collect">
+    <span class="btn__text">Click & Collect</span>
   </button>
 </div>
 {{/if}}

package/src/components/potential-promotion.hbs

@@ -2,16 +2,16 @@
     <div class="p-promotion__icon">
         <i class="icon fas fa-gift"></i>
     </div>
-    {{#ifCond switch-vat '&&' descriptionExcVat}}
+    {{#ifCond switch-vat '&&' displayDescriptionExclusiveVat}}
         <div class="p-promotion__description including-vat">
-            {{description}}
+            {{displayDescription}}
         </div>
         <div class="p-promotion__description excluding-vat d-none">
-            {{descriptionExcVat}}
+            {{displayDescriptionExclusiveVat}}
         </div>
     {{else}}
         <div class="p-promotion__description">
-            {{description}}
+            {{displayDescription}}
         </div>
     {{/ifCond}}
     <div class="p-promotion__close">

package/src/components/price-badges.hbs

@@ -0,0 +1,12 @@
+<div class="pdp__badges-wrapper">
+    <div class="pdp__badges pdp-price-container__badges price__badges-v2 price__badges-v2-{{badge-color}}
+        {{#if badge-text-color}}price__badges-v2-text-{{badge-text-color}}{{/if}}
+        {{#if badge-wide}}price__badges-v2-wide{{/if}}">
+        {{#ifCond switch-vat '&&' badge-text-exc}}
+            <div class="pdp__badge including-vat">{{badge-text}}</div>
+            <div class="pdp__badge excluding-vat d-none">{{badge-text-exc}}</div>
+        {{else}}
+            <div class="pdp__badge">{{badge-text}}</div>
+        {{/ifCond}}
+    </div>
+</div>

package/src/components/price-block-v2.hbs

@@ -1,17 +1,8 @@
 <div class="pdp-price-container">
-  {{#if isDiscount}}
-    <div class="pdp__badges pdp-price-container__badges price__badges-v2 price__badges-v2-{{badge-color}}
-      {{#if badge-text-color}}price__badges-v2-text-{{badge-text-color}}{{/if}}
-      {{#if badge-wide}}price__badges-v2-wide{{/if}}">
-      {{#ifCond switch-vat '&&' badge-text-exc}}
-        <div class="pdp__badge including-vat">{{badge-text}}</div>
-        <div class="pdp__badge excluding-vat d-none">{{badge-text-exc}}</div>
-      {{else}}
-        <div class="pdp__badge">{{badge-text}}</div>
-      {{/ifCond}}
-    </div>
-  {{/if}}
   <div class="pdp-price">
+    {{#if isDiscount}}
+        {{> price-badges}}
+    {{/if}}
     <div class="pdp-price__value">
       {{#if switch-vat}}
         <div class="pdp-price-sale__value including-vat">
@@ -196,6 +187,8 @@
         </div>
       {{/if}}
 
+      {{> bloomreach/why-not-add context=mockDataKey}}
+
       {{#if mfeProductCalculator}}
         <div class="pdp-price__quantity-calculator">MFE Calculator Placeholder</div>
       {{/if}}

package/src/components/reviews-rating.hbs

@@ -0,0 +1,22 @@
+<div class="reviews">
+  <div class="rating-bg">
+    <i class="fa fa-star star-in" aria-hidden="true"></i>
+    <i class="fa fa-star star-in" aria-hidden="true"></i>
+    <i class="fa fa-star star-in" aria-hidden="true"></i>
+    <i class="fa fa-star star-in" aria-hidden="true"></i>
+    <i class="fa fa-star star-in" aria-hidden="true"></i>
+
+    <div
+        class="rating-overlay"
+        data-rating="{{#if externalAverageRating}}{{externalAverageRating}}{{else}}0{{/if}}"
+    >
+      <span class="star-overlay"><i class="fa fa-star" aria-hidden="true"></i></span>
+      <span class="star-overlay"><i class="fa fa-star" aria-hidden="true"></i></span>
+      <span class="star-overlay"><i class="fa fa-star" aria-hidden="true"></i></span>
+      <span class="star-overlay"><i class="fa fa-star" aria-hidden="true"></i></span>
+      <span class="star-overlay"><i class="fa fa-star" aria-hidden="true"></i></span>
+    </div>
+
+    <span class="{{#if countClass}}{{countClass}}{{else}}reviews-count{{/if}}">(<span class="{{#if countValueClass}}{{countValueClass}}{{else}}reviews-count-value{{/if}}">{{#if externalReviewCount}}{{externalReviewCount}}{{else}}0{{/if}}</span>)</span>
+  </div>
+</div>

package/src/components/share-list-modal-without-social-icons.hbs

@@ -18,10 +18,10 @@
 
         <form class="share-list__form" action="#" id="share-list-form">
 
-          {{> form-row type="email" id="share-via-email" label="Share via email" info="Enter email addresses separated by space:"}}
+          {{> form-row type="text" id="share-via-email" label="Share via email" info="Enter email addresses separated by space:"}}
 
           <div class="share-via-email-box">
-            {{> form-row type="email"}}
+            {{> form-row type="text"}}
           </div>
 
           <span id="add-btn" class="add-email-btn">

package/src/components/share-list-modal.hbs

@@ -18,10 +18,10 @@
 
             <form class="share-list__form" action="#" id="share-list-form">
 
-                {{> form-row type="email" id="share-via-email" label="Share via email" info="Enter email addresses separated by space:"}}
+                {{> form-row type="text" id="share-via-email" label="Share via email" info="Enter email addresses separated by space:"}}
 
                 <div class="share-via-email-box">
-                    {{> form-row type="email"}}
+                    {{> form-row type="text"}}
                 </div>
 
                 <span id="add-btn" class="add-email-btn">
@@ -89,6 +89,10 @@
     })
 
     $(".share-list__cancel").bind("click", function() {
-        $("input[type=email]").val("");
+        $(".js-share-email").val("");
+
+        if (window.Wick && Wick.ShoppingList && typeof Wick.ShoppingList.resetFormErrors === "function") {
+            Wick.ShoppingList.resetFormErrors();
+        }
     });
 </script>