Merge branch 'master' of github.com:yireo/Yireo_GoogleTagManager2LokiCheckout

Author: jissereitsma

CHANGELOG.md

@@ -6,13 +6,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+<<<<<<< HEAD
 ## [2.0.2] - 27 September 2025
 ### Fixed
 - Failsafe for when store is not present yet
 - Change container to block
 - Prevent empty quote from causing exception
 - New structure of localStorage listener
 - Add CI files
+=======
+## [2.0.4] - 08 October 2025
+### Fixed
+- Do not apply hyva handle, but just copy all XML layout changes
+
+## [2.0.3] - 29 September 2025
+### Fixed
+- Enable Alpine templates to call upon Yireo GTM properly
+- Failsafe for when store is not present yet
+
+## [2.0.2] - 27 September 2025
+- Change container to block
+- Prevent empty quote from causing exception
+- New structure of localStorage listener
+>>>>>>> 5e3ea4fb9a822a3bcb498c0b66918ac70f6fe7a3
 
 ## [2.0.1] - 13 August 2025
 ### Fixed

MODULE.json

@@ -12,11 +12,6 @@
         "Loki_CssUtils",
         "Loki_FieldComponents",
         "Loki_MapComponents",
-        "Magento_Backend",
-        "Magento_Catalog",
-        "Magento_CatalogInventory",
-        "Magento_CatalogSearch",
-        "Magento_Checkout",
         "Magento_CheckoutAgreements",
         "Magento_Config",
         "Magento_ConfigurableProduct",
@@ -33,10 +28,9 @@
         "Magento_Tax",
         "Magento_Vault",
         "Yireo_CspUtilities",
-        "Yireo_GoogleTagManager2",
-        "Yireo_HyvaThemeAutoRegistration"
+        "Yireo_GoogleTagManager2"
     ],
     "components": [],
     "config": [],
     "tests": []
-}
+}

composer.json

@@ -1,13 +1,12 @@
 {
     "name": "yireo/magento2-googletagmanager2-loki-checkout",
-    "version": "2.0.2",
+    "version": "2.0.4",
     "description": "N/A",
     "type": "magento2-module",
     "require": {
-        "loki-checkout/magento2-core": "^2.1",
-        "magento/framework": "^103.0",
-        "magento/module-checkout": "^100.4",
-        "magento/module-store": "^101.1",
+        "loki/magento2-components": "^2.0",
+        "magento/framework": "^102.0 || ^103.0",
+        "magento/module-checkout": "^100.0",
         "yireo/magento2-googletagmanager2": "^3.10"
     },
     "license": [
@@ -21,4 +20,4 @@
             "Yireo\\GoogleTagManager2LokiCheckout\\": ""
         }
     }
-}
+}

etc/module.xml

@@ -2,9 +2,14 @@
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
     <module name="Yireo_GoogleTagManager2LokiCheckout">
         <sequence>
+<<<<<<< HEAD
             <module name="LokiCheckout_Core"/>
             <module name="Magento_Checkout"/>
             <module name="Magento_Store"/>
+=======
+            <module name="Loki_Components"/>
+            <module name="Magento_Checkout"/>
+>>>>>>> 5e3ea4fb9a822a3bcb498c0b66918ac70f6fe7a3
             <module name="Yireo_GoogleTagManager2"/>
         </sequence>
     </module>

view/frontend/layout/loki_checkout.xml

@@ -6,6 +6,24 @@
                 name="yireo_googletagmanager2.loki_checkout.script.localstorage-listener"
                 template="Yireo_GoogleTagManager2LokiCheckout::script/localstorage-listener.phtml"
                 ifconfig="googletagmanager2/settings/enabled"/>
+
+            <block
+                name="yireo_googletagmanager2.pusher-script"
+                template="Yireo_GoogleTagManager2::hyva/script-pusher.phtml"
+                ifconfig="googletagmanager2/settings/enabled"/>
+
+            <block
+                name="yireo_googletagmanager2.logger-script"
+                template="Yireo_GoogleTagManager2::hyva/script-logger.phtml"
+                ifconfig="googletagmanager2/settings/enabled"/>
         </referenceBlock>
+
+        <referenceBlock
+            name="yireo_googletagmanager2.data-layer"
+            template="Yireo_GoogleTagManager2::hyva/data-layer.phtml"/>
+            
+        <referenceBlock
+            name="yireo_googletagmanager2.script-additions"
+            template="Yireo_GoogleTagManager2::hyva/script-additions.phtml"/>
     </body>
 </page>