wickes-css2 2.112.0-develop.8 → 2.112.0-develop.9

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 (10) hide show
  1. package/Readme.md +0 -3
  2. package/build/js/page/checkout-payment-details.js +10 -0
  3. package/package.json +1 -1
  4. package/src/components/address-billie.hbs +22 -18
  5. package/src/components/checkout-edit-billing-address.hbs +1 -1
  6. package/src/components/checkout-payment-details-v2.hbs +6 -1
  7. package/src/js/page/checkout-payment-details.js +10 -0
  8. package/src/page_payment-details-billie-registered-only.html +76 -0
  9. package/src/page_payment-details-billie-unregistered-only.html +76 -0
  10. package/src/sitemap.html +12 -0
package/Readme.md CHANGED
@@ -6,7 +6,6 @@ This project requires 14 version of node.js. From now on we are using yarn as pa
6
6
  ## Commit Guidelines
7
7
  This project is now using the semantic-release npm plug-in to control versioning. This means that it will automatically bump the version numbers when the CI build occurs.
8
8
  The decision on whether this is a patch, feature or breaking (b.f.p) release is based upon the GIT commit messages. We are using the [Angular Commit Message Conventions](https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#-git-commit-guidelines)
9
-
10
9
  | Commit message | Release type |
11
10
  |--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|----------------------------|
12
11
  | `fix(pencil): stop graphite breaking when too much pressure applied` | Patch Release |
@@ -232,11 +231,9 @@ While using breakpoints we should use right order of its placement:
232
231
  }
233
232
 
234
233
  ```
235
-
236
234
  * Preferable way is to use one way of breakpoints direction: -up or -down, and to use them both only in exceptional cases"
237
235
  * -only breakpoints should be placed only after group of -up or -down
238
236
 
239
-
240
237
  ## Js
241
238
 
242
239
  ... to be added
package/build/js/page/checkout-payment-details.js CHANGED
@@ -244,6 +244,7 @@ Wick.CheckoutPaymentDetails = (function () {
244
244
  setBillieStepVisibility(getBillieRepaymentTermsLength() === 1);
245
245
  resetBillieRepaymentSelection();
246
246
  showBillieBusiness();
247
+ initBillieBusinessType();
247
248
  break;
248
249
 
249
250
  case 'clearpay':
@@ -324,6 +325,14 @@ Wick.CheckoutPaymentDetails = (function () {
324
325
  });
325
326
  }
326
327
 
328
+ function initBillieBusinessType() {
329
+ const $radios = elements.$billieBusiness.find(`input${elements.businessTypeName}`);
330
+ if ($radios.length === 1) {
331
+ $radios.prop('checked', true);
332
+ toggleBusinessTypeFields($radios.val());
333
+ }
334
+ }
335
+
327
336
  function forceReflow($element) {
328
337
  if (!$element.length) return;
329
338
  void $element[0].offsetHeight;
@@ -345,6 +354,7 @@ Wick.CheckoutPaymentDetails = (function () {
345
354
 
346
355
  const hasSelection = $('input[name="repaymentTerms"]:checked').length > 0;
347
356
  setBillieStepVisibility(hasSelection);
357
+ initBillieBusinessType();
348
358
 
349
359
  const $row = $(this).closest('.form-row[data-row-required]');
350
360
  $row.removeClass('form-row_validation-error').find('.form-row__error').remove();
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "wickes-css2",
3
- "version": "2.112.0-develop.8",
3
+ "version": "2.112.0-develop.9",
4
4
  "description": "CSS and JS and page templates in use by Wickes",
5
5
  "main": "index.js",
6
6
  "scripts": {
package/src/components/address-billie.hbs CHANGED
@@ -4,26 +4,30 @@
4
4
  Select your business type
5
5
  </label>
6
6
 
7
- <div class="form-row">
8
- <div class="form-row__field">
9
- {{> radiobutton
10
- id="businessTypeUnregistered"
11
- name="businessType"
12
- value="unregistered"
13
- label="Unregistered Sole Trader / Business"}}
7
+ {{#unless (eq billie-business-type "REGISTERED_SOLE_TRADER_BUSINESS")}}
8
+ <div class="form-row">
9
+ <div class="form-row__field">
10
+ {{> radiobutton
11
+ id="businessTypeUnregistered"
12
+ name="businessType"
13
+ value="unregistered"
14
+ label="Unregistered Sole Trader / Business"}}
15
+ </div>
14
16
  </div>
15
- </div>
16
- <div class="form-row">
17
- <div class="form-row__field">
18
- {{> radiobutton
19
- id="businessTypeRegistered"
20
- name="businessType"
21
- value="registered"
22
- labelClass="registered-label"
23
- label="Registered Sole Trader / Business"
24
- tooltip="A Registered Business is one that has undergone the official process of being recognised and registered with Companies House, establishing its legal identity and enabling it to operate within a specific jurisdiction, such as a limited company. A Registered Business will have been issued a Company Registration Number (CRN) from Companies House."}}
17
+ {{/unless}}
18
+ {{#unless (eq billie-business-type "UNREGISTERED_SOLE_TRADER_BUSINESS")}}
19
+ <div class="form-row">
20
+ <div class="form-row__field">
21
+ {{> radiobutton
22
+ id="businessTypeRegistered"
23
+ name="businessType"
24
+ value="registered"
25
+ labelClass="registered-label"
26
+ label="Registered Sole Trader / Business"
27
+ tooltip="A Registered Business is one that has undergone the official process of being recognised and registered with Companies House, establishing its legal identity and enabling it to operate within a specific jurisdiction, such as a limited company. A Registered Business will have been issued a Company Registration Number (CRN) from Companies House."}}
28
+ </div>
25
29
  </div>
26
- </div>
30
+ {{/unless}}
27
31
  </div>
28
32
  <div
29
33
  id="unregistered-fields"
package/src/components/checkout-edit-billing-address.hbs CHANGED
@@ -23,7 +23,7 @@
23
23
 
24
24
  <div class="address-postcode">
25
25
  {{> address-postcode-look-up}}
26
- {{> address-billie}}
26
+ {{> address-billie billie-business-type=billie-business-type}}
27
27
  </div>
28
28
 
29
29
  {{#unless no-set-card}}
package/src/components/checkout-payment-details-v2.hbs CHANGED
@@ -239,7 +239,12 @@
239
239
  </div>
240
240
  </div>
241
241
  <div class="billing-address">
242
- {{> checkout-edit-billing-address actionBlock="true" no-set-card="true" billie-form=billie-form}}
242
+ {{> checkout-edit-billing-address
243
+ actionBlock="true"
244
+ no-set-card="true"
245
+ billie-form=billie-form
246
+ billie-business-type=billie-business-type
247
+ }}
243
248
  </div>
244
249
  <div data-existing-card
245
250
  class="form-row form-row__action form-row__action_custom checkout-payment-details__place-order paypal__row">
package/src/js/page/checkout-payment-details.js CHANGED
@@ -244,6 +244,7 @@ Wick.CheckoutPaymentDetails = (function () {
244
244
  setBillieStepVisibility(getBillieRepaymentTermsLength() === 1);
245
245
  resetBillieRepaymentSelection();
246
246
  showBillieBusiness();
247
+ initBillieBusinessType();
247
248
  break;
248
249
 
249
250
  case 'clearpay':
@@ -324,6 +325,14 @@ Wick.CheckoutPaymentDetails = (function () {
324
325
  });
325
326
  }
326
327
 
328
+ function initBillieBusinessType() {
329
+ const $radios = elements.$billieBusiness.find(`input${elements.businessTypeName}`);
330
+ if ($radios.length === 1) {
331
+ $radios.prop('checked', true);
332
+ toggleBusinessTypeFields($radios.val());
333
+ }
334
+ }
335
+
327
336
  function forceReflow($element) {
328
337
  if (!$element.length) return;
329
338
  void $element[0].offsetHeight;
@@ -345,6 +354,7 @@ Wick.CheckoutPaymentDetails = (function () {
345
354
 
346
355
  const hasSelection = $('input[name="repaymentTerms"]:checked').length > 0;
347
356
  setBillieStepVisibility(hasSelection);
357
+ initBillieBusinessType();
348
358
 
349
359
  const $row = $(this).closest('.form-row[data-row-required]');
350
360
  $row.removeClass('form-row_validation-error').find('.form-row__error').remove();
package/src/page_payment-details-billie-registered-only.html ADDED
@@ -0,0 +1,76 @@
1
+ {{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout-confirmation-new" title="Checkout - Payment details with Billie" isAsideSticky="true" clearPayIcon=true billieIcon=true}}
2
+
3
+ {{#content "head" mode="append"}}
4
+ <link type="text/css" rel="stylesheet" href="./css/pages/checkout-new.css">
5
+ <link type="text/css" rel="stylesheet" href="./css/pages/page_checkout_delivery-new.css">
6
+ <link type="text/css" rel="stylesheet" href="./css/components/payment-details-BPS-form.css">
7
+ <link type="text/css" rel="stylesheet" href="./css/components/checkout-payment-details-v2.css">
8
+
9
+ <script src="https://applepay.cdn-apple.com/jsapi/v1/apple-pay-sdk.js"></script>
10
+ {{/content}}
11
+ {{#content "notification"}}
12
+ {{> notifications notification-page.error text="Sorry, there are errors on this page. Please review the information you've entered and update sections marked in red."}}
13
+ {{/content}}
14
+ {{#content "steps"}}
15
+ {{> steps-three-steps active-step-index="2"}}
16
+ {{/content}}
17
+
18
+ {{#content "aside"}}
19
+ {{> order-summary delivery-address-v2.summary no-action=true id=1 basket-id=true clearPayIcon=clearPayIcon billieIcon=true paymentsCheckoutV2=true hideDeliveryCostMessage=true}}
20
+ {{/content}}
21
+
22
+
23
+ {{#content "main"}}
24
+ <div class="delivery-block">
25
+ <h3 class="delivery-block__heading">Delivery Information</h3>
26
+ <div class="delivery-block__wrapper">
27
+ {{#with checkoutOrder.deliveryPayments.[0]}}
28
+ <div class="checkout-order">
29
+ {{> checkout-order-block}}
30
+ </div>
31
+ {{/with}}
32
+ </div>
33
+ </div>
34
+
35
+ <div class="click-collect-block">
36
+ <h3 class="click-collect-block__heading">Click & Collect</h3>
37
+ <div class="click-collect-block__wrapper">
38
+ {{#with checkoutOrder.clickCollectDeliveryAddress.[0]}}
39
+ <div class="checkout-order">
40
+ {{> checkout-order-block}}
41
+ </div>
42
+ {{/with}}
43
+ </div>
44
+ </div>
45
+
46
+ <div class="billing-payment-block">
47
+ <h3 class="billing-payment-block__heading">Billing & Payment</h3>
48
+ <div class="billing-payment-block__wrapper">
49
+ {{> checkout-payment-details-v2
50
+ apple-pay=true
51
+ google-pay=true
52
+ clear-pay=true
53
+ billie=true
54
+ edit-bill-mod=true
55
+ billie-form=true
56
+ open-delivery-block=true
57
+ billie-business-type="REGISTERED_SOLE_TRADER_BUSINESS"
58
+ }}
59
+ </div>
60
+ </div>
61
+
62
+ {{/content}}
63
+
64
+ {{#content "foot" mode="append"}}
65
+ <script
66
+ async
67
+ src="https://pay.google.com/gp/p/js/pay.js">
68
+ </script>
69
+ <script defer src="./js/page/checkout-confirmation-new.js"></script>
70
+ <script defer src="./js/page/checkout-payment-details.js"></script>
71
+ <script defer src="./js/page/klarna-modal-scroll-disable.js"></script>
72
+ <script defer src="./js/page/billie-business-type.js"></script>
73
+ {{> checkout-terms-and-conditions-modal }}
74
+ {{> payment-loader hidden=true spinnerTypes=(array "billie-logo" "clearpay-logo" "paypal-logo")}}
75
+ {{/content}}
76
+ {{/extend}}
package/src/page_payment-details-billie-unregistered-only.html ADDED
@@ -0,0 +1,76 @@
1
+ {{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout-confirmation-new" title="Checkout - Payment details with Billie" isAsideSticky="true" clearPayIcon=true billieIcon=true}}
2
+
3
+ {{#content "head" mode="append"}}
4
+ <link type="text/css" rel="stylesheet" href="./css/pages/checkout-new.css">
5
+ <link type="text/css" rel="stylesheet" href="./css/pages/page_checkout_delivery-new.css">
6
+ <link type="text/css" rel="stylesheet" href="./css/components/payment-details-BPS-form.css">
7
+ <link type="text/css" rel="stylesheet" href="./css/components/checkout-payment-details-v2.css">
8
+
9
+ <script src="https://applepay.cdn-apple.com/jsapi/v1/apple-pay-sdk.js"></script>
10
+ {{/content}}
11
+ {{#content "notification"}}
12
+ {{> notifications notification-page.error text="Sorry, there are errors on this page. Please review the information you've entered and update sections marked in red."}}
13
+ {{/content}}
14
+ {{#content "steps"}}
15
+ {{> steps-three-steps active-step-index="2"}}
16
+ {{/content}}
17
+
18
+ {{#content "aside"}}
19
+ {{> order-summary delivery-address-v2.summary no-action=true id=1 basket-id=true clearPayIcon=clearPayIcon billieIcon=true paymentsCheckoutV2=true hideDeliveryCostMessage=true}}
20
+ {{/content}}
21
+
22
+
23
+ {{#content "main"}}
24
+ <div class="delivery-block">
25
+ <h3 class="delivery-block__heading">Delivery Information</h3>
26
+ <div class="delivery-block__wrapper">
27
+ {{#with checkoutOrder.deliveryPayments.[0]}}
28
+ <div class="checkout-order">
29
+ {{> checkout-order-block}}
30
+ </div>
31
+ {{/with}}
32
+ </div>
33
+ </div>
34
+
35
+ <div class="click-collect-block">
36
+ <h3 class="click-collect-block__heading">Click & Collect</h3>
37
+ <div class="click-collect-block__wrapper">
38
+ {{#with checkoutOrder.clickCollectDeliveryAddress.[0]}}
39
+ <div class="checkout-order">
40
+ {{> checkout-order-block}}
41
+ </div>
42
+ {{/with}}
43
+ </div>
44
+ </div>
45
+
46
+ <div class="billing-payment-block">
47
+ <h3 class="billing-payment-block__heading">Billing & Payment</h3>
48
+ <div class="billing-payment-block__wrapper">
49
+ {{> checkout-payment-details-v2
50
+ apple-pay=true
51
+ google-pay=true
52
+ clear-pay=true
53
+ billie=true
54
+ edit-bill-mod=true
55
+ billie-form=true
56
+ open-delivery-block=true
57
+ billie-business-type="UNREGISTERED_SOLE_TRADER_BUSINESS"
58
+ }}
59
+ </div>
60
+ </div>
61
+
62
+ {{/content}}
63
+
64
+ {{#content "foot" mode="append"}}
65
+ <script
66
+ async
67
+ src="https://pay.google.com/gp/p/js/pay.js">
68
+ </script>
69
+ <script defer src="./js/page/checkout-confirmation-new.js"></script>
70
+ <script defer src="./js/page/checkout-payment-details.js"></script>
71
+ <script defer src="./js/page/klarna-modal-scroll-disable.js"></script>
72
+ <script defer src="./js/page/billie-business-type.js"></script>
73
+ {{> checkout-terms-and-conditions-modal }}
74
+ {{> payment-loader hidden=true spinnerTypes=(array "billie-logo" "clearpay-logo" "paypal-logo")}}
75
+ {{/content}}
76
+ {{/extend}}
package/src/sitemap.html CHANGED
@@ -992,6 +992,18 @@
992
992
  Billie Basket
993
993
  </a>
994
994
  </li>
995
+ <li>
996
+ <span class="page-id">5</span>
997
+ <a href="page_payment-details-billie-unregistered-only.html" target="_blank">
998
+ Billie - Payment details with unregistered business type only
999
+ </a>
1000
+ </li>
1001
+ <li>
1002
+ <span class="page-id">6</span>
1003
+ <a href="page_payment-details-billie-registered-only.html" target="_blank">
1004
+ Billie - Payment details with registered business type only
1005
+ </a>
1006
+ </li>
995
1007
  </ul>
996
1008
  <h3>
997
1009
  Pages with Gift Cards