wickes-css2 2.96.0-develop.3 → 2.96.0-develop.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wickes-css2",
-  "version": "2.96.0-develop.3",
+  "version": "2.96.0-develop.4",
   "description": "CSS and JS and page templates in use by Wickes",
   "main": "index.js",
   "scripts": {
@@ -108,7 +108,15 @@
     "branches": [
       "alt-master",
       {
-        "name": "custom-tag/IC-574-meganav-integration",
+        "name": "develop",
+        "prerelease": true
+      },
+      {
+        "name": "preprod",
+        "prerelease": true
+      },
+      {
+        "name": "custom-tag/*",
         "prerelease": "${name.replace(/^custom-tag\\//g, '')}"
       }
     ],

package/src/js/components/general/main-nav.js

@@ -34,7 +34,7 @@ Wick.MainNav = (function () {
                       <ul class="main-nav__menu">
                           ${menuSection.children.map(createMainNavItems).join('')}
                       </ul>
-                  </div>
+                    </div>
                 </li>
               `
           } else {
@@ -66,9 +66,6 @@ Wick.MainNav = (function () {
       function createMainNavItems(menuSection) {
         if (menuSection) {
           if (menuSection.children && menuSection.children.length) {
-            if(menuSection.originalChildrenCount) {
-              console.log(menuSection)
-            }
             return `
               <li class="main-nav__menu__item nav-col">
                 <a href="${checkUrl(menuSection)}" class="main-nav__menu__label ${setClass(menuSection, 2)}" tabindex="0" ${setColor(menuSection)}>
@@ -262,31 +259,25 @@ Wick.MainNav = (function () {
         });
       }
 
-      function isSSR() {
-        return $mainNav.attr('data-ssr') === 'true'
-      }
-
-      if (isSSR()) {
-        Wick.Nav();
-        Wick.Responsive.callBr();
-      } else {
-        checkIfRealEnvironment();
-      }
+      checkIfRealEnvironment();
     }
   }
 })();
 
 $(document).ready(function () {
-  const defaultOptions = {
-    type: 'GET',
-    cache: true,
-    link: window.location.origin,
-    local: false
-  };
+  function init() {
+    const defaultOptions = {
+      type: 'GET',
+      cache: true,
+      link: window.location.origin,
+      local: false
+    };
 
-  if (!$('#main-nav').length) {
-    return;
+    if (!$('#main-nav').length) {
+      return;
+    }
+    Wick.MainNav.createMainNav(defaultOptions);
   }
 
-  Wick.MainNav.createMainNav(defaultOptions);
+  init();
 });

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

@@ -54,7 +54,10 @@ Wick.VatToggle = {
   },
 
   isToggleVatAvailable: function() {
-    return window.ACC.app.isVatToggleAvailable;
+    //added so that it doesn't trigger in the local environment
+    if (!Wick.checkLocalEnv) {
+      return window.ACC.app.isVatToggleAvailable;
+    }
   },
 
   isOn: function () {

package/src/js/emulation/basket-data.js

@@ -431,6 +431,442 @@ Wick.BasketData = (function () {
       "entryGroupNumbers": null,
       "message": "The Basket quantity of <a href=\"/Blue-Circle-Ready-To-Use-Postcrete---20kg/p/221100\" style=\"text-decoration: underline\">Blue Circle Ready To Use Postcrete - 20kg</a> has been reduced to 74 from 100 due to insufficient stock."
     },
+    initialCartState: {
+      "code": "696252000",
+      "subTotal": {"value": 19.0, "formattedValue": "£19.00", "currencyIso": "GBP", "formattedPriceWithoutCurrencySymbol": "19.00"},
+      "totalTax": {"value": 3.17, "formattedValue": "£3.17", "currencyIso": "GBP", "formattedPriceWithoutCurrencySymbol": "3.17"},
+      "deliveryCost": {"value": 0.0, "formattedValue": "£0.00", "currencyIso": "GBP", "formattedPriceWithoutCurrencySymbol": "0.00"},
+      "charityPrice": {"value": 0.0, "formattedValue": "£0.00", "currencyIso": "GBP", "formattedPriceWithoutCurrencySymbol": "0.00"},
+      "totalDiscounts": {"value": 0.0, "formattedValue": "£0.00", "currencyIso": "GBP", "formattedPriceWithoutCurrencySymbol": "0.00"},
+      "totalPrice": {"value": 19.0, "formattedValue": "£19.00", "currencyIso": "GBP", "formattedPriceWithoutCurrencySymbol": "19.00"},
+      "potentialProductPromotions": [],
+      "appliedProductPromotions": [],
+      "appliedOrderPromotions": [],
+      "promotionsInfo": null,
+      "clickAndCollectOnly": true,
+      "deliveryItemsQuantity": 1,
+      "pickupItemsQuantity": 2,
+      "freeDelivery": false,
+      "subtotalWithoutCharity": {"value": 19.0, "formattedValue": "£19.00", "currencyIso": "GBP", "formattedPriceWithoutCurrencySymbol": "19.00"},
+      "messageForFreeDelivery": null,
+      "pickupOrderGroups": [
+        {
+          "entries": [
+            {
+              "entryNumber": 0,
+              "quantity": 2,
+              "basePrice": {
+                "value": 100.0,
+                "formattedValue": "£100",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "100"
+              },
+              "basePriceExcVat": {
+                "value": 99,
+                "formattedValue": "£99",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "99"
+              },
+              "product": {
+                "code": "221100",
+                "name": "Blue Circle Ready To Use Postcrete - 20kg",
+                "url": "/Blue-Circle-Ready-To-Use-Postcrete---20kg/p/221100",
+                "minOrderQuantity": 0,
+                "maxOrderQuantity": null,
+                "fulfillmentAttributes": {
+                  "type": "STANDARD_STORE_DELIVERED",
+                  "leadTimeDays": 1,
+                  "supplierDelivered": false
+                },
+                "price": {
+                  "value": 100.0,
+                  "formattedValue": "£100",
+                  "currencyIso": "GBP",
+                  "formattedPriceWithoutCurrencySymbol": "100"
+                },
+                "categoryPath": "Products/Building Materials/Cement & Aggregates/Cement",
+                "brandName": "Blue Circle",
+                "categories": [
+                  {
+                    "code": "1000208",
+                    "name": "Cement"
+                  },
+                  {
+                    "code": "1000211",
+                    "name": "Concrete"
+                  }
+                ],
+                "image": {
+                  "url": "//media.dev.wickes.co.uk/is/image/wickes/B3182_221100_00?$normal$",
+                  "altText": "Blue Circle Ready To Use Postcrete - 20kg"
+                },
+                "pricePerSqm": 0.0,
+                "installationProduct": false
+              },
+              "updateable": true,
+              "deliveryPointOfService": {
+                "name": "8901",
+                "description": "WX Test Store 12"
+              },
+              "charity": false,
+              "itemTotalWithoutDiscount": {
+                "value": 100.0,
+                "formattedValue": "£100",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "100"
+              },
+              "itemTotalWithoutDiscountExcVat": {
+                "value": 99,
+                "formattedValue": "£99",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "99"
+              },
+              "orderFulfilmentControls": {
+                "availableForDelivery": true,
+                "availableForCollection": true,
+                "availableForWickesFulfilment": false
+              }
+            }
+          ],
+          "quantity": 1,
+          "totalPrice": {
+            "value": 100.0,
+            "formattedValue": "£100.00",
+            "currencyIso": "GBP",
+            "formattedPriceWithoutCurrencySymbol": "100.00"
+          }
+        },
+        {
+          "entries": [
+            {
+              "entryNumber": 1,
+              "quantity": 2,
+              "basePrice": {
+                "value": 24.0,
+                "formattedValue": "£24",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "24"
+              },
+              "basePriceExcVat": {
+                "value": 23,
+                "formattedValue": "£23",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "23"
+              },
+              "product": {
+                "code": "109450",
+                "name": "Knauf Insulation Space Standard Top Up 170mm Loft Roll - 6.47m²",
+                "url": "/Knauf-Insulation-Space-Standard-Top-Up-170mm-Loft-Roll---6-47m%C2%B2/p/109450",
+                "minOrderQuantity": 0,
+                "maxOrderQuantity": null,
+                "fulfillmentAttributes": {
+                  "type": "HOURLY_STANDARD",
+                  "leadTimeDays": 1,
+                  "supplierDelivered": false
+                },
+                "price": {
+                  "value": 24.0,
+                  "formattedValue": "£24",
+                  "currencyIso": "GBP",
+                  "formattedPriceWithoutCurrencySymbol": "24"
+                },
+                "categoryPath": "Products/Building Materials/Insulation/Loft Insulation",
+                "brandName": "Knauf Insulation",
+                "categories": [
+                  {
+                    "code": "1000270",
+                    "name": "Loft Insulation"
+                  }
+                ],
+                "image": {
+                  "url": "//media.wickes.co.uk/is/image/wickes/O0032_109450_00?$normal$",
+                  "altText": "Knauf Insulation Space Standard Top Up 170mm Loft Roll - 6.47m²"
+                },
+                "pricePerSqm": 0.0,
+                "installationProduct": false
+              },
+              "updateable": true,
+              "deliveryPointOfService": {
+                "name": "8397",
+                "description": "WATFORD"
+              },
+              "charity": false,
+              "itemTotalWithoutDiscount": {
+                "value": 24.0,
+                "formattedValue": "£24",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "24"
+              },
+              "itemTotalWithoutDiscountExcVat": {
+                "value": 23,
+                "formattedValue": "£23",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "23"
+              },
+              "orderFulfilmentControls": {
+                "availableForDelivery": true,
+                "availableForCollection": true,
+                "availableForWickesFulfilment": false
+              }
+            },
+            {
+              "entryNumber": 2,
+              "quantity": 2,
+              "basePrice": {
+                "value": 0.0,
+                "formattedValue": "£0",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "0"
+              },
+              "basePriceExcVat": {
+                "value": 0,
+                "formattedValue": "£0",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "0"
+              },
+              "product": {
+                "code": "103123",
+                "name": "Wickes Passage Door Knob Set - Brass 1 Pair",
+                "url": "/Wickes-Passage-Door-Knob-Set---Brass-1-Pair/p/103123",
+                "minOrderQuantity": 0,
+                "maxOrderQuantity": null,
+                "fulfillmentAttributes": {
+                  "type": "STANDARD",
+                  "leadTimeDays": 1,
+                  "supplierDelivered": false
+                },
+                "price": {
+                  "value": 9.5,
+                  "formattedValue": "£9.50",
+                  "currencyIso": "GBP",
+                  "formattedPriceWithoutCurrencySymbol": "9.50"
+                },
+                "categoryPath": "Products/Clearance",
+                "brandName": "Wickes",
+                "categories": [
+                  {
+                    "code": "1072000",
+                    "name": "Clearance"
+                  },
+                  {
+                    "code": "1065002",
+                    "name": "Security & Hardware Clearance"
+                  },
+                  {
+                    "code": "1022012",
+                    "name": "Doors & Windows Clearance"
+                  },
+                  {
+                    "code": "1008007",
+                    "name": "Door Handles"
+                  }
+                ],
+                "image": {
+                  "url": "//media.wickes.co.uk/is/image/wickes/T3274_103123_00?$normal$",
+                  "altText": "Wickes Passage Door Knob Set - Brass 1 Pair"
+                },
+                "pricePerSqm": 0.0,
+                "installationProduct": false
+              },
+              "updateable": false,
+              "deliveryPointOfService": null,
+              "charity": false,
+              "itemTotalWithoutDiscount": {
+                "value": 0.0,
+                "formattedValue": "£0",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "0"
+              },
+              "itemTotalWithoutDiscountExcVat": {
+                "value": 0,
+                "formattedValue": "£0",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "0"
+              },
+              "orderFulfilmentControls": {
+                "availableForDelivery": true,
+                "availableForCollection": true,
+                "availableForWickesFulfilment": false
+              }
+            }
+          ],
+          "quantity": 2,
+          "totalPrice": {
+            "value": 40.5,
+            "formattedValue": "£40.50",
+            "currencyIso": "GBP",
+            "formattedPriceWithoutCurrencySymbol": "40.50"
+          }
+        }
+      ],
+      "deliveryOrderGroups": [
+        {
+          "entries": [
+            {
+              "entryNumber": 3,
+              "quantity": 3,
+              "basePrice": {
+                "value": 25.0,
+                "formattedValue": "£25",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "25"
+              },
+              "basePriceExcVat": {
+                "value": 24,
+                "formattedValue": "£24",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "24"
+              },
+              "product": {
+                "code": "109451",
+                "name": "Knauf Insulation Super Top Up 200mm Loft Roll - 5.61m²",
+                "url": "/Knauf-Insulation-Super-Top-Up-200mm-Loft-Roll---5-61m%C2%B2/p/109451",
+                "minOrderQuantity": 0,
+                "maxOrderQuantity": null,
+                "fulfillmentAttributes": {
+                  "type": "STANDARD",
+                  "leadTimeDays": 1,
+                  "supplierDelivered": false
+                },
+                "price": {
+                  "value": 25.0,
+                  "formattedValue": "£25",
+                  "currencyIso": "GBP",
+                  "formattedPriceWithoutCurrencySymbol": "25"
+                },
+                "categoryPath": "Products/Building Materials/Insulation/Loft Insulation",
+                "brandName": "Knauf Insulation",
+                "categories": [
+                  {
+                    "code": "1000270",
+                    "name": "Loft Insulation"
+                  }
+                ],
+                "image": {
+                  "url": "//media.wickes.co.uk/is/image/wickes/O0032_109451_00?$normal$",
+                  "altText": "Knauf Insulation Super Top Up 200mm Loft Roll - 5.61m²"
+                },
+                "pricePerSqm": {
+                  "value": 17,
+                  "formattedValue": "£17",
+                  "currencyIso": "GBP",
+                  "formattedPriceWithoutCurrencySymbol": "17"
+                },
+                "pricePerSqmExcVat": {
+                  "value": 16,
+                  "formattedValue": "£16",
+                  "currencyIso": "GBP",
+                  "formattedPriceWithoutCurrencySymbol": "16"
+                },
+                "installationProduct": true
+              },
+              "updateable": true,
+              "deliveryPointOfService": null,
+              "charity": false,
+              "itemTotalWithoutDiscount": {
+                "value": 25.0,
+                "formattedValue": "£25",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "25"
+              },
+              "itemTotalWithoutDiscountExcVat": {
+                "value": 24,
+                "formattedValue": "£24",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "24"
+              },
+              "orderFulfilmentControls": {
+                "availableForDelivery": true,
+                "availableForCollection": true,
+                "availableForWickesFulfilment": false
+              }
+            },
+            {
+              "entryNumber": 4,
+              "quantity": 1,
+              "basePrice": {
+                "value": 25.0,
+                "formattedValue": "£25",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "25"
+              },
+              "basePriceExcVat": {
+                "value": 24,
+                "formattedValue": "£24",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "24"
+              },
+              "product": {
+                "code": "123143",
+                "name": "6 Wickes General Purpose Claw test",
+                "url": "/Knauf-Insulation-Super-Top-Up-200mm-Loft-Roll---5-61m%C2%B2/p/109451",
+                "minOrderQuantity": 0,
+                "maxOrderQuantity": null,
+                "fulfillmentAttributes": {
+                  "type": "STANDARD",
+                  "leadTimeDays": 1,
+                  "supplierDelivered": false
+                },
+                "price": {
+                  "value": 25.0,
+                  "formattedValue": "£25",
+                  "currencyIso": "GBP",
+                  "formattedPriceWithoutCurrencySymbol": "25"
+                },
+                "categoryPath": "Products/Building Materials/Insulation/Loft Insulation",
+                "brandName": "Knauf Insulation",
+                "categories": [
+                  {
+                    "code": "1000270",
+                    "name": "Loft Insulation"
+                  }
+                ],
+                "image": {
+                  "url": "//media.wickes.co.uk/is/image/wickes/O0032_109451_00?$normal$",
+                  "altText": "Knauf Insulation Super Top Up 200mm Loft Roll - 5.61m²"
+                },
+                "pricePerSqm": 0.0,
+                "installationProduct": false
+              },
+              "updateable": true,
+              "deliveryPointOfService": null,
+              "charity": false,
+              "itemTotalWithoutDiscount": {
+                "value": 25.0,
+                "formattedValue": "£25",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "25"
+              },
+              "itemTotalWithoutDiscountExcVat": {
+                "value": 24,
+                "formattedValue": "£24",
+                "currencyIso": "GBP",
+                "formattedPriceWithoutCurrencySymbol": "24"
+              },
+              "orderFulfilmentControls": {
+                "availableForDelivery": true,
+                "availableForCollection": true,
+                "availableForWickesFulfilment": false
+              }
+            }
+          ],
+          "quantity": null,
+          "totalPrice": {
+            "value": 25.0,
+            "formattedValue": "£25.00",
+            "currencyIso": "GBP",
+            "formattedPriceWithoutCurrencySymbol": "25.00"
+          }
+        }
+      ],
+      "paymentInfos": {"payPalEnabled": true, "payPalPaymentInfo": {"id": 123, "payer": "John.doe123@gmail.com"}},
+      "payPalEnabled": true,
+      "deliveryAddress": null,
+      "pickupUniqueItemsNumber": 3,
+      "deliveryUniqueItemsNumber": 1,
+      "totalUnitCount": 2,
+      "orderType": "CC"
+    },
     updateCart: {
       "code": "696252000",
       "subTotal": {"value": 19.0, "formattedValue": "£19.00", "currencyIso": "GBP", "formattedPriceWithoutCurrencySymbol": "19.00"},

package/src/js/emulation/main-nav-local.js

@@ -1,21 +1,19 @@
 var Wick = Wick || {};
-
-Wick.MainNavLocal = function(){
+Wick.MainNavLocal = (function(){
     function init() {
         var localOptions = {
             local: true,
             mockData: Wick.MainNavData.returnData()
         };
 
-        if (!$('#main-nav').length || !$('.ssc-nav').length) {
+        if (!$('#main-nav').length) {
             return;
         }
         
-
         setTimeout(()=> {
             Wick.MainNav.createMainNav(localOptions);
         }, 2000)
     }
 
-    init()
-}();
+    init();
+})();

package/src/js/page/basket-v2.js

@@ -385,9 +385,9 @@ Wick.BasketPage = {
             callAction(payload, actionCallback, info)
         } else {
             if (initial) {
-                Wick.BasketPage.getCartEntries(Wick.BasketData.updateCart);
-                addClassToSummaryAside(Wick.BasketData.updateCart);
-                const initialTotalPrice = Wick.BasketData.updateCart.totalPrice.value;
+                Wick.BasketPage.getCartEntries(Wick.BasketData.initialCartState);
+                addClassToSummaryAside(Wick.BasketData.initialCartState);
+                const initialTotalPrice = Wick.BasketData.initialCartState.totalPrice.value;
                 updateClearpayVisibility(initialTotalPrice);
             } else {
                 updateBasketDataQuantity();

package/src/js/page/components/order-summary.js

@@ -1,5 +1,4 @@
 import {updateDiscount} from "./discounts";
-import {addClassToSummaryAside} from "../basket/summary-mobile";
 
 const osEl = {
     $summarySection: $('.summary'),

package/src/js/page/components/sticky-order-observer.js

@@ -22,8 +22,8 @@ export function initStickyObserver(observedElements, stickyElements, collapseSel
   if ('IntersectionObserver' in window) {
     io = new IntersectionObserver(
       entries => {
-        const anyInView = entries.some(e => e.isIntersecting);
-        toggle(anyInView);
+        const shouldBeHidden = entries.some(e => e.isIntersecting || e.boundingClientRect.y < 0);
+        toggle(shouldBeHidden);
       },
       { rootMargin: '0px 0px -20% 0px', threshold: 0 }
     );
@@ -31,15 +31,15 @@ export function initStickyObserver(observedElements, stickyElements, collapseSel
   } else {
     // Fallback for older browsers
     function check() {
-      let anyInView = false;
+      let anyInViewOrAbove = false;
       $observed.each(function () {
         const r = this.getBoundingClientRect();
-        if (r.top < window.innerHeight * 0.8 && r.bottom > 0) {
-          anyInView = true;
-          return false; // break
+        if ((r.top < window.innerHeight * 0.8 && r.bottom > 0) || r.bottom < 0) {
+          anyInViewOrAbove = true;
+          return false;
         }
       });
-      toggle(anyInView);
+      toggle(anyInViewOrAbove);
     }
     $(window)
       .off('scroll.sticky resize.sticky')

package/src/partials/main-nav.hbs

@@ -1,10 +1,6 @@
 <a id="skip-to-navigation"></a>
-<nav class="main-nav" id="main-nav" data-ssr="{{#unless oldNav}}true{{/unless}}">
-  {{#if oldNav}}
-    {{> skeleton-nav}}
-  {{else}}
-    {{> navigation/nav-wrapper }}
-  {{/if }}
+<nav class="main-nav" id="main-nav">
+  {{>skeleton-nav}}
   {{#unless tradepro-nav}}
     <div class="main-nav__button" data-logged-in="false">
       <a href="/login.html" class="nav-button">