bit of refactoring

Author: tswfi

src/js/constants/selectors-map.ts

@@ -42,6 +42,7 @@ export const cart = {
   displayPromo: '.display-promo',
   promoCode: '#promo-code',
   deleteLinkAction: 'delete-from-cart',
+  removeVoucherAction: 'remove-voucher',
   productQuantity: '.cart__items .js-quantity-button',
   productItem: '.cart__item',
   removeFromCartLink: '.remove-from-cart',

src/js/pages/cart.ts

@@ -14,26 +14,22 @@ export default () => {
 
   if (cartSummary) {
     cartSummary.addEventListener('click', (event: Event) => {
-      const target = event.target as HTMLElement;
-
-      // Check if the clicked element is a voucher code or inside one
-      const voucher = target.closest(Theme.selectors.cart.discountCode);
-
-      if (!voucher || !isHTMLElement(voucher)) return;
-
-      event.stopPropagation();
+      const eventTarget = event.target as HTMLElement;
+      const voucherTarget = eventTarget.closest(Theme.selectors.cart.discountCode);
 
-      const discountInput = document.querySelector<HTMLInputElement>(Theme.selectors.cart.discountName);
-      const promoCode = document.querySelector(Theme.selectors.cart.promoCode);
+      if (voucherTarget && isHTMLElement(voucherTarget)) {
+        const discountInput = document.querySelector<HTMLInputElement>(Theme.selectors.cart.discountName);
+        const promoCode = document.querySelector(Theme.selectors.cart.promoCode);
 
-      if (promoCode && discountInput) {
-        const formCollapser = new Collapse(promoCode, {
-          toggle: false,
-        });
+        if (promoCode && discountInput) {
+          const formCollapser = new Collapse(promoCode, {
+            toggle: false,
+          });
 
-        discountInput.value = voucher.innerText;
-        // Show promo code field
-        formCollapser.show();
+          discountInput.value = voucherTarget.innerText;
+          // Show promo code field
+          formCollapser.show();
+        }
       }
     });
   }

templates/checkout/_partials/cart-voucher.tpl

@@ -16,7 +16,7 @@
                   <span class="cart-voucher__name col">{$voucher.name}</span>
                   <span class="fw-bold">{$voucher.reduction_formatted}</span>
                     {if isset($voucher.code) && $voucher.code !== ''}
-                      <form action="{$urls.pages.cart}?action=show" data-link-action="remove-voucher" class="d-flex" method="post">
+                      <form action="{$urls.pages.cart}?action=show" data-form-action="remove-voucher" class="d-flex" method="post">
                         <input type="hidden" name="token" value="{$static_token}">
                         <input type="hidden" name="deleteDiscount" value="{$voucher.id_cart_rule}">
                         <button type="submit" class="btn btn-link ms-2"><span><i class="material-icons" title="{l s='Remove Voucher' d='Shop.Theme.Checkout'}">&#xE872;</i></span></button>