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/page/components/order-summary.js

@@ -13,46 +13,31 @@ const osEl = {
 }
 
 export function updateOrderSummary(data, equalMap, isVoucher) {
-  equalMap.forEach((obj) => {
-    if (typeof obj.dataValue === 'undefined') return;
-
-    if ($(obj.item).length) {
-      $(obj.item).show();
-    } else {
-      if ($(osEl.checkoutWidgetDetailsDiscount).length) {
-        $(osEl.checkoutWidgetDetailsDiscount).before(createCheckoutWidgetItem(obj));
-      } else {
-        $(osEl.checkoutWidgetDetails).append(createCheckoutWidgetItem(obj));
-      }
-    }
+    equalMap.forEach((obj) => {
+        if ($(obj.item).length) {
+            $(obj.item).show();
+        } else {
+            if ($(osEl.checkoutWidgetDetailsDiscount).length) {
+                $(osEl.checkoutWidgetDetailsDiscount).before(createCheckoutWidgetItem(obj))
+            } else {
+                $(osEl.checkoutWidgetDetails).append(createCheckoutWidgetItem(obj))
+            }
+        }
 
-    $(obj.item).find(obj.itemValue).text(obj.dataValue);
-    if (isVoucher ? obj.dataValue : obj.value && obj.dataValue) {
-      $(obj.item).find(obj.itemValue).show();
-    } else {
-      $(obj.item).hide();
-    }
-  });
+        $(obj.item).find(obj.itemValue).text(obj.dataValue);
+        if (isVoucher ? obj.dataValue : obj.value && obj.dataValue) {
+            $(obj.item).find(obj.itemValue).show();
+        } else {
+            $(obj.item).hide();
+        }
+    })
 
-  const keys = new Set(Object.keys(data || {}));
-  const hasAny = (...arr) => arr.some(k => keys.has(k));
+    const value = data.totalPrice?.formattedValue || data.total;
 
-  const value = data.totalPrice?.formattedValue || data.total;
-  if (typeof value !== 'undefined' && hasAny('total', 'totalPrice')) {
-    updateSummaryMobileBarTotal(value);
-  }
-
-  if (hasAny('promotionsInfo')) {
     updateDiscount(data, isVoucher);
-  }
-
-  if (hasAny('deliveryOrder', 'clickAndCollectOrder', 'clickAndCollectOnly', 'deliveryItemsQuantity', 'pickupItemsQuantity')) {
     hideUnusedDeliveryTypeCost(data, isVoucher);
-  }
-
-  if (hasAny('freeDelivery', 'messageForFreeDelivery', 'clickAndCollectOnly')) {
     calculateFreeDelivery(data);
-  }
+    updateSummaryMobileBarTotal(value);
 }
 
 function createCheckoutWidgetItem(obj) {
@@ -68,14 +53,12 @@ function hideUnusedDeliveryTypeCost(data, isVoucher) {
     $(osEl.delivery).show()
     $(osEl.cc).show()
     if (isVoucher) {
-      if ('deliveryOrder' in data && data.deliveryOrder === false) {
-        $(osEl.delivery).hide();
-      }
-
-      if ('clickAndCollectOrder' in data && data.clickAndCollectOrder === false) {
-        $(osEl.cc).hide();
-      }
-  } else {
+        if (!data.deliveryOrder) {
+            $(osEl.delivery).hide()
+        } else if (!data.clickAndCollectOrder) {
+            $(osEl.cc).hide()
+        }
+    } else {
         if (data.clickAndCollectOnly) {
             $(osEl.delivery).hide()
         } else if (data.deliveryItemsQuantity > 0 && data.pickupItemsQuantity === 0) {

package/build/js/page/utils/validation.js

@@ -257,6 +257,7 @@ export function wrapWithError(element) {
 
 }
 
+
 export function addErrorMessage(element, errorMessage) {
     if (errorMessage) {
         $(element).append('<div class="form-row__error">' + errorMessage + '</div>');
@@ -315,49 +316,3 @@ 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);
-}