wickes-css2 2.94.0-develop.2 → 2.94.0-develop.21
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 +4 -4
- package/build/css/category-main.css +1 -1
- package/build/css/components/checkout-payment-details-v2.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/checkout.css +1 -1
- package/build/css/pages/my-account-v2.css +1 -1
- package/build/css/pages/my-account.css +1 -1
- package/build/css/pages/page_checkout_delivery-new.css +1 -1
- package/build/css/pages/page_default-store.css +1 -0
- package/build/css/pages/page_my-orders.css +1 -0
- package/build/css/pages/page_personal-details.css +1 -1
- package/build/css/pages/page_product-details-v2-critical.css +1 -1
- package/build/css/pages/page_product-details-v2.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/pages/page_shopping-cart-v2.css +1 -1
- package/build/css/pages/tradePro-signup.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/js/account-members.min.js +1 -1
- package/build/js/basket.min.js +2 -2
- package/build/js/bundle.min.js +1 -1
- package/build/js/checkout.min.js +2 -2
- package/build/js/default-store.min.js +1 -0
- package/build/js/emulation.min.js +153 -5
- package/build/js/general.bundle.min.js +1 -1
- package/build/js/merged-checkout.min.js +2 -2
- package/build/js/my-orders.min.js +1 -0
- package/build/js/page/basket/summary-mobile.js +22 -0
- package/build/js/page/basket-v2.js +20 -6
- package/build/js/page/components/order-summary.js +8 -1
- package/build/js/page/components/sticky-order-observer.js +49 -0
- package/build/js/page/components/voucher.js +1 -1
- package/build/js/page/default-store.js +44 -0
- package/build/js/page/my-orders.js +165 -0
- package/build/js/page/personal-details.js +105 -36
- package/build/js/page/quiz.js +20 -11
- 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/build/js/quiz.min.js +1 -1
- package/package.json +1 -1
- package/src/components/account-families/actions-bar.hbs +3 -3
- package/src/components/checkout-action.hbs +14 -11
- package/src/components/checkout-voucher-accordion.hbs +15 -0
- package/src/components/checkout_order-summary-new.hbs +5 -3
- package/src/components/checkout_voucher_large.hbs +20 -16
- package/src/components/date-selection.hbs +1 -1
- package/src/components/default-store/current-store.hbs +60 -0
- package/src/components/default-store/list-of-store.hbs +39 -0
- package/src/components/default-store/store-form.hbs +29 -0
- package/src/components/default-store/store-unavailable.hbs +4 -0
- package/src/components/flatpickr-calendar.hbs +26 -0
- package/src/components/my-account/active-orders/header.hbs +6 -2
- package/src/components/my-account/active-orders/list-orders.hbs +14 -2
- package/src/components/my-account/active-orders/order-header.hbs +1 -1
- package/src/components/my-account/active-orders/order.hbs +10 -6
- package/src/components/my-account/clipboard-code-card.hbs +1 -1
- package/src/components/my-account/empty-orders.hbs +9 -0
- package/src/components/my-account/mobile-nav.hbs +23 -19
- package/src/components/my-account/orders-nav.hbs +15 -0
- package/src/components/my-account/personal-details-form.hbs +5 -0
- package/src/components/my-account/sort-by.hbs +3 -0
- package/src/components/my-account/user-account-actions.hbs +1 -1
- package/src/components/order-item.hbs +3 -3
- package/src/components/order-summary.hbs +91 -56
- package/src/components/partner-signup-form.hbs +4 -0
- package/src/components/signup-form.hbs +1 -2
- package/src/components/store-details.hbs +22 -20
- package/src/components/store-preview.hbs +0 -11
- package/src/components/summary-mobile-bar.hbs +17 -0
- package/src/components/user-information-field.hbs +1 -1
- package/src/data/data_big-wins-stores.json +0 -22
- package/src/data/data_delivery-address-v2.json +1 -1
- package/src/data/data_shopping-cart-v2.json +24 -0
- package/src/data/my-account/data_my-orders.json +246 -0
- package/src/data/my-account/data_personal-details.json +36 -11
- package/src/data/my-account/page_default-store.json +158 -0
- package/src/elements/dropdown.hbs +1 -1
- package/src/elements/input.hbs +2 -2
- package/src/js/components/flatpickr.js +167 -0
- package/src/js/components/general/handleAccordion.js +35 -0
- package/src/js/components/general/is-trade-pro.js +15 -1
- package/src/js/components/general/switchVat.js +1 -1
- package/src/js/components/leave-event.js +41 -2
- package/src/js/emulation/basket-data.js +2 -2
- package/src/js/emulation/big-wins.js +0 -2
- package/src/js/emulation/default-store.js +97 -0
- package/src/js/emulation/forms.js +1 -1
- package/src/js/emulation/mock.js +10 -0
- package/src/js/emulation/my-orders-local.js +41 -0
- package/src/js/page/basket/summary-mobile.js +22 -0
- package/src/js/page/basket-v2.js +20 -6
- package/src/js/page/components/order-summary.js +8 -1
- package/src/js/page/components/sticky-order-observer.js +49 -0
- package/src/js/page/components/voucher.js +1 -1
- package/src/js/page/default-store.js +44 -0
- package/src/js/page/my-orders.js +165 -0
- package/src/js/page/personal-details.js +105 -36
- package/src/js/page/quiz.js +20 -11
- package/src/layouts/basket-new.hbs +1 -1
- package/src/layouts/checkout-new.hbs +1 -0
- package/src/page_checkout_confirmation-new-marketing-consent-error.html +0 -2
- package/src/page_checkout_delivery-address-customer-journey.html +0 -5
- package/src/page_checkout_delivery-address-v2.html +0 -4
- package/src/page_checkout_delivery-details-v2-asm.html +1 -5
- package/src/page_checkout_delivery-details-v2-calendar-message.html +0 -3
- package/src/page_checkout_delivery-details-v2-oos.html +0 -3
- package/src/page_checkout_delivery-details-v2-wisdom-not-available.html +0 -5
- package/src/page_checkout_delivery-details-v2-wisdom.html +0 -5
- package/src/page_checkout_delivery-details-with-loader-v2.html +0 -3
- package/src/page_checkout_delivery-details_guest-new.html +0 -5
- package/src/page_checkout_delivery_address-asm-new.html +0 -4
- package/src/page_checkout_next-day-delivery-details.html +0 -6
- package/src/page_checkout_payment-details-v2.html +1 -1
- package/src/page_checkout_payment-details_guest-with-checkout-journey.html +0 -2
- package/src/page_checkout_payment-details_login-with-checkout-journey.html +0 -2
- package/src/page_checkout_payment-details_with-card-loader.html +56 -0
- package/src/page_checkout_rapid-delivery-details.html +0 -6
- package/src/page_default-store-page-empty.html +48 -0
- package/src/page_default-store-page.html +55 -0
- package/src/page_klarna_payment-details_with-klarna.html +3 -6
- package/src/page_my-orders-empty.html +49 -0
- package/src/page_my-orders.html +64 -0
- package/src/page_payment-details-with-clearpay.html +1 -1
- package/src/page_payment-details_with_apple-pay.html +1 -1
- package/src/page_payment-details_with_google-pay.html +1 -1
- package/src/page_personal-details-installer.html +17 -7
- package/src/page_personal-details.html +15 -7
- package/src/page_shopping-cart-v2.html +6 -16
- package/src/page_tradePro-signup.html +1 -1
- package/src/scss/barclays-paypage-combined-minified.css +1 -1
- package/src/scss/barclays-paypage-combined.css +9 -15
- package/src/scss/components/_big-wins-critical.scss +0 -1
- package/src/scss/components/_big-wins.scss +1 -8
- package/src/scss/components/_checkout-action.scss +132 -6
- package/src/scss/components/_marketing-preferences.scss +1 -1
- package/src/scss/components/_order-item-cc.scss +0 -6
- package/src/scss/components/_order-summary.scss +329 -178
- package/src/scss/components/_sticky-element-appearance.scss +25 -0
- package/src/scss/components/checkout-payment-details-v2.scss +2 -2
- package/src/scss/components/my-account/_active-orders.scss +263 -0
- package/src/scss/components/my-account/_orders-nav.scss +61 -0
- package/src/scss/components/my-account/_shipment.scss +1 -0
- package/src/scss/helpers/_variables.scss +3 -0
- package/src/scss/libs/flatpickr.scss +235 -0
- package/src/scss/main.scss +1 -0
- package/src/scss/pages/_checkout-widget.scss +137 -28
- package/src/scss/pages/_my-account_new.scss +1 -12
- package/src/scss/pages/my-account-v2.scss +1 -136
- package/src/scss/pages/page_checkout_delivery-new.scss +119 -10
- package/src/scss/pages/page_default-store.scss +634 -0
- package/src/scss/pages/page_my-orders.scss +232 -0
- package/src/scss/pages/page_personal-details.scss +37 -5
- package/src/scss/pages/page_products-list-combined.scss +0 -1
- package/src/scss/pages/page_products-list.scss +0 -1
- package/src/scss/pages/page_shopping-cart-v2.scss +137 -34
- package/src/scss/pages/tradePro-signup.scss +27 -0
- package/src/scss/partials/_header.scss +5 -0
- package/src/sitemap.html +6 -0
- package/src/scss/components/my-account/_order.scss +0 -112
package/src/js/page/basket-v2.js
CHANGED
|
@@ -29,6 +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 {addClassToSummaryAside} from "./basket/summary-mobile";
|
|
33
|
+
import { initStickyObserver } from './components/sticky-order-observer';
|
|
32
34
|
|
|
33
35
|
var Wick = window.Wick || {};
|
|
34
36
|
Wick.BasketPage = {
|
|
@@ -384,6 +386,7 @@ Wick.BasketPage = {
|
|
|
384
386
|
} else {
|
|
385
387
|
if (initial) {
|
|
386
388
|
Wick.BasketPage.getCartEntries(Wick.BasketData.updateCart);
|
|
389
|
+
addClassToSummaryAside(Wick.BasketData.updateCart);
|
|
387
390
|
const initialTotalPrice = Wick.BasketData.updateCart.totalPrice.value;
|
|
388
391
|
updateClearpayVisibility(initialTotalPrice);
|
|
389
392
|
} else {
|
|
@@ -405,6 +408,7 @@ Wick.BasketPage = {
|
|
|
405
408
|
updateClearpayPlacements(Wick.BasketData.updateCart.totalPrice.value);
|
|
406
409
|
updateClearpayVisibility(Wick.BasketData.updateCart.totalPrice.value);
|
|
407
410
|
Wick.BasketPage.addPotentialPromo(Wick.BasketData.updateCart);
|
|
411
|
+
addClassToSummaryAside(Wick.BasketData.updateCart);
|
|
408
412
|
Wick.BasketPage.getCartEntries(Wick.BasketData.updateCart);
|
|
409
413
|
Wick.BasketPage.checkProductArrays(Wick.BasketData.updateCart) || Wick.BasketPage.removeOrderItem(repaintData);
|
|
410
414
|
updateBasketSession();
|
|
@@ -415,6 +419,7 @@ Wick.BasketPage = {
|
|
|
415
419
|
},
|
|
416
420
|
updateCartAction: function (response, info) {
|
|
417
421
|
updateClearpayVisibility(response.totalPrice.value)
|
|
422
|
+
addClassToSummaryAside(response)
|
|
418
423
|
if (info.initial) {
|
|
419
424
|
Wick.BasketPage.getCartEntries(response);
|
|
420
425
|
} else {
|
|
@@ -739,6 +744,7 @@ Wick.BasketPage = {
|
|
|
739
744
|
|
|
740
745
|
Wick.BasketPage.paintActionButton();
|
|
741
746
|
checkPayPalAvailability(data);
|
|
747
|
+
Wick.VatToggle.reapplyDisplayClass();
|
|
742
748
|
$(document).trigger("cartRerender");
|
|
743
749
|
},
|
|
744
750
|
createBasketSection: function (type, group, data) {
|
|
@@ -848,11 +854,11 @@ Wick.BasketPage = {
|
|
|
848
854
|
? '<span class="order-item__value">FREE</span>'
|
|
849
855
|
: Wick.VatToggle.isToggleVatAvailable()
|
|
850
856
|
? `
|
|
851
|
-
<div class="including-vat
|
|
857
|
+
<div class="including-vat"><!--
|
|
852
858
|
--><span class="order-item__value">${currentItem.basePrice.formattedValue}</span><!--
|
|
853
859
|
--><div class="price-vat">Inc.VAT</div>
|
|
854
860
|
</div>
|
|
855
|
-
<div class="excluding-vat
|
|
861
|
+
<div class="excluding-vat"><!--
|
|
856
862
|
--><span class="order-item__value">${currentItem.basePriceExcVat.formattedValue}</span><!--
|
|
857
863
|
--><div class="price-vat">Exc.VAT</div>
|
|
858
864
|
</div>
|
|
@@ -870,11 +876,11 @@ Wick.BasketPage = {
|
|
|
870
876
|
? '<span class="order-item__value">FREE</span>'
|
|
871
877
|
: Wick.VatToggle.isToggleVatAvailable()
|
|
872
878
|
? `
|
|
873
|
-
<div class="including-vat
|
|
879
|
+
<div class="including-vat"><!--
|
|
874
880
|
--><span class="order-item__value">${currentItem.itemTotalWithoutDiscount.formattedValue}</span><!--
|
|
875
881
|
--><div class="price-vat">Inc.VAT</div><!--
|
|
876
882
|
--></div>
|
|
877
|
-
<div class="excluding-vat
|
|
883
|
+
<div class="excluding-vat"><!--
|
|
878
884
|
--><span class="order-item__value">${currentItem.itemTotalWithoutDiscountExcVat.formattedValue}</span><!--
|
|
879
885
|
--><div class="price-vat">Exc.VAT</div>
|
|
880
886
|
</div>
|
|
@@ -999,11 +1005,11 @@ Wick.BasketPage = {
|
|
|
999
1005
|
${
|
|
1000
1006
|
Wick.VatToggle.isToggleVatAvailable()
|
|
1001
1007
|
? `
|
|
1002
|
-
<div class="including-vat
|
|
1008
|
+
<div class="including-vat"><!--
|
|
1003
1009
|
--><span class="order-item__value">£${item.product.pricePerSqm.formattedPriceWithoutCurrencySymbol}</span><!--
|
|
1004
1010
|
--><div class="price-vat">Inc.VAT</div>
|
|
1005
1011
|
</div>
|
|
1006
|
-
<div class="excluding-vat
|
|
1012
|
+
<div class="excluding-vat"><!--
|
|
1007
1013
|
--><span class="order-item__value">£${item.product.pricePerSqmExcVat.formattedPriceWithoutCurrencySymbol}</span><!--
|
|
1008
1014
|
--><div class="price-vat">Exc.VAT</div>
|
|
1009
1015
|
</div>
|
|
@@ -1256,6 +1262,9 @@ Wick.BasketPage = {
|
|
|
1256
1262
|
$(Wick.BasketPage.el.content).find(quantityButton).prop('disabled', false);
|
|
1257
1263
|
}
|
|
1258
1264
|
};
|
|
1265
|
+
|
|
1266
|
+
$(document).on('cartUpdate', initStickyObserver);
|
|
1267
|
+
|
|
1259
1268
|
$(document).ready(function () {
|
|
1260
1269
|
function init() {
|
|
1261
1270
|
|
|
@@ -1290,6 +1299,11 @@ $(document).ready(function () {
|
|
|
1290
1299
|
|
|
1291
1300
|
$(Wick.BasketPage.el.voucherRemove).unbind('click');
|
|
1292
1301
|
Wick.BasketPage.paintActionButton();
|
|
1302
|
+
initStickyObserver(
|
|
1303
|
+
$('[data-sticky-observe]'),
|
|
1304
|
+
$('[data-sticky-element]'),
|
|
1305
|
+
'.summary__aside.collapse.show'
|
|
1306
|
+
);
|
|
1293
1307
|
Wick.BasketPage.updateCart(...Array(3), true);
|
|
1294
1308
|
setDefaultCharityValue();
|
|
1295
1309
|
if (!$(Wick.BasketPage.el.loader).length) {
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import {updateDiscount} from "./discounts";
|
|
2
|
+
import {addClassToSummaryAside} from "../basket/summary-mobile";
|
|
2
3
|
|
|
3
4
|
const osEl = {
|
|
4
5
|
$summarySection: $('.summary'),
|
|
@@ -9,9 +10,9 @@ const osEl = {
|
|
|
9
10
|
itemFree: '.checkout-widget__item-free',
|
|
10
11
|
itemDeficit: '.checkout-widget__item-deficit',
|
|
11
12
|
summaryDelivery: '.checkout-widget__item-delivery',
|
|
13
|
+
summaryMobileTotal: '.summary__mobile-bar-total',
|
|
12
14
|
}
|
|
13
15
|
|
|
14
|
-
|
|
15
16
|
export function updateOrderSummary(data, equalMap, isVoucher) {
|
|
16
17
|
equalMap.forEach((obj) => {
|
|
17
18
|
if ($(obj.item).length) {
|
|
@@ -32,9 +33,12 @@ export function updateOrderSummary(data, equalMap, isVoucher) {
|
|
|
32
33
|
}
|
|
33
34
|
})
|
|
34
35
|
|
|
36
|
+
const value = data.totalPrice?.formattedValue || data.total;
|
|
37
|
+
|
|
35
38
|
updateDiscount(data, isVoucher);
|
|
36
39
|
hideUnusedDeliveryTypeCost(data, isVoucher);
|
|
37
40
|
calculateFreeDelivery(data);
|
|
41
|
+
updateSummaryMobileBarTotal(value);
|
|
38
42
|
}
|
|
39
43
|
|
|
40
44
|
function createCheckoutWidgetItem(obj) {
|
|
@@ -97,3 +101,6 @@ function calculateFreeDelivery(data) {
|
|
|
97
101
|
})
|
|
98
102
|
}
|
|
99
103
|
|
|
104
|
+
function updateSummaryMobileBarTotal(formattedValue) {
|
|
105
|
+
$(osEl.summaryMobileTotal).text(formattedValue);
|
|
106
|
+
}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
export function initStickyObserver(observedElements, stickyElements, collapseSelector) {
|
|
2
|
+
let io;
|
|
3
|
+
|
|
4
|
+
const $observed = observedElements instanceof jQuery
|
|
5
|
+
? observedElements
|
|
6
|
+
: $(observedElements);
|
|
7
|
+
|
|
8
|
+
const $sticky = stickyElements instanceof jQuery
|
|
9
|
+
? stickyElements
|
|
10
|
+
: $(stickyElements);
|
|
11
|
+
|
|
12
|
+
if (!$observed.length || !$sticky.length) return;
|
|
13
|
+
|
|
14
|
+
function toggle(hide) {
|
|
15
|
+
$sticky.toggleClass('is-hidden', hide);
|
|
16
|
+
$('body').toggleClass('summary-hidden', hide);
|
|
17
|
+
if (hide) {
|
|
18
|
+
$(collapseSelector).collapse('hide');
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
|
|
22
|
+
if ('IntersectionObserver' in window) {
|
|
23
|
+
io = new IntersectionObserver(
|
|
24
|
+
entries => {
|
|
25
|
+
const anyInView = entries.some(e => e.isIntersecting);
|
|
26
|
+
toggle(anyInView);
|
|
27
|
+
},
|
|
28
|
+
{ rootMargin: '0px 0px -20% 0px', threshold: 0 }
|
|
29
|
+
);
|
|
30
|
+
$observed.each((_, el) => io.observe(el));
|
|
31
|
+
} else {
|
|
32
|
+
// Fallback for older browsers
|
|
33
|
+
function check() {
|
|
34
|
+
let anyInView = false;
|
|
35
|
+
$observed.each(function () {
|
|
36
|
+
const r = this.getBoundingClientRect();
|
|
37
|
+
if (r.top < window.innerHeight * 0.8 && r.bottom > 0) {
|
|
38
|
+
anyInView = true;
|
|
39
|
+
return false; // break
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
toggle(anyInView);
|
|
43
|
+
}
|
|
44
|
+
$(window)
|
|
45
|
+
.off('scroll.sticky resize.sticky')
|
|
46
|
+
.on('scroll.sticky resize.sticky', check);
|
|
47
|
+
check();
|
|
48
|
+
}
|
|
49
|
+
}
|
|
@@ -15,7 +15,7 @@ const voucherEl = {
|
|
|
15
15
|
formInvalid: 'form_invalid',
|
|
16
16
|
fieldRow: '.form-row[data-row-required]',
|
|
17
17
|
rowValidationError: 'form-row_validation-error',
|
|
18
|
-
voucherHide: '
|
|
18
|
+
voucherHide: 'checkout-voucher-hide',
|
|
19
19
|
fieldError: '.form-row__error',
|
|
20
20
|
subtotal: '.checkout-widget__item-bold',
|
|
21
21
|
vat: '.checkout-widget__item-vat',
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
var Wick = window.Wick || {};
|
|
2
|
+
|
|
3
|
+
Wick.DefaultStore = {
|
|
4
|
+
HIDDEN_CLASS_NAME: 'd-none',
|
|
5
|
+
el: {
|
|
6
|
+
searchForm: '.search-store',
|
|
7
|
+
$searchInput: $('.search-store #postcode'),
|
|
8
|
+
$btnClear: $('.search-store .btn--clear'),
|
|
9
|
+
$btnSubmit: $('.search-store .btn-search'),
|
|
10
|
+
},
|
|
11
|
+
getPostCode () {
|
|
12
|
+
return Wick.DefaultStore.el.$searchInput.val();
|
|
13
|
+
},
|
|
14
|
+
checkVisibilityOfClearButton () {
|
|
15
|
+
Wick.DefaultStore.el.$btnClear.toggleClass('d-block', Wick.DefaultStore.getPostCode().length > 0);
|
|
16
|
+
},
|
|
17
|
+
updateCollapseState() {
|
|
18
|
+
const dropdowns = $("#openingTimes, #specialTimes, #facilities");
|
|
19
|
+
const btn = $('[data-toggle="collapse"]');
|
|
20
|
+
|
|
21
|
+
if ($(window).width() >= 768) {
|
|
22
|
+
dropdowns.addClass("show");
|
|
23
|
+
if (btn.length) {
|
|
24
|
+
btn.attr("aria-expanded", "true");
|
|
25
|
+
}
|
|
26
|
+
} else {
|
|
27
|
+
dropdowns.removeClass("show");
|
|
28
|
+
if (btn.length) {
|
|
29
|
+
btn.attr("aria-expanded", "false");
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
},
|
|
33
|
+
init () {
|
|
34
|
+
Wick.DefaultStore.updateCollapseState();
|
|
35
|
+
$(window).resize( _.debounce(function () {
|
|
36
|
+
Wick.DefaultStore.updateCollapseState();
|
|
37
|
+
}, 200));
|
|
38
|
+
Wick.DefaultStore.el.$searchInput.on('input', Wick.DefaultStore.checkVisibilityOfClearButton);
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
$(document).ready(function () {
|
|
43
|
+
Wick.DefaultStore.init();
|
|
44
|
+
});
|
|
@@ -0,0 +1,165 @@
|
|
|
1
|
+
import {createEvent} from "./utils/create-event";
|
|
2
|
+
import {appendLoader, showLoader, hideLoader} from "./utils/loader";
|
|
3
|
+
|
|
4
|
+
var Wick = window.Wick || {};
|
|
5
|
+
|
|
6
|
+
Wick.MyOrders = {
|
|
7
|
+
events: {
|
|
8
|
+
MONTHLY_VIEW_EVENT: 'MONTHLY_VIEW_EVENT',
|
|
9
|
+
SORT_BY_EVENT: 'SORT_BY_EVENT',
|
|
10
|
+
LOAD_MORE_EVENT: 'LOAD_MORE_EVENT',
|
|
11
|
+
CATEGORY_EVENT: 'CATEGORY_EVENT',
|
|
12
|
+
},
|
|
13
|
+
HIDDEN_CLASS_NAME: 'd-none',
|
|
14
|
+
el: {
|
|
15
|
+
$myOrders: $('.my-orders'),
|
|
16
|
+
calendar: '#calendarInputFlatpickr',
|
|
17
|
+
loader: '.loader-wrapper',
|
|
18
|
+
$sortOrders: $('#sort_orders'),
|
|
19
|
+
$chooseDate: $('.flatpickr-datepicker[choose-date]'),
|
|
20
|
+
$showYears: $('.flatpickr-datepicker[show-years]'),
|
|
21
|
+
$desktopTabs: $('.nav-orders .nav-orders__item .link'),
|
|
22
|
+
$mobileTabs: $('.nav-orders .account-nav__link'),
|
|
23
|
+
$loadMoreBtn: $('.btn-load-more'),
|
|
24
|
+
oderList: '.active-orders',
|
|
25
|
+
$activeOrderState: $('.nav-orders .nav-orders__item.active .link')
|
|
26
|
+
},
|
|
27
|
+
initialPageNumber: 0,
|
|
28
|
+
numberOfPagesOrders: $('#numberOfPagesOrders').val(),
|
|
29
|
+
loaderPayload: {
|
|
30
|
+
wrapper: 'body',
|
|
31
|
+
hidden: true,
|
|
32
|
+
modifier: 'basket-loader',
|
|
33
|
+
},
|
|
34
|
+
chooseDate: '',
|
|
35
|
+
showYears: '',
|
|
36
|
+
getChooseDate () {
|
|
37
|
+
const attrValue = Wick.MyOrders.el.$chooseDate.attr('choose-date');
|
|
38
|
+
if (attrValue) {
|
|
39
|
+
Wick.MyOrders.chooseDate = attrValue
|
|
40
|
+
}
|
|
41
|
+
},
|
|
42
|
+
requestToUpdateOrders (currentEvent, payload) {
|
|
43
|
+
return new Promise((resolve, reject) => {
|
|
44
|
+
const eventDetail = {resolve, reject};
|
|
45
|
+
const event = createEvent(currentEvent, payload, eventDetail);
|
|
46
|
+
window.dispatchEvent(event);
|
|
47
|
+
})
|
|
48
|
+
.then(({url}) => {
|
|
49
|
+
if (!url) {
|
|
50
|
+
return;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
window.location.href = url;
|
|
54
|
+
})
|
|
55
|
+
.catch((error) => {
|
|
56
|
+
console.error(error);
|
|
57
|
+
});
|
|
58
|
+
},
|
|
59
|
+
loadMore () {
|
|
60
|
+
showLoader(Wick.MyOrders.el.loader);
|
|
61
|
+
|
|
62
|
+
return new Promise((resolve, reject) => {
|
|
63
|
+
const eventDetail = {resolve, reject};
|
|
64
|
+
const payload = {
|
|
65
|
+
currentPage: ++Wick.MyOrders.initialPageNumber,
|
|
66
|
+
sort: Wick.MyOrders.el.$sortOrders.val() || '',
|
|
67
|
+
chooseDate: Wick.MyOrders.chooseDate,
|
|
68
|
+
orderState: Wick.MyOrders.getCurrentOrderState() || ''
|
|
69
|
+
};
|
|
70
|
+
const event = createEvent(Wick.MyOrders.events.LOAD_MORE_EVENT, payload, eventDetail);
|
|
71
|
+
window.dispatchEvent(event);
|
|
72
|
+
})
|
|
73
|
+
.then(({innerHTML, callback}) => {
|
|
74
|
+
if (!innerHTML) {
|
|
75
|
+
return;
|
|
76
|
+
}
|
|
77
|
+
|
|
78
|
+
Wick.MyOrders.showNewOrders(innerHTML);
|
|
79
|
+
Wick.MyOrders.toggleLoadMoreBtn();
|
|
80
|
+
|
|
81
|
+
if (callback) {
|
|
82
|
+
callback()
|
|
83
|
+
}
|
|
84
|
+
})
|
|
85
|
+
.finally(() => {
|
|
86
|
+
hideLoader(Wick.MyOrders.el.loader);
|
|
87
|
+
Wick.MyOrders.el.$loadMoreBtn.blur();
|
|
88
|
+
})
|
|
89
|
+
},
|
|
90
|
+
showNewOrders (newProductsHtml) {
|
|
91
|
+
const $newProductsHtml = $(newProductsHtml);
|
|
92
|
+
$(Wick.MyOrders.el.oderList).append($newProductsHtml);
|
|
93
|
+
},
|
|
94
|
+
toggleLoadMoreBtn () {
|
|
95
|
+
if (Wick.MyOrders.initialPageNumber + 1 >= +Wick.MyOrders.numberOfPagesOrders) {
|
|
96
|
+
Wick.MyOrders.el.$loadMoreBtn.addClass(Wick.MyOrders.HIDDEN_CLASS_NAME);
|
|
97
|
+
}
|
|
98
|
+
},
|
|
99
|
+
getShowYears () {
|
|
100
|
+
const attrValue = Wick.MyOrders.el.$showYears.attr('show-years');
|
|
101
|
+
if (attrValue) {
|
|
102
|
+
Wick.MyOrders.showYears = attrValue
|
|
103
|
+
}
|
|
104
|
+
},
|
|
105
|
+
initializeFlatpickr () {
|
|
106
|
+
Wick.Flatpickr.init({
|
|
107
|
+
id: Wick.MyOrders.el.calendar,
|
|
108
|
+
currentYear: new Date().getFullYear(),
|
|
109
|
+
minYear: new Date().getFullYear() - Wick.MyOrders.showYears,
|
|
110
|
+
dateFormat: "F Y",
|
|
111
|
+
static: true,
|
|
112
|
+
chooseDate: Wick.MyOrders.chooseDate,
|
|
113
|
+
onChangeCallback: function (dateStr) {
|
|
114
|
+
if (!dateStr || isNaN(new Date(dateStr))) {
|
|
115
|
+
Wick.MyOrders.chooseDate = "";
|
|
116
|
+
} else {
|
|
117
|
+
Wick.MyOrders.chooseDate = dateStr;
|
|
118
|
+
}
|
|
119
|
+
|
|
120
|
+
Wick.MyOrders.requestToUpdateOrders(Wick.MyOrders.events.MONTHLY_VIEW_EVENT, { chooseDate: Wick.MyOrders.chooseDate });
|
|
121
|
+
},
|
|
122
|
+
});
|
|
123
|
+
},
|
|
124
|
+
initializeSortOrdersHandler () {
|
|
125
|
+
Wick.MyOrders.el.$sortOrders.on('change', function () {
|
|
126
|
+
const selectedValue = $(this).val();
|
|
127
|
+
Wick.MyOrders.requestToUpdateOrders(Wick.MyOrders.events.SORT_BY_EVENT, { sortBy: selectedValue });
|
|
128
|
+
});
|
|
129
|
+
},
|
|
130
|
+
registerTabClickHandler (tabsElement) {
|
|
131
|
+
tabsElement.on('click', function (e) {
|
|
132
|
+
e.preventDefault();
|
|
133
|
+
const tabId = $(this).attr('id');
|
|
134
|
+
const orderState = tabId ? { orderState: tabId } : '';
|
|
135
|
+
Wick.MyOrders.requestToUpdateOrders(Wick.MyOrders.events.CATEGORY_EVENT, orderState);
|
|
136
|
+
});
|
|
137
|
+
},
|
|
138
|
+
handleCategoryTabClick () {
|
|
139
|
+
Wick.MyOrders.registerTabClickHandler(Wick.MyOrders.el.$desktopTabs);
|
|
140
|
+
Wick.MyOrders.registerTabClickHandler(Wick.MyOrders.el.$mobileTabs);
|
|
141
|
+
},
|
|
142
|
+
getCurrentOrderState () {
|
|
143
|
+
if (Wick.MyOrders.el.$activeOrderState.length) {
|
|
144
|
+
return Wick.MyOrders.el.$activeOrderState.attr('id')
|
|
145
|
+
}
|
|
146
|
+
},
|
|
147
|
+
init () {
|
|
148
|
+
Wick.MyOrders.getShowYears();
|
|
149
|
+
Wick.MyOrders.getChooseDate();
|
|
150
|
+
Wick.MyOrders.initializeFlatpickr();
|
|
151
|
+
Wick.MyOrders.initializeSortOrdersHandler()
|
|
152
|
+
Wick.MyOrders.handleCategoryTabClick();
|
|
153
|
+
appendLoader(Wick.MyOrders.loaderPayload);
|
|
154
|
+
Wick.MyOrders.el.$loadMoreBtn.on('click', Wick.MyOrders.loadMore);
|
|
155
|
+
Wick.HandleAccordions.handleOutsideClick();
|
|
156
|
+
}
|
|
157
|
+
}
|
|
158
|
+
|
|
159
|
+
$(document).ready(function () {
|
|
160
|
+
if (!Wick.MyOrders.el.$myOrders.length) {
|
|
161
|
+
return;
|
|
162
|
+
}
|
|
163
|
+
|
|
164
|
+
Wick.MyOrders.init();
|
|
165
|
+
});
|
|
@@ -24,25 +24,40 @@ Wick.PersonalDetails = {
|
|
|
24
24
|
formInvalidClass: 'form_invalid',
|
|
25
25
|
notification: '.notification',
|
|
26
26
|
fieldError: '.form-row.form-row_validation-error',
|
|
27
|
+
changePasswordPopup: '#change-password-popup',
|
|
28
|
+
globalMessage: '.globalMessages',
|
|
27
29
|
},
|
|
28
|
-
initialFormState: {},
|
|
29
30
|
errorMessages: {
|
|
30
31
|
errorFirstName: 'Please enter your first name',
|
|
31
32
|
errorSurname: 'Please enter your surname',
|
|
32
|
-
errorEmail: 'Please enter
|
|
33
|
-
},
|
|
34
|
-
fieldToLabelMap: {
|
|
35
|
-
titleCode: 'Title',
|
|
36
|
-
firstName: 'First name',
|
|
37
|
-
lastName: 'Surname',
|
|
38
|
-
email: 'Email',
|
|
39
|
-
tradeType: 'How would you describe yourself or your main trade',
|
|
33
|
+
errorEmail: 'Please enter your email address',
|
|
40
34
|
},
|
|
41
35
|
defaultNotificationConfig: {
|
|
42
|
-
container: '.
|
|
36
|
+
container: '.personal-details .globalMessages',
|
|
43
37
|
closeBtn: true,
|
|
44
38
|
noScrolling: true,
|
|
45
39
|
},
|
|
40
|
+
isTradeTypeLabel() {
|
|
41
|
+
return $(Wick.PersonalDetails.el.userForm).find('label:contains("Trade type")').length;
|
|
42
|
+
},
|
|
43
|
+
fieldToLabelMap(name) {
|
|
44
|
+
let currentTradeType = ''
|
|
45
|
+
if (name === 'tradeType') {
|
|
46
|
+
currentTradeType = Wick.PersonalDetails.isTradeTypeLabel()
|
|
47
|
+
? 'Trade type'
|
|
48
|
+
: 'How would you describe yourself or your main trade';
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
const fieldMap = {
|
|
52
|
+
titleCode: 'Title',
|
|
53
|
+
firstName: 'First name',
|
|
54
|
+
lastName: 'Surname',
|
|
55
|
+
email: 'Email address',
|
|
56
|
+
tradeType: currentTradeType,
|
|
57
|
+
};
|
|
58
|
+
|
|
59
|
+
return fieldMap[name] || name;
|
|
60
|
+
},
|
|
46
61
|
getFieldsConfigurations: function () {
|
|
47
62
|
return [
|
|
48
63
|
{
|
|
@@ -111,11 +126,11 @@ Wick.PersonalDetails = {
|
|
|
111
126
|
text: response.globalMessage.message,
|
|
112
127
|
type: 'success',
|
|
113
128
|
});
|
|
114
|
-
Wick.
|
|
115
|
-
Wick.PersonalDetails.updateUserInformationSection(Wick.
|
|
116
|
-
Wick.PersonalDetails.updateFormFields(Wick.
|
|
129
|
+
Wick.LeaveEvent.initialFormState = Wick.LeaveEvent.getState(Wick.PersonalDetails.el.userForm);
|
|
130
|
+
Wick.PersonalDetails.updateUserInformationSection(Wick.LeaveEvent.initialFormState);
|
|
131
|
+
Wick.PersonalDetails.updateFormFields(Wick.LeaveEvent.initialFormState);
|
|
117
132
|
Wick.PersonalDetails.hideForm();
|
|
118
|
-
Wick.
|
|
133
|
+
Wick.PersonalDetails.scrollToElement(Wick.PersonalDetails.el.globalMessage);
|
|
119
134
|
})
|
|
120
135
|
.catch((error) => {
|
|
121
136
|
Wick.Notification.show({
|
|
@@ -124,11 +139,12 @@ Wick.PersonalDetails = {
|
|
|
124
139
|
type: 'error',
|
|
125
140
|
});
|
|
126
141
|
Wick.PersonalDetails.handleFieldErrors(error);
|
|
142
|
+
Wick.PersonalDetails.scrollToElement(Wick.PersonalDetails.el.globalMessage);
|
|
127
143
|
});
|
|
128
144
|
},
|
|
129
|
-
handleFieldErrors(
|
|
130
|
-
if (fieldErrors && fieldErrors.length) {
|
|
131
|
-
fieldErrors.forEach((fieldError) => {
|
|
145
|
+
handleFieldErrors(error) {
|
|
146
|
+
if (error.fieldErrors && error.fieldErrors.length) {
|
|
147
|
+
error.fieldErrors.forEach((fieldError) => {
|
|
132
148
|
const field = `#${fieldError.field}`;
|
|
133
149
|
updateStylingError(field, false, fieldError.message);
|
|
134
150
|
});
|
|
@@ -136,6 +152,15 @@ Wick.PersonalDetails = {
|
|
|
136
152
|
},
|
|
137
153
|
submitForm(event) {
|
|
138
154
|
event.preventDefault();
|
|
155
|
+
Wick.PersonalDetails.trimAndRewriteInputs(Wick.PersonalDetails.el.userForm);
|
|
156
|
+
|
|
157
|
+
if (!Wick.PersonalDetails.hasUnsavedChanges()) {
|
|
158
|
+
Wick.PersonalDetails.hideForm();
|
|
159
|
+
$(Wick.PersonalDetails.el.notification).remove();
|
|
160
|
+
Wick.PersonalDetails.scrollToElement(Wick.PersonalDetails.el.globalMessage);
|
|
161
|
+
return;
|
|
162
|
+
}
|
|
163
|
+
|
|
139
164
|
if (Wick.PersonalDetails.validateForm()) {
|
|
140
165
|
Wick.PersonalDetails.requestToUpdateForm();
|
|
141
166
|
} else {
|
|
@@ -144,6 +169,7 @@ Wick.PersonalDetails = {
|
|
|
144
169
|
text: 'Please correct the errors below.',
|
|
145
170
|
type: 'error',
|
|
146
171
|
});
|
|
172
|
+
Wick.PersonalDetails.scrollToElement(Wick.PersonalDetails.el.globalMessage);
|
|
147
173
|
}
|
|
148
174
|
},
|
|
149
175
|
updateUserInformationSection(personalDetails) {
|
|
@@ -153,27 +179,36 @@ Wick.PersonalDetails = {
|
|
|
153
179
|
|
|
154
180
|
$userInformationList.empty();
|
|
155
181
|
|
|
156
|
-
personalDetails.forEach(({ name, value }) => {
|
|
157
|
-
const label = Wick.PersonalDetails.fieldToLabelMap
|
|
158
|
-
|
|
182
|
+
personalDetails.forEach(({ name, value, text }) => {
|
|
183
|
+
const label = Wick.PersonalDetails.fieldToLabelMap(name);
|
|
184
|
+
const textField = text || value
|
|
159
185
|
$userInformationList.append(
|
|
160
186
|
userInformationField({
|
|
161
187
|
label,
|
|
162
|
-
|
|
188
|
+
textField,
|
|
163
189
|
})
|
|
164
190
|
);
|
|
165
191
|
});
|
|
192
|
+
|
|
193
|
+
Wick.PersonalDetails.hideParentListItemIfLabelExists('CSRFToken');
|
|
166
194
|
},
|
|
167
195
|
updateFormFields(personalDetails) {
|
|
168
|
-
personalDetails.forEach(({ name, value }) => {
|
|
196
|
+
personalDetails.forEach(({ name, value, text }) => {
|
|
169
197
|
const field = document.querySelector(`#${name}`);
|
|
170
198
|
if (field) {
|
|
171
|
-
field.
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
199
|
+
if (field.tagName === 'INPUT') {
|
|
200
|
+
field.value = text || value || '';
|
|
201
|
+
field.setAttribute('value', text || value || '');
|
|
202
|
+
} else {
|
|
203
|
+
const options = field.querySelectorAll('option');
|
|
204
|
+
options.forEach(option => {
|
|
205
|
+
if (option.textContent.trim() === value || option.value === value) {
|
|
206
|
+
option.setAttribute('selected', 'selected');
|
|
207
|
+
field.value = option.value;
|
|
208
|
+
} else {
|
|
209
|
+
option.removeAttribute('selected');
|
|
210
|
+
}
|
|
211
|
+
});
|
|
177
212
|
}
|
|
178
213
|
}
|
|
179
214
|
});
|
|
@@ -182,18 +217,21 @@ Wick.PersonalDetails = {
|
|
|
182
217
|
Wick.PersonalDetails.hideForm();
|
|
183
218
|
$(Wick.PersonalDetails.el.notification).remove();
|
|
184
219
|
$(Wick.LeaveEvent.el.leavePopup).modal('hide');
|
|
185
|
-
Wick.PersonalDetails.updateFormFields(Wick.
|
|
220
|
+
Wick.PersonalDetails.updateFormFields(Wick.LeaveEvent.initialFormState);
|
|
221
|
+
},
|
|
222
|
+
hasUnsavedChanges() {
|
|
223
|
+
const currentState = Wick.LeaveEvent.getState(Wick.PersonalDetails.el.userForm);
|
|
224
|
+
|
|
225
|
+
return !_.isEqual(currentState, Wick.LeaveEvent.initialFormState);
|
|
186
226
|
},
|
|
187
227
|
changePasswordHandler(event) {
|
|
188
228
|
const changePasswordUrl = $(Wick.PersonalDetails.el.btnChangePassword).attr('href');
|
|
189
|
-
const currentState = Wick.LeaveEvent.getState(Wick.PersonalDetails.el.userForm);
|
|
190
|
-
const isDifferent = !_.isEqual(currentState, Wick.PersonalDetails.initialFormState);
|
|
191
229
|
|
|
192
|
-
if (
|
|
230
|
+
if (Wick.PersonalDetails.hasUnsavedChanges()) {
|
|
193
231
|
event.preventDefault();
|
|
194
|
-
$(Wick.
|
|
232
|
+
$(Wick.PersonalDetails.el.changePasswordPopup).modal('show');
|
|
195
233
|
Wick.LeaveEvent.proceedBrowserLeave = true;
|
|
196
|
-
$(Wick.
|
|
234
|
+
$(Wick.PersonalDetails.el.changePasswordPopup).find(Wick.PersonalDetails.el.btnContinue).off('click').on('click', function () {
|
|
197
235
|
Wick.LeaveEvent.removeLeaveEvent();
|
|
198
236
|
$(Wick.LeaveEvent.el.leavePopup).modal('hide');
|
|
199
237
|
window.location.href = changePasswordUrl;
|
|
@@ -202,9 +240,40 @@ Wick.PersonalDetails = {
|
|
|
202
240
|
window.location.href = changePasswordUrl;
|
|
203
241
|
}
|
|
204
242
|
},
|
|
243
|
+
hideParentListItemIfLabelExists(labelText) {
|
|
244
|
+
const label = $(Wick.PersonalDetails.el.userInformationList).find(`label:contains("${labelText}")`);
|
|
245
|
+
|
|
246
|
+
if (label.length > 0) {
|
|
247
|
+
label.closest('li').hide();
|
|
248
|
+
}
|
|
249
|
+
},
|
|
250
|
+
scrollToElement(element) {
|
|
251
|
+
const globalMessage = $(element);
|
|
252
|
+
|
|
253
|
+
if (globalMessage.length > 0) {
|
|
254
|
+
$('html, body').animate({
|
|
255
|
+
scrollTop: globalMessage.offset().top - 20
|
|
256
|
+
}, 300);
|
|
257
|
+
}
|
|
258
|
+
},
|
|
259
|
+
trimAndRewriteInputs(formSelector) {
|
|
260
|
+
const $form = $(formSelector);
|
|
261
|
+
|
|
262
|
+
if (!$form.length) {
|
|
263
|
+
return;
|
|
264
|
+
}
|
|
265
|
+
|
|
266
|
+
$form.find('input[type="text"], input[type="email"]').each(function () {
|
|
267
|
+
$(this).val($.trim($(this).val()));
|
|
268
|
+
});
|
|
269
|
+
},
|
|
205
270
|
init: function () {
|
|
206
|
-
Wick.LeaveEvent.bindEvent(
|
|
207
|
-
|
|
271
|
+
Wick.LeaveEvent.bindEvent(
|
|
272
|
+
Wick.PersonalDetails.el.userForm,
|
|
273
|
+
Wick.PersonalDetails.el.btnCancel,
|
|
274
|
+
Wick.PersonalDetails.el.btnContinue,
|
|
275
|
+
Wick.PersonalDetails.resetFormToInitialState
|
|
276
|
+
);
|
|
208
277
|
|
|
209
278
|
$(Wick.PersonalDetails.el.btnEdit).on('click', Wick.PersonalDetails.showForm);
|
|
210
279
|
$(Wick.PersonalDetails.el.btnSave).on('click', Wick.PersonalDetails.submitForm);
|