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

package/src/js/page/basket-v2.js

@@ -31,6 +31,19 @@ import {displayEnergyEfficiency} from "./basket/display-energy-efficiency";
 import {appendLoader, hideLoader, showLoader} from "./utils/loader";
 import { initStickyObserver } from './components/sticky-order-observer';
 import {addClassToSummaryAside} from "./basket/summary-mobile";
+import {handleQuantityChange} from "./basket/quantity-change-handler";
+import {updateQuantityAction} from "./basket/update-quantity";
+import {updateQuantityOperation} from "./basket/update-quantity-operation";
+import {
+    checkProductArrays,
+    getCartEntries,
+    getMessageInfo,
+    isMessageExist,
+    updatePromotion,
+    showNotification
+} from "./basket/basket-utils";
+import {updateCartBase} from "./basket/basket-update-cart";
+import {updateCartActionBase} from "./basket/basket-update-cart-action";
 
 var Wick = window.Wick || {};
 Wick.BasketPage = {
@@ -192,36 +205,17 @@ Wick.BasketPage = {
         }
 
         //for local update quantity value before API Call
-        switch (action) {
-            case 'plus':
-                value = Number.parseInt(value, 10) + 1;
-                if (value) {
-                    Wick.BasketPage.updateQuantity(quantityInput, value);
-                    Wick.BasketPage.debounceQuantityChange(entryNumber, value, quantityInput, context);
-                }
-                break;
-            case 'minus':
-                value = Number.parseInt(value, 10) - 1;
-                if (value > 0) {
-                    Wick.BasketPage.updateQuantity(quantityInput, value);
-                    Wick.BasketPage.debounceQuantityChange(entryNumber, value, quantityInput, context);
-                } else {
-                    Wick.BasketPage.removeQuantityDisable();
-                }
-
-                break;
-            case 'remove':
-                value = 0;
-                charity || Wick.BasketPage.updateQuantity(quantityInput, value);
-                Wick.BasketPage.debounceQuantityChange(entryNumber, value, quantityInput, context);
-                break;
-            default:
-                if (+value !== 0) {
-                    Wick.BasketPage.updateQuantity(quantityInput, value);
-                    Wick.BasketPage.debounceQuantityChange(entryNumber, value, quantityInput, context);
-                }
-                break;
-        }
+        handleQuantityChange({
+            quantityInput,
+            action,
+            value,
+            context,
+            charity,
+            entryNumber,
+            onQuantityChange: Wick.BasketPage.updateQuantityAction,
+            debounceQuantityChange: Wick.BasketPage.debounceQuantityChange,
+            onRemoveQuantityDisable: Wick.BasketPage.removeQuantityDisable
+        });
 
         changeWisdomWhenQuantityUpdated(e, context);
         Wick.BasketPage.toggleItemTotal(context, +quantityInput.val())
@@ -231,54 +225,23 @@ Wick.BasketPage = {
         Wick.BasketPage.updateQuantityAction(entryNumber, value, quantityInput, context)
     }, 500),
     updateQuantityAction: function (entryNumber, quantityToUpdate, quantityInput, context) {
-        console.log('case(api) to update quantity', entryNumber, quantityToUpdate);
-        //checkEnv
-        if (!Wick.checkLocalEnv) {
-            // api
-            Wick.BasketPage.addQuantityDisable(context);
-            const payload = {
-                url: `${ROUTES.BASKET_ADD_STOCK}/${entryNumber}`,
-                queries: {
-                    quantity: quantityToUpdate,
-                },
-                type: 'PUT',
-                complete: () => {
-                    Wick.BasketPage.removeQuantityDisable();
-                    hideLoader(Wick.BasketPage.el.loader);
-                },
-            }
-
-            callAction(
-              payload,
-              Wick.BasketPage.updateAction,
-              quantityToUpdate,
-              quantityInput,
-              context,
-              (response) => {
-                  if (response.statusMessage === 'accConfirmedMsgs') {
-                      const basketSection = Wick.BasketPage.el.basketMainSection;
-                      $(document).trigger("EEUpdateCart", {
-                          cartEntryNumber: entryNumber,
-                          initialCartQuantity: response.quantity - response.quantityAdded,
-                          newCartQuantity: response.quantity,
-                          fulfillment: context.hasClass('charity-new') ? 'Delivery' : context.closest(basketSection).attr('data-type'),
-                      });
-                  }
-                  context.find(Wick.BasketPage.el.actionButton).removeClass('disabled');
-              });
-        } else {
-            Wick.BasketPage.updateQuantityOperation(
-              quantityToUpdate,
-              quantityInput,
-              context,
-              Wick.BasketData.updateQuantity
-            );
-            Wick.BasketPage.addQuantityDisable(context);
-            setTimeout(() => {
-                Wick.BasketPage.removeQuantityDisable();
-                hideLoader(Wick.BasketPage.el.loader);
-            }, 500);
-        }
+        updateQuantityAction({
+            entryNumber,
+            quantityToUpdate,
+            quantityInput,
+            context,
+            addQuantityDisable: Wick.BasketPage.addQuantityDisable,
+            removeQuantityDisable: Wick.BasketPage.removeQuantityDisable,
+            hideLoader: hideLoader,
+            loaderSelector: Wick.BasketPage.el.loader,
+            updateAction: Wick.BasketPage.updateAction,
+            updateQuantityOperation: Wick.BasketPage.updateQuantityOperation,
+            basketData: Wick.BasketData,
+            isLocalEnv: Wick.checkLocalEnv,
+            callActionFn: callAction,
+            routes: ROUTES,
+            basketSectionSelector: Wick.BasketPage.el.basketMainSection
+        });
     },
     updateAction: function (response, quantityToUpdate, quantityInput, context, successCallback) {
         Wick.BasketPage.updateQuantityOperation(
@@ -290,54 +253,17 @@ Wick.BasketPage = {
         successCallback(response);
     },
     updateQuantityOperation: function (quantityToUpdate, quantityInput, context, data) {
-        const charity = context.hasClass('charity-new'),
-            negativeStatus = data.statusMessage !== 'accConfirmedMsgs',
-            messageInfo = Wick.BasketPage.isMessageExist(data) && Wick.BasketPage.getMessageInfo(data);
-        let maxValue, minValue;
-
-        if (!charity) {
-            maxValue = +quantityInput.attr('max');
-            minValue = +quantityInput.attr('min');
-        }
-
-        console.log('errorStatus:', negativeStatus);
-
-        minValue === 0 ? minValue = 1 : minValue = minValue;
-
-        if (negativeStatus) {
-            Wick.BasketPage.updateCart(messageInfo);
-            Wick.BasketPage.updateQuantity(quantityInput, data.quantity);
-            Wick.BasketPage.showNotification(data);
-        } else {
-            if (charity) {
-                Wick.BasketPage.updateCart();
-            } else {
-                if (maxValue > 1 || minValue > 1) {
-                    if (quantityToUpdate > maxValue || quantityToUpdate < minValue) {
-                        Wick.BasketPage.showNotification(data);
-                    }
-                }
-
-                if (quantityToUpdate === 0) {
-                    Wick.BasketPage.showNotification(data);
-                    Wick.BasketPage.updateCart(messageInfo);
-                } else {
-                    Wick.BasketPage.updateItemTotal(data, context)
-                    Wick.BasketPage.updateCart(null, context)
-                }
-            }
-        }
-
-    },
-    isMessageExist: function (data) {
-        return data.message && data.statusMessage;
-    },
-    getMessageInfo: function (data) {
-        return {
-            message: data.message,
-            status: data.statusMessage,
-        }
+        updateQuantityOperation(quantityToUpdate, quantityInput, context, data, {
+            updateCart: Wick.BasketPage.updateCart,
+            showNotification: Wick.BasketPage.showNotification,
+            updateQuantity: Wick.BasketPage.updateQuantity,
+            updateItemTotal: Wick.BasketPage.updateItemTotal,
+            isMessageExist: Wick.BasketPage.isMessageExist,
+            getMessageInfo: Wick.BasketPage.getMessageInfo
+        });
     },
+    isMessageExist: isMessageExist,
+    getMessageInfo: getMessageInfo,
     loadIndexing: function () {
         Wick.BasketPage.el.$orderItem.each(function (index) {
             $(this).attr('data-id', index);
@@ -364,107 +290,92 @@ Wick.BasketPage = {
             }
         }
     },
-    toggleItemTotal: function (context, quantity) {
+    toggleItemTotal: function(context, quantity) {
         quantity <= 1
-            ? $(context).find(Wick.BasketPage.el.total).addClass(Wick.BasketPage.el.totalHide)
-            : $(context).find(Wick.BasketPage.el.total).removeClass(Wick.BasketPage.el.totalHide);
+          ? $(context).find(Wick.BasketPage.el.total).addClass(Wick.BasketPage.el.totalHide)
+          : $(context).find(Wick.BasketPage.el.total).removeClass(Wick.BasketPage.el.totalHide);
     },
     updateCart: function (repaintData, context, charity, initial, callback) {
         console.log('case(api) to update cart');
-        const info = {repaintData, context, charity, initial}
-        const actionCallback = callback || Wick.BasketPage.updateCartAction;
-
-        if (!Wick.checkLocalEnv) {
-            const payload = {
-                url: ROUTES.BASKET_GET_CART,
-                type: 'GET',
-                complete: hideLoader(Wick.BasketPage.el.loader),
-            }
-
-            callAction(payload, actionCallback, info)
-        } else {
-            if (initial) {
-                Wick.BasketPage.getCartEntries(Wick.BasketData.initialCartState);
-                addClassToSummaryAside(Wick.BasketData.initialCartState);
-                const initialTotalPrice = Wick.BasketData.initialCartState.totalPrice.value;
-                updateClearpayVisibility(initialTotalPrice);
-            } else {
-                updateBasketDataQuantity();
-                updateOrderSummary(
-                    Wick.BasketData.updateCart,
-                    Wick.BasketPage.getEqualMapForUpdateCart(Wick.BasketData.updateCart)
-                );
-
-                !repaintData || Wick.BasketPage.repaintOrderItems(Wick.BasketData.updateCart, repaintData);
-                !charity || Wick.BasketPage.addCharityEntryNumber(Wick.BasketData.updateCart);
-
-                //update promotion when update quantity
-                if (context && context.length) {
-                    Wick.BasketPage.updatePromotion(Wick.BasketData.updateCart, context);
+        updateCartBase({
+            isLocalEnv: Wick.checkLocalEnv,
+            apiUrl: ROUTES.BASKET_GET_CART,
+            apiType: 'GET',
+            hideLoader: () => setTimeout(() => hideLoader(Wick.BasketPage.el.loader), 1000),
+            callActionFn: callAction,
+            actionCallback: callback || Wick.BasketPage.updateCartAction,
+            repaintData,
+            context,
+            charity,
+            initial,
+            localUpdateFn: function(initial, repaintData, context, charity) {
+                if (initial) {
+                    Wick.BasketPage.getCartEntries(Wick.BasketData.initialCartState);
+                    addClassToSummaryAside(Wick.BasketData.initialCartState);
+                    const initialTotalPrice = Wick.BasketData.initialCartState.totalPrice.value;
+                    updateClearpayVisibility(initialTotalPrice);
+                } else {
+                    updateBasketDataQuantity();
+                    updateOrderSummary(
+                      Wick.BasketData.updateCart,
+                      Wick.BasketPage.getEqualMapForUpdateCart(Wick.BasketData.updateCart)
+                    );
+                    !repaintData || Wick.BasketPage.repaintOrderItems(Wick.BasketData.updateCart, repaintData);
+                    !charity || Wick.BasketPage.addCharityEntryNumber(Wick.BasketData.updateCart);
+                    if (context && context.length) {
+                        Wick.BasketPage.updatePromotion(Wick.BasketData.updateCart, context);
+                    }
+                    updateKlarnaPlacements(Wick.BasketData.updateCart.totalPrice.formattedPriceWithoutCurrencySymbol);
+                    updateClearpayPlacements(Wick.BasketData.updateCart.totalPrice.value);
+                    updateClearpayVisibility(Wick.BasketData.updateCart.totalPrice.value);
+                    Wick.BasketPage.addPotentialPromo(Wick.BasketData.updateCart);
+                    addClassToSummaryAside(Wick.BasketData.updateCart);
+                    Wick.BasketPage.getCartEntries(Wick.BasketData.updateCart);
+                    Wick.BasketPage.checkProductArrays(Wick.BasketData.updateCart) || Wick.BasketPage.removeOrderItem(repaintData);
+                    updateBasketSession();
+                    Wick.EnergyEfficiency && Wick.EnergyEfficiency.drawEnergyLabels();
+                    setTimeout(() => hideLoader(Wick.BasketPage.el.loader), 1000);
                 }
-
-                updateKlarnaPlacements(Wick.BasketData.updateCart.totalPrice.formattedPriceWithoutCurrencySymbol);
-                updateClearpayPlacements(Wick.BasketData.updateCart.totalPrice.value);
-                updateClearpayVisibility(Wick.BasketData.updateCart.totalPrice.value);
-                Wick.BasketPage.addPotentialPromo(Wick.BasketData.updateCart);
-                addClassToSummaryAside(Wick.BasketData.updateCart);
-                Wick.BasketPage.getCartEntries(Wick.BasketData.updateCart);
-                Wick.BasketPage.checkProductArrays(Wick.BasketData.updateCart) || Wick.BasketPage.removeOrderItem(repaintData);
-                updateBasketSession();
-                Wick.EnergyEfficiency && Wick.EnergyEfficiency.drawEnergyLabels();
-                setTimeout(hideLoader, 1000);
             }
-        }
+        });
     },
-    updateCartAction: function (response, info) {
-        updateClearpayVisibility(response.totalPrice.value)
-        addClassToSummaryAside(response)
-        if (info.initial) {
-            Wick.BasketPage.getCartEntries(response);
-        } else {
-            updateOrderSummary(response, Wick.BasketPage.getEqualMapForUpdateCart(response));
-            if (info.repaintData) {
-                if (info.repaintData.isChangeDelivery) {
-                    info.repaintData.cartEntry = Wick.BasketPage.cartEntries
-                        .filter(entry => entry.entryNumber === info.repaintData.cartEntryNumber)[0];
-                    $(document).trigger("EEUpdateDeliveryMode", info.repaintData);
-                }
-
-                Wick.BasketPage.checkProductArrays(response) ?
-                    Wick.BasketPage.repaintOrderItems(response, info.repaintData) :
-                    (() => {
-                        $(Wick.BasketPage.el.orderItem).remove();
-                        Wick.BasketPage.removeOrderItem(info.repaintData);
-                    })();
-            }
-
-            !info.charity || Wick.BasketPage.addCharityEntryNumber(response);
-
-            //update promotion when update quantity
-            if (info.context && info.context.length) {
-                Wick.BasketPage.updatePromotion(response, info.context);
+    updateCartAction: function (response, {repaintData, charity, initial, context}) {
+        updateClearpayVisibility(response.totalPrice.value);
+        addClassToSummaryAside(response);
+
+        updateCartActionBase({
+            response,
+            repaintData,
+            context,
+            charity,
+            initial,
+            updateOrderSummaryFn: updateOrderSummary,
+            getEqualMapFn: Wick.BasketPage.getEqualMapForUpdateCart,
+            repaintOrderItemsFn: Wick.BasketPage.repaintOrderItems,
+            addCharityEntryNumberFn: Wick.BasketPage.addCharityEntryNumber,
+            updatePromotionFn: Wick.BasketPage.updatePromotion,
+            addPotentialPromoFn: Wick.BasketPage.addPotentialPromo,
+            cartEntries: Wick.BasketPage.cartEntries,
+            getCartEntriesFn: () => Wick.BasketPage.getCartEntries(response),
+            checkProductArraysFn: Wick.BasketPage.checkProductArrays,
+            removeOrderItemFn: Wick.BasketPage.removeOrderItem,
+            elOrderItem: Wick.BasketPage.el.orderItem,
+            updateKlarnaPlacementsFn: updateKlarnaPlacements,
+            updateClearpayPlacementsFn: updateClearpayPlacements,
+            updateClearpayVisibilityFn: updateClearpayVisibility,
+            addClassToSummaryAsideFn: addClassToSummaryAside,
+            updateBasketSessionFn: updateBasketSession,
+            drawEnergyLabelsFn: Wick.EnergyEfficiency && Wick.EnergyEfficiency.drawEnergyLabels,
+            extraActions: (response) => {
+                updateEeaProducts(response.deliveryOrderGroups, response.pickupOrderGroups);
+                updateEeaCheckoutProducts(response.deliveryOrderGroups, response.pickupOrderGroups);
+                syncEeaProducts();
             }
-
-            Wick.BasketPage.addPotentialPromo(response);
-            updateEeaProducts(response.deliveryOrderGroups, response.pickupOrderGroups);
-            updateEeaCheckoutProducts(response.deliveryOrderGroups, response.pickupOrderGroups);
-            syncEeaProducts();
-            $(document).trigger("cartUpdate");
-            Wick.BasketPage.getCartEntries(response);
-            updateKlarnaPlacements(response.totalPrice.formattedPriceWithoutCurrencySymbol);
-            updateClearpayPlacements(response.totalPrice.value);
-            updateClearpayVisibility(response.totalPrice.value);
-            updateBasketSession();
-            Wick.EnergyEfficiency.drawEnergyLabels()
-        }
-    },
-    checkProductArrays(cart) {
-        return cart.pickupUniqueItemsNumber || cart.deliveryUniqueItemsNumber;
+        });
     },
-    getCartEntries(data) {
-        Wick.BasketPage.cartEntries = data.deliveryOrderGroups.concat(data.pickupOrderGroups)
-            .map(orderGroup => orderGroup.entries)
-            .flatMap(entries => entries);
+    checkProductArrays: checkProductArrays,
+    getCartEntries: function(data) {
+        Wick.BasketPage.cartEntries = getCartEntries(data);
     },
     addCharityEntryNumber: function (data) {
         let entryNumber;
@@ -481,34 +392,17 @@ Wick.BasketPage = {
             )
         }
     },
-    updatePromotion: function (data) {
-        $(Wick.BasketPage.el.orderItem).each(function () {
-            let itemNumber = {entryNumber: +$(this).attr('data-id')}
-            $(this).find(Wick.BasketPage.el.orderItemOffers).remove()
-            $(this).find(Wick.BasketPage.el.orderItemInfo).append(Wick.BasketPage.addPromotions(itemNumber, data));
-        })
+    updatePromotion: function(data, context) {
+        updatePromotion(
+          data,
+          Wick.BasketPage.el.orderItem,
+          Wick.BasketPage.el.orderItemOffers,
+          Wick.BasketPage.el.orderItemInfo,
+          Wick.BasketPage.addPromotions
+        );
     },
-    showNotification: function (data) {
-        let notificationType;
-        switch (data.statusMessage) {
-            case 'accConfirmedMsgs':
-                notificationType = 'success'
-                break;
-            case 'accWarnMsgs':
-                notificationType = 'warning'
-                break;
-            case 'accErrorMsgs':
-                notificationType = 'error'
-                break;
-        }
-
-        Wick.Notification.show({
-            text: data.message,
-            container: '.notification-area',
-            type: notificationType,
-            closeBtn: true
-        });
-
+    showNotification: function(data) {
+        showNotification(data, '.notification-area');
     },
     hideUnusedDeliveryTypeCost: function (data, isVoucher) {
         $(Wick.BasketPage.el.delivery).show()

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

@@ -8,8 +8,6 @@ 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'),
@@ -17,81 +15,45 @@ 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();
-  }
-
-  function setBillieStepVisibility(isReady) {
-    setBillingDetailsRowVisibility(isReady);
-
-    elements.$billieInfoBlock.toggle(isReady);
+      .get()
   }
 
   function togglePaymentBlocks(paymentMethods, checkedMethod) {
     paymentMethods.forEach(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();
-    });
+      $(`[data-${method}]`).toggle(checkedMethod === method)
+    })
   }
 
   function changeDetailsBlock(checkedMethod) {
-    if (checkedMethod !== 'billie') {
-      setBillingDetailsRowVisibility(true);
-    }
-
-    switch (checkedMethod) {
+    switch(checkedMethod) {
       case 'paypal':
         hideCardDetails();
         showPlaceOrder();
@@ -104,48 +66,42 @@ 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()
     }
   }
 
@@ -161,7 +117,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);
@@ -182,27 +138,11 @@ 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 form = $(this).closest('form')[0];
-      form && Wick.Forms.clearValidationErrors(form);
-
       const checkedMethod = $(this).val();
-      togglePaymentBlocks(paymentMethods, checkedMethod);
-      changeDetailsBlock(checkedMethod);
+
+      togglePaymentBlocks(paymentMethods, checkedMethod)
+      changeDetailsBlock(checkedMethod)
     });
 
     $('.btn-new-card').on('click', function() {
@@ -217,20 +157,27 @@ Wick.CheckoutPaymentDetails = (function() {
       return false;
     });
 
-    if (!$modal.length) return;
+    // do not subscribe if no T&C modal on a current page
+    if (!$modal.length) {
+      return;
+    }
 
-    if (typeof (window.onbeforeprint) !== 'undefined') {
+    if (typeof(window.onbeforeprint) !== 'undefined') {
+      // subscriptions for browsers
       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();
 })();