Merge remote-tracking branch 'remotes/origin/rel_1.x' into rel_2.x

Application/views/admin/de/module_options.php

@@ -31,8 +31,5 @@ $aLang = [
     // for cookie manager settings
     'SHOP_MODULE_GROUP_d3_gtm_settings_cookiemanager'   => 'Cookie Manager Einstellungen',
     'SHOP_MODULE_d3_gtm_settings_hasOwnCookieManager'   => 'Cookie Manager nutzen?',
-    'SHOP_MODULE_d3_gtm_settings_HAS_CONSENTMANAGER'      => 'Nutzen Sie die Consentmanager-Einbindung?',
+    'SHOP_MODULE_d3_gtm_settings_cookieName'            => 'CookieID',
-    'SHOP_MODULE_d3_gtm_settings_HAS_CONSENTMANAGER_NO'   => 'Nein',
-    'SHOP_MODULE_d3_gtm_settings_HAS_CONSENTMANAGER_YES'  => 'Ja',
-    'SHOP_MODULE_d3_gtm_settings_cookieName'  => 'CookieID',
 ];

Application/views/blocks/_gtm_js.tpl

@@ -1,12 +1,40 @@
-[{* Always prepare the data layer to avoid errors *}]
+[{assign var="d3VtConfigObject" value=$oViewConf->getConfig()}]
-<script>
+[{if $d3VtConfigObject->getConfigParam('d3_gtm_settings_hasOwnCookieManager')}]
-  var dataLayer = [{$oViewConf->getGtmDataLayer()}] || [];
+    [{if $oViewConf->D3blAcceptedCookie($d3VtConfigObject->getConfigParam('d3_gtm_settings_cookieName'))}]
-</script>
 
-[{if $oViewConf->D3blShowGtmScript()}]
+        [{if $oViewConf->getGtmContainerId()}][{strip}]
+        <!-- Google Tag Manager -->
+        <script>
+          var dataLayer = [{$oViewConf->getGtmDataLayer()}] || [];
+          (function (w, d, s, l, i) {
+            w[l] = w[l] || [];
+            w[l].push({'gtm.start': new Date().getTime(), event: 'gtm.js'});
+            var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
+            j.async = true;
+            j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
+            f.parentNode.insertBefore(j, f);
+          })(window, document, 'script', 'dataLayer', '[{$oViewConf->getGtmContainerId()}]');
+        </script>
+        <!-- End Google Tag Manager -->
+        [{if $oViewConf->getTopActionClassName() === "alist" }]
+        [{* include file="ga4_view_item_list.tpl" gtmCategory=$oView->getActiveCategory() gtmProducts=$oView->getArticleList() listtype=$oView->getListType() *}]
+        [{elseif $oViewConf->getTopActionClassName() === "details" }]
+        [{* include file="ga4_view_item.tpl" gtmProduct=$oView->getProduct() *}]
+        [{elseif $oViewConf->getTopActionClassName() === "search" }]
+        [{elseif $oViewConf->getTopActionClassName() === "basket" }]
+
+        [{/if}]
+        [{/strip}][{/if}]
+    [{else}]
+    <script>
+      var dataLayer = [{$oViewConf->getGtmDataLayer()}] || [];
+    </script>
+    [{/if}]
+[{else}]
     [{if $oViewConf->getGtmContainerId()}][{strip}]
     <!-- Google Tag Manager -->
-    <script [{$oViewConf->getGtmScriptAttributes()}]>
+    <script>
+      var dataLayer = [{$oViewConf->getGtmDataLayer()}] || [];
       (function (w, d, s, l, i) {
         w[l] = w[l] || [];
         w[l].push({'gtm.start': new Date().getTime(), event: 'gtm.js'});
@@ -17,15 +45,15 @@
       })(window, document, 'script', 'dataLayer', '[{$oViewConf->getGtmContainerId()}]');
     </script>
     <!-- End Google Tag Manager -->
-
     [{if $oViewConf->getTopActionClassName() === "alist" }]
     [{* include file="ga4_view_item_list.tpl" gtmCategory=$oView->getActiveCategory() gtmProducts=$oView->getArticleList() listtype=$oView->getListType() *}]
     [{elseif $oViewConf->getTopActionClassName() === "details" }]
     [{* include file="ga4_view_item.tpl" gtmProduct=$oView->getProduct() *}]
     [{elseif $oViewConf->getTopActionClassName() === "search" }]
     [{elseif $oViewConf->getTopActionClassName() === "basket" }]
+
     [{/if}]
     [{/strip}][{/if}]
-    [{/if}]
+[{/if}]
 
-[{$smarty.block.parent}]
+[{$smarty.block.parent}]

Application/views/blocks/_gtm_nojs.tpl

@@ -1,12 +1,8 @@
-[{if $oViewConf->D3blShowGtmScript() && !$oViewConf->getCookieManagerType()}]
+[{if $oViewConf->getGtmContainerId()}][{strip}]
-    [{if $oViewConf->getGtmContainerId()}][{strip}]
     <!-- Google Tag Manager (noscript) -->
     <noscript>
         <iframe src="https://www.googletagmanager.com/ns.html?id=[{$oViewConf->getGtmContainerId()}]"
                 height="0" width="0" style="display:none;visibility:hidden"></iframe>
     </noscript>
-<!-- End Google Tag Manager (noscript) -->
+    <!-- End Google Tag Manager (noscript) -->[{/strip}][{/if}]
-    [{/strip}][{/if}]
-    [{/if}]
-
 [{$smarty.block.parent}]

Application/views/blocks/checkout_s1.tpl

@@ -2,10 +2,10 @@
 
 [{*$oxcmp_basket|get_class_methods|dumpvar*}]
 
-[{assign var="d3BasketPrice" value=$oxcmp_basket->getPrice()}]
-
 [{assign var='gtmCartArticles' value=$oView->getBasketArticles()}]
 [{strip}][{capture assign=d3_ga4_view_cart}]
+    let iPrice = "[{oxprice price=$oxcmp_basket->getPrice()}]";
+
     dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
     dataLayer.push({
         'event': 'view_cart',
@@ -13,15 +13,15 @@
         'ecommerce': {
             'actionField': "step: 1",
             'currency': "[{$currency->name}]",
-            'value': [{$d3BasketPrice->getPrice()}],
+            'value': iPrice.replace("€", ""),
             'items': [
                 [{foreach from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents  key=basketindex}]
-                [{assign var="d3oItemPrice" value=$basketitem->getPrice()}]
+                [{assign var='_price' value=$basketitem->getUnitPrice()}]
                 {
-                    'item_id': '[{$gtmCartArticles[$basketindex]->getFieldData('oxartnum')}]',
+                    'item_id': '[{$gtmCartArticles[$basketindex]->oxarticles__oxartnum->value}]',
-                    'item_name': '[{$gtmCartArticles[$basketindex]->getFieldData('oxtitle')}]',
+                    'item_name': '[{$gtmCartArticles[$basketindex]->oxarticles__oxtitle->value}]',
-                    'item_variant': '[{$gtmCartArticles[$basketindex]->getFieldData('oxvarselect')}]',
+                    'item_variant': '[{$gtmCartArticles[$basketindex]->oxarticles__oxvarselect->value}]',
-                    'price': [{$d3oItemPrice->getPrice()}],
+                    'price': [{$_price->getPrice()}],
                     'quantity':[{$basketitem->getAmount()}],
                     'position':[{$smarty.foreach.gtmCartContents.index}]
                 }[{if !$smarty.foreach.gtmCartContents.last}],[{/if}]

Application/views/blocks/checkout_s5.tpl

@@ -10,22 +10,21 @@
         'event': 'purchase',
         'eventLabel':'Checkout Step 5',
         'ecommerce': {
-          'transaction_id': '[{$_gtmOrder->getFieldData("oxordernr")}]',
+          'transaction_id': '[{$_gtmOrder->oxorder__oxordernr->value}]',
-          'affiliation':    '[{$oxcmp_shop->getFieldData("oxname")}]',
+          'affiliation':    '[{$oxcmp_shop->oxshops__oxname->value}]',
-          'value':          [{$_gtmOrder->getTotalOrderSum()}],
+          'value':          '[{$_gtmOrder->oxorder__oxtotalordersum->value}]',
-          'tax':            [{math equation="x+y" x=$_gtmOrder->getFieldData("oxartvatprice1") y=$_gtmOrder->getFieldData("oxartvatprice2") }],
+          'tax':            '[{math equation="x+y" x=$_gtmOrder->oxorder__oxartvatprice1->value y=$_gtmOrder->oxorder__oxartvatprice2->value }]',
-          'shipping':       [{$_gtmOrder->getFieldData("oxdelcost")}],
+          'shipping':       '[{$_gtmOrder->oxorder__oxdelcost->value}]',
           'currency':       '[{$_gtmOrder->getFieldData('oxcurrency')}]',
           'items':
               [
-                [{foreach from=$_gtmArticles item="d3BasketArticle" name="gtmArticles"}]
+                [{foreach from=$_gtmArticles item="_gtmArticle" name="gtmArticles"}]
-                  [{assign var="d3oArticlePrice" value=$d3BasketArticle->getPrice()}]
                 {
-                    'id':       '[{$d3BasketArticle->getFieldData("oxartnum")}]',
+                    'id':       '[{$_gtmArticle->oxorderarticles__oxartnum->value}]',
-                    'name':     '[{$d3BasketArticle->getFieldData("oxtitle")}]',
+                    'name':     '[{$_gtmArticle->oxorderarticles__oxtitle->value}]',
-                    'variant':  '[{$d3BasketArticle->getFieldData("oxselvariant")}]',
+                    'variant':  '[{$_gtmArticle->oxorderarticles__oxselvariant->value}]',
-                    'price':    [{$d3oArticlePrice->getPrice()}],
+                    'price':    [{$_gtmArticle->oxorderarticles__oxprice->value}],
-                    'quantity': [{$d3BasketArticle->getFieldData("oxamount")}],
+                    'quantity': [{$_gtmArticle->oxorderarticles__oxamount->value}],
                     'position': [{$smarty.foreach.gtmArticles.iteration}]
                 }[{if !$smarty.foreach.gtmArticles.last}],[{/if}]
                 [{/foreach}]

Application/views/blocks/view_item.tpl

@@ -1,26 +0,0 @@
-[{$smarty.block.parent}]
-[{assign var="gtmProduct" value=$oView->getProduct()}]
-[{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
-[{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
-
-<script>
-  dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-  dataLayer.push({
-    'event': 'view_item',
-    'eventLabel':'Product View',
-    'ecommerce': {
-      'currency': '[{$currency->name}]',
-      'items': [
-        {
-          'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
-          'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
-          'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-          'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
-          'item_variant': '[{if $gtmProduct->getFieldData("oxvarselect")}][{$gtmProduct->getFieldData("oxvarselect")}][{/if}]',
-          [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
-          'price': [{$d3PriceObject->getPrice()}]
-        }
-      ]
-    }
-  });
-</script>

Application/views/ga4/add_to_cart.tpl

@@ -1,13 +1,10 @@
 [{$smarty.block.parent}]
 
-[{assign var="d3ProductObject" value=$oView->getProduct()}]
+[{*$gtmProduct|get_class_methods|dumpvar*}]
-[{assign var="d3PriceObject" value=$d3ProductObject->getPrice()}]
 
 [{capture assign=d3_ga4_add_to_cart}]
 [{block name="d3_ga4_add_to_basket"}]
   $("#toBasket").click(function(event) {
-
-    [{*** Debug cases ***}]
     [{*event.preventDefault();*}]
 
     let iArtQuantity = $("#amountToBasket").val();
@@ -18,18 +15,24 @@
       'eventLabel': 'add_to_cart',
       'ecommerce': {
         'currency':   "[{$currency->name}]",
-        'value':      iArtQuantity*[{$d3PriceObject->getPrice()}],
+        'value':      iArtQuantity*[{$gtmProduct->getFieldData('oxprice')}],
         'items':      [
           {
             'item_id':        '[{$gtmProduct->getFieldData('oxartnum')}]',
             'item_name':      '[{$gtmProduct->getFieldData('oxtitle')}]',
-            'price':          [{$d3PriceObject->getPrice()}],
+            'price':          '[{$gtmProduct->getFieldData('oxprice')}]',
             '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] || '',
+            [{if false}]
+            [{* ??? what *}]
+            'item_list_name': 'Search Results',  // If associated with a list selection.
+            'item_list_id': 'SR123',  // If associated with a list selection.
+            'index': 1,  // If associated with a list selection.
+            [{/if}]
             'quantity': iArtQuantity
           }
         ]

Application/views/ga4/search.tpl

@@ -13,13 +13,12 @@
           'search_term': '[{$searchparamforhtml}]',
           '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()}],
+              'price': [{$gtmProduct->oxarticles__oxprice->value|default:'0'}],
               'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
               'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
               'quantity': 1

Application/views/ga4/view_item_list.tpl

@@ -1,4 +1,3 @@
-[{$smarty.block.parent}]
 [{assign var="gtmProducts" value=$products}]
 
 [{assign var="breadCrumb" value=''}]
@@ -16,13 +15,12 @@
               '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()}],
+                        'price': [{$gtmProduct->oxarticles__oxprice->value|default:'0'}],
                         'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
                         'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
                         'quantity': 1

CHANGELOG.md

@@ -4,22 +4,34 @@ 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).
 
-## [1.5.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.4.0...1.5.0) - 2023-05-23
+## [2.3.2](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.2.2...2.3.2) - 2023-03-17
 ### Added
-- additional settings to explicitly indicate that consentmanager is used
+- Aggrosoft-Cookie-Consent compatibility
 ### Fixed
-- unnecessary converting of int to str
+- wrong function for pageview on thankyou page
-- missing PriceObject-bug
+### Deleted
-### Changed
+- unused files
-- genuine code cleanup
 
-## [1.4.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.3.1...1.4.0) - 2023-05-02
+## [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
-- "OXID Cookie Management powered by usercentrics" compatibility
+- cookie handling
-- usercentrics defined script attributes
+
-- cookie-manager evaluation
+## [2.1.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.1...2.1.1) - 2023-01-27
-### Changed
+### Fixed
-- genuine clean up of base-js-files
+- 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.3.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.2.1...1.3.1) - 2023-03-17
 ### Added
@@ -29,7 +41,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [1.2.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.2...1.2.1) - 2023-02-22
 ### Fixed
-- price formatting in view_cart
+- price formatting view_cart
 
 ## [1.2](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.1...1.2) - 2023-02-01
 ### Added
@@ -43,6 +55,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - switched price formatting
 
-## [1.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.0...1.0) - 2023-01-20
+
+## [1.0](https://git.d3data.de/D3Public/GoogleAnalytics4/releases/tag/1.0) - 2023-01-20
 ### Added
 - publication of app features

Docs/README.md

@@ -54,15 +54,12 @@ Aktivieren Sie anschließend diese Weiche. Setzen Sie den Haken bei "Eigenen Coo
 - [aggrosoft - oxid-cookie-compliance](https://github.com/aggrosoft/oxid-cookie-compliance)
   - https://github.com/aggrosoft/oxid-cookie-compliance
   - die entsprechend gewählte Kategorie in den Moduleinstellungen des 'Google Analytics 4' unter
-    ```Einstell. > Cookie Manager Einstellungen > Cookie-ID``` eintragen
+  ```Einstell. > Cookie Manager Einstellungen > Cookie-ID``` eintragen
-  - Default-Werte sind entweder ```ANALYTICS``` oder ```MARKETING```. Bitte auf die Großschreibung achten.
 
 - [Netensio - Cookie Consent Manager](https://www.netensio.de/oxid-eshop-module/cookie-consent-manager-fuer-oxid-eshop.html)
   - Modul entsprechend konfigurieren
   - CookieID des angelegten Cookies in den Moduleinstellungen des 'Google Analytics 4' unter
     ```Einstell. > Cookie Manager Einstellungen > Cookie-ID``` eintragen
-
+  
 - [OXID Cookie Management powered by usercentrics](https://docs.oxid-esales.com/modules/usercentrics/de/latest/einfuehrung.html)
-  - In der Usercentrics-Verwaltung einen Service für Google Analytics anlegen
+  - soweit ich weiß nichts weiter?
-  - Den Service-Namen in den Moduleinstellungen des 'Google Analytics 4' unter
-    ```Einstell. > Cookie Manager Einstellungen > Cookie-ID``` eintragen

Modules/Core/ViewConfig.php

@@ -13,138 +13,59 @@
 namespace D3\GoogleAnalytics4\Modules\Core;
 
 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
 {
 
     // Google Tag Manager Container ID
     private $sContainerId = null;
-    private $sCookieManagerType = null;
 
     public function getGtmContainerId()
     {
         if ($this->sContainerId === null)
         {
-
+            $this->sContainerId = ContainerFactory::getInstance()
-            $this->sContainerId = $this->getConfig()->getConfigParam('d3_gtm_sContainerID');
+                                                  ->getContainer()
+                                                  ->get(ModuleSettingBridgeInterface::class)
+                                                  ->get('d3_gtm_sContainerID', 'd3googleanalytics4');
         }
         return $this->sContainerId;
     }
 
-    public function getModuleConsentmanagerSettingSelectValue() :bool
-    {
-        return Registry::getConfig()->getConfigParam('d3_gtm_settings_HAS_CONSENTMANAGER') === 'YES';
-    }
-
-    public function getCookieManagerType()
-    {
-        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;
-                }
-            }
-        }
-
-        if ($this->sCookieManagerType === false and $this->getModuleConsentmanagerSettingSelectValue()){
-            return "consentmanager";
-        }
-
-        return $this->sCookieManagerType;
-    }
-
     /**
+     * @param $sCookieID
      * @return bool
      */
-    public function D3blShowGtmScript()
+    public function D3blAcceptedCookie($sCookieID)
     {
-        /** @var Config $oConfig */
+        $oSession = Registry::getSession();
-        $oConfig = Registry::getConfig();
+        $aCookies = $oSession->getVariable("aCookieSel");
 
-        // No Cookie Manager in use
+        if (!is_null($aCookies) && is_array($aCookies) && array_key_exists($sCookieID, $aCookies) && $aCookies[$sCookieID] == "1") {
-        if (!$oConfig->getConfigParam('d3_gtm_settings_hasOwnCookieManager')) {
             return true;
         }
 
-        $sCookieID = $oConfig->getConfigParam('d3_gtm_settings_cookieName');
-
-        // Netensio Cookie Manager
-        if ($this->getCookieManagerType() == "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");
-        }
-
         // Aggrosoft Cookie Consent
-        if ($this->getCookieManagerType() == "agcookiecompliance") {
+        if (method_exists($this, "isCookieCategoryEnabled")) {
-            if (method_exists($this, "isCookieCategoryEnabled")) {
+            return $this->isCookieCategoryEnabled($sCookieID);
-                return $this->isCookieCategoryEnabled($sCookieID);
-            }
         }
 
-        // UserCentrics
-        if ($this->getCookieManagerType() === "oxps_usercentrics" or $this->getCookieManagerType() === 'consentmanager') {
-            // Always needs the script-tags delivered to the DOM.
-            return true;
-        }
-
-        // Cookie Manager not (yet) supported
         return false;
     }
 
-    /**
-     * Get additional attributes for script tags.
-     * This is especially important for UserCentrics.
-     * @return string
-     */
-    public function getGtmScriptAttributes()
-    {
-        $oConfig = Registry::getConfig();
-
-        if ($this->getCookieManagerType() == "oxps_usercentrics") {
-            $sCookieId = $oConfig->getConfigParam('d3_gtm_settings_cookieName');
-
-            if ($sCookieId) {
-                return 'type="text/plain" data-usercentrics="' . $sCookieId . '"';
-            }
-        }
-
-        if ($this->getCookieManagerType() == "consentmanager") {
-            $sCookieId = $oConfig->getConfigParam('d3_gtm_settings_cookieName');
-
-            if ($sCookieId) {
-                return 'async 
-                        type="text/plain"
-                        data-cmp-src="https://www.googletagmanager.com/gtm.js?id='.$this->getGtmContainerId().'"
-                        class="cmplazyload"
-                        data-cmp-vendor="s905"
-                        ';
-            }
-        }
-
-        return "";
-    }
-
     private $blGA4enabled = null;
 
     public function isGA4enabled()
     {
         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;

README.md

@@ -23,7 +23,7 @@ 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.

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": {

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.5.0',
+    'version'     => '2.3.2',
     'author'      => 'Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'https://www.oxidmodule.com/',
@@ -43,19 +43,26 @@ $aModule          = [
             'block'    => 'theme_svg_icons',
             'file'     => '/Application/views/blocks/_gtm_nojs.tpl'
         ],
+        // widget_product_list
+        [
+            'template' => 'widget/product/list.tpl',
+            'block'    => 'widget_product_list',
+            'file'     => '/Application/views/blocks/widget_product_list.tpl'
+        ],
         // details
         [
             'template' => 'page/details/inc/productmain.tpl',
             'block'    => 'details_productmain_title',
-            'file'     => '/Application/views/blocks/view_item.tpl',
+            'file'     => '/Application/views/blocks/detail.tpl',
             'position' => 150
         ],
         // checkout
+        // view_cart
         [
             'template' => 'page/checkout/basket.tpl',
             'block'    => 'checkout_basket_main',
             'file'     => '/Application/views/blocks/checkout_s1.tpl'
-        ],
+        ],        
         [
             'template' => 'page/checkout/thankyou.tpl',
             'block'    => 'checkout_thankyou_main',
@@ -65,7 +72,7 @@ $aModule          = [
         // view_item_list
         [
             'template' => 'widget/product/list.tpl',
-            'block'    => 'widget_product_list',
+            'block'    => 'd3Ga4_view_item_list',
             'file'     => '/Application/views/ga4/view_item_list.tpl',
             'position' => 150
         ],
@@ -120,12 +127,5 @@ $aModule          = [
             'value'    => 'example',
             'position' => 999
         ],
-        [
-            'group' => 'd3_gtm_settings_cookiemanager',
-            'name' => 'd3_gtm_settings_HAS_CONSENTMANAGER',
-            'type' => 'select',
-            'value' => 'none',
-            'constraints' => 'NO|YES',
-        ],
     ]
 ];