wickes-css2 2.98.0-develop.2 → 2.98.0-develop.3

package/build/js/my-account.min.js

@@ -1 +1 @@
-!function n(c,i,r){function a(e,t){if(!i[e]){if(!c[e]){var o="function"==typeof require&&require;if(!t&&o)return o(e,!0);if(l)return l(e,!0);throw(t=new Error("Cannot find module '"+e+"'")).code="MODULE_NOT_FOUND",t}o=i[e]={exports:{}},c[e][0].call(o.exports,function(t){return a(c[e][1][t]||t)},o,o.exports,n,c,i,r)}return i[e].exports}for(var l="function"==typeof require&&require,t=0;t<r.length;t++)a(r[t]);return a}({1:[function(t,e,o){"use strict";var n=t("./utils/copy-to-clipboard"),c=window.Wick||{};c.MyAccount={el:{$myAccount:$(".my-account")},clipboardCodes:{tradeProId:{titleEl:".clipboard-code.trade-pro-id .title",subtitleEl:".clipboard-code.trade-pro-id .subtitle",btnCopy:".btn--trade-pro-id"},discountCode:{titleEl:".clipboard-code.discount-code .title",subtitleEl:".clipboard-code.discount-code .subtitle",btnCopy:".btn--discount-code"}},copyCode:function(t){var t=c.MyAccount.clipboardCodes[t],e=t.titleEl,o=t.subtitleEl,t=t.btnCopy,o=$(o).text().trim(),e=$(e).text().trim();(0,n.copyToClipboard)(o,t),c.SnackBar.show({text:"".concat(e," copied to clipboard"),type:c.SnackBar.types.SUCCESS,withCloseButton:!1,autoClose:!0,delayBeforeClose:1500})},init:function(){Object.keys(c.MyAccount.clipboardCodes).forEach(function(t){var e=c.MyAccount.clipboardCodes[t].btnCopy;$(e).on("click",function(){return c.MyAccount.copyCode(t)})})}},$(document).ready(function(){c.MyAccount.el.$myAccount.length&&c.MyAccount.init()})},{"./utils/copy-to-clipboard":2}],2:[function(t,e,o){"use strict";Object.defineProperty(o,"__esModule",{value:!0}),o.copyToClipboard=function(t,e){var o=$("<textarea>").css({position:"absolute",top:0,left:0,opacity:0});$(e).parent().append(o);e=t.replace(/(^\w|\s\w)/g,function(t){return t.toUpperCase()}).split(" ").filter(function(t){return""!==t}).join(" ");o.val(e),navigator.userAgent.match(/TradeProMobile_iOS|DIYMobile_iOS/i)?function(t){var t=t.get(0),e=t.contentEditable,o=t.readOnly,n=document.createRange(),c=window.getSelection();t.contentEditable=!0,t.readOnly=!1,n.selectNodeContents(t),c.removeAllRanges(),c.addRange(n),t.setSelectionRange(0,999999),t.contentEditable=e,t.readOnly=o}(o):navigator.userAgent.match(/ipad|ipod|iphone/i)?(o.select(),o[0].setSelectionRange(0,999999)):o.select();document.execCommand("copy"),o.remove()}},{}]},{},[1]);
+!function n(i,r,c){function l(t,e){if(!r[t]){if(!i[t]){var o="function"==typeof require&&require;if(!e&&o)return o(t,!0);if(a)return a(t,!0);throw(e=new Error("Cannot find module '"+t+"'")).code="MODULE_NOT_FOUND",e}o=r[t]={exports:{}},i[t][0].call(o.exports,function(e){return l(i[t][1][e]||e)},o,o.exports,n,i,r,c)}return r[t].exports}for(var a="function"==typeof require&&require,e=0;e<c.length;e++)l(c[e]);return l}({1:[function(e,t,o){"use strict";var n=e("./utils/copy-to-clipboard"),i=e("./utils/helpers"),r=window.Wick||{};r.MyAccount={el:{$clipboardCode:$(".clipboard-code"),appInfo:".app-info",hideAppInfo:"app-info--hide"},clipboardCodes:{tradeProId:{titleEl:".clipboard-code.trade-pro-id .title",subtitleEl:".clipboard-code.trade-pro-id .subtitle",btnCopy:".btn--trade-pro-id"},discountCode:{titleEl:".clipboard-code.discount-code .title",subtitleEl:".clipboard-code.discount-code .subtitle",btnCopy:".btn--discount-code"}},copyCode:function(e){var e=r.MyAccount.clipboardCodes[e],t=e.titleEl,o=e.subtitleEl,e=e.btnCopy,o=$(o).text().trim(),t=$(t).text().trim();(0,n.copyToClipboard)(o,e),r.SnackBar.show({text:"".concat(t," copied to clipboard"),type:r.SnackBar.types.SUCCESS,withCloseButton:!1,autoClose:!0,delayBeforeClose:1500})},init:function(){Object.keys(r.MyAccount.clipboardCodes).forEach(function(e){var t=r.MyAccount.clipboardCodes[e].btnCopy;$(t).on("click",function(){return r.MyAccount.copyCode(e)})}),$(r.MyAccount.el.appInfo).length&&(0,i.isApp)()&&$(r.MyAccount.el.appInfo).addClass(r.MyAccount.el.hideAppInfo)}},$(document).ready(function(){r.MyAccount.el.$clipboardCode.length&&r.MyAccount.init()})},{"./utils/copy-to-clipboard":2,"./utils/helpers":3}],2:[function(e,t,o){"use strict";Object.defineProperty(o,"__esModule",{value:!0}),o.copyToClipboard=function(e,t){var o=$("<textarea>").css({position:"absolute",top:0,left:0,opacity:0});$(t).parent().append(o);t=e.replace(/(^\w|\s\w)/g,function(e){return e.toUpperCase()}).split(" ").filter(function(e){return""!==e}).join(" ");o.val(t),navigator.userAgent.match(/TradeProMobile_iOS|DIYMobile_iOS/i)?function(e){var e=e.get(0),t=e.contentEditable,o=e.readOnly,n=document.createRange(),i=window.getSelection();e.contentEditable=!0,e.readOnly=!1,n.selectNodeContents(e),i.removeAllRanges(),i.addRange(n),e.setSelectionRange(0,999999),e.contentEditable=t,e.readOnly=o}(o):navigator.userAgent.match(/ipad|ipod|iphone/i)?(o.select(),o[0].setSelectionRange(0,999999)):o.select();document.execCommand("copy"),o.remove()}},{}],3:[function(e,t,o){"use strict";Object.defineProperty(o,"__esModule",{value:!0}),o.countLetters=function(e){e=e.match(/[a-zA-Z]/g);return e?e.length:0},o.createImageElements=function(e,t){return e.map(function(e){return $("<img>").attr("src",e).attr("alt",t)})},o.highlightCharacter=function(e,t,o){return e.includes(t)?(t=new RegExp("\\".concat(t,"+"),"g"),o='<span class="'.concat(o,'">$&</span>'),e.replace(t,o)):e},o.isApp=function(){return navigator.userAgent.match(/TradeProMobile_iOS|TradeProMobile_Android|DIYMobile_iOS|DIYMobile_Android|DIYApp_Guest_Mobile_iOS|DIYApp_Guest_Mobile_Android|AGENT_PLACEHOLDER/i)},o.isHasSymbol=function(e,t){return e.includes(t)},o.isKeyboardOpen=function(){var e=window.innerHeight,t=window.visualViewport.height;return e!==t},o.isTouchDevice=function(){return"ontouchstart"in window},o.scrollToElement=function(e){var t=1<arguments.length&&void 0!==arguments[1]?arguments[1]:20,e=$(e);0<e.length&&$("html, body").animate({scrollTop:e.offset().top-t},300)},o.scrollToTop=function(e){e.scrollTop(0)},o.trimFields=function(){Wick.AddressBook.getFieldsConfigurations().forEach(function(e){var t=e.input.val().trim();e.input.val(t)})}},{}]},{},[1]);

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

@@ -16,8 +16,8 @@ import {checkPayPalAvailability} from './basket/paypal';
 import {
     updateCharity,
     changeCharityPrice,
-    setDefaultCharityValue,
-    initCharityInteractions,
+    toggleCharityElements,
+    setDefaultCharityValue
 } from './components/charity';
 import {callAction} from './utils/http-action';
 import {ROUTES} from './utils/routes';
@@ -80,7 +80,7 @@ Wick.BasketPage = {
         orderItemInfoOffers: 'order-item__info-offers',
         charityInput: '#donation',
         charityItem: '.charity-new',
-        donationCartBtn: '.donation-cart__btn, .donation-cart-new__btn',
+        donationCartBtn: '.donation-cart__btn',
         checkoutWidgetDetails: '.checkout-widget__details',
         checkoutWidgetDetailsFlex: 'checkout-widget__details-flex',
         subtotal: '.checkout-widget__item-bold',
@@ -311,6 +311,7 @@ Wick.BasketPage = {
         } else {
             if (charity) {
                 Wick.BasketPage.updateCart();
+                quantityToUpdate === 0 && toggleCharityElements();
             } else {
                 if (maxValue > 1 || minValue > 1) {
                     if (quantityToUpdate > maxValue || quantityToUpdate < minValue) {
@@ -1281,16 +1282,8 @@ $(document).ready(function () {
         $(Wick.BasketPage.el.content).on('focusout', Wick.BasketPage.el.quantityValue, Wick.BasketPage.changeOnBlur);
         $(Wick.BasketPage.el.content).on('click', Wick.BasketPage.el.deliveryButtonInCC, Wick.BasketPage.changeMethodToDelivery);
         $(Wick.BasketPage.el.content).on('click', Wick.BasketPage.el.updateStoreButton, Wick.BasketPage.changeMethodToCC);
-        $(Wick.BasketPage.el.donationCartBtn).on('click', function(e) {
-            e.preventDefault();
-            const context = $(this).closest(Wick.BasketPage.el.charityItem);
-            if (!context.hasClass('charity-added')) {
-                updateCharity(this);
-                context.addClass('charity-added');
-            } else {
-                changeCharityPrice.call(this);
-            }
-        });
+        $(Wick.BasketPage.el.charityInput).on('click', updateCharity);
+        $(Wick.BasketPage.el.donationCartBtn).on('click', changeCharityPrice);
         $(Wick.BasketPage.el.charityItem).on('click', Wick.BasketPage.el.removeButton, updateCharity);
         $(Wick.BasketPage.el.orderSummary).on('click', Wick.BasketPage.el.voucherRemove, voucherRemove);
         $(Wick.BasketPage.el.promoWrapper).on('click', Wick.BasketPage.el.promoClose, Wick.BasketPage.removePromotion);
@@ -1313,7 +1306,6 @@ $(document).ready(function () {
         );
         Wick.BasketPage.updateCart(...Array(3), true);
         setDefaultCharityValue();
-        initCharityInteractions();
         if (!$(Wick.BasketPage.el.loader).length) {
             appendLoader(Wick.BasketPage.loaderPayload);
         }

package/build/js/page/components/charity.js

@@ -8,47 +8,34 @@ const charityEl = {
   charityInput: '#donation',
   charityTitleWrap: '.title-wrap',
   donationCart: '.donation-cart',
+  donationCartBtn: '.donation-cart__btn',
+  donationCartHolder: '.donation-cart__holder',
   donationCartHide: 'donation-cart__hide',
-  donationCartBtn: '.donation-cart__btn, .donation-cart-new__btn',
-  donationCartBtnSelected: '.donation-cart-new__btn.btn-selected',
-  donationCartHolder: '.donation-cart__holder, .donation-cart-new__holder',
-  donationCartValue: '.donation-cart__value, .donation-cart-new__value',
+  donationCartValue: '.donation-cart__value',
   charityAdded: 'charity-added',
-  donationCartCostBlock: '.donation-cart-new__cost',
-  donationCartCostBlockHide: 'donation-cart-new__cost-hide',
-  donationCartRemove: '.donation-cart-new__cost .order-item__remove',
 }
 
-export function updateCharity(button) {
+export function updateCharity() {
+  //checkbox action
   if ($('#donation').attr('disabled') === 'disabled') {
-    $('#donation').removeAttr('disabled');
+    $('#donation').removeAttr('disabled')
   } else {
     $('#donation').prop('disabled', (_, value) => !value);
   }
 
-  const context = getCurrentCharityItem(button);
+  const context = getCurrentCharityItem(this);
   const productCode = getCurrentProductCode(context);
-  const quantity = getSelectedCharityAmount(button);
 
   showLoader('.basket-loader');
 
   if (context.hasClass(charityEl.charityAdded)) {
-    $(button).removeAttr('checked');
+    $(this).removeAttr('checked');
   } else {
-    $(button).attr('checked', 'checked');
-    repaintCharityButton(button);
-    context
-      .find(charityEl.donationCartValue)
-      .text(quantity);
-    showDonationCostBlock(context);
-    charityActionForAdd(productCode, quantity);
+    $(this).attr('checked', 'checked');
+    charityActionForAdd(productCode);
   }
 }
 
-function getSelectedCharityAmount(context) {
-  return $(context).data('value');
-}
-
 function getCurrentCharityItem(context) {
   return $(context).closest(charityEl.charityItem);
 }
@@ -57,13 +44,13 @@ function getCurrentProductCode(context) {
   return context.find('input[name="productCode"]').val();
 }
 
-export function charityActionForAdd(value, quantity) {
+export function charityActionForAdd(value) {
   if (!Wick.checkLocalEnv) {
     const payload = {
       url: ROUTES.CHARITY_ADD,
       queries: {
         productCodePost: value,
-        qty: quantity,
+        qty: getDefaultCharityAmount(),
       },
       type: 'POST',
     };
@@ -74,10 +61,19 @@ export function charityActionForAdd(value, quantity) {
 
     callAction(payload, executeCharityAction, productInfo);
   } else {
+    toggleCharityElements();
     Wick.BasketPage.updateCart(...Array(2), true);
   }
 }
 
+export function toggleCharityElements() {
+  if ($(charityEl.charityItem).hasClass(charityEl.charityAdded)) {
+    $(charityEl.charityInput).prop('checked', false);
+  }
+  $(charityEl.charityItem).toggleClass(charityEl.charityAdded);
+  $(charityEl.charityItem).hasClass(charityEl.charityMultiple) && toggleMultipleCharityChoose($(charityEl.charityItem));
+}
+
 function executeCharityAction(response, productInfo) {
   if (response.addedProducts && response.addedProducts[0]) {
     productInfo.quantity = response.addedProducts[0].qty;
@@ -85,6 +81,7 @@ function executeCharityAction(response, productInfo) {
   }
 
   Wick.BasketPage.updateCart(...Array(2), true);
+  toggleCharityElements();
 }
 
 export function changeCharityPrice() {
@@ -98,7 +95,6 @@ export function changeCharityPrice() {
 
   repaintCharityButton(this);
   $(charityEl.donationCartValue).text(charityValue);
-  showDonationCostBlock(context);
   charityActionForChangePrice(this);
 }
 
@@ -123,26 +119,22 @@ function repaintCharityButton(context) {
   $(context).removeClass(btnSecondary).addClass(btnSelected);
 }
 
-function getDefaultCharityAmount() {
-  const donationButtons = $(charityEl.charityItem).find(charityEl.donationCartBtn);
-  return donationButtons.first().attr('data-value');
-}
+function resetCharityButton(context) {
+  const donationButtons = $(context).find(charityEl.donationCartBtn);
+  const btnSelected = 'btn-selected';
+  const btnSecondary = 'btn-secondary';
+  const defaultAmount = getDefaultCharityAmount();
 
-export function setDefaultCharityValue() {
-  $(charityEl.donationCartBtnSelected).each(function() {
-    const $btn   = $(this);
-    const $item  = $btn.closest(charityEl.charityItem);
-    const value  = $btn.data('value');
-
-    $item.find(charityEl.donationCartValue).text(value);
-    $item.find(charityEl.donationCartCostBlock)
-      .removeClass(charityEl.donationCartCostBlockHide);
-  });
+  donationButtons.each((i, btn) => {
+    $(btn).attr('data-value') === defaultAmount
+      ? $(btn).removeClass(btnSecondary).addClass(btnSelected)
+      : $(btn).removeClass(btnSelected).addClass(btnSecondary);
+  })
 }
 
-function showDonationCostBlock($charity) {
-  $charity.find(charityEl.donationCartCostBlock)
-    .removeClass(charityEl.donationCartCostBlockHide);
+function getDefaultCharityAmount() {
+  const donationButtons = $(charityEl.charityItem).find(charityEl.donationCartBtn);
+  return donationButtons.first().attr('data-value');
 }
 
 function resetCharityValue() {
@@ -150,19 +142,12 @@ function resetCharityValue() {
   $(charityEl.donationCartValue).text(defaultValue);
 }
 
-export function initCharityInteractions() {
-  $(document).on('click', charityEl.donationCartRemove, function(e) {
-    e.preventDefault();
-
-    const $item = $(this).closest(charityEl.charityItem);
-    $item.removeClass(charityEl.charityAdded);
-    $item
-      .find(charityEl.donationCartCostBlock)
-      .addClass(charityEl.donationCartCostBlockHide);
-    $item
-      .find(charityEl.donationCartBtn)
-      .removeClass('btn-selected')
-      .addClass('btn-secondary');
-    resetCharityValue();
-  });
+export function toggleMultipleCharityChoose(context) {
+  context.find(charityEl.donationCart).toggleClass(charityEl.donationCartHide);
+  resetCharityButton(context);
+  resetCharityValue();
+}
+
+export function setDefaultCharityValue() {
+  $(charityEl.charityItem).hasClass(charityEl.charityMultiple) && resetCharityValue();
 }

package/build/js/page/default-store.js

@@ -18,7 +18,7 @@ Wick.DefaultStore = {
     const dropdowns = $("#openingTimes, #specialTimes, #facilities");
     const btn = $('[data-toggle="collapse"]');
 
-    if ($(window).width() >= 768) {
+    if (Wick.Responsive.getCurrentBreakpoint() !== 'down-sm') {
       dropdowns.addClass("show");
       if (btn.length) {
         btn.attr("aria-expanded", "true");
@@ -32,9 +32,6 @@ Wick.DefaultStore = {
   },
   init () {
     Wick.DefaultStore.updateCollapseState();
-    $(window).resize( _.debounce(function () {
-      Wick.DefaultStore.updateCollapseState();
-    }, 200));
     Wick.DefaultStore.el.$searchInput.on('input', Wick.DefaultStore.checkVisibilityOfClearButton);
   }
 }

package/build/js/page/my-account.js

@@ -1,10 +1,13 @@
 import {copyToClipboard} from "./utils/copy-to-clipboard";
+import {isApp} from "./utils/helpers";
 
 var Wick = window.Wick || {};
 
 Wick.MyAccount = {
   el: {
-    $myAccount: $('.my-account'),
+    $clipboardCode: $('.clipboard-code'),
+    appInfo: '.app-info',
+    hideAppInfo: 'app-info--hide'
   },
   clipboardCodes: {
     tradeProId: {
@@ -39,11 +42,15 @@ Wick.MyAccount = {
       const { btnCopy } = Wick.MyAccount.clipboardCodes[codeType];
       $(btnCopy).on('click', () => Wick.MyAccount.copyCode(codeType));
     });
+
+    if($(Wick.MyAccount.el.appInfo).length && isApp()) {
+      $(Wick.MyAccount.el.appInfo).addClass(Wick.MyAccount.el.hideAppInfo);
+    }
   }
 }
 
 $(document).ready(function () {
-  if (!Wick.MyAccount.el.$myAccount.length) {
+  if (!Wick.MyAccount.el.$clipboardCode.length) {
     return;
   }
 

package/build/js/page/personal-details.js

@@ -25,7 +25,9 @@ Wick.PersonalDetails = {
     notification: '.notification',
     fieldError: '.form-row.form-row_validation-error',
     changePasswordPopup: '#change-password-popup',
+    confirmationEmailPopup: '#confirmation-email-popup',
     globalMessage: '.globalMessages',
+    newEmailElement: '.new-email',
   },
   errorMessages: {
     errorFirstName: 'Please enter your first name',
@@ -150,10 +152,25 @@ Wick.PersonalDetails = {
       });
     }
   },
+  showConfirmationEmailPopup(currentEmail) {
+    const $popup = $(Wick.PersonalDetails.el.confirmationEmailPopup);
+    $popup.find(Wick.PersonalDetails.el.newEmailElement).text(currentEmail);
+    $popup.modal('show');
+
+    $popup.find(Wick.PersonalDetails.el.btnContinue).off('click').on('click', function () {
+      Wick.LeaveEvent.removeLeaveEvent();
+      $popup.modal('hide');
+      Wick.PersonalDetails.requestToUpdateForm();
+    });
+  },
   submitForm(event) {
     event.preventDefault();
     Wick.PersonalDetails.trimAndRewriteInputs(Wick.PersonalDetails.el.userForm);
 
+    const currentState = Wick.LeaveEvent.getState(Wick.PersonalDetails.el.userForm);
+    const initialEmail = Wick.LeaveEvent.initialFormState.find(field => field.name === 'email')?.value;
+    const currentEmail = currentState.find(field => field.name === 'email')?.value;
+
     if (!Wick.PersonalDetails.hasUnsavedChanges()) {
       Wick.PersonalDetails.hideForm();
       $(Wick.PersonalDetails.el.notification).remove();
@@ -162,7 +179,11 @@ Wick.PersonalDetails = {
     }
 
     if (Wick.PersonalDetails.validateForm()) {
-      Wick.PersonalDetails.requestToUpdateForm();
+      if (initialEmail !== currentEmail) {
+        Wick.PersonalDetails.showConfirmationEmailPopup(currentEmail);
+      } else {
+        Wick.PersonalDetails.requestToUpdateForm();
+      }
     } else {
       Wick.Notification.show({
         ...Wick.PersonalDetails.defaultNotificationConfig,