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

package/package.json

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

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

@@ -36,7 +36,11 @@ Wick.VatToggle = {
   },
 
   getSwitcherState: function() {
-    return !!$(Wick.VatToggle.el.switchVatInput).attr('checked');
+    if ($(Wick.VatToggle.el.switchVatInput).length) {
+      return !!$(Wick.VatToggle.el.switchVatInput).attr('checked');
+    } else {
+      return null;
+    }
   },
 
   createToggleEvent: function(isToggled) {
@@ -65,6 +69,28 @@ Wick.VatToggle = {
     $(includingVatEl).toggleClass(hiddenClassName);
     $(excludingVat).toggleClass(hiddenClassName);
   },
+  reapplyDisplayClass: function () {
+    const includingVatEl = Wick.VatToggle.el.includingVat;
+    const excludingVatEl = Wick.VatToggle.el.excludingVat;
+    const hiddenClassName = Wick.VatToggle.HIDDEN_CLASS_NAME;
+
+    let vatState = null;
+
+    // check switcher state for web or cookie for app
+    if (Wick.VatToggle.getSwitcherState() !== null) {
+      vatState = Wick.VatToggle.getSwitcherState();
+    } else {
+      vatState = Wick.VatToggle.isOn();
+    }
+
+    if (vatState) {
+      $(includingVatEl).addClass(hiddenClassName);
+      $(excludingVatEl).removeClass(hiddenClassName);
+    } else {
+      $(includingVatEl).removeClass(hiddenClassName);
+      $(excludingVatEl).addClass(hiddenClassName);
+    }
+  },
 
   updateGlobalClass: function () {
     const includingVatGlobal = Wick.VatToggle.el.includingVatGlobalClass;

package/src/js/page/plp-load-more.js

@@ -38,6 +38,7 @@ Wick.PLPLoadMore = {
 
         Wick.PLPLoadMore.showNewCards(response);
         Wick.PLPLoadMore.toggleLoadMoreBtn();
+        Wick.VatToggle.reapplyDisplayClass();
       })
       .finally(() => {
         hideLoader(Wick.PLPLoadMore.el.loader);

package/src/page_wismo-order-history-loadmore.html

@@ -1,4 +1,4 @@
-{{#extend "my-account" pageClass="wismo-hist" title="Wismo Order history" }}
+{{#extend "my-account" pageClass="wismo-hist" title="Wismo Order history" switch-vat=true}}
 {{#content "head" mode="append"}}
 <link type="text/css" rel="stylesheet" href="./css/pages/page_wismo-order-history.css">
 {{/content}}
@@ -12,7 +12,7 @@
 
     {{> form-row row-mod="sort-order-by" dropdown="true" label="Sort by" id="d1" placeholder="Date"}}
     {{#each page_wismo-order-history.orders }}
-      {{> table_wismo-history }}
+      {{> table_wismo-history switch-vat=true }}
     {{/each }}
     <div class="load-more-wrap" id="loadmorewrap">
       <button class="btn btn-primary load-more" id="loadmore">Load more</button>
@@ -21,4 +21,4 @@
       </div>
     </div>
   {{/content}}
-{{/extend}}
+{{/extend}}

package/src/sitemap.html

@@ -348,7 +348,7 @@
                         <li>
                             <span class="page-id">4.10</span>
                             <a href="page_wismo-order-history-loadmore.html" target="_blank">
-                                Wismo Order history - Loadmore
+                                Wismo Order history - Loadmore VAT
                             </a>
                         </li>
                         <li>