wickes-css2 2.100.0 → 2.101.0-develop.1

package/package.json

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

package/src/components/srp-injected.hbs

@@ -0,0 +1,19 @@
+<div class="srp-injected">
+  <div class="srp-injected__content clamped-text">
+    <p>
+      <span style="font-size:12pt; font-variant:normal; white-space:pre-wrap">
+          <span style="font-family:'Helvetica Neue',sans-serif">
+              <span style="color:#000000">
+                  <span style="font-weight:400">
+                      <span style="font-style:normal">
+                          <span style="text-decoration:none">
+                              The right lighting can turn your bathroom into a sanctuary, blending style and practicality. From sleek ceiling lights to illuminated and elegant wall fixtures, each of our options is designed to elevate your space. Create a warm, inviting glow that turns your bathroom into a haven of comfort and style.
+                          </span>
+                      </span>
+                  </span>
+              </span>
+          </span>
+      </span>
+    </p>
+  </div>
+</div>

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

@@ -83,7 +83,7 @@
               },
               {
                 "shipmentIcon": "fas fa-shipping-fast",
-                "shipmentTitle": "Wickes Rapid Delivery from Southampton Store",
+                "shipmentTitle": "Rapid Delivery from Southampton Store",
                 "shipmentInfo": "Dispatched. Delivery — within 3 hours",
                 "itemsCount": 4,
                 "trackingLink": "/"
@@ -280,7 +280,7 @@
               },
               {
                 "shipmentIcon": "fas fa-shipping-fast",
-                "shipmentTitle": "Wickes Rapid Delivery from Southampton Store",
+                "shipmentTitle": "Rapid Delivery from Southampton Store",
                 "shipmentInfo": "Dispatched. Delivery — within 3 hours",
                 "itemsCount": 4,
                 "trackingLink": "/"
@@ -462,7 +462,7 @@
               },
               {
                 "shipmentIcon": "fas fa-shipping-fast",
-                "shipmentTitle": "Wickes Rapid Delivery from Southampton Store",
+                "shipmentTitle": "Rapid Delivery from Southampton Store",
                 "shipmentInfo": "Dispatched. Delivery — within 3 hours",
                 "itemsCount": 4,
                 "trackingLink": "/"

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

@@ -157,7 +157,7 @@
           "subtotalTooltip": "Order level promotions and delivery charges are not included"
         },
         {
-          "title": "Wickes Rapid",
+          "title": "Rapid Delivery",
           "subtotal": "£53.65",
           "track": "#",
           "deliveryRange": [

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

@@ -57,7 +57,7 @@
           },
           {
             "shipmentIcon": "fas fa-shipping-fast",
-            "shipmentTitle": "Wickes Rapid Delivery from Southampton Store",
+            "shipmentTitle": "Rapid Delivery from Southampton Store",
             "shipmentInfo": "Dispatched. Delivery — within 3 hours",
             "itemsCount": 4,
             "trackingLink": "/"

package/src/js/components/general/clamp-content.js

@@ -7,6 +7,7 @@ Wick.ClampContent = {
   CLAMP_BUTTON_HTML: '<a class="clamp_btn clamp_btn-new" href="#">Read more</a>',
   MAX_LINES: 3,
   clampContentClass: 'clamp-content',
+  clampContentSafariClass: 'clamp-content--safari',
   clampContentSelector: '.clamp-content',
   clampElementsList: [
     '.page-header__intro',
@@ -66,9 +67,16 @@ Wick.ClampContent = {
       );
     });
   },
+  isSafari() {
+    return /^((?!chrome|android).)*safari/i.test(navigator.userAgent);
+  },
   getElementsForClamping() {
     Wick.ClampContent.clampElementsList.forEach((el) => {
       $(el).addClass(Wick.ClampContent.clampContentClass);
+
+      if (Wick.ClampContent.isSafari()) {
+        $(el).addClass(Wick.ClampContent.clampContentSafariClass);
+      }
     })
   },
   init() {

package/src/js/page/basket/wisdom.js

@@ -139,7 +139,7 @@ export function addDeliveryStock(e) {
 
 function addForDelivery(data) {
     Wick.BasketPage.showNotification(data);
-    const statusCode = ['success', 'noStock', 'lowStock']
+    const statusCode = ['success', 'noStock', 'lowStock', 'maxOrderQuantityExceeded']
 
     if (statusCode.includes(data.statusCode)) {
         Wick.BasketPage.updateCart(true);
@@ -294,4 +294,4 @@ export function prettifyWisdomPostcode(e) {
     const postcode = targetPostcode.val();
     const prettifiedPostcode = transformPostcodeToCanonicalView(postcode);
     $(wisdomEl.postcodeInput).val(prettifiedPostcode);
-}
+}

package/src/page_category-landing-with-banner.html

@@ -3,12 +3,20 @@
 {{#content "heading"}}
   <div class="page-header">
     <h1 class="page-header__title">Tools & Workwear</h1>
-    <p class="page-header__intro">
-      Our Tools & Workwear range features everything you could possibly need for a project. Protect yourself and your crew
-      with our range of Safety Equipment and Workwear including clothing, footwear, jackets, overalls and protection for
-      the
-      eyes and ears.
-    </p>
+    <div class="page-header__intro">
+      Our extensive range of Power Tools includes drills, grinders, sanders, saws and other carpentry tools, used by tradesmen and DIYers alike for a professional finish.
+      In addition to our Wickes own-brand range, we also stock trusted brands like
+      <a href="/buying-guides/makita">Makita</a>,
+      <a href="/buying-guides/DEWALT">DEWALT</a>,
+      <a href="/buying-guides/Einhell">Einhell</a>,
+      <a href="/featured/new-stanley-v20-range">Stanley FatMax V20</a>,
+      <a href="/Products/Tools+Workwear/Power-Tools/Nail-Guns/c/1089002?q=%3Arelevance%3AbrandName%3APaslode&amp;text=&amp;Paslode=Paslode#">Paslode</a>,
+      <a href="/buying-guides/bosch">Bosch</a> and <a href="/buying-guides/bosch-professional">Bosch Professional</a>.
+      <br>
+      <br>
+      Need help choosing a drill? then take a look at our handy
+      <a href="/drills-buying-guide">Drills Buying Guide</a>
+    </div>
   </div>
 {{/content}}
 {{#content "main"}}

package/src/page_plp_v2-vat.html

@@ -1,6 +1,7 @@
 {{#extend "base" hybrisClass="hybris-class" pageClass="products-list-page" title="Products list" pagePlp=true switch-vat=true}}
-    {{#content "head" mode="append" pagePlp=true}}{{/content}}
-<style></style>
+    {{#content "head" mode="append" pagePlp=true}}
+        <link type="text/css" rel="stylesheet" href="./css/pages/page_products-list.css">
+    {{/content}}
     {{#content "body"}}
         <main>
             <div class="container">
@@ -10,11 +11,7 @@
                         Fire Doors
                     </h1>
 
-                    <div class="srp-injected">
-                        <div class="srp-injected__content">
-                            <p>Outdoor wall lights are a stylish, yet effective solution to keeping your garden glowing as the day draws to a close. Whether it’s an extra bit of security from one of our outdoor wall lights with sensors, or a more vibrant, decorative addition, our full range of outdoor lighting is designed to bring a touch of life to your surroundings.</p>
-                        </div>
-                    </div>
+                    {{> srp-injected}}
                 </div>
 
                 <div class="row">

package/src/scss/components/_clamp-content.scss

@@ -12,6 +12,12 @@
     margin-bottom: 0;
     padding-bottom: 0;
   }
+
+  &--safari {
+    a {
+      display: contents;
+    }
+  }
 }
 
 .clamped-text {

package/src/scss/pages/page_products-list.scss

@@ -30,8 +30,6 @@
       font-size: 16px;
       font-weight: 500;
       line-height: 1.5;
-      padding: 1em 1.25em;
-      margin-bottom: 20px;
       text-align: left;
 
       p {
@@ -319,10 +317,4 @@
       padding: 5px 0;
     }
   }
-
-  .srp-injected {
-    &__content {
-      padding: 1.25em .75em;
-    }
-  }
 }