wickes-css2 2.97.0-IM-1593-code-width.1 → 2.97.0-develop.2

package/src/components/tile-banner.hbs

@@ -0,0 +1,13 @@
+<div class="tile-estimation__banner">
+    <img src="./img/wickes-logo.svg" alt="logo" class="tile-estimation__banner-logo">
+    <div class="tile-estimation__banner-info">
+        <h3 class="tile-estimation__banner-header">
+            Calculate the cost of your complete tiling project
+            with our no-obligation tile estimation tool.
+        </h3>
+        <p class="tile-estimation__banner-text">
+            From your chosen tiles to installation guaranteed by us,
+            we offer a complete tiling service.
+        </p>
+    </div>
+</div>

package/src/components/tile-why-wickes.hbs

@@ -0,0 +1,32 @@
+<div class="why-wickes">
+    <h4 class="why-wickes__header">
+        Why Wickes?
+    </h4>
+    <ul class="why-wickes__list">
+        <li class="why-wickes__item">
+            <i class="fas fa-check-circle why-wickes__bullet"></i>
+            <p class="why-wickes__info">
+                Our approved installer will complete a technical survey prior to installation
+            </p>
+        </li>
+        <li class="why-wickes__item">
+            <i class="fas fa-check-circle why-wickes__bullet"></i>
+            <p class="why-wickes__info">
+                We provide a 2-year guarantee on workmanship
+            </p>
+        </li>
+        <li class="why-wickes__item">
+            <i class="fas fa-check-circle why-wickes__bullet"></i>
+            <p class="why-wickes__info">
+                We dispose of your old tiles in an environmentally-friendly way
+            </p>
+        </li>
+        <li class="why-wickes__item">
+            <i class="fas fa-check-circle why-wickes__bullet"></i>
+            <p class="why-wickes__info">
+                Your installation estimate includes adhesive, plastic trim and standard
+                grout colours to finish your tiling job
+            </p>
+        </li>
+    </ul>
+</div>

package/src/components/voucher.hbs

@@ -34,19 +34,20 @@
             {{!-- online --}}
             <span class="voucher__label">{{online.label}}</span>
             <div class="voucher__content">
-              {{#if online.title}}
-                <h4 class="mb-0">{{online.title}}</h4>
-              {{/if}}
+              <div>
+                {{#if online.title}}
+                  <h4 class="mb-0">{{online.title}}</h4>
+                {{/if}}
+                <p class="mt-1 mb-0">{{online.note}}</p>
+              </div>
               <div class="my-3">
                 <div class="voucher__code-field copy-tradePro-barcode">
-                  <span>{{online.code}}</span>
-                  <input type="hidden" value="{{online.code}}" disabled>
+                  <input type="text" value="{{online.code}}" disabled>
                   <span class="icon">
                     <i class="fas fa-copy"></i>
                   </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/data/data_flooring-installation.json

@@ -0,0 +1,186 @@
+{
+  "flooring-installation": {
+    "step2": {
+      "removalExist": [
+        {
+          "label": "Existing laminate or wooden floor",
+          "id": "removal-exist-yes-lam"
+        },
+        {
+          "label": "Existing glued or tiled floor",
+          "id": "removal-exist-yes-tile"
+        },
+        {
+          "label": "Not needed",
+          "id": "removal-exist-no"
+        }
+      ],
+      "removalWaste": [
+        {
+          "label": "Yes",
+          "id": "removal-waste-yes"
+        },
+        {
+          "label": "No",
+          "id": "removal-waste-no"
+        }
+      ],
+      "leveling": [
+        {
+          "label": "Yes",
+          "id": "leveling-yes"
+        },
+        {
+          "label": "No",
+          "id": "leveling-no"
+        },
+        {
+          "label": "Unsure",
+          "id": "leveling-unsure"
+        }
+      ],
+      "additionLeveling": [
+        {
+          "label": "Wooden floating floor",
+          "id": "wooden"
+        },
+        {
+          "label": "Concrete",
+          "id": "concrete"
+        }
+      ],
+      "threshold": {
+        "radio": [
+          {
+            "label": "Yes",
+            "id": "threshold-yes"
+          },
+          {
+            "label": "No",
+            "id": "threshold-no"
+          }
+        ],
+        "cards": [
+          {
+            "title": "Shimba/Alberto/Salerno Variable Height Threshold Bar - 900mm Shimba / Alberto / Salerno Variable Height Threshold Bar",
+            "src": "https://media.wickes.co.uk/is/image/wickes/W6149_201521_00?id=WFNRV0&fmt=jpg&fit=constrain,1&wid=348&hei=275",
+            "price":  10,
+            "quantity": 1,
+            "badge": "2 for £40",
+            "description": [
+              "Length: 900 mm",
+              "Material: Plastic",
+              "Self Adhesive Base - No Drilling or Nailing required",
+              "Ideal for single door"
+            ]
+          },
+          {
+            "title": "Wickes Carpet To Laminate Joint Trim Silver",
+            "src": "https://media.wickes.co.uk/is/image/wickes/W6149_201521_00?id=WFNRV0&fmt=jpg&fit=constrain,1&wid=348&hei=275",
+            "price":  4.50,
+            "quantity": 1,
+            "description": [
+              "Length: 900 mm",
+              "Material: Metal",
+              "Ideal for single door"
+            ]
+          }
+        ]
+      },
+      "trimming": {
+        "radio": [
+          {
+            "label": "Yes",
+            "id": "trimming-yes"
+          },
+          {
+            "label": "No",
+            "id": "trimming-no"
+          },
+          {
+            "label": "Unsure",
+            "id": "trimming-unsure"
+          }
+        ]
+      },
+      "scotia": {
+        "radio": [
+          {
+            "label": "Yes",
+            "id": "scotia-yes"
+          },
+          {
+            "label": "No",
+            "id": "scotia-no"
+          }
+        ],
+        "cards": [
+          {
+            "title": "Vitrex White Flooring Trim - 2m",
+            "src": "https://media.wickes.co.uk/is/image/wickes/C1875_121198_00?$normal$",
+            "price":  5,
+            "quantity": 1,
+            "quantity-sqm": 25,
+            "description": [
+              "Length: 2m",
+              "Material: MDF",
+              "Simple to fit"
+            ]
+          },
+          {
+            "title": "Shimba/Alberto/Salerno Oak Laminate Flooring Trim - 2m",
+            "src": "https://media.wickes.co.uk/is/image/wickes/C1875_121198_00?$normal$",
+            "price":  6,
+            "quantity": 1,
+            "quantity-sqm": 25,
+            "description": [
+              "Length: 2m",
+              "Material: MDF",
+              "For use with Laminate, Engineered & Solid Wood",
+              "Simple to fit"
+            ]
+          }
+        ]
+      },
+      "underlay": {
+        "radio": [
+          {
+            "label": "Yes",
+            "id": "underlay-yes"
+          },
+          {
+            "label": "No",
+            "id": "underlay-no"
+          }
+        ],
+        "cards": [
+          {
+            "title": "Arbiton PE Foam Flooring Underlay - 15m Pack",
+            "src": "https://media.wickes.co.uk/is/image/wickes/W6149_620801_00?$normal$",
+            "price":  15,
+            "quantity": 2,
+            "quantity-sqm": 25,
+            "badge": "2 for £40",
+            "description": [
+              "Material: Foam",
+              "Suitable for both timber and concrete substrates",
+              "Strong thermal resistance - 0.4 Tog, ideal for cold rooms or flats"
+            ]
+          },
+          {
+            "title": "Wickes Carpet To Laminate Joint Trim Silver",
+            "src": "https://media.wickes.co.uk/is/image/wickes/W6149_620801_00?$normal$",
+            "price":  26,
+            "quantity": 2,
+            "quantity-sqm": 25,
+            "description": [
+              "Material: XPS",
+              "Suitable for both timber and concrete substrates",
+              "High compressive strength up to 90 kpa which is ideal for click systems"
+            ]
+          }
+        ]
+      }
+    }
+  }
+}

package/src/data/data_voucher_tradePro.json

@@ -41,7 +41,7 @@
         "label": "Online-only",
         "title": "TradePro custom title",
         "note": "Don't forget to use this code on checkout",
-        "code": "TPRNUR19-E9X9-XK2B",
+        "code": "WPRAJU119",
         "buttonText": "Shop now",
         "buttonLink": "#"
       },

package/src/data/my-account/data_address-book.json

@@ -0,0 +1,225 @@
+{
+  "address_book": {
+    "leave-popup": {
+      "title": "Your address won’t be saved",
+      "headerIcon": "fas fa-exclamation-circle",
+      "description": "Are you sure you want to continue?",
+      "actions": {
+        "mod": "actions",
+        "buttons": [
+          {
+            "title": "Cancel",
+            "data-action": "cancel-reset",
+            "isPrimary": true,
+            "close-modal": true
+          },
+          {
+            "mod": "btn-continue",
+            "data-action": "reset-details",
+            "title": "Yes, continue",
+            "isSecondary": true,
+            "url": "/page_my-account_address-book.html"
+          }
+        ]
+      }
+    },
+    "breadcrumbs": [
+      {
+        "url": "/",
+        "text": "Home"
+      },
+      {
+        "url": "/page_my-account.html",
+        "text": "My Account"
+      },
+      {
+        "url": "/page_my-account_address-book.html",
+        "text": "Address Book"
+      }
+    ],
+    "addresses": [
+      {
+        "id": "0",
+        "default": true,
+        "type": {
+          "name": "Delivery",
+          "icon": "fas fa-house-user"
+        },
+        "details": {
+          "fullName": "Mr John Smith",
+          "firstAddress": "G R G Storage Ltd",
+          "secondAddress": "G R G House",
+          "street": "Cobden Street",
+          "city": "Salford",
+          "postcode": "M6 6NA",
+          "country": "United Kingdom",
+          "mobPhone": "07700900000",
+          "homePhone": "07700979124"
+        },
+        "customAttrForDelete": "data-link='remove-address/0'"
+      },
+      {
+        "id": "1",
+        "default": false,
+        "type": {
+          "name": "Delivery",
+          "icon": "fas fa-house-user"
+        },
+        "details": {
+          "fullName": "Mr John Smith",
+          "firstAddress": "G R G Storage Ltd",
+          "secondAddress": "G R G House",
+          "street": "Cobden Street",
+          "city": "Salford",
+          "postcode": "M6 6NA",
+          "country": "United Kingdom",
+          "mobPhone": "07700900000",
+          "homePhone": "07700979124"
+        },
+        "customAttrForDelete": "data-link='remove-address/1'"
+      },
+      {
+        "id": "2",
+        "default": false,
+        "type": {
+          "name": "Delivery",
+          "icon": "fas fa-house-user"
+        },
+        "details": {
+          "fullName": "Mr John Smith",
+          "firstAddress": "G R G Storage Ltd",
+          "secondAddress": "G R G House",
+          "street": "Cobden Street",
+          "city": "Salford",
+          "postcode": "M6 6NA",
+          "country": "United Kingdom",
+          "mobPhone": "07700900000",
+          "homePhone": "07700979124"
+        },
+        "customAttrForDelete": "data-link='remove-address/2'"
+      }
+    ],
+    "tradeProAddress": {
+      "isBusinessAddress": true,
+      "type": {
+        "name": "Business",
+        "icon": "fas fa-hard-hat"
+      },
+      "details": {
+        "fullName": "Mr John Smith",
+        "firstAddress": "G R G Storage Ltd",
+        "secondAddress": "G R G House",
+        "street": "Cobden Street",
+        "city": "Salford",
+        "postcode": "M6 6NA",
+        "country": "United Kingdom",
+        "mobPhone": "07700900000",
+        "homePhone": "07700979124"
+      }
+    },
+    "deleteAddressModal": {
+      "headerIcon": "fas fa-trash",
+      "title": "Would you like to delete this delivery address?",
+      "infoIcon": "fas fa-exclamation-circle",
+      "infoDescription": "You will not be able to undo this action.",
+      "actions": {
+        "mod": "actions",
+        "buttons": [
+          {
+            "title": "Cancel",
+            "data-action": "cancel-delete",
+            "isPrimary": true,
+            "close-modal": true
+          },
+          {
+            "mod": "btn-continue",
+            "data-action": "delete-address",
+            "title": "Yes, delete",
+            "isSecondary": true
+          }
+        ]
+      }
+    },
+    "addressFields": [
+      {
+        "type": "dropdown",
+        "dropdown": true,
+        "id": "titleCode",
+        "label": "Title",
+        "rowMod": "row-title",
+        "required": true,
+        "options": [
+          { "value": "mr", "label": "Mr" },
+          { "value": "mrs", "label": "Mrs" },
+          { "value": "dr", "label": "Dr" }
+        ],
+        "selectedIndex": "0"
+      },
+      {
+        "type": "text",
+        "id": "firstName",
+        "label": "First name",
+        "value": "",
+        "required": true
+      },
+      {
+        "type": "text",
+        "id": "lastName",
+        "label": "Surname",
+        "value": "",
+        "required": true
+      },
+      {
+        "type": "text",
+        "id": "address-lookup-query",
+        "label": "Type first line of the address",
+        "value": "",
+        "required": true
+      },
+      {
+        "type": "text",
+        "id": "mobile-telephone",
+        "label": "Mobile telephone",
+        "value": "",
+        "required": true
+      },
+      {
+        "type": "text",
+        "id": "home-telephone",
+        "label": "Home telephone",
+        "value": "",
+        "required": false
+      }
+    ],
+    "hideFields": [
+      {
+        "type": "text",
+        "id": "address-line-1",
+        "label": "Address line 1",
+        "value": "",
+        "required": true
+      },
+      {
+        "type": "text",
+        "id": "address-line-2",
+        "label": "Address line 2",
+        "value": "",
+        "required": false
+      },
+      {
+        "type": "text",
+        "id": "town-city",
+        "label": "Town / City",
+        "value": "",
+        "required": true
+      },
+      {
+        "type": "text",
+        "id": "postcode_additional",
+        "label": "Postcode",
+        "value": "",
+        "required": true
+      }
+    ]
+  }
+}

package/src/data/my-account/data_change-password.json

@@ -0,0 +1,85 @@
+{
+  "change_password": {
+    "leave-popup": {
+      "title": "Your password won’t be saved",
+      "headerIcon": "fas fa-exclamation-circle",
+      "description": "Are you sure you want to continue?",
+      "actions": {
+        "mod": "actions",
+        "buttons": [
+          {
+            "title": "Cancel",
+            "data-action": "cancel-reset",
+            "isPrimary": true,
+            "close-modal": true
+          },
+          {
+            "mod": "btn-continue",
+            "data-action": "reset-details",
+            "title": "Yes, continue",
+            "isSecondary": true,
+            "link": "./page_my-account_change-password.html"
+          }
+        ]
+      }
+    },
+    "breadcrumbs": [
+      {
+        "url": "/",
+        "text": "Home"
+      },
+      {
+        "url": "/page_my-account.html",
+        "text": "My Account"
+      },
+      {
+        "url": "/page_personal-details.html",
+        "text": "Personal Details"
+      },
+      {
+        "url": "/page_my-account_change-password.html",
+        "text": "Change Password"
+      }
+    ],
+    "fields": [
+      {
+        "type": "password",
+        "id": "currentPassword",
+        "label": "Current password",
+        "value": "",
+        "required": true,
+        "showPassword": {
+          "idToggleIcon": "toggleIcon",
+          "classCustomIcon": "fas fa-eye fa-eye-slash",
+          "idCustomIcon": "eyeIcon"
+        }
+      },
+      {
+        "type": "password",
+        "id": "newPassword",
+        "label": "New password",
+        "value": "",
+        "required": true,
+        "info": "Minimum length is 6 characters",
+        "modificator": "strength",
+        "showPassword": {
+          "idToggleIcon": "toggleIcon",
+          "classCustomIcon": "fas fa-eye fa-eye-slash",
+          "idCustomIcon": "eyeIcon"
+        }
+      },
+      {
+        "type": "password",
+        "id": "confirmPassword",
+        "label": "Confirm new password",
+        "value": "",
+        "required": true,
+        "showPassword": {
+          "idToggleIcon": "toggleIcon",
+          "classCustomIcon": "fas fa-eye fa-eye-slash",
+          "idCustomIcon": "eyeIcon"
+        }
+      }
+    ]
+  }
+}

package/src/elements/form-row.hbs

@@ -1,4 +1,4 @@
-<div class="form-row {{#if clearInput}}form-row--clear-input{{/if}} {{#if error}}form-row_validation-error{{/if}} {{#if locked}}form-row--locked{{/if}} {{row-mod}}" {{#if required}}data-row-required{{/if}} {{#if clearInput}}data-clearable{{/if}} data-form-field>
+<div class="form-row {{#if clearInput}}form-row--clear-input{{/if}} {{#if error}}form-row_validation-error{{/if}} {{#if locked}}form-row--locked{{/if}} {{row-mod}}" {{#if required}}data-row-required{{/if}} {{#if clearInput}}data-clearable{{/if}} {{#if showContent}}data-show-content{{/if}} data-form-field>
   <label class="form-row__label {{#if required}}form-row__label_required{{/if}} {{#if label-hidden}}sr-only{{/if}}" for="{{id}}">
     {{label}}
     {{#if tooltip}}
@@ -14,7 +14,16 @@
   {{/if}}
   <div class="form-row__field">
     {{#unless dropdown}}
-      {{> input placeholder=placeholder}}
+      {{#if showContent}}
+        <div class="input-wrap">
+          <span class="toggle-show" id="{{showContent.idToggleIcon}}">
+            <i class="{{showContent.classCustomIcon}}" id="{{showContent.idCustomIcon}}"></i>
+          </span>
+          {{> input placeholder=placeholder}}
+        </div>
+      {{else}}
+        {{> input placeholder=placeholder}}
+      {{/if}}
       {{#if clearInput}}
         <button class="btn btn-secondary btn--clear" type="button">
           <i class="icon far fa-times fa-lg"></i>

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

@@ -125,18 +125,7 @@ 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/components/leave-event.js

@@ -47,6 +47,8 @@ Wick.LeaveEvent = {
     return arrForm;
   },
   processSerializedArr(arrForm, form) {
+    arrForm = arrForm.filter(item => item.name !== "g-recaptcha-response");
+
     arrForm = arrForm.map((item) => {
       let element = $(form).find(`[name="${item.name}"]`);
 

package/src/js/components/pwdstrength.js

@@ -0,0 +1,21 @@
+var Wick = window.Wick || {};
+
+Wick.Pwdstrength = {
+  el: {
+    $crossIcon: $("#crossIcon")
+  },
+  bindPStrength : function () {
+    $('.strength').pstrength({ verdicts: [
+        'Very weak',
+        'Weak',
+        'Medium',
+        'Strong',
+        'Very strong'
+      ],
+      tooShort: 'Too short',
+      minCharText: 'Minimum length is %d characters' });
+  },
+  init() {
+    Wick.Pwdstrength.bindPStrength();
+  },
+};