wickes-css2 2.94.0-develop.13 → 2.94.0-develop.16

package/package.json

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

package/src/components/checkout-action.hbs

@@ -1,14 +1,15 @@
-<div class="checkout-action__wrapper {{mod}}">
+<div class="checkout-action__wrapper {{lookup . "mod"}} {{view}}">
     {{#if head}}
         {{> checkout-section-title title=head}}
     {{/if}}
-    <div class="checkout-action">
+    <div class="checkout-action {{#if container}}container{{/if}}">
         <div class="checkout-action__section">
             <a href="#" class="btn btn_full btn-action btn-checkout">
-                Checkout
-                <span class="icon">
-                  <i class="fas fa-arrow-right"></i>
-                </span>
+              <span class="btn-wickes-checkout__label checkout-text--mixed">Checkout</span>
+              <span class="btn-wickes-checkout__label checkout-text--collect">Wickes Checkout</span>
+              <span class="icon">
+                <i class="fas fa-arrow-right"></i>
+              </span>
             </a>
         </div>
         <div class="checkout-action__section checkout-widget__basket-block">
@@ -23,13 +24,15 @@
                         </div>
                     </div>
                 </a>
+              {{#unless hidePaypalEmail}}
                 <div class="pay-pal_container-email">
-                    <div class="pay-pal_email-heading">Your PayPal email: </div>
-                    <div class="pay-pal_email-value">John.doe@gmail.com</div>
-                    <div class="pay-pal_email-link">
-                        <a href="#" title="" target="_blank">Don't use this email</a>
-                    </div>
+                  <div class="pay-pal_email-heading">Your PayPal email: </div>
+                  <div class="pay-pal_email-value">John.doe@gmail.com</div>
+                  <div class="pay-pal_email-link">
+                    <a href="#" title="" target="_blank">Don't use this email</a>
+                  </div>
                 </div>
+              {{/unless}}
             </div>
         </div>
     </div>

package/src/components/checkout-voucher-accordion.hbs

@@ -0,0 +1,15 @@
+<li class="checkout-widget__voucher-accordion">
+  <div
+      class="checkout-widget__voucher-toggle collapsed"
+      data-toggle="collapse"
+      data-target="#checkout-voucher-accordion-{{id}}"
+  >
+    Got a voucher?
+    <span class="checkout-widget__icon">
+            <i class="fal fa-angle-up fa-2x"></i>
+          </span>
+  </div>
+  <div class="collapse" id="checkout-voucher-accordion-{{id}}">
+    {{> checkout_voucher_large  id=id title=""}}
+  </div>
+</li>

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

@@ -12,12 +12,13 @@
             {{/each}}
         {{else}}
             {{#each info}}
-                <li class="checkout-widget__item {{#if mod}}checkout-widget__item-{{mod}}{{/if}}">
+                <li class="checkout-widget__item {{#if (lookup this "mod")}}checkout-widget__item-{{lookup this "mod"}}{{/if}}">
                     <span>{{title}}</span>
                     <span class="checkout-widget__item-value">{{value}}</span>
                 </li>
             {{/each}}
         {{/if}}
+        {{> 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"
@@ -35,7 +36,8 @@
             </li>
         {{/if}}
     </ul>
-    <div class="checkout-widget__total">
+  {{#unless mobile}}
+    <div class="checkout-widget__total" data-sticky-observe>
         {{#if confirmationSummary}}
             <div> {{ confirmation-summary.total.title }}</div>
             <div class="checkout-widget__total-value">{{ confirmation-summary.total.value }}</div>
@@ -44,5 +46,5 @@
             <div class="checkout-widget__total-value">{{ total.value }}</div>
         {{/if}}
     </div>
-
+  {{/unless}}
 </div>

package/src/components/checkout_voucher_large.hbs

@@ -1,19 +1,23 @@
 <div class="voucher">
-    {{#if title}}
-        {{> checkout-section-title}}
-    {{/if}}
-    <div class="checkout-widget checkout-voucher checkout-voucher_fixed">
-        <form id="form-checkout-voucher{{id}}">
-            {{> form-row id=(concat 'voucher-code' id) label="Voucher" label-hidden="true" required="true" placeholder="Enter code"}}
-            <button class="voucher__btn btn btn-secondary btn_full">
-                <span class="btn__text">Apply</span>
-            </button>
-        </form>
+  {{#if title}}
+    {{> checkout-section-title}}
+  {{/if}}
+  <div class="checkout-widget checkout-voucher checkout-voucher_fixed">
+    <form id="form-checkout-voucher{{id}}">
+      {{> form-row id=(concat 'voucher-code' id) label="Voucher" label-hidden="true" required="true" placeholder="Enter code" info=""}}
+      <button class="voucher__btn btn btn-primary">
+        <span class="btn__text">Apply</span>
+      </button>
+    </form>
+  </div>
+  {{#unless voucherApplied}}
+    <div class="checkout-widget checkout-voucher voucher-applied checkout-voucher-hide">
+      <div class="voucher-applied__inner">
+      <span class="icon icon__check">
+        <i class="fas fa-check-circle"></i>
+      </span>
+        <h5 class="heading-5 text-center">Voucher has been applied</h5>
+      </div>
     </div>
-    {{#unless voucherApplied}}
-        <div class="checkout-widget checkout-voucher voucher-applied checkout-voucher-hide">
-            <i class="fas fa-check-circle"></i>
-            <h3 class="heading-3 text-center">Voucher has been applied</h3>
-        </div>
-    {{/unless}}
+  {{/unless}}
 </div>

package/src/components/order-summary.hbs

@@ -1,66 +1,101 @@
+{{#if basket}}
+<div class="summary summary--mobile d-lg-none" id="summary-mobile-{{id}}">
+  {{> summary-mobile-bar}}
+  <div class="collapse summary__aside container" id="checkout-summary-mobile-accordion-{{id}}" data-sticky-element>
+
+    {{> checkout_order-summary-new head=title mod=mod id=(concat id "-mobile") mobile="true"}}
+    {{#unless basket}}
+      <div class="summary__payment footer-checkout">
+        {{#unless merged}}
+          {{#if paymentsCheckoutV2}}
+            <div class="footer-checkout-holder footer-checkout-holder--payways">
+              {{> payments-checkout-v2}}
+            </div>
+          {{else}}
+            <div class="footer-checkout-holder">
+              {{> payments-checkout clearPayIcon="true"}}
+              <span class="footer-checkout__copyright">
+                        Copyright ©
+                        <span class="current-year"></span> Wickes.co.uk
+                      </span>
+            </div>
+          {{/if}}
+        {{else}}
+          <div class="summary__payment-message">
+            <p class="summary__payment-main">{{vat-message.main}}</p>
+            <p class="summary__payment-additional">{{vat-message.additional}}</p>
+          </div>
+        {{/unless}}
+      </div>
+    {{/unless}}
+  </div>
+</div>
+{{/if}}
+
+
 <div class="summary {{#if mod}}summary-large{{/if}} {{#if paymentsCheckoutV2 }}summary--payways{{/if}}">
-    {{> checkout-section-title}}
-    {{#if mod}}
-        <div class="summary__accordion collapsed"
-              data-toggle="collapse"
-              data-target="#checkout-details-accordion-{{id}}"
-        >
-            <span class="summary__accordion-text">Show full summary</span>
-            <span class="icon summary-icon-small">
+  {{> checkout-section-title}}
+  {{#if mod}}
+    <div class="summary__accordion collapsed"
+         data-toggle="collapse"
+         data-target="#checkout-details-accordion-{{id}}"
+    >
+      <span class="summary__accordion-text">Show full summary</span>
+      <span class="icon summary-icon-small">
                 <i class="fas fa-angle-up"></i>
             </span>
-        </div>
-    {{/if}}
-    <div class="summary__aside">
-        {{> checkout_order-summary-new head=title mod=mod id=id}}
+    </div>
+  {{/if}}
+  <div class="summary__aside">
+    {{> checkout_order-summary-new head=title mod=mod id=id}}
 
-        {{#if klarna-placement}}
-            <div class="summary__klarna">
-                <klarna-placement
-                    data-key="credit-promotion-badge"
-                    data-locale="en-GB"
-                    data-purchase-amount="12000"
-                ></klarna-placement>
+    {{#if klarna-placement}}
+      <div class="summary__klarna">
+        <klarna-placement
+            data-key="credit-promotion-badge"
+            data-locale="en-GB"
+            data-purchase-amount="12000"
+        ></klarna-placement>
+      </div>
+    {{/if}}
+    {{#if clearpay-placement}}
+      {{> clearpay applyMargin=true hasKlarna=true}}
+    {{/if}}
+    {{#unless basket}}
+      <div class="summary__payment footer-checkout">
+        {{#unless merged}}
+          {{#if paymentsCheckoutV2 }}
+            <div class="footer-checkout-holder footer-checkout-holder--payways">
+              {{> payments-checkout-v2 }}
             </div>
-        {{/if}}
-        {{#if clearpay-placement}}
-            {{> clearpay applyMargin=true hasKlarna=true}}
-        {{/if}}
-        {{#unless basket}}
-            <div class="summary__payment footer-checkout">
-                {{#unless merged}}
-                  {{#if paymentsCheckoutV2 }}
-                    <div class="footer-checkout-holder footer-checkout-holder--payways">
-                      {{> payments-checkout-v2 }}
-                    </div>
-                  {{else}}
-                    <div class="footer-checkout-holder">
-                      {{> payments-checkout clearPayIcon="true" }}
-                      <span class="footer-checkout__copyright">Copyright © <span class="current-year"></span> Wickes.co.uk</span>
-                    </div>
-                  {{/if}}
-                {{else}}
-                    <div class="summary__payment-message">
-                        <p class="summary__payment-main">{{vat-message.main}}</p>
-                        <p class="summary__payment-additional">{{vat-message.additional}}</p>
-                    </div>
-                {{/unless}}
+          {{else}}
+            <div class="footer-checkout-holder">
+              {{> payments-checkout clearPayIcon="true" }}
+              <span class="footer-checkout__copyright">Copyright © <span class="current-year"></span> Wickes.co.uk</span>
             </div>
+          {{/if}}
+        {{else}}
+          <div class="summary__payment-message">
+            <p class="summary__payment-main">{{vat-message.main}}</p>
+            <p class="summary__payment-additional">{{vat-message.additional}}</p>
+          </div>
         {{/unless}}
-    </div>
+      </div>
+    {{/unless}}
+  </div>
 
-    {{#if basket-id}}
-        <div class="summary__basked-id">
-            Basket ID: <span class="id-number">136589003</span>
-        </div>
-    {{/if}}
+  {{#if basket-id}}
+    <div class="summary__basked-id">
+      Basket ID: <span class="id-number">136589003</span>
+    </div>
+  {{/if}}
 
-    {{#if email}}
-        <div class="summary__email">
-            <h3 class="heading-3">Email</h3>
-            <div class="summary__email-info">
-                Examplemail@wickes.co.uk
-            </div>
-        </div>
-    {{/if}}
+  {{#if email}}
+    <div class="summary__email">
+      <h3 class="heading-3">Email</h3>
+      <div class="summary__email-info">
+        Examplemail@wickes.co.uk
+      </div>
+    </div>
+  {{/if}}
 </div>

package/src/components/summary-mobile-bar.hbs

@@ -0,0 +1,17 @@
+<div class="summary__mobile-bar" data-sticky-element>
+  <div class="summary__mobile-order collapsed"
+       data-toggle="collapse"
+       aria-expanded="false"
+       data-target="#checkout-summary-mobile-accordion-{{id}}">
+    <div class="summary__mobile-container container">
+      <span class="summary__mobile-bar-label">Order Summary</span>
+      <div class="summary__icon-container">
+        <span class="summary__mobile-bar-total">{{ total.value }}</span>
+        <span class="summary__icon summary__icon-up">
+          <i class="fal fa-angle-up fa-2x"></i>
+        </span>
+      </div>
+    </div>
+  </div>
+    {{> checkout-action container="true" hidePaypalEmail="true"}}
+</div>

package/src/data/data_delivery-address-v2.json

@@ -9,7 +9,7 @@
           "mod": "bold"
         },
         {
-          "title": "Includes VAT:",
+          "title": "VAT:",
           "value": "£71.66",
           "mod": "vat"
         },

package/src/js/components/general/is-trade-pro.js

@@ -21,4 +21,18 @@ $(document).ready(function () {
     if (navigator.userAgent.match(/TradeProMobile_iOS|TradeProMobile_Android|DIYMobile_iOS|DIYMobile_Android/i)) {
         $('body').addClass('tp-app');
     }
-});
+});
+
+$(function() {
+    if (Wick.isTradeProAndroid) {
+        $('body').addClass('tp-android');
+    }
+    if (Wick.isTradeProiOS) {
+        $('body').addClass('tp-ios');
+        if (
+          window.matchMedia('(min-width: 768px)').matches
+        ) {
+            $('body').addClass('tp-ios-notch');
+        }
+    }
+});

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

@@ -43,7 +43,7 @@ Wick.BasketData = (function () {
       "status": 400,
       "responseJSON": {
         "globalMessage": {
-          "message": "Delivery is already free. Coupon can’t be applied",
+          "message": "Delivery is already free.\nCoupon can’t be applied."
         }
       }
     },
@@ -444,7 +444,7 @@ Wick.BasketData = (function () {
       "appliedOrderPromotions": [],
       "promotionsInfo": null,
       "clickAndCollectOnly": true,
-      "deliveryItemsQuantity": 0,
+      "deliveryItemsQuantity": 1,
       "pickupItemsQuantity": 2,
       "freeDelivery": false,
       "subtotalWithoutCharity": {"value": 19.0, "formattedValue": "£19.00", "currencyIso": "GBP", "formattedPriceWithoutCurrencySymbol": "19.00"},

package/src/js/page/basket/summary-mobile.js

@@ -0,0 +1,22 @@
+const summaryMobileEl = {
+  summaryAside: '.summary__aside',
+  backToTop : '#back-to-top',
+  canDisplayPayPal: '#canDisplayPayPalOnBasketPage',
+};
+
+export function addClassToSummaryAside(data) {
+  const payPalEnabled = data?.paymentInfos?.payPalEnabled;
+  const clickAndCollectOnly = data.clickAndCollectOnly;
+  const canDisplayPayPal = $(summaryMobileEl.canDisplayPayPal).val() === 'true';
+  const isPayPalAllowed = payPalEnabled && clickAndCollectOnly && canDisplayPayPal;
+  const $aside = $(summaryMobileEl.summaryAside);
+  const $backToTop = $(summaryMobileEl.backToTop);
+
+  if (isPayPalAllowed === false) {
+    $aside.addClass('single-button');
+    $backToTop.addClass('single-button');
+  } else {
+    $aside.removeClass('single-button');
+    $backToTop.removeClass('single-button');
+  }
+}

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

@@ -29,6 +29,8 @@ import {
 } from './basket/session-sync'
 import {displayEnergyEfficiency} from "./basket/display-energy-efficiency";
 import {appendLoader, hideLoader, showLoader} from "./utils/loader";
+import {addClassToSummaryAside} from "./basket/summary-mobile";
+import { initStickyObserver } from './components/sticky-order-observer';
 
 var Wick = window.Wick || {};
 Wick.BasketPage = {
@@ -384,6 +386,7 @@ Wick.BasketPage = {
         } else {
             if (initial) {
                 Wick.BasketPage.getCartEntries(Wick.BasketData.updateCart);
+                addClassToSummaryAside(Wick.BasketData.updateCart);
                 const initialTotalPrice = Wick.BasketData.updateCart.totalPrice.value;
                 updateClearpayVisibility(initialTotalPrice);
             } else {
@@ -405,6 +408,7 @@ Wick.BasketPage = {
                 updateClearpayPlacements(Wick.BasketData.updateCart.totalPrice.value);
                 updateClearpayVisibility(Wick.BasketData.updateCart.totalPrice.value);
                 Wick.BasketPage.addPotentialPromo(Wick.BasketData.updateCart);
+                addClassToSummaryAside(Wick.BasketData.updateCart);
                 Wick.BasketPage.getCartEntries(Wick.BasketData.updateCart);
                 Wick.BasketPage.checkProductArrays(Wick.BasketData.updateCart) || Wick.BasketPage.removeOrderItem(repaintData);
                 updateBasketSession();
@@ -415,6 +419,7 @@ Wick.BasketPage = {
     },
     updateCartAction: function (response, info) {
         updateClearpayVisibility(response.totalPrice.value)
+        addClassToSummaryAside(response)
         if (info.initial) {
             Wick.BasketPage.getCartEntries(response);
         } else {
@@ -1257,6 +1262,9 @@ Wick.BasketPage = {
         $(Wick.BasketPage.el.content).find(quantityButton).prop('disabled', false);
     }
 };
+
+$(document).on('cartUpdate', initStickyObserver);
+
 $(document).ready(function () {
     function init() {
 
@@ -1291,6 +1299,11 @@ $(document).ready(function () {
 
         $(Wick.BasketPage.el.voucherRemove).unbind('click');
         Wick.BasketPage.paintActionButton();
+        initStickyObserver(
+            $('[data-sticky-observe]'),
+            $('[data-sticky-element]'),
+            '.summary__aside.collapse.show'
+        );
         Wick.BasketPage.updateCart(...Array(3), true);
         setDefaultCharityValue();
         if (!$(Wick.BasketPage.el.loader).length) {

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

@@ -1,4 +1,5 @@
 import {updateDiscount} from "./discounts";
+import {addClassToSummaryAside} from "../basket/summary-mobile";
 
 const osEl = {
     $summarySection: $('.summary'),
@@ -9,9 +10,9 @@ const osEl = {
     itemFree: '.checkout-widget__item-free',
     itemDeficit: '.checkout-widget__item-deficit',
     summaryDelivery: '.checkout-widget__item-delivery',
+    summaryMobileTotal: '.summary__mobile-bar-total',
 }
 
-
 export function updateOrderSummary(data, equalMap, isVoucher) {
     equalMap.forEach((obj) => {
         if ($(obj.item).length) {
@@ -32,9 +33,12 @@ export function updateOrderSummary(data, equalMap, isVoucher) {
         }
     })
 
+    const value = data.totalPrice?.formattedValue || data.total;
+
     updateDiscount(data, isVoucher);
     hideUnusedDeliveryTypeCost(data, isVoucher);
     calculateFreeDelivery(data);
+    updateSummaryMobileBarTotal(value);
 }
 
 function createCheckoutWidgetItem(obj) {
@@ -97,3 +101,6 @@ function calculateFreeDelivery(data) {
     })
 }
 
+function updateSummaryMobileBarTotal(formattedValue) {
+    $(osEl.summaryMobileTotal).text(formattedValue);
+}

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

@@ -0,0 +1,49 @@
+export function initStickyObserver(observedElements, stickyElements, collapseSelector) {
+  let io;
+
+  const $observed = observedElements instanceof jQuery
+    ? observedElements
+    : $(observedElements);
+
+  const $sticky = stickyElements instanceof jQuery
+    ? stickyElements
+    : $(stickyElements);
+
+  if (!$observed.length || !$sticky.length) return;
+
+  function toggle(hide) {
+    $sticky.toggleClass('is-hidden', hide);
+    $('body').toggleClass('summary-hidden', hide);
+    if (hide) {
+      $(collapseSelector).collapse('hide');
+    }
+  }
+
+  if ('IntersectionObserver' in window) {
+    io = new IntersectionObserver(
+      entries => {
+        const anyInView = entries.some(e => e.isIntersecting);
+        toggle(anyInView);
+      },
+      { rootMargin: '0px 0px -20% 0px', threshold: 0 }
+    );
+    $observed.each((_, el) => io.observe(el));
+  } else {
+    // Fallback for older browsers
+    function check() {
+      let anyInView = false;
+      $observed.each(function () {
+        const r = this.getBoundingClientRect();
+        if (r.top < window.innerHeight * 0.8 && r.bottom > 0) {
+          anyInView = true;
+          return false; // break
+        }
+      });
+      toggle(anyInView);
+    }
+    $(window)
+      .off('scroll.sticky resize.sticky')
+      .on('scroll.sticky resize.sticky', check);
+    check();
+  }
+}

package/src/js/page/components/voucher.js

@@ -15,7 +15,7 @@ const voucherEl = {
     formInvalid: 'form_invalid',
     fieldRow: '.form-row[data-row-required]',
     rowValidationError: 'form-row_validation-error',
-    voucherHide: '.checkout-voucher-hide',
+    voucherHide: 'checkout-voucher-hide',
     fieldError: '.form-row__error',
     subtotal: '.checkout-widget__item-bold',
     vat: '.checkout-widget__item-vat',

package/src/layouts/basket-new.hbs

@@ -38,7 +38,7 @@
       {{#block "prefooter"}}{{/block}}
     </main>
     {{#block "footer"}}
-      {{> footer-checkout-v2 }}
+      {{> footer-checkout-v2}}
     {{/block}}
     {{#block "foot"}}
       {{> scripts }}

package/src/layouts/checkout-new.hbs

@@ -42,6 +42,7 @@
     {{/block}}
     {{#block "foot"}}
       {{> scripts }}
+      <script src="./js/checkout.min.js"></script>
     {{/block}}
   </body>
 </html>

package/src/page_checkout_confirmation-new-marketing-consent-error.html

@@ -61,8 +61,6 @@
     </div>
   </div>
 
-  {{> checkout_voucher_large  title="Voucher Code"}}
-
   <div class="continue-btn">
     <button class="btn btn-action">Continue to Payment Details</button>
   </div>

package/src/page_checkout_delivery-address-customer-journey.html

@@ -36,8 +36,6 @@
     </div>
   </div>
 
-{{> checkout_voucher_large  title="Voucher Code" id="0"}}
-
   <div class="continue-btn">
       <button class="btn btn-action">Continue to Delivery Details</button>
   </div>
@@ -47,7 +45,6 @@
 {{#content "foot" mode="append"}}
   <script defer src="./js/page/checkout-confirmation-new.js"></script>
   <script defer src="./js/page/select-address.js"></script>
-  <script src="./js/checkout.min.js"></script>
 
   {{#extend "modal" classMod="edit-delivery-address" id="modalDeliveryEdit" title="Edit delivery address" fullWidth=true}}
     {{#content "body"}}
@@ -67,5 +64,3 @@
 
 {{/content}}
 {{/extend}}
-
-

package/src/page_checkout_delivery-address-v2.html

@@ -32,9 +32,6 @@
     </div>
   </div>
 
-
-{{> checkout_voucher_large  title="Voucher Code" id="0"}}
-
   <div class="continue-btn">
       <button class="btn btn-action">Continue to Delivery Details</button>
   </div>
@@ -43,6 +40,5 @@
 
 {{#content "foot" mode="append"}}
 <script defer src="./js/page/checkout-confirmation-new.js"></script>
-<script src="./js/checkout.min.js"></script>
 {{/content}}
 {{/extend}}

package/src/page_checkout_delivery-details-v2-asm.html

@@ -1,4 +1,4 @@
-{{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout-confirmation-new" title="Checkout - Delivery details" isAsideSticky="true"}}
+{{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout-confirmation-new page_checkout" title="Checkout - Delivery details" isAsideSticky="true"}}
 {{#content "steps"}}
 {{> steps active-step-index="2" }}
 {{/content}}
@@ -117,8 +117,6 @@
         </button>
     </div>
 
-{{> checkout_voucher_large  title="Voucher Code"}}
-
   <div class="continue-btn">
       <button class="btn btn-action">Continue to Payment Details</button>
   </div>
@@ -146,5 +144,3 @@
 
 {{/content}}
 {{/extend}}
-
-