changed logic of boot secuence and begin checkout

vicklo · vicklo · commit 733c634a7a61 · 2025-11-12T15:17:44.000+01:00
diff --git a/MageWire/Checkout.php b/MageWire/Checkout.php
@@ -10,10 +10,6 @@
 
 class Checkout extends Component
 {
-    protected $listeners = [
-        'shipping_method_selected' => 'triggerShippingMethod',
-        'payment_method_selected' => 'triggerPaymentMethod',
-    ];
     private CheckoutSession $checkoutSession;
     private BeginCheckout $beginCheckout;
     private AddShippingInfo $addShippingInfo;
@@ -31,6 +27,17 @@ public function __construct(
         $this->addPaymentInfo = $addPaymentInfo;
     }
 
+    public function boot(): void
+    {
+        $parent = get_parent_class($this);
+        if ($parent && method_exists($parent, 'boot')) {
+            parent::boot();
+        }
+
+        $this->listeners['shipping_method_selected'] = 'triggerShippingMethod';
+        $this->listeners['payment_method_selected'] = 'triggerPaymentMethod';
+    }
+
     public function triggerBeginCheckout()
     {
         $this->dispatchBrowserEvent('ga:trigger-event', $this->beginCheckout->get());
diff --git a/view/frontend/layout/hyva_checkout_index_index.xml b/view/frontend/layout/hyva_checkout_index_index.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0"?>
 <page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
     <body>
-        <referenceContainer name="Tagging_GTM.data-layer.container">
+        <referenceContainer name="main">
             <block name="yireo_googletagmanager2.hyva_checkout.data-layer.component"
                    template="Tagging_GTM::hyva_checkout/data-layer.phtml"
                    ifconfig="GTM/settings/enabled"
-                   after="Tagging_GTM.data-layer">
+                   after="Tagging_GTM.pusher-script">
                 <arguments>
                     <argument name="magewire" xsi:type="object">Tagging\GTM\MageWire\Checkout</argument>
                     <argument name="begin_checkout_event" xsi:type="object">Tagging\GTM\DataLayer\Event\BeginCheckout</argument>
diff --git a/view/frontend/templates/hyva_checkout/data-layer.phtml b/view/frontend/templates/hyva_checkout/data-layer.phtml
@@ -14,26 +14,18 @@ if (false === $magewire->isHyvaCheckoutEnabled()) {
 }
 
 $beginCheckoutEvent = $block->getData('begin_checkout_event');
+$beginCheckoutPayload = $beginCheckoutEvent->get();
 ?>
-<div>
+<div class="hidden">
     <script>
-        function initYireoGoogleTagManagerInHyvaCheckout() {
+        (function () {
             "use strict";
 
-            function triggerEvent(event) {
+            window.addEventListener('ga:trigger-event', function (event) {
                 googleTagManager2Pusher(event.detail, 'Hyva Checkout');
-            }
+            }, {passive: true});
 
-            triggerEvent(new CustomEvent('ga:trigger-event', {detail: <?= json_encode($beginCheckoutEvent->get()) ?>}));
-
-            return {
-                triggerEvent
-            }
-        }
+            googleTagManager2Pusher(<?= /* @noEscape */ json_encode($beginCheckoutPayload) ?>, 'Hyva Checkout');
+        })();
     </script><?php if (isset($hyvaCsp) && $hyvaCsp): ?><?php $hyvaCsp->registerInlineScript() ?><?php endif; ?>
-    <div id="ga-trigger"
-         x-data="initYireoGoogleTagManagerInHyvaCheckout()"
-         class="hidden"
-         @ga:trigger-event.window="triggerEvent($event)"
-    ></div>
 </div>
