wickes-css2 2.98.0-develop.1 → 2.98.0-develop.10

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.
Files changed (142) hide show
  1. package/Readme.md +4 -3
  2. package/build/css/category-main.css +1 -1
  3. package/build/css/components/checkout-payment-details-v2.css +1 -1
  4. package/build/css/components/global-search.css +1 -1
  5. package/build/css/components/loader.css +1 -1
  6. package/build/css/components/price-block-v2-critical.css +1 -1
  7. package/build/css/components/price-block-v2.css +1 -1
  8. package/build/css/homepage-main.css +1 -1
  9. package/build/css/main.css +1 -1
  10. package/build/css/my-account-main-v2.css +1 -1
  11. package/build/css/my-account-main.css +1 -1
  12. package/build/css/pages/checkout-new.css +1 -1
  13. package/build/css/pages/checkout.css +1 -1
  14. package/build/css/pages/my-account-v2.css +1 -1
  15. package/build/css/pages/page_home.css +1 -1
  16. package/build/css/pages/page_my-order.css +1 -1
  17. package/build/css/pages/page_my-orders.css +1 -1
  18. package/build/css/pages/page_wismo-details.css +1 -1
  19. package/build/css/pdp-main-before-combine.css +1 -1
  20. package/build/css/pdp-main-critical.css +1 -1
  21. package/build/css/pdp-main-non-critical.css +1 -1
  22. package/build/css/pdp-main.css +1 -1
  23. package/build/css/plp-main.css +1 -1
  24. package/build/css/store-locator-main.css +1 -1
  25. package/build/img/billie-logo.svg +4 -0
  26. package/build/img/billie-modal.svg +4 -0
  27. package/build/img/billie-pdp.svg +11 -0
  28. package/build/img/billie-spinner.svg +5 -0
  29. package/build/img/billie.svg +4 -0
  30. package/build/img/calm-primary-logo.png +0 -0
  31. package/build/img/payment/checkout/billie.svg +4 -0
  32. package/build/img/payment/footer/billie.svg +4 -0
  33. package/build/js/basket.min.js +2 -2
  34. package/build/js/bundle.min.js +1 -1
  35. package/build/js/checkout.min.js +1 -1
  36. package/build/js/emulation.min.js +23 -11
  37. package/build/js/general.bundle.min.js +1 -1
  38. package/build/js/merged-checkout.min.js +1 -1
  39. package/build/js/page/basket-v2.js +16 -7
  40. package/build/js/page/billie-business-type.js +34 -0
  41. package/build/js/page/checkout-payment-details.js +8 -0
  42. package/build/js/page/components/charity.js +58 -43
  43. package/build/js/page/components/modal-observer.js +51 -0
  44. package/build/js/page/smart-banner.js +4 -1
  45. package/build/js/pdp.bundle.min.js +1 -1
  46. package/build/js/plp.bundle.min.js +1 -1
  47. package/build/js/project-list.min.js +1 -1
  48. package/build/js/smart-banner.min.js +1 -1
  49. package/package.json +1 -9
  50. package/src/components/address-billie.hbs +42 -0
  51. package/src/components/address-postcode-look-up.hbs +2 -2
  52. package/src/components/basket-charity-donations-new.hbs +40 -0
  53. package/src/components/billie-modal.hbs +41 -0
  54. package/src/components/billie-online-messaging.hbs +14 -0
  55. package/src/components/checkout-edit-billing-address.hbs +20 -6
  56. package/src/components/checkout-payment-details-v2.hbs +94 -55
  57. package/src/components/checkout-payment-info-block.hbs +49 -0
  58. package/src/components/checkout-payment-option.hbs +40 -0
  59. package/src/components/checkout_payment-new.hbs +10 -1
  60. package/src/components/donation-cart-new.hbs +38 -0
  61. package/src/components/modal.hbs +4 -1
  62. package/src/components/my-account/active-orders/list-orders.hbs +1 -1
  63. package/src/components/my-account/active-orders/order.hbs +2 -0
  64. package/src/components/my-account/active-orders/payment-status.hbs +17 -0
  65. package/src/components/my-account/payment-status.hbs +19 -0
  66. package/src/components/my-account/saving-totaliser.hbs +52 -0
  67. package/src/components/order-summary.hbs +3 -0
  68. package/src/components/payment-loader.hbs +59 -21
  69. package/src/components/payments-checkout-v2.hbs +12 -6
  70. package/src/components/payments-checkout.hbs +6 -0
  71. package/src/components/payments.hbs +10 -4
  72. package/src/components/price-block-v2.hbs +13 -8
  73. package/src/components/smart-banner.hbs +1 -1
  74. package/src/components/wismo-payment.hbs +16 -0
  75. package/src/data/data_shopping-cart-v2.json +51 -0
  76. package/src/data/data_wismo.json +53 -0
  77. package/src/data/my-account/data_my-account.json +57 -0
  78. package/src/elements/radiobutton.hbs +7 -0
  79. package/src/img/billie-logo.svg +4 -0
  80. package/src/img/billie-modal.svg +4 -0
  81. package/src/img/billie-pdp.svg +11 -0
  82. package/src/img/billie-spinner.svg +5 -0
  83. package/src/img/billie.svg +4 -0
  84. package/src/img/calm-primary-logo.png +0 -0
  85. package/src/img/payment/checkout/billie.svg +4 -0
  86. package/src/img/payment/footer/billie.svg +4 -0
  87. package/src/js/components/general/notification.js +1 -1
  88. package/src/js/emulation/paymentLoader.js +22 -11
  89. package/src/js/page/basket-v2.js +16 -7
  90. package/src/js/page/billie-business-type.js +34 -0
  91. package/src/js/page/checkout-payment-details.js +8 -0
  92. package/src/js/page/components/charity.js +58 -43
  93. package/src/js/page/components/modal-observer.js +51 -0
  94. package/src/js/page/smart-banner.js +4 -1
  95. package/src/layouts/base.hbs +0 -3
  96. package/src/layouts/bicester-kitchen.hbs +0 -3
  97. package/src/layouts/my-account.hbs +0 -3
  98. package/src/page_basket-billie.html +54 -0
  99. package/src/page_checkout_confirmation-billie.html +339 -0
  100. package/src/page_checkout_delivery-address-customer-journey.html +2 -2
  101. package/src/page_my-account-trade-pro-components.html +27 -0
  102. package/src/page_my-account-trade-pro.html +7 -0
  103. package/src/page_my-account.html +1 -0
  104. package/src/page_my-order.html +1 -1
  105. package/src/page_payment-details-with-billie.html +67 -0
  106. package/src/page_product-details-billie.html +87 -0
  107. package/src/page_shopping-cart-v2.html +4 -3
  108. package/src/page_wismo-details.html +2 -2
  109. package/src/partials/head.hbs +1 -5
  110. package/src/scss/common/_app.scss +0 -1
  111. package/src/scss/common/_elements.scss +4 -0
  112. package/src/scss/components/_billie-modal.scss +181 -0
  113. package/src/scss/components/_billie-online-messaging.scss +46 -0
  114. package/src/scss/components/_charity-donations.scss +114 -186
  115. package/src/scss/components/_donation-cart-new.scss +192 -0
  116. package/src/scss/components/_payments-checkout.scss +2 -1
  117. package/src/scss/components/_payments-v2.scss +8 -0
  118. package/src/scss/components/_smart-banner.scss +4 -2
  119. package/src/scss/components/_tooltip.scss +19 -0
  120. package/src/scss/components/checkout-payment-details-v2.scss +237 -0
  121. package/src/scss/components/loader.scss +8 -0
  122. package/src/scss/components/my-account/_active-orders.scss +2 -0
  123. package/src/scss/components/my-account/_payment-status.scss +84 -0
  124. package/src/scss/components/my-account/_saving-totaliser.scss +175 -0
  125. package/src/scss/components/price-block-v2-critical.scss +4 -0
  126. package/src/scss/components/price-block-v2.scss +4 -0
  127. package/src/scss/globals/_global-components.scss +0 -1
  128. package/src/scss/main.scss +0 -1
  129. package/src/scss/pages/_checkout-confirmation-new.scss +10 -3
  130. package/src/scss/pages/checkout-new.scss +3 -0
  131. package/src/scss/pages/my-account-v2.scss +3 -0
  132. package/src/scss/pages/page_wismo-details.scss +1 -0
  133. package/src/scss/pdp-main-critical.scss +1 -1
  134. package/src/scss/pdp-main.scss +2 -0
  135. package/src/sitemap.html +32 -16
  136. package/src/components/google-banner.hbs +0 -29
  137. package/src/page_app_google_banner.html +0 -176
  138. package/src/page_my-account_tradePro-with-google-banner.html +0 -147
  139. package/src/page_product-details_google-banner.html +0 -124
  140. package/src/page_shopping-cart-charity.html +0 -56
  141. package/src/scss/components/_google_banner-critical.scss +0 -66
  142. package/src/scss/components/_google_banner.scss +0 -80
@@ -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>
@@ -1,6 +1,6 @@
1
1
  <!-- Bootstrap 4 modal dialog markup https://getbootstrap.com/docs/4.1/components/modal/ -->
2
2
 
3
- <div class="modal modal-box {{#if fullWidth}}modal-box_full{{/if}} {{#if wide}}modal-box_wide{{/if}}{{classMod}}"
3
+ <div class="modal modal-box {{#if fullWidth}}modal-box_full{{/if}} {{#if wide}}modal-box_wide{{/if}}{{classMod}}"
4
4
  id="{{id}}" role="dialog" tabindex="-1" data-backdrop="{{backdrop}}" data-keyboard={{#if keyboard}}{{keyboard}}{{else}}false{{/if}}
5
5
  >
6
6
  <div class="modal-dialog modal-box__container {{#if centered}}modal-dialog-centered{{/if}}" role="document">
@@ -38,6 +38,9 @@
38
38
  {{/block}}
39
39
 
40
40
  </div>
41
+ <div class="modal-footer modal-box__footer">
42
+ {{#block "footer"}}{{/block}}
43
+ </div>
41
44
  </div>
42
45
  </div>
43
46
  </div>
@@ -4,7 +4,7 @@
4
4
  {{/if}}
5
5
 
6
6
  {{#each orders}}
7
- {{> my-account/active-orders/order switch-vat=../switch-vat}}
7
+ {{> my-account/active-orders/order switch-vat=../switch-vat billieText=../billieText}}
8
8
  {{/each}}
9
9
 
10
10
  {{#if linkText}}
@@ -3,6 +3,8 @@
3
3
 
4
4
  {{> my-account/active-orders/order-details switch-vat=switch-vat}}
5
5
 
6
+ {{> my-account/active-orders/payment-status}}
7
+
6
8
  {{#if totalConsignments}}
7
9
  {{> my-account/active-orders/consignment-info}}
8
10
  {{/if}}
@@ -0,0 +1,17 @@
1
+ <div class="payment-status payment-status--{{paymentStatus.status}}">
2
+ <span class="payment-status__logo">
3
+ <img class="payments-status__image" src="./img/billie.svg" alt="Billie">
4
+ </span>
5
+ <div class="payment-status__content">
6
+ {{#if paymentStatus.paymentTitle}}
7
+ <div class="payment-status__title">
8
+ <span>{{paymentStatus.paymentTitle}}</span>
9
+ </div>
10
+ {{/if}}
11
+ {{#if paymentStatus.paymentText}}
12
+ <div class="payment-status__text">
13
+ <span>{{paymentStatus.paymentText}}</span>
14
+ </div>
15
+ {{/if}}
16
+ </div>
17
+ </div>
@@ -0,0 +1,19 @@
1
+ {{#if paymentStatus}}
2
+ <div class="payment-status payment-status--{{paymentStatus.status}}">
3
+ <span class="payment-status__logo">
4
+ <img class="payments-status__image" src="./img/billie.svg" alt="Billie">
5
+ </span>
6
+ <div class="payment-status__content">
7
+ {{#if paymentStatus.paymentTitle}}
8
+ <span class="payment-status__title">
9
+ {{paymentStatus.paymentTitle}}
10
+ </span>
11
+ {{/if}}
12
+ {{#if paymentStatus.paymentText}}
13
+ <span class="payment-status__text">
14
+ {{paymentStatus.paymentText}}
15
+ </span>
16
+ {{/if}}
17
+ </div>
18
+ </div>
19
+ {{/if}}
@@ -0,0 +1,52 @@
1
+ <div class="saving-totaliser {{#if this-last-year}}saving-totaliser--this-last-year{{/if}} {{#if this-year-only}}saving-totaliser--this-year-only{{/if}} {{#if no-savings}}saving-totaliser--no-savings{{/if}}">
2
+ <div class="saving-totaliser__title heading-3">Your TradePro savings</div >
3
+ <div class="saving-totaliser__wrapper">
4
+ <div class="saving-totaliser__cell">
5
+ <div class="saving-totaliser__saved">
6
+ <div class="saving-totaliser__cell-title saving-totaliser__saving-title">Since joining TradePro you've saved</div>
7
+ <div class="heading-1">{{#if no-savings}}£0.00{{else}}£3,920.37{{/if}}</div>
8
+ </div>
9
+ <div class="saving-totaliser__encourage">
10
+ {{#unless no-savings}}
11
+ <div>
12
+ <div class="saving-totaliser__attencion heading-2">Impressive!</div>
13
+ <div>Continue shopping with us to save even more.</div>
14
+ </div>
15
+ {{else}}
16
+ <div>
17
+ <div class="saving-totaliser__attencion heading-2">Looks like you've not used your discount yet. </div>
18
+ <div>Start shopping with us to start your building your TradePro savings.</div>
19
+ <a href="#" class="btn btn-primary">
20
+ <span class="btn__text">Explore offers</span>
21
+ </a>
22
+ </div>
23
+ {{/unless}}
24
+ </div>
25
+ <div class="saving-totaliser__saving-icon icon">
26
+ <i class="fas fa-piggy-bank"></i>
27
+ </div>
28
+ </div>
29
+ {{#unless no-savings}}
30
+ <div class="saving-totaliser__wrapper2">
31
+ <div class="saving-totaliser__cell">
32
+ <div class="saving-totaliser__cell-title heading-5">This month</div>
33
+ <div class="mb-0 heading-3">£18.43</div>
34
+ </div>
35
+ <div class="saving-totaliser__cell saving-totaliser__split-cell">
36
+ <div class="saving-totaliser__semi-cell">
37
+ <div class="saving-totaliser__cell-title heading-5">This year</div>
38
+ <div class="mb-0 heading-3">£471.34</div>
39
+ </div>
40
+ {{#unless this-year-only}}
41
+ <div class="saving-totaliser__divider"></div>
42
+ <div class="saving-totaliser__semi-cell">
43
+ <div class="saving-totaliser__cell-title heading-5">Last year</div>
44
+ <div class="mb-0 heading-3">£2,381.10</div>
45
+ </div>
46
+ {{/unless}}
47
+ </div>
48
+ </div>
49
+ {{/unless}}
50
+ </div>
51
+ <div class="saving-totaliser__note">Savings are calculated from the verification date of your TradePro account and are based on your TradePro Discount for online orders only.</div>
52
+ </div>
@@ -58,6 +58,9 @@
58
58
  ></klarna-placement>
59
59
  </div>
60
60
  {{/if}}
61
+ {{#if billie-placement}}
62
+ {{> billie-online-messaging basketStyles=true}}
63
+ {{/if}}
61
64
  {{#if clearpay-placement}}
62
65
  {{> clearpay applyMargin=true hasKlarna=true}}
63
66
  {{/if}}
@@ -1,23 +1,61 @@
1
1
  <div class="payment-loader {{#if hidden}}payment-loader--hidden{{/if}}">
2
- <div class="payment-loader__modal">
3
- {{#if paypal-logo}}
4
- <div class="paypal-checkout-logo">
5
- <img class="paypal-checkout-logo-pp" alt="pp" src="./img/paypal_logo_loader_pp.svg">
6
- <img class="paypal-checkout-logo-paypal" alt="paypal" src="./img/paypal_logo_loader_paypal.svg">
7
- </div>
8
- {{else if klarna-logo}}
9
- <div class="klarna-checkout-logo">
10
- <div class="klarna-spinner-logo"></div>
11
- </div>
12
- {{else if google-logo}}
13
- <div class="google-checkout-logo">
14
- <div class="google-spinner-logo"></div>
15
- </div>
16
- {{else if clearpay-logo}}
17
- <div class="clearpay-checkout-logo">
18
- <div class="clearpay-spinner-logo"></div>
19
- </div>
20
- {{/if}}
21
- <div class="spinner {{#if klarna-logo}}klarna-spinner{{/if}}"></div>
22
- </div>
2
+ <div class="payment-loader__modal">
3
+ {{#if spinnerTypes}}
4
+ {{#each spinnerTypes}}
5
+ {{#if (eq this "paypal-logo")}}
6
+ <div class="paypal-checkout-logo">
7
+ <img class="paypal-checkout-logo-pp" alt="pp" src="./img/paypal_logo_loader_pp.svg">
8
+ <img class="paypal-checkout-logo-paypal" alt="paypal" src="./img/paypal_logo_loader_paypal.svg">
9
+ </div>
10
+ {{else if (eq this "klarna-logo")}}
11
+ <div class="klarna-checkout-logo">
12
+ <div class="klarna-spinner-logo"></div>
13
+ </div>
14
+
15
+ {{else if (eq this "google-logo")}}
16
+ <div class="google-checkout-logo">
17
+ <div class="google-spinner-logo"></div>
18
+ </div>
19
+
20
+ {{else if (eq this "clearpay-logo")}}
21
+ <div class="clearpay-checkout-logo">
22
+ <div class="clearpay-spinner-logo"></div>
23
+ </div>
24
+
25
+ {{else if (eq this "billie-logo")}}
26
+ <div class="billie-checkout-logo">
27
+ <div class="billie-spinner-logo"></div>
28
+ </div>
29
+ {{/if}}
30
+ {{/each}}
31
+ {{else}}
32
+ {{#if paypal-logo}}
33
+ <div class="paypal-checkout-logo">
34
+ <img class="paypal-checkout-logo-pp" alt="pp" src="./img/paypal_logo_loader_pp.svg">
35
+ <img class="paypal-checkout-logo-paypal" alt="paypal" src="./img/paypal_logo_loader_paypal.svg">
36
+ </div>
37
+ {{/if}}
38
+ {{#if klarna-logo}}
39
+ <div class="klarna-checkout-logo">
40
+ <div class="klarna-spinner-logo"></div>
41
+ </div>
42
+ {{/if}}
43
+ {{#if google-logo}}
44
+ <div class="google-checkout-logo">
45
+ <div class="google-spinner-logo"></div>
46
+ </div>
47
+ {{/if}}
48
+ {{#if clearpay-logo}}
49
+ <div class="clearpay-checkout-logo">
50
+ <div class="clearpay-spinner-logo"></div>
51
+ </div>
52
+ {{/if}}
53
+ {{#if billie-logo}}
54
+ <div class="billie-checkout-logo">
55
+ <div class="billie-spinner-logo"></div>
56
+ </div>
57
+ {{/if}}
58
+ {{/if}}
59
+ <div class="spinner {{#if klarna-logo}}klarna-spinner{{/if}}"></div>
60
+ </div>
23
61
  </div>
@@ -1,14 +1,20 @@
1
1
  <div class="payments-checkout">
2
2
  <p class="payments-checkout__title">Ways to Pay</p>
3
3
  <ul class="payments-checkout__list">
4
- <li class="payments-checkout__item">
5
- <span class="payments-checkout-klarna">
4
+ {{#if billieIcon}}
5
+ <li class="payments-checkout__item">
6
+ <img class="payments-checkout__image" src="./img/payment/footer/billie.svg" alt="Billie">
7
+ </li>
8
+ {{else}}
9
+ <li class="payments-checkout__item">
10
+ <span class="payments-checkout-klarna">
6
11
  <klarna-placement
7
- data-key="sidebar-promotion-auto-size"
8
- data-locale="en-GB"
12
+ data-key="sidebar-promotion-auto-size"
13
+ data-locale="en-GB"
9
14
  ></klarna-placement>
10
- </span>
11
- </li>
15
+ </span>
16
+ </li>
17
+ {{/if}}
12
18
  {{#each payments-checkout-list}}
13
19
  <li class="payments-checkout__item">
14
20
  <img class="payments-checkout__image" src="{{src}}" alt="{{payment}}">
@@ -1,5 +1,10 @@
1
1
  <div class="payments-checkout">
2
2
  <ul class="payments-checkout__list">
3
+ {{#if billieIcon}}
4
+ <li class="payments-checkout__item">
5
+ <img class="payments-checkout__image" src="./img/payment/checkout/billie.svg" alt="billie">
6
+ </li>
7
+ {{else}}
3
8
  <li class="payments-checkout__item">
4
9
  <span class="payments-checkout-klarna">
5
10
  <klarna-placement
@@ -8,6 +13,7 @@
8
13
  ></klarna-placement>
9
14
  </span>
10
15
  </li>
16
+ {{/if}}
11
17
  {{#if clearPayIcon}}
12
18
  <li class="payments-checkout__item">
13
19
  <img class="payments-checkout__image" src="./img/payment/checkout/clearpay.svg" alt="clearpay">
@@ -1,14 +1,20 @@
1
1
  <div class="payways">
2
2
  <p class="payways__title">Ways to Pay</p>
3
3
  <ul class="payways__list">
4
- <li class="payways__item">
4
+ {{#if billieIcon}}
5
+ <li class="payways__item">
6
+ <img class="payways__image" src="./img/payment/footer/billie.svg" alt="Billie">
7
+ </li>
8
+ {{else}}
9
+ <li class="payways__item">
5
10
  <span class="payways-klarna">
6
11
  <klarna-placement
7
- data-key="sidebar-promotion-auto-size"
8
- data-locale="en-GB"
12
+ data-key="sidebar-promotion-auto-size"
13
+ data-locale="en-GB"
9
14
  ></klarna-placement>
10
15
  </span>
11
- </li>
16
+ </li>
17
+ {{/if}}
12
18
  {{#each payments-list}}
13
19
  <li class="payways__item">
14
20
  <img class="payways__image" src="{{src}}" alt="{{payment}}">
@@ -116,16 +116,21 @@
116
116
  </div>
117
117
  {{/if}}
118
118
  {{#if klarna-placement}}
119
- <div class="pdp-price__klarna-payment">
120
- <klarna-placement
121
- data-key="credit-promotion-badge"
122
- data-locale="en-GB"
123
- data-purchase-amount="12000"
124
- ></klarna-placement>
125
- </div>
119
+ <div class="pdp-price__klarna-payment">
120
+ <klarna-placement
121
+ data-key="credit-promotion-badge"
122
+ data-locale="en-GB"
123
+ data-purchase-amount="12000"
124
+ ></klarna-placement>
125
+ </div>
126
+ {{/if}}
127
+ {{#if billie-placement}}
128
+ <div class="pdp-price__billie-payment">
129
+ {{> billie-online-messaging}}
130
+ </div>
126
131
  {{/if}}
127
132
  {{#if clearpay-placement}}
128
- {{> clearpay}}
133
+ {{> clearpay}}
129
134
  {{/if}}
130
135
  </div>
131
136
  {{#if currentlyInStock}}
@@ -1,4 +1,4 @@
1
- <div class="smart-banner show">
1
+ <div class="smart-banner">
2
2
  <div>
3
3
  <button class="close notification__close smart-banner__action-close" type="button">
4
4
  <span class="icon"><i class="far fa-times"></i></span>
@@ -37,6 +37,22 @@
37
37
  </div>
38
38
  </div>
39
39
  {{/each}}
40
+ {{else if payment-billie}}
41
+ {{#each wismo-order-payment-billie.items}}
42
+ {{#if this.isPaymentStatus}}
43
+ <div class="wrap-item">
44
+ <div class="wrap-item__name">{{{this.name}}}</div>
45
+ <div class="wrap-item__value">
46
+ {{> my-account/payment-status paymentStatus=this.paymentStatus}}
47
+ </div>
48
+ </div>
49
+ {{else}}
50
+ <div class="wrap-item">
51
+ <div class="wrap-item__name">{{{this.name}}}</div>
52
+ <div class="wrap-item__value">{{{this.value}}}</div>
53
+ </div>
54
+ {{/if}}
55
+ {{/each}}
40
56
  {{else if payment-clearpay}}
41
57
  {{#each wismo-order-payment-clearpay.items}}
42
58
  <div class="wrap-item">
@@ -1145,6 +1145,57 @@
1145
1145
  }
1146
1146
  }
1147
1147
  },
1148
+ "charityDonationNew": {
1149
+ "title": "Charity Donation",
1150
+ "checkoutOrder": {
1151
+ "charity": {
1152
+ "title": "Would you like to make a donation to our chosen charity, Campaign Against Living Miserably (CALM)?",
1153
+ "descr": "All charity donations are non-refundable.",
1154
+ "message": "For more information about our charity partner",
1155
+ "subLink": "https://www.wickes.co.uk/the-brain-tumour-charity",
1156
+ "total": "Total",
1157
+ "img": "img/calm-primary-logo.png",
1158
+ "price": "£1",
1159
+ "options": [
1160
+ {
1161
+ "title": "£1",
1162
+ "value": "1",
1163
+ "active": false
1164
+ },
1165
+ {
1166
+ "title": "£3",
1167
+ "value": "3",
1168
+ "active": false
1169
+ },
1170
+ {
1171
+ "title": "£5",
1172
+ "value": "5",
1173
+ "active": true
1174
+ },
1175
+ {
1176
+ "title": "£10",
1177
+ "value": "10",
1178
+ "active": false
1179
+ },
1180
+ {
1181
+ "title": "£15",
1182
+ "value": "15",
1183
+ "active": false
1184
+ },
1185
+ {
1186
+ "title": "£50",
1187
+ "value": "50",
1188
+ "active": false
1189
+ },
1190
+ {
1191
+ "title": "£100",
1192
+ "value": "100",
1193
+ "active": false
1194
+ }
1195
+ ]
1196
+ }
1197
+ }
1198
+ },
1148
1199
  "charityDonationMultiple": {
1149
1200
  "title": "Charity Donation",
1150
1201
  "img": "img/young-minds-long.png",
@@ -151,6 +151,59 @@
151
151
  }
152
152
  ]
153
153
  },
154
+ "wismo-order-payment-billie" : {
155
+ "items": [
156
+ {
157
+ "name": "Billing address:",
158
+ "value": "Mr John Smith<br>19 Colonial Way, Watford, WD24 4JL,<br>United Kingdom"
159
+ },
160
+ {
161
+ "name": "Delivery address:",
162
+ "value": "Mr John Smith <br>19 Colonial Way, Watford, WD24 4JL,<br> United Kingdom"
163
+ },
164
+ {
165
+ "name": "Payment details:",
166
+ "isPaymentStatus": true,
167
+ "paymentStatus": {
168
+ "status": "success",
169
+ "paymentTitle": "Billie have received full payment"
170
+ }
171
+ },
172
+ {
173
+ "name": "Voucher:",
174
+ "value": "-"
175
+ },
176
+ {
177
+ "name": "Charity Donation",
178
+ "value": "3"
179
+ },
180
+ {
181
+ "name": "Payment details:",
182
+ "isPaymentStatus": true,
183
+ "paymentStatus": {
184
+ "status": "partial",
185
+ "paymentTitle": "Billie have received a part payment.",
186
+ "paymentText": "Full payment is due 30 days from final dispatch or collection date."
187
+ }
188
+ },
189
+ {
190
+ "name": "Payment details:",
191
+ "isPaymentStatus": true,
192
+ "paymentStatus": {
193
+ "status": "overdue",
194
+ "paymentTitle": "Your payment to Billie is overdue"
195
+ }
196
+ },
197
+ {
198
+ "name": "Payment details:",
199
+ "isPaymentStatus": true,
200
+ "paymentStatus": {
201
+ "status": "default",
202
+ "paymentText": "Payment due 30 days from final dispatch or collection date."
203
+ }
204
+ }
205
+ ]
206
+ },
154
207
  "wismo-order-transaction": {
155
208
  "orders": [
156
209
  {
@@ -53,6 +53,10 @@
53
53
  "statusTitle": "Processing",
54
54
  "statusIcon": "fas fa-sync"
55
55
  },
56
+ "paymentStatus": {
57
+ "status": "default",
58
+ "paymentText": "Payment due 30 days from final dispatch or collection date."
59
+ },
56
60
  "totalPrice": "72,986.40",
57
61
  "totalItemCount": 14,
58
62
  "orderDate": "22nd January 2025 10:35 am",
@@ -99,6 +103,59 @@
99
103
  "statusTitle": "Processing",
100
104
  "statusIcon": "fas fa-sync"
101
105
  },
106
+ "paymentStatus": {
107
+ "status": "overdue",
108
+ "paymentTitle": "Your payment to Billie is overdue"
109
+ },
110
+ "totalPrice": "316.73",
111
+ "totalItemCount": 8,
112
+ "orderDate": "22nd January 2025 10:35 am",
113
+ "totalConsignments": 1,
114
+ "shipmentDetails": [
115
+ {
116
+ "shipmentIcon": "fas fa-shipping-fast",
117
+ "shipmentTitle": "Supplier Delivery",
118
+ "shipmentInfo": "Dispatched. The supplier will be in contact with you after receiving order confirmation.",
119
+ "itemsCount": 4
120
+ }
121
+ ]
122
+ },
123
+ {
124
+ "orderId": "940524222",
125
+ "orderTooltipText": "We are mindful of the environment, and we try to plan our routes with sustainability in mind. We are trying to get your order to you as quickly as we can, therefore you're order may come on multiple vans",
126
+ "orderStatus": {
127
+ "statusTitle": "Processing",
128
+ "statusIcon": "fas fa-sync"
129
+ },
130
+ "paymentStatus": {
131
+ "status": "partial",
132
+ "paymentTitle": "Billie have received a part payment.",
133
+ "paymentText": "Full payment is due 30 days from final dispatch or collection date."
134
+ },
135
+ "totalPrice": "316.73",
136
+ "totalItemCount": 8,
137
+ "orderDate": "22nd January 2025 10:35 am",
138
+ "totalConsignments": 1,
139
+ "shipmentDetails": [
140
+ {
141
+ "shipmentIcon": "fas fa-shipping-fast",
142
+ "shipmentTitle": "Supplier Delivery",
143
+ "shipmentInfo": "Dispatched. The supplier will be in contact with you after receiving order confirmation.",
144
+ "itemsCount": 4
145
+ }
146
+ ]
147
+ },
148
+ {
149
+ "orderId": "940524222",
150
+ "orderTooltipText": "We are mindful of the environment, and we try to plan our routes with sustainability in mind. We are trying to get your order to you as quickly as we can, therefore you're order may come on multiple vans",
151
+ "orderStatus": {
152
+ "statusTitle": "Processing",
153
+ "statusIcon": "fas fa-sync"
154
+ },
155
+ "paymentStatus": {
156
+ "status": "success",
157
+ "paymentTitle": "Billie have received full payment"
158
+ },
102
159
  "totalPrice": "316.73",
103
160
  "totalItemCount": 8,
104
161
  "orderDate": "22nd January 2025 10:35 am",
@@ -17,3 +17,10 @@
17
17
  <div class="form-row__error">{{error}}</div>
18
18
  {{/if}}
19
19
  </label>
20
+ {{#if tooltip}}
21
+ {{#if tooltip.className}}
22
+ {{> info-icon title=tooltip data-placement=tooltip-placement }}
23
+ {{else}}
24
+ {{> info-icon title=tooltip data-placement="top" }}
25
+ {{/if}}
26
+ {{/if}}
@@ -0,0 +1,4 @@
1
+ <svg width="48" height="30" viewBox="0 0 48 30" fill="none" xmlns="http://www.w3.org/2000/svg">
2
+ <rect width="48" height="30" rx="3" fill="#1C1C1E"/>
3
+ <path fill-rule="evenodd" clip-rule="evenodd" d="M14.5745 12.7948C14.5745 13.2295 14.5266 13.7053 14.4352 14.1499L14.4366 14.1484C15.296 14.8239 15.8041 15.849 15.8041 16.9337C15.8041 18.8962 14.1782 20.4934 12.1821 20.4934H7.3335V12.8713C7.3335 11.8929 7.74866 10.9469 8.47308 10.2772C9.14808 9.65419 10.0278 9.31152 10.9497 9.31152C11.028 9.31152 11.1079 9.31436 11.1862 9.31861C13.0532 9.43472 14.5745 10.9937 14.5745 12.7948ZM10.6956 18.8283H12.1792C13.2404 18.8283 14.1042 17.9787 14.1042 16.9351C14.1042 16.414 13.8907 15.9439 13.5452 15.6013C12.8906 16.8275 11.9571 17.8852 10.6956 18.8283ZM12.7962 13.6854C12.8427 13.4221 12.8789 13.1092 12.8789 12.7934C12.8789 11.8574 12.0718 11.0433 11.0803 10.9824C10.5417 10.9484 10.0292 11.1296 9.63733 11.4921C9.24533 11.8546 9.02908 12.3445 9.02908 12.8727V13.6854H12.7962ZM12.1792 15.0405H9.02908H9.02616V18.3199C10.5461 17.3669 11.5898 16.3164 12.2852 15.0434C12.2503 15.0405 12.2141 15.0405 12.1792 15.0405ZM21.5625 9.50834V18.7759C21.5625 19.9993 22.2535 20.6889 23.4221 20.6889C23.8982 20.6889 24.3453 20.5756 24.6618 20.4354L24.2582 19.1695C24.1436 19.2106 23.9984 19.2389 23.8402 19.2389C23.5222 19.2389 23.4076 19.0704 23.4076 18.7193V9.31152L21.5625 9.50834ZM26.0136 9.50834V18.7759C26.0136 19.9993 26.7046 20.6889 27.8732 20.6889C28.3493 20.6889 28.7964 20.5756 29.1129 20.4354L28.7093 19.1695C28.5947 19.2106 28.4495 19.2389 28.2912 19.2389C27.9733 19.2389 27.8587 19.0704 27.8587 18.7193V9.31152L26.0136 9.50834ZM40.6247 17.3204H35.8922C36.0344 18.8213 36.7472 19.3084 37.746 19.3084C38.4152 19.3084 38.9712 19.1002 39.6273 18.6556L40.3822 19.6709C39.6404 20.2557 38.7287 20.6578 37.5877 20.6578C35.2491 20.6578 33.9948 19.1427 33.9948 16.8191C33.9948 14.4955 35.207 12.8841 37.3453 12.8841C39.4837 12.8841 40.6667 14.2746 40.6667 16.5968C40.6667 16.7885 40.6486 17.0165 40.634 17.2001C40.6306 17.2429 40.6274 17.2834 40.6247 17.3204ZM38.8246 16.0729C38.8246 14.8622 38.3832 14.1401 37.3555 14.1401C36.5004 14.1401 35.9589 14.6965 35.8587 16.1564H38.8246V16.0729ZM19.5973 10.4228C19.5973 11.0204 19.1256 11.4933 18.4418 11.4933V11.4919C17.7711 11.4919 17.3007 11.0331 17.3007 10.4214C17.3007 9.80971 17.7566 9.33677 18.4418 9.33677C19.127 9.33677 19.5973 9.82528 19.5973 10.4228ZM17.5457 12.9199V20.392H19.3908V12.7245L17.5457 12.9199ZM32.4562 10.4228C32.4562 11.0204 31.9844 11.4933 31.3007 11.4933V11.4919C30.63 11.4919 30.1596 11.0331 30.1596 10.4214C30.1596 9.80971 30.6169 9.33677 31.3007 9.33677C31.9844 9.33677 32.4562 9.82528 32.4562 10.4228ZM30.3571 12.9199V20.392H32.2022V12.7245L30.3571 12.9199Z" fill="white"/>
4
+ </svg>
@@ -0,0 +1,4 @@
1
+ <svg width="64" height="40" viewBox="0 0 64 40" fill="none" xmlns="http://www.w3.org/2000/svg">
2
+ <rect width="64" height="40" rx="3" fill="#1C1C1E"/>
3
+ <path fill-rule="evenodd" clip-rule="evenodd" d="M19.4325 17.0594C19.4325 17.639 19.3686 18.2734 19.2467 18.8661L19.2486 18.8643C20.3945 19.7648 21.0719 21.1317 21.0719 22.5779C21.0719 25.1946 18.9041 27.3243 16.2426 27.3243H9.77783V17.1614C9.77783 15.8568 10.3314 14.5956 11.2973 13.7026C12.1973 12.8719 13.3703 12.415 14.5994 12.415C14.7038 12.415 14.8104 12.4188 14.9148 12.4245C17.4041 12.5793 19.4325 14.6579 19.4325 17.0594ZM14.2606 25.104H16.2388C17.6537 25.104 18.8054 23.9713 18.8054 22.5798C18.8054 21.885 18.5208 21.2583 18.0602 20.8014C17.1873 22.4364 15.9426 23.8466 14.2606 25.104ZM17.0614 18.2469C17.1234 17.8958 17.1717 17.4786 17.1717 17.0575C17.1717 15.8096 16.0956 14.724 14.7736 14.6428C14.0555 14.5975 13.3722 14.8392 12.8496 15.3225C12.3269 15.8058 12.0386 16.459 12.0386 17.1633V18.2469H17.0614ZM16.2388 20.0537H12.0386H12.0347V24.4263C14.0613 23.1556 15.4529 21.7548 16.3801 20.0575C16.3336 20.0537 16.2853 20.0537 16.2388 20.0537ZM28.7498 12.6775V25.0342C28.7498 26.6654 29.6712 27.5848 31.2293 27.5848C31.8642 27.5848 32.4603 27.4338 32.8823 27.2468L32.3442 25.559C32.1913 25.6138 31.9977 25.6515 31.7867 25.6515C31.3628 25.6515 31.2099 25.4268 31.2099 24.9587V12.415L28.7498 12.6775ZM34.6846 12.6775V25.0342C34.6846 26.6654 35.6059 27.5848 37.1641 27.5848C37.7989 27.5848 38.3951 27.4338 38.8171 27.2468L38.2789 25.559C38.1261 25.6138 37.9325 25.6515 37.7215 25.6515C37.2976 25.6515 37.1447 25.4268 37.1447 24.9587V12.415L34.6846 12.6775ZM54.1661 23.0935H47.8561C48.0457 25.0947 48.9961 25.7442 50.3278 25.7442C51.2201 25.7442 51.9614 25.4666 52.8363 24.8738L53.8428 26.2275C52.8537 27.0073 51.6382 27.5434 50.1168 27.5434C46.9986 27.5434 45.3263 25.5233 45.3263 22.4251C45.3263 19.327 46.9425 17.1785 49.7936 17.1785C52.6447 17.1785 54.2222 19.0325 54.2222 22.1287C54.2222 22.3844 54.1979 22.6884 54.1785 22.9331C54.1739 22.9903 54.1697 23.0441 54.1661 23.0935ZM51.7659 21.4301C51.7659 19.8159 51.1775 18.8531 49.8072 18.8531C48.6671 18.8531 47.9451 19.595 47.8115 21.5416H51.7659V21.4301ZM26.1296 13.8968C26.1296 14.6935 25.5006 15.324 24.5889 15.324V15.3221C23.6946 15.3221 23.0675 14.7105 23.0675 13.8949C23.0675 13.0793 23.6753 12.4487 24.5889 12.4487C25.5025 12.4487 26.1296 13.1001 26.1296 13.8968ZM23.3942 17.2263V27.189H25.8543V16.9657L23.3942 17.2263ZM43.2747 13.8968C43.2747 14.6935 42.6457 15.324 41.7341 15.324V15.3221C40.8398 15.3221 40.2126 14.7105 40.2126 13.8949C40.2126 13.0793 40.8224 12.4487 41.7341 12.4487C42.6457 12.4487 43.2747 13.1001 43.2747 13.8968ZM40.4759 17.2263V27.189H42.9361V16.9657L40.4759 17.2263Z" fill="white"/>
4
+ </svg>
@@ -0,0 +1,11 @@
1
+ <svg width="50" height="26" viewBox="0 0 50 26" fill="none" xmlns="http://www.w3.org/2000/svg">
2
+ <g clip-path="url(#clip0_1640_11325)">
3
+ <path d="M47.0833 0.5H2.91667C1.30584 0.5 0 1.80584 0 3.41667V22.5833C0 24.1942 1.30584 25.5 2.91667 25.5H47.0833C48.6942 25.5 50 24.1942 50 22.5833V3.41667C50 1.80584 48.6942 0.5 47.0833 0.5Z" fill="#1C1C1E"/>
4
+ <path fill-rule="evenodd" clip-rule="evenodd" d="M15.8347 10.754C15.8347 11.1888 15.7868 11.6645 15.6954 12.1091L15.6968 12.1077C16.5563 12.7831 17.0643 13.8083 17.0643 14.8929C17.0643 16.8554 15.4384 18.4527 13.4423 18.4527H8.59375V10.8305C8.59375 9.85209 9.00892 8.90617 9.73333 8.23644C10.4083 7.61342 11.2881 7.27075 12.2099 7.27075C12.2883 7.27075 12.3682 7.27359 12.4465 7.27784C14.3134 7.39394 15.8347 8.95292 15.8347 10.754ZM11.9558 16.7875H13.4395C14.5007 16.7875 15.3644 15.9379 15.3644 14.8943C15.3644 14.3733 15.151 13.9032 14.8055 13.5605C14.1508 14.7868 13.2173 15.8444 11.9558 16.7875ZM14.0564 11.6447C14.1029 11.3813 14.1392 11.0684 14.1392 10.7526C14.1392 9.81667 13.3321 9.0025 12.3406 8.94159C11.802 8.90759 11.2895 9.08884 10.8976 9.45134C10.5056 9.81384 10.2893 10.3038 10.2893 10.8319V11.6447H14.0564ZM13.4395 12.9998H10.2893H10.2864V16.2792C11.8063 15.3262 12.8501 14.2756 13.5454 13.0026C13.5106 12.9998 13.4743 12.9998 13.4395 12.9998ZM22.8228 7.46757V16.7351C22.8228 17.9585 23.5138 18.6481 24.6823 18.6481C25.1585 18.6481 25.6056 18.5348 25.9221 18.3946L25.5185 17.1288C25.4038 17.1698 25.2587 17.1981 25.1004 17.1981C24.7825 17.1981 24.6678 17.0296 24.6678 16.6785V7.27075L22.8228 7.46757ZM27.2738 7.46757V16.7351C27.2738 17.9585 27.9648 18.6481 29.1334 18.6481C29.6096 18.6481 30.0567 18.5348 30.3732 18.3946L29.9696 17.1288C29.8549 17.1698 29.7098 17.1981 29.5515 17.1981C29.2336 17.1981 29.1189 17.0296 29.1189 16.6785V7.27075L27.2738 7.46757ZM41.8849 15.2796H37.1524C37.2947 16.7805 38.0074 17.2676 39.0063 17.2676C39.6754 17.2676 40.2314 17.0594 40.8876 16.6148L41.6425 17.6301C40.9007 18.2149 39.989 18.617 38.848 18.617C36.5093 18.617 35.2551 17.1019 35.2551 14.7783C35.2551 12.4548 36.4673 10.8433 38.6056 10.8433C40.7439 10.8433 41.927 12.2338 41.927 14.556C41.927 14.7478 41.9088 14.9758 41.8943 15.1593C41.8908 15.2022 41.8877 15.2426 41.8849 15.2796ZM40.0848 14.0321C40.0848 12.8214 39.6435 12.0993 38.6158 12.0993C37.7607 12.0993 37.2192 12.6558 37.119 14.1157H40.0848V14.0321ZM20.8576 8.38205C20.8576 8.97959 20.3858 9.4525 19.7021 9.4525V9.45109C19.0313 9.45109 18.561 8.99233 18.561 8.38063C18.561 7.76893 19.0168 7.296 19.7021 7.296C20.3873 7.296 20.8576 7.78451 20.8576 8.38205ZM18.806 10.8792V18.3513H20.6511V10.6838L18.806 10.8792ZM33.7164 8.38205C33.7164 8.97959 33.2447 9.4525 32.5609 9.4525V9.45109C31.8903 9.45109 31.4198 8.99233 31.4198 8.38063C31.4198 7.76893 31.8772 7.296 32.5609 7.296C33.2447 7.296 33.7164 7.78451 33.7164 8.38205ZM31.6173 10.8792V18.3513H33.4624V10.6838L31.6173 10.8792Z" fill="white"/>
5
+ </g>
6
+ <defs>
7
+ <clipPath id="clip0_1640_11325">
8
+ <rect width="50" height="25" fill="white" transform="translate(0 0.5)"/>
9
+ </clipPath>
10
+ </defs>
11
+ </svg>