wickes-css2 2.117.0-gift-cards.2 → 2.117.1-develop.1

package/build/js/page/components/gift-cards.js

@@ -1,7 +1,6 @@
 import { initializeInputToggle } from '../utils/show-hide-input';
 import { updateOrderSummary } from './order-summary';
-import { createPostcodeLookup } from './postcode-lookup';
-import { hideLoader, showLoader } from '../utils/loader';
+import { hideLoader, showLoader, appendLoader } from '../utils/loader';
 import {
     ADD_GIFT_CARD,
     buildHintContext,
@@ -21,18 +20,7 @@ import {
     DEFAULT_PAY_ERROR_MESSAGE,
 } from '../utils/gift-cards-utils';
 
-import {
-    bindBlurValidation,
-    clearErrorText,
-    isAntiXssValid,
-    isElementInViewport,
-    removeErrorStyling,
-    resetBlurValidation,
-    validateExactDigits,
-    validateFieldByRule,
-} from '../utils/validation';
-import errorMessages from '../utils/errorMesages';
-import { scrollToElement } from '../utils/helpers';
+import { clearErrorText, validateExactDigits } from '../utils/validation';
 import {
     createGcNumberInputHandler,
     digitsOnlyKeypress,
@@ -54,13 +42,6 @@ const notificationTpl = require('../../../elements/notifications.hbs');
 
 var Wick = window.Wick || {};
 
-const ORDER_NAME_RULES = {
-    orderFirstName: { required: true, validate: isAntiXssValid, message: errorMessages.errorName },
-    orderSurname: { required: true, validate: isAntiXssValid, message: errorMessages.errorSurname },
-};
-const ORDER_ADDRESS_SCROLL_OFFSET = 100;
-const ORDER_ADDRESS_LOOKUP_CONTEXT = 'order-address';
-
 Wick.GiftCard = {
     ADD_GIFT_CARD,
     REMOVE_GIFT_CARD,
@@ -133,19 +114,6 @@ Wick.GiftCard = {
             '[data-apple-pay],[data-google-pay],[data-paypal],[data-klarna],[data-billie],[data-clearpay],[data-existing-card]',
         hiddenCard: 'checkout-payment-details__card-details_hidden',
         cardDetails: '.checkout-payment-details__card-details',
-        orderAddress: '[data-order-address]',
-        orderFirstName: '#order-first-name',
-        orderSurname: '#order-surname',
-        paymentMethodCheckedSel: 'input[name="payment-method"]:checked',
-        paymentMethodCardValue: 'card',
-        paypageIframeWrapSel: '.hop-iframe__wrapper',
-        cardValidationErrorRowSel: '.form-row_validation-error',
-        cardValidationErrorRowClass: 'form-row_validation-error',
-        cardValidationErrorTextSel: '.form-row__error',
-        paypageFormSel: '#hopPostForm',
-        paypageIframeSel: '#hopIframe',
-        paypageCardDetailsSel: '.checkout-payment-details__card-details',
-        wrapper: '.giftcard__wrapper',
     },
 
     messages: {
@@ -155,17 +123,12 @@ Wick.GiftCard = {
         ctaGiftcardText: 'Pay with Gift Card',
     },
 
-    collapseTargets: [
-        '.billing-address input, .billing-address select, .billing-address textarea',
-        '.billing-address [data-finder], .billing-address [data-manually]',
-    ].join(','),
-
     maxChips: 3,
     successTimer: null,
+    pendingServerGiftCards: null,
     altPaymentInfosLocked: false,
     altPaymentPanelsLocked: false,
     summaryTotal: null,
-    orderAddressLookup: null,
 
     resetPinToggle($root) {
         const {
@@ -203,90 +166,6 @@ Wick.GiftCard = {
         $pinInput.trigger(passwordToggleEvent);
     },
 
-    isPanelOpen($root) {
-        const $panel = $root.find(this.el.panel);
-        return $panel.length ? $panel.prop('hidden') === false : false;
-    },
-
-    openPaypage($container) {
-        const {
-            paypageFormSel,
-            paypageIframeSel,
-            paypageIframeWrapSel,
-            paypageCardDetailsSel,
-            hiddenCard,
-        } = this.el;
-
-        const $cardDetails = $container.find(paypageCardDetailsSel);
-        const $wrap = $container.find(paypageIframeWrapSel);
-
-        $cardDetails.removeClass(hiddenCard).show();
-        $wrap.show();
-
-        const $form = $container.find(paypageFormSel);
-
-        const form = $form.get(0);
-        if (!form) return;
-
-        const $oldIframe = $container.find(paypageIframeSel);
-        if ($oldIframe.length) {
-            const old = $oldIframe.get(0);
-            const newIframe = old.cloneNode(true);
-
-            newIframe.src = old.getAttribute('src') || newIframe.src || '';
-            old.parentNode.replaceChild(newIframe, old);
-
-            const iframeName = newIframe.getAttribute('name') || newIframe.name;
-            if (iframeName) form.setAttribute('target', iframeName);
-        }
-    },
-
-    getAppliedChipsCount($root) {
-        const { giftcardRow, chipList, chip } = this.el;
-        const $row = $root.closest(giftcardRow);
-        return $row.length ? $row.find(`${chipList} ${chip}`).length : 0;
-    },
-
-    collapseKeepValues($root) {
-        const { toggle, panel, hint, expandedAttr } = this.el;
-
-        $root.find(panel).prop('hidden', true);
-        $root.find(toggle).attr(expandedAttr, 'false').show();
-
-        const zeroTotal = this.summaryTotal != null ? isZeroAmount(this.summaryTotal) : false;
-        $root.find(hint)[zeroTotal ? 'hide' : 'show']();
-    },
-
-    handleCollapseTrigger(e) {
-        const $target = $(e.target);
-
-        const isCheckbox = $target.is('#chb-payment-details-card');
-        const isInBilling = $target.closest('.billing-address').length > 0;
-
-        if (!isCheckbox && !isInBilling) return;
-
-        const $container = $target.closest(this.el.checkoutContainer);
-        if (!$container.length) return;
-
-        const $giftcard = $container.find(this.el.block).first();
-        if (!$giftcard.length) return;
-
-        if (!this.isPanelOpen($giftcard)) return;
-
-        const chipsCount = this.getAppliedChipsCount($giftcard);
-
-        const { panel, toggle, expandedAttr } = this.el;
-
-        if (chipsCount > 0) {
-            this.updateHintVisibility($giftcard);
-            this.collapseGiftcardPanel($container, { hideIfHasChips: true });
-            $giftcard.find(panel).prop('hidden', true).hide();
-            $giftcard.find(toggle).attr(expandedAttr, 'false');
-            return;
-        }
-        this.collapseKeepValues($giftcard);
-    },
-
     resetForm($root) {
         const { number, pin, note } = this.el;
         const $num = $root.find(number);
@@ -316,102 +195,71 @@ Wick.GiftCard = {
 
     open($root) {
         const { toggle, panel, hint, pin, expandedAttr, passwordToggleEvent } = this.el;
+        this.hideBanner($root);
         $root.show();
 
-        $root.find(panel).prop('hidden', false).show();
+        $root.find(panel).prop('hidden', false);
         $root.find(toggle).attr(expandedAttr, 'true').hide();
         $root.find(hint).hide();
         $root.find(pin).trigger(passwordToggleEvent);
     },
 
     close($root) {
-        const { toggle, panel, expandedAttr, giftcardRow, chipList, chip, hint } = this.el;
+        const { toggle, panel, loader, expandedAttr } = this.el;
         const $toggle = $root.find(toggle);
         const $panel = $root.find(panel);
-        const $pageLoader = this.getPageLoader();
+        const $loader = $root.find(loader);
 
-        showLoader($pageLoader);
+        showLoader($loader);
 
         setTimeout(() => {
-            hideLoader($pageLoader);
+            hideLoader($loader);
 
             $panel.prop('hidden', true);
             $toggle.attr(expandedAttr, 'false').show().trigger('focus');
-
-            const $row = $root.closest(giftcardRow);
-            const count = $row.find(`${chipList} ${chip}`).length;
-            const zeroTotal = this.summaryTotal != null ? isZeroAmount(this.summaryTotal) : false;
-
-            if (count === 0) {
-                $root.find(hint)[zeroTotal ? 'hide' : 'show']();
-                return;
-            }
-
             this.updateHintVisibility($root);
         }, 1000);
     },
 
     showSubmitSpinner($root) {
         const { panel, toggle, hint, expandedAttr } = this.el;
-
         $root.find(panel).prop('hidden', true);
         $root.find(toggle).attr(expandedAttr, 'false').show().trigger('focus');
         $root.find(hint).show();
-
-        this.lockPaymentsForSuccess($root);
-
         this.showSuccess($root);
     },
 
     handleToggleClick(e) {
         e.preventDefault();
-
-        const $root = $(e.currentTarget).closest(this.el.block);
-        const $container = $root.closest(this.el.checkoutContainer);
-
-        if (
-            $container.length &&
-            this.isCardMethodSelected($container) &&
-            this.isPaypageOpen($container)
-        ) {
-            this.clearPaypageAndCollapse($container);
-        }
-
-        this.open($root);
-        this.updateCtaButton($root);
+        this.open($(e.currentTarget).closest(this.el.$blocks));
     },
 
     handleCloseClick(e) {
         e.preventDefault();
-        const $root = $(e.currentTarget).closest(this.el.block);
+        const $root = $(e.currentTarget).closest(this.el.$blocks);
         this.resetForm($root);
         this.close($root);
     },
 
     finalizeSuccess($root, $success) {
+        let { panel, toggle, hint, expandedAttr } = this.el;
+
         if ($success && $success.length) {
             $success.attr('hidden', 'hidden').removeClass('fade show').off('transitionend');
         }
 
         this.resetForm($root);
-        this.updateHintVisibility($root);
-
-        this.successTimer = null;
-    },
-
-    lockPaymentsForSuccess($root) {
-        const $giftcard = $root.closest(this.el.block);
-        const $container = $giftcard.closest(this.el.checkoutContainer);
-
-        this.toggleAltPayments($giftcard, false);
-        this.toggleAltPaymentInfos($giftcard, false);
-
-        $container.find(this.el.billingAddress).show();
+        $root.find(panel).prop('hidden', true);
+        $root.find(toggle).attr(expandedAttr, 'false').show();
+        $root.find(hint).show();
 
-        $container.find(this.el.altPaymentRowsAttr).closest(this.el.formRow).hide();
+        if (this.pendingServerGiftCards) {
+            this.renderGiftCardsFromList($root, this.pendingServerGiftCards);
+            this.pendingServerGiftCards = null;
+        }
 
-        this.altPaymentPanelsLocked = true;
-        this.altPaymentInfosLocked = true;
+        this.updateHintVisibility($root);
+        this.successTimer = null;
     },
 
     showSuccess($root) {
@@ -430,16 +278,15 @@ Wick.GiftCard = {
 
         this.successTimer = setTimeout(() => {
             $success.removeClass('show');
-
             const handler = () => this.finalizeSuccess($root, $success);
-            $success.on('transitionend', handler);
 
+            $success.on('transitionend', handler);
             setTimeout(handler, 200);
-        }, 1500);
+        }, 3000);
     },
 
     handleFormSubmit(e) {
-        const { number, block } = this.el;
+        const { number, block, giftcardRow, loaderChip } = this.el;
         e.preventDefault();
 
         const $root = $(e.currentTarget).closest(block);
@@ -451,50 +298,48 @@ Wick.GiftCard = {
         const $numInput = $root.find(this.el.number);
         const $pinInput = $root.find(this.el.pin);
 
+        const numberBlurOpts = {
+            fieldSelector: this.el.field,
+            errorTextSelector: this.el.errorText,
+            errorClass: this.el.fieldError,
+            ariaInvalidAttr: this.el.ariaInvalidAttr,
+            numberMessage: this.messages.numberMessage,
+        };
+
+        const pinBlurOpts = {
+            fieldSelector: this.el.field,
+            errorTextSelector: this.el.errorText,
+            errorClass: this.el.fieldError,
+            ariaInvalidAttr: this.el.ariaInvalidAttr,
+            pinMessage: this.messages.pinMessage,
+        };
+
         const okNumber = validateExactDigits($numInput, 16, this.messages.numberMessage, this.el);
         const okPin = validateExactDigits($pinInput, 8, this.messages.pinMessage, this.el);
 
         if (!(okNumber && okPin)) {
-            handleGcNumberBlur(
-                { currentTarget: $numInput[0] },
-                {
-                    fieldSelector: this.el.field,
-                    errorTextSelector: this.el.errorText,
-                    errorClass: this.el.fieldError,
-                    ariaInvalidAttr: this.el.ariaInvalidAttr,
-                    numberMessage: this.messages.numberMessage,
-                }
-            );
-
-            handleGcPinBlur(
-                { currentTarget: $pinInput[0] },
-                {
-                    fieldSelector: this.el.field,
-                    errorTextSelector: this.el.errorText,
-                    errorClass: this.el.fieldError,
-                    ariaInvalidAttr: this.el.ariaInvalidAttr,
-                    pinMessage: this.messages.pinMessage,
-                }
-            );
-
+            handleGcNumberBlur({ currentTarget: $numInput[0] }, numberBlurOpts);
+            handleGcPinBlur({ currentTarget: $pinInput[0] }, pinBlurOpts);
             (!okNumber ? $numInput : $pinInput).trigger('focus');
             return;
         }
 
         const giftCardNumber = this.getNumberValue($root);
         const pin = this.getPinValue($root);
+        const $row = $root.closest(giftcardRow);
 
-        const $pageLoader = this.getPageLoader();
-        showLoader($pageLoader);
+        let $loader = $row.children(loaderChip);
+
+        if (!$loader.length) {
+            appendLoader({ wrapper: $row });
+            $loader = $row.children(loaderChip).last();
+        }
 
-        verifyGiftCard($pageLoader, giftCardNumber, pin)
+        verifyGiftCard($loader, giftCardNumber, pin)
             .then((res) => this.handleVerifyResponse($root, res))
             .catch((err) => {
                 const msg = this.getErrorMessage(err);
                 this.showBannerError($root, msg);
-            })
-            .finally(() => {
-                hideLoader($pageLoader);
             });
     },
 
@@ -505,20 +350,18 @@ Wick.GiftCard = {
                 return;
             }
 
-            let summaryData;
-            if (res.orderTotal != null || res.giftCardTotal != null) {
-                summaryData = { total: res.orderTotal, giftCardApplied: res.giftCardTotal };
+            this.pendingServerGiftCards = res.giftCards.slice();
 
-                updateOrderSummary(summaryData, buildSummaryEqualMap(summaryData), true);
+            if (res.orderTotal != null || res.giftCardTotal != null) {
+                const data = { total: res.orderTotal, giftCardApplied: res.giftCardTotal };
+                updateOrderSummary(data, buildSummaryEqualMap(data), true);
                 this.summaryTotal = res.orderTotal;
-
                 this.toggleBillingDescrForZero($root);
                 this.updateCtaButton($root);
             }
 
             this.resetForm($root);
             this.showSubmitSpinner($root);
-            this.renderGiftCardsFromList($root, res.giftCards);
             return;
         }
 
@@ -526,9 +369,10 @@ Wick.GiftCard = {
         this.showBannerError($root, msg);
     },
 
-    updateHintVisibility($root, opts = {}) {
+    updateHintVisibility($root) {
         const {
             chipList,
+            giftcardRow,
             hint,
             panel,
             toggle,
@@ -538,63 +382,61 @@ Wick.GiftCard = {
             chip,
             block,
             body,
-            fieldError,
         } = this.el;
 
-        const { skipResetForm = false } = opts;
-
-        const $giftcard = $root.closest(block).length ? $root.closest(block) : $root;
-        const $summary = this.ensureSummaryContainer($giftcard);
-        const count = $summary.find(`${chipList} ${chip}`).length;
-
+        const $row = $root.closest(giftcardRow);
+        const $giftcard = $row.find(block).first();
+        const count = $row.find(`${chipList} ${chip}`).length;
         const limit = this.maxChips || 3;
+
         const zeroTotal = this.summaryTotal != null ? isZeroAmount(this.summaryTotal) : false;
 
         this.toggleAltPayments($giftcard, count === 0);
         this.toggleAltPaymentInfos($giftcard, count === 0);
-        const panelOpen = this.isPanelOpen($giftcard);
 
-        if (count === 0) {
-            $summary.hide();
-
-            $giftcard.show();
-
-            if (!skipResetForm) {
-                this.resetForm($giftcard);
+        if (count > 0) {
+            if (!this.altPaymentPanelsLocked) {
+                this.showOnlyBillingAddress($giftcard);
+                this.altPaymentPanelsLocked = true;
+            } else {
+                this.showOnlyBillingAddress($giftcard);
             }
-
-            if (panelOpen) {
-                this.open($giftcard);
+        } else {
+            if (!this.altPaymentPanelsLocked) {
+                this.toggleAltPayments($giftcard, true);
+                this.toggleAltPaymentInfos($giftcard, true);
             } else {
-                $giftcard.find(panel).prop('hidden', true);
-                $giftcard.find(toggle).attr(expandedAttr, 'false').show();
-                $giftcard.find(hint)[zeroTotal ? 'hide' : 'show']();
+                this.showOnlyBillingAddress($giftcard);
             }
+        }
+
+        const $summary = this.ensureSummaryContainer($giftcard);
 
+        if (count === 0) {
+            $summary.hide();
+            $giftcard.show();
+            this.resetForm($giftcard);
+            $giftcard.find(panel).prop('hidden', true);
+            $giftcard.find(toggle).attr(expandedAttr, 'false').show();
+            $giftcard.find(hint)[zeroTotal ? 'hide' : 'show']();
             this.updateCtaButton($giftcard);
             return;
         }
 
         this.setBillingLabelToCard($giftcard);
-
         $summary.show();
+        $giftcard.hide();
         $giftcard.find(hint).hide();
-        const hasError = $giftcard.find(`.${fieldError}`).length > 0;
-
-        const shouldHideGiftcard = count > 0 && !panelOpen && !hasError;
-
-        $giftcard.toggle(!shouldHideGiftcard);
 
         const ctx = buildHintContext(count, limit, zeroTotal);
         const html = giftCardsHint(ctx);
-
         const $old = $summary.find(summaryHint).first();
         const $new = $(html);
 
         if ($old.length) $old.replaceWith($new);
         else $summary.append($new);
 
-        if (zeroTotal || panelOpen) {
+        if (zeroTotal) {
             $summary.find(summaryHint).hide();
         }
 
@@ -610,21 +452,18 @@ Wick.GiftCard = {
     },
 
     toggleAltPaymentInfos($root, show) {
-        const { checkoutContainer, billieInfo, klarnaInfo, paymentMethodCheckedSel } = this.el;
-
+        const { checkoutContainer, billieInfo, klarnaInfo } = this.el;
         const $container = $root.closest(checkoutContainer);
 
         if (this.altPaymentInfosLocked) {
             show = false;
         }
 
-        const currentMethod = $container.find(paymentMethodCheckedSel).val();
-
-        const showBillie = show && currentMethod === 'billie';
-        const showKlarna = show && currentMethod === 'klarna';
-
-        $container.find(billieInfo)[showBillie ? 'show' : 'hide']();
-        $container.find(klarnaInfo)[showKlarna ? 'show' : 'hide']();
+        [$container.find(billieInfo), $container.find(klarnaInfo)].forEach(($panel) => {
+            if ($panel && $panel.length) {
+                $panel[show ? 'show' : 'hide']();
+            }
+        });
 
         if (!show) this.altPaymentInfosLocked = true;
     },
@@ -693,48 +532,16 @@ Wick.GiftCard = {
 
     handleAddAnotherClick(e) {
         e.preventDefault();
-
-        const {
-            giftcardRow,
-            chipList,
-            chip,
-            block,
-            number,
-            pin,
-            summaryHint,
-            checkoutContainer,
-            fieldError,
-            notificationRoot,
-        } = this.el;
+        const { giftcardRow, chipList, chip, block, number, summaryHint } = this.el;
 
         const $row = $(e.currentTarget).closest(giftcardRow);
-
-        const $container = $row.closest(checkoutContainer);
-        if (
-            $container.length &&
-            this.isCardMethodSelected($container) &&
-            this.isPaypageOpen($container)
-        ) {
-            this.clearPaypageAndCollapse($container);
-        }
-
         const count = $row.find(`${chipList} ${chip}`).length;
         if (count >= this.maxChips) return;
 
         const $giftcard = $row.find(block).first();
-
-        const hasDraft =
-            String($giftcard.find(number).val() || '').trim().length > 0 ||
-            String($giftcard.find(pin).val() || '').trim().length > 0;
-
-        const hasFieldError = $giftcard.find(`.${fieldError}`).length > 0;
-        const hasBannerError = $giftcard.find(notificationRoot).length > 0;
-
-        if (!hasDraft && !hasFieldError && !hasBannerError) {
-            this.resetForm($giftcard);
-        }
-
+        this.resetForm($giftcard);
         this.open($giftcard);
+
         $row.find(summaryHint).hide();
 
         setTimeout(() => {
@@ -742,43 +549,6 @@ Wick.GiftCard = {
         }, 0);
     },
 
-    isCardMethodSelected($container) {
-        const { paymentMethodCheckedSel, paymentMethodCardValue } = this.el;
-
-        const $checked = $container.find(paymentMethodCheckedSel);
-        return $checked.length && $checked.val() === paymentMethodCardValue;
-    },
-
-    isPaypageOpen($container) {
-        const { paypageIframeWrapSel } = this.el;
-
-        const $wrap = $container.find(paypageIframeWrapSel);
-        return $wrap.length ? $wrap.is(':visible') : false;
-    },
-
-    clearPaypageAndCollapse($container) {
-        const {
-            cardDetails,
-            hiddenCard,
-            paypageIframeWrapSel,
-            cardValidationErrorRowSel,
-            cardValidationErrorRowClass,
-            cardValidationErrorTextSel,
-        } = this.el;
-
-        const $cardDetails = $container.find(cardDetails);
-        if (!$cardDetails.length) return;
-
-        $cardDetails.addClass(hiddenCard).hide();
-        $cardDetails.find(paypageIframeWrapSel).hide();
-
-        $cardDetails
-            .find(cardValidationErrorRowSel)
-            .removeClass(cardValidationErrorRowClass)
-            .find(cardValidationErrorTextSel)
-            .remove();
-    },
-
     getErrorMessage(payload) {
         const code =
             payload && (typeof payload.code === 'number' || typeof payload.code === 'string')
@@ -790,8 +560,7 @@ Wick.GiftCard = {
 
     handleChipCloseClick(e) {
         e.preventDefault();
-
-        const { chip, giftcardRow, block, giftcardChipClose, chipList } = this.el;
+        const { chip, giftcardRow, block, giftcardChipClose, chipList, loaderChip } = this.el;
 
         const $clickedChip = $(e.currentTarget).closest(chip);
         const $row = $clickedChip.closest(giftcardRow);
@@ -802,19 +571,22 @@ Wick.GiftCard = {
         const index = $chips.index($clickedChip);
         if (index < 0) return;
 
-        $row.find(giftcardChipClose).css('pointer-events', 'none').attr('aria-disabled', 'true');
+        let $loader = $row.children(loaderChip);
+        if (!$loader.length) {
+            appendLoader({ wrapper: $row });
+            $loader = $row.children(loaderChip).last();
+        }
 
-        const $pageLoader = this.getPageLoader();
-        showLoader($pageLoader);
+        $row.find(giftcardChipClose).css('pointer-events', 'none').attr('aria-disabled', 'true');
 
-        removeGiftCard($pageLoader, index)
+        removeGiftCard($loader, index)
             .then((res) => this.handleRemoveResponse($giftcard, res))
             .catch((err) => {
                 const msg = this.getErrorMessage(err);
                 this.showBannerError($giftcard, msg);
             })
             .finally(() => {
-                hideLoader($pageLoader);
+                hideLoader($loader);
                 $row.find(giftcardChipClose).css('pointer-events', '').removeAttr('aria-disabled');
             });
     },
@@ -825,10 +597,7 @@ Wick.GiftCard = {
             const data = { total: res.orderTotal, giftCardApplied: res.giftCardTotal };
             this.summaryTotal = res.orderTotal;
 
-            this.renderGiftCardsFromList($giftcard, giftCardsList, {
-                ...data,
-                skipResetForm: true,
-            });
+            this.renderGiftCardsFromList($giftcard, giftCardsList, data);
 
             if (res.orderTotal != null || res.giftCardTotal != null) {
                 updateOrderSummary(data, buildSummaryEqualMap(data), true);
@@ -856,14 +625,14 @@ Wick.GiftCard = {
     },
 
     getPageLoader() {
-        const $pageLoader = $(this.el.pageLoader);
-        if (!$pageLoader.parent().is('body')) $pageLoader.appendTo('body');
-        return $pageLoader;
+        const $pl = $(this.el.pageLoader);
+        if (!$pl.parent().is('body')) $pl.appendTo('body');
+        return $pl;
     },
 
     showPageLoader() {
-        const $pageLoader = this.getPageLoader();
-        showLoader($pageLoader);
+        const $pl = this.getPageLoader();
+        showLoader($pl);
     },
 
     updateCtaButton($scope) {
@@ -888,67 +657,13 @@ Wick.GiftCard = {
         }
     },
 
-    toggleOrderAddress($scope, show) {
-        const $container = $scope.closest(this.el.checkoutContainer);
-        const $orderAddress = $container.find(this.el.orderAddress);
-        if (!$orderAddress.length) return;
-
-        const wasShown = !$orderAddress.hasClass('d-none');
-        if (wasShown === show) return;
-
-        $orderAddress.toggleClass('d-none', !show);
-
-        if (this.orderAddressLookup) this.orderAddressLookup.setShown(show);
-    },
-
-    validateOrderNames() {
-        let $firstInvalid = null;
-
-        Object.keys(ORDER_NAME_RULES).forEach((key) => {
-            const $field = $(this.el[key]);
-            const isValid = validateFieldByRule($field, ORDER_NAME_RULES[key]);
-
-            if (!isValid && !$firstInvalid) $firstInvalid = $field;
-        });
-
-        return $firstInvalid;
-    },
-
-    isOrderAddressValid() {
-        const $invalidName = this.validateOrderNames();
-        const isLookupValid =
-            !this.orderAddressLookup ||
-            this.orderAddressLookup.validate({ shouldScroll: !$invalidName });
-
-        if ($invalidName) {
-            const $row = $invalidName.closest(this.el.formRow);
-            if (!isElementInViewport($row)) scrollToElement($row, ORDER_ADDRESS_SCROLL_OFFSET);
-        }
-
-        return !$invalidName && isLookupValid;
-    },
-
-    resetOrderAddress() {
-        Object.keys(ORDER_NAME_RULES).forEach((key) => {
-            const $field = $(this.el[key]);
-            $field.val('');
-            removeErrorStyling($field.closest(this.el.formRow));
-            resetBlurValidation($field);
-        });
-
-        if (this.orderAddressLookup) this.orderAddressLookup.reset();
-    },
-
     toggleBillingDescrForZero($scope) {
         const $container = $scope.closest(this.el.checkoutContainer);
         const $descr = $container.find(this.el.checkoutPaymentFields);
-        const isFullyCovered = isZeroAmount(this.summaryTotal);
-
-        this.toggleOrderAddress($scope, isFullyCovered);
-
         if (!$descr.length) return;
 
-        $descr[isFullyCovered ? 'hide' : 'show']();
+        const shouldHide = isZeroAmount(this.summaryTotal);
+        $descr[shouldHide ? 'hide' : 'show']();
     },
 
     getNumberValue($root) {
@@ -975,8 +690,6 @@ Wick.GiftCard = {
             e.stopPropagation();
             e.stopImmediatePropagation();
 
-            if (!self.isOrderAddressValid()) return;
-
             const $scope = $btn.closest(self.el.checkoutContainer).find(self.el.block).first();
             const $root = $scope.length ? $scope : $(self.el.block).first();
 
@@ -1006,8 +719,8 @@ Wick.GiftCard = {
                     }
                 })
                 .finally(() => {
-                    const $pageLoader = self.getPageLoader();
-                    hideLoader($pageLoader);
+                    const $pl = self.getPageLoader();
+                    hideLoader($pl);
                 });
         });
     },
@@ -1029,32 +742,6 @@ Wick.GiftCard = {
         $inline.find(inlineHeader).after(html);
     },
 
-    clearErrorsOnly($root) {
-        const { number, pin, note, field, errorText, fieldError, ariaInvalidAttr } = this.el;
-
-        const $num = $root.find(number);
-        const $pin = $root.find(pin);
-
-        clearErrorText($num, field, errorText, fieldError, ariaInvalidAttr);
-        clearErrorText($pin, field, errorText, fieldError, ariaInvalidAttr);
-
-        $root.find(note).remove();
-
-        this.hideBanner($root);
-    },
-
-    clearErrorsIfEmptyOnInit($root) {
-        const rawNum = String($root.find(this.el.number).val() || '');
-        const rawPin = String($root.find(this.el.pin).val() || '');
-
-        const digitsNum = rawNum.replace(/\D/g, '');
-        const digitsPin = rawPin.replace(/\D/g, '');
-
-        if (digitsNum || digitsPin) return;
-
-        this.clearErrorsOnly($root);
-    },
-
     hideBanner($root) {
         const { notification } = this.el;
         $root.find(notification).remove();
@@ -1080,7 +767,7 @@ Wick.GiftCard = {
         $list.children(`${chip}:not(${loaderChip})`).remove();
 
         const html = (giftCards || [])
-            .map((giftCard) => this.renderChipHTML(this.mapGiftToChipData($root, giftCard)))
+            .map((g) => this.renderChipHTML(this.mapGiftToChipData($root, g)))
             .join('');
 
         if (html) {
@@ -1118,22 +805,9 @@ Wick.GiftCard = {
 
     showOnlyBillingAddress($root) {
         const { checkoutContainer, billingAddress, altPaymentRowsAttr, hiddenCard } = this.el;
-
         const $container = $root.closest(checkoutContainer);
-        if (!$container.length) {
-            return;
-        }
-
-        $container.find(billingAddress).removeClass(hiddenCard).show();
-
+        $container.find(billingAddress).removeClass(hiddenCard);
         $container.find(altPaymentRowsAttr).addClass(hiddenCard);
-
-        if (this.isCardMethodSelected($container)) {
-            this.clearPaypageAndCollapse($container);
-        } else {
-            $container.find(this.el.cardDetails).addClass(hiddenCard);
-        }
-
         this.toggleAltPaymentInfos($root, false);
     },
 
@@ -1167,77 +841,12 @@ Wick.GiftCard = {
         });
     },
 
-    collapseGiftcardPanel($container, opts = {}) {
-        const { hideIfHasChips = false } = opts;
-        const { panel, toggle, expandedAttr, checkoutContainer, block } = this.el;
-
-        const $ctx = $container && $container.length ? $container : $(checkoutContainer).first();
-        const $giftcard = $ctx.find(block).first();
-        if (!$giftcard.length) return;
-
-        $giftcard.find(panel).prop('hidden', true).hide();
-        $giftcard.find(toggle).attr(expandedAttr, 'false');
-
-        this.updateHintVisibility($giftcard, { skipResetForm: true });
-
-        if (hideIfHasChips) {
-            const hasChips = this.getAppliedChipsCount($giftcard) > 0;
-            if (hasChips) {
-                $giftcard.hide();
-                $giftcard.find(toggle).hide();
-            } else {
-                $giftcard.show();
-                $giftcard.find(toggle).show();
-            }
-        } else {
-            $giftcard.find(toggle).show();
-        }
-    },
-
-    bindCtaCardCollapse() {
-        const sel = this.el.btnEnterDetails;
-
-        $(document).off('click.giftcardCardCollapse', sel);
-
-        $(document).on('click.giftcardCardCollapse', sel, (e) => {
-            const $btn = $(e.currentTarget);
-            const mode = $btn.attr('data-mode');
-            if (mode !== 'card') return;
-
-            const $container = $btn.closest(this.el.checkoutContainer);
-
-            console.log('[GC] CTA click', {
-                mode,
-                btnFound: $(e.currentTarget).length,
-                container: $btn.closest(this.el.checkoutContainer).length,
-            });
-
-            if (!$container.length) return;
-
-            e.preventDefault();
-
-            this.collapseGiftcardPanel($container, { hideIfHasChips: true });
-
-            this.openPaypage($container);
-        });
-    },
-
     bindEvents() {
         const { number, pin, toggle, closeBtn, giftcardBtn, jsGiftcardAdd, giftcardChipClose } =
             this.el;
 
         $(document).off('.giftcard');
 
-        $(document).off('focusin.giftcard', this.collapseTargets);
-        $(document).on('focusin.giftcard', this.collapseTargets, (e) =>
-            this.handleCollapseTrigger(e)
-        );
-
-        $(document).off('change.giftcard', '#chb-payment-details-card');
-        $(document).on('change.giftcard', '#chb-payment-details-card', (e) =>
-            this.handleCollapseTrigger(e)
-        );
-
         const handleNumberInput = createGcNumberInputHandler({
             fieldSelector: this.el.field,
             fieldErrorClass: this.el.fieldError,
@@ -1289,25 +898,10 @@ Wick.GiftCard = {
             .on('click.giftcard', giftcardChipClose, this.handleChipCloseClick.bind(this));
 
         this.bindGiftcardCtaHandler();
-        this.bindCtaCardCollapse();
-        this.bindOrderNameValidation();
-    },
-
-    bindOrderNameValidation() {
-        Object.keys(ORDER_NAME_RULES).forEach((key) => {
-            bindBlurValidation(
-                this.el[key],
-                (field) => validateFieldByRule($(field), ORDER_NAME_RULES[key]),
-                { namespace: '.giftcard' }
-            );
-        });
     },
 
     init(payload = {}) {
         const { field, pin, $blocks } = this.el;
-        if (!this.orderAddressLookup) {
-            this.orderAddressLookup = createPostcodeLookup(ORDER_ADDRESS_LOOKUP_CONTEXT);
-        }
         this.bindEvents();
         this.bindSplitPaymentFailedListener();
         if ($blocks && $blocks.length) {
@@ -1324,10 +918,7 @@ Wick.GiftCard = {
         }
 
         $blocks.each((index, block) => {
-            const $block = $(block);
-            this.clearErrorsIfEmptyOnInit($block);
-
-            const $pinField = $block.find(pin).closest(field);
+            const $pinField = $(block).find(pin).closest(field);
             if ($pinField.length) {
                 initializeInputToggle($pinField);
             }