wickes-css2 2.98.0-billie.2 → 2.98.0-develop.2
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 +0 -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/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_home.css +1 -1
- package/build/css/pages/page_my-orders.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/calm-primary-logo.png +0 -0
- package/build/js/basket.min.js +1 -1
- package/build/js/emulation.min.js +11 -23
- package/build/js/page/basket-v2.js +15 -8
- package/build/js/page/checkout-payment-details.js +0 -8
- package/build/js/page/components/charity.js +58 -43
- package/package.json +2 -2
- package/src/components/address-postcode-look-up.hbs +2 -2
- package/src/components/basket-charity-donations-new.hbs +40 -0
- 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/donation-cart-new.hbs +38 -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/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/data/data_shopping-cart-v2.json +51 -0
- package/src/elements/radiobutton.hbs +0 -7
- package/src/img/calm-primary-logo.png +0 -0
- package/src/js/emulation/paymentLoader.js +11 -22
- package/src/js/page/basket-v2.js +15 -8
- package/src/js/page/checkout-payment-details.js +0 -8
- package/src/js/page/components/charity.js +58 -43
- package/src/page_checkout_delivery-address-customer-journey.html +2 -2
- package/src/page_my-account.html +0 -1
- package/src/page_shopping-cart-v2.html +3 -4
- package/src/scss/common/_elements.scss +0 -4
- package/src/scss/components/_charity-donations.scss +114 -186
- package/src/scss/components/_donation-cart-new.scss +192 -0
- package/src/scss/components/_payments-v2.scss +0 -8
- 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/pages/_checkout-confirmation-new.scss +3 -10
- package/src/scss/pages/checkout-new.scss +1 -0
- package/src/scss/pages/my-account-v2.scss +0 -1
- package/src/sitemap.html +0 -27
- 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/page_shopping-cart-charity.html +0 -56
- package/src/scss/components/_tooltip.scss +0 -19
- package/src/scss/components/my-account/_payment-status.scss +0 -36
|
@@ -6192,32 +6192,20 @@ $(document).ready(function () {
|
|
|
6192
6192
|
initMyOrdersEvent();
|
|
6193
6193
|
});
|
|
6194
6194
|
|
|
6195
|
-
const paymentLoader= '.payment-loader';
|
|
6196
|
-
const paymentLoaderHideClass= 'payment-loader--hidden';
|
|
6197
|
-
const
|
|
6198
|
-
const
|
|
6199
|
-
|
|
6200
|
-
google: '.google__button',
|
|
6201
|
-
clearpay: '#checkout-payment-details-clearpay',
|
|
6202
|
-
billie: '#checkout-payment-details-billie, .billie__button',
|
|
6203
|
-
paypal: '#checkout-payment-details-paypal'
|
|
6204
|
-
};
|
|
6195
|
+
const paymentLoader = '.payment-loader';
|
|
6196
|
+
const paymentLoaderHideClass = 'payment-loader--hidden';
|
|
6197
|
+
const applePayButton = '.apple__button';
|
|
6198
|
+
const googlePayButton = '.google__button';
|
|
6199
|
+
const clearPayRadioButton = '#checkout-payment-details-clearpay';
|
|
6205
6200
|
|
|
6206
|
-
|
|
6207
|
-
$(paymentLoader).find(`${paymentLoaderModal} > div`).hide();
|
|
6208
|
-
$(`.${paymentType}-checkout-logo`).show();
|
|
6209
|
-
$(`${paymentLoader} .spinner`).show();
|
|
6201
|
+
const showPaymentLoader = () => {
|
|
6210
6202
|
$(paymentLoader).removeClass(paymentLoaderHideClass);
|
|
6203
|
+
setTimeout(() => $(paymentLoader).addClass(paymentLoaderHideClass), 1000);
|
|
6204
|
+
};
|
|
6211
6205
|
|
|
6212
|
-
|
|
6213
|
-
|
|
6214
|
-
|
|
6215
|
-
}
|
|
6216
|
-
|
|
6217
|
-
Object.entries(paymentTypeSelectors).forEach(([type, triggerSelector]) => {
|
|
6218
|
-
$(document).on('click', triggerSelector, () => showPaymentLoader(type));
|
|
6219
|
-
});
|
|
6220
|
-
|
|
6206
|
+
$(document).on('click', applePayButton, showPaymentLoader);
|
|
6207
|
+
$(document).on('click', googlePayButton, showPaymentLoader);
|
|
6208
|
+
$(document).on('click', clearPayRadioButton, showPaymentLoader);
|
|
6221
6209
|
var Wick = Wick || {};
|
|
6222
6210
|
|
|
6223
6211
|
Wick.pdfFileLoader = {
|
|
@@ -16,8 +16,8 @@ import {checkPayPalAvailability} from './basket/paypal';
|
|
|
16
16
|
import {
|
|
17
17
|
updateCharity,
|
|
18
18
|
changeCharityPrice,
|
|
19
|
-
|
|
20
|
-
|
|
19
|
+
setDefaultCharityValue,
|
|
20
|
+
initCharityInteractions,
|
|
21
21
|
} from './components/charity';
|
|
22
22
|
import {callAction} from './utils/http-action';
|
|
23
23
|
import {ROUTES} from './utils/routes';
|
|
@@ -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 = {
|
|
@@ -80,7 +80,7 @@ Wick.BasketPage = {
|
|
|
80
80
|
orderItemInfoOffers: 'order-item__info-offers',
|
|
81
81
|
charityInput: '#donation',
|
|
82
82
|
charityItem: '.charity-new',
|
|
83
|
-
donationCartBtn: '.donation-cart__btn',
|
|
83
|
+
donationCartBtn: '.donation-cart__btn, .donation-cart-new__btn',
|
|
84
84
|
checkoutWidgetDetails: '.checkout-widget__details',
|
|
85
85
|
checkoutWidgetDetailsFlex: 'checkout-widget__details-flex',
|
|
86
86
|
subtotal: '.checkout-widget__item-bold',
|
|
@@ -311,7 +311,6 @@ Wick.BasketPage = {
|
|
|
311
311
|
} else {
|
|
312
312
|
if (charity) {
|
|
313
313
|
Wick.BasketPage.updateCart();
|
|
314
|
-
quantityToUpdate === 0 && toggleCharityElements();
|
|
315
314
|
} else {
|
|
316
315
|
if (maxValue > 1 || minValue > 1) {
|
|
317
316
|
if (quantityToUpdate > maxValue || quantityToUpdate < minValue) {
|
|
@@ -1282,8 +1281,16 @@ $(document).ready(function () {
|
|
|
1282
1281
|
$(Wick.BasketPage.el.content).on('focusout', Wick.BasketPage.el.quantityValue, Wick.BasketPage.changeOnBlur);
|
|
1283
1282
|
$(Wick.BasketPage.el.content).on('click', Wick.BasketPage.el.deliveryButtonInCC, Wick.BasketPage.changeMethodToDelivery);
|
|
1284
1283
|
$(Wick.BasketPage.el.content).on('click', Wick.BasketPage.el.updateStoreButton, Wick.BasketPage.changeMethodToCC);
|
|
1285
|
-
$(Wick.BasketPage.el.
|
|
1286
|
-
|
|
1284
|
+
$(Wick.BasketPage.el.donationCartBtn).on('click', function(e) {
|
|
1285
|
+
e.preventDefault();
|
|
1286
|
+
const context = $(this).closest(Wick.BasketPage.el.charityItem);
|
|
1287
|
+
if (!context.hasClass('charity-added')) {
|
|
1288
|
+
updateCharity(this);
|
|
1289
|
+
context.addClass('charity-added');
|
|
1290
|
+
} else {
|
|
1291
|
+
changeCharityPrice.call(this);
|
|
1292
|
+
}
|
|
1293
|
+
});
|
|
1287
1294
|
$(Wick.BasketPage.el.charityItem).on('click', Wick.BasketPage.el.removeButton, updateCharity);
|
|
1288
1295
|
$(Wick.BasketPage.el.orderSummary).on('click', Wick.BasketPage.el.voucherRemove, voucherRemove);
|
|
1289
1296
|
$(Wick.BasketPage.el.promoWrapper).on('click', Wick.BasketPage.el.promoClose, Wick.BasketPage.removePromotion);
|
|
@@ -1305,8 +1312,8 @@ $(document).ready(function () {
|
|
|
1305
1312
|
'.summary__aside.collapse.show'
|
|
1306
1313
|
);
|
|
1307
1314
|
Wick.BasketPage.updateCart(...Array(3), true);
|
|
1308
|
-
|
|
1309
1315
|
setDefaultCharityValue();
|
|
1316
|
+
initCharityInteractions();
|
|
1310
1317
|
if (!$(Wick.BasketPage.el.loader).length) {
|
|
1311
1318
|
appendLoader(Wick.BasketPage.loaderPayload);
|
|
1312
1319
|
}
|
|
@@ -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,
|
|
@@ -8,34 +8,47 @@ const charityEl = {
|
|
|
8
8
|
charityInput: '#donation',
|
|
9
9
|
charityTitleWrap: '.title-wrap',
|
|
10
10
|
donationCart: '.donation-cart',
|
|
11
|
-
donationCartBtn: '.donation-cart__btn',
|
|
12
|
-
donationCartHolder: '.donation-cart__holder',
|
|
13
11
|
donationCartHide: 'donation-cart__hide',
|
|
14
|
-
|
|
12
|
+
donationCartBtn: '.donation-cart__btn, .donation-cart-new__btn',
|
|
13
|
+
donationCartBtnSelected: '.donation-cart-new__btn.btn-selected',
|
|
14
|
+
donationCartHolder: '.donation-cart__holder, .donation-cart-new__holder',
|
|
15
|
+
donationCartValue: '.donation-cart__value, .donation-cart-new__value',
|
|
15
16
|
charityAdded: 'charity-added',
|
|
17
|
+
donationCartCostBlock: '.donation-cart-new__cost',
|
|
18
|
+
donationCartCostBlockHide: 'donation-cart-new__cost-hide',
|
|
19
|
+
donationCartRemove: '.donation-cart-new__cost .order-item__remove',
|
|
16
20
|
}
|
|
17
21
|
|
|
18
|
-
export function updateCharity() {
|
|
19
|
-
//checkbox action
|
|
22
|
+
export function updateCharity(button) {
|
|
20
23
|
if ($('#donation').attr('disabled') === 'disabled') {
|
|
21
|
-
$('#donation').removeAttr('disabled')
|
|
24
|
+
$('#donation').removeAttr('disabled');
|
|
22
25
|
} else {
|
|
23
26
|
$('#donation').prop('disabled', (_, value) => !value);
|
|
24
27
|
}
|
|
25
28
|
|
|
26
|
-
const context = getCurrentCharityItem(
|
|
29
|
+
const context = getCurrentCharityItem(button);
|
|
27
30
|
const productCode = getCurrentProductCode(context);
|
|
31
|
+
const quantity = getSelectedCharityAmount(button);
|
|
28
32
|
|
|
29
33
|
showLoader('.basket-loader');
|
|
30
34
|
|
|
31
35
|
if (context.hasClass(charityEl.charityAdded)) {
|
|
32
|
-
$(
|
|
36
|
+
$(button).removeAttr('checked');
|
|
33
37
|
} else {
|
|
34
|
-
$(
|
|
35
|
-
|
|
38
|
+
$(button).attr('checked', 'checked');
|
|
39
|
+
repaintCharityButton(button);
|
|
40
|
+
context
|
|
41
|
+
.find(charityEl.donationCartValue)
|
|
42
|
+
.text(quantity);
|
|
43
|
+
showDonationCostBlock(context);
|
|
44
|
+
charityActionForAdd(productCode, quantity);
|
|
36
45
|
}
|
|
37
46
|
}
|
|
38
47
|
|
|
48
|
+
function getSelectedCharityAmount(context) {
|
|
49
|
+
return $(context).data('value');
|
|
50
|
+
}
|
|
51
|
+
|
|
39
52
|
function getCurrentCharityItem(context) {
|
|
40
53
|
return $(context).closest(charityEl.charityItem);
|
|
41
54
|
}
|
|
@@ -44,13 +57,13 @@ function getCurrentProductCode(context) {
|
|
|
44
57
|
return context.find('input[name="productCode"]').val();
|
|
45
58
|
}
|
|
46
59
|
|
|
47
|
-
export function charityActionForAdd(value) {
|
|
60
|
+
export function charityActionForAdd(value, quantity) {
|
|
48
61
|
if (!Wick.checkLocalEnv) {
|
|
49
62
|
const payload = {
|
|
50
63
|
url: ROUTES.CHARITY_ADD,
|
|
51
64
|
queries: {
|
|
52
65
|
productCodePost: value,
|
|
53
|
-
qty:
|
|
66
|
+
qty: quantity,
|
|
54
67
|
},
|
|
55
68
|
type: 'POST',
|
|
56
69
|
};
|
|
@@ -61,19 +74,10 @@ export function charityActionForAdd(value) {
|
|
|
61
74
|
|
|
62
75
|
callAction(payload, executeCharityAction, productInfo);
|
|
63
76
|
} else {
|
|
64
|
-
toggleCharityElements();
|
|
65
77
|
Wick.BasketPage.updateCart(...Array(2), true);
|
|
66
78
|
}
|
|
67
79
|
}
|
|
68
80
|
|
|
69
|
-
export function toggleCharityElements() {
|
|
70
|
-
if ($(charityEl.charityItem).hasClass(charityEl.charityAdded)) {
|
|
71
|
-
$(charityEl.charityInput).prop('checked', false);
|
|
72
|
-
}
|
|
73
|
-
$(charityEl.charityItem).toggleClass(charityEl.charityAdded);
|
|
74
|
-
$(charityEl.charityItem).hasClass(charityEl.charityMultiple) && toggleMultipleCharityChoose($(charityEl.charityItem));
|
|
75
|
-
}
|
|
76
|
-
|
|
77
81
|
function executeCharityAction(response, productInfo) {
|
|
78
82
|
if (response.addedProducts && response.addedProducts[0]) {
|
|
79
83
|
productInfo.quantity = response.addedProducts[0].qty;
|
|
@@ -81,7 +85,6 @@ function executeCharityAction(response, productInfo) {
|
|
|
81
85
|
}
|
|
82
86
|
|
|
83
87
|
Wick.BasketPage.updateCart(...Array(2), true);
|
|
84
|
-
toggleCharityElements();
|
|
85
88
|
}
|
|
86
89
|
|
|
87
90
|
export function changeCharityPrice() {
|
|
@@ -95,6 +98,7 @@ export function changeCharityPrice() {
|
|
|
95
98
|
|
|
96
99
|
repaintCharityButton(this);
|
|
97
100
|
$(charityEl.donationCartValue).text(charityValue);
|
|
101
|
+
showDonationCostBlock(context);
|
|
98
102
|
charityActionForChangePrice(this);
|
|
99
103
|
}
|
|
100
104
|
|
|
@@ -119,35 +123,46 @@ function repaintCharityButton(context) {
|
|
|
119
123
|
$(context).removeClass(btnSecondary).addClass(btnSelected);
|
|
120
124
|
}
|
|
121
125
|
|
|
122
|
-
function resetCharityButton(context) {
|
|
123
|
-
const donationButtons = $(context).find(charityEl.donationCartBtn);
|
|
124
|
-
const btnSelected = 'btn-selected';
|
|
125
|
-
const btnSecondary = 'btn-secondary';
|
|
126
|
-
const defaultAmount = getDefaultCharityAmount();
|
|
127
|
-
|
|
128
|
-
donationButtons.each((i, btn) => {
|
|
129
|
-
$(btn).attr('data-value') === defaultAmount
|
|
130
|
-
? $(btn).removeClass(btnSecondary).addClass(btnSelected)
|
|
131
|
-
: $(btn).removeClass(btnSelected).addClass(btnSecondary);
|
|
132
|
-
})
|
|
133
|
-
}
|
|
134
|
-
|
|
135
126
|
function getDefaultCharityAmount() {
|
|
136
127
|
const donationButtons = $(charityEl.charityItem).find(charityEl.donationCartBtn);
|
|
137
128
|
return donationButtons.first().attr('data-value');
|
|
138
129
|
}
|
|
139
130
|
|
|
131
|
+
export function setDefaultCharityValue() {
|
|
132
|
+
$(charityEl.donationCartBtnSelected).each(function() {
|
|
133
|
+
const $btn = $(this);
|
|
134
|
+
const $item = $btn.closest(charityEl.charityItem);
|
|
135
|
+
const value = $btn.data('value');
|
|
136
|
+
|
|
137
|
+
$item.find(charityEl.donationCartValue).text(value);
|
|
138
|
+
$item.find(charityEl.donationCartCostBlock)
|
|
139
|
+
.removeClass(charityEl.donationCartCostBlockHide);
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
|
|
143
|
+
function showDonationCostBlock($charity) {
|
|
144
|
+
$charity.find(charityEl.donationCartCostBlock)
|
|
145
|
+
.removeClass(charityEl.donationCartCostBlockHide);
|
|
146
|
+
}
|
|
147
|
+
|
|
140
148
|
function resetCharityValue() {
|
|
141
149
|
const defaultValue = getDefaultCharityAmount();
|
|
142
150
|
$(charityEl.donationCartValue).text(defaultValue);
|
|
143
151
|
}
|
|
144
152
|
|
|
145
|
-
export function
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
+
export function initCharityInteractions() {
|
|
154
|
+
$(document).on('click', charityEl.donationCartRemove, function(e) {
|
|
155
|
+
e.preventDefault();
|
|
156
|
+
|
|
157
|
+
const $item = $(this).closest(charityEl.charityItem);
|
|
158
|
+
$item.removeClass(charityEl.charityAdded);
|
|
159
|
+
$item
|
|
160
|
+
.find(charityEl.donationCartCostBlock)
|
|
161
|
+
.addClass(charityEl.donationCartCostBlockHide);
|
|
162
|
+
$item
|
|
163
|
+
.find(charityEl.donationCartBtn)
|
|
164
|
+
.removeClass('btn-selected')
|
|
165
|
+
.addClass('btn-secondary');
|
|
166
|
+
resetCharityValue();
|
|
167
|
+
});
|
|
153
168
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "wickes-css2",
|
|
3
|
-
"version": "2.98.0-
|
|
3
|
+
"version": "2.98.0-develop.2",
|
|
4
4
|
"description": "CSS and JS and page templates in use by Wickes",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -108,7 +108,7 @@
|
|
|
108
108
|
"branches": [
|
|
109
109
|
"alt-master",
|
|
110
110
|
{
|
|
111
|
-
"name": "custom-tag/
|
|
111
|
+
"name": "custom-tag/RG-1311-prototype-charity-reg-no-for-calm-basket",
|
|
112
112
|
"prerelease": "${name.replace(/^custom-tag\\//g, '')}"
|
|
113
113
|
}
|
|
114
114
|
],
|
|
@@ -3,9 +3,9 @@
|
|
|
3
3
|
{{> form-row id="first-line-address" label="Type first line of the address" required="true"}}
|
|
4
4
|
</div>
|
|
5
5
|
<div>
|
|
6
|
-
{{> form-row id="address-line-1" label="Address line 1" required="true"
|
|
6
|
+
{{> form-row id="address-line-1" label="Address line 1" required="true"}}
|
|
7
7
|
{{> form-row id="address-line-2" label="Address line 2"}}
|
|
8
|
-
{{> form-row id="town-city" label="Town/City" required="true"}}
|
|
8
|
+
{{> form-row id="town-city" label="Town / City" required="true"}}
|
|
9
9
|
{{> form-row id="postcode_additional" label="Postcode" required="true"}}
|
|
10
10
|
</div>
|
|
11
11
|
{{else}}
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
{{#if title}}
|
|
2
|
+
{{> checkout-section-title}}
|
|
3
|
+
{{/if}}
|
|
4
|
+
<div class="charity-new charity-donation-new">
|
|
5
|
+
{{#with checkoutOrder.charity}}
|
|
6
|
+
|
|
7
|
+
<div class="charity-donation-new__wrapper">
|
|
8
|
+
<div class="charity-donation-new__top">
|
|
9
|
+
<div class="charity-donation-new__header">
|
|
10
|
+
<div class="charity-donation-new__title">{{title}}</div>
|
|
11
|
+
<div class="charity-donation-new__right">
|
|
12
|
+
<img
|
|
13
|
+
class="charity-donation-new__image"
|
|
14
|
+
src="{{img}}"
|
|
15
|
+
alt="{{title}}"
|
|
16
|
+
title="{{title}}"
|
|
17
|
+
/>
|
|
18
|
+
</div>
|
|
19
|
+
</div>
|
|
20
|
+
|
|
21
|
+
<div class="charity-donation-new__description">
|
|
22
|
+
{{descr}}
|
|
23
|
+
<span class="charity-donation-new__message">
|
|
24
|
+
{{message}}
|
|
25
|
+
<a
|
|
26
|
+
class="charity-donation-new__subtitle-link"
|
|
27
|
+
href="{{subLink}}"
|
|
28
|
+
>
|
|
29
|
+
click here</a>.
|
|
30
|
+
</span>
|
|
31
|
+
</div>
|
|
32
|
+
</div>
|
|
33
|
+
|
|
34
|
+
<div class="charity-donation-new__body">
|
|
35
|
+
{{> donation-cart-new}}
|
|
36
|
+
</div>
|
|
37
|
+
</div>
|
|
38
|
+
|
|
39
|
+
{{/with}}
|
|
40
|
+
</div>
|
|
@@ -1,32 +1,18 @@
|
|
|
1
1
|
<div class="checkout-payment-details__row" {{attr}}>
|
|
2
2
|
<div class="checkout-payment-details__descr{{descrModifier}}">
|
|
3
3
|
<h3 class="checkout-payment-details__title">Billing address</h3>
|
|
4
|
-
{{#if billie-form}}
|
|
5
|
-
<div class="checkout-payment-details__populated-address">
|
|
6
|
-
<span>
|
|
7
|
-
<span class="checkout-payment-details__populated-text">Populated from your business address in your TradePro account.</span>
|
|
8
|
-
{{> info-icon title="If the pre-populated address is incorrect, please amend it before proceeding. To update it permanently, review and amend your Business Address in My TradePro (or Installer) Account > Address Book." data-placement="top" }}
|
|
9
|
-
</span>
|
|
10
|
-
</div>
|
|
11
|
-
{{/if}}
|
|
12
4
|
<div class="warning-required">Required fields</div>
|
|
13
|
-
|
|
14
|
-
<div class="form-
|
|
15
|
-
|
|
16
|
-
{{> checkbox id="chb-payment-details-card" label="Use my delivery address"}}
|
|
17
|
-
</div>
|
|
5
|
+
<div class="form-row">
|
|
6
|
+
<div class="form-row__field">
|
|
7
|
+
{{> checkbox id="chb-payment-details-card" label="Use my delivery address" }}
|
|
18
8
|
</div>
|
|
19
|
-
|
|
9
|
+
</div>
|
|
20
10
|
{{#unless edit-bill-mod}}
|
|
21
11
|
{{> form-row id="card-name" label="Name on card" required="true"}}
|
|
22
12
|
{{/unless}}
|
|
23
13
|
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
{{#if billie-form}}
|
|
27
|
-
{{> address-billie}}
|
|
28
|
-
{{/if}}
|
|
29
|
-
</div>
|
|
14
|
+
{{> address-postcode-look-up}}
|
|
15
|
+
|
|
30
16
|
|
|
31
17
|
{{#unless no-set-card}}
|
|
32
18
|
<div class="form-row">
|
|
@@ -4,48 +4,23 @@
|
|
|
4
4
|
<div class="checkout-payment-details__row">
|
|
5
5
|
<div class="checkout-payment-details__descr">
|
|
6
6
|
<h3 class="checkout-payment-details__title">Payment method</h3>
|
|
7
|
-
{{#if
|
|
8
|
-
<div class="form-row">
|
|
9
|
-
<div class="form-row__field form-row__field-billie">
|
|
10
|
-
<label
|
|
11
|
-
class="rbn rbn_align billie-label__rbn"
|
|
12
|
-
for="checkout-payment-details-billie"
|
|
13
|
-
>
|
|
14
|
-
<input
|
|
15
|
-
type="radio"
|
|
16
|
-
id="checkout-payment-details-billie"
|
|
17
|
-
name="payment-method"
|
|
18
|
-
value="billie"
|
|
19
|
-
>
|
|
20
|
-
<ins></ins>
|
|
21
|
-
<div class="billie-badge-container">
|
|
22
|
-
<img
|
|
23
|
-
src="./img/payment/footer/billie.svg"
|
|
24
|
-
alt="Billie Pay Later"
|
|
25
|
-
>
|
|
26
|
-
</div>
|
|
27
|
-
</label>
|
|
28
|
-
</div>
|
|
29
|
-
</div>
|
|
30
|
-
{{else if klarna-method}}
|
|
7
|
+
{{#if klarna-method}}
|
|
31
8
|
<div class="form-row">
|
|
32
9
|
<div class="form-row__field form-row__field-klarna">
|
|
33
10
|
<label
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
>
|
|
11
|
+
class="rbn rbn_align klarna-label__rbn"
|
|
12
|
+
for="checkout-payment-details-klarna">
|
|
37
13
|
<input
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
>
|
|
14
|
+
type="radio"
|
|
15
|
+
id="checkout-payment-details-klarna"
|
|
16
|
+
name="payment-method"
|
|
17
|
+
value="klarna">
|
|
43
18
|
<ins></ins>
|
|
44
19
|
<div class="klarna-logo-img">
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
20
|
+
<klarna-placement
|
|
21
|
+
data-key="sidebar-promotion-auto-size"
|
|
22
|
+
data-locale="en-GB"
|
|
23
|
+
></klarna-placement>
|
|
49
24
|
</div>
|
|
50
25
|
</label>
|
|
51
26
|
</div>
|
|
@@ -158,63 +133,50 @@
|
|
|
158
133
|
</div>
|
|
159
134
|
</div>
|
|
160
135
|
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
ctaButtonLabel="Pay with Klarna"
|
|
189
|
-
ctaButtonClass="klarna__button"
|
|
190
|
-
ctaFooterHtml="By placing your order, you accept our
|
|
191
|
-
<a href='#' class='link-secondary' data-toggle='modal' data-target='#modal-terms-and-conditions'>
|
|
192
|
-
Terms & Conditions of Sale
|
|
193
|
-
</a>"
|
|
194
|
-
}}
|
|
195
|
-
|
|
196
|
-
{{> checkout-payment-info-block
|
|
197
|
-
dataAttr="data-billie"
|
|
198
|
-
blockClass="checkout-payment-details__billie"
|
|
199
|
-
infoClass="billie-info"
|
|
200
|
-
|
|
201
|
-
heading="Get first. Pay later <br> Pay 30 days after shipment"
|
|
202
|
-
brandLogoHtml="<img
|
|
203
|
-
src='https://static.billie.io/badges/Billie_Checkout_Default.svg'
|
|
204
|
-
alt='Billie Pay Later'
|
|
205
|
-
width='70'
|
|
206
|
-
height='35'>"
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
listItem1="Billie charges no fee"
|
|
210
|
-
listItem2="No sign up required"
|
|
211
|
-
listItem3="Europes go-to B2B payment service"
|
|
136
|
+
<div data-klarna class="checkout-payment-details__klarna" style="display: none;">
|
|
137
|
+
<div class="klarna-info">
|
|
138
|
+
<div class="klarna-info__header">
|
|
139
|
+
<h4 class="klarna-info__header_title">Choose your way to pay</h4>
|
|
140
|
+
<div class="klarna-logo-img-big">
|
|
141
|
+
<klarna-placement
|
|
142
|
+
data-key="sidebar-promotion-auto-size"
|
|
143
|
+
data-locale="en-GB"
|
|
144
|
+
></klarna-placement>
|
|
145
|
+
</div>
|
|
146
|
+
</div>
|
|
147
|
+
<ul class="klarna-info__list">
|
|
148
|
+
<li class="klarna-info__list_item"><i class="fa fa-check"></i>Pay in 3. Interest-free.</li>
|
|
149
|
+
<li class="klarna-info__list_item"><i class="fa fa-check"></i>Pay now or Pay in 30 days.</li>
|
|
150
|
+
<li class="klarna-info__list_item"><i class="fa fa-check"></i>Buyer protection included.</li>
|
|
151
|
+
</ul>
|
|
152
|
+
<div class="klarna-info__learn-more">
|
|
153
|
+
<img class="klarna-info__learn-more_icon" src="img/icon_info.png" width="20" height="20" alt="info">
|
|
154
|
+
<klarna-placement
|
|
155
|
+
data-key="top-strip-promotion-auto-size"
|
|
156
|
+
data-locale="en-GB"
|
|
157
|
+
></klarna-placement>
|
|
158
|
+
</div>
|
|
159
|
+
<div class="klarna-info__accept-info">
|
|
160
|
+
By continuing, I accept the terms of the <a href="#" class="klarna-info__link">Klarna Shopping Service</a> and confirm that I have read the <a href="#" class="klarna-info__link">Privacy Notice</a> and <a href="#" class="klarna-info__link">Cookie Notice</a>
|
|
161
|
+
</div>
|
|
162
|
+
</div>
|
|
212
163
|
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
<
|
|
217
|
-
|
|
164
|
+
<div class="form-row form-row__action form-row__action_custom">
|
|
165
|
+
<div class="form-row__col-btn">
|
|
166
|
+
<button class="btn btn-primary btn_full btn-enter-details">
|
|
167
|
+
<span class="btn__text">Pay with Klarna</span>
|
|
168
|
+
</button>
|
|
169
|
+
</div>
|
|
170
|
+
<div class="form-row__col-terms">
|
|
171
|
+
<p>
|
|
172
|
+
By placing your order, you accept our
|
|
173
|
+
<a href="#" class="link-secondary" data-toggle="modal" data-target="#modal-terms-and-conditions">
|
|
174
|
+
Terms & Conditions of Sale
|
|
175
|
+
</a>
|
|
176
|
+
</p>
|
|
177
|
+
</div>
|
|
178
|
+
</div>
|
|
179
|
+
</div>
|
|
218
180
|
|
|
219
181
|
<div data-clearpay class="checkout-payment-details__clearpay" style="display: none;">
|
|
220
182
|
<div class="clearpay-widget">
|
|
@@ -222,9 +184,8 @@
|
|
|
222
184
|
</div>
|
|
223
185
|
</div>
|
|
224
186
|
|
|
225
|
-
|
|
226
187
|
<div class="billing-address">
|
|
227
|
-
{{> checkout-edit-billing-address actionBlock="true" no-set-card="true"
|
|
188
|
+
{{> checkout-edit-billing-address actionBlock="true" no-set-card="true"}}
|
|
228
189
|
</div>
|
|
229
190
|
<div data-existing-card class="form-row form-row__action form-row__action_custom checkout-payment-details__place-order paypal__row">
|
|
230
191
|
<div class="form-row__col-btn" data-paypal style="display: none;">
|
|
@@ -24,15 +24,6 @@
|
|
|
24
24
|
></klarna-placement>
|
|
25
25
|
</div>
|
|
26
26
|
</div>
|
|
27
|
-
{{else if billie}}
|
|
28
|
-
<div class="checkout-widget__details checkout-payment__billie">
|
|
29
|
-
<div class="checkout-widget__details__item">
|
|
30
|
-
<div>Payment method:</div>
|
|
31
|
-
</div>
|
|
32
|
-
<div class="billie-logo-img">
|
|
33
|
-
<img src="./img/billie-logo.svg" alt="billie">
|
|
34
|
-
</div>
|
|
35
|
-
</div>
|
|
36
27
|
{{else if apple}}
|
|
37
28
|
<div class="checkout-widget__details checkout-payment__apple">
|
|
38
29
|
<div class="checkout-widget__details__item">
|
|
@@ -79,7 +70,7 @@
|
|
|
79
70
|
</ul>
|
|
80
71
|
{{/if}}
|
|
81
72
|
|
|
82
|
-
{{#unless (
|
|
73
|
+
{{#unless (or klarna clearpay)}}
|
|
83
74
|
<div class="checkout-widget__details__address">
|
|
84
75
|
<div class="heading">Billing address</div>
|
|
85
76
|
<div class="address">
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
<div class="donation-cart-new">
|
|
2
|
+
<div class="donation-cart-new__details">
|
|
3
|
+
<div class="donation-cart-new__options">
|
|
4
|
+
<p class="donation-cart-new__description">
|
|
5
|
+
Select the amount you would like to donate:
|
|
6
|
+
</p>
|
|
7
|
+
<div class="donation-cart-new__holder">
|
|
8
|
+
{{#each options}}
|
|
9
|
+
<button
|
|
10
|
+
class="btn
|
|
11
|
+
{{#if active}}btn-selected {{else}} btn-secondary{{/if}}
|
|
12
|
+
donation-cart-new__btn"
|
|
13
|
+
data-value="{{value}}"
|
|
14
|
+
>
|
|
15
|
+
<span class="btn__text">{{title}}</span>
|
|
16
|
+
</button>
|
|
17
|
+
{{/each}}
|
|
18
|
+
</div>
|
|
19
|
+
<div class="donation-cart-new__cost donation-cart-new__cost-hide">
|
|
20
|
+
<div class="donation-cart-new__price">
|
|
21
|
+
<span class="donation-cart-new__currency">£</span>
|
|
22
|
+
<span class="donation-cart-new__value"></span>
|
|
23
|
+
donation has been added to your basket.
|
|
24
|
+
</div>
|
|
25
|
+
<button class="btn order-item__remove" data-action="remove">
|
|
26
|
+
<span class="btn__text">
|
|
27
|
+
<i class="fas fa-trash"></i>
|
|
28
|
+
</span>
|
|
29
|
+
</button>
|
|
30
|
+
</div>
|
|
31
|
+
|
|
32
|
+
<hr class="donation-cart-new__divider" />
|
|
33
|
+
<p class="donation-cart-new__charity-info">
|
|
34
|
+
Charity Reg No: 1110621 & Scot SC044347
|
|
35
|
+
</p>
|
|
36
|
+
</div>
|
|
37
|
+
</div>
|
|
38
|
+
</div>
|