wickes-css2 2.103.0-RG-1756-incorrect-payment-method-when-proceed-payment-with-gift-card.2 → 2.103.0-RG-1742-billie-30-60-90-days.1

package/build/js/emulation.min.js

@@ -3428,42 +3428,6 @@ Wick.checkLocalEnv = (function () {
     }
 })();
 
-var Wick = Wick || {};
-Wick.CheckoutData = (function () {
-  return {
-    //TODO: update after BE confirmation
-    successGiftCardData: {
-      "subTotal": "£100.00",
-      "deliveryCost": "£4.00",
-      "freeDelivery": false,
-      "clickAndCollectCost": "FREE",
-      "totalForDelivery": "£69.00",
-      "totalForClickAndCollect": "FREE",
-      "total": "£0.00",
-      "vat": "£11.17",
-      "deliveryOrder": true,
-      "clickAndCollectOrder": false,
-      "discountTotal": "£2.00",
-      "giftCardApplied": "-£100.00",
-      "discounts": [
-        "Spend over £10 and get £2 fixed discount"
-      ],
-      "promotionsInfo": [
-        {
-          "description": "Spend over £10 and get £2 fixed discount",
-          "usedCouponCode": "RT_02"
-        }
-      ],
-      "subTotalWithDeliveryCost": "£69.00",
-      "net": false,
-      "subtotalWithDeliveryAndDiscounts": "£67.00",
-      "discountAmounts": [],
-      "goodsTotalWithoutDiscount": "£65.00",
-      "charityPrice": ""
-    },
-  }
-})();
-
 var Wick = Wick || {};
 Wick.DeliveryDetails = (function () {
   var $page = $('.page_checkout-delivery-details');
@@ -3504,33 +3468,24 @@ var Wick = Wick || {};
 
 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 (e) {
-      e.preventDefault();
-      var $scope = $(this).closest('form');
-      if (!$scope.length) $scope = $(this).closest('.billing-address');
-      if (!$scope.length) $scope = $('.billing-address');
-      var nameVal= ($scope.find('#card-name').val() || '').trim();
-      var finderVal= ($scope.find('#first-line-address').val() || '').trim();
-      var manualLine1= ($scope.find('#address-line-1').val() || '').trim();
-      var manualTown= ($scope.find('#town-city').val() || '').trim();
-      var manualPost= ($scope.find('#postcode_additional').val() || '').trim();
-      var addressFinderOk = finderVal.length > 0;
-      var addressManualOk = manualLine1 && manualTown && manualPost;
-
-      if (nameVal && (addressFinderOk || addressManualOk)) {
-        var $details = $('.checkout-payment-details__card-details');
-        $details.removeClass('checkout-payment-details__card-details_hidden');
-        $('html, body').animate({ scrollTop: $details.offset().top - 15 }, 700);
-        return;
-      }
-
-      var formEl = $scope.closest('form').get(0) || $scope.get(0);
-      if (formEl && Wick.Forms && Wick.Forms.showValidationErrors) {
-        Wick.Forms.showValidationErrors(formEl);
+    $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){
+        $('.checkout-payment-details__card-details').removeClass('checkout-payment-details__card-details_hidden');
+        $('html, body').animate({
+          scrollTop: $('.checkout-payment-details__card-details').offset().top - 15
+        }, 700);
+        return false;
       }
+      Wick.Forms.showValidationErrors($form[0]);
+      return false;
     });
 
     $('.checkout-payment-details__card-details').on('submit', function(){
@@ -4067,16 +4022,11 @@ Wick.Forms = (function(){
 
   var showValidationErrors = function (form, errorMsg) {
     var $form = $(form);
-    var $rows = $form.find(fieldRow).not('[data-no-global-validation]');
-    if (!$rows.length) return;
-    $rows.find('.form-row__error').remove();
-
     if (!$form.hasClass(formInvalid)) {
-      $form.addClass(formInvalid);
+      $form.find('.form-row__error').remove();
+      $form.addClass(formInvalid).find(fieldRow).append(validationError(errorMsg)).addClass(rowValidationError);
     }
 
-    $rows.append(validationError(errorMsg)).addClass(rowValidationError);
-
     var $firstMsg = $form.find(fieldRow).first();
     if($firstMsg.length && !isElementInViewport($firstMsg)){
       var inModal = $firstMsg.closest('.modal').length,
@@ -4223,9 +4173,27 @@ Wick.Forms = (function(){
     }
 
     function isNotEmpty(field){
-      return !!$(field).val();
+      var $field = $(field);
+      var type = ($field.attr('type') || '').toLowerCase();
+
+      if (type === 'checkbox') {
+        return $field.is(':checked');
+      }
+
+      if (type === 'radio') {
+        var name = $field.attr('name');
+        if (!name) return false;
+
+        var $scope = $field.closest('[data-row-required]');
+        if (!$scope.length) $scope = $field.closest('form');
+
+        return $scope.find('input[type="radio"][name="' + name.replace(/"/g, '\\"') + '"]').is(':checked');
+      }
+
+      return !!$field.val();
     }
 
+
     if ($(form).is('#form-checkout-your-details')) {
       var requiredFields = $(form).find('[data-row-required]:visible :input');
       if (_.every(requiredFields, isNotEmpty)){
@@ -4386,212 +4354,6 @@ $(document).ready(function () {
   Wick.GenerateProjectIdLocal.init();
 });
 
-(function () {
-  if (!window.Wick) return;
-
-  const M_OK = '0000000000000001';
-  const M_ZERO_BALANCE = '0000000000000000';
-  const M_NOT_RECOGNISED = '1111111111111111';
-  const M_LOCKED = '2222222222222222';
-  const M_MERCHANT_ISSUE = '3333333333333333';
-  const M_EXCHANGE = '4040404040404040';
-  const M_EXPIRED = '4444444444444444';
-  const M_INVALID = '5555555555555555';
-  const M_ADDED = '6666666666666666';
-  const M_CONFIG_PROBLEM = '9999999999999999';
-
-  const M_PAY_ERR_101 = '7777777777777101';
-  const M_PAY_ERR_102 = '7777777777777102';
-  const M_PAY_ERR_103 = '7777777777777103';
-
-  const PAY_ERROR_CARD_MAP = {
-    [M_PAY_ERR_101]: 101,
-    [M_PAY_ERR_102]: 102,
-    [M_PAY_ERR_103]: 103,
-  };
-
-  const GIFT_CARDS_LIMIT = 3;
-  const BASE_ORDER_TOTAL = 300.00;
-
-  let PAY_ERROR_CODE;
-
-  const mock = {
-    orderTotal: BASE_ORDER_TOTAL,
-    giftCardTotal: 0.00,
-    giftCards: [],
-  };
-
-  const toMasked = (num) => `************${String(num || '').slice(-5)}`;
-
-  function recomputeTotalsAndOrder() {
-    mock.giftCardTotal = mock.giftCards.reduce((sum, c) => sum + Number(c.amountToRedeem || 0), 0);
-    const remaining = Math.max(0, BASE_ORDER_TOTAL - mock.giftCardTotal);
-    mock.orderTotal = Number(remaining.toFixed(2));
-  }
-
-  function applyWithClamp(requestedAmount) {
-    const remaining = Math.max(0, BASE_ORDER_TOTAL - mock.giftCardTotal);
-    const applied = Math.min(Number(requestedAmount || 0), remaining);
-    return Number(applied.toFixed(2));
-  }
-
-  function successPayload() {
-    return {
-      orderTotal: mock.orderTotal,
-      giftCardTotal: mock.giftCardTotal,
-      giftCards: mock.giftCards.slice()
-    };
-  }
-
-  function getGiftCardErrorCode(giftCardNumber) {
-    switch (giftCardNumber) {
-      case M_NOT_RECOGNISED:
-        return 10;
-      case M_LOCKED:
-        return 16;
-      case M_MERCHANT_ISSUE:
-        return 20;
-      case M_EXCHANGE:
-        return 40;
-      case M_EXPIRED:
-        return 60;
-      case M_INVALID:
-        return 99;
-      case M_ADDED:
-        return 89;
-      case M_CONFIG_PROBLEM:
-        return -1;
-      default:
-        return null;
-    }
-  }
-
-  function addGiftCardMock(giftCardNumber) {
-    const errorCode = getGiftCardErrorCode(giftCardNumber);
-
-    if (Number.isFinite(errorCode)) {
-      return Promise.reject({ code: errorCode });
-    }
-
-    let requested;
-    if (giftCardNumber === M_OK) {
-      requested = 123.45;
-    } else if (giftCardNumber === M_ZERO_BALANCE) {
-      requested = 0;
-    } else {
-      requested = 50.00;
-    }
-
-    if (mock.giftCards.length >= GIFT_CARDS_LIMIT) {
-      return Promise.reject({ code: 20 });
-    }
-
-    const beforeTotal = mock.giftCardTotal;
-    const applied = applyWithClamp(requested);
-
-    mock.giftCards.push({
-      id: (Date.now() + Math.random()).toString(36),
-      maskedNumber: toMasked(giftCardNumber),
-      amountToRedeem: applied,
-      originalNumber: giftCardNumber,
-    });
-
-    if (mock.giftCards.length === GIFT_CARDS_LIMIT) {
-      const leftover = Math.max(0, BASE_ORDER_TOTAL - (beforeTotal + applied));
-      if (leftover > 0) {
-        const last = mock.giftCards[mock.giftCards.length - 1];
-        last.amountToRedeem = Number((Number(last.amountToRedeem) + leftover).toFixed(2));
-      }
-      mock.giftCardTotal = BASE_ORDER_TOTAL;
-      mock.orderTotal = 0;
-      return Promise.resolve(successPayload());
-    }
-
-    recomputeTotalsAndOrder();
-    return Promise.resolve(successPayload());
-  }
-
-  function removeGiftCardMock(index) {
-    const beforeLen = mock.giftCards.length;
-    if (index < 0 || index >= beforeLen) return Promise.reject({ code: 20 });
-
-    mock.giftCards.splice(index, 1);
-    recomputeTotalsAndOrder();
-    return Promise.resolve(successPayload());
-  }
-
-  function anyPayErrorCardApplied() {
-    for (const gc of mock.giftCards) {
-      const code = PAY_ERROR_CARD_MAP[gc.originalNumber];
-      if (Number.isFinite(code)) return code;
-    }
-    return undefined;
-  }
-
-  function initGiftCardMock() {
-    if (!$('.giftcard-row, .giftcard').length) return;
-
-    $(window).off(Wick.GiftCard.ADD_GIFT_CARD);
-    $(window).off(Wick.GiftCard.REMOVE_GIFT_CARD);
-    $(window).off(Wick.GiftCard.PAY_WITH_GIFT_CARD);
-
-    $(window).on(Wick.GiftCard.ADD_GIFT_CARD, function (e) {
-      const payload = (e.detail && e.detail.payload) || {};
-      const giftCardNumber = payload.giftCardNumber;
-      setTimeout(function () {
-        addGiftCardMock(giftCardNumber)
-          .then(function (p) { e.detail.resolve(Object.assign({ code: 0 }, p)); })
-          .catch(function (err) { e.detail.reject(err); });
-      }, 1000);
-    });
-
-    $(window).on(Wick.GiftCard.REMOVE_GIFT_CARD, function (e) {
-      const payload = (e.detail && e.detail.payload) || {};
-      const index = Number(payload.index);
-      setTimeout(function () {
-        removeGiftCardMock(index)
-          .then(function (p) { e.detail.resolve(Object.assign({ code: 0 }, p)); })
-          .catch(function (err) { e.detail.reject(err); });
-      }, 1000);
-    });
-
-    $(window).on(Wick.GiftCard.PAY_WITH_GIFT_CARD, function (e) {
-      setTimeout(function () {
-        const forcedErrorFromCard = anyPayErrorCardApplied();
-        if (Number.isFinite(forcedErrorFromCard)) {
-          return e.detail.reject({
-            errorCode: forcedErrorFromCard,
-            giftCards: mock.giftCards.slice(),
-          });
-        }
-
-        if (Number(mock.orderTotal) === 0) {
-          e.detail.resolve({ url: 'page_checkout_confirmation-billie.html' });
-        } else {
-          const errorCode = Number.isFinite(PAY_ERROR_CODE) ? PAY_ERROR_CODE : undefined;
-          e.detail.reject({
-            errorCode,
-            giftCards: mock.giftCards.slice(),
-          });
-        }
-      }, 1000);
-    });
-  }
-
-  $(document).ready(function () {
-    mock.giftCards = [];
-    recomputeTotalsAndOrder();
-
-    Wick.GiftCard.init({
-      giftCardsLimit: GIFT_CARDS_LIMIT,
-      errorCode: PAY_ERROR_CODE,
-      giftCards: mock.giftCards.slice()
-    });
-  });
-
-  $(document).ready(initGiftCardMock);
-})();
-
 const suggestions = [
   {
     value: 'lintel',