bump version && changelog to 1.8.0

bug would adjust the script even if the check for an own cookieManager is not set

Application/views/admin/de/module_options.php

@@ -31,5 +31,10 @@ $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_cookieName'            => 'CookieID',
+    'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER'                   => 'Nutzen Sie eine der folgenden Einbindungen?<br>
+                                                                        Dann wählen Sie bitte die zutreffende aus.',
+    'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER_NONE'              => '---',
+    'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER_CONSENTMANAGER'    => 'consentmanager',
+    'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER_USERCENTRICS'      => 'usercentrics',
+    'SHOP_MODULE_d3_gtm_settings_cookieName'  => 'CookieID',
 ];

Application/views/blocks/_gtm_js.tpl

@@ -1,40 +1,12 @@
-[{assign var="d3VtConfigObject" value=$oViewConf->getConfig()}]
+[{* Always prepare the data layer to avoid errors *}]
-[{if $d3VtConfigObject->getConfigParam('d3_gtm_settings_hasOwnCookieManager')}]
+<script>
-    [{if $oViewConf->D3blAcceptedCookie($d3VtConfigObject->getConfigParam('d3_gtm_settings_cookieName'))}]
+  var dataLayer = [{$oViewConf->getGtmDataLayer()}] || [];
+</script>
 
-        [{if $oViewConf->getGtmContainerId()}][{strip}]
+[{if $oViewConf->D3blShowGtmScript()}]
-        <!-- 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>
+    <script [{$oViewConf->getGtmScriptAttributes()}]>
-      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'});
@@ -45,15 +17,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,8 +1,12 @@
-[{if $oViewConf->getGtmContainerId()}][{strip}]
+[{if $oViewConf->D3blShowGtmScript()}]
+    [{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) -->[{/strip}][{/if}]
+<!-- End Google Tag Manager (noscript) -->
+    [{/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': iPrice.replace("€", ""),
+            'value': [{$d3BasketPrice->getPrice()}],
             'items': [
                 [{foreach from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents  key=basketindex}]
-                [{assign var='_price' value=$basketitem->getUnitPrice()}]
+                [{assign var="d3oItemPrice" value=$basketitem->getPrice()}]
                 {
-                    'item_id': '[{$gtmCartArticles[$basketindex]->oxarticles__oxartnum->value}]',
+                    'item_id': '[{$gtmCartArticles[$basketindex]->getFieldData('oxartnum')}]',
-                    'item_name': '[{$gtmCartArticles[$basketindex]->oxarticles__oxtitle->value}]',
+                    'item_name': '[{$gtmCartArticles[$basketindex]->getFieldData('oxtitle')}]',
-                    'item_variant': '[{$gtmCartArticles[$basketindex]->oxarticles__oxvarselect->value}]',
+                    'item_variant': '[{$gtmCartArticles[$basketindex]->getFieldData('oxvarselect')}]',
-                    'price': [{$_price->getPrice()}],
+                    'price': [{$d3oItemPrice->getPrice()}],
                     'quantity':[{$basketitem->getAmount()}],
                     'position':[{$smarty.foreach.gtmCartContents.index}]
                 }[{if !$smarty.foreach.gtmCartContents.last}],[{/if}]

Application/views/blocks/checkout_s5.tpl

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

Application/views/blocks/view_item.tpl

@@ -12,12 +12,13 @@
       'currency': '[{$currency->name}]',
       'items': [
         {
-          'item_name': '[{$gtmProduct->oxarticles__oxtitle->value}]',
+          'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
-          'item_id': '[{$gtmProduct->oxarticles__oxartnum->value}]',
+          '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->oxarticles__oxvarselect->value}][{$gtmProduct->oxarticles__oxvarselect->value}][{/if}]',
+          'item_variant': '[{if $gtmProduct->getFieldData("oxvarselect")}][{$gtmProduct->getFieldData("oxvarselect")}][{/if}]',
-          'price': [{$gtmProduct->oxarticles__oxprice->value}]
+          [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
+          'price': [{$d3PriceObject->getPrice()}]
         }
       ]
     }

Application/views/ga4/add_to_cart.tpl

@@ -1,6 +1,7 @@
 [{$smarty.block.parent}]
 
-[{*$gtmProduct|get_class_methods|dumpvar*}]
+[{assign var="d3ProductObject" value=$oView->getProduct()}]
+[{assign var="d3PriceObject" value=$d3ProductObject->getPrice()}]
 
 [{capture assign=d3_ga4_add_to_cart}]
 [{block name="d3_ga4_add_to_basket"}]
@@ -17,23 +18,18 @@
       'eventLabel': 'add_to_cart',
       'ecommerce': {
         'currency':   "[{$currency->name}]",
-        'value':      iArtQuantity*[{$gtmProduct->getFieldData('oxprice')}],
+        'value':      iArtQuantity*[{$d3PriceObject->getPrice()}],
         'items':      [
           {
             'item_id':        '[{$gtmProduct->getFieldData('oxartnum')}]',
             'item_name':      '[{$gtmProduct->getFieldData('oxtitle')}]',
-            'price':          '[{$gtmProduct->getFieldData('oxprice')}]',
+            '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] || '',
-            [{if false}]
-            '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,12 +13,13 @@
           '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': [{$gtmProduct->oxarticles__oxprice->value|default:'0'}],
+              '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

Application/views/ga4/view_item_list.tpl

@@ -1,4 +1,5 @@
-[{assign var="gtmProducts" value=$products}]
+[{$smarty.block.parent}]
+[{assign var="gtmProducts" value=$oView->getArticleList()}]
 
 [{assign var="breadCrumb" value=''}]
 
@@ -15,12 +16,13 @@
               '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': [{$gtmProduct->oxarticles__oxprice->value|default:'0'}],
+                        '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

CHANGELOG.md

@@ -4,38 +4,41 @@ 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.3.3](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.3.2...2.3.3) - 2023-03-20
+## [1.8.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.7.0...1.8.0) - 2023-05-31
 ### Fixed
-- metadata file path for view_item
+- bug in explicit manager selection
 
-## [2.3.2](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.2.2...2.3.2) - 2023-03-17
+## [1.7.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.6.0...1.7.0) - 2023-05-31
 ### Added
-- Aggrosoft-Cookie-Consent compatibility
+- extended call to read the technical documentation
+### Changed
+- block-extension for view_item_list
+- way of getting list-articles in view_item_list
+
+## [1.6.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.5.0...1.6.0) - 2023-05-30
+### Added
+- possibility to choose between consentmanager && usercentrics
+- position to block extension
+### Changed
+- genuine code cleanup
+- usercentrics includation script
+
+## [1.5.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.4.0...1.5.0) - 2023-05-23
+### Added
+- additional settings to explicitly indicate that consentmanager is used
 ### Fixed
-- wrong function for pageview on thankyou page
+- unnecessary converting of int to str
-### Deleted
+- missing PriceObject-bug
-- unused files
+### Changed
+- genuine code cleanup
 
-## [2.2.2](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.2.1...2.2.2) - 2023-02-22
+## [1.4.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.3.1...1.4.0) - 2023-05-02
-### 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
+- "OXID Cookie Management powered by usercentrics" compatibility
-
+- usercentrics defined script attributes
-## [2.1.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.1...2.1.1) - 2023-01-27
+- cookie-manager evaluation
-### Fixed
+### Changed
-- add missing class import
+- genuine clean up of base-js-files
-
-## [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
@@ -45,7 +48,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 view_cart
+- price formatting in view_cart
 
 ## [1.2](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.1...1.2) - 2023-02-01
 ### Added
@@ -59,7 +62,6 @@ 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

@@ -12,8 +12,8 @@ Für den geregelten Ablauf sind folgende Blöcke nötig:
     - Datei: page/search/search.tpl
     - GA4 Event: view_search_results
 - Artikelliste
-    - Blockname: d3Ga4_view_item_list (muss hinzugefügt werden)
+    - Blockname: page_list_productlist
-    - Datei: widget/product/list.tpl
+    - Datei: page/list/list.tpl
     - GA4 Event: view_item_list
 - Detailseite
     - Blockname: details_productmain_title
@@ -54,12 +54,15 @@ 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)
-  - soweit ich weiß nichts weiter?
+  - 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

Modules/Core/ViewConfig.php

@@ -13,59 +13,160 @@
 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;
     }
 
     /**
-     * @param $sCookieID
+     * @return mixed
+     */
+    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()
+    {
+        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->getExplicitManager()){
+            return "externalService";
+        }
+
+        return $this->sCookieManagerType;
+    }
+
+    /**
      * @return bool
      */
-    public function D3blAcceptedCookie($sCookieID)
+    public function shallUseOwnCookieManager()
     {
-        $oSession = Registry::getSession();
+        return (bool) Registry::getConfig()->getConfigParam('d3_gtm_settings_hasOwnCookieManager');
-        $aCookies = $oSession->getVariable("aCookieSel");
+    }
 
-        if (!is_null($aCookies) && is_array($aCookies) && array_key_exists($sCookieID, $aCookies) && $aCookies[$sCookieID] == "1") {
+    /**
+     * @return bool
+     */
+    public function D3blShowGtmScript()
+    {
+        /** @var Config $oConfig */
+        $oConfig = Registry::getConfig();
+
+        // No Cookie Manager in use
+        if (false === $this->shallUseOwnCookieManager()) {
             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 (method_exists($this, "isCookieCategoryEnabled")) {
+        if ($this->getCookieManagerType() == "agcookiecompliance") {
-            return $this->isCookieCategoryEnabled($sCookieID);
+            if (method_exists($this, "isCookieCategoryEnabled")) {
+                return $this->isCookieCategoryEnabled($sCookieID);
+            }
+        }
+
+        // UserCentrics or consentmanager
+        if ($this->getCookieManagerType() === "oxps_usercentrics" or $this->getCookieManagerType() === 'externalService') {
+            // Always needs the script-tags delivered to the DOM.
+            return true;
         }
 
         return false;
     }
 
+    /**
+     * Get additional attributes for script tags.
+     * This is especially important for UserCentrics.
+     * @return string
+     */
+    public function getGtmScriptAttributes()
+    {
+        $oConfig = Registry::getConfig();
+
+        if (false === $this->shallUseOwnCookieManager()){
+            return "";
+        }
+
+        if ($this->getCookieManagerType() === "oxps_usercentrics" or $this->getExplicitManager() === 'USERCENTRICS') {
+            $sCookieId = $oConfig->getConfigParam('d3_gtm_settings_cookieName');
+
+            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 ($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 = ContainerFactory::getInstance()
+            $this->sContainerId = $this->getConfig()->getConfigParam('d3_gtm_blEnableGA4');
-                                                  ->getContainer()
-                                                  ->get(ModuleSettingBridgeInterface::class)
-                                                  ->get('d3_gtm_blEnableGA4', 'd3googleanalytics4');
         }
 
         return $this->blGA4enabled;

README.md

@@ -23,13 +23,17 @@ 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:^2
+php composer require d3/google-analytics4:^1
 ```
 
 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"!
+
 ## Verwendung
 ### Grundfunktionalität
 Nach erfolgreicher Installation finden Sie in Ihrem Shop-Admin unter "Erweiterungen > Module" 

composer.json

@@ -45,7 +45,7 @@
   },
   "require": {
     "php": ">=7.1",
-    "oxid-esales/oxideshop-ce": "^6.5",
+    "oxid-esales/oxideshop-ce": "v6.0 - 6.3",
     "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'     => '2.3.3',
+    'version'     => '1.8.0',
     'author'      => 'Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'https://www.oxidmodule.com/',
@@ -35,7 +35,8 @@ $aModule          = [
         [
             'template' => 'layout/base.tpl',
             'block'    => 'head_meta_robots',
-            'file'     => '/Application/views/blocks/_gtm_js.tpl'
+            'file'     => '/Application/views/blocks/_gtm_js.tpl',
+            'position' => 150
         ],
         // tag manager nojs
         [
@@ -43,18 +44,6 @@ $aModule          = [
             'block'    => 'theme_svg_icons',
             'file'     => '/Application/views/blocks/_gtm_nojs.tpl'
         ],
-        // 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',
-            'file'     => '/Application/views/blocks/checkout_s5.tpl'
-        ],
         // details
         [
             'template' => 'page/details/inc/productmain.tpl',
@@ -62,11 +51,22 @@ $aModule          = [
             'file'     => '/Application/views/blocks/view_item.tpl',
             'position' => 150
         ],
+        // checkout
+        [
+            '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',
+            'file'     => '/Application/views/blocks/checkout_s5.tpl'
+        ],
         // Lists
         // view_item_list
         [
-            'template' => 'widget/product/list.tpl',
+            'template' => 'page/list/list.tpl',
-            'block'    => 'd3Ga4_view_item_list',
+            'block'    => 'page_list_productlist',
             'file'     => '/Application/views/ga4/view_item_list.tpl',
             'position' => 150
         ],
@@ -121,5 +121,12 @@ $aModule          = [
             'value'    => 'example',
             'position' => 999
         ],
+        [
+            'group' => 'd3_gtm_settings_cookiemanager',
+            'name' => 'd3_gtm_settings_HAS_STD_MANAGER',
+            'type' => 'select',
+            'value' => 'none',
+            'constraints' => 'NONE|CONSENTMANAGER|USERCENTRICS',
+        ],
     ]
 ];