wickes-css2 2.103.0-RG-1742-billie-30-60-90-days.3 → 2.103.0-develop.10

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

@@ -1,20 +1,20 @@
 var Wick = Wick || {};
 
-Wick.PaymentDetails = (function() {
+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() {
-      if ($form.find('#card-name').val()?.length &&
+  function bindEvents () {
+    $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) {
+        $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,
+          scrollTop: $('.checkout-payment-details__card-details').offset().top - 15
         }, 700);
         return false;
       }
@@ -22,14 +22,14 @@ Wick.PaymentDetails = (function() {
       return false;
     });
 
-    $('.checkout-payment-details__card-details').on('submit', function() {
+    $('.checkout-payment-details__card-details').on('submit', function(){
       var $form = $(this);
       if ($form.find('#card-type').val() &&
         $form.find('#card-name1').val().length &&
         $form.find('#card-number').val().length &&
         $form.find('#month').val() &&
         $form.find('#year').val() &&
-        $form.find('#security-code').val()) {
+        $form.find('#security-code').val()){
         window.location.href = isGuestPage
           ? './page_checkout_confirmation_guest.html'
           : './page_checkout_confirmation.html';

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

@@ -7,22 +7,16 @@ function simulateHybrisSendingHtml() {
   document.dispatchEvent(event);
 }
 
-function initCloseJustAddedDiff() {
-  $(window).on('CLOSE_JUST_ADDED CLOSE_MINI_BASKET', function ({ detail: { resolve }}) {
+function bindResolveEvent(events) {
+  $(window).on(events.join(' '), function ({ detail: { resolve } }) {
     setTimeout(() => {
-      return resolve();
+      resolve();
     }, 200);
   });
-};
-
-function simulateShowMiniBasket() {
-  const event = new CustomEvent('showMiniBasket', {});
-  document.dispatchEvent(event);
 }
 
 $(document).ready(function () {
   $('.btn-add-to-basket').on('click', simulateHybrisSendingHtml);
-  $('.header-minicart__btn').on('click', simulateShowMiniBasket);
 
-  initCloseJustAddedDiff();
+  bindResolveEvent(['CLOSE_JUST_ADDED', 'CLOSE_MINI_BASKET', 'MINI_BASKET_CHECKOUT', 'MINI_BASKET_VIEW_BASKET']);
 });

package/src/js/emulation/forms.js

@@ -1,5 +1,5 @@
 var Wick = Wick || {};
-Wick.Forms = (function() {
+Wick.Forms = (function(){
   var fieldRow = '.form-row[data-row-required]',
     field = '.form-row__field',
     fieldError = '.form-row__error',
@@ -9,44 +9,43 @@ Wick.Forms = (function() {
     // validationError = '<div class="form-row__error">Error message here</div>',
     $forgotPassword = $('.link-forgot-password'),
     scenarios = [{
-      condition: function() {
-        // fill in the valid returning customer's details
-        // Email: responsive@test.com; Password: 123456
-        return $('#login-email').val() === 'responsive@test.com' && $('#password').val() === '123456';
-      },
-      action: function() {
-        // redirected to the homepage
-        Wick.User.login();
-        window.location.href = './';
+        condition: function(){
+          // fill in the valid returning customer's details
+          // Email: responsive@test.com; Password: 123456
+          return $('#login-email').val() === 'responsive@test.com' && $('#password').val() === '123456';
+        },
+        action: function(){
+          // redirected to the homepage
+          Wick.User.login();
+          window.location.href = './';
+        }
       },
-    },
       {
-        condition: function() {
+        condition: function(){
           // continue as a new user with "test+random@user.com"
           return $('#registration-email').val().length;
           // return $('#registration-email').val() === 'test+random@user.com';
         },
-        action: function() {
+        action: function(){
           // redirected to the register form
           window.location.href = './page_registration.html';
-        },
+        }
       },
       {
-        condition: function() {
+        condition: function(){
           // When I click forgotten password link
         },
-        action: function() {
+        action: function(){
           // redirected on the "Forgotten Password" page
           window.location.href = './page_forgotten-password.html';
-        },
-      },
-    ],
-
-    validationError = function(errorMsg) {
-      return `<div class="form-row__error"> ${errorMsg || 'Error message here'}</div>`;
-    };
+        }
+      }
+    ];
 
-  function isElementInViewport(el) {
+  validationError = function (errorMsg) {
+    return `<div class="form-row__error"> ${errorMsg || 'Error message here'}</div>`
+  }
+  function isElementInViewport (el) {
     if (typeof jQuery === 'function' && el instanceof jQuery) {
       el = el[0];
     }
@@ -59,21 +58,15 @@ Wick.Forms = (function() {
     );
   }
 
-  var showValidationErrors = function(form, errorMsg) {
+  var showValidationErrors = function (form, errorMsg) {
     var $form = $(form);
     if (!$form.hasClass(formInvalid)) {
       $form.find('.form-row__error').remove();
-      var $rows = $form.find(fieldRow).filter(function() {
-        return $(this).is(':visible');
-      });
-
-      $rows.append(validationError(errorMsg)).addClass(rowValidationError);
+      $form.addClass(formInvalid).find(fieldRow).append(validationError(errorMsg)).addClass(rowValidationError);
     }
 
-    var $firstMsg = $form.find(fieldRow).filter(function() {
-      return $(this).is(':visible');
-    }).first();
-    if ($firstMsg.length && !isElementInViewport($firstMsg)) {
+    var $firstMsg = $form.find(fieldRow).first();
+    if($firstMsg.length && !isElementInViewport($firstMsg)){
       var inModal = $firstMsg.closest('.modal').length,
         $scrollableEl = inModal ? $firstMsg.closest('.modal') : $('html, body'),
         y = inModal ? 0 : $firstMsg.offset().top - 30;
@@ -82,26 +75,22 @@ Wick.Forms = (function() {
     }
   };
 
-  var clearValidationErrors = function(form) {
+  var clearValidationErrors = function (form) {
     var $form = $(form);
-
-    $form.removeClass(formInvalid);
-
-    $form.find(fieldRow)
-      .removeClass(rowValidationError)
-      .find(fieldError).remove();
-
-    $form.find(fieldError).remove();
+    if ($form.hasClass(formInvalid)) {
+      $form.removeClass(formInvalid)
+        .find(fieldRow).removeClass(rowValidationError)
+        .find(fieldError).remove();
+    }
   };
 
-
-  var handleSmoothScroll = function() {
+  var handleSmoothScroll = function () {
     $('html, body').animate({
-      scrollTop: $('.cards-store-list').offset().top - 60,
+      scrollTop: $('.cards-store-list').offset().top - 60
     }, 300);
   };
 
-  var handleFormSubmit = function() {
+  var handleFormSubmit = function () {
     var form = this;
 
     if ($(form).is('#form-login') || $(form).is('#form-register')) {
@@ -115,21 +104,21 @@ Wick.Forms = (function() {
     }
 
     if ($(form).is('#form-forgotten-password')) {
-      if ($(form).find('#email').val().length) {
+      if ($(form).find('#email').val().length){
         window.location.href = './page_upd-pass.html';
         return false;
       }
     }
 
     if ($(form).is('#form-forgotten-password-popup')) {
-      if ($(form).find('#email').val().length) {
+      if ($(form).find('#email').val().length){
         window.location.href = './page_checkout_sign-in.html';
         return false;
       }
     }
 
     if ($(form).is('#checkout-form-forgotten-password-popup')) {
-      if ($(form).find('#email').val().length) {
+      if ($(form).find('#email').val().length){
         $('.modal-reset-wrap').addClass('d-block');
         $('.request-pass').addClass('d-none');
         $('.modal-title').text('Password Reset');
@@ -138,7 +127,7 @@ Wick.Forms = (function() {
     }
 
     if ($(form).is('.update-pass')) {
-      if ($(form).find('#new-password').val().length && $(form).find('#confirmed-password').val().length) {
+      if ($(form).find('#new-password').val().length && $(form).find('#confirmed-password').val().length){
         window.location.href = './page_login.html';
         return false;
       }
@@ -147,7 +136,7 @@ Wick.Forms = (function() {
     if ($(form).is('.change-email')) {
       if ($(form).find('#new-email').val().length &&
         $(form).find('#confirm-new-email').val().length &&
-        $(form).find('#password').val().length) {
+        $(form).find('#password').val().length){
         window.location.href = './page_my-account.html';
         return false;
       }
@@ -156,7 +145,7 @@ Wick.Forms = (function() {
     if ($(form).is('.form-change-password')) {
       if ($(form).find('#current-password').val().length &&
         $(form).find('#new-password').val().length &&
-        $(form).find('#confirm-password').val().length) {
+        $(form).find('#confirm-password').val().length){
         window.location.href = './page_my-account.html';
         return false;
       }
@@ -168,14 +157,14 @@ Wick.Forms = (function() {
         $(form).find('#postcode').val().length &&
         $(form).find('#email').val().length &&
         $(form).find('#password').val().length &&
-        $(form).find('#confirm-password').val().length) {
+        $(form).find('#confirm-password').val().length){
         window.location.href = './page_my-account.html';
         return false;
       }
     }
 
     if ($(form).is('.form-personal-details')) {
-      if ($(form).find('#first-name').val().length && $(form).find('#surname').val().length) {
+      if ($(form).find('#first-name').val().length && $(form).find('#surname').val().length){
         window.location.href = './page_my-account.html';
         return false;
       }
@@ -183,26 +172,26 @@ Wick.Forms = (function() {
 
     if ($(form).is('.form-address-details')) {
       if ($(form).find('#first-name').val().length &&
-        $(form).find('#second-name').val().length &&
-        $(form).find('#address1').val().length &&
-        $(form).find('#town-city').val().length &&
-        $(form).find('#mobile-telephone').val().length) {
+          $(form).find('#second-name').val().length &&
+          $(form).find('#address1').val().length &&
+          $(form).find('#town-city').val().length &&
+          $(form).find('#mobile-telephone').val().length) {
         window.location.href = './page_my-account_address-book.html';
         return false;
       }
     }
 
     if ($(form).is('.form-locator')) {
-      if ($(form).find('#store-id').val()) {
+      if ($(form).find('#store-id').val()){
         window.location.href = './page_store-locator-details.html';
         return false;
       }
     }
 
     if ($(form).is('.form-locator-list')) {
-      if ($(form).find('#postcode-town').val().length) {
+      if ($(form).find('#postcode-town').val().length){
         var actionAfterSubmit = $(form).attr('data-action');
-        if (actionAfterSubmit === 'scroll-to-list') {
+        if (actionAfterSubmit === 'scroll-to-list'){
           clearValidationErrors(this);
           handleSmoothScroll();
         } else {
@@ -213,7 +202,7 @@ Wick.Forms = (function() {
     }
 
     if ($(form).is('#form-mini-basket')) {
-      if (Wick.User.isLoggedIn()) {
+      if (Wick.User.isLoggedIn()){
         window.location.href = './page_checkout_delivery-address.html';
       } else {
         window.location.href = './page_checkout_sign-in.html';
@@ -221,31 +210,13 @@ Wick.Forms = (function() {
       return false;
     }
 
-    function isNotEmpty(field) {
-      var $field = $(field);
-      var type = ($field.attr('type') || '').toLowerCase();
-
-      if (type === 'checkbox') {
-        return $field.is(':checked');
-      }
-
-      if (type === 'radio') {
-        var name = $field.attr('name');
-        if (!name) return false;
-
-        var $scope = $field.closest('[data-row-required]');
-        if (!$scope.length) $scope = $field.closest('form');
-
-        return $scope.find('input[type="radio"][name="' + name.replace(/"/g, '\\"') + '"]').is(':checked');
-      }
-
-      return !!$field.val();
+    function isNotEmpty(field){
+      return !!$(field).val();
     }
 
-
     if ($(form).is('#form-checkout-your-details')) {
       var requiredFields = $(form).find('[data-row-required]:visible :input');
-      if (_.every(requiredFields, isNotEmpty)) {
+      if (_.every(requiredFields, isNotEmpty)){
         window.location.href = $(form).attr('data-action');
         return false;
       }
@@ -253,7 +224,7 @@ Wick.Forms = (function() {
 
     if ($(form).is('#checkout-your-details-modal')) {
       var requiredFields = $(form).find('[data-row-required]:visible :input');
-      if (_.every(requiredFields, isNotEmpty)) {
+      if (_.every(requiredFields, isNotEmpty)){
         $('#modalDeliveryEdit').modal('hide');
         return false;
       }
@@ -267,15 +238,15 @@ Wick.Forms = (function() {
       }
     }
 
-    if ($(form).is('.checkout-register')) {
+    if ($(form).is('.checkout-register')){
       if ($(form).find('#password').val().length &&
-        $(form).find('#confirm-password').val().length) {
+          $(form).find('#confirm-password').val().length) {
         window.location.href = './page_my-account.html';
         return false;
       }
     }
 
-    if ($(form).is('#form-checkout-voucher')) {
+    if ($(form).is('#form-checkout-voucher')){
       if ($(form).find('#voucher-code').val().length) {
         return false;
       }
@@ -287,11 +258,11 @@ Wick.Forms = (function() {
       }
     }
 
-    if ($(form).is('.header-search')) {
+    if ($(form).is('.header-search')){
       window.location.href = './page_search-results.html';
     }
 
-    if ($(form).is('.click-and-collect__locator-form')) {
+    if ($(form).is('.click-and-collect__locator-form')){
       var $form = $(form);
       if ($form.find('#click-and-collect-town').val().length) {
         clearValidationErrors(this);
@@ -304,24 +275,24 @@ Wick.Forms = (function() {
       return false;
     }
 
-    if ($(form).is('.form-track-order')) {
-      var $form = $(form);
-
-      if ($form.find('#order').val().length &&
-        $form.find('#tel').val().length &&
-        $form.find('#email').val().length &&
-        $form.find('#postcode').val().length) {
-        clearValidationErrors(this);
-      } else if (!$form.hasClass(formInvalid)) {
-        $form.addClass(formInvalid);
-
-        $(fieldRow).each(function() {
-          $(this).addClass(rowValidationError)
-            .append('<div class="form-row__error">' + $(this).data('message') + '</div>');
-        });
-      }
+    if($(form).is('.form-track-order')) {
+        var $form = $(form);
+
+        if ($form.find('#order').val().length &&
+            $form.find('#tel').val().length &&
+            $form.find('#email').val().length &&
+            $form.find('#postcode').val().length) {
+            clearValidationErrors(this);
+        } else if (!$form.hasClass(formInvalid)) {
+          $form.addClass(formInvalid);
+
+          $(fieldRow).each(function() {
+            $(this).addClass(rowValidationError)
+              .append('<div class="form-row__error">' + $(this).data('message') + '</div>');
+          });
+        }
 
-      return false;
+        return false;
     }
 
     if ($(form).is('#edit-billing-address')) {
@@ -337,28 +308,28 @@ Wick.Forms = (function() {
   };
 
   var scrollLocatorListPage = function() {
-    var isLocatorListPage = $('.cards-store-list').length;
-    var isScrollNeeded = window.location.hash === '#stores-list';
-    if (isLocatorListPage && isScrollNeeded) {
-      handleSmoothScroll();
-    }
+      var isLocatorListPage = $('.cards-store-list').length;
+      var isScrollNeeded = window.location.hash === "#stores-list";
+      if (isLocatorListPage && isScrollNeeded) {
+          handleSmoothScroll();
+      }
   };
 
-  let bindEvents = function() {
+  let bindEvents = function () {
     let selector = excludedClassesForForm.reduce((acc, className) => {
       return acc + ':not([class^="' + className + '"])';
     }, 'form');
     $(document).on('submit', selector, handleFormSubmit);
     $forgotPassword.on('click', scenarios[2].action);
-    $('.btn-cancel').on('click', function() {
+    $('.btn-cancel').on('click', function(){
       window.location.href = './page_my-account.html';
     });
-    $('.btn-previous').on('click', function() {
+    $('.btn-previous').on('click', function(){
       window.location.href = './page_login.html';
     });
   };
 
-  var init = function() {
+  var init = function () {
     bindEvents();
     scrollLocatorListPage();
   };
@@ -367,6 +338,6 @@ Wick.Forms = (function() {
 
   return {
     showValidationErrors: showValidationErrors,
-    clearValidationErrors: clearValidationErrors,
-  };
+    clearValidationErrors: clearValidationErrors
+  }
 })();