bump version && changelog to 2.7.0

[rework] change structure of GA-event
moving the procedere into one step so there's not an accidental triggering of an GA-Push-Event which at the end overwrites the View-Item-Push-Event in the cmpEvent
2023-06-19 15:17:43 +02:00 · 2023-06-19 14:57:12 +02:00 · 2023-06-01 14:19:29 +02:00 · 2023-05-31 14:33:49 +02:00 · 2023-05-31 14:29:46 +02:00 · 2023-05-31 13:42:54 +02:00
11 changed files with 321 additions and 137 deletions
--- a/Application/Model/ManagerHandler.php
+++ b/Application/Model/ManagerHandler.php
@ -0,0 +1,53 @@
+<?php
+
+namespace D3\GoogleAnalytics4\Application\Model;
+
+use OxidEsales\Eshop\Core\Registry;
+use OxidEsales\Eshop\Core\ViewConfig;
+
+class ManagerHandler
+{
+    /**
+     * @return string
+     */
+    public function getCurrManager() :string
+    {
+        /** @var ManagerTypes $oManagerTypes */
+        $oManagerTypes = oxNew(ManagerTypes::class);
+
+        /** @var ViewConfig $oViewConfig */
+        $oViewConfig = oxNew(ViewConfig::class);
+
+        $aManagerList =  $oManagerTypes->getManagerList();
+
+        foreach ($aManagerList as $managerName){
+           if ($oViewConfig->isModuleActive($managerName)){
+               return $managerName;
+           }
+        }
+
+       return $this->getExplicitManager();
+    }
+
+    /**
+     * @return string
+     */
+    public function getModuleSettingExplicitManagerSelectValue() :string
+    {
+        return Registry::getConfig()->getConfigParam('d3_gtm_settings_HAS_STD_MANAGER');
+    }
+
+    /**
+     * @return string
+     */
+    public function getExplicitManager() :string
+    {
+        $sPotentialManagerName = $this->getModuleSettingExplicitManagerSelectValue();
+
+        /** @var ManagerTypes $oManagerTypes */
+        $oManagerTypes = oxNew(ManagerTypes::class);
+        return $oManagerTypes->isManagerInList($sPotentialManagerName)
+            ? $sPotentialManagerName
+            : "NONE";
+    }
+}
--- a/Application/Model/ManagerTypes.php
+++ b/Application/Model/ManagerTypes.php
@ -0,0 +1,60 @@
+<?php
+
+namespace D3\GoogleAnalytics4\Application\Model;
+
+class ManagerTypes
+{
+    #ToDo: make own classes for each of the manager
+
+
+    const EXTERNAL_SERVICE          = "externalService";
+    const NET_COOKIE_MANAGER        = "net_cookie_manager";
+
+    /**
+     * Further information's:
+     * https://github.com/aggrosoft/oxid-cookie-compliance
+     */
+    const AGCOOKIECOMPLIANCE        = "agcookiecompliance";
+
+    /**
+     * Used the OXID Module.
+     *
+     * Further information's:
+     * https://docs.oxid-esales.com/modules/usercentrics/de/latest/einfuehrung.html
+     *
+     * Usercentrics homepage:
+     * https://usercentrics.com
+     */
+    const USERCENTRICS_MODULE       = "oxps_usercentrics";
+
+    /**
+     * manually included usercentrics script
+     */
+    const USERCENTRICS_MANUALLY     = "USERCENTRICS";
+
+    const CONSENTMANAGER            = "CONSENTMANAGER";
+
+    /**
+     * @return array
+     */
+    public function getManagerList(): array
+    {
+        return [
+            "externalService"       => self::EXTERNAL_SERVICE,
+            "agcookiecompliance"    => self::AGCOOKIECOMPLIANCE,
+            "net_cookie_manager"    => self::NET_COOKIE_MANAGER,
+            "oxps_usercentrics"     => self::USERCENTRICS_MODULE,
+            "usercentrics"          => self::USERCENTRICS_MANUALLY,
+            "consentmanager"        => self::CONSENTMANAGER
+        ];
+    }
+
+    /**
+     * @param string $sManager
+     * @return bool
+     */
+    public function isManagerInList(string $sManager) :bool
+    {
+        return in_array($sManager, $this->getManagerList(), true);
+    }
+}
--- a/Application/views/blocks/_gtm_nojs.tpl
+++ b/Application/views/blocks/_gtm_nojs.tpl
@ -1,4 +1,4 @@
-[{if $oViewConf->D3blShowGtmScript() && !$oViewConf->getCookieManagerType()}]
+[{if $oViewConf->D3blShowGtmScript()}]
    [{if $oViewConf->getGtmContainerId()}][{strip}]
    <!-- Google Tag Manager (noscript) -->
    <noscript>
--- a/Application/views/ga4/add_to_cart.tpl
+++ b/Application/views/ga4/add_to_cart.tpl
@ -1,56 +1,47 @@
 [{$smarty.block.parent}]

-[{assign var="d3ProductObject" value=$oView->getProduct()}]
-[{assign var="d3PriceObject" value=$d3ProductObject->getPrice()}]
+[{* variable $gtmProduct is passed from parent tempalte *}]
+[{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
+[{assign var="gtmCurrency" value=$oView->getActCurrency()}]
+[{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+[{assign var="gtmCategory" value=$gtmProduct->getCategory()}]

 [{capture assign=d3_ga4_add_to_cart}]
-[{block name="d3_ga4_add_to_basket"}]
+  [{block name="d3_ga4_add_to_basket"}]
  $("#toBasket").click(function(event) {
+  dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */

-    [{*** Debug cases ***}]
-    [{*event.preventDefault();*}]
+  let itemCategories = '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]no category[{/if}]'.split('/');

-    let iArtQuantity = $("#amountToBasket").val();
+  [{*** Debug cases ***}]
+  [{*event.preventDefault();*}]

-    dataLayer.push({
-        'isAddToBasket': true,
-      'event':'add_to_cart',
-      'eventLabel': 'add_to_cart',
-      'ecommerce': {
-        'currency':   "[{$currency->name}]",
-        'value':      iArtQuantity*[{$d3PriceObject->getPrice()}],
-        'items':      [
-          {
-            'item_id':        '[{$gtmProduct->getFieldData('oxartnum')}]',
-            'item_name':      '[{$gtmProduct->getFieldData('oxtitle')}]',
-            'price':          [{$d3PriceObject->getPrice()}],
-            'item_brand':     '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-            'item_variant':   '[{if $gtmProduct->getFieldData('oxvarselect')}][{$gtmProduct->getFieldData('oxvarselect')}][{/if}]',
-            'item_category':  itemCategories[0] || 'no category',
-            'item_category_2':itemCategories[1] || '',
-            'item_category_3':itemCategories[2] || '',
-            'item_category_4':itemCategories[3] || '',
-            'quantity': iArtQuantity
-          }
-        ]
+  let iArtQuantity = $("#amountToBasket").val();
+
+  dataLayer.push({
+    'isAddToBasket': true,
+    'event':'add_to_cart',
+    'eventLabel': 'add_to_cart',
+    'ecommerce': {
+      'currency':   "[{$currency->name}]",
+      'value':      iArtQuantity*[{$d3PriceObject->getPrice()}],
+      'items':      [
+        {
+        'item_id':        '[{$gtmProduct->getFieldData('oxartnum')}]',
+        'item_name':      '[{$gtmProduct->getFieldData('oxtitle')}]',
+        'price':          [{$d3PriceObject->getPrice()}],
+        'item_brand':     '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+        'item_variant':   '[{if $gtmProduct->getFieldData('oxvarselect')}][{$gtmProduct->getFieldData('oxvarselect')}][{/if}]',
+        'item_category':  itemCategories[0] || 'no category',
+        'item_category_2':itemCategories[1] || '',
+        'item_category_3':itemCategories[2] || '',
+        'item_category_4':itemCategories[3] || '',
+        'quantity': iArtQuantity
+        }
+      ]
      }
    });
  });
-[{/block}]
-[{/capture}]
-[{oxscript add=$d3_ga4_add_to_cart}]
-
-[{strip}]
-    [{* variable $gtmProduct is passed from parent tempalte *}]
-
-    [{assign var="gtmCurrency" value=$oView->getActCurrency()}]
-    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
-    [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
-
-    <script>
-      dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-
-      let itemCategories = '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]no category[{/if}]'.split('/');
-
-    </script>
-[{/strip}]
+  [{/block}]
+  [{/capture}]
+[{oxscript add=$d3_ga4_add_to_cart}]
--- a/Application/views/ga4/view_item_list.tpl
+++ b/Application/views/ga4/view_item_list.tpl
@ -1,36 +1,36 @@
-[{$smarty.block.parent}]
-[{assign var="gtmProducts" value=$oView->getArticleList()}]
-
-[{assign var="breadCrumb" value=''}]
-
-[{if $gtmProducts|@count}]
-[{strip}]
-    <script>
-        /* ga4 */
-        dataLayer.push({ecommerce: null});
-        dataLayer.push({
-            'event':'view_item_list',
-            'event_name': 'view_item_list',
-            'ecommerce': {
-              'item_list_id': '[{$oView->getCategoryId()}]',
-              'item_list_name': '[{foreach from=$oView->getBreadCrumb() item=sCrum}][{if $sCrum.title }][{$breadCrumb|cat:$sCrum.title|cat:" > "}][{/if}][{/foreach}]',
-                'items': [
-                    [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
-                    [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
-                    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
-                    [{if !$gtmCategory}][{assign var="gtmCategory" value=$gtmProduct->getCategory()}][{/if}]
-                    {
-                        'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
-                        'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
-                        'price': [{$d3PriceObject->getPrice()}],
-                        'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-                        'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
-                        'quantity': 1
-                    }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
-                    [{/foreach}]
-                ]
-            }
-        });
-    </script>
-[{/strip}]
+[{$smarty.block.parent}]
+[{assign var="gtmProducts" value=$oView->getArticleList()}]
+
+[{assign var="breadCrumb" value=''}]
+
+[{if $gtmProducts|@count}]
+[{strip}]
+    <script>
+        /* ga4 */
+        dataLayer.push({ecommerce: null});
+        dataLayer.push({
+            'event':'view_item_list',
+            'event_name': 'view_item_list',
+            'ecommerce': {
+              'item_list_id': '[{$oView->getCategoryId()}]',
+              'item_list_name': '[{foreach from=$oView->getBreadCrumb() item=sCrum}][{if $sCrum.title }][{$breadCrumb|cat:$sCrum.title|cat:" > "}][{/if}][{/foreach}]',
+                'items': [
+                    [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
+                    [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
+                    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+                    [{if !$gtmCategory}][{assign var="gtmCategory" value=$gtmProduct->getCategory()}][{/if}]
+                    {
+                        'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
+                        'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
+                        'price': [{$d3PriceObject->getPrice()}],
+                        'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+                        'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
+                        'quantity': 1
+                    }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
+                    [{/foreach}]
+                ]
+            }
+        });
+    </script>
+[{/strip}]
 [{/if}]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,6 +4,78 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

+## [2.7.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.6.0...2.7.0) - 2023-06-19
+### Changed
+- add_to_cart event template-structure
+
+## [2.6.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.5.0...2.6.0) - 2023-05-31
+### Added
+- add settings to explicit choose an external service (usercentrics/ consentmanager)
+- position to block-extension
+- extended instructions to check for in readme
+### Fixed
+- usercentrics script
+- missing right articleList-getter
+### Changed
+- view_item_list-template block extension
+- cookieManager handling
+### Removed
+- additional check for cookieManagerType
+
+## [2.5.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.4.0...2.5.0) - 2023-05-23
+### Added
+- additional settings to explicitly indicate that consentmanager is used
+### Fixed
+- unnecessary converting of int to str
+- missing PriceObject-bug
+### Changed
+- genuine code cleanup
+
+## [2.4.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.3.3...2.4.0) - 2023-05-02
+### Added
+- "OXID Cookie Management powered by usercentrics" compatibility
+- usercentrics defined script attributes
+- cookie-manager evaluation
+### Changed
+- genuine clean up of base-js-files
+
+## [2.3.3](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.3.2...2.3.3) - 2023-03-20
+### Fixed
+- metadata file path for view_item
+
+## [2.3.2](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.2.2...2.3.2) - 2023-03-17
+### Added
+- Aggrosoft-Cookie-Consent compatibility
+### Fixed
+- wrong function for pageview on thankyou page
+### Deleted
+- unused files
+
+## [2.2.2](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.2.1...2.2.2) - 2023-02-22
+### Fixed
+- price formatting in view_cart
+
+## [2.2.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.1.1...2.2.1) - 2023-02-21
+### Added
+- cookie handling
+
+## [2.1.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.1...2.1.1) - 2023-01-27
+### Fixed
+- add missing class import
+
+## [2.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.0...2.1) - 2023-01-27
+### Added
+- block section for add_to_basket js
+- template block order positions
+
+## [2.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.1...2.0) - 2023-01-20
+### Added
+- using of ContainerFactory in ViewConfig
+
+## [1.8.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.7.0...1.8.0) - 2023-05-31
+### Fixed
+- bug in explicit manager selection
+
 ## [1.7.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.6.0...1.7.0) - 2023-05-31
 ### Added
 - extended call to read the technical documentation
--- a/Docs/README.md
+++ b/Docs/README.md
@ -65,4 +65,12 @@ Aktivieren Sie anschließend diese Weiche. Setzen Sie den Haken bei "Eigenen Coo
 - [OXID Cookie Management powered by usercentrics](https://docs.oxid-esales.com/modules/usercentrics/de/latest/einfuehrung.html)
  - In der Usercentrics-Verwaltung die Services "Google Analytics" und "Google Tag Manager" anlegen
  - Den Service ```Google Tag Manager``` in den Moduleinstellungen des 'Google Analytics 4' unter
-    ```Einstell. > Cookie Manager Einstellungen > Cookie-ID``` eintragen
+    Google Tag Manager eintragen
+  - 
+- [Consent Management Provider](https://www.consentmanager.net/)
+  - In der Consentmanager-Oberfläche den Anbieter "Google Tag Manager" mit der ID s905 hinzufügen
+  - Im Frontend, im consentmanager-Pop-up nach dem 'Google Tag Manager' suchen
+    - kleines Fragezeichen neben den Namen anklicken und ganz runter scrollen
+      - prüfen, ob ein Cookie vorgegeben ist
+      - sonst, in der Consentmanager-Oberfläche Cookie-Liste entsprechendes Cookie suchen und im Admin unter
+        ```Einstell. > Cookie Manager Einstellungen > Cookie-ID``` eintragen
--- a/Modules/Core/ViewConfig.php
+++ b/Modules/Core/ViewConfig.php
@ -12,9 +12,13 @@

 namespace D3\GoogleAnalytics4\Modules\Core;

+use D3\GoogleAnalytics4\Application\Model\ManagerHandler;
+use D3\GoogleAnalytics4\Application\Model\ManagerTypes;
 use OxidEsales\Eshop\Application\Controller\FrontendController;
 use OxidEsales\Eshop\Core\Config;
 use OxidEsales\Eshop\Core\Registry;
+use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ModuleSettingBridgeInterface;

 class ViewConfig extends ViewConfig_parent
 {
@ -27,54 +31,33 @@ class ViewConfig extends ViewConfig_parent
    {
        if ($this->sContainerId === null)
        {
-
-            $this->sContainerId = $this->getConfig()->getConfigParam('d3_gtm_sContainerID');
+            $this->sContainerId = ContainerFactory::getInstance()
+                                                  ->getContainer()
+                                                  ->get(ModuleSettingBridgeInterface::class)
+                                                  ->get('d3_gtm_sContainerID', 'd3googleanalytics4');
        }
        return $this->sContainerId;
    }

    /**
-     * @return mixed
+     * @return void
     */
-    public function getModuleSettingExplicitManagerSelectValue()
-    {
-        return Registry::getConfig()->getConfigParam('d3_gtm_settings_HAS_STD_MANAGER');
-    }
-
-    /**
-     * @return false|mixed
-     */
-    public function getExplicitManager()
-    {
-        $sManagerName = $this->getModuleSettingExplicitManagerSelectValue();
-        return $sManagerName === "NONE" ? false : $sManagerName;
-    }
-
-    public function getCookieManagerType()
+    public function defineCookieManagerType() :void
    {
        if ($this->sCookieManagerType === null)
        {
-            $this->sCookieManagerType = false;
-
-            $allowedManagerTypes = [
-                'net_cookie_manager',
-                'agcookiecompliance',
-                'oxps_usercentrics'
-            ];
-
-            foreach ($allowedManagerTypes as $type) {
-                if ($this->isModuleActive($type)) {
-                    $this->sCookieManagerType = $type;
-                    break;
-                }
-            }
+            /** @var ManagerHandler $oManagerHandler */
+            $oManagerHandler = oxNew(ManagerHandler::class);
+            $this->sCookieManagerType = $oManagerHandler->getCurrManager();
        }
+    }

-        if ($this->sCookieManagerType === false and $this->getExplicitManager()){
-            return "externalService";
-        }
-
-        return $this->sCookieManagerType;
+    /**
+     * @return bool
+     */
+    public function shallUseOwnCookieManager() :bool
+    {
+        return (bool) Registry::getConfig()->getConfigParam('d3_gtm_settings_hasOwnCookieManager');
    }

    /**
@ -86,29 +69,37 @@ class ViewConfig extends ViewConfig_parent
        $oConfig = Registry::getConfig();

        // No Cookie Manager in use
-        if (!$oConfig->getConfigParam('d3_gtm_settings_hasOwnCookieManager')) {
+        if (!$this->shallUseOwnCookieManager()) {
            return true;
        }

+        $this->defineCookieManagerType();
+
        $sCookieID = $oConfig->getConfigParam('d3_gtm_settings_cookieName');

        // Netensio Cookie Manager
-        if ($this->getCookieManagerType() == "net_cookie_manager") {
+        if ($this->sCookieManagerType === ManagerTypes::NET_COOKIE_MANAGER) {
            $oSession = Registry::getSession();
            $aCookies = $oSession->getVariable("aCookieSel");

-            return (!is_null($aCookies) && is_array($aCookies) && array_key_exists($sCookieID, $aCookies) && $aCookies[$sCookieID] == "1");
+            return (is_array($aCookies) && array_key_exists($sCookieID, $aCookies) && $aCookies[$sCookieID] == "1");
        }

        // Aggrosoft Cookie Consent
-        if ($this->getCookieManagerType() == "agcookiecompliance") {
+        if ($this->sCookieManagerType === ManagerTypes::AGCOOKIECOMPLIANCE) {
            if (method_exists($this, "isCookieCategoryEnabled")) {
                return $this->isCookieCategoryEnabled($sCookieID);
            }
        }

        // UserCentrics or consentmanager
-        if ($this->getCookieManagerType() === "oxps_usercentrics" or $this->getCookieManagerType() === 'externalService') {
+        if (
+            $this->sCookieManagerType       === ManagerTypes::USERCENTRICS_MODULE
+            or $this->sCookieManagerType    === ManagerTypes::USERCENTRICS_MANUALLY
+            or $this->sCookieManagerType    === ManagerTypes::CONSENTMANAGER
+            or $this->sCookieManagerType    === ManagerTypes::EXTERNAL_SERVICE
+        )
+        {
            // Always needs the script-tags delivered to the DOM.
            return true;
        }
@ -122,21 +113,27 @@ class ViewConfig extends ViewConfig_parent
     * This is especially important for UserCentrics.
     * @return string
     */
-    public function getGtmScriptAttributes()
+    public function getGtmScriptAttributes() :string
    {
        $oConfig = Registry::getConfig();
+        $sCookieId = $oConfig->getConfigParam('d3_gtm_settings_cookieName');

-        if ($this->getCookieManagerType() === "oxps_usercentrics" or $this->getExplicitManager() === 'USERCENTRICS') {
-            $sCookieId = $oConfig->getConfigParam('d3_gtm_settings_cookieName');
+        if (false === $this->shallUseOwnCookieManager()){
+            return "";
+        }

+        if (
+            $this->sCookieManagerType === ManagerTypes::USERCENTRICS_MODULE
+            or $this->sCookieManagerType === ManagerTypes::USERCENTRICS_MANUALLY
+        )
+        {
            if ($sCookieId) {
                return 'data-usercentrics="' . $sCookieId . '" type="text/plain" async=""';
            }
        }

-        if ($this->getCookieManagerType() === "externalService" and $this->getExplicitManager() === 'CONSENTMANAGER') {
-            $sCookieId = $oConfig->getConfigParam('d3_gtm_settings_cookieName');
-
+        if ($this->sCookieManagerType === ManagerTypes::CONSENTMANAGER)
+        {
            if ($sCookieId) {
                return 'async 
                        type="text/plain"
@ -156,7 +153,10 @@ class ViewConfig extends ViewConfig_parent
    {
        if ($this->blGA4enabled === null)
        {
-            $this->sContainerId = $this->getConfig()->getConfigParam('d3_gtm_blEnableGA4');
+            $this->sContainerId = ContainerFactory::getInstance()
+                                                  ->getContainer()
+                                                  ->get(ModuleSettingBridgeInterface::class)
+                                                  ->get('d3_gtm_blEnableGA4', 'd3googleanalytics4');
        }

        return $this->blGA4enabled;
--- a/README.md
+++ b/README.md
@ -23,16 +23,16 @@ Dieses Paket erfordert einen mit Composer installierten OXID eShop in einer in d
 Öffnen Sie eine Kommandozeile und navigieren Sie zum Stammverzeichnis des Shops (Elternverzeichnis von source und vendor). Führen Sie den folgenden Befehl aus. Passen Sie die Pfadangaben an Ihre Installationsumgebung an.

 ```bash
-php composer require d3/google-analytics4:^1
+php composer require d3/google-analytics4:^2
 ```

 Sofern nötig, bestätigen Sie bitte, dass Sie `package-name` erlauben, Code auszuführen.

 Aktivieren Sie das Modul im Shopadmin unter "Erweiterungen -> Module".

-> ### Wichtig!
-> Bitte stellen Sie sicher, dass die nötigen Blöcke im OXID-Shop zur Verfügung stehen.
-> Lesen Sie mehr in der [technischen Doku](./Docs/README.md) unter "Blöcke"!
+### Wichtig!
+Bitte stellen Sie sicher, dass die nötigen Template-Blöcke im OXID-Shop zur Verfügung stehen. 
+Lesen Sie mehr in der [technischen Doku](./Docs/README.md) unter "Blöcke"!

 ## Verwendung
 ### Grundfunktionalität
--- a/composer.json
+++ b/composer.json
@ -45,7 +45,7 @@
  },
  "require": {
    "php": ">=7.1",
-    "oxid-esales/oxideshop-ce": "v6.0 - 6.3",
+    "oxid-esales/oxideshop-ce": "^6.5",
    "google/apiclient":" ^2.0"
  },
  "autoload": {
--- a/metadata.php
+++ b/metadata.php
@ -17,7 +17,7 @@ $aModule          = [
                      Die Entwicklung basiert auf einem Fork von Marat Bedoev - <a href='https://github.com/vanilla-thunder/oxid-module-gtm'>Github-Link</a>
                      ",
    'thumbnail'   => 'thumbnail.png',
-    'version'     => '1.7.0',
+    'version'     => '2.7.0',
    'author'      => 'Data Development (Inh.: Thomas Dartsch)',
    'email'       => 'support@shopmodule.com',
    'url'         => 'https://www.oxidmodule.com/',
Author	SHA1	Message	Date
MaxBUhe	e48b21022c	bump version && changelog to 2.7.0	2023-06-19 15:17:43 +02:00
MaxBUhe	b4bf91660e	[rework] change structure of GA-event moving the procedere into one step so there's not an accidental triggering of an GA-Push-Event which at the end overwrites the View-Item-Push-Event in the cmpEvent	2023-06-19 14:57:12 +02:00
MaxBUhe	3d62993dfc	add missing consentmanager readme entry	2023-06-01 14:19:29 +02:00
MaxBUhe	679a49823c	add missing changelog 1.x changes	2023-05-31 14:33:49 +02:00
MaxBUhe	106fea9c91	fix explicit manager bug bug would make script apply anyway, even if no manager is found	2023-05-31 14:29:46 +02:00
MaxBUhe	13132e6da0	Merge branch 'rel_2_prep_porting_rel_1.x' of git.d3data.de:D3Public/GoogleAnalytics4 into rel_2_prep_porting_rel_1.x	2023-05-31 13:42:54 +02:00
MaxBUhe	5c478124bc	bump version && changelog to 2.6.0	2023-05-31 13:40:51 +02:00
MaxBUhe	12613357b3	bump version && changelog to 2.6.0	2023-05-31 13:38:32 +02:00
MaxBUhe	95e0cab68c	rework 'Manager Type Handling'; add ManagerHandler + ManagerTypes	2023-05-31 12:17:00 +02:00
MaxBUhe	1d194d445a	rm unnecessary check	2023-05-31 12:16:10 +02:00
MaxBUhe	bf3fee5ce5	add missing article-getter	2023-05-31 10:35:18 +02:00
MaxBUhe	3c280a3adb	adjust readme and switch used block-extension	2023-05-31 10:34:34 +02:00
MaxBUhe	6217524828	adjusted usercentrics script	2023-05-31 10:34:24 +02:00
MaxBUhe	5ef600ff2a	added position to block-extension	2023-05-31 10:34:14 +02:00
MaxBUhe	a40d922f42	[working-state] restructuring usercentricts & consentmanager decision consentmanager decision is working so far; next step is implementing usercentricts	2023-05-31 10:33:59 +02:00
MaxBUhe	dae5f66f81	add usercentrics chosable settings-value; add additional methods; add new multilang-idents	2023-05-31 10:33:43 +02:00
MaxBUhe	347e551194	merge rel_1.x changelog	2023-05-23 11:49:09 +02:00
MaxBUhe	000c49c56b	bump version && changelog to 2.5.0	2023-05-23 11:32:20 +02:00
MaxBUhe	002cc69d2a	switch metadata entries; fix getPrice-bug	2023-05-23 10:06:21 +02:00
MaxBUhe	af78809ae5	add settings-entry; add consentmanager-option	2023-05-15 15:06:25 +02:00
MaxBUhe	d531ba648b	fix unnecessary convert of int to str	2023-05-12 14:08:52 +02:00
MaxBUhe	a0c650fca3	Merge branch 'rel_2.x'	2023-05-11 15:26:45 +02:00
MaxBUhe	af341a984b	Merge branch 'rel_1.x' # Conflicts: # CHANGELOG.md # metadata.php	2023-05-11 15:26:31 +02:00
MaxBUhe	122dd4cf53	genuine code cleanup; switch hard-getter to methods and use price-object	2023-05-10 15:01:56 +02:00
MaxBUhe	27798703b0	bump version && changelog to 2.4.0	2023-05-02 14:36:52 +02:00
Christoph Staeblein	8eb734be8a	OXID UserCentrics support, general overhaul for cookie managers	2023-05-02 14:28:47 +02:00
MaxBUhe	616f31ecba	Merge remote-tracking branch 'remotes/origin/rel_2.x'	2023-03-20 15:46:58 +01:00
MaxBUhe	527eec1355	bump changelog	2023-03-20 11:01:03 +01:00
MaxBUhe	1966d3008e	Merge remote-tracking branch 'remotes/origin/rel_2.x_custB' into rel_2.x	2023-03-20 10:56:29 +01:00
MaxBUhe	bd51b37159	hot-fix: add missing view_item file; add metadata entry	2023-03-20 09:49:49 +01:00
MaxBuhe01	718b60e12c	Merge remote-tracking branch 'remotes/origin/rel_2.x'	2023-03-17 15:31:34 +01:00
MaxBuhe01	d4df87bfff	Merge remote-tracking branch 'remotes/origin/rel_1.x' into rel_2.x	2023-03-17 15:30:03 +01:00
MaxBUhe	63007e9b02	bump version	2023-03-10 11:25:12 +01:00
MaxBUhe	5fe656988c	genuine cleaning off of unnecessary files (prevent confusion)	2023-03-10 11:22:49 +01:00
MaxBUhe	9cb3a54824	Merge remote-tracking branch 'remotes/origin/rel_2.x'	2023-02-22 14:35:22 +01:00
MaxBUhe	2f6fd8a31c	bump version	2023-02-22 14:31:28 +01:00
MaxBUhe	8f9ed021d6	bump version	2023-02-22 14:07:14 +01:00
MaxBUhe	0ef3d3373a	Merge remote-tracking branch 'remotes/origin/dev/view_cart/illegal_character_U+20AC' into rel_2.x	2023-02-22 14:05:56 +01:00
MaxBUhe	fd2b4a5bbe	add special price formatting	2023-02-22 13:46:27 +01:00
MaxBuhe01	1c0d55bdc3	Merge remote-tracking branch 'remotes/origin/rel_2.x'	2023-02-21 12:47:38 +01:00
MaxBuhe01	7c1f99e678	Merge remote-tracking branch 'remotes/origin/rel_2.x'	2023-02-21 12:47:02 +01:00
MaxBUhe	126e746651	missing changelog-entry	2023-02-21 12:46:34 +01:00
MaxBuhe01	1c45a16356	bump version	2023-02-21 12:27:52 +01:00
MaxBUhe	1589f202a9	add own cookie-check method; rm unnecessary help-text	2023-02-21 12:09:04 +01:00
MaxBUhe	55bd7b7fb4	adjust module_options meta-docs	2023-02-01 14:27:49 +01:00
MaxBUhe	3c1e6a11ff	bump version	2023-01-27 13:47:13 +01:00
MaxBUhe	9ac78a0d43	OST:#573111 fix bug - missing use	2023-01-27 13:43:29 +01:00
MaxBUhe	e2bcb34051	bump version	2023-01-27 11:11:09 +01:00
MaxBUhe	4ea0c19d7b	Merge remote-tracking branch 'remotes/origin/rel_1.x' into rel_2.x	2023-01-27 11:04:23 +01:00
MaxBUhe	56740f1f10	rm unnecessary method call in gtm_js.tpl	2023-01-27 09:19:05 +01:00
MaxBUhe	daed30a585	rm unnecessary entries in metadata	2023-01-27 09:07:22 +01:00
MaxBUhe	48d411ac3f	switch head-meta-infos	2023-01-27 09:07:09 +01:00
MaxBUhe	b530366cb8	rm unnecessary lang file	2023-01-27 09:06:49 +01:00
MaxBUhe	975d07056a	cleaning off branding	2023-01-27 08:59:06 +01:00
MaxBUhe	24bf113d30	switch comment in changelog of 2.0	2023-01-26 09:20:56 +01:00
MaxBUhe	ca6a810fa3	add 1.0 section to changelog	2023-01-26 09:16:51 +01:00
MaxBUhe	62b382eadf	adding tech-docs; rm unnecessary sections in readme; fixing wrong links	2023-01-26 09:15:10 +01:00
MaxBUhe	45d8e45137	fix missing entries in changelog	2023-01-25 10:58:24 +01:00
MaxBUhe	70f2308575	extend changelog and readme	2023-01-25 10:48:02 +01:00
MaxBUhe	6eb15ec080	add block description	2023-01-20 14:31:39 +01:00
MaxBUhe	d722c46a74	bump metadata-version	2023-01-20 11:26:09 +01:00
MaxBUhe	d847a34e99	set compatibility to oxid 6.5 and above	2023-01-20 11:24:30 +01:00
MaxBUhe	7b55d1d57c	adjust requirements	2023-01-20 11:18:48 +01:00
MaxBUhe	a25be1069c	rework code to actually fit 6.0.x && 6.1x	2023-01-20 11:18:17 +01:00
MaxBUhe	5200232a32	Merge remote-tracking branch 'remotes/origin/rel_1.x' into dev_1.x_OXID_6.3	2023-01-20 11:11:17 +01:00
MaxBUhe	bcd785774b	adjusting composer.json to fit corresponding shop-version	2022-12-22 08:56:45 +01:00
MaxBUhe	5ba613df30	add currency to the params	2022-12-21 11:12:35 +01:00
MaxBUhe	a1dc0a6a58	fix bug that'd fail in wave and fail iIndex	2022-12-09 14:51:45 +01:00