wickes-css2 2.117.0-develop.2 → 2.117.0-develop.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wickes-css2",
-  "version": "2.117.0-develop.2",
+  "version": "2.117.0-develop.3",
   "description": "CSS and JS and page templates in use by Wickes",
   "main": "index.js",
   "scripts": {

package/src/js/emulation/forms.js

@@ -346,22 +346,6 @@ Wick.Forms = (function () {
         }
 
         let requiredFields;
-        if ($(form).is('#form-checkout-your-details')) {
-            requiredFields = $(form).find('[data-row-required]:visible :input');
-            if (_.every(requiredFields, isNotEmpty)) {
-                window.location.href = $(form).attr('data-action');
-                return false;
-            }
-        }
-
-        if ($(form).is('#checkout-your-details-modal')) {
-            requiredFields = $(form).find('[data-row-required]:visible :input');
-            if (_.every(requiredFields, isNotEmpty)) {
-                $('#modalDeliveryEdit').modal('hide');
-                return false;
-            }
-        }
-
         if ($(form).is('#edit-delivery-address')) {
             requiredFields = $(form).find('[data-row-required]:visible :input');
             if (_.every(requiredFields, isNotEmpty)) {

package/src/page_checkout_confirmation.html

@@ -1,53 +1,8 @@
 {{#extend "checkout" pageClass="page_checkout page_checkout page_checkout-confirmation" title="Checkout - Confirmation"
 logout=true}}
-{{#content "steps"}}
-<div class="page-header">
-    <h1 class="page-header__title">Thank You, Your Order Has Been Placed</h1>
-    <p class="page-header__order-number">Order number: <span class="page-header__order-number_strong">143402004</span>
-    </p>
-    <p class="page-header__intro">We have emailed your order confirmation to <a href="#">michael.michael@gmail.com</a>
-        with details of when your order will be delivered.
-        This email will also contain our contact details should you wish to get in touch with us.</p>
-</div>
-
-<div class="col-12">
-    <h3>Products delivered by Wickes</h3>
-    <p>The product listed below will be delivered to you by Wickes. The date, time slot and address for this delivery
-        are
-        listed below:</p>
-</div>
-{{/content}}
 {{#content "main"}}
 
 <div class="product-delivery-table">
-    <div class="product-delivery-table__delivery-info">
-        <div class="row">
-            <div class="product-delivery-table__date">
-                <h4>Delivery date</h4>
-                <div class="product-delivery-table__date-inner">
-                    <div class="checkout-address-time__time-regular">MAR</div>
-                    <div class="checkout-address-time__time-primary">15</div>
-                    <div class="checkout-address-time__time-additional">8:00am - 6:00pm</div>
-                </div>
-            </div>
-            <div class="product-delivery-table__time">
-                <h4>Delivery time</h4>
-                <div class="product-delivery-table__content">
-                    8:00am - 6:00pm
-                </div>
-            </div>
-            <div class="product-delivery-table__address">
-                <h4>Delivery address</h4>
-                <div class="product-delivery-table__content">
-                    459 Acasia way<br/>
-                    Wimbledon<br/>
-                    London<br/>
-                    S7 7ET
-                </div>
-            </div>
-        </div>
-    </div>
-
     <div class="shopping-card-container">
         {{#each page_confirmation.linesCollection}}
         {{>order-line mod="order-line_shrink" calculator-notification=true}}
@@ -55,12 +10,6 @@ logout=true}}
     </div>
 </div>
 
-<div class="col-12">
-    <h3>Supplier delivered products</h3>
-    <p>The following products will be delivered by our suppliers. They will be contacting you to arrange a delivery
-        date.</p>
-</div>
-
 <div class="product-delivery-table product-supplier-delivery">
     <div class="shopping-card-container">
         {{#each page_confirmation.linesCollection}}
@@ -97,13 +46,11 @@ logout=true}}
         {{/each}}
     </div>
 </div>
-<a href="./" class="btn btn-secondary checkout-continue-shopping">Return to shopping</a>
 {{/content}}
 {{#content "aside"}}
 {{> checkout_order-summary label="Total: "}}
 {{> checkout_payment }}
 {{> checkout_information }}
 
-<a href="./" class="btn btn-secondary checkout-continue-shopping_mobile">Return to shopping</a>
 {{/content}}
 {{/extend}}

package/src/page_checkout_confirmation_paypal.html

@@ -1,53 +1,8 @@
 {{#extend "checkout" pageClass="page_checkout page_checkout page_checkout-confirmation" title="Checkout - Confirmation"
 logout=true}}
-{{#content "steps"}}
-<div class="page-header">
-    <h1 class="page-header__title">Thank You, Your Order Has Been Placed</h1>
-    <p class="page-header__order-number">Order number: <span class="page-header__order-number_strong">143402004</span>
-    </p>
-    <p class="page-header__intro">We have emailed your order confirmation to michael.michael@gmail.com
-        with details of when your order will be delivered.
-        This email will also contain our contact details should you wish to get in touch with us.</p>
-</div>
-
-<div class="col-12">
-    <h3>Products delivered by Wickes</h3>
-    <p>The product listed below will be delivered to you by Wickes. The date, time slot and address for this delivery
-        are
-        listed below:</p>
-</div>
-{{/content}}
 {{#content "main"}}
 
 <div class="product-delivery-table">
-    <div class="product-delivery-table__delivery-info">
-        <div class="row">
-            <div class="product-delivery-table__date">
-                <h4>Delivery date</h4>
-                <div class="product-delivery-table__date-inner">
-                    <div class="checkout-address-time__time-regular">MAR</div>
-                    <div class="checkout-address-time__time-primary">15</div>
-                    <div class="checkout-address-time__time-additional">8:00am - 6:00pm</div>
-                </div>
-            </div>
-            <div class="product-delivery-table__time">
-                <h4>Delivery time</h4>
-                <div class="product-delivery-table__content">
-                    8:00am - 6:00pm
-                </div>
-            </div>
-            <div class="product-delivery-table__address">
-                <h4>Delivery address</h4>
-                <div class="product-delivery-table__content">
-                    459 Acasia way<br/>
-                    Wimbledon<br/>
-                    London<br/>
-                    S7 7ET
-                </div>
-            </div>
-        </div>
-    </div>
-
     <div class="shopping-card-container">
         {{#each page_confirmation.linesCollection}}
         {{>order-line mod="order-line_shrink"}}
@@ -55,12 +10,6 @@ logout=true}}
     </div>
 </div>
 
-<div class="col-12">
-    <h3>Supplier delivered products</h3>
-    <p>The following products will be delivered by our suppliers. They will be contacting you to arrange a delivery
-        date.</p>
-</div>
-
 <div class="product-delivery-table product-supplier-delivery">
     <div class="shopping-card-container">
         {{#each page_confirmation.linesCollection}}
@@ -90,13 +39,11 @@ logout=true}}
     </div>
     {{/each}}
 </div>
-<a href="./" class="btn btn-secondary checkout-continue-shopping">Return to shopping</a>
 {{/content}}
 {{#content "aside"}}
 {{> checkout_order-summary label="Total: "}}
 {{> checkout_payment-other-methods }}
 {{> checkout_information }}
 
-<a href="./" class="btn btn-secondary checkout-continue-shopping_mobile">Return to shopping</a>
 {{/content}}
 {{/extend}}

package/src/page_checkout_delivery-address-ASM.html

@@ -1,77 +1,8 @@
 {{#extend "checkout" pageClass="page_checkout-delivery-details page_checkout-delivery-details_asm" title="Checkout - Delivery address ASM" logout=true isAsideSticky="true"}}
-{{#content "steps"}}
-{{> steps active-step-index="1" }}
-{{/content}}
-{{#content "main"}}
-<div class="delivery-address">
-    <div data-addresses>
-        <div class="user-address js-selectable js-selectable_selected">
-            <div class="row">
-                <div class="user-address__content">
-                    <div class="selected-address">
-                        {{> radiobutton label="Use this delivery address" name="r1" id="r1" checked="true"}}
-                    </div>
-                    <div class="row">
-                        <div class="user-address__address">
-                            Mr John Smith <br>29 Acacia Road <br>London <br>N7 3BM <br>United Kingdom
-                        </div>
-                        <div class="user-address__phone">
-                            07834 678 234
-                        </div>
-                    </div>
-                </div>
-
-                <div class="user-address__actions">
-                    <button class="btn btn-secondary btn-remove-address">
-                    <span class="btn__text">
-                        <span class="fas fa-trash"></span>
-                        Remove</span>
-                    </button>
-
-                    <a href class="btn btn-secondary" data-toggle="modal" data-target="#modalDeliveryEdit">
-                        <span class="icon"><span class="fas fa-edit"></span></span>
-                        <span class="btn__text">Edit</span>
-                    </a>
 
-                    <div class="default-mark-full">
-                        Default
-                    </div>
-                </div>
-            </div>
-        </div>
-
-    </div>
-    <div data-new-address style="display: none;">
-        <div class="delivery-address__btn-back">
-            <a href="#" class="link-primary btn-back-to-addresses">Back to choose address</a>
-        </div>
-        <form class="form-wrapper delivery-address-form" id="form-checkout-your-details" data-action="./page_checkout_delivery-details.html">
-            <div class="delivery-address-form__inner">
-                {{> checkout_your-details uid="cyd1" address-list=true}}
-                <div class="form-row form-row__action">
-                    <div class="form-row__col-btn">
-                        <button class="btn btn-action btn_full">
-                            <span class="btn__text">Delivery details</span>
-                        </button>
-                    </div>
-                </div>
-            </div>
-        </form>
-    </div>
-</div>
-<div>
-    <a href="#" class="btn-new-address">Add new address</a>
-</div>
-<a href="./page_checkout_delivery-details.html" class="btn_full btn btn-action checkout-widget__outer-button btn-delivery-details">Continue to delivery details
-    <span class="icon">
-        <i class="fas fa-arrow-right"></i>
-    </span>
-</a>
-{{/content}}
 {{#content "aside"}}
 {{> checkout_order-summary label="Subtotal: "}}
 {{> email-widget }}
-{{> checkout_voucher voucherApplied=true}}
 {{/content}}
 {{#content "foot" mode="append"}}
 <script defer src="js/page/checkout-delivery-address.js"></script>
@@ -80,18 +11,6 @@
 {{#content "sections"}}
 
 {{#extend "modal-body-section" customSectionClass="edit-delivery-addr-guest__form"}}
-{{#content "body"}}
-<form class="form-wrapper" id="checkout-your-details-modal">
-    {{> checkout_your-details open-delivery-block="true" uid="cyd2"}}
-    <div class="form-row form-row__action">
-        <div class="form-row__col-btn">
-            <button class="btn btn-primary btn_full">
-                <span class="btn__text">Save address</span>
-            </button>
-        </div>
-    </div>
-</form>
-{{/content}}
 {{/extend}}
 
 {{/content}}

package/src/page_checkout_delivery-details-v2-asm.html

@@ -1,6 +1,6 @@
 {{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout-confirmation-new page_checkout" title="Checkout - Delivery details" isAsideSticky="true"}}
 {{#content "steps"}}
-{{> steps active-step-index="2" }}
+{{> steps-three-steps active-step-index="2" }}
 {{/content}}
 
   {{#content "head" mode="append"}}

package/src/page_checkout_delivery-details-v2-calendar-message.html

@@ -1,6 +1,6 @@
 {{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout-confirmation-new page_checkout" title="Checkout - Delivery details" isAsideSticky="true"}}
 {{#content "steps"}}
-{{> steps active-step-index="2" }}
+{{> steps-three-steps active-step-index="2" }}
 {{/content}}
 
   {{#content "head" mode="append"}}

package/src/page_checkout_delivery-details-v2-oos.html

@@ -6,7 +6,7 @@
 {{/content}}
 
 {{#content "steps"}}
-{{> steps active-step-index="2" }}
+{{> steps-three-steps active-step-index="2" }}
 {{/content}}
 
 

package/src/page_checkout_delivery-details-v2-wisdom-not-available.html

@@ -1,6 +1,6 @@
 {{#extend "checkout-new" pageClass="page_checkout-delivery-new page_checkout-confirmation-new page_checkout" title="Checkout - Delivery details" isAsideSticky="true"}}
 {{#content "steps"}}
-{{> steps active-step-index="2" }}
+{{> steps-three-steps active-step-index="2" }}
 {{/content}}
 
   {{#content "head" mode="append"}}

package/src/page_checkout_delivery-details-v2-wisdom.html

@@ -1,6 +1,6 @@
 {{#extend "checkout-new" pageClass="page_checkout-delivery-new page_checkout-confirmation-new page_checkout" title="Checkout - Delivery details" isAsideSticky="true" clearPayIcon=true}}
 {{#content "steps"}}
-{{> steps active-step-index="2" }}
+{{> steps-three-steps active-step-index="2" }}
 {{/content}}
 
   {{#content "head" mode="append"}}

package/src/page_checkout_delivery-details-with-loader-v2.html

@@ -2,7 +2,7 @@
 
 {{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout-confirmation-new page_checkout" title="Checkout - Delivery details" isAsideSticky="true"}}
 {{#content "steps"}}
-{{> steps active-step-index="2" }}
+{{> steps-three-steps active-step-index="2" }}
 {{/content}}
 
   {{#content "head" mode="append"}}

package/src/page_checkout_delivery-details_guest-new.html

@@ -1,6 +1,6 @@
 {{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout page_checkout-confirmation-new" title="Checkout - Delivery details Guest" isAsideSticky="true"}}
 {{#content "steps"}}
-{{> steps active-step-index="2" }}
+{{> steps-three-steps active-step-index="2" }}
 {{/content}}
 
   {{#content "head" mode="append"}}

package/src/page_checkout_payment-details-ASM.html

@@ -1,7 +1,4 @@
 {{#extend "checkout" pageClass="page_checkout-payment-details page_checkout-payment-details_asm" title="Checkout - Payment Details" logout=true isAsideSticky="true" big-and-bulky-tooltip=true}}
-  {{#content "steps"}}
-    {{> steps active-step-index="3" }}
-  {{/content}}
 
   {{#content "main"}}
     {{> checkout-payment-details }}
@@ -16,13 +13,9 @@
   {{#content "aside"}}
     {{> checkout_order-summary label="Total: "}}
     {{> email-widget }}
-    {{> checkout_delivery }}
-    {{> checkout_supplier-delivery }}
-    {{> checkout_click-and-collect }}
   {{/content}}
   {{#content "foot" mode="append"}}
     <script defer src="./js/page/checkout-payment-details.js"></script>
     {{> checkout-terms-and-conditions-modal }}
-    {{> checkout-edit-billing-address-modal }}
   {{/content}}
 {{/extend}}

package/src/page_checkout_payment-details-v2-asm.html

@@ -1,6 +1,6 @@
 {{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout-confirmation-new" title="Checkout - Payment details" isAsideSticky="true" checkout=true}}
 {{#content "steps"}}
-{{> steps active-step-index="3" }}
+{{> steps-three-steps active-step-index="3" }}
 {{/content}}
 
   {{#content "head" mode="append"}}
@@ -20,7 +20,7 @@
         <h3 class="delivery-block__heading">Delivery Information</h3>
         <div class="delivery-block__wrapper">
             {{#with checkoutOrder.deliveryPayments.[0]}}
-                <div class="checkout-order">        
+                <div class="checkout-order">
                     {{> checkout-order-block}}
                 </div>
             {{/with}}
@@ -31,7 +31,7 @@
         <h3 class="click-collect-block__heading">Click & Collect</h3>
         <div class="click-collect-block__wrapper">
           {{#with checkoutOrder.clickCollectDeliveryAddress.[0]}}
-            <div class="checkout-order">        
+            <div class="checkout-order">
                 {{> checkout-order-block}}
             </div>
           {{/with}}

package/src/page_checkout_payment-details_guest-BPS.html

@@ -5,7 +5,7 @@
   {{/content}}
 
   {{#content "steps"}}
-    {{> steps active-step-index="3" }}
+    {{> steps-three-steps active-step-index="3" }}
   {{/content}}
 
   {{#content "main"}}
@@ -20,9 +20,6 @@
   {{/content}}
   {{#content "aside"}}
       {{> checkout_order-summary label="Total: "}}
-      {{> checkout_delivery }}
-      {{> checkout_supplier-delivery }}
-      {{> checkout_click-and-collect }}
   {{/content}}
   {{#content "foot" mode="append"}}
     <script defer src="./js/page/checkout-payment-details.js"></script>

package/src/page_checkout_payment-details_guest-click-collect-icon.html

@@ -15,9 +15,6 @@
   {{/content}}
   {{#content "aside"}}
       {{> checkout_order-summary label="Total: "}}
-      {{> checkout_delivery }}
-      {{> checkout_supplier-delivery }}
-      {{> checkout_click-and-collect }}
   {{/content}}
   {{#content "foot" mode="append"}}
 {{> checkout-voucher-remove-modal

package/src/page_checkout_payment-details_guest.html

@@ -1,7 +1,4 @@
 {{#extend "checkout" pageClass="page_checkout-payment-details_guest" title="Checkout - Payment Details - Guest" isAsideSticky="true"}}
-  {{#content "steps"}}
-    {{> steps active-step-index="3" }}
-  {{/content}}
 
   {{#content "main"}}
     {{> checkout-payment-details_guest }}
@@ -15,9 +12,6 @@
   {{/content}}
   {{#content "aside"}}
       {{> checkout_order-summary label="Total: "}}
-      {{> checkout_delivery }}
-      {{> checkout_supplier-delivery }}
-      {{> checkout_click-and-collect }}
   {{/content}}
   {{#content "foot" mode="append"}}
     <script defer src="./js/page/checkout-payment-details.js"></script>

package/src/page_checkout_payment-details_with-loader.html

@@ -1,7 +1,4 @@
 {{#extend "checkout" pageClass="page_checkout-payment-details" title="Checkout - Payment Details" logout=true isAsideSticky="true"}}
-  {{#content "steps"}}
-    {{> steps active-step-index="3" }}
-  {{/content}}
 
   {{#content "main"}}
     {{> checkout-payment-details }}
@@ -15,14 +12,10 @@
   {{/content}}
   {{#content "aside"}}
     {{> checkout_order-summary label="Total: "}}
-    {{> checkout_delivery }}
-    {{> checkout_supplier-delivery }}
-    {{> checkout_click-and-collect }}
   {{/content}}
   {{#content "foot" mode="append"}}
     <script defer src="./js/page/checkout-payment-details.js"></script>
     {{> checkout-terms-and-conditions-modal }}
-    {{> checkout-edit-billing-address-modal }}
     {{> payment-loader paypal-logo="true"}}
   {{/content}}
 {{/extend}}

package/src/page_in-store_MVP_order-summary-submitted.html

@@ -1,18 +1,6 @@
 {{#extend "instore-checkout" pageClass="in-store_order-summary-sub checkout-summary" title="In Store Checkout" logout=true isAsideSticky="true"}}
-{{#content "head" mode="append"}}
-<link type="text/css" rel="stylesheet" href="./css/pages/page_in-store_MVP_order-summary-submitted.css">
-{{/content}}
-{{#content "steps"}}
-{{> steps active-step-index="3" }}
-{{/content}}
 
 {{#content "main"}}
-<div class="page-header form-bg">
-  <h1 class="page-header__title">Please proceed to the till & make payment for your order</h1>
-  <p class="page-header__next-steps"><strong>Next steps:</strong> Once payment has been made, you will receive and itemised till receipt, and an order
-    confirmation email including the delivery information will be sent to <a href="#">example@gmail.com</a>
-  </p>
-</div>
 {{#extend "lines-group" name="Products delivered by Wickes" collapsed=true}}
   {{#content "content"}}
     {{#each page_shopping-cart.linesCollection}}
@@ -31,8 +19,4 @@
 {{#content "aside"}}
 {{> checkout_order-summary label="Subtotal: " submit=true }}
 {{/content}}
-{{#content "foot" mode="append"}}
-{{> in-store-terms-and-conditions-modal}}
-<script defer src="./js/page/instore-checkout.js"></script>
-{{/content}}
 {{/extend}}

package/src/page_instore_progress_bar-three-steps.html

@@ -15,9 +15,6 @@
   {{/content}}
   {{#content "aside"}}
       {{> checkout_order-summary label="Total: "}}
-      {{> checkout_delivery }}
-      {{> checkout_supplier-delivery }}
-      {{> checkout_click-and-collect }}
   {{/content}}
   {{#content "foot" mode="append"}}
     <script defer src="./js/page/checkout-payment-details.js"></script>

package/src/page_new-checkout-form-secure.html

@@ -1,6 +1,6 @@
 {{#extend "checkout-new" pageClass="new-checkout-login-secure" title="Checkout - Secure Login Wickes" fullWidth=true}}
  {{#content "steps"}}
-    {{> steps active-step-index="0" }}
+    {{> steps-three-steps active-step-index="0" }}
  {{/content}}
 
 {{#content "main"}}
@@ -12,9 +12,9 @@
       <div class="form-wrapper__block">
           <form class="new-checkout-form">
               <h3 class="new-checkout-form__header">Secure checkout?</h3>
-  
+
               <div class="new-checkout-form__info">
-                Enter your password to continue your session.    
+                Enter your password to continue your session.
               </div>
 
               {{> form-row type="password" id="password" label="Password" required="true"}}
@@ -25,10 +25,10 @@
                 </div>
                 <a href="page_new-checkout_login-register.html" class="link-secondary">
                     Click here to sign in
-                </a>                  
+                </a>
               </div>
 
-  
+
               <div class="new-checkout-form__submit-block">
                 <button class="btn btn-primary btn_full">
                   <span class="btn__text">
@@ -44,7 +44,7 @@
 
                 <a href="#" class="link-secondary forgot-link" data-toggle="modal" data-target="#modal-fogot-pass">
                   Forgotten password
-                </a>                  
+                </a>
               </div>
 
               <div class="btn-guest-checkout-back">
@@ -55,19 +55,18 @@
                   </span>
                 </a>
               </div>
-  
-  
+
+
           </form>
       </div>
     </div>
 </div>
-  
+
 
 
 {{/content}}
 
 {{#content "foot" mode="append"}}
-<script defer src="./js/page/checkout-sign-in.js"></script>
 
 {{#extend "modal" id="modal-fogot-pass" title="Forgotten password" fullWidth=true}}
   {{#content "body"}}
@@ -96,7 +95,7 @@
       <div class="modal-reset-block">
           <div class="modal-reset-icon">
               <div class="modal-reset-icon__wrap">
-                  <i class="fas fa-check"></i>          
+                  <i class="fas fa-check"></i>
               </div>
           </div>
           <div class="modal-reset-text">

package/src/scss/main.scss

@@ -42,7 +42,6 @@
 @import 'components/pagination__shopping-list'; //only shopping list
 @import 'components/search-filter'; //plp & product-search & search result
 @import 'components/category-tree'; //product-search & plp
-@import 'components/steps'; //checkout & in-store & tradePro
 @import 'components/steps-three'; //checkout progress bar for three steps
 @import 'components/modal-box'; //pdp & checkout & kitchen-claims
 @import 'components/legal-info'; //plp + product search + search result

package/src/scss/pages/checkout-new.scss

@@ -1,6 +1,6 @@
 @import '../helpers/helpers';
 @import '../partials/header_checkout';
-@import '../components/steps';
+@import '../components/steps-three';
 @import '../partials/footer_checkout';
 @import '../components/new-checkout-form';
 @import 'checkout-confirmation-new';
@@ -15,7 +15,6 @@
 @import 'checkout_delivery-details';
 @import 'checkout_delivery-address';
 @import 'checkout_delivery-address-asm';
-@import 'checkout_your-details';
 @import 'checkout-widget';
 @import 'checkout_edit-delivery-address';
 @import 'checkout_terms-and-conditions';
@@ -45,8 +44,6 @@ body {
 }
 //  --------
 
-.new-checkout-login-wickes,
-.new-checkout-login-guest,
 .new-checkout-login-secure {
   .full-width-content {
     padding-bottom: 10px;

package/src/scss/pages/checkout.scss

@@ -5,7 +5,6 @@
 @import 'checkout_delivery-details';
 @import 'checkout_delivery-address';
 @import 'checkout_delivery-address-asm';
-@import 'checkout_your-details';
 @import 'checkout-confirmation';
 @import 'checkout-widget';
 @import 'checkout_edit-delivery-address';