wickes-css2 2.106.0-develop.6 → 2.106.0-develop.8

package/src/js/page/components/order-summary.js

@@ -13,31 +13,46 @@ const osEl = {
 }
 
 export function updateOrderSummary(data, equalMap, isVoucher) {
-    equalMap.forEach((obj) => {
-        if ($(obj.item).length) {
-            $(obj.item).show();
-        } else {
-            if ($(osEl.checkoutWidgetDetailsDiscount).length) {
-                $(osEl.checkoutWidgetDetailsDiscount).before(createCheckoutWidgetItem(obj))
-            } else {
-                $(osEl.checkoutWidgetDetails).append(createCheckoutWidgetItem(obj))
-            }
-        }
+  equalMap.forEach((obj) => {
+    if (typeof obj.dataValue === 'undefined') return;
 
-        $(obj.item).find(obj.itemValue).text(obj.dataValue);
-        if (isVoucher ? obj.dataValue : obj.value && obj.dataValue) {
-            $(obj.item).find(obj.itemValue).show();
-        } else {
-            $(obj.item).hide();
-        }
-    })
+    if ($(obj.item).length) {
+      $(obj.item).show();
+    } else {
+      if ($(osEl.checkoutWidgetDetailsDiscount).length) {
+        $(osEl.checkoutWidgetDetailsDiscount).before(createCheckoutWidgetItem(obj));
+      } else {
+        $(osEl.checkoutWidgetDetails).append(createCheckoutWidgetItem(obj));
+      }
+    }
 
-    const value = data.totalPrice?.formattedValue || data.total;
+    $(obj.item).find(obj.itemValue).text(obj.dataValue);
+    if (isVoucher ? obj.dataValue : obj.value && obj.dataValue) {
+      $(obj.item).find(obj.itemValue).show();
+    } else {
+      $(obj.item).hide();
+    }
+  });
 
+  const keys = new Set(Object.keys(data || {}));
+  const hasAny = (...arr) => arr.some(k => keys.has(k));
+
+  const value = data.totalPrice?.formattedValue || data.total;
+  if (typeof value !== 'undefined' && hasAny('total', 'totalPrice')) {
+    updateSummaryMobileBarTotal(value);
+  }
+
+  if (hasAny('promotionsInfo')) {
     updateDiscount(data, isVoucher);
+  }
+
+  if (hasAny('deliveryOrder', 'clickAndCollectOrder', 'clickAndCollectOnly', 'deliveryItemsQuantity', 'pickupItemsQuantity')) {
     hideUnusedDeliveryTypeCost(data, isVoucher);
+  }
+
+  if (hasAny('freeDelivery', 'messageForFreeDelivery', 'clickAndCollectOnly')) {
     calculateFreeDelivery(data);
-    updateSummaryMobileBarTotal(value);
+  }
 }
 
 function createCheckoutWidgetItem(obj) {
@@ -53,12 +68,14 @@ function hideUnusedDeliveryTypeCost(data, isVoucher) {
     $(osEl.delivery).show()
     $(osEl.cc).show()
     if (isVoucher) {
-        if (!data.deliveryOrder) {
-            $(osEl.delivery).hide()
-        } else if (!data.clickAndCollectOrder) {
-            $(osEl.cc).hide()
-        }
-    } else {
+      if ('deliveryOrder' in data && data.deliveryOrder === false) {
+        $(osEl.delivery).hide();
+      }
+
+      if ('clickAndCollectOrder' in data && data.clickAndCollectOrder === false) {
+        $(osEl.cc).hide();
+      }
+  } else {
         if (data.clickAndCollectOnly) {
             $(osEl.delivery).hide()
         } else if (data.deliveryItemsQuantity > 0 && data.pickupItemsQuantity === 0) {

package/src/js/page/components/toggle-password-visibility.js

@@ -0,0 +1,22 @@
+import { initializeInputToggle } from "../utils/show-hide-input";
+
+var Wick = window.Wick || {};
+
+Wick.TogglePasswordVisibility = {
+  el: {
+    $containers: $('.form-row[data-show-content] .input-wrap'),
+  },
+
+  init() {
+    if (!this.el.$containers.length) {
+      return;
+    }
+    this.el.$containers.each(function () {
+      initializeInputToggle($(this));
+    });
+  },
+};
+
+$(document).ready(function () {
+  Wick.TogglePasswordVisibility.init();
+});

package/src/js/page/components/voucher.js

@@ -1,11 +1,11 @@
-import {updateOrderSummary} from './order-summary';
-import {callAction} from '../utils/http-action';
-import {retryAction, retryHelpers} from "./retry-action";
-import {showValidationErrors} from '../utils/validation'
-import {updateKlarnaPlacements} from '../basket/klarna';
-import {getCSRFToken, CSRF} from "./csrf";
-import {ROUTES} from '../utils/routes';
-import {updateClearpayPlacements, updateClearpayVisibility} from '../basket/clearpay';
+import { updateOrderSummary } from './order-summary';
+import { callAction } from '../utils/http-action';
+import { retryAction, retryHelpers } from './retry-action';
+import { showValidationErrors } from '../utils/validation';
+import { updateKlarnaPlacements } from '../basket/klarna';
+import { getCSRFToken, CSRF } from './csrf';
+import { ROUTES } from '../utils/routes';
+import { updateClearpayPlacements, updateClearpayVisibility } from '../basket/clearpay';
 
 const voucherEl = {
     $basketVoucher: $('.checkout-voucher'),
@@ -30,8 +30,10 @@ const voucherEl = {
 };
 
 export function checkVoucherCode(e, current) {
-    e && e.preventDefault()
-    const context = current ? $(current).closest(voucherEl.voucher) : $(this).closest(voucherEl.voucher),
+    e && e.preventDefault();
+    const context = current
+            ? $(current).closest(voucherEl.voucher)
+            : $(this).closest(voucherEl.voucher),
         value = context.find('input').val().trim(),
         encodedValue = encodeURIComponent(value),
         errorMsg = {
@@ -39,8 +41,8 @@ export function checkVoucherCode(e, current) {
             responseJSON: {
                 globalMessage: {
                     message: 'Please enter a voucher code',
-                }
-            }
+                },
+            },
         };
 
     if (value && value.length) {
@@ -59,7 +61,7 @@ function executionVoucherApplying(value, context) {
             url: `${ROUTES.VOUCHER_UPDATE}/${value}`,
             type: 'POST',
             headers: {
-                'CSRFToken': CSRF.getToken(),
+                CSRFToken: CSRF.getToken(),
             },
             retryLimit: retryHelpers.retryLimit,
             error: notApplyVoucher,
@@ -79,7 +81,7 @@ export function voucherRemove() {
     let voucher = $(this).parent(),
         voucherCode = voucher.attr('data-coupon-code');
     voucher.addClass('checkout-widget__voucher-removed').text('Voucher removed');
-    voucherRemoveAction(voucherCode, voucher)
+    voucherRemoveAction(voucherCode, voucher);
 }
 
 function voucherRemoveAction(code) {
@@ -90,7 +92,7 @@ function voucherRemoveAction(code) {
             type: 'DELETE',
             headers: {
                 'Content-Type': 'application/json',
-                'CSRFToken': CSRF.getToken(),
+                CSRFToken: CSRF.getToken(),
             },
             error: handleVoucherRemovingError,
         };
@@ -106,12 +108,11 @@ function formattedTotalPriceWithoutSymbol(val) {
 }
 
 function executionVoucherRemoving(data) {
-    updateOrderSummary(
-        data,
-        getEqualMapForVoucherUpdate(data),
-        true
+    updateOrderSummary(data, getEqualMapForVoucherUpdate(data), true);
+    updateKlarnaPlacements(
+        formattedTotalPriceWithoutSymbol(data.total),
+        data.paymentInfos.klarnaPaymentInfo.customPaymentMethodIds
     );
-    updateKlarnaPlacements(formattedTotalPriceWithoutSymbol(data.total));
     updateClearpayPlacements(data.total);
     updateClearpayVisibility(data.total);
 }
@@ -123,19 +124,18 @@ function applyVoucher(data, context) {
 
     clearValidationErrors($voucherForm);
     voucherEl.$basketVoucher.toggle(voucherEl.voucherHide);
-    updateOrderSummary(
-        data,
-        getEqualMapForVoucherUpdate(data),
-        true
+    updateOrderSummary(data, getEqualMapForVoucherUpdate(data), true);
+    updateKlarnaPlacements(
+        formattedTotalPriceWithoutSymbol(data.total),
+        data.paymentInfos.klarnaPaymentInfo.customPaymentMethodIds
     );
-    updateKlarnaPlacements(formattedTotalPriceWithoutSymbol(data.total));
     updateClearpayPlacements(data.total);
     updateClearpayVisibility(data.total);
     setTimeout(function () {
         voucherButton.attr('disabled', false);
         $voucherFormInput.val('');
         voucherEl.$basketVoucher.toggle(voucherEl.voucherHide);
-    }, 5000)
+    }, 5000);
 }
 
 function notApplyVoucher(xhr, context) {
@@ -158,21 +158,25 @@ function notApplyVoucher(xhr, context) {
 function retryVoucherAction(voucherForm) {
     return new Promise((resolve) => {
         getCSRFToken(resolve);
-    }).then(() => {
-        retryAction(checkVoucherCode, retryHelpers.retryLimit, ...Array(1), voucherForm)
-    }).catch(() => {
-        showDefaultError();
     })
+        .then(() => {
+            retryAction(checkVoucherCode, retryHelpers.retryLimit, ...Array(1), voucherForm);
+        })
+        .catch(() => {
+            showDefaultError();
+        });
 }
 
 function retryVoucherRemoving(code) {
     return new Promise((resolve) => {
         getCSRFToken(resolve);
-    }).then(() => {
-        retryAction(voucherRemoveAction, retryHelpers.retryLimit, code);
-    }).catch(() => {
-        console.log('remove failed');
     })
+        .then(() => {
+            retryAction(voucherRemoveAction, retryHelpers.retryLimit, code);
+        })
+        .catch(() => {
+            console.log('remove failed');
+        });
 }
 
 function handleVoucherRemovingError(xhr, code) {
@@ -182,7 +186,7 @@ function handleVoucherRemovingError(xhr, code) {
 }
 
 function showDefaultError(error = retryHelpers.errorMsg) {
-    const voucher = getNotAppliedVoucher()
+    const voucher = getNotAppliedVoucher();
     showValidationErrors(voucher.find('form'), error);
 }
 
@@ -195,9 +199,12 @@ function getNotAppliedVoucher() {
 function clearValidationErrors(form) {
     var $form = $(form);
     if ($form.hasClass(voucherEl.formInvalid)) {
-        $form.removeClass(voucherEl.formInvalid)
-            .find(voucherEl.fieldRow).removeClass(voucherEl.rowValidationError)
-            .find(voucherEl.fieldError).remove();
+        $form
+            .removeClass(voucherEl.formInvalid)
+            .find(voucherEl.fieldRow)
+            .removeClass(voucherEl.rowValidationError)
+            .find(voucherEl.fieldError)
+            .remove();
     }
 }
 
@@ -207,48 +214,46 @@ function getEqualMapForVoucherUpdate(data) {
             item: voucherEl.subtotal,
             itemValue: voucherEl.value,
             dataValue: data.subTotal,
-            title: 'Items subtotal:'
-
+            title: 'Items subtotal:',
         },
         {
             item: voucherEl.vat,
             itemValue: voucherEl.value,
             dataValue: data.vat,
-            title: 'VAT:'
+            title: 'VAT:',
         },
         {
             item: voucherEl.cc,
             itemValue: voucherEl.value,
             dataValue: data.clickAndCollectCost,
-            title: 'Click & Collect:'
+            title: 'Click & Collect:',
         },
         {
             item: voucherEl.delivery,
             itemValue: voucherEl.value,
             dataValue: data.deliveryCost,
-            title: 'Delivery:'
+            title: 'Delivery:',
         },
         {
             item: voucherEl.charity,
             itemValue: voucherEl.value,
             dataValue: data.charityPrice,
-            title: 'Charity donation:'
+            title: 'Charity donation:',
         },
         {
             item: voucherEl.discountItem,
             itemValue: voucherEl.discountValue,
-            dataValue: data.discountTotal
+            dataValue: data.discountTotal,
         },
         {
             item: voucherEl.orderTotal,
             itemValue: voucherEl.orderTotalValue,
-            dataValue: data.total
+            dataValue: data.total,
         },
     ];
 }
 
 $(document).ready(function () {
-
     function init() {
         if (!$('.checkout-voucher').length) {
             return;

package/src/js/page/filters/plp-filters-mobile.js

@@ -65,6 +65,11 @@ Wick.PLPFiltersMobile = {
         $btn.text(total > 0 ? `View results (${total})` : 'View results');
     },
 
+    hideAccordions() {
+        $(Wick.PLPFiltersMobile.$ACCORDION).addClass(Wick.PLPFiltersMobile.ACCORDION_COLLAPSED);
+        $(Wick.PLPFiltersMobile.$ACCORDION_CONTENT).hide();
+    },
+
     init() {
         // two-way binding for input between desktop and modal
         $(document)
@@ -81,14 +86,13 @@ Wick.PLPFiltersMobile = {
         $(document)
             .off('shown.bs.modal.plpFiltersMobile', Wick.PLPFiltersMobile.MODAL_SEL)
             .on('shown.bs.modal.plpFiltersMobile', Wick.PLPFiltersMobile.MODAL_SEL, function () {
-                Wick.PLPFilters.setDOMFromState($(this), Wick.PLPFilters.draftState);
+                Wick.PLPFilters.setDOMFromState($(this), Wick.PLPFilters.appliedState);
             });
 
         $(document)
             .off('hide.bs.modal.plpFiltersMobile', Wick.PLPFiltersMobile.MODAL_SEL)
             .on('hide.bs.modal.plpFiltersMobile', Wick.PLPFiltersMobile.MODAL_SEL, function () {
-                const scope = $(Wick.PLPFiltersMobile.ROOT_WRAPPER).add($(this));
-                Wick.PLPFilters.draftState = Wick.PLPFilters.collectStateFromDOM(scope);
+                Wick.PLPFiltersMobile.hideAccordions();
             });
 
         // mobile "View results" button in modal
@@ -122,7 +126,6 @@ Wick.PLPFiltersMobile = {
 
                 e.preventDefault();
 
-                Wick.PLPFilters.draftState = {};
                 Wick.PLPFilters.appliedState = {};
                 Wick.PLPFilters.writeStateToURL(Wick.PLPFilters.appliedState, false);
 

package/src/js/page/filters/plp-filters-utils.js

@@ -1,14 +1,6 @@
 var Wick = window.Wick || {};
 
 Wick.PLPUtils = (function () {
-    function cloneState(state) {
-        const out = {};
-        Object.keys(state).forEach((k) => {
-            out[k] = new Set(state[k]);
-        });
-        return out;
-    }
-
     function syncTwinInputsByName(name, checked, source) {
         const all = $('.filter-card__checkbox, .swatch__checkbox, .checkbox__input').filter(
             function () {
@@ -65,7 +57,6 @@ Wick.PLPUtils = (function () {
     }
 
     return {
-        cloneState,
         syncTwinInputsByName,
         getPanelType,
         countItems,

package/src/js/page/filters/plp-filters.js

@@ -6,7 +6,6 @@ Wick.PLPFilters = {
     ROOT: '.plp-filters',
     GROUP: '.plp-filters__group',
     APPLY_BTN: '.plp-filters__apply',
-    draftState: null,
 
     INPUTS: '.filter-card__checkbox, .swatch__checkbox, .checkbox__input',
 
@@ -25,7 +24,6 @@ Wick.PLPFilters = {
         }
 
         Wick.PLPFilters.appliedState = Wick.PLPFilters.readStateFromURL(rootWrapper);
-        Wick.PLPFilters.draftState = Wick.PLPUtils.cloneState(Wick.PLPFilters.appliedState);
         Wick.PLPFilters.setDOMFromState(rootWrapper, Wick.PLPFilters.appliedState);
 
         // 3) chips
@@ -45,11 +43,8 @@ Wick.PLPFilters = {
     handlePageShow() {
         window.addEventListener('pageshow', function () {
             const rootWrapper = $(Wick.PLPFilters.ROOT_WRAPPER);
-            const stateScope = rootWrapper.add($(Wick.PLPFiltersMobile.MODAL_SEL));
-
-            Wick.PLPFilters.appliedState = Wick.PLPFilters.readStateFromURL(stateScope);
-            Wick.PLPFilters.draftState = Wick.PLPFilters.appliedState;
-            Wick.PLPFilters.setDOMFromState(stateScope, Wick.PLPFilters.appliedState);
+            Wick.PLPFilters.appliedState = Wick.PLPFilters.readStateFromURL(rootWrapper);
+            Wick.PLPFilters.setDOMFromState(rootWrapper, Wick.PLPFilters.appliedState);
         });
     },
 
@@ -192,10 +187,7 @@ Wick.PLPFilters = {
 
     // ===== APPLY
     applyFromScopes(scopeForCollect, push) {
-        const nextState = Wick.PLPFilters.collectStateFromDOM(scopeForCollect);
-
-        Wick.PLPFilters.draftState = nextState;
-        Wick.PLPFilters.appliedState = nextState;
+        Wick.PLPFilters.appliedState = Wick.PLPFilters.collectStateFromDOM(scopeForCollect);
         Wick.PLPFilters.writeStateToURL(Wick.PLPFilters.appliedState, !!push);
     },
 

package/src/js/page/plp-img-v2.js

@@ -0,0 +1,25 @@
+$(document).ready(function () {
+    
+    let imgWrap = $('.products-list-v2 .card__img-wrap');
+    let img = $('.products-list-v2 .card__img-v2');
+    
+    square();
+
+    img.height(function () {
+        if (Math.round($(this).height()) > Math.round($(this).width())) {
+            $(this).height('99.9%'); //fix for ie
+        } else if ((Math.round($(this).height()) < Math.round($(this).width()))){
+            $(this).width('99.9%'); // fix for ie
+        } else {
+            $(this).width('99.9%'); // fix for ie
+            $(this).height('99.9%'); // fix for ie
+        }
+    });
+
+    function square() {
+        let width = imgWrap.width();
+        imgWrap.height(width);
+    }
+
+    $(window).on('resize', square);
+});

package/src/js/page/share-project-list.js

@@ -1,175 +1,57 @@
 import { copyToClipboard } from './utils/copy-to-clipboard';
 
-var Wick = window.Wick || {};
-
+var Wick = Wick || {};
 Wick.ShareProjectList = (function () {
-    const SELECTORS = {
-        input: '#share-list-modal #shopping-list-link',
-        linkContainer: '#copy-link',
-        link: 'a',
-    };
-
-    const CLASSES = {
-        copied: 'copy-link_hovered',
-    };
-
-    function logActiveElement() {
-        const active = document.activeElement;
-
-        if (!active) {
-            return;
-        }
-    }
-
-    function getElements() {
-        const $input = $(SELECTORS.input);
-        const $linkContainer = $(SELECTORS.linkContainer);
-        const $link = $linkContainer.find(SELECTORS.link);
-
-        return {
-            $input: $input,
-            $linkContainer: $linkContainer,
-            $link: $link,
-        };
-    }
-
-    function enableFocusAndSelect($input, source) {
-        if (!$input.length) {
-            return;
-        }
+    function init() {
+        var $input = $('#share-list-modal #shopping-list-link');
+        var linkContainer = $('#copy-link');
+        var $actualLink = linkContainer.find('a');
+        var copyClass = 'copy-link_hovered';
 
-        const input = $input.get(0);
-        const value = input.value || '';
-        const valueLength = value.length;
+        $actualLink.on('click', function (e) {
+            e.preventDefault();
+        });
 
-        logActiveElement('[ShareProjectList] before removeAttr disabled');
+        function focusAndSelectInput() {
+            if (!$input.length) return;
 
-        $input.removeAttr('disabled');
+            var el = $input.get(0);
 
-        try {
-            input.focus();
-        } catch (error) {
-            console.error('[ShareProjectList] input.focus() failed', {
-                source: source,
-                error: error,
-            });
-        }
+            $input.removeAttr('disabled');
 
-        logActiveElement('[ShareProjectList] after input.focus()');
+            el.focus();
 
-        try {
-            if (typeof input.setSelectionRange === 'function') {
-                input.setSelectionRange(0, valueLength);
-            } else if (typeof input.select === 'function') {
-                input.select();
+            var len = (el.value || '').length;
+            if (typeof el.setSelectionRange === 'function') {
+                el.setSelectionRange(0, len);
+            } else if (typeof el.select === 'function') {
+                el.select();
             }
-        } catch (error) {
-            console.error('[ShareProjectList] selection failed', {
-                source: source,
-                error: error,
-            });
         }
 
-        logActiveElement('[ShareProjectList] after selection');
-
-        setTimeout(function () {
-            logActiveElement('[ShareProjectList] after 0ms timeout');
-        }, 0);
-
-        setTimeout(function () {
-            logActiveElement('[ShareProjectList] after 50ms timeout');
-        }, 50);
-
-        setTimeout(function () {
-            logActiveElement('[ShareProjectList] after 150ms timeout');
-        }, 150);
-    }
-
-    function getInputValue($input) {
-        const value = String($input.val() || '').trim();
-
-        return value;
-    }
-
-    function bindEvents(elements) {
-        const $input = elements.$input;
-        const $linkContainer = elements.$linkContainer;
-        const $link = elements.$link;
+        linkContainer.on('click', function (e) {
+            e.preventDefault();
 
-        $input.on('focus', function () {
-            logActiveElement('[ShareProjectList] on input focus');
-        });
+            focusAndSelectInput();
 
-        $input.on('blur', function () {
-            logActiveElement('[ShareProjectList] on input blur');
-        });
+            var value = ($input.val() || '').trim();
+            if (!value) return;
 
-        $link.on('click', function (event) {
-            event.preventDefault();
-        });
-
-        $linkContainer.on('mousedown', function () {
-            logActiveElement('[ShareProjectList] on mousedown before focus');
-        });
-
-        $linkContainer.on('click', function (event) {
-            let value;
-
-            logActiveElement('[ShareProjectList] before click preventDefault');
-
-            event.preventDefault();
-
-            enableFocusAndSelect($input, 'linkContainer click');
-
-            value = getInputValue($input);
-            if (!value) {
-                return;
-            }
-
-            copyToClipboard(value, $linkContainer.get(0), { noUpperCase: true })
+            copyToClipboard(value, linkContainer[0], { noUpperCase: true })
                 .then(function () {
-                    $link.addClass(CLASSES.copied);
-
-                    logActiveElement('[ShareProjectList] after copy success before refocus');
-
-                    enableFocusAndSelect($input, 'copy success refocus');
-
-                    setTimeout(function () {
-                        enableFocusAndSelect($input, 'copy success refocus timeout 0');
-                    }, 0);
-
-                    setTimeout(function () {
-                        enableFocusAndSelect($input, 'copy success refocus timeout 50');
-                    }, 50);
+                    $actualLink.addClass(copyClass);
                 })
-                .catch(function (error) {
-                    console.error('[ShareProjectList] Failed to copy shopping list link', error);
-
-                    logActiveElement('[ShareProjectList] after copy error before refocus');
-
-                    enableFocusAndSelect($input, 'copy error refocus');
+                .catch(function (e) {
+                    console.error(e);
                 });
         });
 
-        $input.on('click', function () {
-            enableFocusAndSelect($input, 'input click');
-            $link.removeClass(CLASSES.copied);
+        $input.on('click', function (e) {
+            e.preventDefault();
+            focusAndSelectInput();
+            $actualLink.removeClass(copyClass);
         });
     }
 
-    function init() {
-        var elements = getElements();
-
-        if (!elements.$input.length || !elements.$linkContainer.length || !elements.$link.length) {
-            return;
-        }
-
-        bindEvents(elements);
-    }
-
-    return {
-        init: init,
-    };
+    init();
 })();
-
-Wick.ShareProjectList.init();