wickes-css2 2.98.0-billie.4 → 2.98.0-develop.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Readme.md +1 -1
- package/build/css/category-main.css +1 -1
- package/build/css/components/checkout-payment-details-v2.css +1 -1
- package/build/css/components/global-search.css +1 -1
- package/build/css/components/loader.css +1 -1
- package/build/css/emulation.css +1 -1
- package/build/css/homepage-main.css +1 -1
- package/build/css/main.css +1 -1
- package/build/css/my-account-main-v2.css +1 -1
- package/build/css/my-account-main.css +1 -1
- package/build/css/pages/checkout-new.css +1 -1
- package/build/css/pages/my-account-v2.css +1 -1
- package/build/css/pages/page_address-book.css +1 -1
- package/build/css/pages/page_change-password.css +1 -1
- package/build/css/pages/page_default-store.css +1 -1
- package/build/css/pages/page_discount.css +1 -0
- package/build/css/pages/page_home.css +1 -1
- package/build/css/pages/page_my-orders.css +1 -1
- package/build/css/pages/page_personal-details.css +1 -1
- package/build/css/pages/page_products-list-combined.css +1 -1
- package/build/css/pages/page_products-list.css +1 -1
- package/build/css/pdp-main-before-combine.css +1 -1
- package/build/css/pdp-main-critical.css +1 -1
- package/build/css/pdp-main-non-critical.css +1 -1
- package/build/css/pdp-main.css +1 -1
- package/build/css/plp-main.css +1 -1
- package/build/css/store-locator-main.css +1 -1
- package/build/img/apps/app-lg.png +0 -0
- package/build/img/apps/app-md.png +0 -0
- package/build/js/basket.min.js +2 -2
- package/build/js/bundle.min.js +1 -1
- package/build/js/checkout.min.js +1 -1
- package/build/js/default-store.min.js +1 -1
- package/build/js/emulation.min.js +11 -23
- package/build/js/general.bundle.min.js +1 -1
- package/build/js/merged-checkout.min.js +1 -1
- package/build/js/my-account.min.js +1 -1
- package/build/js/page/basket-v2.js +1 -2
- package/build/js/page/checkout-payment-details.js +0 -8
- package/build/js/page/default-store.js +1 -4
- package/build/js/page/my-account.js +9 -2
- package/build/js/page/personal-details.js +22 -1
- package/build/js/pdp.bundle.min.js +1 -1
- package/build/js/personal-details.min.js +1 -1
- package/build/js/plp.bundle.min.js +1 -1
- package/build/js/project-list.min.js +1 -1
- package/package.json +10 -2
- package/src/components/address-postcode-look-up.hbs +2 -2
- package/src/components/checkout-edit-billing-address.hbs +6 -20
- package/src/components/checkout-payment-details-v2.hbs +55 -94
- package/src/components/checkout_payment-new.hbs +1 -10
- package/src/components/header-menu/logout-action.hbs +8 -0
- package/src/components/header-menu/popover-actions-mob.hbs +11 -0
- package/src/components/header-menu/popover-actions.hbs +13 -0
- package/src/components/header-menu/user-actions-mob.hbs +18 -0
- package/src/components/header-menu/user-actions.hbs +12 -0
- package/src/components/my-account/active-orders/list-orders.hbs +1 -1
- package/src/components/my-account/active-orders/order.hbs +0 -2
- package/src/components/my-account/clipboard-code-card.hbs +13 -6
- package/src/components/my-account/discount.hbs +3 -1
- package/src/components/payment-loader.hbs +21 -59
- package/src/components/payments-checkout-v2.hbs +6 -12
- package/src/components/payments-checkout.hbs +0 -6
- package/src/components/payments.hbs +4 -10
- package/src/components/price-block-order.hbs +0 -1
- package/src/data/data_header-menu.json +153 -0
- package/src/data/my-account/data_discount.json +80 -0
- package/src/data/my-account/data_personal-details.json +22 -0
- package/src/elements/radiobutton.hbs +0 -7
- package/src/img/apps/app-lg.png +0 -0
- package/src/img/apps/app-md.png +0 -0
- package/src/js/components/general/clamp-content.js +1 -0
- package/src/js/components/general/main-nav.js +5 -5
- package/src/js/emulation/paymentLoader.js +11 -22
- package/src/js/page/basket-v2.js +1 -2
- package/src/js/page/checkout-payment-details.js +0 -8
- package/src/js/page/default-store.js +1 -4
- package/src/js/page/my-account.js +9 -2
- package/src/js/page/personal-details.js +22 -1
- package/src/page_checkout_delivery-address-customer-journey.html +2 -2
- package/src/page_my-account-installer.html +2 -1
- package/src/page_my-account-trade-pro.html +1 -0
- package/src/page_my-account.html +10 -2
- package/src/page_personal-details.html +5 -0
- package/src/page_plp_v2-vat.html +8 -2
- package/src/page_shopping-cart-v2.html +2 -3
- package/src/page_tradepro-discount-app.html +82 -0
- package/src/page_tradepro-discount.html +82 -0
- package/src/partials/header.hbs +40 -41
- package/src/partials/main-nav.hbs +51 -171
- package/src/scss/common/_elements.scss +0 -4
- package/src/scss/common/_rewards-counter.scss +1 -1
- package/src/scss/components/_leave-modal.scss +6 -2
- package/src/scss/components/_payments-v2.scss +0 -8
- package/src/scss/components/_price-block-critical.scss +3 -3
- package/src/scss/components/_price-block.scss +8 -3
- package/src/scss/components/checkout-payment-details-v2.scss +0 -237
- package/src/scss/components/loader.scss +0 -8
- package/src/scss/components/my-account/_active-orders.scss +0 -2
- package/src/scss/components/my-account/_barcode.scss +58 -0
- package/src/scss/components/my-account/_clipboard-code.scss +77 -0
- package/src/scss/components/my-account/_discount.scss +51 -0
- package/src/scss/emulation.scss +1 -1
- package/src/scss/helpers/_mixins.scss +9 -0
- package/src/scss/pages/_checkout-confirmation-new.scss +3 -10
- package/src/scss/pages/my-account-v2.scss +38 -172
- package/src/scss/pages/page_change-password.scss +1 -1
- package/src/scss/pages/page_default-store.scss +5 -4
- package/src/scss/pages/page_discount.scss +212 -0
- package/src/scss/pages/page_personal-details.scss +1 -74
- package/src/scss/pages/page_products-list-combined.scss +13 -3
- package/src/scss/pages/page_products-list.scss +9 -1
- package/src/scss/partials/_header-critical.scss +2 -5
- package/src/scss/partials/_header.scss +58 -25
- package/src/scss/partials/_main-nav.scss +43 -29
- package/src/scss/plp-main.scss +1 -0
- package/src/sitemap.html +2 -25
- package/build/img/billie-logo.svg +0 -4
- package/build/img/billie-spinner.svg +0 -5
- package/build/img/billie.svg +0 -4
- package/build/img/payment/checkout/billie.svg +0 -4
- package/build/img/payment/footer/billie.svg +0 -4
- package/build/js/page/billie-business-type.js +0 -34
- package/src/components/address-billie.hbs +0 -42
- package/src/components/checkout-payment-info-block.hbs +0 -49
- package/src/components/checkout-payment-option.hbs +0 -40
- package/src/components/my-account/active-orders/payment-status.hbs +0 -8
- package/src/img/billie-logo.svg +0 -4
- package/src/img/billie-spinner.svg +0 -5
- package/src/img/billie.svg +0 -4
- package/src/img/payment/checkout/billie.svg +0 -4
- package/src/img/payment/footer/billie.svg +0 -4
- package/src/js/page/billie-business-type.js +0 -34
- package/src/page_checkout_confirmation-billie.html +0 -339
- package/src/page_payment-details-with-billie.html +0 -67
- package/src/page_product-details-billie.html +0 -86
- package/src/scss/components/_tooltip.scss +0 -19
- package/src/scss/components/my-account/_payment-status.scss +0 -36
|
@@ -1 +1 @@
|
|
|
1
|
-
!function n(
|
|
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]);
|
|
@@ -29,8 +29,8 @@ import {
|
|
|
29
29
|
} from './basket/session-sync'
|
|
30
30
|
import {displayEnergyEfficiency} from "./basket/display-energy-efficiency";
|
|
31
31
|
import {appendLoader, hideLoader, showLoader} from "./utils/loader";
|
|
32
|
-
import { initStickyObserver } from './components/sticky-order-observer';
|
|
33
32
|
import {addClassToSummaryAside} from "./basket/summary-mobile";
|
|
33
|
+
import { initStickyObserver } from './components/sticky-order-observer';
|
|
34
34
|
|
|
35
35
|
var Wick = window.Wick || {};
|
|
36
36
|
Wick.BasketPage = {
|
|
@@ -1305,7 +1305,6 @@ $(document).ready(function () {
|
|
|
1305
1305
|
'.summary__aside.collapse.show'
|
|
1306
1306
|
);
|
|
1307
1307
|
Wick.BasketPage.updateCart(...Array(3), true);
|
|
1308
|
-
|
|
1309
1308
|
setDefaultCharityValue();
|
|
1310
1309
|
if (!$(Wick.BasketPage.el.loader).length) {
|
|
1311
1310
|
appendLoader(Wick.BasketPage.loaderPayload);
|
|
@@ -62,14 +62,6 @@ Wick.CheckoutPaymentDetails = (function() {
|
|
|
62
62
|
case 'klarna':
|
|
63
63
|
hideBillingAddres();
|
|
64
64
|
break;
|
|
65
|
-
case 'billie':
|
|
66
|
-
detailsLabel = {
|
|
67
|
-
...detailsLabel,
|
|
68
|
-
labelText: 'Name on Billie account',
|
|
69
|
-
buttonText: 'Pay with Billie'
|
|
70
|
-
}
|
|
71
|
-
changeLabelText(detailsLabel);
|
|
72
|
-
break;
|
|
73
65
|
case 'clearpay':
|
|
74
66
|
detailsLabel = {
|
|
75
67
|
...detailsLabel,
|
|
@@ -18,7 +18,7 @@ Wick.DefaultStore = {
|
|
|
18
18
|
const dropdowns = $("#openingTimes, #specialTimes, #facilities");
|
|
19
19
|
const btn = $('[data-toggle="collapse"]');
|
|
20
20
|
|
|
21
|
-
if (
|
|
21
|
+
if (Wick.Responsive.getCurrentBreakpoint() !== 'down-sm') {
|
|
22
22
|
dropdowns.addClass("show");
|
|
23
23
|
if (btn.length) {
|
|
24
24
|
btn.attr("aria-expanded", "true");
|
|
@@ -32,9 +32,6 @@ Wick.DefaultStore = {
|
|
|
32
32
|
},
|
|
33
33
|
init () {
|
|
34
34
|
Wick.DefaultStore.updateCollapseState();
|
|
35
|
-
$(window).resize( _.debounce(function () {
|
|
36
|
-
Wick.DefaultStore.updateCollapseState();
|
|
37
|
-
}, 200));
|
|
38
35
|
Wick.DefaultStore.el.$searchInput.on('input', Wick.DefaultStore.checkVisibilityOfClearButton);
|
|
39
36
|
}
|
|
40
37
|
}
|
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import {copyToClipboard} from "./utils/copy-to-clipboard";
|
|
2
|
+
import {isApp} from "./utils/helpers";
|
|
2
3
|
|
|
3
4
|
var Wick = window.Wick || {};
|
|
4
5
|
|
|
5
6
|
Wick.MyAccount = {
|
|
6
7
|
el: {
|
|
7
|
-
$
|
|
8
|
+
$clipboardCode: $('.clipboard-code'),
|
|
9
|
+
appInfo: '.app-info',
|
|
10
|
+
hideAppInfo: 'app-info--hide'
|
|
8
11
|
},
|
|
9
12
|
clipboardCodes: {
|
|
10
13
|
tradeProId: {
|
|
@@ -39,11 +42,15 @@ Wick.MyAccount = {
|
|
|
39
42
|
const { btnCopy } = Wick.MyAccount.clipboardCodes[codeType];
|
|
40
43
|
$(btnCopy).on('click', () => Wick.MyAccount.copyCode(codeType));
|
|
41
44
|
});
|
|
45
|
+
|
|
46
|
+
if($(Wick.MyAccount.el.appInfo).length && isApp()) {
|
|
47
|
+
$(Wick.MyAccount.el.appInfo).addClass(Wick.MyAccount.el.hideAppInfo);
|
|
48
|
+
}
|
|
42
49
|
}
|
|
43
50
|
}
|
|
44
51
|
|
|
45
52
|
$(document).ready(function () {
|
|
46
|
-
if (!Wick.MyAccount.el.$
|
|
53
|
+
if (!Wick.MyAccount.el.$clipboardCode.length) {
|
|
47
54
|
return;
|
|
48
55
|
}
|
|
49
56
|
|
|
@@ -25,7 +25,9 @@ Wick.PersonalDetails = {
|
|
|
25
25
|
notification: '.notification',
|
|
26
26
|
fieldError: '.form-row.form-row_validation-error',
|
|
27
27
|
changePasswordPopup: '#change-password-popup',
|
|
28
|
+
confirmationEmailPopup: '#confirmation-email-popup',
|
|
28
29
|
globalMessage: '.globalMessages',
|
|
30
|
+
newEmailElement: '.new-email',
|
|
29
31
|
},
|
|
30
32
|
errorMessages: {
|
|
31
33
|
errorFirstName: 'Please enter your first name',
|
|
@@ -150,10 +152,25 @@ Wick.PersonalDetails = {
|
|
|
150
152
|
});
|
|
151
153
|
}
|
|
152
154
|
},
|
|
155
|
+
showConfirmationEmailPopup(currentEmail) {
|
|
156
|
+
const $popup = $(Wick.PersonalDetails.el.confirmationEmailPopup);
|
|
157
|
+
$popup.find(Wick.PersonalDetails.el.newEmailElement).text(currentEmail);
|
|
158
|
+
$popup.modal('show');
|
|
159
|
+
|
|
160
|
+
$popup.find(Wick.PersonalDetails.el.btnContinue).off('click').on('click', function () {
|
|
161
|
+
Wick.LeaveEvent.removeLeaveEvent();
|
|
162
|
+
$popup.modal('hide');
|
|
163
|
+
Wick.PersonalDetails.requestToUpdateForm();
|
|
164
|
+
});
|
|
165
|
+
},
|
|
153
166
|
submitForm(event) {
|
|
154
167
|
event.preventDefault();
|
|
155
168
|
Wick.PersonalDetails.trimAndRewriteInputs(Wick.PersonalDetails.el.userForm);
|
|
156
169
|
|
|
170
|
+
const currentState = Wick.LeaveEvent.getState(Wick.PersonalDetails.el.userForm);
|
|
171
|
+
const initialEmail = Wick.LeaveEvent.initialFormState.find(field => field.name === 'email')?.value;
|
|
172
|
+
const currentEmail = currentState.find(field => field.name === 'email')?.value;
|
|
173
|
+
|
|
157
174
|
if (!Wick.PersonalDetails.hasUnsavedChanges()) {
|
|
158
175
|
Wick.PersonalDetails.hideForm();
|
|
159
176
|
$(Wick.PersonalDetails.el.notification).remove();
|
|
@@ -162,7 +179,11 @@ Wick.PersonalDetails = {
|
|
|
162
179
|
}
|
|
163
180
|
|
|
164
181
|
if (Wick.PersonalDetails.validateForm()) {
|
|
165
|
-
|
|
182
|
+
if (initialEmail !== currentEmail) {
|
|
183
|
+
Wick.PersonalDetails.showConfirmationEmailPopup(currentEmail);
|
|
184
|
+
} else {
|
|
185
|
+
Wick.PersonalDetails.requestToUpdateForm();
|
|
186
|
+
}
|
|
166
187
|
} else {
|
|
167
188
|
Wick.Notification.show({
|
|
168
189
|
...Wick.PersonalDetails.defaultNotificationConfig,
|