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

package/build/js/page/basket-v2.js

@@ -277,13 +277,14 @@ Wick.BasketPage = {
             if (isSwitchVat) {
                 const itemTotalIncVat = context.find(Wick.BasketPage.el.itemTotalIncVat);
                 const itemTotalExcVat = context.find(Wick.BasketPage.el.itemTotalExcVat);
-                const totalPrice = data.entry.itemTotalWithoutDiscount.formattedValue;
-                const totalPriceExcVat = data.entry.itemTotalWithoutDiscountExcVat.formattedValue;
+                const totalPrice = data.entry.displayItemTotalWithoutDiscount.formattedValue;
+                const totalPriceExcVat =
+                    data.entry.displayItemTotalWithoutDiscountExclusiveVat.formattedValue;
                 itemTotalIncVat.text(totalPrice);
                 itemTotalExcVat.text(totalPriceExcVat);
             } else {
                 const totalValue = context.find(Wick.BasketPage.el.itemTotal);
-                const totalPrice = data.entry.itemTotalWithoutDiscount.formattedValue;
+                const totalPrice = data.entry.displayItemTotalWithoutDiscount.formattedValue;
                 totalValue.text(totalPrice);
             }
         }
@@ -798,20 +799,20 @@ Wick.BasketPage = {
                             <div class="order-item__price-title">Item price:</div>
                             <div class="order-item__price-value">
                             ${
-                                currentItem.basePrice.value === 0
+                                currentItem.displayBasePrice.value === 0
                                     ? '<span class="order-item__value">FREE</span>'
                                     : Wick.VatToggle.isToggleVatAvailable()
                                       ? `
                                             <div class="including-vat"><!--
-                                                --><span class="order-item__value">${currentItem.basePrice.formattedValue}</span><!--
+                                                --><span class="order-item__value">${currentItem.displayBasePrice.formattedValue}</span><!--
                                                 --><div class="price-vat">Inc.VAT</div>
                                             </div>
                                             <div class="excluding-vat"><!--
-                                                --><span class="order-item__value">${currentItem.basePriceExcVat.formattedValue}</span><!--
+                                                --><span class="order-item__value">${currentItem.displayBasePriceExclusiveVat.formattedValue}</span><!--
                                                 --><div class="price-vat">Exc.VAT</div>
                                             </div>
                                           `
-                                      : `<span class="order-item__value">${currentItem.basePrice.formattedValue}</span>`
+                                      : `<span class="order-item__value">${currentItem.displayBasePrice.formattedValue}</span>`
                             }
                             </div>
                         </div>
@@ -820,20 +821,20 @@ Wick.BasketPage = {
                             <div class="order-item__total-title">Item total:</div>
                             <div class="order-item__total-value">
                                 ${
-                                    currentItem.itemTotalWithoutDiscount.value === 0
+                                    currentItem.displayItemTotalWithoutDiscount.value === 0
                                         ? '<span class="order-item__value">FREE</span>'
                                         : Wick.VatToggle.isToggleVatAvailable()
                                           ? `
                                                 <div class="including-vat"><!--
-                                                    --><span class="order-item__value">${currentItem.itemTotalWithoutDiscount.formattedValue}</span><!--
+                                                    --><span class="order-item__value">${currentItem.displayItemTotalWithoutDiscount.formattedValue}</span><!--
                                                     --><div class="price-vat">Inc.VAT</div><!--
                                                 --></div>
                                                 <div class="excluding-vat"><!--
-                                                    --><span class="order-item__value">${currentItem.itemTotalWithoutDiscountExcVat.formattedValue}</span><!--
+                                                    --><span class="order-item__value">${currentItem.displayItemTotalWithoutDiscountExclusiveVat.formattedValue}</span><!--
                                                     --><div class="price-vat">Exc.VAT</div>
                                                 </div>
                                             `
-                                          : `<span class="order-item__value">${currentItem.itemTotalWithoutDiscount.formattedValue}</span>`
+                                          : `<span class="order-item__value">${currentItem.displayItemTotalWithoutDiscount.formattedValue}</span>`
                                 }
                             </div>
                         </div>
@@ -929,7 +930,7 @@ Wick.BasketPage = {
         data.appliedProductPromotions &&
             data.appliedProductPromotions.forEach((entry) => {
                 entry.consumedEntries.forEach((promo) => {
-                    if (promo.orderEntryNumber === item.entryNumber && entry.description) {
+                    if (promo.orderEntryNumber === item.entryNumber && entry.displayDescription) {
                         if (arr.length) {
                             let duplicate = arr.every((el) => {
                                 return el !== Wick.BasketPage.buildPromotion(entry);
@@ -1115,15 +1116,19 @@ Wick.BasketPage = {
         const arr = [];
         if (data.potentialOrderPromotions && data.potentialOrderPromotions.length) {
             data.potentialOrderPromotions.forEach((promo) => {
-                !promo.description ||
+                !promo.displayDescription ||
                     arr.push(`
                     <div class="p-promotion">
                         <div class="p-promotion__icon">
                             <i class="icon fas fa-gift"></i>
                         </div>
-                        <div class="p-promotion__description">
-                            ${promo.description}
-                        </div>
+                        ${
+                            Wick.VatToggle.isToggleVatAvailable() &&
+                            promo.displayDescriptionExclusiveVat
+                                ? `<div class="p-promotion__description including-vat">${promo.displayDescription}</div>
+                               <div class="p-promotion__description excluding-vat d-none">${promo.displayDescriptionExclusiveVat}</div>`
+                                : `<div class="p-promotion__description">${promo.displayDescription}</div>`
+                        }
                         <div class="p-promotion__close">
                             <i class="icon fas fa-times"></i>
                         </div>
@@ -1134,15 +1139,19 @@ Wick.BasketPage = {
 
         if (data.appliedOrderPromotions && data.appliedOrderPromotions.length) {
             data.appliedOrderPromotions.forEach((promo) => {
-                !promo.description ||
+                !promo.displayDescription ||
                     arr.push(`
                     <div class="p-promotion">
                         <div class="p-promotion__icon">
                             <i class="icon fas fa-gift"></i>
                         </div>
-                        <div class="p-promotion__description">
-                            ${promo.description}
-                        </div>
+                        ${
+                            Wick.VatToggle.isToggleVatAvailable() &&
+                            promo.displayDescriptionExclusiveVat
+                                ? `<div class="p-promotion__description including-vat">${promo.displayDescription}</div>
+                               <div class="p-promotion__description excluding-vat d-none">${promo.displayDescriptionExclusiveVat}</div>`
+                                : `<div class="p-promotion__description">${promo.displayDescription}</div>`
+                        }
                         <div class="p-promotion__close">
                             <i class="icon fas fa-times"></i>
                         </div>

package/build/js/page/bloomreach-widget/bloomreach-widget.js

@@ -0,0 +1,250 @@
+var Wick = window.Wick || {};
+
+import { isApp } from '../utils/helpers';
+import { createEvent } from '../utils/create-event';
+import CompleteYourProjectWidget from './complete-your-project-widget';
+import WhyNotAddWidget from './why-not-add-widget';
+
+Wick.BloomreachWidget = {
+    widgets: {},
+
+    el: {
+        loadingButtonText: '.loading-button__text',
+        loadingButtonLoader: '.loading-button__loader',
+        ratingOverlay: '.rating-overlay',
+        starOverlay: '.star-overlay',
+        vatInc: '.including-vat-inherit',
+        vatExc: '.excluding-vat-inherit',
+    },
+
+    registerWidgets(widgetList) {
+        widgetList.forEach(function ({ type, widget }) {
+            Wick.BloomreachWidget.widgets[type] = widget;
+        });
+    },
+
+    getWidget(type) {
+        return Wick.BloomreachWidget.widgets[type];
+    },
+
+    init(type, payloadData) {
+        const widget = Wick.BloomreachWidget.getWidget(type);
+
+        if (!widget || typeof widget.init !== 'function') {
+            return;
+        }
+
+        widget.init(payloadData, Wick.BloomreachWidget);
+    },
+
+    normalizePayload(payloadData) {
+        if (Array.isArray(payloadData)) {
+            return payloadData;
+        }
+
+        if (payloadData && Array.isArray(payloadData.recommendedProducts)) {
+            return payloadData.recommendedProducts;
+        }
+
+        return [];
+    },
+
+    hasRecommendations(payloadData) {
+        return Wick.BloomreachWidget.normalizePayload(payloadData).length > 0;
+    },
+
+    getDisplayPrice(product) {
+        return product.displayPrice || product.price || {};
+    },
+
+    getDisplayPriceExcVat(product) {
+        return product.displayPriceExclusiveVat || product.priceExclusiveVat || null;
+    },
+
+    getPriceValue(price) {
+        return price && typeof price.value === 'number' ? price.value : 0;
+    },
+
+    getPriceFormattedValue(price) {
+        if (!price) {
+            return '';
+        }
+
+        if (price.formattedValue) {
+            return price.formattedValue;
+        }
+
+        if (typeof price.value === 'number') {
+            return Wick.BloomreachWidget.formatPrice(price.value);
+        }
+
+        return '';
+    },
+
+    removeBlankTargets($root) {
+        if (!isApp()) {
+            return;
+        }
+
+        $root.find('a[target="_blank"]').removeAttr('target');
+    },
+
+    getWasPrice(product) {
+        const displayPrice = Wick.BloomreachWidget.getDisplayPrice(product);
+
+        return displayPrice && displayPrice.wasPrice ? displayPrice.wasPrice : null;
+    },
+
+    getWasPriceFormatted(product) {
+        const displayPrice = Wick.BloomreachWidget.getDisplayPrice(product);
+        const wasPrice = Wick.BloomreachWidget.getWasPrice(product);
+
+        if (wasPrice && wasPrice.formattedValue) {
+            return wasPrice.formattedValue;
+        }
+
+        if (typeof wasPrice === 'number') {
+            return Wick.BloomreachWidget.formatPrice(wasPrice);
+        }
+
+        if (wasPrice) {
+            return `${displayPrice.currencySymbol || '£'}${wasPrice}`;
+        }
+
+        return '';
+    },
+
+    getExcVatWasPrice(product) {
+        const priceExclusiveVat = product.priceExclusiveVat || null;
+        const displayPriceExclusiveVat = product.displayPriceExclusiveVat || null;
+        const wasPrice =
+            (displayPriceExclusiveVat && displayPriceExclusiveVat.wasPrice) ||
+            (priceExclusiveVat && priceExclusiveVat.wasPrice);
+
+        if (wasPrice && wasPrice.formattedValue) {
+            return wasPrice.formattedValue;
+        }
+
+        if (typeof wasPrice === 'number') {
+            return Wick.BloomreachWidget.formatPrice(wasPrice);
+        }
+
+        return wasPrice || '';
+    },
+
+    getProductImage(product, fallbackProduct) {
+        const productImages = product.images || [];
+        const fallbackImages = fallbackProduct ? fallbackProduct.images || [] : [];
+        const images = productImages.length ? productImages : fallbackImages;
+
+        return (
+            images.find(function (item) {
+                return item.format === 'product';
+            }) ||
+            images.find(function (item) {
+                return item.imageType === 'PRIMARY';
+            }) ||
+            images[0] ||
+            {}
+        );
+    },
+
+    getProductRenderData(product, options = {}) {
+        const displayPrice = Wick.BloomreachWidget.getDisplayPrice(product);
+        const displayPriceExcVat = Wick.BloomreachWidget.getDisplayPriceExcVat(product);
+        const wasPriceFormatted = Wick.BloomreachWidget.getWasPriceFormatted(product);
+        const excVatWasPriceFormatted = Wick.BloomreachWidget.getExcVatWasPrice(product);
+        const isSwitchVat = !!(window.ACC && window.ACC.app && window.ACC.app.isVatToggleAvailable);
+
+        return {
+            ...product,
+            price: displayPrice,
+            image:
+                options.image ||
+                Wick.BloomreachWidget.getProductImage(product, options.fallbackProduct),
+            wasPriceFormatted,
+            'switch-vat': isSwitchVat,
+            incVatFormattedValue: Wick.BloomreachWidget.getPriceFormattedValue(displayPrice),
+            incVatValue: Wick.BloomreachWidget.getPriceValue(displayPrice),
+            excVatFormattedValue: Wick.BloomreachWidget.getPriceFormattedValue(displayPriceExcVat),
+            excVatValue: Wick.BloomreachWidget.getPriceValue(displayPriceExcVat),
+            incVatWasPriceFormatted: wasPriceFormatted,
+            excVatWasPriceFormatted: Wick.BloomreachWidget.getExcVatWasPrice(product),
+        };
+    },
+
+    drawRating($root) {
+        const { ratingOverlay, starOverlay } = Wick.BloomreachWidget.el;
+
+        $root.find(ratingOverlay).each(function () {
+            let rating = parseFloat($(this).attr('data-rating')) || 0;
+            const $stars = $(this).children(starOverlay);
+
+            $stars.each(function () {
+                const $star = $(this);
+
+                if (rating >= 1) {
+                    rating--;
+                } else if (rating > 0) {
+                    const width = Math.asin(2 * rating - 1) / Math.PI + 0.5;
+                    $star.css('width', width + 'rem');
+                    rating = 0;
+                } else {
+                    $star.css('width', '0rem');
+                }
+            });
+        });
+    },
+
+    dispatchWidgetEvent(eventName, payload) {
+        return new Promise(function (resolve, reject) {
+            const eventDetail = { resolve, reject };
+            const event = createEvent(eventName, payload, eventDetail);
+
+            window.dispatchEvent(event);
+        });
+    },
+
+    reapplyVatDisplay() {
+        if (!Wick.VatToggle || typeof Wick.VatToggle.isActive !== 'function') {
+            return;
+        }
+
+        const { vatInc, vatExc } = Wick.BloomreachWidget.el;
+        const hiddenClassName = Wick.VatToggle.HIDDEN_CLASS_NAME || 'd-none';
+        const isExcVatActive = Wick.VatToggle.isActive();
+
+        $(vatInc).toggleClass(hiddenClassName, isExcVatActive);
+        $(vatExc).toggleClass(hiddenClassName, !isExcVatActive);
+    },
+
+    bindVatToggle(namespace) {
+        if (!Wick.VatToggle || !Wick.VatToggle.TOGGLE_VAT_EVENT_NAME) {
+            return;
+        }
+
+        const eventName = `${Wick.VatToggle.TOGGLE_VAT_EVENT_NAME}.${namespace}`;
+
+        $(window).off(eventName).on(eventName, Wick.BloomreachWidget.reapplyVatDisplay);
+    },
+
+    formatPrice(value) {
+        return new Intl.NumberFormat('en-GB', {
+            style: 'currency',
+            currency: 'GBP',
+            minimumFractionDigits: 2,
+            maximumFractionDigits: 2,
+        }).format(value);
+    },
+};
+
+Wick.BloomreachWidget.registerWidgets([
+    {
+        type: 'completeYourProject',
+        widget: CompleteYourProjectWidget,
+    },
+    {
+        type: 'whyNotAdd',
+        widget: WhyNotAddWidget,
+    },
+]);