wickes-css2 2.94.0-develop.5 → 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.
- package/Readme.md +1 -1
- package/build/css/category-main.css +1 -1
- package/build/css/emulation.css +1 -1
- package/build/css/homepage-main.css +1 -1
- package/build/css/main.css +1 -1
- package/build/css/my-account-main.css +1 -1
- package/build/css/pages/checkout-new.css +1 -1
- package/build/css/pages/checkout.css +1 -1
- package/build/css/pages/my-account.css +1 -1
- package/build/css/pages/page_checkout_delivery-new.css +1 -1
- package/build/css/pages/page_product-details-v2-critical.css +1 -1
- package/build/css/pages/page_product-details-v2.css +1 -1
- package/build/css/pages/page_shopping-cart-v2.css +1 -1
- package/build/css/pdp-main-before-combine.css +1 -1
- package/build/css/pdp-main-critical.css +1 -1
- package/build/css/pdp-main-non-critical.css +1 -1
- package/build/css/pdp-main.css +1 -1
- package/build/css/plp-main.css +1 -1
- package/build/css/store-locator-main.css +1 -1
- package/build/img/placeholders/discount-sm-15.jpg +0 -0
- package/build/img/placeholders/discount-sm.png +0 -0
- package/build/js/account-members.min.js +1 -1
- package/build/js/basket.min.js +1 -1
- package/build/js/bundle.min.js +1 -1
- package/build/js/checkout.min.js +1 -1
- package/build/js/emulation.min.js +30 -177
- package/build/js/general.bundle.min.js +1 -1
- package/build/js/merged-checkout.min.js +1 -1
- package/build/js/page/plp-load-more.js +0 -1
- package/build/js/pdp.bundle.min.js +1 -1
- package/build/js/plp.bundle.min.js +1 -1
- package/build/js/project-list.min.js +1 -1
- package/package.json +1 -1
- package/src/components/account-families/actions-bar.hbs +3 -6
- package/src/components/aside-nav2.hbs +1 -1
- package/src/components/calendar-time-table-v2.hbs +3 -0
- package/src/components/calendar-time-table.hbs +3 -0
- package/src/components/date-selection-v2.hbs +106 -0
- package/src/components/date-selection.hbs +59 -46
- package/src/components/delivery-selection.hbs +11 -0
- package/src/components/delivery-types-v2.hbs +17 -0
- package/src/components/delivery-types.hbs +38 -18
- package/src/components/navigation/menu-item-sub.hbs +33 -0
- package/src/components/navigation/menu-item-top.hbs +32 -0
- package/src/components/navigation/menu-item.hbs +32 -0
- package/src/components/navigation/nav-wrapper.hbs +12 -0
- package/src/components/store-details.hbs +20 -22
- package/src/components/store-preview.hbs +11 -0
- package/src/components.html +0 -1
- package/src/data/data_big-wins-stores.json +22 -0
- package/src/data/data_notification-page.json +0 -4
- package/src/data/navigation.json +854 -0
- package/src/elements/dropdown.hbs +5 -16
- package/src/elements/form-row.hbs +1 -1
- package/src/elements/input.hbs +2 -2
- package/src/img/placeholders/discount-sm-15.jpg +0 -0
- package/src/img/placeholders/discount-sm.png +0 -0
- package/src/js/components/date-selection.js +20 -6
- package/src/js/components/general/main-nav.js +23 -14
- package/src/js/components/general/switchVat.js +1 -27
- package/src/js/components/leave-event.js +5 -51
- package/src/js/emulation/big-wins.js +2 -0
- package/src/js/emulation/date-selection.js +21 -0
- package/src/js/emulation/forms.js +1 -1
- package/src/js/emulation/main-nav-local.js +6 -4
- package/src/js/page/plp-load-more.js +0 -1
- package/src/layouts/my-account.hbs +1 -1
- package/src/page_checkout_delivery-address.html +70 -0
- package/src/page_checkout_delivery-details-ASM.html +251 -0
- package/src/page_checkout_delivery-details-oos-partially.html +215 -0
- package/src/page_checkout_delivery-details-oos.html +232 -0
- package/src/page_checkout_delivery-details-v2-asm.html +3 -3
- package/src/page_checkout_delivery-details-v2-calendar-message.html +1 -1
- package/src/page_checkout_delivery-details-v2-oos.html +1 -1
- package/src/page_checkout_delivery-details-v2-wisdom-not-available.html +2 -2
- package/src/page_checkout_delivery-details-v2-wisdom.html +2 -2
- package/src/{page_checkout_rapid-delivery-details.html → page_checkout_delivery-details-v2.html} +3 -14
- package/src/page_checkout_delivery-details-with-loader-v2.html +1 -1
- package/src/page_checkout_delivery-details-with-loader.html +220 -0
- package/src/page_checkout_delivery-details.html +221 -0
- package/src/page_checkout_delivery-details_guest-new.html +1 -1
- package/src/page_checkout_delivery-details_guest.html +198 -0
- package/src/page_discount_installer.html +1 -7
- package/src/page_marketing-preferences.html +1 -7
- package/src/page_my-account.html +59 -56
- package/src/page_my-account_address-book.html +2 -8
- package/src/page_my-account_order-history.html +3 -8
- package/src/page_my-account_personal-details.html +1 -7
- package/src/page_old-navigation.html +10 -0
- package/src/page_tradePro_delivery-details.html +243 -0
- package/src/page_tradePro_discount.html +2 -8
- package/src/page_tradePro_rewards.html +1 -7
- package/src/page_wismo-order-history-loadmore.html +3 -3
- package/src/partials/breadcrumbs.hbs +8 -27
- package/src/partials/head.hbs +1 -5
- package/src/partials/header.hbs +49 -68
- package/src/partials/main-nav.hbs +15 -19
- package/src/scss/components/_aside-nav2.scss +0 -18
- package/src/scss/components/_big-wins-critical.scss +1 -0
- package/src/scss/components/_big-wins.scss +8 -1
- package/src/scss/components/_date-selection-add-new-styles.scss +19 -78
- package/src/scss/components/_date-selection.scss +215 -30
- package/src/scss/components/_order-item-cc.scss +6 -0
- package/src/scss/emulation.scss +24 -0
- package/src/scss/helpers/_variables.scss +1 -3
- package/src/scss/pages/_my-account_new.scss +12 -1
- package/src/scss/pages/checkout-new.scss +0 -51
- package/src/scss/pages/my-account.scss +0 -1
- package/src/scss/pages/page_checkout_delivery-new.scss +1 -2
- package/src/scss/pages/page_paint-mixing-error.scss +1 -1
- package/src/scss/partials/_header.scss +0 -35
- package/src/scss/partials/_main-nav.scss +11 -6
- package/src/sitemap.html +78 -47
- package/build/css/my-account-main-v2.css +0 -1
- package/build/css/pages/my-account-v2.css +0 -1
- package/build/css/pages/page_default-store.css +0 -1
- package/build/css/pages/page_personal-details.css +0 -1
- package/build/js/default-store.min.js +0 -1
- package/build/js/my-account.min.js +0 -1
- package/build/js/page/default-store.js +0 -44
- package/build/js/page/my-account.js +0 -51
- package/build/js/page/personal-details.js +0 -286
- package/build/js/personal-details.min.js +0 -1
- package/src/components/banner-news.hbs +0 -8
- package/src/components/default-store/current-store.hbs +0 -60
- package/src/components/default-store/list-of-store.hbs +0 -39
- package/src/components/default-store/store-form.hbs +0 -29
- package/src/components/default-store/store-unavailable.hbs +0 -4
- package/src/components/my-account/active-orders/consignment-info.hbs +0 -11
- package/src/components/my-account/active-orders/header.hbs +0 -4
- package/src/components/my-account/active-orders/list-orders.hbs +0 -9
- package/src/components/my-account/active-orders/order-details.hbs +0 -18
- package/src/components/my-account/active-orders/order-header.hbs +0 -7
- package/src/components/my-account/active-orders/order.hbs +0 -20
- package/src/components/my-account/active-orders/shipment-detail.hbs +0 -13
- package/src/components/my-account/barcode.hbs +0 -17
- package/src/components/my-account/clipboard-code-card.hbs +0 -16
- package/src/components/my-account/contact-us.hbs +0 -23
- package/src/components/my-account/discount.hbs +0 -11
- package/src/components/my-account/greetings.hbs +0 -7
- package/src/components/my-account/leave-modal.hbs +0 -13
- package/src/components/my-account/menu-items.hbs +0 -25
- package/src/components/my-account/mobile-nav.hbs +0 -46
- package/src/components/my-account/personal-details-form.hbs +0 -29
- package/src/components/my-account/personal-details.hbs +0 -14
- package/src/components/my-account/user-account-actions.hbs +0 -18
- package/src/components/user-information-field.hbs +0 -4
- package/src/data/data_calendar.json +0 -149
- package/src/data/my-account/data_my-account.json +0 -469
- package/src/data/my-account/data_personal-details.json +0 -204
- package/src/data/my-account/page_default-store.json +0 -158
- package/src/js/components/leave-event-v2.js +0 -0
- package/src/js/emulation/default-store.js +0 -97
- package/src/js/emulation/personal-details-local.js +0 -73
- package/src/js/page/default-store.js +0 -44
- package/src/js/page/my-account.js +0 -51
- package/src/js/page/personal-details.js +0 -286
- package/src/layouts/my-account-v2.hbs +0 -27
- package/src/page_checkout_next-day-delivery-details.html +0 -161
- package/src/page_default-store-page-empty.html +0 -48
- package/src/page_default-store-page.html +0 -55
- package/src/page_my-account-installer.html +0 -93
- package/src/page_my-account-trade-pro.html +0 -91
- package/src/page_personal-details-installer.html +0 -62
- package/src/page_personal-details.html +0 -60
- package/src/scss/components/my-account/_consignment-info.scss +0 -46
- package/src/scss/components/my-account/_contacts.scss +0 -116
- package/src/scss/components/my-account/_menu.scss +0 -215
- package/src/scss/components/my-account/_mobile-nav.scss +0 -130
- package/src/scss/components/my-account/_order.scss +0 -112
- package/src/scss/components/my-account/_shipment.scss +0 -93
- package/src/scss/my-account-main-v2.scss +0 -32
- package/src/scss/pages/my-account-v2.scss +0 -570
- package/src/scss/pages/page_default-store.scss +0 -634
- package/src/scss/pages/page_personal-details.scss +0 -281
|
@@ -0,0 +1,221 @@
|
|
|
1
|
+
{{#extend "checkout" pageClass="page_checkout-delivery-details" title="Checkout - Delivery details" logout=true isAsideSticky="true"}}
|
|
2
|
+
{{#content "steps"}}
|
|
3
|
+
{{> steps active-step-index="2" }}
|
|
4
|
+
<div class="checkout-heading">
|
|
5
|
+
<h3>Products delivered by Wickes</h3>
|
|
6
|
+
<div class="checkout-heading__info-block">
|
|
7
|
+
<div class="checkout-heading__descr">
|
|
8
|
+
<p class="checkout-heading__paragraph">
|
|
9
|
+
Please choose a date for delivery from the calendar below
|
|
10
|
+
</p>
|
|
11
|
+
</div>
|
|
12
|
+
</div>
|
|
13
|
+
</div>
|
|
14
|
+
{{/content}}
|
|
15
|
+
{{#content "main"}}
|
|
16
|
+
<div class="component component-date-selection">
|
|
17
|
+
{{> date-selection}}
|
|
18
|
+
</div>
|
|
19
|
+
<a href="./page_checkout_payment-details.html" class="btn btn-action delivery-details__payment-details_mobile">Continue
|
|
20
|
+
to payment details
|
|
21
|
+
<span class="icon">
|
|
22
|
+
<i class="fas fa-arrow-right"></i>
|
|
23
|
+
</span>
|
|
24
|
+
</a>
|
|
25
|
+
{{> checkout_delivery modal="modal-edit-delivery-address" }}
|
|
26
|
+
{{#extend "lines-group" name="Products delivered by Wickes" id=136589003 collapsed=false}}
|
|
27
|
+
{{#content "content"}}
|
|
28
|
+
{{#each page_shopping-cart.linesCollection}}
|
|
29
|
+
{{>order-line mod="order-line_shrink" calculator-notification=true}}
|
|
30
|
+
{{/each}}
|
|
31
|
+
{{/content}}
|
|
32
|
+
{{/extend}}
|
|
33
|
+
|
|
34
|
+
|
|
35
|
+
<div class="delivery-details-option">
|
|
36
|
+
{{>checkout-supply-info checkout-components.supply-info.[0]}}
|
|
37
|
+
</div>
|
|
38
|
+
|
|
39
|
+
{{#extend "lines-group" name="Products delivered by our supplier expected within 7 working days" id=136589004 collapsed=false}}
|
|
40
|
+
{{#content "content"}}
|
|
41
|
+
{{#each page_shopping-cart.linesCollection}}
|
|
42
|
+
{{>order-line mod="order-line_shrink"}}
|
|
43
|
+
{{/each}}
|
|
44
|
+
{{/content}}
|
|
45
|
+
{{/extend}}
|
|
46
|
+
|
|
47
|
+
{{#extend "lines-group" name="Products delivered by our supplier expected within 14 working days" id=136589005 collapsed=false}}
|
|
48
|
+
{{#content "content"}}
|
|
49
|
+
{{#each page_shopping-cart.linesCollection}}
|
|
50
|
+
{{>order-line mod="order-line_shrink"}}
|
|
51
|
+
{{/each}}
|
|
52
|
+
{{/content}}
|
|
53
|
+
{{/extend}}
|
|
54
|
+
|
|
55
|
+
{{#extend "lines-group" name="Products delivered by our supplier expected within 21 working days" id=136589006 collapsed=false}}
|
|
56
|
+
{{#content "content"}}
|
|
57
|
+
{{#each page_shopping-cart.linesCollection}}
|
|
58
|
+
{{>order-line mod="order-line_shrink"}}
|
|
59
|
+
{{/each}}
|
|
60
|
+
{{/content}}
|
|
61
|
+
{{/extend}}
|
|
62
|
+
|
|
63
|
+
|
|
64
|
+
<div class="delivery-details-option__contact-details">
|
|
65
|
+
{{>checkout-supply-info checkout-components.supply-info.[1]}}
|
|
66
|
+
<form class="form-wrapper your-contact-details form-bg">
|
|
67
|
+
<div class="your-contact-details__row">
|
|
68
|
+
<div class="your-contact-details__descr">
|
|
69
|
+
<h3>Your contact details</h3>
|
|
70
|
+
<p>Please enter your phone number(s) below so we can contact you regarding your order.</p>
|
|
71
|
+
<div class="warning-required">
|
|
72
|
+
Required fields
|
|
73
|
+
</div>
|
|
74
|
+
{{> form-row type="tel" id="mobile" label="Mobile phone" required="true"}}
|
|
75
|
+
{{> form-row type="tel" id="home-phone" label="Home phone" row-mod="row-tel"}}
|
|
76
|
+
<h3>Simplify your collection</h3>
|
|
77
|
+
<p>All the Click & Collect items in your order are currently available at the following stores. Select
|
|
78
|
+
one of the store to collect all your items from the same location.
|
|
79
|
+
</p>
|
|
80
|
+
<div class="your-contact-details__checkbox-wrap">
|
|
81
|
+
<div class="your-contact-details__checkbox">
|
|
82
|
+
{{#extend "radiobutton" id="oldham" name="store" label="Oldham" checked="true"}}
|
|
83
|
+
{{#content "html"}}
|
|
84
|
+
<span class="distance">6.2 Miles</span>
|
|
85
|
+
<div class="store-address">
|
|
86
|
+
<div class="store-address__street">Wickes Larch Street,</div>
|
|
87
|
+
<div class="store-address__town">Oldham</div>
|
|
88
|
+
<div class="store-address__city">Greater Manchester,</div>
|
|
89
|
+
<div class="store-address__postcode">OL8 1TA</div>
|
|
90
|
+
<div class="store-address__country">United Kingdom</div>
|
|
91
|
+
</div>
|
|
92
|
+
{{/content}}
|
|
93
|
+
{{/extend}}
|
|
94
|
+
</div>
|
|
95
|
+
<div class="your-contact-details__checkbox">
|
|
96
|
+
{{#extend "radiobutton" id="clifton" name="store" label="Clifton"}}
|
|
97
|
+
{{#content "html"}}
|
|
98
|
+
<span class="distance">4.9 Miles</span>
|
|
99
|
+
<div class="store-address">
|
|
100
|
+
<div class="store-address__street">Wickes Wynne Avenue,</div>
|
|
101
|
+
<div class="store-address__town"> Clifton, Swinton</div>
|
|
102
|
+
<div class="store-address__city">Greater Manchester,</div>
|
|
103
|
+
<div class="store-address__postcode">M27 8FU</div>
|
|
104
|
+
<div class="store-address__country">United Kingdom</div>
|
|
105
|
+
</div>
|
|
106
|
+
{{/content}}
|
|
107
|
+
{{/extend}}
|
|
108
|
+
</div>
|
|
109
|
+
</div>
|
|
110
|
+
<p class="order-update">I would like to update my order to collect all my items from one store.</p>
|
|
111
|
+
</div>
|
|
112
|
+
</div>
|
|
113
|
+
<div class="form-row form-row__action">
|
|
114
|
+
<div class="form-row__col-btn">
|
|
115
|
+
<button class="btn btn-primary">
|
|
116
|
+
<span class="btn__text">Simplify collection</span>
|
|
117
|
+
</button>
|
|
118
|
+
</div>
|
|
119
|
+
</div>
|
|
120
|
+
</form>
|
|
121
|
+
</div>
|
|
122
|
+
|
|
123
|
+
|
|
124
|
+
<div class="delivery-details-option delivery-details-option_time-slot">
|
|
125
|
+
<h4>Collection from Oldham store <span class="checkout__text-highlighted">1 Item</span></h4>
|
|
126
|
+
<div class="delivery-details-option__delivery-info">
|
|
127
|
+
<div class="delivery-details-option__delivery-info-left">
|
|
128
|
+
{{>checkout-address-time time=true within=true}}
|
|
129
|
+
</div>
|
|
130
|
+
<div class="delivery-details-option__delivery-info-right">
|
|
131
|
+
{{>schedule}}
|
|
132
|
+
</div>
|
|
133
|
+
</div>
|
|
134
|
+
</div>
|
|
135
|
+
|
|
136
|
+
{{#extend "lines-group" name="Products for Click & Collect from Oldham" id=132583005 collapsed=false}}
|
|
137
|
+
{{#content "content"}}
|
|
138
|
+
{{#each page_shopping-cart.linesCollection}}
|
|
139
|
+
{{>order-line mod="order-line_shrink"}}
|
|
140
|
+
{{/each}}
|
|
141
|
+
{{/content}}
|
|
142
|
+
{{/extend}}
|
|
143
|
+
|
|
144
|
+
|
|
145
|
+
<div class="delivery-details-option delivery-details-option_time-slot">
|
|
146
|
+
<h4>Collection from Oldham store <span class="checkout__text-highlighted">1 Item</span></h4>
|
|
147
|
+
<div class="delivery-details-option__delivery-info">
|
|
148
|
+
<div class="delivery-details-option__delivery-info-left">
|
|
149
|
+
{{>checkout-address-time time=true within=true}}
|
|
150
|
+
</div>
|
|
151
|
+
<div class="delivery-details-option__delivery-info-right">
|
|
152
|
+
{{>schedule}}
|
|
153
|
+
</div>
|
|
154
|
+
</div>
|
|
155
|
+
</div>
|
|
156
|
+
|
|
157
|
+
{{#extend "lines-group" name="Products for Click & Collect from Oldham" id=136589506 collapsed=false}}
|
|
158
|
+
{{#content "content"}}
|
|
159
|
+
{{#each page_shopping-cart.linesCollection}}
|
|
160
|
+
{{>order-line mod="order-line_shrink"}}
|
|
161
|
+
{{/each}}
|
|
162
|
+
{{/content}}
|
|
163
|
+
{{/extend}}
|
|
164
|
+
|
|
165
|
+
|
|
166
|
+
<a href="./page_checkout_payment-details.html" class="btn btn-action delivery-details__payment-details">Continue to
|
|
167
|
+
payment details
|
|
168
|
+
<span class="icon">
|
|
169
|
+
<i class="fas fa-arrow-right"></i>
|
|
170
|
+
</span>
|
|
171
|
+
</a>
|
|
172
|
+
|
|
173
|
+
{{/content}}
|
|
174
|
+
{{#content "aside"}}
|
|
175
|
+
{{> checkout_order-summary label="Subtotal: " action='./page_checkout_payment-details.html'}}
|
|
176
|
+
{{> checkout_voucher }}
|
|
177
|
+
{{> checkout_delivery modal="modal-edit-delivery-address" }}
|
|
178
|
+
{{> checkout_supplier-delivery edit="true" }}
|
|
179
|
+
{{> checkout_click-and-collect invisibleForMobile="true" }}
|
|
180
|
+
<a href="./page_checkout_payment-details.html" class="btn btn-action delivery-details__payment-details_mobile">Continue
|
|
181
|
+
to payment details
|
|
182
|
+
<span class="icon">
|
|
183
|
+
<i class="fas fa-arrow-right"></i>
|
|
184
|
+
</span>
|
|
185
|
+
</a>
|
|
186
|
+
{{/content}}
|
|
187
|
+
{{#content "foot" mode="append"}}
|
|
188
|
+
<script defer src="js/page/checkout-edit-address.js"></script>
|
|
189
|
+
|
|
190
|
+
{{#extend "modal" classMod="edit-delivery-address" id="modal-edit-delivery-address" title="Edit delivery address" fullWidth=true}}
|
|
191
|
+
{{#content "body"}}
|
|
192
|
+
<div class="component">
|
|
193
|
+
{{> notifications
|
|
194
|
+
classModifier="notification_warning"
|
|
195
|
+
text="<strong>Please note:</strong> Changing your delivery address may impact our ability
|
|
196
|
+
to deliver your order on the date you have selected.<br/>
|
|
197
|
+
You may have to re-select your delivery date and slot after changing your delivery address."
|
|
198
|
+
warning=true
|
|
199
|
+
}}
|
|
200
|
+
</div>
|
|
201
|
+
{{> user-address-simplified modal="true" editUrl="page_checkout_delivery-address.html" radioName="checkout-edit-delivery-details" mod="js-selectable" isDeleted=false hasRemove=false}}
|
|
202
|
+
<div class="edit-delivery-address__actions row">
|
|
203
|
+
<div class="edit-delivery-address__add-btn">
|
|
204
|
+
<a href="page_checkout_delivery-address.html" class="btn btn-secondary">
|
|
205
|
+
<span class="btn__text">Add new address</span>
|
|
206
|
+
</a>
|
|
207
|
+
</div>
|
|
208
|
+
<div class="edit-delivery-address__delivery-btn">
|
|
209
|
+
<button class="btn btn-action">
|
|
210
|
+
<span class="btn__text">Continue to delivery details</span>
|
|
211
|
+
<span class="icon">
|
|
212
|
+
<i class="fas fa-arrow-right"></i>
|
|
213
|
+
</span>
|
|
214
|
+
</button>
|
|
215
|
+
</div>
|
|
216
|
+
</div>
|
|
217
|
+
{{/content}}
|
|
218
|
+
{{/extend}}
|
|
219
|
+
|
|
220
|
+
{{/content}}
|
|
221
|
+
{{/extend}}
|
|
@@ -0,0 +1,198 @@
|
|
|
1
|
+
{{#extend "checkout" pageClass="page_checkout-delivery-details" title="Checkout - Delivery details - Guest" isAsideSticky="true"}}
|
|
2
|
+
{{#content "steps"}}
|
|
3
|
+
{{> steps active-step-index="2" }}
|
|
4
|
+
<div class="checkout-heading">
|
|
5
|
+
<h3>Products delivered by Wickes</h3>
|
|
6
|
+
</div>
|
|
7
|
+
{{/content}}
|
|
8
|
+
{{#content "main"}}
|
|
9
|
+
<div class="component component-date-selection">
|
|
10
|
+
{{> date-selection}}
|
|
11
|
+
</div>
|
|
12
|
+
<a href="./page_checkout_payment-details.html" class="btn btn-action delivery-details__payment-details_mobile">Continue to Payment details
|
|
13
|
+
<span class="icon">
|
|
14
|
+
<i class="fas fa-arrow-right"></i>
|
|
15
|
+
</span>
|
|
16
|
+
</a>
|
|
17
|
+
{{> checkout_delivery modal="modal-edit-delivery-address" }}
|
|
18
|
+
{{#extend "lines-group" name="Products delivered by Wickes" id=136589003 collapsed=false}}
|
|
19
|
+
{{#content "content"}}
|
|
20
|
+
{{#each page_shopping-cart.linesCollection}}
|
|
21
|
+
{{>order-line mod="order-line_shrink"}}
|
|
22
|
+
{{/each}}
|
|
23
|
+
{{/content}}
|
|
24
|
+
{{/extend}}
|
|
25
|
+
|
|
26
|
+
|
|
27
|
+
<div class="delivery-details-option">
|
|
28
|
+
{{>checkout-supply-info checkout-components.supply-info.[0]}}
|
|
29
|
+
</div>
|
|
30
|
+
{{#extend "lines-group" name="Products delivered by our supplier" id=136589004 collapsed=false}}
|
|
31
|
+
{{#content "content"}}
|
|
32
|
+
{{#each page_shopping-cart.linesCollection}}
|
|
33
|
+
{{>order-line mod="order-line_shrink"}}
|
|
34
|
+
{{/each}}
|
|
35
|
+
{{/content}}
|
|
36
|
+
{{/extend}}
|
|
37
|
+
|
|
38
|
+
|
|
39
|
+
|
|
40
|
+
<div class="delivery-details-option__contact-details">
|
|
41
|
+
{{>checkout-supply-info checkout-components.supply-info.[1]}}
|
|
42
|
+
<form class="form-wrapper your-contact-details form-bg">
|
|
43
|
+
<div class="your-contact-details__row">
|
|
44
|
+
<div class="your-contact-details__descr">
|
|
45
|
+
<h3>Your contact details</h3>
|
|
46
|
+
<p>Please enter your phone number(s) below so we can contact you regarding your order.</p>
|
|
47
|
+
<div class="warning-required">
|
|
48
|
+
Required fields
|
|
49
|
+
</div>
|
|
50
|
+
{{> form-row type="tel" id="mobile" label="Mobile phone" required="true"}}
|
|
51
|
+
{{> form-row type="tel" id="home-phone" label="Home phone" row-mod="row-tel"}}
|
|
52
|
+
<h3>Simplify your collection</h3>
|
|
53
|
+
<p>All the Click & Collect items in your order are currently available at the following stores. Select
|
|
54
|
+
one of the store to collect all your items from the same location.
|
|
55
|
+
</p>
|
|
56
|
+
<div class="your-contact-details__checkbox-wrap">
|
|
57
|
+
<div class="your-contact-details__checkbox">
|
|
58
|
+
{{#extend "radiobutton" id="oldham" name="store" label="Oldham" checked="true"}}
|
|
59
|
+
{{#content "html"}}
|
|
60
|
+
<span class="distance">6.2 Miles</span>
|
|
61
|
+
<div class="store-address">
|
|
62
|
+
<div class="store-address__street">Wickes Larch Street,</div>
|
|
63
|
+
<div class="store-address__town">Oldham</div>
|
|
64
|
+
<div class="store-address__city">Greater Manchester,</div>
|
|
65
|
+
<div class="store-address__postcode">OL8 1TA</div>
|
|
66
|
+
<div class="store-address__country">United Kingdom</div>
|
|
67
|
+
</div>
|
|
68
|
+
{{/content}}
|
|
69
|
+
{{/extend}}
|
|
70
|
+
</div>
|
|
71
|
+
<div class="your-contact-details__checkbox">
|
|
72
|
+
{{#extend "radiobutton" id="clifton" name="store" label="Clifton"}}
|
|
73
|
+
{{#content "html"}}
|
|
74
|
+
<span class="distance">4.9 Miles</span>
|
|
75
|
+
<div class="store-address">
|
|
76
|
+
<div class="store-address__street">Wickes Wynne Avenue,</div>
|
|
77
|
+
<div class="store-address__town"> Clifton, Swinton</div>
|
|
78
|
+
<div class="store-address__city">Greater Manchester,</div>
|
|
79
|
+
<div class="store-address__postcode">M27 8FU</div>
|
|
80
|
+
<div class="store-address__country">United Kingdom</div>
|
|
81
|
+
</div>
|
|
82
|
+
{{/content}}
|
|
83
|
+
{{/extend}}
|
|
84
|
+
</div>
|
|
85
|
+
</div>
|
|
86
|
+
<p class="order-update">I would like to update my order to collect all my items from one store.</p>
|
|
87
|
+
</div>
|
|
88
|
+
</div>
|
|
89
|
+
<div class="form-row form-row__action">
|
|
90
|
+
<div class="form-row__col-btn">
|
|
91
|
+
<button class="btn btn-primary">
|
|
92
|
+
<span class="btn__text">Simplify collection</span>
|
|
93
|
+
</button>
|
|
94
|
+
</div>
|
|
95
|
+
</div>
|
|
96
|
+
</form>
|
|
97
|
+
</div>
|
|
98
|
+
|
|
99
|
+
|
|
100
|
+
|
|
101
|
+
<div class="delivery-details-option delivery-details-option_time-slot">
|
|
102
|
+
<h4>Collection from Oldham store <span class="checkout__text-highlighted">1 Item</span></h4>
|
|
103
|
+
<div class="delivery-details-option__delivery-info">
|
|
104
|
+
<div class="delivery-details-option__delivery-info-left">
|
|
105
|
+
{{>checkout-address-time time=true within=true}}
|
|
106
|
+
</div>
|
|
107
|
+
<div class="delivery-details-option__delivery-info-right">
|
|
108
|
+
{{>schedule}}
|
|
109
|
+
</div>
|
|
110
|
+
</div>
|
|
111
|
+
</div>
|
|
112
|
+
|
|
113
|
+
{{#extend "lines-group" name="Products for Click & Collect from Oldham" id=136589005 collapsed=false}}
|
|
114
|
+
{{#content "content"}}
|
|
115
|
+
{{#each page_shopping-cart.linesCollection}}
|
|
116
|
+
{{>order-line mod="order-line_shrink"}}
|
|
117
|
+
{{/each}}
|
|
118
|
+
{{/content}}
|
|
119
|
+
{{/extend}}
|
|
120
|
+
|
|
121
|
+
|
|
122
|
+
|
|
123
|
+
<div class="delivery-details-option delivery-details-option_time-slot">
|
|
124
|
+
<h4>Collection from Oldham store <span class="checkout__text-highlighted">1 Item</span></h4>
|
|
125
|
+
<div class="delivery-details-option__delivery-info">
|
|
126
|
+
<div class="delivery-details-option__delivery-info-left">
|
|
127
|
+
{{>checkout-address-time time=true within=true}}
|
|
128
|
+
</div>
|
|
129
|
+
<div class="delivery-details-option__delivery-info-right">
|
|
130
|
+
{{>schedule}}
|
|
131
|
+
</div>
|
|
132
|
+
</div>
|
|
133
|
+
</div>
|
|
134
|
+
|
|
135
|
+
{{#extend "lines-group" name="Products for Click & Collect from Oldham" id=136589006 collapsed=false}}
|
|
136
|
+
{{#content "content"}}
|
|
137
|
+
{{#each page_shopping-cart.linesCollection}}
|
|
138
|
+
{{>order-line mod="order-line_shrink"}}
|
|
139
|
+
{{/each}}
|
|
140
|
+
{{/content}}
|
|
141
|
+
{{/extend}}
|
|
142
|
+
|
|
143
|
+
|
|
144
|
+
<a href="./page_checkout_payment-details_guest.html" class="btn btn-action delivery-details__payment-details">Continue to payment details
|
|
145
|
+
<span class="icon">
|
|
146
|
+
<i class="fas fa-arrow-right"></i>
|
|
147
|
+
</span>
|
|
148
|
+
</a>
|
|
149
|
+
|
|
150
|
+
{{/content}}
|
|
151
|
+
{{#content "aside"}}
|
|
152
|
+
{{> checkout_order-summary label="Subtotal: " action='./page_checkout_payment-details_guest.html'}}
|
|
153
|
+
{{> checkout_voucher }}
|
|
154
|
+
{{> checkout_delivery modal="modalDeliveryGuest" }}
|
|
155
|
+
{{> checkout_supplier-delivery edit="true" }}
|
|
156
|
+
{{> checkout_click-and-collect invisibleForMobile="true" }}
|
|
157
|
+
<a href="./page_checkout_payment-details.html" class="btn btn-action delivery-details__payment-details_mobile">Continue to payment details
|
|
158
|
+
<span class="icon">
|
|
159
|
+
<i class="fas fa-arrow-right"></i>
|
|
160
|
+
</span>
|
|
161
|
+
</a>
|
|
162
|
+
{{/content}}
|
|
163
|
+
{{#content "foot" mode="append"}}
|
|
164
|
+
<script defer src="js/page/checkout-edit-address.js"></script>
|
|
165
|
+
|
|
166
|
+
{{#extend "modal" id="modalDeliveryGuest" title="Edit delivery address" fullWidth=true classMod="edit-delivery-addr-guest"}}
|
|
167
|
+
{{#content "sections"}}
|
|
168
|
+
|
|
169
|
+
{{#extend "modal-body-section"}}
|
|
170
|
+
{{#content "body"}}
|
|
171
|
+
<div class="edit-delivery-addr-guest__notifications">
|
|
172
|
+
{{> notifications notification-page.warning-note}}
|
|
173
|
+
</div>
|
|
174
|
+
{{/content}}
|
|
175
|
+
{{/extend}}
|
|
176
|
+
|
|
177
|
+
{{#extend "modal-body-section" customSectionClass="edit-delivery-addr-guest__form"}}
|
|
178
|
+
{{#content "body"}}
|
|
179
|
+
<form class="form-wrapper" id="edit-delivery-address">
|
|
180
|
+
{{> checkout_your-details open-delivery-block="true" uid="cyd3" }}
|
|
181
|
+
<div class="form-row form-row__action">
|
|
182
|
+
<div class="form-row__col-btn">
|
|
183
|
+
<button class="btn btn-action btn_full">
|
|
184
|
+
<span class="btn__text">Continue to delivery details</span>
|
|
185
|
+
<span class="icon">
|
|
186
|
+
<i class="fas fa-arrow-right"></i>
|
|
187
|
+
</span>
|
|
188
|
+
</button>
|
|
189
|
+
</div>
|
|
190
|
+
</div>
|
|
191
|
+
</form>
|
|
192
|
+
{{/content}}
|
|
193
|
+
{{/extend}}
|
|
194
|
+
|
|
195
|
+
{{/content}}
|
|
196
|
+
{{/extend}}
|
|
197
|
+
{{/content}}
|
|
198
|
+
{{/extend}}
|
|
@@ -6,13 +6,7 @@
|
|
|
6
6
|
{{> account-heading title="Installer Discount"}}
|
|
7
7
|
{{/content}}
|
|
8
8
|
{{#content "aside"}}
|
|
9
|
-
|
|
10
|
-
{{> my-account/mobile-nav
|
|
11
|
-
mod="account-nav--old-pages"
|
|
12
|
-
menu=my_account.installer.menu
|
|
13
|
-
active-index=3
|
|
14
|
-
page-name="Installer Discount"
|
|
15
|
-
}}
|
|
9
|
+
{{> aside-nav2 my-account-installer-menu-new active-index="5" page-name="Installer Discount" tradePro="true"}}
|
|
16
10
|
{{/content}}
|
|
17
11
|
{{#content "main"}}
|
|
18
12
|
<div class="page-header">
|
|
@@ -3,13 +3,7 @@
|
|
|
3
3
|
{{> account-heading title="Update Marketing Preferences"}}
|
|
4
4
|
{{/content}}
|
|
5
5
|
{{#content "aside"}}
|
|
6
|
-
|
|
7
|
-
{{> my-account/mobile-nav
|
|
8
|
-
mod="account-nav--old-pages"
|
|
9
|
-
menu=my_account.diy.menu
|
|
10
|
-
active-index=4
|
|
11
|
-
page-name="Marketing Preferences"
|
|
12
|
-
}}
|
|
6
|
+
{{> aside-nav2 my-account-tradePro-menu-new active-index="1" page-name="Update Marketing Preferences" tradePro="true"}}
|
|
13
7
|
{{/content}}
|
|
14
8
|
{{#content "main"}}
|
|
15
9
|
<form action="#" class="form-bg form-personal-details">
|
package/src/page_my-account.html
CHANGED
|
@@ -1,57 +1,60 @@
|
|
|
1
|
-
{{#extend "my-account
|
|
2
|
-
{{#content "
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
1
|
+
{{#extend "my-account" pageClass="page_my-account_your-account" title="My account" pageMyAcc=true}}
|
|
2
|
+
{{#content "heading"}}
|
|
3
|
+
{{> account-heading title="My account"}}
|
|
4
|
+
{{/content}}
|
|
5
|
+
{{#content "aside"}}
|
|
6
|
+
{{> aside-nav2 my-account-menu page-name="My account"}}
|
|
7
|
+
{{/content}}
|
|
8
|
+
{{#content "main"}}
|
|
9
|
+
<div class="my-account">
|
|
10
|
+
<div class="my-account-data">
|
|
11
|
+
<div class="my-account-data__heading">
|
|
12
|
+
<div class="my-account-data__icon">
|
|
13
|
+
<span class="fas fa-user-alt"></span>
|
|
14
|
+
</div>
|
|
15
|
+
<h4>Profile</h4>
|
|
16
|
+
</div>
|
|
17
|
+
<ul class="my-account-data__list">
|
|
18
|
+
<li class="my-account-data__list-item"><a href="./page_my-account_personal-details.html" class="link-secondary">Update personal details</a></li>
|
|
19
|
+
<li class="my-account-data__list-item"><a href="./page_my-account_change-password.html" class="link-secondary">Change your password</a></li>
|
|
20
|
+
</ul>
|
|
21
|
+
</div>
|
|
22
|
+
<div class="my-account-data">
|
|
23
|
+
<div class="my-account-data__heading">
|
|
24
|
+
<div class="my-account-data__icon">
|
|
25
|
+
<span class="fas fa-calendar-edit"></span>
|
|
26
|
+
</div>
|
|
27
|
+
<h4>Order history</h4>
|
|
28
|
+
</div>
|
|
29
|
+
<ul class="my-account-data__list">
|
|
30
|
+
<li class="my-account-data__list-item"><a href="./page_my-account_order-history.html" class="link-secondary">View order history</a></li>
|
|
31
|
+
<li class="my-account-data__list-item"><a href="./page_shopping-cart.html" class="link-secondary">View your basket</a></li>
|
|
32
|
+
</ul>
|
|
33
|
+
</div>
|
|
34
|
+
<div class="my-account-data">
|
|
35
|
+
<div class="my-account-data__heading">
|
|
36
|
+
<div class="my-account-data__icon">
|
|
37
|
+
<span class="fas fa-credit-card-front"></span>
|
|
38
|
+
</div>
|
|
39
|
+
<h4>Payment details</h4>
|
|
40
|
+
</div>
|
|
41
|
+
<ul class="my-account-data__list">
|
|
42
|
+
<li class="my-account-data__list-item"><a href="./page_my-account_payment-details.html" class="link-secondary">Manage your payment details</a></li>
|
|
43
|
+
<li class="my-account-data__list-item"><a href="./page_my-account_payment-details.html" class="link-secondary">Set default payment details</a></li>
|
|
44
|
+
</ul>
|
|
45
|
+
</div>
|
|
46
|
+
<div class="my-account-data">
|
|
47
|
+
<div class="my-account-data__heading">
|
|
48
|
+
<div class="my-account-data__icon">
|
|
49
|
+
<span class="fas fa-book"></span>
|
|
50
|
+
</div>
|
|
51
|
+
<h4>Address book</h4>
|
|
52
|
+
</div>
|
|
53
|
+
<ul class="my-account-data__list">
|
|
54
|
+
<li class="my-account-data__list-item"><a href="./page_my-account_address-book.html" class="link-secondary">Manage your delivery address</a></li>
|
|
55
|
+
<li class="my-account-data__list-item"><a href="./page_my-account_address-book.html" class="link-secondary">Set default delivery address</a></li>
|
|
56
|
+
</ul>
|
|
57
|
+
</div>
|
|
11
58
|
</div>
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
<div class="account-summary">
|
|
16
|
-
<div class="container">
|
|
17
|
-
<div class="row">
|
|
18
|
-
<div class="col-12">
|
|
19
|
-
<div class="account-summary__wrapper">
|
|
20
|
-
{{> my-account/greetings
|
|
21
|
-
name=my_account.user.name
|
|
22
|
-
subtitle=my_account.user.email
|
|
23
|
-
}}
|
|
24
|
-
</div>
|
|
25
|
-
{{> my-account/active-orders/list-orders
|
|
26
|
-
title=my_account.diy.activeOrders.sectionTitle
|
|
27
|
-
linkText='View all orders'
|
|
28
|
-
orders=my_account.diy.activeOrders.orderList
|
|
29
|
-
}}
|
|
30
|
-
</div>
|
|
31
|
-
</div>
|
|
32
|
-
</div>
|
|
33
|
-
</div>
|
|
34
|
-
<div class="container">
|
|
35
|
-
<div class="row">
|
|
36
|
-
<div class="col-12">
|
|
37
|
-
{{> my-account/menu-items
|
|
38
|
-
items=my_account.diy.menu
|
|
39
|
-
}}
|
|
40
|
-
</div>
|
|
41
|
-
</div>
|
|
42
|
-
</div>
|
|
43
|
-
<div class="account-actions">
|
|
44
|
-
<div class="container">
|
|
45
|
-
<div class="row">
|
|
46
|
-
<div class="col-12">
|
|
47
|
-
{{> my-account/user-account-actions mod="d-sm-none"}}
|
|
48
|
-
{{> my-account/contact-us contacts=my_account.contacts }}
|
|
49
|
-
</div>
|
|
50
|
-
</div>
|
|
51
|
-
</div>
|
|
52
|
-
</div>
|
|
53
|
-
{{/content}}
|
|
54
|
-
{{#content "foot" mode="append"}}
|
|
55
|
-
<script defer src="./js/my-account.min.js"></script>
|
|
56
|
-
{{/content}}
|
|
57
|
-
{{/extend}}
|
|
59
|
+
{{/content}}
|
|
60
|
+
{{/extend}}
|
|
@@ -3,13 +3,7 @@
|
|
|
3
3
|
{{> account-heading title="Address book" subtitle="Manage your address book" btnLink="page_my-account_address-details.html" btnTitle="Add new address"}}
|
|
4
4
|
{{/content}}
|
|
5
5
|
{{#content "aside"}}
|
|
6
|
-
{{> aside-nav2 my-account-menu active-index="4" page-name="Address book"
|
|
7
|
-
{{> my-account/mobile-nav
|
|
8
|
-
mod="account-nav--old-pages"
|
|
9
|
-
menu=my_account.diy.menu
|
|
10
|
-
active-index=3
|
|
11
|
-
page-name="Address Book"
|
|
12
|
-
}}
|
|
6
|
+
{{> aside-nav2 my-account-menu active-index="4" page-name="Address book"}}
|
|
13
7
|
{{/content}}
|
|
14
8
|
{{#content "main"}}
|
|
15
9
|
|
|
@@ -24,4 +18,4 @@
|
|
|
24
18
|
</div>
|
|
25
19
|
|
|
26
20
|
{{/content}}
|
|
27
|
-
{{/extend}}
|
|
21
|
+
{{/extend}}
|
|
@@ -1,17 +1,12 @@
|
|
|
1
|
-
{{#extend "my-account" pageClass="" title="Order history"
|
|
1
|
+
{{#extend "my-account" pageClass="" title="Order history" pageMyAcc=true}}
|
|
2
2
|
{{#content "heading"}}
|
|
3
3
|
{{> account-heading title="Order History"}}
|
|
4
4
|
{{/content}}
|
|
5
5
|
{{#content "aside"}}
|
|
6
|
-
{{> aside-nav2 my-account-menu active-index="6" page-name="Order History"
|
|
7
|
-
{{> my-account/mobile-nav
|
|
8
|
-
mod="account-nav--old-pages"
|
|
9
|
-
menu=my_account.diy.menu
|
|
10
|
-
active-index=1
|
|
11
|
-
page-name="My Orders"
|
|
12
|
-
}}
|
|
6
|
+
{{> aside-nav2 my-account-menu active-index="6" page-name="Order History"}}
|
|
13
7
|
{{/content}}
|
|
14
8
|
{{#content "main"}}
|
|
9
|
+
|
|
15
10
|
{{> form-row row-mod="sort-order-by" dropdown="true" label="Sort orders by" id="d1" placeholder="Date"}}
|
|
16
11
|
{{#each page_my-account_order-history.orders }}
|
|
17
12
|
{{> table_order-history }}
|
|
@@ -4,13 +4,7 @@
|
|
|
4
4
|
{{> account-heading title="Update Personal Details"}}
|
|
5
5
|
{{/content}}
|
|
6
6
|
{{#content "aside"}}
|
|
7
|
-
{{> aside-nav2 my-account-menu active-index="0" page-name="Update Personal Details"
|
|
8
|
-
{{> my-account/mobile-nav
|
|
9
|
-
mod="account-nav--old-pages"
|
|
10
|
-
menu=my_account.diy.menu
|
|
11
|
-
active-index=2
|
|
12
|
-
page-name="Personal Details"
|
|
13
|
-
}}
|
|
7
|
+
{{> aside-nav2 my-account-menu active-index="0" page-name="Update Personal Details"}}
|
|
14
8
|
{{/content}}
|
|
15
9
|
{{#content "main"}}
|
|
16
10
|
<form action="#" class="form-bg form-personal-details">
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
{{#extend "base" pageClass="" title="Old navigation" oldNav=true hideBreadcrumbs=true pageBasket=true}}
|
|
2
|
+
{{#content "body"}}
|
|
3
|
+
<main>
|
|
4
|
+
<div class="container">
|
|
5
|
+
<h1 class="page-header__title">That example old navigation</h1>
|
|
6
|
+
<p class="page-header__intro">Must be skeleton and after loading navigation</p>
|
|
7
|
+
</div>
|
|
8
|
+
</main>
|
|
9
|
+
{{/content}}
|
|
10
|
+
{{/extend}}
|