wickes-css2 2.109.0-develop.3 → 2.109.0-gift-cards.1

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

@@ -1,38 +1,35 @@
 var Wick = Wick || {};
 Wick.DeliveryDetails = (function () {
-    var $page = $('.page_checkout-delivery-details');
+  var $page = $('.page_checkout-delivery-details');
 
-    function bindEvents() {
-        var dateAlert;
+  function bindEvents () {
+    var dateAlert;
 
-        $page
-            .find(
-                '.btn-payment-details, .delivery-details__payment-details, .delivery-details__payment-details_mobile'
-            )
-            .on('click', function () {
-                if (navigator.userAgent.match(/TradeProMobile_Android|DIYMobile_Android/i)) {
-                    document.body.scrollTop = 0;
-                    document.documentElement.scrollTop = 0;
-                }
+    $page.find('.btn-payment-details, .delivery-details__payment-details, .delivery-details__payment-details_mobile').on('click', function () {
 
-                if (!Wick.DateSelection.isDateSelected()) {
-                    dateAlert = Wick.Notification.show({
-                        text: 'Sorry, please select a delivery date and/or time',
-                        container: '.checkout-heading',
-                        type: 'error',
-                    });
-                    return false;
-                }
-            });
+      if (navigator.userAgent.match(/TradeProMobile_Android|DIYMobile_Android/i)) {
+        document.body.scrollTop = 0;
+        document.documentElement.scrollTop = 0;
+      }
 
-        $('.date-selection').on('selected', function () {
-            dateAlert && dateAlert.hide();
+      if (!Wick.DateSelection.isDateSelected()){
+        dateAlert = Wick.Notification.show({
+          text: 'Sorry, please select a delivery date and/or time',
+          container: '.checkout-heading',
+          type: 'error'
         });
-    }
+        return false;
+      }
+    });
 
-    if (!$page.length) {
-        return;
-    }
+    $('.date-selection').on('selected', function(){
+      dateAlert && dateAlert.hide();
+    });
+  }
 
-    bindEvents();
+  if (!$page.length){
+    return;
+  }
+
+  bindEvents();
 })();

package/src/js/emulation/custom-slider-emulation.js

@@ -3,7 +3,7 @@ function simulateHybrisSendingHtml() {
     const event = new CustomEvent('productAddedToCart', {
         detail: { html: htmlFromHybris },
     });
-    window.dispatchEvent(event);
+    document.dispatchEvent(event);
 }
 
 function bindResolveEvent(events) {

package/src/js/emulation/date-selection.js

@@ -1,144 +1,32 @@
-const DS_EL = {
-    cell: '.calendar__cell_cnt',
-    dateSelection: '.date-selection',
-    loader: '.rapid-loader',
-    title: '.delivery-btn .title',
-    subtitle: '.delivery-btn .subtitle',
-    infoIcon: '.rapid-info-icon',
-    image: '.delivery-btn__image',
-};
-
-const DS_CLASSES = {
-    selectedCell: 'calendar__cell_selected',
-    isSelected: 'date-selection_selected',
-    rapidCell: 'calendar__cell_rapid',
-    hidden: 'd-none',
-};
-
-let rapidLoaderShown = false;
-let isDateSelected = false;
-
-function generateRapidEstimate() {
-    const scenario = Math.floor(Math.random() * 4);
-
-    switch (scenario) {
-        case 0: {
-            const mins = Math.floor(Math.random() * 59) + 1;
-            const padded = String(mins).padStart(2, '0');
-            const word = mins === 1 ? 'minute' : 'minutes';
-            return `Delivered in as little as <br>${padded} ${word} for &pound;10.00`;
-        }
-        case 1: {
-            const mins = Math.floor(Math.random() * 60);
-            const padded = String(mins).padStart(2, '0');
-            const word = mins === 1 ? 'minute' : 'minutes';
-            const minutePart = mins === 0 ? '00 minutes' : `${padded} ${word}`;
-            return `Delivered in as little as <br>1 hour ${minutePart} for &pound;10.00`;
-        }
-        case 2: {
-            const mins = Math.floor(Math.random() * 60);
-            const padded = String(mins).padStart(2, '0');
-            const word = mins === 1 ? 'minute' : 'minutes';
-            const minutePart = mins === 0 ? '00 minutes' : `${padded} ${word}`;
-            return `Delivered in as little as <br>2 hours ${minutePart} for &pound;10.00`;
-        }
-        default:
-            return null;
-    }
-}
-
-function updateDeliveryInfo() {
-    const $subtitle = $(DS_EL.subtitle);
-    const $infoIcon = $subtitle.find(DS_EL.infoIcon).detach();
-    const estimate = generateRapidEstimate();
-
-    if (estimate) {
-        $subtitle.html(estimate);
-        $infoIcon.removeClass(DS_CLASSES.hidden);
-    } else {
-        $subtitle.html('Delivery within 3 hours for <b>&pound;10.00');
-        $infoIcon.addClass(DS_CLASSES.hidden);
-    }
-
-    $subtitle.append($infoIcon);
-    $infoIcon.filter('[data-toggle="tooltip"]').tooltip();
-}
-
-function showRapidLoader() {
-    const $self = $(DS_EL.dateSelection);
-    const $loader = $(DS_EL.loader);
-    $loader.removeClass(DS_CLASSES.hidden);
-
-    setTimeout(() => {
-        $loader.addClass(DS_CLASSES.hidden);
-        $self.addClass(DS_CLASSES.isSelected);
-        updateRapidInfo();
-    }, 3000);
-}
-
-function updateNonRapidInfo() {
-    const $title = $(DS_EL.title);
-    const $subtitle = $(DS_EL.subtitle);
-    const $infoIcon = $subtitle.find(DS_EL.infoIcon).detach();
-    const $image = $(DS_EL.image);
-
-    $title.text('Next or Named day delivery');
-    $subtitle.html('Delivery between 7am - 7pm for &pound;12.00');
-    $infoIcon.addClass(DS_CLASSES.hidden);
-    $subtitle.append($infoIcon);
-    $image.addClass(DS_CLASSES.hidden);
-}
-
-function updateRapidInfo() {
-    const $title = $(DS_EL.title);
-    const $image = $(DS_EL.image);
-
-    $title.text('Rapid delivery');
-    $image.removeClass(DS_CLASSES.hidden);
-    updateDeliveryInfo();
-}
-
-function selectTimeSlot(e) {
-    const $self = $(DS_EL.dateSelection);
-    const $cell = $(e.target).closest(DS_EL.cell);
-    const isRapid = $cell.hasClass(DS_CLASSES.rapidCell);
-
-    $(DS_EL.cell).removeClass(DS_CLASSES.selectedCell);
-    $cell.addClass(DS_CLASSES.selectedCell);
+var Wick = Wick || {};
+Wick.DateSelection = (function(){
+  var $self = $('.date-selection'),
+    cell = '.calendar__cell_cnt',
+    selectedCell = 'calendar__cell_selected',
+    isSelected = 'date-selection_selected',
+    isDateSelected = false;
+
+  var selectTimeSlot = function(e){
+    $(cell).removeClass(selectedCell);
+    $(e.target).addClass(selectedCell);
+    $self.addClass(isSelected);
     $self.trigger('selected');
     isDateSelected = true;
+  };
 
-    if (isRapid) {
-        if (!rapidLoaderShown) {
-            rapidLoaderShown = true;
-            showRapidLoader();
-            return;
-        } else {
-            $self.addClass(DS_CLASSES.isSelected);
-            updateRapidInfo();
-        }
-    } else {
-        $self.addClass(DS_CLASSES.isSelected);
-        updateNonRapidInfo();
-    }
-}
-
-function initDateSelection() {
-    const $self = $(DS_EL.dateSelection);
-
+  var init = function () {
     if (!$self.length) {
-        return;
+      return;
     }
 
-    $self.on('click', DS_EL.cell, selectTimeSlot);
-}
+    $self.on('click', cell, selectTimeSlot);
+  }
 
-var Wick = window.Wick || {};
+  init();
 
-Wick.DateSelection = {
-    isDateSelected: () => isDateSelected,
-};
-
-$(document).ready(function () {
-    initDateSelection();
-});
+  return {
+    isDateSelected: function(){
+      return isDateSelected;
+    }
+  }
+})();

package/src/js/emulation/forms.js

@@ -323,18 +323,6 @@ Wick.Forms = (function () {
             }
         }
 
-        if ($(form).is('.notify-me-form')) {
-            if ($(form).find('#notify-me-email').val().length) {
-                return false;
-            }
-        }
-
-        if ($(form).is('.add-list-id__form')) {
-            if ($(form).find('#project-id').val().length) {
-                return false;
-            }
-        }
-
         if ($(form).is('.header-search')) {
             window.location.href = './page_search-results.html';
         }

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

@@ -1,4 +1,4 @@
-window.Wick = window.Wick || {};
+var Wick = Wick || {};
 Wick.MiniBasketData = (function () {
     return {
         updateQuantity: {
@@ -874,14 +874,14 @@ Wick.MiniBasketData = (function () {
             clickAndCollectOnly: false,
             deliveryItemsQuantity: 1,
             pickupItemsQuantity: 2,
-            freeDelivery: false,
+            freeDelivery: true,
             subtotalWithoutCharity: {
                 value: 19.0,
                 formattedValue: '£19.00',
                 currencyIso: 'GBP',
                 formattedPriceWithoutCurrencySymbol: '19.00',
             },
-            messageForFreeDelivery: null,
+            messageForFreeDelivery: 'Free delivery<i class="icon fas fa-check"></i>',
             pickupOrderGroups: [
                 {
                     entries: [

package/src/js/emulation/switchCalendar.js

@@ -16,21 +16,20 @@ Wick.Calendar = {
         if ($(this).hasClass(Wick.Calendar.el.switchBtnEarlier)) {
             $currentCalendar = $currentCalendar.prev();
             $currentCalendar.removeClass(Wick.Calendar.el.dateSectionHidden);
+
         } else if ($(this).hasClass(Wick.Calendar.el.switchBtnLatest)) {
             $currentCalendar = $currentCalendar.next(Wick.Calendar.el.dateSection);
             $currentCalendar.removeClass(Wick.Calendar.el.dateSectionHidden);
         }
     },
+
 };
 
 $(document).ready(function () {
     function init() {
+
         if (Wick.checkLocalEnv) {
-            $(Wick.Calendar.el.componentDateSection).on(
-                'click',
-                Wick.Calendar.el.switchBtn,
-                Wick.Calendar.SwitchCalendar
-            );
+            $(Wick.Calendar.el.componentDateSection).on('click', Wick.Calendar.el.switchBtn, Wick.Calendar.SwitchCalendar);
         }
     }
 
@@ -40,11 +39,8 @@ $(document).ready(function () {
 
     init();
 
-    $(window).on(
-        'resize',
-        _.debounce(function () {
-            unbind();
-            init();
-        }, 250)
-    );
+    $(window).on('resize', _.debounce(function () {
+        unbind();
+        init();
+    }, 250));
 });

package/src/js/page/basket/mini-basket-total.js

@@ -1,11 +1,10 @@
 import { updateDiscount } from '../components/discounts';
 
 const osEl = {
-    totalSection: '.mini-basket__total',
+    $totalSection: $('.mini-basket__total'),
     checkoutWidgetDetailsDiscount: '.checkout-widget__details-discount',
     checkoutWidgetDetails: '.checkout-widget__details',
     delivery: '.checkout-widget__item-delivery',
-    deliveryCostMessage: '.checkout-widget__item-delivery-cost-message',
     cc: '.checkout-widget__item-cc',
     itemFree: '.checkout-widget__item-free',
     itemDeficit: '.checkout-widget__item-deficit',
@@ -38,40 +37,26 @@ export function updateTotal(data, equalMap, isVoucher) {
 }
 
 function createCheckoutWidgetItem(obj) {
-    const isDelivery = obj.item === osEl.delivery;
     return `
       <li class="checkout-widget__item ${obj.item.substr(1)}">
         <span>${obj.title}</span>
           <span class="checkout-widget__item-value">${obj.dataValue}</span>
       </li>
-      ${
-          isDelivery
-              ? `
-      <li class="checkout-widget__item checkout-widget__item-delivery-cost-message">
-        <span class="checkout-widget__item-value" id="order-delivery-cost-message">
-          Final delivery cost confirmed at checkout
-        </span>
-      </li>`
-              : ''
-      }
     `;
 }
 
 function hideUnusedDeliveryTypeCost(data, isVoucher) {
     $(osEl.delivery).show();
-    $(osEl.deliveryCostMessage).show();
     $(osEl.cc).show();
     if (isVoucher) {
         if (!data.deliveryOrder) {
             $(osEl.delivery).hide();
-            $(osEl.deliveryCostMessage).hide();
         } else if (!data.clickAndCollectOrder) {
             $(osEl.cc).hide();
         }
     } else {
         if (data.clickAndCollectOnly) {
             $(osEl.delivery).hide();
-            $(osEl.deliveryCostMessage).hide();
         } else if (data.deliveryItemsQuantity > 0 && data.pickupItemsQuantity === 0) {
             $(osEl.cc).hide();
         }
@@ -79,7 +64,7 @@ function hideUnusedDeliveryTypeCost(data, isVoucher) {
 }
 
 function calculateFreeDelivery(data) {
-    $(osEl.totalSection).each(function () {
+    osEl.$totalSection.each(function () {
         let $free = $(this).find(osEl.itemFree);
         let $deficit = $(this).find(osEl.itemDeficit);