wickes-css2 2.98.0-develop.6 → 2.98.0-develop.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wickes-css2",
-  "version": "2.98.0-develop.6",
+  "version": "2.98.0-develop.8",
   "description": "CSS and JS and page templates in use by Wickes",
   "main": "index.js",
   "scripts": {
@@ -108,7 +108,7 @@
     "branches": [
       "alt-master",
       {
-        "name": "custom-tag/0.3.0-legends",
+        "name": "develop",
         "prerelease": "${name.replace(/^custom-tag\\//g, '')}"
       }
     ],

package/src/components/checkout_order-summary-new.hbs

@@ -18,26 +18,21 @@
                 </li>
             {{/each}}
         {{/if}}
-        {{#unless hideApplyVoucher}}
-          {{> checkout-voucher-accordion id=id}}
-        {{/unless}}
+        {{> checkout-voucher-accordion id=id}}
         {{#if discounts}}
             <li class="checkout-widget__accordion-wrap checkout-widget__details-discount">
-              <span
-                class="checkout-widget__detail-name checkout-widget__detail-name_accordion collapsed"
-                data-toggle="collapse"
-                data-target="#acheckout-widget-accordion-{{id}}">
-                  Discount(s):
-                  <span class="icon accordion__header-icon-small">
-                    <i class="fas fa-angle-up"></i>
-                  </span>
-              </span>
-              <ul class="checkout-widget__details-hidden collapse" id="acheckout-widget-accordion-{{id}}">
-                  {{#each discounts}}
-                      {{> cart-voucher}}
-                  {{/each}}
-              </ul>
-              <span class="checkout-widget__detail-value">£0.00</span>
+            <span class="checkout-widget__detail-name checkout-widget__detail-name_accordion collapsed" data-toggle="collapse"
+                    data-target="#acheckout-widget-accordion-{{id}}">Discount(s):
+                <span class="icon accordion__header-icon-small">
+                <i class="fas fa-angle-up"></i>
+                </span>
+            </span>
+                <ul class="checkout-widget__details-hidden collapse" id="acheckout-widget-accordion-{{id}}">
+                    {{#each discounts}}
+                        {{> cart-voucher}}
+                    {{/each}}
+                </ul>
+                <span class="checkout-widget__detail-value">£0.00</span>
             </li>
         {{/if}}
     </ul>

package/src/components/header-minicart.hbs

@@ -6,12 +6,12 @@
       </span>
       <span class="header-right__link-title">Basket</span>
     </span>
-    <button type="button" class="header-right__link header-minicart__btn header-minicart__btn_link" style="display: none;">
+    <a href="page_shopping-cart.html" class="header-right__link header-minicart__btn header-minicart__btn_link"  style="display: none;">
       <span class="btn__text">
         <i class="fas fa-shopping-basket fa-2x"></i>
       </span>
       <span class="header-right__link-title">Basket</span>
-    </button>
+    </a>
   </div>
   <span class="header-minicart__counter">0</span>
-</div>
+</div>

package/src/components/legal-info.hbs

@@ -1,24 +1,27 @@
-<div class="container">
-  <div class="row">
-    <div class="col-12">
-      <div class="legal-info">
-        <h3 class="legal-info__toggle" data-toggle="collapse" data-target="#collapseInfo" aria-expanded="false" aria-controls="collapseInfo">
-          {{#if customTitle}}
-            {{customTitle}}
-          {{else}}
-            Frequently Asked Questions
-          {{/if}}
-          <span class="icon-wrap"></span>
-        </h3>
-
-        <div class="collapse" id="collapseInfo">
-          <div class="collapse-wrap">
-            <div class="container">
-              {{{page_category-landing.legal-info}}}
-            </div>
-          </div>
+<div class="legal-info container">
+    <div class="row">
+        <div class="col-lg-3"></div>
+        <div class="col-lg-9">
+            <p>
+                Terms and conditions Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
+                incididunt ut labore et dolore
+                magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
+                commodo
+                consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
+                pariatur.
+                Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
+                laborum.
+            </p>
+            <p>
+                Terms and conditions Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
+                incididunt ut labore et dolore
+                magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea
+                commodo
+                consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla
+                pariatur.
+                Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est
+                laborum.
+            </p>
         </div>
-      </div>
     </div>
-  </div>
-</div>
+</div>

package/src/components/my-account/saving-totaliser.hbs

@@ -0,0 +1,52 @@
+<div class="saving-totaliser {{#if this-last-year}}saving-totaliser--this-last-year{{/if}} {{#if this-year-only}}saving-totaliser--this-year-only{{/if}} {{#if no-savings}}saving-totaliser--no-savings{{/if}}">
+  <div class="saving-totaliser__title heading-3">Your TradePro savings</div >
+  <div class="saving-totaliser__wrapper">
+    <div class="saving-totaliser__cell">
+      <div class="saving-totaliser__saved">
+        <div class="saving-totaliser__cell-title saving-totaliser__saving-title">Since joining TradePro you've saved</div>
+        <div class="heading-1">{{#if no-savings}}£0.00{{else}}£3,920.37{{/if}}</div>
+      </div>
+      <div class="saving-totaliser__encourage">
+        {{#unless no-savings}}
+          <div>
+            <div class="saving-totaliser__attencion heading-2">Impressive!</div>
+            <div>Continue shopping with us to save even more.</div>
+          </div>
+        {{else}}
+          <div>
+            <div class="saving-totaliser__attencion heading-2">Looks like you've not used your discount yet. </div>
+            <div>Start shopping with us to start your building your TradePro savings.</div>
+            <a href="#" class="btn btn-primary">
+              <span class="btn__text">Explore offers</span>
+            </a>
+          </div>
+        {{/unless}}
+      </div>
+      <div class="saving-totaliser__saving-icon icon">
+        <i class="fas fa-piggy-bank"></i>
+      </div>
+    </div>
+     {{#unless no-savings}}
+      <div class="saving-totaliser__wrapper2">
+        <div class="saving-totaliser__cell">
+          <div class="saving-totaliser__cell-title heading-5">This month</div>
+          <div class="mb-0 heading-3">£18.43</div>
+        </div>
+        <div class="saving-totaliser__cell saving-totaliser__split-cell">
+          <div class="saving-totaliser__semi-cell">
+            <div class="saving-totaliser__cell-title heading-5">This year</div>
+            <div class="mb-0 heading-3">£471.34</div>
+          </div>
+          {{#unless this-year-only}}
+            <div class="saving-totaliser__divider"></div>
+            <div class="saving-totaliser__semi-cell">
+              <div class="saving-totaliser__cell-title heading-5">Last year</div>
+              <div class="mb-0 heading-3">£2,381.10</div>
+            </div>
+          {{/unless}}
+        </div>
+      </div>
+    {{/unless}}
+  </div>
+  <div class="saving-totaliser__note">Savings are calculated from the verification date of your TradePro account and are based on your TradePro Discount for online orders only.</div>
+</div>

package/src/components/pdp-price-actions.hbs

@@ -83,4 +83,4 @@
     <span class="btn__text">Order Paint Mix</span>
   </button>
 </div>
-{{/if}}
+{{/if}}

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

@@ -194,6 +194,7 @@
                         big-wins=big-wins
                         wisdom=wisdom
                         mcfc=mcfc
+                        paint-mix=true
                         available=available
                         stock-accordion="stock-accordion"
                         isUserNonRegistered=isUserNonRegistered

package/src/components/track-my-order-info.hbs

@@ -1,7 +1,9 @@
 <div class="order-info">
   <h3 class="order-info__toggle" data-toggle="collapse" data-target="#collapseInfo" aria-expanded="false" aria-controls="collapseInfo">
     {{title}}
-    <span class="icon-wrap"></span>
+    <span class="icon-wrap">
+      <i class="fas fa-plus icon"></i>
+    </span>
   </h3>
 
   <div class="collapse" id="collapseInfo">

package/src/data/data_confirmation-summary.json

@@ -2,12 +2,12 @@
   "confirmation-summary": {
     "info": [
       {
-        "title": "Items subtotal:",
+        "title": "Items Subtotal:",
         "value": "£44.44",
         "mod": "bold"
       },
       {
-        "title": "VAT:",
+        "title": "Includes VAT:",
         "value": "£71.66",
         "mod": "vat"
       },
@@ -21,7 +21,7 @@
         "mod": "delivery"
       },
       {
-        "title": "Charity donation:",
+        "title": "Young Minds donation:",
         "value": "£1.00"
       }
     ],

package/src/data/data_latest-offers.json

@@ -2409,4 +2409,4 @@
       ]
     }
   }
-}
+}

package/src/data/data_mini-basket.json

@@ -11,8 +11,7 @@
         "price": "£2,009.00",
         "incVatPrice": "£30.00",
         "excVatPrice": "£10.00",
-        "lower-quantity": true,
-        "CC": "East Grinstead"
+        "lower-quantity": true
       },
       {
         "quantity": {
@@ -32,77 +31,9 @@
         "title": "Rangemaster Classic Deluxe 90 Ceramic Range Cooker - Black with Chrome Trim",
         "src": "img/placeholders/[e-img-4to3].jpg",
         "price": "£2,009.00",
-        "incVatPrice": "£309.00",
-        "excVatPrice": "£109.00",
-        "bad-amount": true
-      },
-      {
-        "quantity": {
-          "value": "1"
-        },
-        "title": "Rangemaster Classic Deluxe 90 Ceramic Range Cooker - Black with Chrome Trim",
-        "src": "img/placeholders/tap.jpg",
-        "price": "£2,009.00",
-        "incVatPrice": "£30.00",
-        "excVatPrice": "£10.00",
-        "lower-quantity": true,
-        "CC": "East Grinstead"
-      },
-      {
-        "quantity": {
-          "value": "1"
-        },
-        "title": "Rangemaster Classic Deluxe 90 Ceramic Range Cooker - Black with Chrome Trim",
-        "src": "img/placeholders/[e-img-4to3].jpg",
-        "price": "£2,009.00",
-        "incVatPrice": "£309.00",
-        "excVatPrice": "£109.00",
-        "bad-amount": true
-      },
-      {
-        "quantity": {
-          "value": "1"
-        },
-        "title": "Rangemaster Classic Deluxe 90 Ceramic Range Cooker - Black with Chrome Trim",
-        "src": "img/placeholders/[e-img-4to3].jpg",
-        "price": "£2,009.00",
-        "incVatPrice": "£309.00",
-        "excVatPrice": "£109.00",
-        "bad-amount": true
-      },
-      {
-        "quantity": {
-          "value": "1"
-        },
-        "title": "Rangemaster Classic Deluxe 90 Ceramic Range Cooker - Black with Chrome Trim",
-        "src": "img/placeholders/tap.jpg",
-        "price": "£2,009.00",
-        "incVatPrice": "£30.00",
-        "excVatPrice": "£10.00",
-        "lower-quantity": true,
-        "CC": "East Grinstead"
-      },
-      {
-        "quantity": {
-          "value": "1"
-        },
-        "title": "Rangemaster Classic Deluxe 90 Ceramic Range Cooker - Black with Chrome Trim",
-        "src": "img/placeholders/[e-img-4to3].jpg",
-        "price": "£2,009.00",
-        "incVatPrice": "£309.00",
-        "excVatPrice": "£109.00",
-        "bad-amount": true
-      },
-      {
-        "quantity": {
-          "value": "1"
-        },
-        "title": "Rangemaster Classic Deluxe 90 Ceramic Range Cooker - Black with Chrome Trim",
-        "src": "img/placeholders/[e-img-4to3].jpg",
-        "price": "£2,009.00",
-        "incVatPrice": "£309.00",
-        "excVatPrice": "£109.00",
-        "bad-amount": true
+        "incVatPrice": "£3,009.00",
+        "excVatPrice": "£1,009.00",
+        "basket-product": true
       }
     ],
     "just-added": [
@@ -117,11 +48,6 @@
         "excVatPrice": "£1,009.00",
         "basket-product": true
       }
-    ],
-    "total": {
-      "totalPrice": {
-        "formattedValue": "£17.50"
-      }
-    }
+    ]
   }
-}
+}

package/src/data/data_page-category.json

@@ -217,7 +217,6 @@
           }
         ]
       }
-    ],
-    "legal-info": "<p>Our selection of toilets is crafted to suit a wide range of <a href=\"https://www.wickes.co.uk/bathroom/suites\">bathroom suites</a>, from compact cloakrooms to spacious bathrooms. With our large selection, you’ll easily find a solution for both modern and traditional spaces. Each toilet is built for efficiency and easy maintenance, helping you achieve a stylish, functional bathroom with a range of finishes and shapes.</p>\n<h3>FAQs</h3>\n<h4>What are the different types of toilets?</h4>\n<p>Different toilet types include close-coupled, back-to-wall, rimless, wall-hung, and <a href=\"https://www.wickes.co.uk/Products/Bathrooms/Toilets+Accessories/Low+High-Level-Toilets/c/1000359\">high and low-level toilets</a>. Each has unique installation and style benefits, suitable for various bathroom sizes and styles.</p>\n<h4>What toilets suit a modern bathroom?</h4>\n<p>Rimless, wall-hung and <a href=\"https://www.wickes.co.uk/Products/Bathrooms/Toilets+Accessories/Back-to-Wall-Toilets/c/1000282\">back-to-wall toilets</a> fit well in modern bathrooms. Their sleek designs and efficient features offer a clean, contemporary look.</p>\n<h4>What toilets look best in a traditional bathroom?</h4>\n<p>High-level and low-level toilets are popular in traditional designs, adding elegance and classic style with vintage-inspired cisterns and details.</p>"
+    ]
   }
 }

package/src/data/data_page-merge-basket.json

@@ -110,7 +110,7 @@
         "energyEfficiency": {
           "type": "Old",
           "rating": "C",
-          "linkProduct": "https://media.wickes.co.uk/image/upload/v1676542815/documents/wickes/Product-Info-Example_qj5mln.pdf"
+          "linkProduct": "https://media.wickes.co.uk/image/upload/v1676542815/documents/wickes/Product-Info-Example_qj5mln.pdf",
         }
       },
       {

package/src/data/data_store-locator-v2.json

@@ -8,7 +8,7 @@
       "telephone": "01872 6511 101",
       "fax": "01872 6511 101",
       "sat-nav": "X11 1TT",
-      "store-info": "Maecenas nisl leo, consectetur a lacus eu, lacinia tincidunt elit. Suspendisse bibendum molestie lectus sit amet vehicula. Vestibulum in nisi at felis finibus maximus. Fusce placerat viverra semper. Sed in nulla quis neque commodo faucibus a ut eros."
+      "store-info": "Maecenas nisl leo, consectetur a lacus eu, lacinia tincidunt elit. Suspendisse bibendum molestie lectus sit amet vehicula. Vestibulum in nisi at felis finibus maximus. Fusce placerat viverra semper. Sed in nulla quis neque commodo faucibus a ut eros.",
     },
     "accordion-data": [
       {

package/src/js/emulation/big-wins.js

@@ -612,35 +612,35 @@ Wick.BigWinsProto = function () {
       $temp.remove();
     });
 
-    // bwVar.$addForDelivery.on('click', function () {
-    //   Wick.SnackBar.show(
-    //       {
-    //         text: 'Notification success message for Delivery with Close Btn',
-    //         type: Wick.SnackBar.types.SUCCESS
-    //       }
-    //   );
-    //   Wick.SnackBar.show(
-    //       {
-    //         text: 'Notification warning message for Delivery with Close Btn',
-    //         type: Wick.SnackBar.types.WARNING
-    //       }
-    //   );
-    //   Wick.SnackBar.show(
-    //       {
-    //         text: 'Notification error message for Delivery with Close Btn',
-    //         type: Wick.SnackBar.types.ERROR
-    //       }
-    //   );
-    //   Wick.SnackBar.show(
-    //       {
-    //         text: 'Notification success message for Delivery with Autoclose',
-    //         type: Wick.SnackBar.types.SUCCESS,
-    //         withCloseButton: false,
-    //         autoClose: true,
-    //         delayBeforeClose: 3000
-    //       }
-    //   );
-    // });
+    bwVar.$addForDelivery.on('click', function () {
+      Wick.SnackBar.show(
+          {
+            text: 'Notification success message for Delivery with Close Btn',
+            type: Wick.SnackBar.types.SUCCESS
+          }
+      );
+      Wick.SnackBar.show(
+          {
+            text: 'Notification warning message for Delivery with Close Btn',
+            type: Wick.SnackBar.types.WARNING
+          }
+      );
+      Wick.SnackBar.show(
+          {
+            text: 'Notification error message for Delivery with Close Btn',
+            type: Wick.SnackBar.types.ERROR
+          }
+      );
+      Wick.SnackBar.show(
+          {
+            text: 'Notification success message for Delivery with Autoclose',
+            type: Wick.SnackBar.types.SUCCESS,
+            withCloseButton: false,
+            autoClose: true,
+            delayBeforeClose: 3000
+          }
+      );
+    });
 
     bwVar.$addClickAndCollect.on('click', function (e) {
       e.stopPropagation();

package/src/js/emulation/mock.js

@@ -20,50 +20,5 @@ Wick.FEMock = {
       "page": 2,
       "html": '<article class="active-orders__item"><header class="order-header"><h3 class="order-header__title">Order 940564001</h3><div class="order-status completed"><svg class="svg-inline--fa fa-check-circle fa-w-16 icon" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="check-circle" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" data-fa-i2svg=""><path fill="currentColor" d="M504 256c0 136.967-111.033 248-248 248S8 392.967 8 256 119.033 8 256 8s248 111.033 248 248zM227.314 387.314l184-184c6.248-6.248 6.248-16.379 0-22.627l-22.627-22.627c-6.248-6.249-16.379-6.249-22.628 0L216 308.118l-70.059-70.059c-6.248-6.248-16.379-6.248-22.628 0l-22.627 22.627c-6.248 6.248-6.248 16.379 0 22.627l104 104c6.249 6.249 16.379 6.249 22.628.001z"></path></svg><span>Complete</span></div></header><section class="order-details"><div class="order-details__summary"><span class="order-details__price">£92.75</span> <span class="order-details__count">7 item(s)</span></div><time class="order-details__date" datetime="21st November 2024 4:32 PM">21st November 2024 4:32 PM</time></section><div class="view-more"><a class="link" href="/"><span>View More</span> <svg class="svg-inline--fa fa-arrow-right fa-w-14 icon" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="arrow-right" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" data-fa-i2svg=""><path fill="currentColor" d="M190.5 66.9l22.2-22.2c9.4-9.4 24.6-9.4 33.9 0L441 239c9.4 9.4 9.4 24.6 0 33.9L246.6 467.3c-9.4 9.4-24.6 9.4-33.9 0l-22.2-22.2c-9.5-9.5-9.3-25 .4-34.3L311.4 296H24c-13.3 0-24-10.7-24-24v-32c0-13.3 10.7-24 24-24h287.4L190.9 101.2c-9.8-9.3-10-24.8-.4-34.3z"></path></svg></a></div></article><article class="active-orders__item"><header class="order-header"><h3 class="order-header__title">Order 940520002</h3><div class="order-status cancelled"><svg class="svg-inline--fa fa-times fa-w-10 icon" aria-hidden="true" focusable="false" data-prefix="far" data-icon="times" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" data-fa-i2svg=""><path fill="currentColor" d="M207.6 256l107.72-107.72c6.23-6.23 6.23-16.34 0-22.58l-25.03-25.03c-6.23-6.23-16.34-6.23-22.58 0L160 208.4 52.28 100.68c-6.23-6.23-16.34-6.23-22.58 0L4.68 125.7c-6.23 6.23-6.23 16.34 0 22.58L112.4 256 4.68 363.72c-6.23 6.23-6.23 16.34 0 22.58l25.03 25.03c6.23 6.23 16.34 6.23 22.58 0L160 303.6l107.72 107.72c6.23 6.23 16.34 6.23 22.58 0l25.03-25.03c6.23-6.23 6.23-16.34 0-22.58L207.6 256z"></path></svg><span>Cancelled</span></div></header><section class="order-details"><div class="order-details__summary"><span class="order-details__price">£32.00</span> <span class="order-details__count">1 item(s)</span></div><time class="order-details__date" datetime="28th October 2024 7:29 AM">28th October 2024 7:29 AM</time></section><div class="view-more"><a class="link" href="/"><span>View More</span> <svg class="svg-inline--fa fa-arrow-right fa-w-14 icon" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="arrow-right" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" data-fa-i2svg=""><path fill="currentColor" d="M190.5 66.9l22.2-22.2c9.4-9.4 24.6-9.4 33.9 0L441 239c9.4 9.4 9.4 24.6 0 33.9L246.6 467.3c-9.4 9.4-24.6 9.4-33.9 0l-22.2-22.2c-9.5-9.5-9.3-25 .4-34.3L311.4 296H24c-13.3 0-24-10.7-24-24v-32c0-13.3 10.7-24 24-24h287.4L190.9 101.2c-9.8-9.3-10-24.8-.4-34.3z"></path></svg></a></div></article>'
     }
-  ],
-  cartPDP: `
-          <div class="custom-slider__wrap custom-slider__wrap--scroll">
-            <div class="custom-slider__header">
-              <a href="#" type="button" class="link close-popup">
-                  <span class="icon-wrap">
-                    <svg class="svg-inline--fa fa-angle-left fa-w-6" aria-hidden="true" focusable="false" data-prefix="far" data-icon="angle-left" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 192 512" data-fa-i2svg=""><path fill="currentColor" d="M4.2 247.5L151 99.5c4.7-4.7 12.3-4.7 17 0l19.8 19.8c4.7 4.7 4.7 12.3 0 17L69.3 256l118.5 119.7c4.7 4.7 4.7 12.3 0 17L168 412.5c-4.7 4.7-12.3 4.7-17 0L4.2 264.5c-4.7-4.7-4.7-12.3 0-17z"></path></svg>
-                  </span>
-                Continue shopping
-              </a>
-              <a href="#" type="button" class="icon-wrap close-popup">
-                <svg class="svg-inline--fa fa-times fa-w-10 icon" aria-hidden="true" focusable="false" data-prefix="far" data-icon="times" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 320 512" data-fa-i2svg=""><path fill="currentColor" d="M207.6 256l107.72-107.72c6.23-6.23 6.23-16.34 0-22.58l-25.03-25.03c-6.23-6.23-16.34-6.23-22.58 0L160 208.4 52.28 100.68c-6.23-6.23-16.34-6.23-22.58 0L4.68 125.7c-6.23 6.23-6.23 16.34 0 22.58L112.4 256 4.68 363.72c-6.23 6.23-6.23 16.34 0 22.58l25.03 25.03c6.23 6.23 16.34 6.23 22.58 0L160 303.6l107.72 107.72c6.23 6.23 16.34 6.23 22.58 0l25.03-25.03c6.23-6.23 6.23-16.34 0-22.58L207.6 256z"></path></svg>
-              </a>
-            </div>
-            <div class="custom-slider__message">
-                <span class="icon-wrap success">
-                    <svg class="svg-inline--fa fa-check-circle fa-w-16" aria-hidden="true" focusable="false" data-prefix="fas" data-icon="check-circle" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" data-fa-i2svg=""><path fill="currentColor" d="M504 256c0 136.967-111.033 248-248 248S8 392.967 8 256 119.033 8 256 8s248 111.033 248 248zM227.314 387.314l184-184c6.248-6.248 6.248-16.379 0-22.627l-22.627-22.627c-6.248-6.249-16.379-6.249-22.628 0L216 308.118l-70.059-70.059c-6.248-6.248-16.379-6.248-22.628 0l-22.627 22.627c-6.248 6.248-6.248 16.379 0 22.627l104 104c6.249 6.249 16.379 6.249 22.628.001z"></path></svg>
-                </span>
-              <div class="messages">
-                <p class="messages__text">You’ve just added</p>
-                <span class="messages__notice">Excluding items already in the basket</span>
-              </div>
-            </div>
-            <ul class="products">
-              <li class="products__item">
-                <a class="products__image" href="page_product-details-with-global-search-v2.html">
-                  <img class="product-img" src="img/placeholders/tap.jpg" alt="">
-                </a>
-                <div class="products__details">
-                  <a href="#" class="title">Rangemaster Classic Deluxe 90 Ceramic Range Cooker - Black with Chrome Trim</a>
-                  <p class="item">Click &amp; Collect: <span class="value">East Grinstead</span></p>
-                  <p class="item">Qty: <span class="value">1</span></p>
-                  <p class="price including-vat-inherit">£30.00 <span class="inc">Inc.VAT</span></p>
-                  <p class="price excluding-vat-inherit">£10.00 <span class="inc">Exc.VAT</span></p>
-                </div>
-              </li>
-            </ul>
-            <div class="custom-slider__content">
-              <p>Product description Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar sic tempor. Sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus pronin sapien nunc accuan eget. Product description Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar sic tempor. Sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus pronin sapien nunc accuan eget.</p>
-            </div>
-          </div>
-          <div class="custom-slider__footer footer-fixed">
-            <button class="btn btn_full btn-secondary close-popup">Continue Shopping</button>
-            <button class="btn btn-action btn_full">View Basket</button>
-          </div>
-      `
+  ]
 }

package/src/js/emulation/popover-mini-basket.js

@@ -129,8 +129,8 @@ Wick.MiniBasket = (function() {
       });
     },
     bindEvents: function(){
-      // this._bindEvents();
-      // this._bindTouchEvents();
+      this._bindEvents();
+      this._bindTouchEvents();
     },
     enable: function(){
       rollover.isDisabled = false;

package/src/js/page/pdp.js

@@ -24,10 +24,7 @@ Wick.PDP = (function () {
     $page
       .find('.btn-add-to-basket, .card-store-collect__btn')
       .on('click', function(){
-        // TODO: This code is currently not in use because the backend (BE) has its own build for PDP.
-        //       Consider removing this fragment if it's confirmed to be obsolete, or document why it might still be needed.
-
-        // Wick.MiniBasket && Wick.MiniBasket.showJustAdded();
+        Wick.MiniBasket && Wick.MiniBasket.showJustAdded();
       });
   }
 

package/src/layouts/base.hbs

@@ -42,12 +42,6 @@
       {{> footer }}
     {{/block}}
 
-    {{#if miniBasketEmpty}}
-      {{> mini-basket/mini-basket-empty }}
-    {{else}}
-      {{> mini-basket/mini-basket }}
-    {{/if}}
-
     {{#block "foot"}}
       {{> scripts }}
     {{/block}}

package/src/layouts/my-account-v2.hbs

@@ -21,13 +21,6 @@
 {{#block "footer"}}
   {{> footer }}
 {{/block}}
-
-{{#if miniBasketEmpty}}
-  {{> mini-basket/mini-basket-empty }}
-{{else}}
-  {{> mini-basket/mini-basket }}
-{{/if}}
-
 {{#block "foot"}}
   {{> scripts}}
 {{/block}}

package/src/page_my-account-trade-pro-components.html

@@ -0,0 +1,27 @@
+{{#extend
+  "my-account-v2"
+  iconUserClass=my_account.tradepro.icons.tradeproID
+  dataBreadcrumbs=my_account.tradepro.breadcrumbs
+  pageClass="page_my-account_new"
+  title=my_account.tradepro.title
+  pageMyAcc=true
+  myAccV2=true
+  isLoggedIn=true
+  mainClass="my-account"
+  switch-vat=true
+}}
+{{#content "main"}}
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      {{> my-account/saving-totaliser this-last-year=true}}
+      {{> my-account/saving-totaliser this-year-only=true}}
+      {{> my-account/saving-totaliser no-savings=true}}
+    </div>
+  </div>
+</div>
+{{/content}}
+{{#content "foot" mode="append"}}
+<script defer src="./js/my-account.min.js"></script>
+{{/content}}
+{{/extend}}

package/src/page_my-account-trade-pro.html

@@ -69,6 +69,13 @@
     </div>
   </div>
 </div>
+<div class="container">
+  <div class="row">
+    <div class="col-12">
+      {{> my-account/saving-totaliser this-last-year=true}}
+    </div>
+  </div>
+</div>
 <div class="account-actions">
   <div class="container">
     <div class="row">

package/src/page_product-details-saved-pl.html

@@ -1,19 +1,16 @@
-{{#extend "base"
-    pageClass="page-product-details"
-    title="Product details page new"
-    isDiscount=true
-    isSQM=true
-    isDescription=true
-    isCashback=false
-    isSize=true
-    isGuide=true
-    hourly-delivery=true
-    badge-text='15% off'
-    badge-color='yellow'
-    badge-text-color='gray'
-    currentlyInStock=true
-    pagePdp=true
-    miniBasketEmpty=true
+{{#extend "base" pageClass="page-product-details" title="Product details page new"
+          isDiscount=true
+          isSQM=true
+          isDescription=true
+          isCashback=false
+          isSize=true
+          isGuide=true
+          hourly-delivery=true
+          badge-text='15% off'
+          badge-color='yellow'
+          badge-text-color='gray'
+          currentlyInStock=true
+          pagePdp=true
 }}
     {{#content "head" mode="append" pagePdp=true}}{{/content}}
     {{#content "body"}}