wickes-css2 2.94.0-develop.2 → 2.94.0-develop.20

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 (159) hide show
  1. package/Readme.md +4 -5
  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/homepage-main.css +1 -1
  5. package/build/css/main.css +1 -1
  6. package/build/css/my-account-main-v2.css +1 -1
  7. package/build/css/my-account-main.css +1 -1
  8. package/build/css/pages/checkout-new.css +1 -1
  9. package/build/css/pages/checkout.css +1 -1
  10. package/build/css/pages/my-account-v2.css +1 -1
  11. package/build/css/pages/my-account.css +1 -1
  12. package/build/css/pages/page_checkout_delivery-new.css +1 -1
  13. package/build/css/pages/page_default-store.css +1 -0
  14. package/build/css/pages/page_my-orders.css +1 -0
  15. package/build/css/pages/page_personal-details.css +1 -1
  16. package/build/css/pages/page_product-details-v2-critical.css +1 -1
  17. package/build/css/pages/page_product-details-v2.css +1 -1
  18. package/build/css/pages/page_products-list-combined.css +1 -1
  19. package/build/css/pages/page_products-list.css +1 -1
  20. package/build/css/pages/page_shopping-cart-v2.css +1 -1
  21. package/build/css/pdp-main-before-combine.css +1 -1
  22. package/build/css/pdp-main-critical.css +1 -1
  23. package/build/css/pdp-main-non-critical.css +1 -1
  24. package/build/css/pdp-main.css +1 -1
  25. package/build/css/plp-main.css +1 -1
  26. package/build/css/store-locator-main.css +1 -1
  27. package/build/js/account-members.min.js +1 -1
  28. package/build/js/basket.min.js +2 -2
  29. package/build/js/bundle.min.js +1 -1
  30. package/build/js/checkout.min.js +2 -2
  31. package/build/js/default-store.min.js +1 -0
  32. package/build/js/emulation.min.js +153 -5
  33. package/build/js/general.bundle.min.js +1 -1
  34. package/build/js/merged-checkout.min.js +2 -2
  35. package/build/js/my-orders.min.js +1 -0
  36. package/build/js/page/basket/summary-mobile.js +22 -0
  37. package/build/js/page/basket-v2.js +20 -6
  38. package/build/js/page/components/order-summary.js +8 -1
  39. package/build/js/page/components/sticky-order-observer.js +49 -0
  40. package/build/js/page/components/voucher.js +1 -1
  41. package/build/js/page/default-store.js +44 -0
  42. package/build/js/page/my-orders.js +165 -0
  43. package/build/js/page/personal-details.js +105 -36
  44. package/build/js/pdp.bundle.min.js +1 -1
  45. package/build/js/personal-details.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/package.json +2 -10
  49. package/src/components/account-families/actions-bar.hbs +3 -3
  50. package/src/components/checkout-action.hbs +14 -11
  51. package/src/components/checkout-voucher-accordion.hbs +15 -0
  52. package/src/components/checkout_order-summary-new.hbs +5 -3
  53. package/src/components/checkout_voucher_large.hbs +20 -16
  54. package/src/components/default-store/current-store.hbs +60 -0
  55. package/src/components/default-store/list-of-store.hbs +39 -0
  56. package/src/components/default-store/store-form.hbs +29 -0
  57. package/src/components/default-store/store-unavailable.hbs +4 -0
  58. package/src/components/flatpickr-calendar.hbs +26 -0
  59. package/src/components/my-account/active-orders/header.hbs +6 -2
  60. package/src/components/my-account/active-orders/list-orders.hbs +14 -2
  61. package/src/components/my-account/active-orders/order-header.hbs +1 -1
  62. package/src/components/my-account/active-orders/order.hbs +10 -6
  63. package/src/components/my-account/clipboard-code-card.hbs +1 -1
  64. package/src/components/my-account/empty-orders.hbs +9 -0
  65. package/src/components/my-account/mobile-nav.hbs +23 -19
  66. package/src/components/my-account/orders-nav.hbs +15 -0
  67. package/src/components/my-account/personal-details-form.hbs +5 -0
  68. package/src/components/my-account/sort-by.hbs +3 -0
  69. package/src/components/my-account/user-account-actions.hbs +1 -1
  70. package/src/components/order-summary.hbs +91 -56
  71. package/src/components/signup-form.hbs +1 -2
  72. package/src/components/store-details.hbs +22 -20
  73. package/src/components/store-preview.hbs +0 -11
  74. package/src/components/summary-mobile-bar.hbs +17 -0
  75. package/src/components/user-information-field.hbs +1 -1
  76. package/src/data/data_big-wins-stores.json +0 -22
  77. package/src/data/data_delivery-address-v2.json +1 -1
  78. package/src/data/my-account/data_my-orders.json +246 -0
  79. package/src/data/my-account/data_personal-details.json +36 -11
  80. package/src/data/my-account/page_default-store.json +158 -0
  81. package/src/elements/dropdown.hbs +1 -1
  82. package/src/elements/input.hbs +2 -2
  83. package/src/js/components/flatpickr.js +167 -0
  84. package/src/js/components/general/handleAccordion.js +35 -0
  85. package/src/js/components/general/is-trade-pro.js +15 -1
  86. package/src/js/components/general/switchVat.js +1 -1
  87. package/src/js/components/leave-event.js +41 -2
  88. package/src/js/emulation/basket-data.js +2 -2
  89. package/src/js/emulation/big-wins.js +0 -2
  90. package/src/js/emulation/default-store.js +97 -0
  91. package/src/js/emulation/forms.js +1 -1
  92. package/src/js/emulation/mock.js +10 -0
  93. package/src/js/emulation/my-orders-local.js +41 -0
  94. package/src/js/page/basket/summary-mobile.js +22 -0
  95. package/src/js/page/basket-v2.js +20 -6
  96. package/src/js/page/components/order-summary.js +8 -1
  97. package/src/js/page/components/sticky-order-observer.js +49 -0
  98. package/src/js/page/components/voucher.js +1 -1
  99. package/src/js/page/default-store.js +44 -0
  100. package/src/js/page/my-orders.js +165 -0
  101. package/src/js/page/personal-details.js +105 -36
  102. package/src/layouts/basket-new.hbs +1 -1
  103. package/src/layouts/checkout-new.hbs +1 -0
  104. package/src/page_checkout_confirmation-new-marketing-consent-error.html +0 -2
  105. package/src/page_checkout_delivery-address-customer-journey.html +0 -5
  106. package/src/page_checkout_delivery-address-v2.html +0 -4
  107. package/src/page_checkout_delivery-details-v2-asm.html +1 -5
  108. package/src/page_checkout_delivery-details-v2-calendar-message.html +0 -3
  109. package/src/page_checkout_delivery-details-v2-oos.html +0 -3
  110. package/src/page_checkout_delivery-details-v2-wisdom-not-available.html +0 -5
  111. package/src/page_checkout_delivery-details-v2-wisdom.html +0 -5
  112. package/src/page_checkout_delivery-details-with-loader-v2.html +0 -3
  113. package/src/page_checkout_delivery-details_guest-new.html +0 -5
  114. package/src/page_checkout_delivery_address-asm-new.html +0 -4
  115. package/src/page_checkout_next-day-delivery-details.html +0 -6
  116. package/src/page_checkout_payment-details-v2.html +1 -1
  117. package/src/page_checkout_payment-details_guest-with-checkout-journey.html +0 -2
  118. package/src/page_checkout_payment-details_login-with-checkout-journey.html +0 -2
  119. package/src/page_checkout_payment-details_with-card-loader.html +56 -0
  120. package/src/page_checkout_rapid-delivery-details.html +0 -6
  121. package/src/page_default-store-page-empty.html +48 -0
  122. package/src/page_default-store-page.html +55 -0
  123. package/src/page_klarna_payment-details_with-klarna.html +3 -6
  124. package/src/page_my-orders-empty.html +49 -0
  125. package/src/page_my-orders.html +64 -0
  126. package/src/page_payment-details-with-clearpay.html +1 -1
  127. package/src/page_payment-details_with_apple-pay.html +1 -1
  128. package/src/page_payment-details_with_google-pay.html +1 -1
  129. package/src/page_personal-details-installer.html +17 -7
  130. package/src/page_personal-details.html +15 -7
  131. package/src/page_shopping-cart-v2.html +6 -16
  132. package/src/scss/barclays-paypage-combined-minified.css +1 -1
  133. package/src/scss/barclays-paypage-combined.css +9 -15
  134. package/src/scss/components/_big-wins-critical.scss +0 -1
  135. package/src/scss/components/_big-wins.scss +1 -8
  136. package/src/scss/components/_checkout-action.scss +132 -6
  137. package/src/scss/components/_order-item-cc.scss +0 -6
  138. package/src/scss/components/_order-summary.scss +329 -178
  139. package/src/scss/components/_sticky-element-appearance.scss +25 -0
  140. package/src/scss/components/checkout-payment-details-v2.scss +2 -2
  141. package/src/scss/components/my-account/_active-orders.scss +263 -0
  142. package/src/scss/components/my-account/_orders-nav.scss +61 -0
  143. package/src/scss/components/my-account/_shipment.scss +1 -0
  144. package/src/scss/helpers/_variables.scss +3 -0
  145. package/src/scss/libs/flatpickr.scss +235 -0
  146. package/src/scss/main.scss +1 -0
  147. package/src/scss/pages/_checkout-widget.scss +137 -28
  148. package/src/scss/pages/_my-account_new.scss +1 -12
  149. package/src/scss/pages/my-account-v2.scss +1 -136
  150. package/src/scss/pages/page_checkout_delivery-new.scss +119 -10
  151. package/src/scss/pages/page_default-store.scss +634 -0
  152. package/src/scss/pages/page_my-orders.scss +232 -0
  153. package/src/scss/pages/page_personal-details.scss +37 -5
  154. package/src/scss/pages/page_products-list-combined.scss +0 -1
  155. package/src/scss/pages/page_products-list.scss +0 -1
  156. package/src/scss/pages/page_shopping-cart-v2.scss +137 -36
  157. package/src/scss/partials/_header.scss +5 -0
  158. package/src/sitemap.html +6 -0
  159. package/src/scss/components/my-account/_order.scss +0 -112
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "wickes-css2",
3
- "version": "2.94.0-develop.2",
3
+ "version": "2.94.0-develop.20",
4
4
  "description": "CSS and JS and page templates in use by Wickes",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -108,15 +108,7 @@
108
108
  "branches": [
109
109
  "alt-master",
110
110
  {
111
- "name": "develop",
112
- "prerelease": true
113
- },
114
- {
115
- "name": "preprod",
116
- "prerelease": true
117
- },
118
- {
119
- "name": "custom-tag/*",
111
+ "name": "custom-tag/0.1.0-originals",
120
112
  "prerelease": "${name.replace(/^custom-tag\\//g, '')}"
121
113
  }
122
114
  ],
@@ -1,15 +1,15 @@
1
- <div class="actions-bar {{mod}}">
1
+ <div class="actions-bar {{this.mod}}">
2
2
  {{#each buttons}}
3
3
  {{#if url}}
4
4
  <a
5
- class="btn btn_full {{#if isPrimary}}btn-primary{{/if}} {{#if isSecondary}}btn-secondary{{/if}} {{mod}}"
5
+ class="btn btn_full {{#if isPrimary}}btn-primary{{/if}} {{#if isSecondary}}btn-secondary{{/if}} {{this.mod}}"
6
6
  href="{{url}}"
7
7
  >
8
8
  {{title}}
9
9
  </a>
10
10
  {{else}}
11
11
  <button
12
- class="btn btn_full {{#if isPrimary}}btn-primary{{/if}} {{#if isSecondary}}btn-secondary{{/if}} {{mod}}"
12
+ class="btn btn_full {{#if isPrimary}}btn-primary{{/if}} {{#if isSecondary}}btn-secondary{{/if}} {{this.mod}}"
13
13
  {{#if toggle-modal}}
14
14
  data-toggle="modal"
15
15
  data-target="{{target}}"
@@ -1,14 +1,15 @@
1
- <div class="checkout-action__wrapper {{mod}}">
1
+ <div class="checkout-action__wrapper {{lookup . "mod"}} {{view}}">
2
2
  {{#if head}}
3
3
  {{> checkout-section-title title=head}}
4
4
  {{/if}}
5
- <div class="checkout-action">
5
+ <div class="checkout-action {{#if container}}container{{/if}}">
6
6
  <div class="checkout-action__section">
7
7
  <a href="#" class="btn btn_full btn-action btn-checkout">
8
- Checkout
9
- <span class="icon">
10
- <i class="fas fa-arrow-right"></i>
11
- </span>
8
+ <span class="btn-wickes-checkout__label checkout-text--mixed">Checkout</span>
9
+ <span class="btn-wickes-checkout__label checkout-text--collect">Wickes Checkout</span>
10
+ <span class="icon">
11
+ <i class="fas fa-arrow-right"></i>
12
+ </span>
12
13
  </a>
13
14
  </div>
14
15
  <div class="checkout-action__section checkout-widget__basket-block">
@@ -23,13 +24,15 @@
23
24
  </div>
24
25
  </div>
25
26
  </a>
27
+ {{#unless hidePaypalEmail}}
26
28
  <div class="pay-pal_container-email">
27
- <div class="pay-pal_email-heading">Your PayPal email: </div>
28
- <div class="pay-pal_email-value">John.doe@gmail.com</div>
29
- <div class="pay-pal_email-link">
30
- <a href="#" title="" target="_blank">Don't use this email</a>
31
- </div>
29
+ <div class="pay-pal_email-heading">Your PayPal email: </div>
30
+ <div class="pay-pal_email-value">John.doe@gmail.com</div>
31
+ <div class="pay-pal_email-link">
32
+ <a href="#" title="" target="_blank">Don't use this email</a>
33
+ </div>
32
34
  </div>
35
+ {{/unless}}
33
36
  </div>
34
37
  </div>
35
38
  </div>
@@ -0,0 +1,15 @@
1
+ <li class="checkout-widget__voucher-accordion">
2
+ <div
3
+ class="checkout-widget__voucher-toggle collapsed"
4
+ data-toggle="collapse"
5
+ data-target="#checkout-voucher-accordion-{{id}}"
6
+ >
7
+ Got a voucher?
8
+ <span class="checkout-widget__icon">
9
+ <i class="fal fa-angle-up fa-2x"></i>
10
+ </span>
11
+ </div>
12
+ <div class="collapse" id="checkout-voucher-accordion-{{id}}">
13
+ {{> checkout_voucher_large id=id title=""}}
14
+ </div>
15
+ </li>
@@ -12,12 +12,13 @@
12
12
  {{/each}}
13
13
  {{else}}
14
14
  {{#each info}}
15
- <li class="checkout-widget__item {{#if mod}}checkout-widget__item-{{mod}}{{/if}}">
15
+ <li class="checkout-widget__item {{#if (lookup this "mod")}}checkout-widget__item-{{lookup this "mod"}}{{/if}}">
16
16
  <span>{{title}}</span>
17
17
  <span class="checkout-widget__item-value">{{value}}</span>
18
18
  </li>
19
19
  {{/each}}
20
20
  {{/if}}
21
+ {{> checkout-voucher-accordion id=id}}
21
22
  {{#if discounts}}
22
23
  <li class="checkout-widget__accordion-wrap checkout-widget__details-discount">
23
24
  <span class="checkout-widget__detail-name checkout-widget__detail-name_accordion collapsed" data-toggle="collapse"
@@ -35,7 +36,8 @@
35
36
  </li>
36
37
  {{/if}}
37
38
  </ul>
38
- <div class="checkout-widget__total">
39
+ {{#unless mobile}}
40
+ <div class="checkout-widget__total" data-sticky-observe>
39
41
  {{#if confirmationSummary}}
40
42
  <div> {{ confirmation-summary.total.title }}</div>
41
43
  <div class="checkout-widget__total-value">{{ confirmation-summary.total.value }}</div>
@@ -44,5 +46,5 @@
44
46
  <div class="checkout-widget__total-value">{{ total.value }}</div>
45
47
  {{/if}}
46
48
  </div>
47
-
49
+ {{/unless}}
48
50
  </div>
@@ -1,19 +1,23 @@
1
1
  <div class="voucher">
2
- {{#if title}}
3
- {{> checkout-section-title}}
4
- {{/if}}
5
- <div class="checkout-widget checkout-voucher checkout-voucher_fixed">
6
- <form id="form-checkout-voucher{{id}}">
7
- {{> form-row id=(concat 'voucher-code' id) label="Voucher" label-hidden="true" required="true" placeholder="Enter code"}}
8
- <button class="voucher__btn btn btn-secondary btn_full">
9
- <span class="btn__text">Apply</span>
10
- </button>
11
- </form>
2
+ {{#if title}}
3
+ {{> checkout-section-title}}
4
+ {{/if}}
5
+ <div class="checkout-widget checkout-voucher checkout-voucher_fixed">
6
+ <form id="form-checkout-voucher{{id}}">
7
+ {{> form-row id=(concat 'voucher-code' id) label="Voucher" label-hidden="true" required="true" placeholder="Enter code" info=""}}
8
+ <button class="voucher__btn btn btn-primary">
9
+ <span class="btn__text">Apply</span>
10
+ </button>
11
+ </form>
12
+ </div>
13
+ {{#unless voucherApplied}}
14
+ <div class="checkout-widget checkout-voucher voucher-applied checkout-voucher-hide">
15
+ <div class="voucher-applied__inner">
16
+ <span class="icon icon__check">
17
+ <i class="fas fa-check-circle"></i>
18
+ </span>
19
+ <h5 class="heading-5 text-center">Voucher has been applied</h5>
20
+ </div>
12
21
  </div>
13
- {{#unless voucherApplied}}
14
- <div class="checkout-widget checkout-voucher voucher-applied checkout-voucher-hide">
15
- <i class="fas fa-check-circle"></i>
16
- <h3 class="heading-3 text-center">Voucher has been applied</h3>
17
- </div>
18
- {{/unless}}
22
+ {{/unless}}
19
23
  </div>
@@ -0,0 +1,60 @@
1
+ <div class="current-store">
2
+ <p class="current-store__default">Your default store</p>
3
+ <h3 class="current-store__name">{{name}}</h3>
4
+ <p class="current-store__address">{{address}}</p>
5
+ <p class="current-store__phone">Phone: {{phone}}</p>
6
+ <a class="current-store__link" href="#">View store details</a>
7
+ <div class="current-store__hours">
8
+ <div class="current-store__hours-section">
9
+ <p class="title-section">Opening times</p>
10
+ <ul class="opening-times collapse" id="openingTimes">
11
+ {{#each openingTimes}}
12
+ <li class="opening-times__item">
13
+ <span class="opening-times__day">
14
+ {{day}}
15
+ </span>
16
+ <span class="opening-times__time">
17
+ {{time}}
18
+ </span>
19
+ </li>
20
+ {{/each}}
21
+ </ul>
22
+ </div>
23
+ <div class="current-store__hours-section current-store__hours-section--special">
24
+ <p class="title-section">Special opening times</p>
25
+ <ul class="special-times collapse" id="specialTimes">
26
+ {{#each specialOpeningTimes}}
27
+ <li class="special-times__item">
28
+ <div class="special-times__days">
29
+ <span class="special-times__name">
30
+ {{name}}
31
+ </span>
32
+ <span class="special-times__day">
33
+ {{day}}
34
+ </span>
35
+ </div>
36
+ <span class="special-times__time">
37
+ {{time}}
38
+ </span>
39
+ </li>
40
+ {{/each}}
41
+ </ul>
42
+ </div>
43
+ <div class="current-store__hours-section current-store__hours-section--facilities">
44
+ <p class="title-section">Facilities</p>
45
+ <ul class="facilities collapse" id="facilities">
46
+ {{#each facilities}}
47
+ <li class="facilities__item">
48
+ <span class="facilities__icon-container">
49
+ <i class="{{icon}} facilities__icon"></i>
50
+ </span>
51
+ <span class="facilities__title">{{title}}</span>
52
+ </li>
53
+ {{/each}}
54
+ </ul>
55
+ </div>
56
+ <button class="btn btn-link" type="button" data-toggle="collapse" data-target="#openingTimes, #specialTimes, #facilities" aria-expanded="false" aria-controls="openingTimes specialTimes facilities">
57
+ <i class="far fa-angle-down icon"></i>
58
+ </button>
59
+ </div>
60
+ </div>
@@ -0,0 +1,39 @@
1
+ <form action="#" class="list-of-store" style="{{style}}">
2
+ <div class="bw">
3
+ <div class="bw__stock stock">
4
+ <ul class="stock__list">
5
+ {{#each bigWins.stores}}
6
+ <li class="stock__item">
7
+ <div class="stock__radio">
8
+ {{> radiobutton name="store" id="stock-store" checked=checked}}
9
+ </div>
10
+ {{> store-preview
11
+ class="stock__store"
12
+ id=id
13
+ myAcc=true
14
+ name=name
15
+ distance=distance
16
+ }}
17
+ </li>
18
+ {{/each}}
19
+ {{#each bigWins.stores}}
20
+ {{> store-details
21
+ distance = distance
22
+ distanceUom = distanceUom
23
+ name = name
24
+ phone = phone
25
+ postcode = postcode
26
+ }}
27
+ {{/each}}
28
+ </ul>
29
+ </div>
30
+ </div>
31
+ <div class="bw_act">
32
+ <a href="#" class="btn btn-primary btn_full my-account_add-store">
33
+ Add default store
34
+ </a>
35
+ <a href="#" class="btn btn-outline-primary btn_full my-account_cancel-store">
36
+ Cancel
37
+ </a>
38
+ </div>
39
+ </form>
@@ -0,0 +1,29 @@
1
+ <form action="#" class="search-store" data-clearable>
2
+ <div class="form-row form-row--clear-input" data-row-required>
3
+ <label class="search-store__label" for="{{id}}">{{label}}</label>
4
+ <div class="search-store__wrap">
5
+ <div class="form-row__field search-store__input">
6
+ <input
7
+ class="input"
8
+ id="{{id}}"
9
+ aria-label="{{id}}"
10
+ type="text"
11
+ name="text"
12
+ placeholder="{{placeholder}}"
13
+ autocomplete="off"
14
+ >
15
+ <button class="btn btn-secondary btn--clear" type="button">
16
+ <i class="{{iconCross}} icon"></i>
17
+ </button>
18
+ <button class="btn btn-search" type="submit">
19
+ <i class="{{iconSearch}} icon"></i>
20
+ </button>
21
+ </div>
22
+ <button type="button" class="btn btn-primary btn--location" id="geoLocationIcon">
23
+ <i class="{{iconLocation}} icon"></i>
24
+ <i class="{{iconError}} icon-error" style="display: none;"></i>
25
+ </button>
26
+ </div>
27
+ <div class="form-row__error" style="display: none">{{error}}</div>
28
+ </div>
29
+ </form>
@@ -0,0 +1,4 @@
1
+ <div class="store-unavailable {{mod}}">
2
+ <h3 class="store-unavailable__title">{{title}}</h3>
3
+ <i class="{{icon}} icon"></i>
4
+ </div>
@@ -0,0 +1,26 @@
1
+ <div class="flatpickr-datepicker" choose-date="" show-years="15">
2
+ <label class="flatpickr-datepicker__label">
3
+ Monthly view
4
+ {{> info-icon
5
+ modification="icon-info"
6
+ title=textTooltip
7
+ data-placement="top"
8
+ data-container=".flatpickr-datepicker__label"
9
+ }}
10
+ </label>
11
+ <div class="flatpickr-datepicker__field">
12
+ <input
13
+ type="text"
14
+ class="flatpickr-input"
15
+ id="calendarInputFlatpickr"
16
+ placeholder="Select year and month"
17
+ readonly
18
+ />
19
+ <span class="icon-wrap icon-wrap--cross" id="crossIcon">
20
+ <i class="far fa-times cross-icon"></i>
21
+ </span>
22
+ <span class="icon-wrap" id="calendarIcon">
23
+ <i class="fas fa-calendar-alt icon-calendar"></i>
24
+ </span>
25
+ </div>
26
+ </div>
@@ -1,4 +1,8 @@
1
1
  <div class="active-orders__header">
2
- <h3 class="active-orders__title">{{title}}</h3>
3
- <a class="btn btn_full btn-primary btn--all-orders d-none d-sm-block" rel="stylesheet" href="#">{{linkText}}</a>
2
+ {{#if title}}
3
+ <h3 class="active-orders__title">{{title}}</h3>
4
+ {{/if}}
5
+ {{#if linkText}}
6
+ <a class="btn btn_full btn-primary btn--all-orders d-none d-sm-block" rel="stylesheet" href="#">{{linkText}}</a>
7
+ {{/if}}
4
8
  </div>
@@ -1,9 +1,21 @@
1
1
  <div class="active-orders">
2
- {{> my-account/active-orders/header}}
2
+ {{#if title}}
3
+ {{> my-account/active-orders/header}}
4
+ {{/if}}
3
5
 
4
6
  {{#each orders}}
5
7
  {{> my-account/active-orders/order switch-vat=../switch-vat}}
6
8
  {{/each}}
7
9
 
8
- <a class="btn btn_full btn-primary btn--all-orders d-sm-none" rel="stylesheet" href="#">{{linkText}}</a>
10
+ {{#if linkText}}
11
+ <a class="btn btn_full btn-primary btn--all-orders d-sm-none" rel="stylesheet" href="#">{{linkText}}</a>
12
+ {{/if}}
9
13
  </div>
14
+ {{#if isLoadMore}}
15
+ <div class="load-more-wrap">
16
+ <input id="numberOfPagesOrders" value="3" type="hidden">
17
+ <button class="btn btn-primary btn-load-more">
18
+ Load more
19
+ </button>
20
+ </div>
21
+ {{/if}}
@@ -1,6 +1,6 @@
1
1
  <header class="order-header">
2
2
  <h3 class="order-header__title">Order {{orderId}}</h3>
3
- <div class="order-header__status">
3
+ <div class="order-status {{orderStatus.statusClass}}">
4
4
  <i class="{{orderStatus.statusIcon}} icon"></i>
5
5
  <span>{{orderStatus.statusTitle}}</span>
6
6
  </div>
@@ -3,13 +3,17 @@
3
3
 
4
4
  {{> my-account/active-orders/order-details switch-vat=switch-vat}}
5
5
 
6
- {{> my-account/active-orders/consignment-info}}
6
+ {{#if totalConsignments}}
7
+ {{> my-account/active-orders/consignment-info}}
8
+ {{/if}}
7
9
 
8
- <section class="shipment-details">
9
- {{#each shipmentDetails}}
10
- {{> my-account/active-orders/shipment-detail}}
11
- {{/each}}
12
- </section>
10
+ {{#if shipmentDetails}}
11
+ <section class="shipment-details">
12
+ {{#each shipmentDetails}}
13
+ {{> my-account/active-orders/shipment-detail}}
14
+ {{/each}}
15
+ </section>
16
+ {{/if}}
13
17
 
14
18
  <div class="view-more">
15
19
  <a class="link" href="/">
@@ -1,4 +1,4 @@
1
- <div class="clipboard-code {{mod}}">
1
+ <div class="clipboard-code {{this.mod}}">
2
2
  {{#if customIcon}}
3
3
  {{{customIcon}}}
4
4
  {{else}}
@@ -0,0 +1,9 @@
1
+ <div class="empty-orders">
2
+ <h2 class="empty-orders__title">{{title}}</h2>
3
+ <span class="empty-orders__image">
4
+ {{{image}}}
5
+ </span>
6
+ {{#if btnText}}
7
+ <a href="#" class="btn btn-primary empty-orders__btn">{{btnText}}</a>
8
+ {{/if}}
9
+ </div>
@@ -1,17 +1,19 @@
1
- <div class="account-nav {{mod}}" {{#if (eq @index ../active-index)}}data-active-index="{{active-index}}"{{/if}}>
1
+ <div class="account-nav {{this.mod}}" {{#if (eq @index ../active-index)}}data-active-index="{{active-index}}"{{/if}}>
2
2
  <div class="account-nav__toggle accordion accordion_collapsed">
3
3
  <div class="accordion__header" role="link" aria-expanded="false">
4
- <span class="account-nav__icon">
5
- {{#each menu}}
6
- {{#if (eq @index ../active-index)}}
7
- {{#if customIcon}}
8
- {{{icon}}}
9
- {{else}}
10
- <i class="{{icon}} icon"></i>
11
- {{/if}}
4
+ {{#each menu}}
5
+ {{#if (eq @index ../active-index)}}
6
+ {{#if icon}}
7
+ <span class="account-nav__icon">
8
+ {{#if customIcon}}
9
+ {{{icon}}}
10
+ {{else}}
11
+ <i class="{{icon}} icon"></i>
12
+ {{/if}}
13
+ </span>
12
14
  {{/if}}
13
- {{/each}}
14
- </span>
15
+ {{/if}}
16
+ {{/each}}
15
17
  <span class="accordion__header-text">{{page-name}}</span>
16
18
  <span class="icon accordion__header-icon">
17
19
  <i class="fas fa-angle-up"></i>
@@ -23,14 +25,16 @@
23
25
  <ul class="account-nav__list">
24
26
  {{#each menu}}
25
27
  <li class="account-nav__item">
26
- <a class="account-nav__link" data-index="{{@index}}" href="{{link}}">
27
- <span class="account-nav__icon">
28
- {{#if customIcon}}
29
- {{{icon}}}
30
- {{else}}
31
- <i class="{{icon}} icon"></i>
32
- {{/if}}
33
- </span>
28
+ <a class="account-nav__link" data-index="{{@index}}" href="{{link}}" id="{{id}}">
29
+ {{#if icon}}
30
+ <span class="account-nav__icon">
31
+ {{#if customIcon}}
32
+ {{{icon}}}
33
+ {{else}}
34
+ <i class="{{icon}} icon"></i>
35
+ {{/if}}
36
+ </span>
37
+ {{/if}}
34
38
  {{title}}
35
39
  {{#if total}}
36
40
  <span class="rewards">{{total}}</span>
@@ -0,0 +1,15 @@
1
+ <nav class="nav-orders">
2
+ {{> my-account/mobile-nav
3
+ mod="d-sm-none"
4
+ menu=nav
5
+ active-index=0
6
+ page-name=nav.[0].title
7
+ }}
8
+ <ul class="nav-orders__wrap d-none d-sm-flex">
9
+ {{#each nav}}
10
+ <li class="nav-orders__item {{#if isActive}}active{{/if}}">
11
+ <a class="link" href="#" id="{{id}}">{{title}}</a>
12
+ </li>
13
+ {{/each}}
14
+ </ul>
15
+ </nav>
@@ -8,12 +8,17 @@
8
8
  label=this.label
9
9
  value=this.value
10
10
  placeholder=this.placeholder
11
+ input-mod=this.modificator
11
12
  required=this.required
12
13
  row-mod=this.rowMod
13
14
  options=this.options
14
15
  selectedIndex=this.selectedIndex
16
+ data-tag=this.dataTag
15
17
  }}
16
18
  {{/each}}
19
+ {{#if isInstaller}}
20
+ <input id="tradeTypeHidden" type="hidden" name="tradeTypeValue" value="installer" data-tag="trade-type-value">
21
+ {{/if}}
17
22
  <div class="user-form__ctas">
18
23
  {{#each buttons}}
19
24
  <button class="{{this.class}}" type="{{this.type}}" data-action="{{this.dataAction}}">
@@ -0,0 +1,3 @@
1
+ <div class="sort-orders">
2
+ {{> form-row dropdown="true" id="sort_orders" label="Sort by" placeholder="Name (descending)"}}
3
+ </div>
@@ -1,4 +1,4 @@
1
- <ul class="account-actions__list {{mod}}">
1
+ <ul class="account-actions__list {{this.mod}}">
2
2
  <li class="account-actions__item">
3
3
  <a class="account-actions__link" href="#">
4
4
  <span class="icon">