wickes-css2 2.106.0-develop.7 → 2.106.0-develop.8

package/src/js/page/utils/validation.js

@@ -257,7 +257,6 @@ export function wrapWithError(element) {
 
 }
 
-
 export function addErrorMessage(element, errorMessage) {
     if (errorMessage) {
         $(element).append('<div class="form-row__error">' + errorMessage + '</div>');
@@ -316,3 +315,49 @@ export function validateGuidPattern (value) {
 export function validateUserFriendlyIdPattern (value) {
     return patterns.userFriendlyIdPattern.test(value);
 }
+
+export function showErrorText($input, message, fieldSelector, errorTextClass, errorClass, ariaInvalidAttr) {
+  const $field = $input.closest(fieldSelector);
+  $field.addClass(errorClass);
+  $input.attr(ariaInvalidAttr, 'true');
+
+  let $err = $field.find(errorTextClass);
+  if (!$err.length) {
+    $err = $(`<div class="${errorTextClass.slice(1)}" />`).appendTo($field);
+  }
+  $err.text(message);
+}
+
+export function clearErrorText($input, fieldSelector, errorTextClass, errorClass, ariaInvalidAttr) {
+  const $field = $input.closest(fieldSelector);
+  $field.removeClass(errorClass);
+  $input.removeAttr(ariaInvalidAttr);
+  $field.find(errorTextClass).remove();
+}
+
+ function digitsOnly(value) {
+  return String(value || '').replace(/\D/g, '');
+}
+
+function hasExactDigits(value, n) {
+  return digitsOnly(value).length === Number(n);
+}
+
+function validateByPredicate($input, predicate, message, {
+  fieldSelector,
+  errorText: errorTextClass,
+  fieldError: errorClass,
+  ariaInvalidAttr,
+}) {
+  const ok = !!predicate(String($input.val() || ''));
+  if (!ok) {
+    showErrorText($input, message, fieldSelector, errorTextClass, errorClass, ariaInvalidAttr);
+  } else {
+    clearErrorText($input, fieldSelector, errorTextClass, errorClass, ariaInvalidAttr);
+  }
+  return ok;
+}
+
+export function validateExactDigits($input, n, message, cfg) {
+  return validateByPredicate($input, (v) => hasExactDigits(v, n), message, cfg);
+}

package/src/layouts/checkout.hbs

@@ -22,14 +22,10 @@
     {{/block}}
     <a id="skip-to-content"></a>
     <main {{#if fullWidth}}class="full-width-content"{{/if}}>
-      <div class="globalMessages">
-        <div class="container">
-          {{#block "notification"}}{{/block}}
-        </div>
-      </div>
       <div class="container">
         <div class="row">
           {{#block "steps"}}{{/block}}
+          {{#block "notification"}}{{/block}}
           <div class="content">
             {{#block "main"}}{{/block}}
           </div>

package/src/page_my-account_change-password.html

@@ -62,5 +62,6 @@
     }}
     <script src="./js/pstrength.min.js"></script>
     <script src="./js/change-password.min.js"></script>
+    <script src="./js/toggle-password-visibility.min.js"></script>
 {{/content}}
 {{/extend}}

package/src/page_payment-details-with-gift-card.html

@@ -8,13 +8,15 @@
 
 <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 "notification"}}
+<div class="globalMessages container">
+</div>
+{{/content}}
+
 {{#content "aside"}}
 {{> order-summary delivery-address-v2.summary no-action=true id=1 basket-id=true clearPayIcon=clearPayIcon billieIcon=true paymentsCheckoutV2=true checkout=true}}
 {{/content}}
@@ -46,7 +48,7 @@
 <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}}
+    {{> checkout-payment-details-v2 apple-pay=true google-pay=true clear-pay=true klarna-method=true}}
   </div>
 </div>
 
@@ -61,7 +63,8 @@
 <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>
+<script defer src="./js/gift-cards.min.js"></script>
 {{> checkout-terms-and-conditions-modal }}
-{{> payment-loader hidden=true spinnerTypes=(array "billie-logo" "clearpay-logo" "paypal-logo")}}
+{{> loader hidden=true modifier="page-loader"}}
 {{/content}}
 {{/extend}}

package/src/scss/components/_gift-cards.scss

@@ -0,0 +1,360 @@
+.giftcard-row {
+  position: relative;
+  display: flex;
+  gap: 16px;
+}
+
+.giftcard {
+  border: 1px solid $gray;
+  border-radius: 4px;
+  background: $white;
+  padding: 12px 16px;
+  width: 100%;
+  order: 3;
+  position: relative;
+
+  .giftcard__field {
+    .form-row {
+      margin-bottom: 0;
+    }
+  }
+}
+
+.giftcard-add {
+  display: inline-flex;
+  align-items: center;
+  gap: 8px;
+  color: $blue;
+  text-decoration: none;
+  cursor: pointer;
+
+  &__icon {
+    width: 16px;
+    height: 16px;
+  }
+
+  &__text {
+    font-size: .875rem;
+    line-height: 1.375rem;
+    font-weight: 500;
+  }
+}
+
+.giftcard-hint {
+  display: block;
+  color: $squant;
+  font-size: .875rem;
+  line-height: 1.375rem;
+  font-weight: 400;
+  margin-left: 32px;
+}
+
+.giftcard-inline {
+  padding: 12px 8px;
+
+  &__header {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 16px;
+  }
+
+  &__title {
+    font-weight: 500;
+    font-size: 1.125rem;
+    line-height: 1.5rem;
+    white-space: nowrap;
+  }
+
+  &__balance {
+    color: $blue;
+    font-weight: 400;
+    font-size: .875rem;
+    line-height: 1.375rem;
+    text-decoration: underline;
+    white-space: nowrap;
+  }
+
+  &__close {
+    position: absolute;
+    width: 24px;
+    height: 24px;
+    top: 8px;
+    right: 8px;
+    cursor: pointer;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: $warm-grey;
+  }
+
+  &__fields {
+    display: flex;
+    flex-direction: column;
+    gap: 24px;
+  }
+
+  .notification {
+    margin-bottom: 16px;
+  }
+}
+
+.form-row__label {
+  margin-bottom: 8px;
+}
+
+.giftcard__btn {
+  width: 100%;
+}
+
+.giftcard__field {
+  position: relative;
+  display: flex;
+  flex-direction: column;
+  padding-bottom: 18px;
+  min-width: 0;
+}
+
+.giftcard-inline .giftcard-inline__fields > .form-row.giftcard__field {
+  margin-bottom: 0;
+}
+
+.giftcard-field--error .giftcard__input {
+  border-color: $red;
+}
+
+.giftcard__error-text  {
+  font-weight: 400;
+  font-size: .75rem;
+  line-height: 1rem;
+  color: $red;
+  margin-top: 8px;
+}
+
+.giftcard .toggle-show svg {
+  pointer-events: none;
+}
+
+.form-row .toggle-show {
+  font-size: 1rem;
+  cursor: pointer;
+  position: absolute;
+  right: 8px;
+  top: 0;
+  height: 100%;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 24px;
+}
+
+.giftcard-applied {
+  width: 100%;
+  border: 1px solid $gray-light;
+  border-radius: 4px;
+  background: $white;
+  padding: 15px 16px;
+  order: 2;
+
+  &__inner {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 12px;
+  }
+
+  &__icon {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+  }
+
+  .fa-check-circle {
+    text-align: center;
+    color: $green;
+    font-size: 1rem;
+  }
+
+  &__text {
+    margin: 0;
+    font-size: .875rem;
+    line-height: 1.5rem;
+    font-weight: 500;
+    word-break: break-word;
+  }
+}
+
+.giftcard-summary {
+  position: relative;
+  width: 100%;
+
+  &__hint {
+    margin-top: 16px;
+    margin-bottom: 0;
+    font-size: .875rem;
+    font-weight: 400;
+    line-height: 1.375rem;
+  }
+
+  &__add {
+    text-decoration: underline;
+    cursor: pointer;
+    color: $blue;
+  }
+}
+
+.giftcard-chip-list {
+  display: flex;
+  flex-direction: column;
+  gap: 16px;
+}
+
+.giftcard-chip {
+  display: flex;
+  align-items: center;
+  width: 100%;
+  gap: 12px;
+  padding: 12px 16px;
+  border: 1px solid $gray;
+  border-radius: 4px;
+  background: $white;
+  min-height: 44px;
+  position: relative;
+
+  &__close {
+    position: absolute;
+    width: 24px;
+    height: 24px;
+    top: 8px;
+    right: 8px;
+    cursor: pointer;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    color: $warm-grey;
+  }
+}
+
+.giftcard-chip__icon {
+  width: 48px;
+  height: 30px;
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.giftcard-chip__content {
+  flex: 1 1 auto;
+  min-width: 0;
+}
+
+.giftcard-chip__line {
+  display: block;
+  line-height: 1.25rem;
+
+  .giftcard-chip__applied {
+    font-size: .875rem;
+    font-weight: 400;
+    line-height: 1.5rem;
+    color: $gray-dark;
+  }
+}
+
+.giftcard-chip__number {
+  font-weight: 500;
+  line-height: 1.5rem;
+  font-size: 1rem;
+  color: $gray-dark;
+}
+
+.giftcard-chip__applied {
+  white-space: nowrap;
+}
+
+@include media-breakpoint-up(sm) {
+  .giftcard-inline__fields {
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    gap: 16px;
+  }
+
+  .giftcard-inline__fields > .form-row.giftcard__field--pin.giftcard__field--pin {
+    width: 116px;
+  }
+
+  .giftcard-inline__fields > .form-row.giftcard__field--number.giftcard__field--number {
+    width: 224px;
+  }
+
+  .giftcard__actions {
+    display: flex;
+    align-items: flex-end;
+    height: 72px;
+  }
+
+  .giftcard-summary {
+    &__hint {
+      width: 354px;
+
+      &--max {
+        width: 100%;
+      }
+    }
+  }
+}
+
+@include media-breakpoint-up(md) {
+  .giftcard-inline__fields > .form-row.giftcard__field--pin.giftcard__field--pin {
+    width: 214px;
+  }
+
+  .giftcard-inline__fields > .form-row.giftcard__field--number.giftcard__field--number {
+    width: 240px;
+  }
+
+
+  .giftcard-inline__title {
+    font-weight: 700;
+  }
+
+  .giftcard-summary {
+    &__hint {
+      width: 100%;
+
+      &--max {
+        width: 460px;
+      }
+    }
+  }
+}
+
+@include media-breakpoint-up(lg) {
+  .giftcard-inline__fields {
+    max-width: 470px;
+  }
+
+  .giftcard-summary {
+    &__hint {
+      width: 100%;
+
+      &--max {
+        width: 100%;
+      }
+    }
+  }
+}
+
+@include media-breakpoint-up(xl) {
+  .giftcard-inline__fields {
+    max-width: 100%;
+  }
+
+  .giftcard__btn {
+    width: 140px;
+  }
+
+  .giftcard__field--number,
+  .giftcard__field--pin {
+    width: 100%;
+  }
+}

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

@@ -1,5 +1,6 @@
 @import '../helpers/helpers';
 @import '../components/tooltip';
+@import '../components/gift-cards';
 
 .checkout-payment-details-v2 {
   .checkout-payment-details {
@@ -73,6 +74,7 @@
       font-size: 14px;
       font-weight: 400;
       line-height: 24px;
+      vertical-align: top;
     }
 
     .form-row {
@@ -331,8 +333,10 @@
       }
     }
 
-    .google {
-      &-logo {
+    .google,
+    .billie {
+      &-logo,
+      &-badge-container {
         margin: -3px 0;
       }
     }

package/src/scss/pages/page_checkout_delivery-new.scss

@@ -27,6 +27,8 @@
         .checkout-widget {
           &__details {
             font-size: 1rem;
+            display: flex;
+            flex-direction: column;
 
             .checkout-widget {
               &__item {
@@ -53,6 +55,19 @@
               &__details-discount {
                 order: 1;
               }
+
+              &__gift-card {
+                order: 2;
+                margin-bottom: 0;
+                margin-top: 20px;
+                font-weight: 700;
+
+                .checkout-widget__item-value {
+                  ::first-letter {
+                    font-size: 1rem;
+                  }
+                }
+              }
             }
           }
 
@@ -194,6 +209,10 @@
     margin: 40px 0;
   }
 
+  .loader-wrapper.page-loader {
+    position: fixed;
+  }
+
   .oos-block {
     @include make-col(12);
 
@@ -399,6 +418,13 @@
       margin-bottom: 13px;
     }
   }
+
+  .notification {
+    &:only-child,
+    &:last-child {
+      margin-bottom: 30px;
+    }
+  }
 }
 
 #modalDeliveryEdit,

package/src/js/components/toggle-password-visibility.js

@@ -1,58 +0,0 @@
-var Wick = window.Wick || {};
-
-Wick.TogglePasswordVisibility = {
-  el: {
-    $toggleShow: $('[data-show-content] .toggle-show'),
-    inputWrap: $('.form-row[data-show-content] .input-wrap'),
-    toggleIcon: '.toggle-show',
-  },
-
-  updateIconVisibility(inputField, toggleIcon) {
-    const valueLength = inputField.val().length;
-    if (valueLength > 0) {
-      toggleIcon.show();
-    } else {
-      toggleIcon.hide();
-    }
-  },
-
-  attachInputListener(inputField, toggleIcon) {
-    inputField.on('input', function () {
-      Wick.TogglePasswordVisibility.updateIconVisibility($(this), toggleIcon);
-    });
-  },
-
-  attachToggleClickListener(inputField, toggleIcon) {
-    toggleIcon.on('click', function () {
-      const isPasswordType = inputField.attr('type') === 'password';
-      const iconSvg = $(this).find('svg');
-
-      if (isPasswordType) {
-        inputField.attr('type', 'text');
-        iconSvg.removeClass('fa-eye-slash').addClass('fa-eye');
-      } else {
-        inputField.attr('type', 'password');
-        iconSvg.removeClass('fa-eye').addClass('fa-eye-slash');
-      }
-    });
-  },
-
-  init() {
-    Wick.TogglePasswordVisibility.el.inputWrap.each(function () {
-      const inputField = $(this).find('input');
-      const toggleIcon = $(this).find(Wick.TogglePasswordVisibility.el.toggleIcon);
-
-      Wick.TogglePasswordVisibility.attachInputListener(inputField, toggleIcon);
-      Wick.TogglePasswordVisibility.updateIconVisibility(inputField, toggleIcon);
-      Wick.TogglePasswordVisibility.attachToggleClickListener(inputField, toggleIcon);
-    });
-  },
-};
-
-$(document).ready(function () {
-  if (!Wick.TogglePasswordVisibility.el.$toggleShow.length) {
-    return;
-  }
-
-  Wick.TogglePasswordVisibility.init();
-});