wickes-css2 2.94.0-develop.6 → 2.94.0-ic-298-mega-nav.1

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 (180) hide show
  1. package/Readme.md +1 -1
  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/emulation.css +1 -1
  5. package/build/css/homepage-main.css +1 -1
  6. package/build/css/main.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.css +1 -1
  11. package/build/css/pages/page_checkout_delivery-new.css +1 -1
  12. package/build/css/pages/page_product-details-v2-critical.css +1 -1
  13. package/build/css/pages/page_product-details-v2.css +1 -1
  14. package/build/css/pages/page_shopping-cart-v2.css +1 -1
  15. package/build/css/pdp-main-before-combine.css +1 -1
  16. package/build/css/pdp-main-critical.css +1 -1
  17. package/build/css/pdp-main-non-critical.css +1 -1
  18. package/build/css/pdp-main.css +1 -1
  19. package/build/css/plp-main.css +1 -1
  20. package/build/css/store-locator-main.css +1 -1
  21. package/build/img/placeholders/discount-sm-15.jpg +0 -0
  22. package/build/img/placeholders/discount-sm.png +0 -0
  23. package/build/js/account-members.min.js +1 -1
  24. package/build/js/basket.min.js +1 -1
  25. package/build/js/bundle.min.js +1 -1
  26. package/build/js/checkout.min.js +1 -1
  27. package/build/js/emulation.min.js +30 -177
  28. package/build/js/general.bundle.min.js +1 -1
  29. package/build/js/merged-checkout.min.js +1 -1
  30. package/build/js/page/plp-load-more.js +0 -1
  31. package/build/js/pdp.bundle.min.js +1 -1
  32. package/build/js/plp.bundle.min.js +1 -1
  33. package/build/js/project-list.min.js +1 -1
  34. package/package.json +1 -1
  35. package/src/components/account-families/actions-bar.hbs +3 -6
  36. package/src/components/aside-nav2.hbs +1 -1
  37. package/src/components/calendar-time-table-v2.hbs +3 -0
  38. package/src/components/calendar-time-table.hbs +3 -0
  39. package/src/components/date-selection-v2.hbs +106 -0
  40. package/src/components/date-selection.hbs +59 -46
  41. package/src/components/delivery-selection.hbs +11 -0
  42. package/src/components/delivery-types-v2.hbs +17 -0
  43. package/src/components/delivery-types.hbs +38 -18
  44. package/src/components/navigation/menu-item-sub.hbs +33 -0
  45. package/src/components/navigation/menu-item-top.hbs +32 -0
  46. package/src/components/navigation/menu-item.hbs +32 -0
  47. package/src/components/navigation/nav-wrapper.hbs +12 -0
  48. package/src/components/store-details.hbs +20 -22
  49. package/src/components/store-preview.hbs +11 -0
  50. package/src/components.html +0 -1
  51. package/src/data/data_big-wins-stores.json +22 -0
  52. package/src/data/data_notification-page.json +0 -4
  53. package/src/data/navigation.json +854 -0
  54. package/src/elements/dropdown.hbs +5 -16
  55. package/src/elements/form-row.hbs +1 -1
  56. package/src/elements/input.hbs +2 -2
  57. package/src/img/placeholders/discount-sm-15.jpg +0 -0
  58. package/src/img/placeholders/discount-sm.png +0 -0
  59. package/src/js/components/date-selection.js +20 -6
  60. package/src/js/components/general/main-nav.js +23 -14
  61. package/src/js/components/general/switchVat.js +1 -27
  62. package/src/js/components/leave-event.js +5 -51
  63. package/src/js/emulation/big-wins.js +2 -0
  64. package/src/js/emulation/date-selection.js +21 -0
  65. package/src/js/emulation/forms.js +1 -1
  66. package/src/js/emulation/main-nav-local.js +6 -4
  67. package/src/js/page/plp-load-more.js +0 -1
  68. package/src/layouts/my-account.hbs +1 -1
  69. package/src/page_checkout_delivery-address.html +70 -0
  70. package/src/page_checkout_delivery-details-ASM.html +251 -0
  71. package/src/page_checkout_delivery-details-oos-partially.html +215 -0
  72. package/src/page_checkout_delivery-details-oos.html +232 -0
  73. package/src/page_checkout_delivery-details-v2-asm.html +3 -3
  74. package/src/page_checkout_delivery-details-v2-calendar-message.html +1 -1
  75. package/src/page_checkout_delivery-details-v2-oos.html +1 -1
  76. package/src/page_checkout_delivery-details-v2-wisdom-not-available.html +2 -2
  77. package/src/page_checkout_delivery-details-v2-wisdom.html +2 -2
  78. package/src/{page_checkout_rapid-delivery-details.html → page_checkout_delivery-details-v2.html} +3 -14
  79. package/src/page_checkout_delivery-details-with-loader-v2.html +1 -1
  80. package/src/page_checkout_delivery-details-with-loader.html +220 -0
  81. package/src/page_checkout_delivery-details.html +221 -0
  82. package/src/page_checkout_delivery-details_guest-new.html +1 -1
  83. package/src/page_checkout_delivery-details_guest.html +198 -0
  84. package/src/page_discount_installer.html +1 -7
  85. package/src/page_marketing-preferences.html +1 -7
  86. package/src/page_my-account.html +59 -56
  87. package/src/page_my-account_address-book.html +2 -8
  88. package/src/page_my-account_order-history.html +3 -8
  89. package/src/page_my-account_personal-details.html +1 -7
  90. package/src/page_old-navigation.html +10 -0
  91. package/src/page_tradePro_delivery-details.html +243 -0
  92. package/src/page_tradePro_discount.html +2 -8
  93. package/src/page_tradePro_rewards.html +1 -7
  94. package/src/page_wismo-order-history-loadmore.html +3 -3
  95. package/src/partials/breadcrumbs.hbs +8 -27
  96. package/src/partials/head.hbs +1 -5
  97. package/src/partials/header.hbs +49 -68
  98. package/src/partials/main-nav.hbs +15 -19
  99. package/src/scss/barclays-paypage-combined-minified.css +1 -1
  100. package/src/scss/barclays-paypage-combined.css +15 -9
  101. package/src/scss/components/_aside-nav2.scss +0 -18
  102. package/src/scss/components/_big-wins-critical.scss +1 -0
  103. package/src/scss/components/_big-wins.scss +8 -1
  104. package/src/scss/components/_date-selection-add-new-styles.scss +19 -78
  105. package/src/scss/components/_date-selection.scss +215 -30
  106. package/src/scss/components/_order-item-cc.scss +6 -0
  107. package/src/scss/components/checkout-payment-details-v2.scss +2 -2
  108. package/src/scss/emulation.scss +24 -0
  109. package/src/scss/helpers/_variables.scss +1 -3
  110. package/src/scss/pages/_my-account_new.scss +12 -1
  111. package/src/scss/pages/checkout-new.scss +0 -51
  112. package/src/scss/pages/my-account.scss +0 -1
  113. package/src/scss/pages/page_checkout_delivery-new.scss +1 -2
  114. package/src/scss/pages/page_paint-mixing-error.scss +1 -1
  115. package/src/scss/partials/_header.scss +0 -35
  116. package/src/scss/partials/_main-nav.scss +11 -6
  117. package/src/sitemap.html +78 -49
  118. package/build/css/my-account-main-v2.css +0 -1
  119. package/build/css/pages/my-account-v2.css +0 -1
  120. package/build/css/pages/page_default-store.css +0 -1
  121. package/build/css/pages/page_personal-details.css +0 -1
  122. package/build/js/default-store.min.js +0 -1
  123. package/build/js/my-account.min.js +0 -1
  124. package/build/js/page/default-store.js +0 -44
  125. package/build/js/page/my-account.js +0 -51
  126. package/build/js/page/personal-details.js +0 -286
  127. package/build/js/personal-details.min.js +0 -1
  128. package/src/components/banner-news.hbs +0 -8
  129. package/src/components/default-store/current-store.hbs +0 -60
  130. package/src/components/default-store/list-of-store.hbs +0 -39
  131. package/src/components/default-store/store-form.hbs +0 -29
  132. package/src/components/default-store/store-unavailable.hbs +0 -4
  133. package/src/components/my-account/active-orders/consignment-info.hbs +0 -11
  134. package/src/components/my-account/active-orders/header.hbs +0 -4
  135. package/src/components/my-account/active-orders/list-orders.hbs +0 -9
  136. package/src/components/my-account/active-orders/order-details.hbs +0 -18
  137. package/src/components/my-account/active-orders/order-header.hbs +0 -7
  138. package/src/components/my-account/active-orders/order.hbs +0 -20
  139. package/src/components/my-account/active-orders/shipment-detail.hbs +0 -13
  140. package/src/components/my-account/barcode.hbs +0 -17
  141. package/src/components/my-account/clipboard-code-card.hbs +0 -16
  142. package/src/components/my-account/contact-us.hbs +0 -23
  143. package/src/components/my-account/discount.hbs +0 -11
  144. package/src/components/my-account/greetings.hbs +0 -7
  145. package/src/components/my-account/leave-modal.hbs +0 -13
  146. package/src/components/my-account/menu-items.hbs +0 -25
  147. package/src/components/my-account/mobile-nav.hbs +0 -46
  148. package/src/components/my-account/personal-details-form.hbs +0 -29
  149. package/src/components/my-account/personal-details.hbs +0 -14
  150. package/src/components/my-account/user-account-actions.hbs +0 -18
  151. package/src/components/user-information-field.hbs +0 -4
  152. package/src/data/data_calendar.json +0 -149
  153. package/src/data/my-account/data_my-account.json +0 -469
  154. package/src/data/my-account/data_personal-details.json +0 -204
  155. package/src/data/my-account/page_default-store.json +0 -158
  156. package/src/js/components/leave-event-v2.js +0 -0
  157. package/src/js/emulation/default-store.js +0 -97
  158. package/src/js/emulation/personal-details-local.js +0 -73
  159. package/src/js/page/default-store.js +0 -44
  160. package/src/js/page/my-account.js +0 -51
  161. package/src/js/page/personal-details.js +0 -286
  162. package/src/layouts/my-account-v2.hbs +0 -27
  163. package/src/page_checkout_next-day-delivery-details.html +0 -161
  164. package/src/page_checkout_payment-details_with-card-loader.html +0 -56
  165. package/src/page_default-store-page-empty.html +0 -48
  166. package/src/page_default-store-page.html +0 -55
  167. package/src/page_my-account-installer.html +0 -93
  168. package/src/page_my-account-trade-pro.html +0 -91
  169. package/src/page_personal-details-installer.html +0 -62
  170. package/src/page_personal-details.html +0 -60
  171. package/src/scss/components/my-account/_consignment-info.scss +0 -46
  172. package/src/scss/components/my-account/_contacts.scss +0 -116
  173. package/src/scss/components/my-account/_menu.scss +0 -215
  174. package/src/scss/components/my-account/_mobile-nav.scss +0 -130
  175. package/src/scss/components/my-account/_order.scss +0 -112
  176. package/src/scss/components/my-account/_shipment.scss +0 -93
  177. package/src/scss/my-account-main-v2.scss +0 -32
  178. package/src/scss/pages/my-account-v2.scss +0 -570
  179. package/src/scss/pages/page_default-store.scss +0 -634
  180. package/src/scss/pages/page_personal-details.scss +0 -281
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "wickes-css2",
3
- "version": "2.94.0-develop.6",
3
+ "version": "2.94.0-ic-298-mega-nav.1",
4
4
  "description": "CSS and JS and page templates in use by Wickes",
5
5
  "main": "index.js",
6
6
  "scripts": {
@@ -1,15 +1,15 @@
1
- <div class="actions-bar {{this.mod}}">
1
+ <div class="actions-bar {{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}} {{this.mod}}"
5
+ class="btn btn_full {{#if isPrimary}}btn-primary{{/if}} {{#if isSecondary}}btn-secondary{{/if}} {{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}} {{this.mod}}"
12
+ class="btn btn_full {{#if isPrimary}}btn-primary{{/if}} {{#if isSecondary}}btn-secondary{{/if}} {{mod}}"
13
13
  {{#if toggle-modal}}
14
14
  data-toggle="modal"
15
15
  data-target="{{target}}"
@@ -17,9 +17,6 @@
17
17
  {{#if close-modal}}
18
18
  data-dismiss="modal"
19
19
  {{/if}}
20
- {{#if data-action}}
21
- data-action="{{data-action}}"
22
- {{/if}}
23
20
  >
24
21
  {{title}}
25
22
  </button>
@@ -1,4 +1,4 @@
1
- <div class="aside-nav2__wrapper {{mod}}" {{#if active-index}}data-active-index="{{active-index}}"{{/if}}>
1
+ <div class="aside-nav2__wrapper" {{#if active-index}}data-active-index="{{active-index}}"{{/if}}>
2
2
  <div class="aside-nav2">
3
3
  <div class="aside-holder">
4
4
  {{#each aside-list2}}
@@ -0,0 +1,3 @@
1
+ <div class="calendar__row_extended calendar__row_extended-hide">
2
+ {{> delivery-types-v2}}
3
+ </div>
@@ -0,0 +1,3 @@
1
+ <div class="calendar__row_extended calendar__row_extended-hide">
2
+ {{> delivery-types}}
3
+ </div>
@@ -0,0 +1,106 @@
1
+ <div class="date-selection {{#if hidden}}date-selection-hidden{{/if}}">
2
+ <div class="date-selection__inner">
3
+ <div class="delivery-date">
4
+ <div class="calendar">
5
+ {{> delivery-selection mobile=true}}
6
+ <div class="calendar__head {{#if wisdom}}calendar__head-wisdom{{/if}}">
7
+ <div class="calendar__month">February</div>
8
+ {{#if wisdom}}
9
+ {{#if latest}}
10
+ <div class="calendar__switch calendar__switch-latest">
11
+ Later Dates <i class="calendar__switch-icon far fa-chevron-right"></i>
12
+ </div>
13
+ {{/if}}
14
+ {{#if earlier}}
15
+ <div class="calendar__switch calendar__switch-earlier">
16
+ <i class="calendar__switch-icon far fa-chevron-left"></i> Earlier Dates
17
+ </div>
18
+ {{/if}}
19
+ {{/if}}
20
+ </div>
21
+ <div class="calendar__grid">
22
+ <div class="calendar__row calendar__row_names">
23
+ <span class="calendar__cell calendar__cell_head">S</span>
24
+ <span class="calendar__cell calendar__cell_head">M</span>
25
+ <span class="calendar__cell calendar__cell_head">T</span>
26
+ <span class="calendar__cell calendar__cell_head">W</span>
27
+ <span class="calendar__cell calendar__cell_head">T</span>
28
+ <span class="calendar__cell calendar__cell_head">F</span>
29
+ <span class="calendar__cell calendar__cell_head">S</span>
30
+ </div>
31
+ <div class="calendar__row">
32
+ <div class="calendar__row_days">
33
+ <span class="calendar__cell calendar__cell_cnt calendar__cell_inactive">25</span>
34
+ <span class="calendar__cell calendar__cell_cnt calendar__cell_inactive">26</span>
35
+ <span class="calendar__cell calendar__cell_cnt calendar__cell_inactive">27</span>
36
+ <span class="calendar__cell calendar__cell_cnt calendar__cell_inactive">28</span>
37
+ <span class="calendar__cell calendar__cell_cnt">1</span>
38
+ <span class="calendar__cell calendar__cell_cnt">2</span>
39
+ <span class="calendar__cell calendar__cell_cnt">3</span>
40
+ </div>
41
+ {{> calendar-time-table-v2}}
42
+ </div>
43
+ <div class="calendar__row">
44
+ <div class="calendar__row_days">
45
+ <span class="calendar__cell calendar__cell_cnt">4</span>
46
+ <span class="calendar__cell calendar__cell_cnt">5</span>
47
+ <span class="calendar__cell calendar__cell_cnt">6</span>
48
+ <span class="calendar__cell calendar__cell_cnt">7</span>
49
+ <span class="calendar__cell calendar__cell_cnt">8</span>
50
+ <span class="calendar__cell calendar__cell_cnt">9</span>
51
+ <span class="calendar__cell calendar__cell_cnt">10</span>
52
+ </div>
53
+ {{> calendar-time-table-v2}}
54
+ </div>
55
+ <div class="calendar__row">
56
+ <div class="calendar__row_days">
57
+ <span class="calendar__cell calendar__cell_cnt">11</span>
58
+ <span class="calendar__cell calendar__cell_cnt">12</span>
59
+ <span class="calendar__cell calendar__cell_cnt">13</span>
60
+ <span class="calendar__cell calendar__cell_cnt">14</span>
61
+ <span class="calendar__cell calendar__cell_cnt">15</span>
62
+ <span class="calendar__cell calendar__cell_cnt">16</span>
63
+ <span class="calendar__cell calendar__cell_cnt">17</span>
64
+ </div>
65
+ {{> calendar-time-table-v2}}
66
+ </div>
67
+ <div class="calendar__row">
68
+ <div class="calendar__row_days">
69
+ <span class="calendar__cell calendar__cell_cnt">18</span>
70
+ <span class="calendar__cell calendar__cell_cnt">19</span>
71
+ <span class="calendar__cell calendar__cell_cnt">20</span>
72
+ <span class="calendar__cell calendar__cell_cnt">21</span>
73
+ <span class="calendar__cell calendar__cell_cnt">22</span>
74
+ <span class="calendar__cell calendar__cell_cnt">23</span>
75
+ <span class="calendar__cell calendar__cell_cnt">24</span>
76
+ </div>
77
+ {{> calendar-time-table-v2}}
78
+ </div>
79
+ {{#unless wisdom}}
80
+ <div class="calendar__row">
81
+ <div class="calendar__row_days">
82
+ <span class="calendar__cell calendar__cell_cnt">25</span>
83
+ <span class="calendar__cell calendar__cell_cnt">26</span>
84
+ <span class="calendar__cell calendar__cell_cnt">27</span>
85
+ <span class="calendar__cell calendar__cell_cnt">28</span>
86
+ <span class="calendar__cell calendar__cell_cnt">29</span>
87
+ <span class="calendar__cell calendar__cell_cnt">30</span>
88
+ <span class="calendar__cell calendar__cell_cnt">31</span>
89
+ </div>
90
+ {{> calendar-time-table-v2}}
91
+ </div>
92
+ {{/unless}}
93
+ </div>
94
+ {{#if calendar-message}}
95
+ <div class="calendar__message">
96
+ <span>Our delivery slots are currently available up to 7 days in advance.</span>
97
+ <span>We release additional delivery slots daily.</span>
98
+ </div>
99
+ {{/if}}
100
+ </div>
101
+ </div>
102
+ <div class="delivery-time">
103
+ {{> delivery-types-v2}}
104
+ </div>
105
+ </div>
106
+ </div>
@@ -1,63 +1,76 @@
1
- <div class="date-selection {{#if hidden}}date-selection-hidden{{/if}}">
1
+ <div class="date-selection">
2
2
  <div class="date-selection__inner">
3
3
  <div class="delivery-date">
4
4
  <div class="calendar">
5
- <div class="calendar__head {{#if wisdom}}calendar__head-wisdom{{/if}}">
6
- <div class="calendar__month">Apr</div>
7
- {{#if wisdom}}
8
- {{#if latest}}
9
- <div class="calendar__switch calendar__switch-latest">
10
- Later Dates <i class="calendar__switch-icon far fa-chevron-right"></i>
11
- </div>
12
- {{/if}}
13
- {{#if earlier}}
14
- <div class="calendar__switch calendar__switch-earlier">
15
- <i class="calendar__switch-icon far fa-chevron-left"></i> Earlier Dates
16
- </div>
17
- {{/if}}
18
- {{/if}}
19
- </div>
5
+ {{> delivery-selection mobile=true}}
6
+ <div class="calendar__month">March / April 2018</div>
20
7
  <div class="calendar__grid">
21
- <div class="calendar__row calendar__row_names">
22
- {{#each day_calendar}}
23
- <span class="calendar__cell calendar__cell_head">{{this}}</span>
24
- {{/each}}
25
- </div>
26
- {{#each calendar}}
27
- {{#if (eq (mod @index 7) 0)}}
28
- <div class="calendar__row">
8
+ <div class="calendar__row calendar__row_names">
9
+ <span class="calendar__cell calendar__cell_head">Tue</span>
10
+ <span class="calendar__cell calendar__cell_head">Wed</span>
11
+ <span class="calendar__cell calendar__cell_head">Thu</span>
12
+ <span class="calendar__cell calendar__cell_head">Fri</span>
13
+ <span class="calendar__cell calendar__cell_head">Sat</span>
14
+ <span class="calendar__cell calendar__cell_head">Sun</span>
15
+ <span class="calendar__cell calendar__cell_head">Mon</span>
16
+ </div>
17
+ <div class="calendar__row">
29
18
  <div class="calendar__row_days">
30
- {{/if}}
31
- <span class="calendar__cell calendar__cell_cnt{{#if isInactive}} calendar__cell_inactive{{/if}}">{{day}}</span>
32
- {{#if (eq (mod_inc @index 7) 0)}}
19
+ <span class="calendar__cell calendar__cell_cnt calendar__cell_inactive">13</span>
20
+ <span class="calendar__cell calendar__cell_cnt">14</span>
21
+ <span class="calendar__cell calendar__cell_cnt">15</span>
22
+ <span class="calendar__cell calendar__cell_cnt">16</span>
23
+ <span class="calendar__cell calendar__cell_cnt calendar__cell_inactive">17</span>
24
+ <span class="calendar__cell calendar__cell_cnt">18</span>
25
+ <span class="calendar__cell calendar__cell_cnt">19</span>
33
26
  </div>
34
- </div>
35
- {{/if}}
36
- {{/each}}
37
- {{#unless wisdom}}
27
+ {{> calendar-time-table}}
28
+ </div>
38
29
  <div class="calendar__row">
39
30
  <div class="calendar__row_days">
40
- {{#each extraDays}}
41
- <span class="calendar__cell calendar__cell_cnt">{{ day }}</span>
42
- {{/each}}
31
+ <span class="calendar__cell calendar__cell_cnt">20</span>
32
+ <span class="calendar__cell calendar__cell_cnt">21</span>
33
+ <span class="calendar__cell calendar__cell_cnt">22</span>
34
+ <span class="calendar__cell calendar__cell_cnt">23</span>
35
+ <span class="calendar__cell calendar__cell_cnt calendar__cell_inactive">24</span>
36
+ <span class="calendar__cell calendar__cell_cnt">25</span>
37
+ <span class="calendar__cell calendar__cell_cnt">26</span>
43
38
  </div>
39
+ {{> calendar-time-table}}
44
40
  </div>
45
- {{/unless}}
46
- </div>
47
- {{#if calendar-message}}
48
- <div class="calendar__message">
49
- <span>Our delivery slots are currently available up to 7 days in advance.</span>
50
- <span>We release additional delivery slots daily.</span>
41
+ <div class="calendar__row">
42
+ <div class="calendar__row_days">
43
+ <span class="calendar__cell calendar__cell_cnt">27</span>
44
+ <span class="calendar__cell calendar__cell_cnt">28</span>
45
+ <span class="calendar__cell calendar__cell_cnt">29</span>
46
+ <span class="calendar__cell calendar__cell_cnt">30</span>
47
+ <span class="calendar__cell calendar__cell_cnt calendar__cell_inactive">31</span>
48
+ <span class="calendar__cell calendar__cell_cnt">1</span>
49
+ <span class="calendar__cell calendar__cell_cnt">2</span>
50
+ </div>
51
+ {{> calendar-time-table}}
51
52
  </div>
52
- {{/if}}
53
+ <div class="calendar__row">
54
+ <div class="calendar__row_days">
55
+ <span class="calendar__cell calendar__cell_cnt">3</span>
56
+ <span class="calendar__cell calendar__cell_cnt">4</span>
57
+ <span class="calendar__cell calendar__cell_cnt">5</span>
58
+ <span class="calendar__cell calendar__cell_cnt">6</span>
59
+ <span class="calendar__cell calendar__cell_cnt calendar__cell_inactive">7</span>
60
+ <span class="calendar__cell calendar__cell_cnt">8</span>
61
+ <span class="calendar__cell calendar__cell_cnt">9</span>
62
+ </div>
63
+ {{> calendar-time-table}}
64
+ </div>
65
+ </div>
53
66
  </div>
54
67
  </div>
55
68
  <div class="delivery-time">
56
- {{> delivery-types
57
- title=titleDelivery
58
- subtitle=subtitleDelivery
59
- classImg=imgDelivery
60
- }}
69
+ <div class="delivery-time__no-selection">
70
+ Please select a delivery date to choose appropriate delivery time
71
+ </div>
72
+ {{> delivery-types}}
73
+ {{> delivery-selection}}
61
74
  </div>
62
75
  </div>
63
76
  </div>
@@ -0,0 +1,11 @@
1
+ <div class="delivery-selection {{#if mobile}}delivery-selection-mobile {{/if}}">
2
+ <span class="delivery-selection__caption">Your products will be delivered:</span>
3
+ <span class="delivery-selection__date">Thu 15 March 2018</span>
4
+ <span class="delivery-selection__time">8am - 6pm</span>
5
+
6
+ <div class="delivery-selection__show-calendar">
7
+ <a href="#" class="delivery-selection__show-calendar-link">
8
+ Change the date and time
9
+ </a>
10
+ </div>
11
+ </div>
@@ -0,0 +1,17 @@
1
+ <div class="delivery-types">
2
+ <div class="delivery-types__inner delivery-types-wrap">
3
+ <button class="btn btn_full btn_large delivery-type__action-btn-primary">
4
+ <span class="btn__text">7am - 7pm - <b>Free</b></span>
5
+ </button>
6
+
7
+ <button class="btn btn-secondary btn_full btn_large">
8
+ <span class="btn__text">7am - 12pm - <b>£5.00</b></span>
9
+ </button>
10
+ </div>
11
+
12
+ <div class="delivery-time__show-calendar">
13
+ <a href="#" class="delivery-time__show-calendar-link">
14
+ Change the date and time
15
+ </a>
16
+ </div>
17
+ </div>
@@ -1,21 +1,41 @@
1
1
  <div class="delivery-types">
2
- <div class="delivery-types__inner delivery-container">
3
- <button class="btn btn_full delivery-btn">
4
- {{#if title}}
5
- <span class="delivery-btn__content">
6
- <span class="title">{{title}}</span>
7
- <span class="subtitle">{{subtitle}}</span>
8
- </span>
9
- {{#if classImg}}
10
- <span class="delivery-btn__image">
11
- <i class="{{classImg}}"></i>
12
- </span>
13
- {{/if}}
14
- {{else}}
15
- <span class="delivery-btn__content">
16
- <span class="title">7am - 7pm - Free</span>
17
- </span>
18
- {{/if}}
2
+ <div class="delivery-types__accordion">
3
+ <i class="fas fa-angle-up"></i>
4
+ </div>
5
+ <div class="delivery-types__inner" data-simplebar="init">
6
+ <div class="delivery-types__date">
7
+ Wed 04 Mar 2020
8
+ </div>
9
+ <div class="delivery-type">
10
+ <div class="delivery-types__name">
11
+ Standard delivery
12
+ {{> info-icon title="Standard delivery" data-placement="top" }}
13
+ </div>
14
+ <div class="delivery-types__error">
15
+ Please select an appropriate delivery time.
16
+ </div>
17
+ <ul class="delivery-types__slots">
18
+ <li class="delivery-types__slot">
19
+ {{> radiobutton label="8:00am - 12:00pm" name="radio-slot" id="radio-standard"}}
20
+ <span class="delivery-types__cost">£7.95</span>
21
+ </li>
22
+ <li class="delivery-types__slot">
23
+ {{> radiobutton label="8:00am - 6:00pm" name="radio-slot" id="radio-standard"}}
24
+ <span class="delivery-types__cost">Free</span>
25
+ </li>
26
+ <li class="delivery-types__slot">
27
+ {{> radiobutton label="8:00am - 12:00pm" name="radio-slot" id="radio-standard"}}
28
+ <span class="delivery-types__cost">£7.95</span>
29
+ </li>
30
+ </ul>
31
+ </div>
32
+ </div>
33
+ <button class="btn btn-secondary btn_full delivery-types__confirm">
34
+ <span class="btn__text">Confirm</span>
19
35
  </button>
20
- </div>
36
+ <div class="delivery-time__show-calendar">
37
+ <a href="#" class="delivery-time__show-calendar-link">
38
+ Change the date and time
39
+ </a>
40
+ </div>
21
41
  </div>
@@ -0,0 +1,33 @@
1
+ <ul>
2
+ {{#each subMenuItems}}
3
+ <li class="main-nav__sub-menu__item nav-col">
4
+ <a
5
+ href="{{ url }}"
6
+ class="main-nav__sub-menu__link main-nav__sub-sub-menu__link-last
7
+ {{#if color}}main-nav__sub-menu__link--invert {{/if}}
8
+ {{#ifCond color '==' "GREEN"}}green{{/ifCond}}
9
+ {{#ifCond color '==' "RED"}}red{{/ifCond}}
10
+ "
11
+ tabindex="0"
12
+ style="
13
+ {{#ifCond color '==' "GREEN"}}background-color: #9acd32; color: #fff;{{/ifCond}}
14
+ {{#ifCond color '==' "RED"}}background-color: #cf000f; color: #fff;{{/ifCond}}
15
+ {{#if bold}}font-weight: 700;{{/if}}
16
+ "
17
+ >
18
+ {{ name }}
19
+ </a>
20
+ </li>
21
+ {{/each }}
22
+ {{#if originalChildrenCount}}
23
+ {{#ifCond originalChildrenCount '!=' subMenuItems.length }}
24
+ <a
25
+ href="{{ menuItemUrl }}"
26
+ class="main-nav__sub-menu__link main-nav__sub-menu__view-more"
27
+ tabindex="0"
28
+ >
29
+ View More
30
+ </a>
31
+ {{/ifCond}}
32
+ {{/if}}
33
+ </ul>
@@ -0,0 +1,32 @@
1
+ {{#each navigation}}
2
+ <ul class="main-nav__top-level">
3
+ {{#each children}}
4
+ <li class="main-nav__top-level__item">
5
+ <a
6
+ href="{{ url }}"
7
+ class="main-nav__top-level__label
8
+ {{#if color}}main-nav__top-level__label--invert {{/if}}
9
+ {{#ifCond color '==' "GREEN"}}green{{/ifCond}}
10
+ {{#ifCond color '==' "RED"}}red{{/ifCond}}
11
+ "
12
+ tabindex="0"
13
+ style="
14
+ {{#ifCond color '==' "GREEN"}}background-color: #9acd32; color: #fff;{{/ifCond}}
15
+ {{#ifCond color '==' "RED"}}background-color: #cf000f; color: #fff;{{/ifCond}}
16
+ {{#if bold}}font-weight: 700;{{/if}}
17
+ "
18
+ >
19
+ {{ name }}
20
+ </a>
21
+ <div class="main-nav__menu-wrapper">
22
+ {{#if banner}}
23
+ <div class="main-nav__menu-banner">
24
+ {{{banner}}}
25
+ </div>
26
+ {{/if}}
27
+ {{> navigation/menu-item menuItems=children}}
28
+ </div>
29
+ </li>
30
+ {{/each}}
31
+ </ul>
32
+ {{/each}}
@@ -0,0 +1,32 @@
1
+ <ul class="main-nav__menu">
2
+ {{#each menuItems}}
3
+ <li class="main-nav__menu__item nav-col">
4
+ <a
5
+ href="{{ url }}"
6
+ class="main-nav__menu__label
7
+ {{#if color}}main-nav__menu__label--invert {{/if}}
8
+ {{#ifCond color '==' "GREEN"}}green{{/ifCond}}
9
+ {{#ifCond color '==' "RED"}}red{{/ifCond}}
10
+ "
11
+ tabindex="0"
12
+ style="
13
+ {{#ifCond color '==' "GREEN"}}background-color: #9acd32; color: #fff;{{/ifCond}}
14
+ {{#ifCond color '==' "RED"}}background-color: #cf000f; color: #fff;{{/ifCond}}
15
+ {{#if bold}}font-weight: 700;{{/if}}
16
+ "
17
+ >
18
+ {{ name }}
19
+ </a>
20
+ <div class="main-nav__sub-menu__wrapper" tabindex="0">
21
+ <div class="main-nav__sub-menu">
22
+ {{> navigation/menu-item-sub subMenuItems=children originalChildrenCount=originalChildrenCount menuItemUrl=url}}
23
+ <div class="main-nav__view-all">
24
+ <a href="{{ url }}" class="main-nav__view-all__link" tabindex="0">
25
+ View all {{ name }}
26
+ </a>
27
+ </div>
28
+ </div>
29
+ </div>
30
+ </li>
31
+ {{/each}}
32
+ </ul>
@@ -0,0 +1,12 @@
1
+ <div class="main-nav__section main-nav__section_main">
2
+ <div class="main-nav__back-btn__wrap">
3
+ <a href="#" class="main-nav__back-btn">
4
+ <span class="icon">
5
+ <i class="fas fa-arrow-left fa-lg"></i>
6
+ </span>
7
+ </a>
8
+ </div>
9
+ <div class="main-nav__top-level-wrap">
10
+ {{> navigation/menu-item-top }}
11
+ </div>
12
+ </div>
@@ -66,30 +66,28 @@
66
66
  </table>
67
67
  </div>
68
68
  {{#unless defStore}}
69
- {{#if specialOpeningTimes}}
70
69
  <div class="s-details__open">
71
- <p class="s-details__open_title">
72
- Special opening times
73
- </p>
74
- <table class="s-details__table s-details__table_special">
75
- {{#each specialOpeningTimes}}
76
- <tr class="s-details__table_row" >
77
- <td class="s-details__table_cell">
78
- {{name}}
79
- </td>
80
- <td class="s-details__table_cell s-details__table_time" rowspan="2">
81
- {{time}}
82
- </td>
83
- </tr>
84
- <tr class="s-details__table_row s-details__table_day">
85
- <td class="s-details__table_cell">
86
- {{day}}
87
- </td>
88
- </tr>
89
- {{/each}}
90
- </table>
70
+ <p class="s-details__open_title">
71
+ Special opening times
72
+ </p>
73
+ <table class="s-details__table s-details__table_special">
74
+ {{#each specialOpeningTimes}}
75
+ <tr class="s-details__table_row" >
76
+ <td class="s-details__table_cell">
77
+ {{name}}
78
+ </td>
79
+ <td class="s-details__table_cell s-details__table_time" rowspan="2">
80
+ {{time}}
81
+ </td>
82
+ </tr>
83
+ <tr class="s-details__table_row s-details__table_day">
84
+ <td class="s-details__table_cell">
85
+ {{day}}
86
+ </td>
87
+ </tr>
88
+ {{/each}}
89
+ </table>
91
90
  </div>
92
- {{/if}}
93
91
  {{/unless}}
94
92
  </div>
95
93
  </div>
@@ -26,6 +26,17 @@
26
26
  {{ address }}
27
27
  </div>
28
28
  {{/if}}
29
+ <div class="store__act">
30
+ <span class="icon store__marker">
31
+ <i class="far fa-map-marker-alt"></i>
32
+ </span>
33
+ <span class="icon store__tick">
34
+ <i class="far fa-check"></i>
35
+ </span>
36
+ <a href="#" class="store-state">
37
+ Make this your default store
38
+ </a>
39
+ </div>
29
40
  </div>
30
41
  <div class="store__details">
31
42
  <div class="store__dist">
@@ -191,7 +191,6 @@
191
191
  <div class="content">
192
192
  {{#with page_order-details.lines.[0]}}
193
193
  {{>order-line}}
194
-
195
194
  {{/with}}
196
195
  </div>
197
196
  </div>
@@ -40,6 +40,28 @@
40
40
  "day": "Friday",
41
41
  "time": "07:00 - 18:00"
42
42
  }
43
+ ],
44
+ "specialOpeningTimes": [
45
+ {
46
+ "name": "Good Friday",
47
+ "day": "Fri 10 Apr",
48
+ "time": "6.30 - 21.00"
49
+ },
50
+ {
51
+ "name": "Saturday",
52
+ "day": "Sat 11 Apr",
53
+ "time": "6.30 - 21.00"
54
+ },
55
+ {
56
+ "name": "Easter Sunday",
57
+ "day": "Sun 12 Apr",
58
+ "time": "CLOSED"
59
+ },
60
+ {
61
+ "name": "Easter Monday",
62
+ "day": "Mon 13 Apr",
63
+ "time": "06.30 - 21.00"
64
+ }
43
65
  ]
44
66
  },
45
67
  {
@@ -142,10 +142,6 @@
142
142
  "classModifier": "notification_error",
143
143
  "text": "Sorry, we can't deliver to your area",
144
144
  "error": true
145
- },
146
- "info-message": {
147
- "classModifier": "notification_info-message",
148
- "text": "The discount is automatically applied to all prices"
149
145
  }
150
146
  }
151
147
  }