wickes-css2 2.112.0-develop.4 → 2.112.0-develop.6

package/package.json

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

package/src/components/my-account/order.hbs

@@ -2,7 +2,12 @@
   <div class="order__header">
     <h3 class="order__title">{{title}}</h3>
     <div class="order__subtotal-wrap">
-      <p class="order__subtotal">Item(s) subtotal: <b>{{subtotal}}</b></p>
+      {{#if switchVat}}
+        <p class="order__subtotal including-vat">Item(s) subtotal: <b>{{subtotal}}</b></p>
+        <p class="order__subtotal excluding-vat d-none">Item(s) subtotal: <b>{{subtotalExcVat}}</b></p>
+      {{else}}
+        <p class="order__subtotal">Item(s) subtotal: <b>{{subtotal}}</b></p>
+      {{/if}}
       {{> info-icon
           modification="icon-info"
           title=subtotalTooltip

package/src/components/order-item.hbs

@@ -91,20 +91,20 @@
             <div class="order-item__price">
                 <div class="order-item__price-title">Item price:</div>
                 <div class="order-item__price-value">
-                    {{#ifvalue price value='0'}}
+                    {{#ifvalue displayBasePrice value='0'}}
                         <span class="order-item__value">FREE</span>
                     {{else}}
                         {{#if switch-vat}}
                             <div class="including-vat">
-                                <span class="order-item__value">£{{price}}</span>
+                                <span class="order-item__value">£{{displayBasePrice}}</span>
                                 <div class="price-vat">Inc.VAT</div>
                             </div>
                             <div class="excluding-vat d-none">
-                                <span class="order-item__value">£{{priceExcVat}}</span>
+                                <span class="order-item__value">£{{displayBasePriceExclusiveVat}}</span>
                                 <div class="price-vat">Exc.VAT</div>
                             </div>
                         {{else}}
-                            <span class="order-item__value">£{{price}}</span>
+                            <span class="order-item__value">£{{displayBasePrice}}</span>
                         {{/if}}
                     {{/ifvalue}}
                 </div>
@@ -136,15 +136,15 @@
                     {{else}}
                         {{#if switch-vat}}
                             <div class="including-vat">
-                                <span class="order-item__value">£{{total}}</span>
+                                <span class="order-item__value">£{{displayItemTotalWithoutDiscount}}</span>
                                 <div class="price-vat">Inc.VAT</div>
                             </div>
                             <div class="excluding-vat d-none">
-                                <span class="order-item__value">£{{totalExcVat}}</span>
+                                <span class="order-item__value">£{{displayItemTotalWithoutDiscountExclusiveVat}}</span>
                                 <div class="price-vat">Exc.VAT</div>
                             </div>
                         {{else}}
-                            <span class="order-item__value">£{{total}}</span>
+                            <span class="order-item__value">£{{displayItemTotalWithoutDiscount}}</span>
                         {{/if}}
                     {{/ifvalue}}
                 </div>

package/src/components/potential-promotion.hbs

@@ -2,16 +2,16 @@
     <div class="p-promotion__icon">
         <i class="icon fas fa-gift"></i>
     </div>
-    {{#ifCond switch-vat '&&' descriptionExcVat}}
+    {{#ifCond switch-vat '&&' displayDescriptionExclusiveVat}}
         <div class="p-promotion__description including-vat">
-            {{description}}
+            {{displayDescription}}
         </div>
         <div class="p-promotion__description excluding-vat d-none">
-            {{descriptionExcVat}}
+            {{displayDescriptionExclusiveVat}}
         </div>
     {{else}}
         <div class="p-promotion__description">
-            {{description}}
+            {{displayDescription}}
         </div>
     {{/ifCond}}
     <div class="p-promotion__close">

package/src/components/price-badges.hbs

@@ -0,0 +1,12 @@
+<div class="pdp__badges-wrapper">
+    <div class="pdp__badges pdp-price-container__badges price__badges-v2 price__badges-v2-{{badge-color}}
+        {{#if badge-text-color}}price__badges-v2-text-{{badge-text-color}}{{/if}}
+        {{#if badge-wide}}price__badges-v2-wide{{/if}}">
+        {{#ifCond switch-vat '&&' badge-text-exc}}
+            <div class="pdp__badge including-vat">{{badge-text}}</div>
+            <div class="pdp__badge excluding-vat d-none">{{badge-text-exc}}</div>
+        {{else}}
+            <div class="pdp__badge">{{badge-text}}</div>
+        {{/ifCond}}
+    </div>
+</div>

package/src/components/price-block-v2.hbs

@@ -1,17 +1,8 @@
 <div class="pdp-price-container">
-  {{#if isDiscount}}
-    <div class="pdp__badges pdp-price-container__badges price__badges-v2 price__badges-v2-{{badge-color}}
-      {{#if badge-text-color}}price__badges-v2-text-{{badge-text-color}}{{/if}}
-      {{#if badge-wide}}price__badges-v2-wide{{/if}}">
-      {{#ifCond switch-vat '&&' badge-text-exc}}
-        <div class="pdp__badge including-vat">{{badge-text}}</div>
-        <div class="pdp__badge excluding-vat d-none">{{badge-text-exc}}</div>
-      {{else}}
-        <div class="pdp__badge">{{badge-text}}</div>
-      {{/ifCond}}
-    </div>
-  {{/if}}
   <div class="pdp-price">
+    {{#if isDiscount}}
+        {{> price-badges}}
+    {{/if}}
     <div class="pdp-price__value">
       {{#if switch-vat}}
         <div class="pdp-price-sale__value including-vat">

package/src/components/share-list-modal-without-social-icons.hbs

@@ -18,10 +18,10 @@
 
         <form class="share-list__form" action="#" id="share-list-form">
 
-          {{> form-row type="email" id="share-via-email" label="Share via email" info="Enter email addresses separated by space:"}}
+          {{> form-row type="text" id="share-via-email" label="Share via email" info="Enter email addresses separated by space:"}}
 
           <div class="share-via-email-box">
-            {{> form-row type="email"}}
+            {{> form-row type="text"}}
           </div>
 
           <span id="add-btn" class="add-email-btn">

package/src/components/share-list-modal.hbs

@@ -18,10 +18,10 @@
 
             <form class="share-list__form" action="#" id="share-list-form">
 
-                {{> form-row type="email" id="share-via-email" label="Share via email" info="Enter email addresses separated by space:"}}
+                {{> form-row type="text" id="share-via-email" label="Share via email" info="Enter email addresses separated by space:"}}
 
                 <div class="share-via-email-box">
-                    {{> form-row type="email"}}
+                    {{> form-row type="text"}}
                 </div>
 
                 <span id="add-btn" class="add-email-btn">
@@ -89,6 +89,10 @@
     })
 
     $(".share-list__cancel").bind("click", function() {
-        $("input[type=email]").val("");
+        $(".js-share-email").val("");
+
+        if (window.Wick && Wick.ShoppingList && typeof Wick.ShoppingList.resetFormErrors === "function") {
+            Wick.ShoppingList.resetFormErrors();
+        }
     });
 </script>

package/src/data/data_shopping-cart-v2.json

@@ -9,11 +9,15 @@
     "potentialOrderPromotions": [
       {
         "description": "Spend over £200 on Bathroom Lighting and save £10.0",
-        "descriptionExcVat": "Spend over £150 on Bathroom Lighting and save £10.0"
+        "descriptionExcVat": "Spend over £150 on Bathroom Lighting and save £10.0",
+        "displayDescription": "Spend over £200 on Bathroom Lighting and save £10.0",
+        "displayDescriptionExclusiveVat": "Spend over £150 on Bathroom Lighting and save £10.0"
       },
       {
         "description": "Spend over 2500 pound and get £2500 discount",
-        "descriptionExcVat": "Spend over 2000 pound and get £2000 discount"
+        "descriptionExcVat": "Spend over 2000 pound and get £2000 discount",
+        "displayDescription": "Spend over 2500 pound and get £2500 discount",
+        "displayDescriptionExclusiveVat": "Spend over 2000 pound and get £2000 discount"
       }
     ],
     "checkout": {
@@ -110,6 +114,10 @@
             "quantity": 2,
             "total": "32",
             "totalExcVat": "30",
+            "displayBasePrice": "16",
+            "displayBasePriceExclusiveVat": "15",
+            "displayItemTotalWithoutDiscount": "32",
+            "displayItemTotalWithoutDiscountExclusiveVat": "30",
             "offers": [
               "Buy 2 for 3 — Add 1 to qualify",
               "Buy 2 for 3 — Add 1 to qualify"
@@ -369,6 +377,10 @@
             "quantity": 123,
             "total": "19776",
             "totalExcVat": "19000",
+            "displayBasePrice": "16",
+            "displayBasePriceExclusiveVat": "15",
+            "displayItemTotalWithoutDiscount": "19776",
+            "displayItemTotalWithoutDiscountExclusiveVat": "19000",
             "message": "Purchased 12 times since your last visit 1 day ago",
             "click-and-collect": {
               "otherStores": [
@@ -604,6 +616,10 @@
             "quantity": 2,
             "total": "32",
             "totalExcVat": "30",
+            "displayBasePrice": "16",
+            "displayBasePriceExclusiveVat": "15",
+            "displayItemTotalWithoutDiscount": "32",
+            "displayItemTotalWithoutDiscountExclusiveVat": "30",
             "click-and-collect": {
               "otherStores": [
                 {
@@ -836,6 +852,10 @@
             "priceExcVat": "15",
             "total": "32",
             "totalExcVat": "30",
+            "displayBasePrice": "16",
+            "displayBasePriceExclusiveVat": "15",
+            "displayItemTotalWithoutDiscount": "32",
+            "displayItemTotalWithoutDiscountExclusiveVat": "30",
             "quantity": 1,
             "totalMobile": "16",
             "click-and-collect": {
@@ -1077,6 +1097,10 @@
             "quantity": 2,
             "total": "32",
             "totalExcVat": "30",
+            "displayBasePrice": "16",
+            "displayBasePriceExclusiveVat": "15",
+            "displayItemTotalWithoutDiscount": "32",
+            "displayItemTotalWithoutDiscountExclusiveVat": "30",
             "offers": [
               "Buy 2 for 3 — Add 1 to qualify",
               "Buy 2 for 3 — Add 1 to qualify"
@@ -1100,6 +1124,10 @@
             "quantity": 123,
             "total": "19776",
             "totalExcVat": "19000",
+            "displayBasePrice": "16",
+            "displayBasePriceExclusiveVat": "15",
+            "displayItemTotalWithoutDiscount": "19776",
+            "displayItemTotalWithoutDiscountExclusiveVat": "19000",
             "message": "Purchased 12 times since your last visit 1 day ago",
             "address": "Watford",
             "updateable": true
@@ -1115,6 +1143,10 @@
             "quantity": 2,
             "total": "32",
             "totalExcVat": "30",
+            "displayBasePrice": "16",
+            "displayBasePriceExclusiveVat": "15",
+            "displayItemTotalWithoutDiscount": "32",
+            "displayItemTotalWithoutDiscountExclusiveVat": "30",
             "updateable": true
 
           },
@@ -1126,6 +1158,10 @@
             "priceExcVat": "15",
             "total": "32",
             "totalExcVat": "30",
+            "displayBasePrice": "16",
+            "displayBasePriceExclusiveVat": "15",
+            "displayItemTotalWithoutDiscount": "32",
+            "displayItemTotalWithoutDiscountExclusiveVat": "30",
             "code": "1231210",
             "quantity": 1,
             "totalMobile": "16",
@@ -1139,6 +1175,10 @@
             "priceExcVat": "0",
             "total": "0",
             "totalExcVat": "0",
+            "displayBasePrice": "0",
+            "displayBasePriceExclusiveVat": "0",
+            "displayItemTotalWithoutDiscount": "0",
+            "displayItemTotalWithoutDiscountExclusiveVat": "0",
             "updateable": false,
             "code": "1231211",
             "quantity": 1,
@@ -1160,6 +1200,10 @@
             "quantity": 1,
             "total": "968",
             "totalExcVat": "960",
+            "displayBasePrice": "968",
+            "displayBasePriceExclusiveVat": "960",
+            "displayItemTotalWithoutDiscount": "968",
+            "displayItemTotalWithoutDiscountExclusiveVat": "960",
             "deliveryStock": true,
             "onlyDeliveryType": true
           }

package/src/data/data_shopping-cart-with-energy.json

@@ -8,10 +8,14 @@
     },
     "potentialOrderPromotions": [
       {
-        "description": "Spend over £200 on Bathroom Lighting and save £10.0"
+        "description": "Spend over £200 on Bathroom Lighting and save £10.0",
+        "displayDescription": "Spend over £200 on Bathroom Lighting and save £10.0",
+        "displayDescriptionExclusiveVat": "Spend over £150 on Bathroom Lighting and save £10.0"
       },
       {
-        "description": "Spend over 2500 pound and get £2500 discount"
+        "description": "Spend over 2500 pound and get £2500 discount",
+        "displayDescription": "Spend over 2500 pound and get £2500 discount",
+        "displayDescriptionExclusiveVat": "Spend over 2000 pound and get £2000 discount"
       }
     ],
     "checkout": {
@@ -80,6 +84,10 @@
             "price": "16",
             "quantity": 2,
             "total": "32",
+            "displayBasePrice": "16",
+            "displayBasePriceExclusiveVat": "15",
+            "displayItemTotalWithoutDiscount": "32",
+            "displayItemTotalWithoutDiscountExclusiveVat": "30",
             "offers": [
               "Buy 2 for 3 — Add 1 to qualify",
               "Buy 2 for 3 — Add 1 to qualify"
@@ -339,6 +347,10 @@
             "price": "16",
             "quantity": 2,
             "total": "32",
+            "displayBasePrice": "16",
+            "displayBasePriceExclusiveVat": "15",
+            "displayItemTotalWithoutDiscount": "32",
+            "displayItemTotalWithoutDiscountExclusiveVat": "30",
             "offers": [
               "Buy 2 for 3 — Add 1 to qualify",
               "Buy 2 for 3 — Add 1 to qualify"
@@ -604,6 +616,10 @@
             "price": "16",
             "quantity": 2,
             "total": "32",
+            "displayBasePrice": "16",
+            "displayBasePriceExclusiveVat": "15",
+            "displayItemTotalWithoutDiscount": "32",
+            "displayItemTotalWithoutDiscountExclusiveVat": "30",
             "offers": [
               "Buy 2 for 3 — Add 1 to qualify",
               "Buy 2 for 3 — Add 1 to qualify"
@@ -628,6 +644,10 @@
             "price": "16",
             "quantity": 3,
             "total": "32",
+            "displayBasePrice": "16",
+            "displayBasePriceExclusiveVat": "15",
+            "displayItemTotalWithoutDiscount": "32",
+            "displayItemTotalWithoutDiscountExclusiveVat": "30",
             "energyEfficiencyInfo": {
               "ratingValue": "D",
               "oldRatingType": false,
@@ -641,6 +661,10 @@
             "image": "./img/tile-buying-guide.jpg",
             "title": "6 Wickes General Purpose Claw test",
             "price": "16",
+            "displayBasePrice": "16",
+            "displayBasePriceExclusiveVat": "15",
+            "displayItemTotalWithoutDiscount": "16",
+            "displayItemTotalWithoutDiscountExclusiveVat": "15",
             "code": "123143",
             "quantity": 1,
             "totalMobile": "16",

package/src/data/my-account/data_my-order.json

@@ -87,6 +87,8 @@
         {
           "title": "Click & Collect",
           "subtotal": "£53.65",
+          "subtotalExcVat": "£44.71",
+          "switchVat": true,
           "deliveryRange": [
             {
               "icon": "fas fa-box-alt",
@@ -159,6 +161,8 @@
         {
           "title": "Rapid Delivery",
           "subtotal": "£53.65",
+          "subtotalExcVat": "£44.71",
+          "switchVat": true,
           "track": "#",
           "deliveryRange": [
             {
@@ -202,6 +206,8 @@
         {
           "title": "Wickes Delivery",
           "subtotal": "£53.65",
+          "subtotalExcVat": "£44.71",
+          "switchVat": true,
           "track": "#",
           "deliveryRange": [
             {
@@ -263,6 +269,8 @@
           "title": "Supplier Delivery",
           "supplier": true,
           "subtotal": "£53.65",
+          "subtotalExcVat": "£44.71",
+          "switchVat": true,
           "deliveryRange": [
             {
               "icon": "fas fa-box-alt",