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

package/src/js/page/components/modal-observer.js

@@ -0,0 +1,51 @@
+var Wick = Wick || {};
+
+Wick.ModalObserver = (function () {
+  const modal = $('.modal-scroll-observer');
+    modalContent = modal.find('.modal-content'),
+    modalBody = modal.find('.modal-body');
+
+  $(document).ready(function () {
+    if (!modal.length) {
+      return;
+    }
+
+    function updateScrollFades() {
+      const tolerance = 5;
+      const scrollTop = modalBody.scrollTop();
+      const scrollHeight = modalBody.prop('scrollHeight');
+      const visibleHeight = modalBody.outerHeight();
+
+      const isAtTop = scrollTop <= tolerance;
+      const isAtBottom = scrollTop + visibleHeight >= scrollHeight - tolerance;
+
+      let state;
+
+      if (isAtTop && isAtBottom) {
+        state = 'full';
+      } else if (isAtTop) {
+        state = 'top';
+      } else if (isAtBottom) {
+        state = 'bottom';
+      } else {
+        state = 'middle';
+      }
+
+      modalContent.attr('data-scroll-state', state);
+    }
+
+    modalBody.on('scroll', updateScrollFades);
+
+    modal.on('shown.bs.modal', function() {
+      updateScrollFades();
+    });
+
+    $(window).on('resize', function() {
+      if (modal.is(':visible')) {
+        updateScrollFades();
+      }
+    });
+
+  });
+
+})();

package/src/page_basket-billie.html

@@ -0,0 +1,54 @@
+{{#extend "basket-new" page_shopping-cart pageClass="page_basket basket" title="Basket-Billie" clearPayIcon=true pageBasket=true billieIcon=true}}
+{{#content "head" mode="append"}}
+<link type="text/css" rel="stylesheet" href="./css/pages/page_shopping-cart-v2.css">
+<link type="text/css" rel="stylesheet" href="./css/pages/checkout-new.css">
+{{/content}}
+{{#content "heading"}}
+<div class="notification-area pr-0 pl-0">
+  {{> notifications notification-page.warning-tiles-changed withCloseBtn="true"}}
+</div>
+<div class="checkout-header__promo">
+  {{#each shopping-cart-v2.potentialOrderPromotions}}
+  {{> potential-promotion}}
+  {{/each}}
+</div>
+{{> checkout-header shopping-cart-v2.header}}
+{{/content}}
+{{#content "aside"}}
+{{> order-summary
+shopping-cart-v2.checkout
+id=1
+title="Order Summary"
+basket=true
+clearPayIcon=clearPayIcon
+billie-placement=true
+clearpay-placement=true
+klarna-placement=false
+billieIcon=true
+paymentsCheckoutV2=true
+}}
+{{> checkout-action  mod="mounted"}}
+{{> summary-payment paymentsCheckoutV2="true" billieIcon=true}}
+{{> checkout-action  mod="large"}}
+{{/content}}
+{{#content "main"}}
+<input type="hidden" id="SUPPLIER_DELIVERED_7_DAYS" value="<b> Wickes Supplier </b> - Delivery within 7 days">
+<input type="hidden" id="STANDARD" value="<b> STANDARD </b> - Delivery within 1 day">
+<input type="hidden" id="canDisplayPayPalOnBasketPage" value="true">
+{{#each shopping-cart-v2.sections }}
+<section class="basket__section" data-type="{{type}}">
+  {{> checkout-section-title title=type items-count=items-count}}
+  {{#each items}}
+  {{> order-item}}
+  {{/each}}
+</section>
+{{/each}}
+{{> charity-donations-multiple shopping-cart-v2.charityDonationMultiple}}
+{{> checkout-action}}
+{{/content}}
+{{#content "foot" mode="append"}}
+<script defer src="./js/basket.min.js"></script>
+<script defer src="./js/page/components/modal-observer.js"></script>
+{{> billie-modal }}
+{{/content}}
+{{/extend}}

package/src/page_checkout_confirmation-billie.html

@@ -0,0 +1,339 @@
+{{#extend "checkout-new" pageClass="page_checkout page_checkout-confirmation-new" title="Checkout - Confirmation"
+logout=true}}
+{{#content "steps"}}
+<div class="header-wrap">
+  <h1 class="header__title">Order Confirmation</h1>
+  <p class="header__order-block">Order number: <span class="header__order-number">143402004</span></p>
+</div>
+{{/content}}
+{{#content "main"}}
+
+<div class="confirmation-result-wrap">
+  <div class="confirmation-result__notif">
+    <span class="notif-check"><i class="fas fa-check"></i></span>
+    <span class="notif-info">Your Order Was Successful!</span>
+  </div>
+
+  <p class="confirmation-result__info">
+    We have emailed your order confirmation to <a href="mailto:petra.mendez@gmail.com">petra.mendez@gmail.com</a> with details of when your order will be delivered. This email will also contain our contact details should you wish to get in touch with us.
+  </p>
+
+  <div class="confirmation-result__action">
+    <a href="https://www.wickes.co.uk/track-my-order" class="btn btn-primary"><i class="fas fa-map-marked-alt"></i> Track My Order</a>
+    <a href="https://www.wickes.co.uk/my-account/orders" class="btn btn-primary">View My Order</a>
+    <a href="./" class="btn btn-secondary">Return Shopping</a>
+  </div>
+</div>
+
+{{#with checkoutOrder.delivery.[0]}}
+{{>checkout-order}}
+{{/with}}
+
+
+{{#with checkoutOrder.clickCollect.[0]}}
+{{>checkout-order}}
+{{/with}}
+
+
+{{#with checkoutOrder.charity.[0]}}
+{{>checkout-order charity="true"}}
+{{/with}}
+
+
+{{> checkout_payment-new billie=true}}
+{{> checkout_order-summary-new label="Subtotal:" confirmationSummary="true"}}
+
+<form class="checkout-tradepro form-bg">
+  <div class="checkout-tradepro__row">
+    <div class="checkout-tradepro__descr">
+      <div class="checkout-tradepro__info-wrap">
+        <div class="checkout-tradepro__info">
+          It looks like you're in the Trade?
+          You could be eligible to join TradePro and get
+          <strong>10% off future purchases whenever you shop in-store or online.</strong>
+        </div>
+        <a href="#" class="checkout-tradepro__learn-more">Learn more about TradePro</a>
+      </div>
+      <h3>TradePro Signup</h3>
+      <div class="warning-required">Required fields</div>
+      <h3 class="checkout-tradepro__title">Proof of Trade ID</h3>
+      <p class="checkout-tradepro__paragraph warning-required">
+        Please supply two forms of approved ID
+      </p>
+
+      <div class="signup-tradepro__attach checkout-tradepro__attach_id">
+        {{> attach-make make-attachment=true}}
+        {{> modal id="attac"}}
+        {{#extend "modal" id="attach" title="Choose Type of ID" fullWidth=true classMod="id-type"}}
+        {{#content "sections"}}
+
+        {{#extend "modal-body-section" customSectionClass="id-type-signup"}}
+        {{#content "body"}}
+        {{> notifications notification-page.warning withCloseBtn="true"
+        text="Unable to attach file. Only JPG, PNG, GIF, BMP, WEBP, TIFF and HEIF image files are supported."}}
+        <div class="signup-tradepro__modal-info">
+          Select two forms of ID.
+          <div class="tradepro-id-counter_wrap">
+            <span>1</span>
+            of
+            <span>2</span>
+          </div>
+          ID's chosen
+        </div>
+        <div class="signup-tradepro__modal-fields">
+          <div class="tradepro-field">
+              <span class="icon icon__link inactive-el">
+                <i class="far fa-link"></i>
+              </span>
+            <a href="#" class="signup-tradepro__modal-trigger inactive-el">Trade business website</a>
+            <div class="signup-tradepro__modal-action">
+              <div class="form-row" data-row-required="">
+                <label class="form-row__label"></label>
+                <div class="form-row__field">
+                  {{> input need-pattern=true}}
+                  <div class="form-row__error">{{error}}</div>
+                </div>
+              </div>
+              <div class="signup-tradepro__modal-buttons">
+                <div class="row">
+                  <div class="button-done">
+                    <button class="btn btn-primary">
+                      Done
+                    </button>
+                  </div>
+                  <div class="button-cancel">
+                    <button class="btn btn-secondary">
+                      Cancel
+                    </button>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="tradepro-field">
+              <span class="icon icon__link">
+                <i class="far fa-link"></i>
+              </span>
+            <span class="icon icon__pencil">
+                <i class="far fa-pencil"></i>
+              </span>
+            <a href="#" class="signup-tradepro__modal-trigger">Check a trade profile</a>
+            <div class="signup-tradepro__modal-action">
+              <div class="form-row" data-row-required="">
+                <label class="form-row__label"></label>
+                <div class="form-row__field">
+                  {{> input need-pattern=true}}
+                  <div class="form-row__error">{{error}}</div>
+                </div>
+              </div>
+              <div class="signup-tradepro__modal-buttons">
+                <div class="row">
+                  <div class="button-done">
+                    <button class="btn btn-primary">
+                      Done
+                    </button>
+                  </div>
+                  <div class="button-cancel">
+                    <button class="btn btn-secondary">
+                      Cancel
+                    </button>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="tradepro-field">
+              <span class="icon icon__link">
+                <i class="far fa-link"></i>
+              </span>
+            <a href="#" class="signup-tradepro__modal-trigger">Facebook trade business page</a>
+            <span class="icon icon__notification">
+                <span class="fas fa-check-circle"></span>
+              </span>
+            <div class="signup-tradepro__modal-action">
+              <div class="form-row" data-row-required="">
+                <label class="form-row__label"></label>
+                <div class="form-row__field">
+                  {{> input need-pattern=true}}
+                  <div class="form-row__error">{{error}}</div>
+                </div>
+              </div>
+              <div class="signup-tradepro__modal-buttons">
+                <div class="row">
+                  <div class="button-done">
+                    <button class="btn btn-primary">
+                      Done
+                    </button>
+                  </div>
+                  <div class="button-cancel">
+                    <button class="btn btn-secondary">
+                      Cancel
+                    </button>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="tradepro-field">
+              <span class="icon icon__link">
+                <i class="far fa-link"></i>
+              </span>
+            <a href="#" class="signup-tradepro__modal-trigger">Mybuilder profile</a>
+            <div class="signup-tradepro__modal-action">
+              <div class="form-row" data-row-required="">
+                <label class="form-row__label"></label>
+                <div class="form-row__field">
+                  {{> input need-pattern=true}}
+                  <div class="form-row__error">{{error}}</div>
+                </div>
+              </div>
+              <div class="signup-tradepro__modal-buttons">
+                <div class="row">
+                  <div class="button-done">
+                    <button class="btn btn-primary">
+                      Done
+                    </button>
+                  </div>
+                  <div class="button-cancel">
+                    <button class="btn btn-secondary">
+                      Cancel
+                    </button>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="tradepro-field">
+              <span class="icon icon__paperclip">
+                <i class="far fa-paperclip"></i>
+              </span>
+            {{> attach-make make-capture=true}}
+            <input class="tradepro-attachment" type="file" accept="image/*" capture>
+          </div>
+          <div class="tradepro-field">
+            <img src="img/placeholders/thumbnail-sm.png"/>
+            <span class="icon icon__paperclip">
+                  <i class="far fa-paperclip"></i>
+                </span>
+            <span class="icon icon__camera">
+                <i class="far fa-camera"></i>
+              </span>
+            <a href="#" class="signup-tradepro__modal-trigger">Letterhead</a>
+            <input class="tradepro-attachment" type="file" accept="image/*" capture>
+          </div>
+          <div class="tradepro-field">
+              <span class="icon icon__paperclip">
+                <i class="far fa-paperclip"></i>
+              </span>
+            <span class="icon icon__camera">
+                <i class="far fa-camera"></i>
+              </span>
+            <a href="#" class="signup-tradepro__modal-trigger">Compliment slip</a>
+            <input class="tradepro-attachment" type="file" accept="image/*" capture>
+          </div>
+          <div class="tradepro-field">
+              <span class="icon icon__edit">
+                <i class="fas fa-edit"></i>
+              </span>
+            <a href="#" class="signup-tradepro__modal-trigger">Ltd company: Registration number</a>
+            <div class="signup-tradepro__modal-action">
+              <div class="form-row" data-row-required="">
+                <label class="form-row__label"></label>
+                <div class="form-row__field">
+                  {{> input need-pattern=true}}
+                  <div class="form-row__error">{{error}}</div>
+                </div>
+              </div>
+              <div class="signup-tradepro__modal-buttons">
+                <div class="row">
+                  <div class="button-done">
+                    <button class="btn btn-primary">
+                      Done
+                    </button>
+                  </div>
+                  <div class="button-cancel">
+                    <button class="btn btn-secondary">
+                      Cancel
+                    </button>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+          <div class="tradepro-field">
+              <span class="icon icon__edit">
+                <i class="fas fa-edit"></i>
+              </span>
+            <a href="#" class="signup-tradepro__modal-trigger">Plc: Registration number</a>
+            <div class="signup-tradepro__modal-action">
+              <div class="form-row" data-row-required="">
+                <label class="form-row__label"></label>
+                <div class="form-row__field">
+                  {{> input need-pattern=true}}
+                  <div class="form-row__error">{{error}}</div>
+                </div>
+              </div>
+              <div class="signup-tradepro__modal-buttons">
+                <div class="row">
+                  <div class="button-done">
+                    <button class="btn btn-primary">
+                      Done
+                    </button>
+                  </div>
+                  <div class="button-cancel">
+                    <button class="btn btn-secondary">
+                      Cancel
+                    </button>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        {{/content}}
+        {{/extend}}
+
+        {{/content}}
+        {{/extend}}
+      </div>
+      <div class="chosen-form-container">
+        <div class="chosen-form-wrap">
+          <div class="chosen-form">
+            <div>
+              <img class="mr-2" src="img/placeholders/thumbnail-sm.png"/>
+              Trade business website
+            </div>
+            <span class="icon icon__notification">
+              <span class="fas fa-check-circle"></span>
+            </span>
+          </div>
+          <div class="form-row__error">Error message here</div>
+          <div class="chosen-form">
+            <div>
+              <img class="mr-2" src="img/placeholders/thumbnail-sm.png"/>
+              Ltd company: Registration number
+            </div>
+
+            <span class="icon icon__notification">
+              <span class="fas fa-check-circle"></span>
+            </span>
+          </div>
+          <div class="form-row__error">Error message here</div>
+        </div>
+      </div>
+      {{> signup-form}}
+    </div>
+  </div>
+</form>
+
+{{/content}}
+
+{{#content "aside"}}
+{{> checkout_information info-icon="true"}}
+{{/content}}
+
+{{#content "foot" mode="append"}}
+<script defer src="./js/page/checkout-confirmation-new.js"></script>
+{{/content}}
+
+{{/extend}}

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

@@ -1,4 +1,4 @@
-{{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout page_checkout-confirmation-new" title="Checkout - Delivery address Customer Journey" isAsideSticky="true"}}
+{{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout page_checkout-confirmation-new" title="Checkout - Delivery address Customer Journey" isAsideSticky="true" billieIcon=true}}
 {{#content "steps"}}
 {{> steps active-step-index="1" }}
 {{/content}}
@@ -9,7 +9,7 @@
   {{/content}}
 
   {{#content "aside"}}
-    {{> order-summary delivery-address-v2.summary no-action=true id=1 basket-id=true}}
+    {{> order-summary delivery-address-v2.summary no-action=true id=1 basket-id=true billieIcon=true}}
   {{/content}}
 
 

package/src/page_my-account.html

@@ -35,6 +35,7 @@
           title=my_account.diy.activeOrders.sectionTitle
           linkText='View all orders'
           orders=my_account.diy.activeOrders.orderList
+          billieText="Payment due 30 days from Dispatch or Collection Date"
       }}
     </div>
    </div>

package/src/page_my-order.html

@@ -61,7 +61,7 @@
     <div class="col-12 col-lg-3">
       <div class="wismo">
         {{> my-account/wismo_order-summary my_order.wismo-order-summary }}
-        {{> wismo-payment }}
+        {{> wismo-payment payment-billie=true}}
       </div>
     </div>
   </div>

package/src/page_payment-details-with-billie.html

@@ -0,0 +1,67 @@
+{{#extend "checkout" pageClass="page_checkout-delivery-new page_checkout-confirmation-new" title="Checkout - Payment details with Billie" isAsideSticky="true" clearPayIcon=true billieIcon=true}}
+
+{{#content "head" mode="append"}}
+<link type="text/css" rel="stylesheet" href="./css/pages/checkout-new.css">
+<link type="text/css" rel="stylesheet" href="./css/pages/page_checkout_delivery-new.css">
+<link type="text/css" rel="stylesheet" href="./css/components/payment-details-BPS-form.css">
+<link type="text/css" rel="stylesheet" href="./css/components/checkout-payment-details-v2.css">
+
+<script src="https://applepay.cdn-apple.com/jsapi/v1/apple-pay-sdk.js"></script>
+{{/content}}
+{{#content "notification"}}
+{{> notifications notification-page.error text="Sorry, there are errors on this page. Please review the information you've entered and update sections marked in red."}}
+{{/content}}
+{{#content "steps"}}
+{{> steps-three-steps active-step-index="2"}}
+{{/content}}
+
+{{#content "aside"}}
+{{> order-summary delivery-address-v2.summary no-action=true id=1 basket-id=true clearPayIcon=clearPayIcon billieIcon=true paymentsCheckoutV2=true}}
+{{/content}}
+
+
+{{#content "main"}}
+<div class="delivery-block">
+  <h3 class="delivery-block__heading">Delivery Information</h3>
+  <div class="delivery-block__wrapper">
+    {{#with checkoutOrder.deliveryPayments.[0]}}
+    <div class="checkout-order">
+      {{> checkout-order-block}}
+    </div>
+    {{/with}}
+  </div>
+</div>
+
+<div class="click-collect-block">
+  <h3 class="click-collect-block__heading">Click & Collect</h3>
+  <div class="click-collect-block__wrapper">
+    {{#with checkoutOrder.clickCollectDeliveryAddress.[0]}}
+    <div class="checkout-order">
+      {{> checkout-order-block}}
+    </div>
+    {{/with}}
+  </div>
+</div>
+
+<div class="billing-payment-block">
+  <h3 class="billing-payment-block__heading">Billing & Payment</h3>
+  <div class="billing-payment-block__wrapper">
+    {{> checkout-payment-details-v2 apple-pay=true google-pay=true clear-pay=true billie=true edit-bill-mod=true billie-form=true open-delivery-block=true}}
+  </div>
+</div>
+
+{{/content}}
+
+{{#content "foot" mode="append"}}
+<script
+    async
+    src="https://pay.google.com/gp/p/js/pay.js">
+</script>
+<script defer src="./js/page/checkout-confirmation-new.js"></script>
+<script defer src="./js/page/checkout-payment-details.js"></script>
+<script defer src="./js/page/klarna-modal-scroll-disable.js"></script>
+<script defer src="./js/page/billie-business-type.js"></script>
+{{> checkout-terms-and-conditions-modal }}
+{{> payment-loader hidden=true spinnerTypes=(array "billie-logo" "clearpay-logo" "paypal-logo")}}
+{{/content}}
+{{/extend}}

package/src/page_product-details-billie.html

@@ -0,0 +1,87 @@
+{{#extend "base" pageClass="page-product-details" title="Product details page new with Billie"
+isDiscount=true
+isSQM=true
+isDescription=true
+isCashback=false
+isSize=true
+hourly-delivery=true
+badge-text='15% off'
+badge-color='yellow'
+badge-text-color='gray'
+step3=true
+currentlyInStock=true
+pagePdp=true
+}}
+{{#content "body"}}
+
+
+<main class="pdp__main">
+  <div class="container">
+    <div class="pdp">
+      <div class="pdp__title">
+        <h1 class="pdp__heading">Bosch PSB 1800 LI-2 18V Li-Ion Cordless Combi Drill Example with long
+          title in two rows
+        </h1>
+        <div class="pdp__reviews_small">
+          <span class="product-code product-code-v2">Product code: <strong id="product-code-val">236334</strong></span>
+          <div class="product-card__reviews review-star">
+            <div class="product-rating product-rating-v2">
+              <div class="rating-bg">
+                <i class="fa fa-star" aria-hidden="true"></i>
+                <i class="fa fa-star" aria-hidden="true"></i>
+                <i class="fa fa-star" aria-hidden="true"></i>
+                <i class="fa fa-star" aria-hidden="true"></i>
+                <i class="fa fa-star" aria-hidden="true"></i>
+                <div class="rating-overlay"
+                     data-rating="{{#if review-rating}}{{review-rating}}{{else}}0{{/if}}">
+                  <i class="fa fa-star" aria-hidden="true"></i>
+                  <i class="fa fa-star" aria-hidden="true"></i>
+                  <i class="fa fa-star" aria-hidden="true"></i>
+                  <i class="fa fa-star" aria-hidden="true"></i>
+                  <i class="fa fa-star" aria-hidden="true"></i>
+                </div>
+              </div>
+            </div>
+            <span class="review-star-average review-star-average-v2">(4.6)</span>
+          </div>
+          <span class="pdp__reviews-link-wrap"><a href="#" data-link="#pdp-reviews" id="open-review">82 reviews</a></span>
+        </div>
+      </div>
+
+      <div class="pdp__gallery">
+        {{> gallery-pdp-v2 }}
+      </div>
+      <div class="pdp__aside">
+        {{> price-block-v2
+        isProductSaved=false
+        isUserLogedOut=true
+        install=true
+        sample=true
+        big-wins=true
+        stock-accordion="stock-accordion"
+        cc=false
+        nearestAmount=12
+        isUserNonRegistered=true
+        delivery=true
+        nearest-purchase=true
+        clearpay-placement=true
+        billie-placement=true
+        }}
+        {{> fulfilment-accordions }}
+      </div>
+      <div class="pdp__description">
+        {{> product-main-info-v2 isAdvice=true}}
+      </div>
+    </div>
+  </div>
+</main>
+{{/content}}
+{{#content "foot" mode="append"}}
+<script type="text/html" id="mini-basket-popup">
+  {{> popover-mini-basket mod="popover-mini-basket_just-added" products=mini-basket.just-added just-added=true}}
+</script>
+<script defer src="./js/page/pdp.js"></script>
+<script defer src="./js/page/components/modal-observer.js"></script>
+{{> billie-modal }}
+{{/content}}
+{{/extend}}

package/src/page_shopping-cart-v2.html

@@ -1,4 +1,4 @@
-{{#extend "basket-new" page_shopping-cart pageClass="page_basket basket" title="Basket"}}
+{{#extend "basket-new" page_shopping-cart pageClass="page_basket basket" title="Basket" billieIcon=true}}
   {{#content "head" mode="append"}}
     <link type="text/css" rel="stylesheet" href="./css/pages/page_shopping-cart-v2.css">
     <link type="text/css" rel="stylesheet" href="./css/pages/checkout-new.css">
@@ -23,10 +23,11 @@
   id=1
   title="Order Summary"
   basket=true
+  billie=true
   }}
   {{> checkout-action  mod="mounted"}}
   {{> checkout-action  mod="mounted" view="mobile"}}
-  {{> summary-payment paymentsCheckoutV2=true}}
+  {{> summary-payment paymentsCheckoutV2=true billieIcon=true}}
 {{/content}}
 {{#content "main"}}
   <input type="hidden" id="SUPPLIER_DELIVERED_7_DAYS" value="<b> Wickes Supplier </b> - Delivery within 7 days">
@@ -40,7 +41,7 @@
       {{/each}}
     </section>
   {{/each}}
-{{> charity-donations-multiple shopping-cart-v2.charityDonationMultiple}}
+{{> basket-charity-donations-new   shopping-cart-v2.charityDonationNew }}
 {{/content}}
 {{#content "foot" mode="append"}}
   <script defer src="./js/basket.min.js"></script>