wickes-css2 2.103.0-RG-1742-billie-30-60-90-days.1 → 2.103.0-RG-1742-billie-30-60-90-days.3

package/build/js/page/checkout-payment-details.js

@@ -8,6 +8,8 @@ Wick.CheckoutPaymentDetails = (function() {
   };
 
   const elements = {
+    $billieRepaymentTerms: $('.js-billie-repayment-terms'),
+    $billieInfoBlock: $('.checkout-payment-details__billie'),
     $wrapperPaymentInput: $('.checkout-payment-details__row'),
     paymentInputName: '[name=payment-method]',
     $cardDetails: $('.checkout-payment-details__card-details'),
@@ -15,45 +17,81 @@ Wick.CheckoutPaymentDetails = (function() {
     $billingAddress: $('.billing-address'),
     hiddenCardDetailsClass: 'checkout-payment-details__card-details_hidden',
     hiddenClass: 'd-none',
-  }
+  };
 
   function preparePage() {
-    var modalOpened = $(".modal.show").length;
+    var modalOpened = $('.modal.show').length;
     if (!modalOpened) {
       return;
     }
     var modalContent = $modal.find('.modal-content').clone();
-    $modal.modal("hide");
-    modalContent.addClass("print-area");
-    $("body")
-      .addClass("print-mode")
+    $modal.modal('hide');
+    modalContent.addClass('print-area');
+    $('body')
+      .addClass('print-mode')
       .append(modalContent);
   }
 
   function resetPage() {
-    var modalPrintModeActive = $("body.print-mode").length;
+    var modalPrintModeActive = $('body.print-mode').length;
     if (!modalPrintModeActive) {
       return;
     }
-    $("body").removeClass("print-mode");
-    $(".print-area").remove();
-    $modal.modal("show");
+    $('body').removeClass('print-mode');
+    $('.print-area').remove();
+    $modal.modal('show');
   }
 
   function getPaymentMethods() {
     return $(elements.paymentInputName)
       .map((_, item) => $(item).val())
-      .get()
+      .get();
+  }
+
+  function setBillieStepVisibility(isReady) {
+    setBillingDetailsRowVisibility(isReady);
+
+    elements.$billieInfoBlock.toggle(isReady);
   }
 
   function togglePaymentBlocks(paymentMethods, checkedMethod) {
     paymentMethods.forEach(method => {
-      $(`[data-${method}]`).toggle(checkedMethod === method)
-    })
+      $(`[data-${method}]`).toggle(checkedMethod === method);
+    });
+  }
+
+  function setBillingDetailsRowVisibility(isVisible) {
+    const $row = elements.$billingAddress.find('.checkout-payment-details__row');
+
+    $row.toggle(isVisible);
+
+    $row.find(':input').prop('disabled', !isVisible);
+  }
+
+
+  function resetBillieRepaymentSelection() {
+    elements.$billieRepaymentTerms.find('input[name="repaymentTerms"]').prop('checked', false);
+  }
+
+  function bindBillieRepaymentGate() {
+    $(document).on('change', 'input[name="repaymentTerms"]', function() {
+      const currentMethod = $(elements.paymentInputName + ':checked').val();
+      if (currentMethod !== 'billie') return;
+
+      const hasSelection = $('input[name="repaymentTerms"]:checked').length > 0;
+      setBillingDetailsRowVisibility(hasSelection);
+
+      const $row = $(this).closest('.form-row[data-row-required]');
+      $row.removeClass('form-row_validation-error').find('.form-row__error').remove();
+    });
   }
 
   function changeDetailsBlock(checkedMethod) {
-    switch(checkedMethod) {
+    if (checkedMethod !== 'billie') {
+      setBillingDetailsRowVisibility(true);
+    }
+
+    switch (checkedMethod) {
       case 'paypal':
         hideCardDetails();
         showPlaceOrder();
@@ -66,42 +104,48 @@ Wick.CheckoutPaymentDetails = (function() {
         detailsLabel = {
           ...detailsLabel,
           labelText: 'Name on Billie account',
-          buttonText: 'Pay with Billie'
-        }
+          buttonText: 'Pay with Billie',
+        };
         changeLabelText(detailsLabel);
+
+        setBillieStepVisibility(false);
+
+        resetBillieRepaymentSelection();
         break;
+
+
       case 'clearpay':
         detailsLabel = {
           ...detailsLabel,
           labelText: 'Name on Clearpay account',
-          buttonText: 'Pay with Clearpay'
-        }
+          buttonText: 'Pay with Clearpay',
+        };
         prevClearableMethod === 'card' && clearInputFields();
         changeLabelText(detailsLabel);
         prevClearableMethod = checkedMethod;
         break;
       case 'apple':
-        hideCardDetails()
-        hidePlaceOrder()
-        hideBillingAddres()
+        hideCardDetails();
+        hidePlaceOrder();
+        hideBillingAddres();
         break;
       case 'google':
-        hideCardDetails()
-        hidePlaceOrder()
-        hideBillingAddres()
+        hideCardDetails();
+        hidePlaceOrder();
+        hideBillingAddres();
         break;
       case 'card':
         detailsLabel = {
           ...detailsLabel,
           labelText: 'Name on card',
-          buttonText: 'Enter card details'
-        }
+          buttonText: 'Enter card details',
+        };
         prevClearableMethod === 'clearpay' && clearInputFields();
         changeLabelText(detailsLabel);
         prevClearableMethod = checkedMethod;
         break;
       default:
-        showPlaceOrder()
+        showPlaceOrder();
     }
   }
 
@@ -117,7 +161,7 @@ Wick.CheckoutPaymentDetails = (function() {
     const { inputName, labelText, buttonName, buttonText } = params;
     elements.$billingAddress.removeClass(elements.hiddenClass);
     let labelElement = elements.$billingAddress.find('[for="' + inputName + '"]');
-    let buttonElement = elements.$billingAddress.find("." + buttonName + " .btn__text");
+    let buttonElement = elements.$billingAddress.find('.' + buttonName + ' .btn__text');
 
     labelElement && labelElement.text(labelText);
     buttonElement && buttonElement.text(buttonText);
@@ -138,11 +182,27 @@ Wick.CheckoutPaymentDetails = (function() {
   function init() {
     const paymentMethods = getPaymentMethods();
 
+    $(document).on('change', 'input[name="repaymentTerms"]', function() {
+      const currentMethod = $(elements.paymentInputName + ':checked').val();
+      if (currentMethod !== 'billie') return;
+
+      const hasSelection = $('input[name="repaymentTerms"]:checked').length > 0;
+
+      setBillieStepVisibility(hasSelection);
+
+      const $row = $(this).closest('.form-row[data-row-required]');
+      $row.removeClass('form-row_validation-error')
+        .find('.form-row__error').remove();
+    });
+
+
     elements.$wrapperPaymentInput.on('change', elements.paymentInputName, function() {
-      const checkedMethod = $(this).val();
+      const form = $(this).closest('form')[0];
+      form && Wick.Forms.clearValidationErrors(form);
 
-      togglePaymentBlocks(paymentMethods, checkedMethod)
-      changeDetailsBlock(checkedMethod)
+      const checkedMethod = $(this).val();
+      togglePaymentBlocks(paymentMethods, checkedMethod);
+      changeDetailsBlock(checkedMethod);
     });
 
     $('.btn-new-card').on('click', function() {
@@ -157,27 +217,20 @@ Wick.CheckoutPaymentDetails = (function() {
       return false;
     });
 
-    // do not subscribe if no T&C modal on a current page
-    if (!$modal.length) {
-      return;
-    }
+    if (!$modal.length) return;
 
-    if (typeof(window.onbeforeprint) !== 'undefined') {
-      // subscriptions for browsers
+    if (typeof (window.onbeforeprint) !== 'undefined') {
       window.onbeforeprint = preparePage;
       window.onafterprint = resetPage;
     } else if (window.matchMedia) {
-      // subscriptions for iOS devices
       var mediaQueryList = window.matchMedia('print');
       mediaQueryList.addListener(function(mql) {
-        if (mql.matches) {
-          preparePage();
-        } else {
-          resetPage();
-        }
+        if (mql.matches) preparePage();
+        else resetPage();
       });
     }
   }
 
+
   init();
 })();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wickes-css2",
-  "version": "2.103.0-RG-1742-billie-30-60-90-days.1",
+  "version": "2.103.0-RG-1742-billie-30-60-90-days.3",
   "description": "CSS and JS and page templates in use by Wickes",
   "main": "index.js",
   "scripts": {

package/src/components/checkout-chip.hbs

@@ -0,0 +1,15 @@
+<div class="checkout-chip">
+  <input
+      class="checkout-chip__input"
+      type="radio"
+      name="{{name}}"
+      id="{{id}}"
+      value="{{value}}"
+      {{#if checked}}checked{{/if}}
+  />
+
+  <label class="checkout-chip__label" for="{{id}}">
+    <span class="checkout-chip__label-top">{{top}}</span>
+    <span class="checkout-chip__label-bottom">{{bottom}}</span>
+  </label>
+</div>

package/src/components/checkout-payment-details-v2.hbs

@@ -66,13 +66,13 @@
             <div class="form-row">
               <div class="form-row__field form-row__field-clearpay">
                 <label
-                  class="rbn rbn_align clearpay-label__rbn"
-                  for="checkout-payment-details-clearpay">
+                    class="rbn rbn_align clearpay-label__rbn"
+                    for="checkout-payment-details-clearpay">
                   <input
-                    type="radio"
-                    id="checkout-payment-details-clearpay"
-                    name="payment-method"
-                    value="clearpay">
+                      type="radio"
+                      id="checkout-payment-details-clearpay"
+                      name="payment-method"
+                      value="clearpay">
                   <ins></ins>
                   <div class="clearpay-logo">
                     <img class="payments-checkout__image" src="./img/payment/checkout/clearpay.svg" alt="clearpay">
@@ -85,13 +85,13 @@
             <div class="form-row">
               <div class="form-row__field form-row__field-apple">
                 <label
-                  class="rbn rbn_align apple-label__rbn"
-                  for="checkout-payment-details-apple">
+                    class="rbn rbn_align apple-label__rbn"
+                    for="checkout-payment-details-apple">
                   <input
-                    type="radio"
-                    id="checkout-payment-details-apple"
-                    name="payment-method"
-                    value="apple">
+                      type="radio"
+                      id="checkout-payment-details-apple"
+                      name="payment-method"
+                      value="apple">
                   <ins></ins>
                   <div class="apple-logo">
                     <img src="img/apple-pay.svg" alt="apple pay">
@@ -104,13 +104,13 @@
             <div class="form-row">
               <div class="form-row__field form-row__field-google">
                 <label
-                  class="rbn rbn_align google-label__rbn"
-                  for="checkout-payment-details-google">
+                    class="rbn rbn_align google-label__rbn"
+                    for="checkout-payment-details-google">
                   <input
-                    type="radio"
-                    id="checkout-payment-details-google"
-                    name="payment-method"
-                    value="google">
+                      type="radio"
+                      id="checkout-payment-details-google"
+                      name="payment-method"
+                      value="google">
                   <ins></ins>
                   <div class="google-logo">
                     <img src="img/google-pay-mark.png" alt="google pay">
@@ -124,7 +124,8 @@
               <label class="rbn rbn_align" for="checkout-payment-details-paypal">
                 <input type="radio" id="checkout-payment-details-paypal" name="payment-method" value="paypal">
                 <ins></ins>
-                <img class="checkout-payment-details__icon" src="img/payments_paypal-large.png" width="90" height="24" alt="paypal">
+                <img class="checkout-payment-details__icon" src="img/payments_paypal-large.png" width="90" height="24"
+                     alt="paypal">
               </label>
             </div>
           </div>
@@ -163,7 +164,18 @@
         </div>
       </div>
 
+      <div class="form-row js-billie-repayment-terms" style="display: none" data-billie data-row-required data-message="Please select repayment terms">
+        <div class="form-row__field">
+          {{> checkout-payment-repayment-terms
+              name="repaymentTerms"
+              title="Select repayment terms"
+              repaymentTerms=billieTerms
+          }}
+        </div>
+      </div>
+
       {{> checkout-payment-info-block
+          showRepaymentTerms=false
           dataAttr="data-klarna"
           blockClass="checkout-payment-details__klarna"
           infoClass="klarna-info"
@@ -198,27 +210,13 @@
                 </a>"
       }}
 
-
-      <div class="form-row" data-row-required data-message="Please select repayment terms">
-        <div class="form-row__field">
-          {{> checkout-payment-repayment-terms
-                  name="repaymentTerms"
-                  title="Select repayment terms"
-                  repaymentTerms=(array
-                          (hash id="repay-30" value="30" top="30" bottom="days")
-                          (hash id="repay-60" value="60" top="60" bottom="days")
-                          (hash id="repay-90" value="90" top="90" bottom="days")
-                  )
-          }}
-        </div>
-      </div>
-
       {{> checkout-payment-info-block
           dataAttr="data-billie"
+          showRepaymentTerms=true
           blockClass="checkout-payment-details__billie"
           infoClass="billie-info"
 
-          heading="Get first. Pay later <br> Pay 30 days after shipment"
+          heading="Get first. Pay later <br> Pay <span class='term'>30</span> days after shipment"
           brandLogoHtml="<img
             src='https://static.billie.io/badges/Billie_Checkout_Default.svg'
             alt='Billie Pay Later'
@@ -244,7 +242,8 @@
       <div class="billing-address">
         {{> checkout-edit-billing-address actionBlock="true" no-set-card="true" billie-form=billie-form}}
       </div>
-      <div data-existing-card class="form-row form-row__action form-row__action_custom checkout-payment-details__place-order paypal__row">
+      <div data-existing-card
+           class="form-row form-row__action form-row__action_custom checkout-payment-details__place-order paypal__row">
         <div class="form-row__col-btn" data-paypal style="display: none;">
           <a class="pay-pal_wrap" href="./page_checkout_confirmation-new.html">
             <div class="buttons-container">

package/src/components/checkout-payment-repayment-terms.hbs

@@ -1,25 +1,12 @@
 <div class="repayment-terms">
   <div class="repayment-terms__title">
     <span class="repayment-terms__asterisk">*</span>
-    <span>Select repayment terms</span>
+    <span>{{title}}</span>
   </div>
 
   <div class="repayment-terms__chips" role="radiogroup">
     {{#each repaymentTerms}}
-      <div class="repayment-terms__chip">
-        <input
-                class="repayment-terms__input"
-                type="radio"
-                name="repaymentTerms"
-                id="{{id}}"
-                value="{{value}}"
-        />
-
-        <label class="repayment-terms__label" for="{{id}}">
-          <span class="repayment-terms__label-top">{{top}}</span>
-          <span class="repayment-terms__label-bottom">{{bottom}}</span>
-        </label>
-      </div>
+      {{> checkout-chip name=../name }}
     {{/each}}
   </div>
-</div>
+</div>

package/src/data/data_billie-terms.json

@@ -0,0 +1,7 @@
+{
+  "billieTerms": [
+    { "id": "repay-30", "value": "30", "top": "30", "bottom": "days" },
+    { "id": "repay-60", "value": "60", "top": "60", "bottom": "days" },
+    { "id": "repay-90", "value": "90", "top": "90", "bottom": "days" }
+  ]
+}

package/src/js/emulation/checkout-payment-details.js

@@ -1,20 +1,20 @@
 var Wick = Wick || {};
 
-Wick.PaymentDetails = (function () {
+Wick.PaymentDetails = (function() {
   var $btnEnterDetails = $('.btn-enter-details'),
     $form = $btnEnterDetails.parents('form'),
     isGuestPage = $('.page_checkout-payment-details_guest').length;
 
-  function bindEvents () {
-    $btnEnterDetails.on('click', function(){
-      if ($form.find('#card-name').val().length &&
+  function bindEvents() {
+    $btnEnterDetails.on('click', function() {
+      if ($form.find('#card-name').val()?.length &&
         $form.find('#first-line-address').val().length &&
         $form.find('#address-line-1').val().length &&
         $form.find('#town-city').val().length &&
-        $form.find('#postcode_additional').val().length){
+        $form.find('#postcode_additional').val().length) {
         $('.checkout-payment-details__card-details').removeClass('checkout-payment-details__card-details_hidden');
         $('html, body').animate({
-          scrollTop: $('.checkout-payment-details__card-details').offset().top - 15
+          scrollTop: $('.checkout-payment-details__card-details').offset().top - 15,
         }, 700);
         return false;
       }
@@ -22,14 +22,14 @@ Wick.PaymentDetails = (function () {
       return false;
     });
 
-    $('.checkout-payment-details__card-details').on('submit', function(){
+    $('.checkout-payment-details__card-details').on('submit', function() {
       var $form = $(this);
       if ($form.find('#card-type').val() &&
         $form.find('#card-name1').val().length &&
         $form.find('#card-number').val().length &&
         $form.find('#month').val() &&
         $form.find('#year').val() &&
-        $form.find('#security-code').val()){
+        $form.find('#security-code').val()) {
         window.location.href = isGuestPage
           ? './page_checkout_confirmation_guest.html'
           : './page_checkout_confirmation.html';