wickes-css2 2.103.0-RG-1658-apply-dynamic-logic-gift-card.1 → 2.103.0-develop.1

package/src/js/components/banner-placement-manager.js

@@ -0,0 +1,258 @@
+var Wick = Wick || {};
+Wick.BannerPlacementManager = {
+  SPONSOR_BANNERS_DISPLAYED_EVENT: 'sponsorAdsDisplayedEvent',
+  el: {
+    banners: '.card-product-banner',
+    sponsorBanners: '.card-sponsor-banner',
+    sponsorProducts: '.card-sponsor-product',
+    allBanners: '.card-product-banner, .card-sponsor-banner, .card-sponsor-product',
+    productCard: '.product-card',
+    allListSlots: '.product-card, .card-product-banner, .card-sponsor-banner, .card-sponsor-product',
+    productsWrap: '.products-list-v2',
+    $products: $('.product-card'),
+    attrPositionDesktop: 'data-desktop-position',
+    attrPositionMobile: 'data-mobile-position',
+    attrRequiredAmountDesktop: 'data-required-amount-desktop',
+    attrRequiredAmountMobile: 'data-required-amount-mobile',
+    hide: 'd-none',
+    sponsoredAdvBanners: '.sponsored-ad'
+  },
+  classes: {
+    sponsorBanners: 'card-sponsor-banner',
+    sponsorProducts: 'card-sponsor-product',
+    productBanners: 'card-product-banner',
+    bannerInactiveClass: 'card-product-banner--inactive'
+  },
+  isEventSent: false,
+  currentBreakpoint: null,
+  checkProductsInColumn() {
+    Wick.BannerPlacementManager.addInactiveClasses();
+    Wick.BannerPlacementManager.arrangeBannersInRightOrder();
+    const $allBanners = $(Wick.BannerPlacementManager.el.allBanners);
+    const totalProducts = Wick.BannerPlacementManager.getListLength();
+    const totalSlots = totalProducts + $allBanners.length;
+    $allBanners.each((index, banner) => {
+      const bannerPosition = Wick.BannerPlacementManager.getBannerPosition(banner);
+
+      if ($(banner).hasClass('card-product-banner')) {
+        if (bannerPosition > totalSlots) {
+          Wick.BannerPlacementManager.hideBanner(banner);
+          $(Wick.BannerPlacementManager.el.productsWrap).append(banner);
+          return;
+        }
+      }
+
+      if ($(banner).hasClass(Wick.BannerPlacementManager.classes.sponsorBanners) || $(banner).hasClass(Wick.BannerPlacementManager.classes.sponsorProducts)) {
+        if (bannerPosition > totalProducts) {
+          Wick.BannerPlacementManager.showBanner(banner);
+          Wick.BannerPlacementManager.removeInactiveClass(banner);
+          $(Wick.BannerPlacementManager.el.productsWrap).append(banner);
+          return;
+        }
+      }
+
+      Wick.BannerPlacementManager.hideBannerDueLimit(banner, index);
+      Wick.BannerPlacementManager.moveBannerToSpecifiedPosition(banner);
+    });
+  },
+  moveBannerToSpecifiedPosition(banner) {
+    const $listSlots = Wick.BannerPlacementManager.getListSlots();
+    const bannerPosition = Wick.BannerPlacementManager.getBannerPosition(banner) - 2;
+    const listSlotsLength = $listSlots.length;
+
+    if (Wick.BannerPlacementManager.isBannerVisible(banner)) {
+      if (bannerPosition <= listSlotsLength) {
+        if ($listSlots[bannerPosition]) {
+          Wick.BannerPlacementManager.showBanner(banner);
+          Wick.BannerPlacementManager.removeInactiveClass(banner);
+          Wick.BannerPlacementManager.moveBanner(banner, $listSlots[bannerPosition]);
+        } else {
+          Wick.BannerPlacementManager.hideBanner(banner);
+          Wick.BannerPlacementManager.coverEdgeCases(banner);
+        }
+      } else {
+        if ($(banner).hasClass(Wick.BannerPlacementManager.classes.sponsorBanners) || $(banner).hasClass(Wick.BannerPlacementManager.classes.sponsorProducts)) {
+          Wick.BannerPlacementManager.showBanner(banner);
+          Wick.BannerPlacementManager.removeInactiveClass(banner);
+          $(Wick.BannerPlacementManager.el.productsWrap).append(banner);
+        } else {
+          Wick.BannerPlacementManager.hideBanner(banner);
+        }
+      }
+    }
+  },
+  moveBanner(banner, targetElement) {
+    $(banner).remove();
+    $(targetElement).after(banner);
+  },
+  hideBanner(banner) {
+    $(banner).addClass(Wick.BannerPlacementManager.el.hide);
+  },
+  showBanner(banner) {
+    $(banner).removeClass(Wick.BannerPlacementManager.el.hide);
+  },
+  isBannerVisible(banner) {
+    return !$(banner).hasClass(Wick.BannerPlacementManager.el.hide);
+  },
+  hideBannerDueLimit(banner) {
+    const bannerMinLimit = Wick.BannerPlacementManager.getBannerLimit(banner) - 1;
+    const $listSlots = Wick.BannerPlacementManager.getListSlots();
+    const listProductsLength = $listSlots.length;
+    Wick.BannerPlacementManager.showBanner(banner);
+
+    if (bannerMinLimit > listProductsLength) {
+      Wick.BannerPlacementManager.hideBanner(banner);
+    }
+  },
+  getBannerPosition(banner) {
+    const isMobile = Wick.BannerPlacementManager.isMobileResolution();
+    const positionAttribute = isMobile
+      ?  Wick.BannerPlacementManager.el.attrPositionMobile
+      : Wick.BannerPlacementManager.el.attrPositionDesktop
+
+    return banner.hasAttribute(positionAttribute)
+      ? Number(banner.getAttribute(positionAttribute))
+      : Number(Wick.BannerPlacementManager.getListLength() + Wick.BannerPlacementManager.getBannersAmount());
+  },
+  getBannerLimit(banner) {
+    const isMobile = Wick.BannerPlacementManager.isMobileResolution();
+
+    const limitAttribute = isMobile
+      ? Wick.BannerPlacementManager.el.attrRequiredAmountMobile
+      : Wick.BannerPlacementManager.el.attrRequiredAmountDesktop;
+
+    return banner.hasAttribute(limitAttribute)
+      ? Number(banner.getAttribute(limitAttribute))
+      : 0;
+  },
+  isMobileResolution() {
+    return Wick.Responsive.getCurrentBreakpoint() !== 'up-lg';
+  },
+  getListLength() {
+    const $listItems = $(Wick.BannerPlacementManager.el.productsWrap).children(Wick.BannerPlacementManager.el.productCard);
+    return $listItems.length;
+  },
+  getBannersAmount() {
+    return $(Wick.BannerPlacementManager.el.allBanners).length;
+  },
+  getProductsAmount() {
+    return Wick.BannerPlacementManager.el.$products.length;
+  },
+  arrangeBannersInRightOrder() {
+    const $allBanners = $(Wick.BannerPlacementManager.el.allBanners);
+
+    const sponsorProducts = $allBanners.filter((i, el) =>
+      $(el).hasClass(Wick.BannerPlacementManager.classes.sponsorProducts)
+    );
+    const sponsorBanners = $allBanners.filter((i, el) =>
+      $(el).hasClass(Wick.BannerPlacementManager.classes.sponsorBanners)
+    );
+
+    const firstSponsorProductPos = sponsorProducts.length > 0
+      ? Math.min(...sponsorProducts.map((i, el) => Wick.BannerPlacementManager.getBannerPosition(el)).get())
+      : Infinity;
+    const firstSponsorBannerPos = sponsorBanners.length > 0
+      ? Math.min(...sponsorBanners.map((i, el) => Wick.BannerPlacementManager.getBannerPosition(el)).get())
+      : Infinity;
+
+    let groupOrder;
+    if (firstSponsorProductPos < firstSponsorBannerPos) {
+      groupOrder = [
+        Wick.BannerPlacementManager.classes.sponsorProducts,
+        Wick.BannerPlacementManager.classes.sponsorBanners,
+        Wick.BannerPlacementManager.classes.productBanners
+      ];
+    } else {
+      groupOrder = [
+        Wick.BannerPlacementManager.classes.sponsorBanners,
+        Wick.BannerPlacementManager.classes.sponsorProducts,
+        Wick.BannerPlacementManager.classes.productBanners
+      ];
+    }
+
+    $allBanners.sort((a, b) => {
+      function getGroupIndex(el) {
+        if ($(el).hasClass(groupOrder[0])) return 0;
+        if ($(el).hasClass(groupOrder[1])) return 1;
+        if ($(el).hasClass(groupOrder[2])) return 2;
+        return 3;
+      }
+
+      const groupA = getGroupIndex(a);
+      const groupB = getGroupIndex(b);
+
+      if (groupA !== groupB) {
+        return groupA - groupB;
+      }
+
+      const positionA = Wick.BannerPlacementManager.getBannerPosition(a);
+      const positionB = Wick.BannerPlacementManager.getBannerPosition(b);
+
+      return positionA - positionB;
+    }).appendTo(Wick.BannerPlacementManager.el.productsWrap);
+  },
+  addInactiveClasses() {
+    $(Wick.BannerPlacementManager.el.allBanners).addClass(Wick.BannerPlacementManager.el.hide);
+  },
+  removeInactiveClass(banner) {
+    $(banner).removeClass(Wick.BannerPlacementManager.classes.bannerInactiveClass)
+  },
+  insertFirstBanner(banner) {
+    const bannerPosition = Wick.BannerPlacementManager.getBannerPosition(banner);
+
+    if (bannerPosition === 1) {
+      Wick.BannerPlacementManager.showBanner(banner);
+      Wick.BannerPlacementManager.removeInactiveClass(banner);
+      $(banner).remove();
+      $(Wick.BannerPlacementManager.el.productsWrap).prepend(banner);
+    }
+  },
+  coverEdgeCases(banner) {
+    Wick.BannerPlacementManager.insertFirstBanner(banner);
+  },
+  getListSlots() {
+    return $(Wick.BannerPlacementManager.el.productsWrap)
+      .children(Wick.BannerPlacementManager.el.allListSlots);
+  },
+  getBannerPriority(banner) {
+    if ($(banner).hasClass(Wick.BannerPlacementManager.classes.sponsorProducts)) {
+      return 1;
+    }
+    if ($(banner).hasClass(Wick.BannerPlacementManager.classes.sponsorBanners)) {
+      return 2;
+    }
+    return 3;
+  },
+  dispatchSponsorAdsDisplayedEvent() {
+    return new Promise((resolve, reject) => {
+      const eventDetail = { resolve, reject };
+      const sponsorAdsEvent = createEvent(Wick.BannerPlacementManager.SPONSOR_BANNERS_DISPLAYED_EVENT, { displayed: true }, eventDetail);
+      window.dispatchEvent(sponsorAdsEvent);
+    });
+  },
+  init() {
+    Wick.Responsive.onResize(function () {
+      if(Wick.BannerPlacementManager.currentBreakpoint !== Wick.Responsive.getCurrentBreakpoint()) {
+        Wick.BannerPlacementManager.currentBreakpoint = Wick.Responsive.getCurrentBreakpoint()
+        Wick.BannerPlacementManager.checkProductsInColumn();
+
+        if (
+          !Wick.BannerPlacementManager.isEventSent && $(Wick.BannerPlacementManager.el.sponsoredAdvBanners).length
+        ) {
+          Wick.BannerPlacementManager.dispatchSponsorAdsDisplayedEvent();
+          Wick.BannerPlacementManager.isEventSent = true;
+        }
+
+        $(window).trigger('productBannerPositionChanged');
+      }
+    });
+  }
+};
+
+$(document).ready(function () {
+  if (!Wick.BannerPlacementManager.getBannersAmount() || !Wick.BannerPlacementManager.getProductsAmount()) {
+    return;
+  }
+
+  Wick.BannerPlacementManager.init();
+})

package/src/js/components/general/notification.js

@@ -4,14 +4,13 @@ Wick.Notification = (function(){
     var self = this,
         iconSuccess = '<span class="icon notification__icon"><span class="fas fa-check-circle"></span></span>',
         iconWarning = '<span class="icon notification__icon"><span class="fas fa-exclamation-circle"></span></span>',
-        iconError = '<span class="icon notification__icon"><span class="fas fa-times-circle"></span></span>',
         closeBtn = '<span class="icon notification__close"><span class="far fa-times"></span></span>';
 
     this.$self = $('<div/>', {
       'class': 'notification notification_general notification_' + params.type,
       html: params.text
     })
-        .prepend(params.type === 'success' ? iconSuccess : params.type === 'warning' ? iconWarning : params.type === 'error' ? iconError : '')
+        .prepend(params.type === 'success' ? iconSuccess : params.type === 'warning' ? iconWarning : params.type === 'error' ? iconWarning : '')
         .prepend(params.closeBtn ? closeBtn : '')
         .prependTo(params.container);
 

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

@@ -0,0 +1,58 @@
+var Wick = window.Wick || {};
+
+Wick.TogglePasswordVisibility = {
+  el: {
+    $toggleShow: $('[data-show-content] .toggle-show'),
+    inputWrap: $('.form-row[data-show-content] .input-wrap'),
+    toggleIcon: '.toggle-show',
+  },
+
+  updateIconVisibility(inputField, toggleIcon) {
+    const valueLength = inputField.val().length;
+    if (valueLength > 0) {
+      toggleIcon.show();
+    } else {
+      toggleIcon.hide();
+    }
+  },
+
+  attachInputListener(inputField, toggleIcon) {
+    inputField.on('input', function () {
+      Wick.TogglePasswordVisibility.updateIconVisibility($(this), toggleIcon);
+    });
+  },
+
+  attachToggleClickListener(inputField, toggleIcon) {
+    toggleIcon.on('click', function () {
+      const isPasswordType = inputField.attr('type') === 'password';
+      const iconSvg = $(this).find('svg');
+
+      if (isPasswordType) {
+        inputField.attr('type', 'text');
+        iconSvg.removeClass('fa-eye-slash').addClass('fa-eye');
+      } else {
+        inputField.attr('type', 'password');
+        iconSvg.removeClass('fa-eye').addClass('fa-eye-slash');
+      }
+    });
+  },
+
+  init() {
+    Wick.TogglePasswordVisibility.el.inputWrap.each(function () {
+      const inputField = $(this).find('input');
+      const toggleIcon = $(this).find(Wick.TogglePasswordVisibility.el.toggleIcon);
+
+      Wick.TogglePasswordVisibility.attachInputListener(inputField, toggleIcon);
+      Wick.TogglePasswordVisibility.updateIconVisibility(inputField, toggleIcon);
+      Wick.TogglePasswordVisibility.attachToggleClickListener(inputField, toggleIcon);
+    });
+  },
+};
+
+$(document).ready(function () {
+  if (!Wick.TogglePasswordVisibility.el.$toggleShow.length) {
+    return;
+  }
+
+  Wick.TogglePasswordVisibility.init();
+});

package/src/js/emulation/banner-placement-manager.js

@@ -0,0 +1,53 @@
+// Simulate prompt for input
+function getInputs() {
+  const productBannerPositions = prompt("Enter Product Banner Positions:", "2") || "";
+  const sponsorProductPositions = prompt("Enter Sponsor Product Positions (comma-separated):", "6,7,8") || "";
+  const sponsorBannerPositions = prompt("Enter Sponsor Banner Positions:", "10") || "";
+
+  return {
+    productBannerPositions: productBannerPositions ? productBannerPositions.split(",").map(Number) : [],
+    sponsorProductPositions: sponsorProductPositions ? sponsorProductPositions.split(",").map(Number) : [],
+    sponsorBannerPositions: sponsorBannerPositions ? sponsorBannerPositions.split(",").map(Number) : [],
+  };
+}
+
+function getPositionAttr() {
+  const isMobile = Wick.BannerPlacementManager.isMobileResolution();
+  return isMobile
+    ? 'data-mobile-position'
+    : 'data-desktop-position';
+}
+
+function updatePositions(inputs) {
+  const productBannerElements = document.querySelectorAll(".card-product-banner");
+  productBannerElements.forEach((el, index) => {
+    if (inputs.productBannerPositions[index] !== undefined) {
+      el.setAttribute(getPositionAttr(), inputs.productBannerPositions[index]);
+    }
+  });
+
+  const sponsorProductElements = document.querySelectorAll(".card-sponsor-product");
+  sponsorProductElements.forEach((el, index) => {
+    if (inputs.sponsorProductPositions[index] !== undefined) {
+      el.setAttribute(getPositionAttr(), inputs.sponsorProductPositions[index]);
+    }
+  });
+
+  const sponsorBannerElements = document.querySelectorAll(".card-sponsor-banner");
+  sponsorBannerElements.forEach((el, index) => {
+    if (inputs.sponsorBannerPositions[index] !== undefined) {
+      el.setAttribute(getPositionAttr(), inputs.sponsorBannerPositions[index]);
+    }
+  });
+}
+
+function init() {
+  const inputs = getInputs();
+  updatePositions(inputs);
+}
+
+$(document).ready(function () {
+  if ($('.retail-media .products-list.products-list-v2').length) {
+    setTimeout(() => init(), 100)
+  }
+});

package/src/js/emulation/checkout-payment-details.js

@@ -2,33 +2,24 @@ var Wick = Wick || {};
 
 Wick.PaymentDetails = (function () {
   var $btnEnterDetails = $('.btn-enter-details'),
+    $form = $btnEnterDetails.parents('form'),
     isGuestPage = $('.page_checkout-payment-details_guest').length;
 
   function bindEvents () {
-    $btnEnterDetails.on('click', function (e) {
-      e.preventDefault();
-      var $scope = $(this).closest('form');
-      if (!$scope.length) $scope = $(this).closest('.billing-address');
-      if (!$scope.length) $scope = $('.billing-address');
-      var nameVal= ($scope.find('#card-name').val() || '').trim();
-      var finderVal= ($scope.find('#first-line-address').val() || '').trim();
-      var manualLine1= ($scope.find('#address-line-1').val() || '').trim();
-      var manualTown= ($scope.find('#town-city').val() || '').trim();
-      var manualPost= ($scope.find('#postcode_additional').val() || '').trim();
-      var addressFinderOk = finderVal.length > 0;
-      var addressManualOk = manualLine1 && manualTown && manualPost;
-
-      if (nameVal && (addressFinderOk || addressManualOk)) {
-        var $details = $('.checkout-payment-details__card-details');
-        $details.removeClass('checkout-payment-details__card-details_hidden');
-        $('html, body').animate({ scrollTop: $details.offset().top - 15 }, 700);
-        return;
-      }
-
-      var formEl = $scope.closest('form').get(0) || $scope.get(0);
-      if (formEl && Wick.Forms && Wick.Forms.showValidationErrors) {
-        Wick.Forms.showValidationErrors(formEl);
+    $btnEnterDetails.on('click', function(){
+      if ($form.find('#card-name').val().length &&
+        $form.find('#first-line-address').val().length &&
+        $form.find('#address-line-1').val().length &&
+        $form.find('#town-city').val().length &&
+        $form.find('#postcode_additional').val().length){
+        $('.checkout-payment-details__card-details').removeClass('checkout-payment-details__card-details_hidden');
+        $('html, body').animate({
+          scrollTop: $('.checkout-payment-details__card-details').offset().top - 15
+        }, 700);
+        return false;
       }
+      Wick.Forms.showValidationErrors($form[0]);
+      return false;
     });
 
     $('.checkout-payment-details__card-details').on('submit', function(){

package/src/js/emulation/forms.js

@@ -60,16 +60,11 @@ Wick.Forms = (function(){
 
   var showValidationErrors = function (form, errorMsg) {
     var $form = $(form);
-    var $rows = $form.find(fieldRow).not('[data-no-global-validation]');
-    if (!$rows.length) return;
-    $rows.find('.form-row__error').remove();
-
     if (!$form.hasClass(formInvalid)) {
-      $form.addClass(formInvalid);
+      $form.find('.form-row__error').remove();
+      $form.addClass(formInvalid).find(fieldRow).append(validationError(errorMsg)).addClass(rowValidationError);
     }
 
-    $rows.append(validationError(errorMsg)).addClass(rowValidationError);
-
     var $firstMsg = $form.find(fieldRow).first();
     if($firstMsg.length && !isElementInViewport($firstMsg)){
       var inModal = $firstMsg.closest('.modal').length,

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

@@ -13,46 +13,31 @@ const osEl = {
 }
 
 export function updateOrderSummary(data, equalMap, isVoucher) {
-  equalMap.forEach((obj) => {
-    if (typeof obj.dataValue === 'undefined') return;
-
-    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 ($(obj.item).length) {
+            $(obj.item).show();
+        } else {
+            if ($(osEl.checkoutWidgetDetailsDiscount).length) {
+                $(osEl.checkoutWidgetDetailsDiscount).before(createCheckoutWidgetItem(obj))
+            } else {
+                $(osEl.checkoutWidgetDetails).append(createCheckoutWidgetItem(obj))
+            }
+        }
 
-    $(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();
-    }
-  });
+        $(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;
 
-  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) {
@@ -68,14 +53,12 @@ function hideUnusedDeliveryTypeCost(data, isVoucher) {
     $(osEl.delivery).show()
     $(osEl.cc).show()
     if (isVoucher) {
-      if ('deliveryOrder' in data && data.deliveryOrder === false) {
-        $(osEl.delivery).hide();
-      }
-
-      if ('clickAndCollectOrder' in data && data.clickAndCollectOrder === false) {
-        $(osEl.cc).hide();
-      }
-  } else {
+        if (!data.deliveryOrder) {
+            $(osEl.delivery).hide()
+        } else if (!data.clickAndCollectOrder) {
+            $(osEl.cc).hide()
+        }
+    } else {
         if (data.clickAndCollectOnly) {
             $(osEl.delivery).hide()
         } else if (data.deliveryItemsQuantity > 0 && data.pickupItemsQuantity === 0) {

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

@@ -6,7 +6,9 @@ $(document).ready(function () {
     }
 
     function cardsContent(itemsInRow) {
-        let card = $('.content .product-card, .content .card-product-banner');
+        let card = $('.content .product-card, .content .card-product-banner, .content .card-sponsor-banner, .content .card-sponsor-product').filter(function() {
+            return $(this).parents('.product-card, .card-product-banner, .card-sponsor-banner, .card-sponsor-product').length === 0;
+        });
         let priceSelectors = [
             '.including-vat .product-card__price__old-price',
             '.excluding-vat .product-card__price__old-price',
@@ -17,6 +19,7 @@ $(document).ready(function () {
         revealAll(card, ['.product-card__price__old-price',
                                     '.product-card__price-sqm',
                                     '.product-card__price-value',
+                                    '.product-card__sponsored',
                                     '.energy-efficiency',
                                     '.energy-efficiency__link']);
 
@@ -33,6 +36,8 @@ $(document).ready(function () {
                 hideEmptiness(currentRow, '.product-card__price-sqm');
             }
             hideEmptiness(currentRow, '.product-card__price-value');
+            hideEmptiness(currentRow, '.product-card__sponsored');
+            hideEmptiness(currentRow, '.product-card__price__old-price');
             hideEmptiness(currentRow, '.energy-efficiency');
             hideEmptiness(currentRow, '.energy-efficiency__link');
 
@@ -43,11 +48,15 @@ $(document).ready(function () {
     function hideEmptiness(query, className) {
         let currentQuery = query.find(className);
         let rowContent = currentQuery.text();
-
-        if (className === '.energy-efficiency') {
-            let isEnergyQueryEmpty = isClassPresentInQuery(currentQuery, "energy-efficiency--empty");
-
-            if (isEnergyQueryEmpty) {
+        const classEmptyCheckMap = {
+            '.energy-efficiency': 'energy-efficiency--empty',
+            '.product-card__sponsored': 'product-card__sponsored--empty',
+            '.product-card__price__old-price': 'product-card__price_empty'
+        };
+
+        if (classEmptyCheckMap[className]) {
+            let isClassEmpty = isClassPresentInQuery(currentQuery, classEmptyCheckMap[className]);
+            if (isClassEmpty) {
                 currentQuery.hide();
             }
             return;

package/src/js/page/plp-load-more.js

@@ -43,7 +43,7 @@ Wick.PLPLoadMore = {
       .finally(() => {
         hideLoader(Wick.PLPLoadMore.el.loader);
         Wick.PLPLoadMore.el.$loadMoreBtn.blur();
-        Wick.ProductBanner.checkProductsInColumn();
+        Wick.BannerPlacementManager.checkProductsInColumn();
         $(window).trigger('productBannerPositionChanged');
         Wick.EnergyEfficiency.drawEnergyLabels();
         Wick.PLP?.bindEvents();

package/src/js/page/utils/validation.js

@@ -257,6 +257,7 @@ export function wrapWithError(element) {
 
 }
 
+
 export function addErrorMessage(element, errorMessage) {
     if (errorMessage) {
         $(element).append('<div class="form-row__error">' + errorMessage + '</div>');
@@ -315,49 +316,3 @@ export function validateGuidPattern (value) {
 export function validateUserFriendlyIdPattern (value) {
     return patterns.userFriendlyIdPattern.test(value);
 }
-
-export function showErrorText($input, message, fieldSelector, errorTextClass, errorClass, ariaInvalidAttr) {
-  const $field = $input.closest(fieldSelector);
-  $field.addClass(errorClass);
-  $input.attr(ariaInvalidAttr, 'true');
-
-  let $err = $field.find(errorTextClass);
-  if (!$err.length) {
-    $err = $(`<div class="${errorTextClass.slice(1)}" />`).appendTo($field);
-  }
-  $err.text(message);
-}
-
-export function clearErrorText($input, fieldSelector, errorTextClass, errorClass, ariaInvalidAttr) {
-  const $field = $input.closest(fieldSelector);
-  $field.removeClass(errorClass);
-  $input.removeAttr(ariaInvalidAttr);
-  $field.find(errorTextClass).remove();
-}
-
- function digitsOnly(value) {
-  return String(value || '').replace(/\D/g, '');
-}
-
-function hasExactDigits(value, n) {
-  return digitsOnly(value).length === Number(n);
-}
-
-function validateByPredicate($input, predicate, message, {
-  fieldSelector,
-  errorText: errorTextClass,
-  fieldError: errorClass,
-  ariaInvalidAttr,
-}) {
-  const ok = !!predicate(String($input.val() || ''));
-  if (!ok) {
-    showErrorText($input, message, fieldSelector, errorTextClass, errorClass, ariaInvalidAttr);
-  } else {
-    clearErrorText($input, fieldSelector, errorTextClass, errorClass, ariaInvalidAttr);
-  }
-  return ok;
-}
-
-export function validateExactDigits($input, n, message, cfg) {
-  return validateByPredicate($input, (v) => hasExactDigits(v, n), message, cfg);
-}

package/src/layouts/checkout.hbs

@@ -22,10 +22,14 @@
     {{/block}}
     <a id="skip-to-content"></a>
     <main {{#if fullWidth}}class="full-width-content"{{/if}}>
+      <div class="globalMessages">
+        <div class="container">
+          {{#block "notification"}}{{/block}}
+        </div>
+      </div>
       <div class="container">
         <div class="row">
           {{#block "steps"}}{{/block}}
-          {{#block "notification"}}{{/block}}
           <div class="content">
             {{#block "main"}}{{/block}}
           </div>