wickes-css2 2.96.0-develop.6 → 2.96.0-develop.7

package/src/components/voucher.hbs

@@ -34,12 +34,9 @@
             {{!-- online --}}
             <span class="voucher__label">{{online.label}}</span>
             <div class="voucher__content">
-              <div>
-                {{#if online.title}}
-                  <h4 class="mb-0">{{online.title}}</h4>
-                {{/if}}
-                <p class="mt-1 mb-0">{{online.note}}</p>
-              </div>
+              {{#if online.title}}
+                <h4 class="mb-0">{{online.title}}</h4>
+              {{/if}}
               <div class="my-3">
                 <div class="voucher__code-field copy-tradePro-barcode">
                   <input type="text" value="{{online.code}}" disabled>
@@ -48,6 +45,7 @@
                   </span>
                 </div>
               </div>
+              <p class="mb-3">{{online.note}}</p>
               {{#ifCond online.buttonLink "&&" online.buttonText}}
                 <a href="{{online.buttonLink}}" class="btn btn-primary">
                   <span class="btn__text">{{online.buttonText}}</span>

package/src/js/components/general/switchVat.js

@@ -125,7 +125,18 @@ Wick.VatToggle = {
     document.cookie = cookiesString;
   },
 
+  rerenderCheckbox: function () {
+    // rerender checkbox to avoid browser caching IM-1534
+    if ($(Wick.VatToggle.el.switchVatInput).length) {
+      let inputTemplate = $(Wick.VatToggle.el.switchVatInput).prop('outerHTML');
+      inputTemplate = inputTemplate.replace('name="vat"', `name="vat-${Date.now()}"`);
+      $(Wick.VatToggle.el.switchVatInput).replaceWith(inputTemplate);
+    }
+  },
+
   init: function() {
+    Wick.VatToggle.rerenderCheckbox();
+
     const isVatShouldBeToggled = Wick.VatToggle.isOn();
     const isVatToggled = !!Wick.VatToggle.getSwitcherState();
 

package/src/js/emulation/project-list-print.js

@@ -1,3 +1,5 @@
+var Wick = window.Wick || {};
+
 function initProjectShadowList() {
   $('.download-pdf').on('click', emulateDownloadAction);
 }
@@ -7,7 +9,8 @@ function emulateDownloadAction(e) {
 
   let currentUrl = window.location.href;
   let baseUrl = currentUrl.substring(0, currentUrl.lastIndexOf('/') + 1);
-  let pageShoppingListPDF = baseUrl + 'page_my-shopping-list-pdf.html';
+  let pageName = Wick.VatToggle.isToggleVatAvailable() ? 'page_my-shopping-list-pdf-vat.html' : 'page_my-shopping-list-pdf.html';
+  let pageShoppingListPDF = baseUrl + pageName;
 
   $.ajax({
       type: 'get',

package/src/layouts/base.hbs

@@ -16,7 +16,7 @@
         {{> google-banner}}
     {{/if}}
     {{#block "header"}}
-      {{> header chatBot=chatBot }}
+      {{> header chatBot=chatBot switch-vat=switch-vat }}
     {{/block}}
     <a id="skip-to-content"></a>
     {{#if hybrisClass}}

package/src/page_activate-trade-pro-api-flow.html

@@ -0,0 +1,62 @@
+{{#extend "base" pageClass="trade-pro-act" title="Activate TradePro account"}}
+{{#content "head" mode="append"}}
+<link type="text/css" rel="stylesheet" href="./css/pages/page_act-trade-pro.css">
+{{/content}}
+{{#content "body"}}
+
+<main class="container trade-pro-acc">
+  <div class="page-header">
+    <h1>Activate your TradePro account</h1>
+  </div>
+  <div class="tradepro-act-wrapper">
+    <form action="#" class="tradepro-act">
+      <div class="tradepro-act__content component">
+        <div class="tradepro-act__info">
+          <p>
+            Create a new password to activate your TradePro account
+          </p>
+        </div>
+        {{> form-row type="password" id="new-password" label="Password" required="true"}}
+        {{> form-row type="password" id="confirmed-password" label="Confirm password" required="true"}}
+        <div>
+          <p>
+            As a member of TradePro, we send our members the latest deals and offers.
+          </p>
+          <p>
+            Please indicate how you'd like us to send these to you:
+          </p>
+          <div class="form-row">
+            <div class="form-row__field">
+              {{> checkbox id="sendEmail" label="Email"}}
+            </div>
+          </div>
+          <div class="form-row">
+            <div class="form-row__field">
+              {{> checkbox id="sendSms" label="SMS" }}
+            </div>
+          </div>
+          <div class="form-row">
+            <div class="form-row__field">
+              {{> checkbox id="sendPhone" label="Phone" }}
+            </div>
+          </div>
+          <div class="form-row">
+            <div class="form-row__field">
+              {{> checkbox id="sendPost" label="Post" }}
+            </div>
+          </div>
+        </div>
+        <div class="form-row form-row__action form-row__action_act-btn-wrap">
+          <div class="form-row__col-btn">
+            <button class="btn btn-primary btn_full">
+              <span class="btn__text">Activate TradePro account</span>
+            </button>
+          </div>
+        </div>
+      </div>
+    </form>
+  </div>
+</main>
+
+{{/content}}
+{{/extend}}

package/src/page_my-shopping-list-pdf-vat.html

@@ -0,0 +1,7 @@
+{{#extend "pdf" hybrisClass="hybris-class" pageClass="page_my-shopping-list" title="My Project List" shoppingListPDF=true}}
+{{#content "head" mode="append"}}
+{{/content}}
+{{#content "body"}}
+  {{> shopping-list-pdf switch-vat=true}}
+{{/content}}
+{{/extend}}

package/src/partials/header.hbs

@@ -97,7 +97,7 @@
               <span class="header-top-line__link-title">Project list</span>
             </a>
           {{else}}
-            <a href="./page_my-shopping-list.html" class="header-top-line__link">
+            <a href="{{#if switch-vat}}./page_project-list-vat.html{{else}}./page_my-shopping-list.html{{/if}}" class="header-top-line__link">
               <span class="btn__text">
                 <i class="fas fa-clipboard-list fa-lg"></i>
               </span>

package/src/scss/components/_ti-total-area.scss

@@ -3,50 +3,11 @@
   background: $gray-bg;
   padding: 20px;
 
-  & .step1-inactive {
-    width: 100%;
-    flex-wrap: wrap;
-  }
-
   &__title {
     font-weight: 500;
     margin-bottom: 13px;
   }
 
-  &__waste {
-    width: 100%;
-    text-align: right;
-    font-size: .875rem;
-    font-weight: 400;
-    line-height: 1;
-    justify-content: flex-end;
-    margin-bottom: 0;
-    padding-bottom: 5px;
-
-    .ti__total:not(.ti__total-waste) & {
-      display: none;
-    }
-  }
-
-  &__row {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-    padding-bottom: 5px;
-
-    &-specification {
-      font-size: .875rem;
-      font-weight: 700;
-      line-height: 22px;
-    }
-
-    &-value {
-      font-size: .875rem;
-      font-weight: 400;
-      line-height: 22px;
-    }
-  }
-
   &__accordion-wrap {
     color: $black;
   }
@@ -156,12 +117,6 @@
     font-size: 1rem;
     font-weight: 500;
     line-height: 24px;
-
-    .ti__step1-inactive & {
-      font-size: .875rem;
-      font-weight: 700;
-      line-height: 22px;
-    }
   }
 
   &__form-row {
@@ -200,10 +155,6 @@
     background: $gray-bg;
     padding: 5px 20px;
 
-    .ti__step1-inactive & {
-      padding: 0 20px;
-    }
-
     &::before {
       content: '';
       display: block;
@@ -251,10 +202,6 @@
         display: none;
       }
 
-      .ti__step1-inactive & {
-        padding: 8px 15px;
-      }
-
       &-value {
         font-size: 1.125rem;
         line-height: 24px;

package/src/scss/components/tile-calculator.scss

@@ -1,7 +1,4 @@
-@import './tile-banner';
+@import '../helpers/helpers';
 @import './tile-product';
-@import './tile-why-wickes';
-@import './ti-header';
 @import './ti-floor';
 @import './ti-total-area';
-@import './ti-radio';