bump version && changelog to 2.7.0

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

.gitignore

@@ -1 +0,0 @@
-.idea

Application/Model/ManagerTypes.php

@@ -34,10 +34,6 @@ class ManagerTypes
 
     const CONSENTMANAGER            = "CONSENTMANAGER";
 
-    const COOKIEFIRST               = "COOKIEFIRST";
-
-    const COOKIEBOT               = "COOKIEBOT";
-
     /**
      * @return array
      */
@@ -49,9 +45,7 @@ class ManagerTypes
             "net_cookie_manager"    => self::NET_COOKIE_MANAGER,
             "oxps_usercentrics"     => self::USERCENTRICS_MODULE,
             "usercentrics"          => self::USERCENTRICS_MANUALLY,
-            "consentmanager"        => self::CONSENTMANAGER,
-            "cookiefirst"           => self::COOKIEFIRST,
-            "cookiebot"             => self::COOKIEBOT,
+            "consentmanager"        => self::CONSENTMANAGER
         ];
     }
 

Application/views/admin/de/module_options.php

@@ -31,23 +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?',
-    'HELP_SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER'              => 'Mehr Informationen zu den genannten Coookie-Manager finden Sie auf den folgenden Home-Pages<br><br>
-                                                                        <a href="https://consentmanager.net/">Consentmanager</a><br>
-                                                                        <a href="https://usercentrics.com/">Usercentrics</a><br>
-                                                                        <a href="https://cookiefirst.com">Cookiefirst</a><br>
-                                                                        <hr>
-                                                                        Bei weiteren Fragen stehen wir gern zur Verfügung! Kontaktieren Sie uns einfach unter <a href="https://www.d3data.de/">https://www.d3data.de/</a>',
     '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_HAS_STD_MANAGER_COOKIEFIRST'       => 'cookiefirst',
-    'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER_COOKIEBOT'         => 'Cookiebot',
-    'SHOP_MODULE_d3_gtm_settings_controlParameter'        => 'Steuerungsparameter',
-    'HELP_SHOP_MODULE_d3_gtm_settings_controlParameter'   => 'Nähere infos zum <a target="_blank" href="https://git.d3data.de/D3Public/GoogleAnalytics4/src/branch/master/Docs">"<strong>Steuerungsparameter</strong>"</a><hr>
-                                                        <strong>Beachte:</strong><br>
-                                                        Sofern Sie die <a target="_blank" href="https://consentmanager.net" style="color: blue">consentmanager</a> CMP verwenden,
-                                                        bitte ich Sie, gründlichst, die Hinweise der <a target="_blank" href="https://git.d3data.de/D3Public/GoogleAnalytics4/src/branch/master/Docs/CMP/consentmanager.md">Moduldokumentation/Consentmanager</a> zu lesen.
-                                                        '
+    'SHOP_MODULE_d3_gtm_settings_cookieName'  => 'CookieID',
 ];

Application/views/blocks/_gtm_js.tpl

@@ -4,22 +4,28 @@
 </script>
 
 [{if $oViewConf->D3blShowGtmScript()}]
-    [{if $oViewConf->getGtmContainerId()}]
-        [{strip}]
-            <!-- Google Tag Manager -->
-            <script [{$oViewConf->getGtmScriptAttributes()}]>
-              (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 -->
-        [{/strip}]
+    [{if $oViewConf->getGtmContainerId()}][{strip}]
+    <!-- Google Tag Manager -->
+    <script [{$oViewConf->getGtmScriptAttributes()}]>
+      (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}]
     [{/if}]
-[{/if}]
 
 [{$smarty.block.parent}]

Application/views/blocks/checkout_s1.tpl

@@ -0,0 +1,33 @@
+[{$smarty.block.parent}]
+
+[{*$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}]
+    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+    dataLayer.push({
+        'event': 'view_cart',
+        'eventLabel':'Checkout Step 1',
+        'ecommerce': {
+            'actionField': "step: 1",
+            'currency': "[{$currency->name}]",
+            'value': [{$d3BasketPrice->getPrice()}],
+            'items': [
+                [{foreach from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents  key=basketindex}]
+                [{assign var="d3oItemPrice" value=$basketitem->getPrice()}]
+                {
+                    'item_id': '[{$gtmCartArticles[$basketindex]->getFieldData('oxartnum')}]',
+                    'item_name': '[{$gtmCartArticles[$basketindex]->getFieldData('oxtitle')}]',
+                    'item_variant': '[{$gtmCartArticles[$basketindex]->getFieldData('oxvarselect')}]',
+                    'price': [{$d3oItemPrice->getPrice()}],
+                    'quantity':[{$basketitem->getAmount()}],
+                    'position':[{$smarty.foreach.gtmCartContents.index}]
+                }[{if !$smarty.foreach.gtmCartContents.last}],[{/if}]
+                [{/foreach}]
+                ]
+        }
+    });
+[{/capture}][{/strip}]
+[{oxscript add=$d3_ga4_view_cart}]

Application/views/blocks/checkout_s5.tpl

@@ -0,0 +1,36 @@
+[{$smarty.block.parent}]
+
+[{strip}]
+<script>
+    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+    [{assign var="_gtmOrder" value=$oView->getOrder()}]
+    [{assign var="_gtmArticles" value=$_gtmOrder->getOrderArticles()}]
+    
+    dataLayer.push({
+        'event': 'purchase',
+        'eventLabel':'Checkout Step 5',
+        'ecommerce': {
+          'transaction_id': '[{$_gtmOrder->getFieldData("oxordernr")}]',
+          'affiliation':    '[{$oxcmp_shop->getFieldData("oxname")}]',
+          'value':          [{$_gtmOrder->getTotalOrderSum()}],
+          'tax':            [{math equation="x+y" x=$_gtmOrder->getFieldData("oxartvatprice1") y=$_gtmOrder->getFieldData("oxartvatprice2") }],
+          'shipping':       [{$_gtmOrder->getFieldData("oxdelcost")}],
+          'currency':       '[{$_gtmOrder->getFieldData('oxcurrency')}]',
+          'items':
+              [
+                [{foreach from=$_gtmArticles item="d3BasketArticle" name="gtmArticles"}]
+                  [{assign var="d3oArticlePrice" value=$d3BasketArticle->getPrice()}]
+                {
+                    'id':       '[{$d3BasketArticle->getFieldData("oxartnum")}]',
+                    'name':     '[{$d3BasketArticle->getFieldData("oxtitle")}]',
+                    'variant':  '[{$d3BasketArticle->getFieldData("oxselvariant")}]',
+                    'price':    [{$d3oArticlePrice->getPrice()}],
+                    'quantity': [{$d3BasketArticle->getFieldData("oxamount")}],
+                    'position': [{$smarty.foreach.gtmArticles.iteration}]
+                }[{if !$smarty.foreach.gtmArticles.last}],[{/if}]
+                [{/foreach}]
+              ]
+        }
+    })
+</script>
+[{/strip}]

Application/views/blocks/details_productmain_tobasket.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]

Application/views/blocks/page_list_listbody.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]

Application/views/blocks/purchase.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/purchase.tpl"}]

Application/views/blocks/remove_from_cart.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/remove_from_cart.tpl"}]

Application/views/blocks/start_welcome_text.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]

Application/views/blocks/view_cart.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/view_cart.tpl"}]

Application/views/blocks/view_item.tpl

@@ -1,3 +1,26 @@
 [{$smarty.block.parent}]
+[{assign var="gtmProduct" value=$oView->getProduct()}]
+[{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
+[{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
 
-[{include file="event/view_item.tpl"}]
+<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/blocks/view_item_list.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/view_item_list.tpl"}]

Application/views/blocks/view_search_result.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/view_search_result.tpl"}]

Application/views/event/add_to_cart.tpl

@@ -1,61 +0,0 @@
-
-[{if $d3CmpBasket && $d3CmpBasket->getAddToBasketDecision() && $d3CmpBasket->d3GtmRequestedArticleLoadedByAnid() !== null}]
-  [{assign var="oGtmProduct"              value=$d3CmpBasket->d3GtmRequestedArticleLoadedByAnid()}]
-  [{assign var="oGtmAmountArticlesAdded"  value=$d3CmpBasket->getD3GtmAddToCartAmountArticles()}]
-  [{*$smarty.block.parent*}]
-  [{* variable $oGtmProduct is passed from parent tempalte *}]
-  [{assign var="d3PriceObject"    value=$oGtmProduct->getPrice()}]
-  [{assign var="gtmCurrency"      value=$oView->getActCurrency()}]
-  [{assign var="gtmManufacturer"  value=$oGtmProduct->getManufacturer()}]
-  [{assign var="gtmCategory"      value=$oGtmProduct->getCategory()}]
-
-  [{block name="d3_ga4_add_to_cart_list_block"}]
-    [{capture name="d3_ga4_add_to_cart_listtpl"}]
-      [{strip}]
-      dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-
-      [{*** Debug cases ***}]
-      [{*event.preventDefault();*}]
-
-      let iArtQuantity = $("[{$htmlIdAmountOfArticles}]").val();
-      let iArtQuantityAdded = [{$oGtmAmountArticlesAdded}];
-
-      if(!iArtQuantity && (iArtQuantityAdded === 1)){
-        iArtQuantity = 1;
-      }else{
-        iArtQuantity = iArtQuantityAdded;
-      }
-
-      dataLayer.push({
-        'isAddToBasket': true,
-        'event':'add_to_cart',
-        'eventLabel': 'add_to_cart',
-        'ecommerce': {
-          'currency':   "[{$currency->name}]",
-          'value':      iArtQuantity*[{$d3PriceObject->getPrice()}],
-          'items':      [
-            {
-              'item_id':        '[{$oGtmProduct->getFieldData('oxartnum')}]',
-              'item_name':      '[{$oGtmProduct->getFieldData('oxtitle')}]',
-              'price':          [{$d3PriceObject->getPrice()}],
-              'item_brand':     '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-              'item_variant':   '[{if $oGtmProduct->getFieldData('oxvarselect')}][{$oGtmProduct->getFieldData('oxvarselect')}][{/if}]',
-              [{if $gtmCategory}]
-              'item_category':  '[{$gtmCategory->getSplitCategoryArray(0, true)}]',
-              'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1, true)}]',
-              'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2, true)}]',
-              'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3, true)}]',
-              'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
-              [{/if}]
-              'quantity': iArtQuantity
-            }
-          ]
-        }[{if $oViewConf->isDebugModeOn()}],
-        'debug_mode': 'true'
-        [{/if}]
-      });
-      [{/strip}]
-    [{/capture}]
-    [{oxscript add=$smarty.capture.d3_ga4_add_to_cart_listtpl}]
-  [{/block}]
-[{/if}]

Application/views/event/purchase.tpl

@@ -1,56 +0,0 @@
-[{block name="d3_ga4_purchase_block"}]
-    [{capture name="d3_ga4_purchase"}]
-        [{strip}]
-            dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-            [{assign var="gtmOrder"         value=$oView->getOrder()}]
-            [{assign var="gtmBasket"         value=$oView->getBasket()}]
-            [{assign var="gtmArticles"      value=$gtmOrder->getOrderArticles()}]
-            [{assign var="gtmOrderVouchers"  value=$gtmOrder->getVoucherNrList()}]
-
-            dataLayer.push({
-                'event': 'purchase',
-                'eventLabel':'Checkout Step 5',
-                'ecommerce':
-                {
-                    'transaction_id': '[{$gtmOrder->getFieldData("oxordernr")}]',
-                    'affiliation':    '[{$oxcmp_shop->getFieldData("oxname")}]',
-                    'value':          [{$gtmOrder->getTotalOrderSum()}],
-                    'tax':            [{math equation="x+y" x=$gtmOrder->getFieldData("oxartvatprice1") y=$gtmOrder->getFieldData("oxartvatprice2") }],
-                    'shipping':       [{$gtmOrder->getFieldData("oxdelcost")}],
-                    'currency':       '[{$gtmOrder->getFieldData('oxcurrency')}]',
-                    'coupon':         '[{foreach from=$gtmOrderVouchers item="gtmOrderVoucher" name="gtmOrderVoucherIteration"}][{$gtmOrderVoucher}][{if !$smarty.foreach.gtmOrderVoucherIteration.last}], [{/if}][{/foreach}]',
-                    'paymentType':    '[{$gtmBasket->getPaymentOnPaymentId()}]',
-                    'items':
-                    [
-                        [{foreach from=$gtmArticles item="gtmBasketItem" name="gtmArticles"}]
-                        [{assign var="gtmPurchaseItemPriceObject"   value=$gtmBasketItem->getPrice()}]
-                        [{assign var="gtmPurchaseItem"              value=$gtmBasketItem->getArticle()}]
-                        [{assign var="gtmPurchaseItemCategory"      value=$gtmPurchaseItem->getCategory()}]
-
-                        {
-                            'item_id':          '[{$gtmBasketItem->getFieldData("oxartnum")}]',
-                            'item_name':        '[{$gtmBasketItem->getFieldData("oxtitle")}]',
-                            'affiliation':      '[{$gtmBasketItem->getFieldData("oxtitle")}]',
-                            'coupon':           '[{foreach from=$gtmOrderVouchers item="gtmOrderVoucher" name="gtmOrderVoucherIteration"}][{$gtmOrderVoucher}][{if !$smarty.foreach.gtmOrderVoucherIteration.last}], [{/if}][{/foreach}]',
-                            'item_variant':     '[{$gtmBasketItem->getFieldData("oxselvariant")}]',
-                            [{if $gtmPurchaseItemCategory}]
-                            'item_category':    '[{$gtmPurchaseItemCategory->getSplitCategoryArray(0, true)}]',
-                            'item_category_2':  '[{$gtmPurchaseItemCategory->getSplitCategoryArray(1, true)}]',
-                            'item_category_3':  '[{$gtmPurchaseItemCategory->getSplitCategoryArray(2, true)}]',
-                            'item_category_4':  '[{$gtmPurchaseItemCategory->getSplitCategoryArray(3, true)}]',
-                            'item_list_name':   '[{$gtmPurchaseItemCategory->getSplitCategoryArray()}]',
-                            [{/if}]
-                            'price':            [{$gtmPurchaseItemPriceObject->getPrice()}],
-                            'quantity':         [{$gtmBasketItem->getFieldData("oxamount")}],
-                            'position':         [{$smarty.foreach.gtmArticles.iteration}]
-                        }[{if !$smarty.foreach.gtmArticles.last}],[{/if}]
-                        [{/foreach}]
-                    ]
-                }[{if $oViewConf->isDebugModeOn()}],
-                'debug_mode': 'true'
-                [{/if}]
-            })
-        [{/strip}]
-    [{/capture}]
-    [{oxscript add=$smarty.capture.d3_ga4_purchase}]
-[{/block}]

Application/views/event/remove_from_cart.tpl

@@ -1,46 +0,0 @@
-[{block name="d3_ga4_remove_from_cart_block"}]
-    [{if $hasBeenReloaded}]
-        [{assign var="d3BasketPrice" value=$oxcmp_basket->getPrice()}]
-        [{capture name="d3_ga4_remove_from_cart"}]
-            [{strip}]
-                dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-                dataLayer.push({
-                    'isRemoveFromCart': true,
-                    'event': 'remove_from_cart',
-                    'eventLabel':'remove_from_cart',
-                    'ecommerce': {
-                        'actionField': "step: 1",
-                        'currency': "[{$currency->name}]",
-                        'value': [{$d3BasketPrice->getPrice()}],
-                        'coupon':         '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
-                        'items': [
-                            [{foreach from=$toRemoveArticles->getArray() name=gtmRemovedItems item=rmItem  key=rmItemindex}]
-                            [{assign var="d3oItemPrice" value=$rmItem->getPrice()}]
-                            [{assign var="gtmBasketItemCategory" value=$rmItem->getCategory()}]
-                            {
-                            'item_id':          '[{$rmItem->getFieldData('oxartnum')}]',
-                            'item_name':        '[{$rmItem->getFieldData('oxtitle')}]',
-                            'item_variant':     '[{$rmItem->getFieldData('oxvarselect')}]',
-                            [{if $gtmBasketItemCategory}]
-                            'item_category':    '[{$gtmBasketItemCategory->getSplitCategoryArray(0, true)}]',
-                            'item_category_2':  '[{$gtmBasketItemCategory->getSplitCategoryArray(1, true)}]',
-                            'item_category_3':  '[{$gtmBasketItemCategory->getSplitCategoryArray(2, true)}]',
-                            'item_category_4':  '[{$gtmBasketItemCategory->getSplitCategoryArray(3, true)}]',
-                            'item_list_name':   '[{$gtmBasketItemCategory->getSplitCategoryArray()}]',
-                            [{/if}]
-                            'price':            [{$d3oItemPrice->getPrice()}],
-                            'coupon':           '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
-                            'quantity':         '[{$rmItem->getFieldData('d3AmountThatGotRemoved')}]',
-                            'position':         [{$smarty.foreach.gtmRemovedItems.index}]
-                            }[{if !$smarty.foreach.gtmRemovedItems.last}],[{/if}]
-                            [{/foreach}]
-                        ]
-                    }[{if $oViewConf->isDebugModeOn()}],
-                    'debug_mode': 'true'
-                    [{/if}]
-                });
-            [{/strip}]
-        [{/capture}]
-        [{oxscript add=$smarty.capture.d3_ga4_remove_from_cart}]
-    [{/if}]
-[{/block}]

Application/views/event/view_cart.tpl

@@ -1,50 +0,0 @@
-[{*$oxcmp_basket|get_class_methods|dumpvar*}]
-
-[{assign var="d3BasketPrice" value=$oxcmp_basket->getPrice()}]
-[{assign var='gtmCartArticles' value=$oView->getBasketArticles()}]
-
-[{block name="d3_ga4_view_cart_block"}]
-    [{capture name="d3_ga4_view_cart"}]
-        [{strip}]
-            dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-            dataLayer.push({
-                'event': 'view_cart',
-                'eventLabel':'Checkout Step 1',
-                'ecommerce':
-                {
-                    'actionField': "step: 1",
-                    'currency': "[{$currency->name}]",
-                    'value': [{$d3BasketPrice->getPrice()}],
-                    'coupon':         '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
-                    'items':
-                    [
-                        [{foreach from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents  key=basketindex}]
-                        [{assign var="d3oItemPrice" value=$basketitem->getPrice()}]
-                        [{assign var="gtmBasketItem" value=$basketitem->getArticle()}]
-                        [{assign var="gtmBasketItemCategory" value=$gtmBasketItem->getCategory()}]
-                        {
-                            'item_id':          '[{$gtmCartArticles[$basketindex]->getFieldData('oxartnum')}]',
-                            'item_name':        '[{$gtmCartArticles[$basketindex]->getFieldData('oxtitle')}]',
-                            'item_variant':     '[{$gtmCartArticles[$basketindex]->getFieldData('oxvarselect')}]',
-                            [{if $gtmBasketItemCategory}]
-                            'item_category':    '[{$gtmBasketItemCategory->getSplitCategoryArray(0, true)}]',
-                            'item_category_2':  '[{$gtmBasketItemCategory->getSplitCategoryArray(1, true)}]',
-                            'item_category_3':  '[{$gtmBasketItemCategory->getSplitCategoryArray(2, true)}]',
-                            'item_category_4':  '[{$gtmBasketItemCategory->getSplitCategoryArray(3, true)}]',
-                            'item_list_name':   '[{$gtmBasketItemCategory->getSplitCategoryArray()}]',
-                            [{/if}]
-                            'price':            [{$d3oItemPrice->getPrice()}],
-                            'coupon':           '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
-                            'quantity':         [{$basketitem->getAmount()}],
-                            'position':         [{$smarty.foreach.gtmCartContents.index}]
-                        }[{if !$smarty.foreach.gtmCartContents.last}],[{/if}]
-                        [{/foreach}]
-                    ]
-                }[{if $oViewConf->isDebugModeOn()}],
-                'debug_mode': 'true'
-                [{/if}]
-            });
-        [{/strip}]
-    [{/capture}]
-    [{oxscript add=$smarty.capture.d3_ga4_view_cart}]
-[{/block}]

Application/views/event/view_item.tpl

@@ -1,41 +0,0 @@
-[{assign var="gtmProduct" value=$oView->getProduct()}]
-[{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
-[{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
-
-[{block name="d3_ga4_view_item_block"}]
-    [{capture name="d3_ga4_view_item"}]
-        [{strip}]
-            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_variant': '[{if $gtmProduct->getFieldData("oxvarselect")}][{$gtmProduct->getFieldData("oxvarselect")}][{/if}]',
-                                [{if $gtmCategory}]
-                                'item_category':  '[{$gtmCategory->getSplitCategoryArray(0, true)}]',
-                                'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1, true)}]',
-                                'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2, true)}]',
-                                'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3, true)}]',
-                                'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
-                                [{/if}]
-                                [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
-                                'price': [{$d3PriceObject->getPrice()}]
-                            }
-                        ]
-                }[{if $oViewConf->isDebugModeOn()}],
-                'debug_mode': 'true'
-                [{/if}]
-            });
-        [{/strip}]
-    [{/capture}]
-    [{oxscript add=$smarty.capture.d3_ga4_view_item}]
-[{/block}]

Application/views/event/view_item_list.tpl

@@ -1,45 +0,0 @@
-[{assign var="gtmProducts" value=$oView->getArticleList()}]
-[{assign var="gtmCategory" value=$oView->getActiveCategory()}]
-
-[{assign var="breadCrumb" value=''}]
-
-[{block name="d3_ga4_view_item_list_block"}]
-    [{if $gtmProducts|@count}]
-        [{capture name="d3_ga4_view_item_list"}]
-            [{strip}]
-                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}]',
-                                [{if $gtmCategory}]
-                                'item_category':  '[{$gtmCategory->getSplitCategoryArray(0, true)}]',
-                                'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1, true)}]',
-                                'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2, true)}]',
-                                'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3, true)}]',
-                                [{/if}]
-                                'quantity': 1
-                            }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
-                            [{/foreach}]
-                        ]
-                    }[{if $oViewConf->isDebugModeOn()}],
-                    'debug_mode': 'true'
-                    [{/if}]
-                });
-            [{/strip}]
-        [{/capture}]
-        [{oxscript add=$smarty.capture.d3_ga4_view_item_list}]
-    [{/if}]
-[{/block}]

Application/views/event/view_search_result.tpl

@@ -1,44 +0,0 @@
-[{assign var="gtmProducts" value=$oView->getArticleList()}]
-
-[{block name="d3_ga4_view_search_result_block"}]
-  [{if $gtmProducts}]
-    [{capture name="d3_ga4_view_search_result"}]
-      [{strip}]
-        dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-        dataLayer.push({
-          'event': 'view_search_result',
-          'eventLabel':'view_search_result[{if $oViewConf->isDebugModeOn()}]_test[{/if}]',
-          'ecommerce': {
-            'search_term': '[{$searchparamforhtml}]',
-            'items': [
-              [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
-              [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
-              [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
-              [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
-              {
-                'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
-                'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
-                'price': [{$d3PriceObject->getPrice()}],
-                'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-                [{if $gtmCategory}]
-                'item_category':  '[{$gtmCategory->getSplitCategoryArray(0, true)}]',
-                'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1, true)}]',
-                'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2, true)}]',
-                'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3, true)}]',
-                'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
-                [{/if}]
-                'quantity': 1
-              }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
-              [{/foreach}]
-            ]
-          }[{if $oViewConf->isDebugModeOn()}],
-          'debug_mode': 'true'
-          [{/if}]
-        });
-      [{/strip}]
-    [{/capture}]
-    [{oxscript add=$smarty.capture.d3_ga4_view_search_result}]
-  [{/if}]
-[{/block}]
-
-[{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]

Application/views/ga4/add_to_cart.tpl

@@ -0,0 +1,47 @@
+[{$smarty.block.parent}]
+
+[{* 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"}]
+  $("#toBasket").click(function(event) {
+  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('/');
+
+  [{*** Debug cases ***}]
+  [{*event.preventDefault();*}]
+
+  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}]

Application/views/ga4/search.tpl

@@ -0,0 +1,33 @@
+[{$smarty.block.parent}]
+
+[{assign var="gtmProducts" value=$oView->getArticleList()}]
+
+[{if $gtmProducts|@count}]
+  [{strip}]
+    <script>
+      dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+      dataLayer.push({
+        'event': 'view_search_result',
+        'eventLabel':'view_search_result',
+        'ecommerce': {
+          '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()}],
+              '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}]

Application/views/ga4/view_item_list.tpl

@@ -0,0 +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}]
+[{/if}]

Application/views/tpl/page/account/d3gtmnoticelist.tpl

@@ -1,18 +0,0 @@
-[{capture append="oxidBlock_content"}]
-    [{assign var="template_title" value="MY_WISH_LIST"|oxmultilangassign}]
-    <h1 class="page-header">[{oxmultilang ident="MY_WISH_LIST"}]</h1>
-
-    [{if $oView->getNoticeProductList()}]
-    [{include file="widget/product/list.tpl" type="line" listId="noticelistProductList" title="" products=$oView->getNoticeProductList() removeFunction="tonoticelist" owishid=$oxcmp_user->oxuser__oxid->value}]
-    [{else}]
-    <p class="alert alert-info">[{oxmultilang ident="WISH_LIST_EMPTY"}]</p>
-    [{/if}]
-
-    [{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]
-
-    [{insert name="oxid_tracker" title=$template_title}]
-    [{/capture}]
-[{capture append="oxidBlock_sidebar"}]
-    [{include file="page/account/inc/account_menu.tpl" active_link="noticelist"}]
-    [{/capture}]
-[{include file="layout/page.tpl" sidebar="Left"}]

Application/views/tpl/page/account/d3gtmrecommendationlist.tpl

@@ -1,32 +0,0 @@
-[{capture append="oxidBlock_content"}]
-    [{assign var="template_title" value="LISTMANIA"|oxmultilangassign}]
-    [{assign var="_actvrecommlist" value=$oView->getActiveRecommList()}]
-
-    <h1 class="page-header">[{oxmultilang ident="LISTMANIA"}]</h1>
-
-    [{if $oView->isSavedList()}]
-        [{assign var="_statusMessage" value="LISTMANIA_LIST_SAVED"|oxmultilangassign}]
-        [{include file="message/success.tpl" statusMessage=$_statusMessage}]
-    [{/if}]
-
-    [{block name="account_redommendationlist_content"}]
-
-        [{include file="form/recommendation_edit.tpl" actvrecommlist=$_actvrecommlist}]
-
-        <hr>
-
-        [{if !$oView->getActiveRecommList()}]
-            [{assign var="blEdit" value=true}]
-            [{include file="page/recommendations/inc/list.tpl"}]
-        [{/if}]
-    [{/block}]
-
-    [{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]
-
-    [{insert name="oxid_tracker" title=$template_title}]
-[{/capture}]
-[{capture append="oxidBlock_sidebar"}]
-    [{include file="page/account/inc/account_menu.tpl" active_link="recommendationlist"}]
-[{/capture}]
-[{include file="layout/page.tpl" sidebar="Left"}]
-

Application/views/tpl/page/account/d3gtmwishlist.tpl

@@ -1,44 +0,0 @@
-[{capture append="oxidBlock_content"}]
-    [{assign var="template_title" value="MY_GIFT_REGISTRY"|oxmultilangassign}]
-    [{if !$oView->getWishListUsers() && $oView->getWishListSearchParam()}]
-        [{assign var="_statusMessage" value="MESSAGE_SORRY_NO_GIFT_REGISTRY"|oxmultilangassign}]
-        [{include file="message/error.tpl" statusMessage=$_statusMessage}]
-    [{/if}]
-    [{assign var="editval" value=$oView->getEnteredData()}]
-    [{if $oView->isWishListEmailSent()}]
-        [{assign var="_statusMessage" value="GIFT_REGISTRY_SENT_SUCCESSFULLY"|oxmultilangassign:$editval->rec_email}]
-        [{include file="message/notice.tpl" statusMessage=$_statusMessage}]
-    [{/if}]
-
-    <h1 class="page-header">[{$oView->getTitle()}]</h1>
-
-    <div class="wishlist-search">
-        [{include file="form/wishlist_search.tpl" searchClass="account_wishlist"}]
-    </div>
-
-    <hr>
-
-    <div class="wishlist">
-        [{if $oView->getWishList()}]
-            [{include file="form/wishlist_publish.tpl"}]
-            <hr>
-            [{include file="form/wishlist_suggest.tpl"}]
-        [{/if}]
-    </div>
-
-    [{if $oView->getWishList()}]
-        [{include file="widget/product/list.tpl" type="line" listId="wishlistProductList" title="" products=$oView->getWishProductList() removeFunction="towishlist" toBasketFunction="tobasket" owishid=$oxcmp_user->oxuser__oxid->value}]
-    [{else}]
-        <p class="alert alert-info">
-            [{oxmultilang ident="GIFT_REGISTRY_EMPTY"}]
-        </p>
-    [{/if}]
-
-    [{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]
-
-    [{insert name="oxid_tracker" title=$template_title}]
-[{/capture}]
-[{capture append="oxidBlock_sidebar"}]
-    [{include file="page/account/inc/account_menu.tpl" active_link="wishlist"}]
-[{/capture}]
-[{include file="layout/page.tpl" sidebar="Left"}]

CHANGELOG.md

@@ -4,65 +4,74 @@ 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.15.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.15.0...1.15.1) - 2024-04-11
-### Fixed
-- false processing of template during missing necessary-component
-
-## [1.15.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.14.0...1.15.0) - 2024-01-25
-### Fixed
-- missing Component-ArticleDetails extension, missing ManufacturerListController extension
-
-## [1.14.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.13.0...1.14.0) - 2024-01-03
-### Added
-- add_to_cart Event to several new shop-pages (landing-page, Account, category article-list, start)
-- PHPStan code-cleanup
-### Changed
-- template structure
-- code cleanup
-
-## [1.13.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.12.0...1.13.0) - 2023-09-13
-### Added
-- extended Docs
-### Changed
-- control-param name
-- control-param function
-- adjusted check for set control-param
-- consentmanager-script-adjustments
-
-## [1.12.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.11.1...1.12.0) - 2023-09-07
-### Added
-- cookiebot functionality
-
-## [1.11.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.11.0...1.11.1) - 2023-08-17
-### Fixed
-- metadata class entry
-
-## [1.11.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.10.0...1.11.0) - 2023-08-16
-### Added
-- remove_from_cart
-- auto debug_mode setter
-- manufacturer extension for breadcrumb
-### Changed
-- general template cleanup
-
-## [1.10.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.9.0...1.10.0) - 2023-06-27
-### Added
-- Following Entries to dedicated event-templates
-  - coupon
-  - paymentType
-  - item_list_name
-  - item_category
-- Method to get the in order used Payment-Name
-- Method to get the current Article Category
-### Changed
-- cookieManager handling
-- general template cleanup
-- renaming the template to a more intuitive name
-
-## [1.9.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.8.0...1.9.0) - 2023-06-19
+## [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

Docs/CMP/consentmanager.md

@@ -1,18 +0,0 @@
-# Consentmanager
-## 1. Steuerungsparameter
-Tragen Sie hier die gewünschte ID des zu prüfenden Anbieters (Vendor-ID) ein.<br>
-Diese ID finden Sie in Ihrem Consentmanager-Dashboard, links, unter "CMP > Anbieter".
-
-Nähere Informationen hierzu suchen Sie bitte auf der offiziellen Webseite von [app.consentmanager](https://help.consentmanager.de/books/cmp/page/4-configuring-vendors-and-cookies).
-
-## 2. Gebräuchliche ID's
-- s26 (Google Analytics/ GA/ GA4)
-- s905 (Google Tag Manager/ GTM)
-
-## 3. Einrichtung GTM
-Die von Ihnen eingetragene ID muss oder ist schlussendlich die ID, auf die im GTM-Umfeld geprüft wird.  
-Das heißt, dass sich die Eintragung nach GTM, oder umgekehrt, richtet.
-
-### Unterstützung benötigt?
-Kein Problem!  
-Kontaktieren Sie uns gern unter [d3data.de](https://www.d3data.de)

Docs/README.md

@@ -1,17 +1,10 @@
 # Technische Doku
 ## GA4 Events / Customizing
-Für alle implementierten GA4 Events existieren Templates unter `source/modules/d3/googleanalytics4/Application/views/event/`, dabei entspricht der Dateiname dem Eventnamen in GA4.
+Für alle implementierten GA4 Events existieren Templates unter `source/modules/d3/googleanalytics4/Application/views/ga4/`, dabei entspricht der Dateiname dem Eventnamen in GA4.
 Die Einbindung dieser Event-Templates erfolgt über TPL-Blöcke unter `source/modules/d3/googleanalytics4/Application/views/blocks/`.  
 *Hinweis: nicht alle templates sind bereits gefüllt. Wünschen Sie die Implementierung eines unausgefüllten templates?
 Kommen Sie auf uns zu unter https://www.d3data.de/
 
-## Steuerungsparameter
-Tragen Sie hier im Normalfall die ID des zu prüfenden Cookies ein.  
-In bestimmten Fällen, müssen Sie hier alternative Werte eintragen. Diese Fälle sind bedingt
-nach der gewählten CMP (Consent Manager Platform).  
-  
-> nähere Infos unter [CMP](#consent-manager-platform-cmp)  
-
 ## Blöcke
 Für den geregelten Ablauf sind folgende Blöcke nötig:
 - Suchergebnisse
@@ -19,7 +12,7 @@ Für den geregelten Ablauf sind folgende Blöcke nötig:
     - Datei: page/search/search.tpl
     - GA4 Event: view_search_results
 - Artikelliste
-    - Blockname: page_list_productlist
+    - Blockname: page_list_productlist (muss hinzugefügt werden)
     - Datei: page/list/list.tpl
     - GA4 Event: view_item_list
 - Detailseite
@@ -30,10 +23,6 @@ Für den geregelten Ablauf sind folgende Blöcke nötig:
     - Blockname: details_productmain_tobasket
     - Datei: page/details/inc/productmain.tpl
     - GA4 Event: add_to_cart
-- aus dem WK entfernen
-    - Blockname: checkout_basket_main
-    - Datei: page/checkout/basket.tpl
-    - GA4 Event: remove_from_cart
 - Warenkorb
     - Blockname: checkout_basket_main
     - Datei: page/checkout/basket.tpl
@@ -61,9 +50,6 @@ Dann tragen Sie in den Folgeeinstellungen unter "Cookie Manager Einstellungen",
 die Cookie-ID des zugehörigen Cookies ein.  
 Aktivieren Sie anschließend diese Weiche. Setzen Sie den Haken bei "Eigenen Cookie Manager nutzen?".
 
-## Consent Manager Platform (CMP)
-- [Consentmanager](https://git.d3data.de/D3Public/GoogleAnalytics4/src/branch/master/Docs/CMP/consentmanager.md)
-
 ### Unterstützung für
 - [aggrosoft - oxid-cookie-compliance](https://github.com/aggrosoft/oxid-cookie-compliance)
   - https://github.com/aggrosoft/oxid-cookie-compliance
@@ -87,7 +73,4 @@ Aktivieren Sie anschließend diese Weiche. Setzen Sie den Haken bei "Eigenen Coo
     - 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
-  
-- [Cookiebot](https://www.cookiebot.com)
-  - Nähere Informationen folgen bald! Bis dato, besuchen Sie bitte die offizielle Webseite.
+        ```Einstell. > Cookie Manager Einstellungen > Cookie-ID``` eintragen

IntelliSenseHelper.php

@@ -15,54 +15,4 @@
 
 namespace D3\GoogleAnalytics4\Modules\Core{
     class ViewConfig_parent extends \OxidEsales\Eshop\Core\ViewConfig{}
-}
-
-namespace D3\GoogleAnalytics4\Modules\Application\Model{
-    class Category_parent extends \OxidEsales\Eshop\Application\Model\Category {}
-    class Basket_parent extends \OxidEsales\Eshop\Application\Model\Basket {}
-    class Manufacturer_parent extends \OxidEsales\Eshop\Application\Model\Manufacturer {}
-}
-
-namespace D3\GoogleAnalytics4\Modules\Application\Controller{
-
-    use OxidEsales\Eshop\Application\Controller\AccountNoticeListController;
-    use OxidEsales\Eshop\Application\Controller\AccountRecommlistController;
-    use OxidEsales\Eshop\Application\Controller\AccountWishlistController;
-    use OxidEsales\Eshop\Application\Controller\Admin\ManufacturerController;
-    use OxidEsales\Eshop\Application\Controller\ArticleListController;
-    use OxidEsales\Eshop\Application\Controller\SearchController;
-    use OxidEsales\Eshop\Application\Controller\StartController;
-
-    class BasketController_parent extends \OxidEsales\Eshop\Application\Controller\BasketController {}
-    class ThankYouController_parent extends \OxidEsales\Eshop\Application\Controller\ThankYouController {}
-
-    class ArticleListController_AddToCartHelpMethods_parent extends ArticleListController {}
-
-    class ArticleDetailsController_parent extends \OxidEsales\Eshop\Application\Controller\ArticleDetailsController {}
-
-    class d3GtmAccountNoticeListController_parent extends AccountNoticeListController {}
-
-    class d3GtmAccountRecommlistController_parent extends AccountRecommlistController {}
-
-    class d3GtmAccountWishlistController_parent extends AccountWishlistController {}
-
-    class d3GtmStartController_parent extends StartController {}
-
-    class d3GtmSearchController_parent extends SearchController {}
-
-    class d3GtmManufacturerListController_parent extends ManufacturerController {}
-}
-
-namespace D3\GoogleAnalytics4\Modules\Application\Component{
-
-    use OxidEsales\Eshop\Application\Component\BasketComponent;
-
-    class d3GtmBasketComponentExtension_parent extends BasketComponent {}
-}
-
-namespace D3\GoogleAnalytics4\Modules\Application\Component\Widget{
-
-    use OxidEsales\Eshop\Application\Component\Widget\ArticleDetails;
-
-    class d3GtmWidgetArticleDetails_parent extends ArticleDetails {}
 }

Modules/Application/Component/Widget/d3GtmWidgetArticleDetails.php

@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace D3\GoogleAnalytics4\Modules\Application\Component\Widget;
-
-
-class d3GtmWidgetArticleDetails extends d3GtmWidgetArticleDetails_parent
-{
-    public function render()
-    {
-        $return = parent::render();
-
-        $this->addTplParam('d3CmpBasket', $this->getComponent('oxcmp_basket'));
-
-        return $return;
-    }
-}

Modules/Application/Component/d3GtmBasketComponentExtension.php

@@ -1,77 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Application\Component;
-
-use OxidEsales\Eshop\Application\Model\Article;
-use OxidEsales\Eshop\Core\Registry;
-
-class d3GtmBasketComponentExtension extends d3GtmBasketComponentExtension_parent
-{
-    /**
-     * @param $sProductId
-     * @param $dAmount
-     * @param $aSel
-     * @param $aPersParam
-     * @param $blOverride
-     * @return mixed|string
-     * @throws \Exception
-     */
-    public function toBasket($sProductId = null, $dAmount = null, $aSel = null, $aPersParam = null, $blOverride = false)
-    {
-        $return = parent::toBasket($sProductId, $dAmount, $aSel, $aPersParam, $blOverride);
-
-        Registry::getSession()->setVariable('d3GtmAddToBasketTrigger', true);
-
-        $iAmountArticlesAddedToCart = (int) Registry::getRequest()->getRequestEscapedParameter('am');
-
-        if ($iAmountArticlesAddedToCart){
-            Registry::getSession()->setVariable('d3GtmAddToCartAmountArticles', $iAmountArticlesAddedToCart);
-        }else{
-            Registry::getSession()->setVariable('d3GtmAddToCartAmountArticles', 1);
-        }
-
-        return $return;
-    }
-
-    /**
-     * @return int
-     */
-    public function getD3GtmAddToCartAmountArticles() :int
-    {
-        $iAmount = Registry::getSession()->getVariable('d3GtmAddToCartAmountArticles');
-
-        Registry::getSession()->deleteVariable('d3GtmAddToCartAmountArticles');
-
-        return (int) $iAmount;
-    }
-
-    /**
-     * @return bool
-     */
-    public function getAddToBasketDecision() :bool
-    {
-        $decision = Registry::getSession()->getVariable('d3GtmAddToBasketTrigger');
-
-        Registry::getSession()->setVariable('d3GtmAddToBasketTrigger', false);
-
-        return (bool) $decision;
-    }
-
-    /**
-     * @return Article|null
-     */
-    public function d3GtmRequestedArticleLoadedByAnid()
-    {
-        $sAnid = Registry::getRequest()->getRequestEscapedParameter('anid');
-
-        $oArticle = null;
-
-        if ($sAnid){
-            /** @var Article $oArticle */
-            $oArticle = oxNew(Article::class);
-            $oArticle->load($sAnid);
-        }
-
-        return $oArticle;
-    }
-}

Modules/Application/Controller/ArticleDetailsController.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Application\Controller;
-
-class ArticleDetailsController extends ArticleDetailsController_parent
-{
-    public function render()
-    {
-        $return = parent::render();
-
-        $this->addTplParam('d3CmpBasket', $this->getComponent('oxcmp_basket'));
-
-        return $return;
-    }
-}

Modules/Application/Controller/ArticleListController_AddToCartHelpMethods.php

@@ -1,15 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Application\Controller;
-
-class ArticleListController_AddToCartHelpMethods extends ArticleListController_AddToCartHelpMethods_parent
-{
-    public function render()
-    {
-        $render = parent::render();
-
-        $this->addTplParam('d3CmpBasket', $this->getComponent('oxcmp_basket'));
-
-        return $render;
-    }
-}

Modules/Application/Controller/BasketController.php

@@ -1,123 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Application\Controller;
-
-use OxidEsales\Eshop\Application\Component\BasketComponent;
-use OxidEsales\Eshop\Application\Model\Article;
-use OxidEsales\Eshop\Application\Model\ArticleList;
-use OxidEsales\Eshop\Core\Registry;
-use oxSystemComponentException;
-
-class BasketController extends BasketController_parent
-{
-    /**
-     * @return string
-     */
-    public function render()
-    {
-        $return = parent::render();
-
-        $this->d3GA4getRemovedArticlesListObject();
-
-        return $return;
-    }
-
-    /**
-     * @return void
-     * @throws oxSystemComponentException
-     */
-    public function d3GA4getRemovedArticlesListObject() :void
-    {
-        $this->addTplParam('hasBeenReloaded', false);
-        // collecting items to add
-        $aProducts = Registry::getRequest()->getRequestEscapedParameter('aproducts');
-
-        // collecting specified item
-        $sProductId = Registry::getRequest()->getRequestEscapedParameter('aid');
-        if ($sProductId) {
-            // additionally fetching current product info
-            $dAmount = Registry::getRequest()->getRequestEscapedParameter('am');
-
-            // select lists
-            $aSel = Registry::getRequest()->getRequestEscapedParameter('sel');
-
-            /** @var BasketComponent $oBasketComponent */
-            $oBasketComponent = $this->getComponent('oxcmp_basket');
-
-            $aPersParam = $oBasketComponent->__call('getPersistedParameters', []);
-
-            $sBasketItemId = Registry::getRequest()->getRequestEscapedParameter('bindex');
-
-            $aProducts[$sProductId] = [
-                'am'           => $dAmount,
-                'sel'          => $aSel,
-                'persparam'    => $aPersParam,
-                'basketitemid' => $sBasketItemId
-            ];
-        }
-
-        if (is_array($aProducts) && count($aProducts)) {
-            $toRemoveArticleIdList = [];
-            $artIdOnArtAmountList = [];
-
-            if ($this->isArticleRemovedState($aProducts)) {
-                //setting amount to 0 if removing article from basket
-                foreach ($aProducts as $sProductId => $aProduct) {
-                    if ((isset($aProduct['remove']) && $aProduct['remove']) or intval($aProduct['am']) === 0) {
-                        if (!in_array($aProduct, $toRemoveArticleIdList)) {
-                            $toRemoveArticleIdList[] = $aProduct['aid'];
-                            $artIdOnArtAmountList[$aProduct['aid']] = $aProduct['am'];
-                        }
-
-                        $aProducts[$sProductId]['am'] = 0;
-                        #for GA4 Event
-                        $this->addTplParam('hasBeenReloaded', true);
-                    } else {
-                        unset($aProducts[$sProductId]);
-                    }
-                }
-            }
-
-            $oArtList = oxNew(ArticleList::class);
-            $oArtList->loadIds($toRemoveArticleIdList);
-
-            #dumpVar($this->getBasketArticles());
-
-            /** @var Article $item */
-            foreach ($oArtList->getArray() as $item){
-                foreach ($artIdOnArtAmountList as $artId => $artAmount){
-                    if ($item->getId() === $artId){
-                        $item->assign(['d3AmountThatGotRemoved' => $artAmount]);
-                    }
-                }
-            }
-
-            $this->addTplParam('toRemoveArticles', $oArtList);
-        }
-    }
-
-    /**
-     * @return bool
-     *
-     * checks, if we're in the short state of "an Article has been removed"
-     * We check by looking for the "'removeBtn' is not null", as a sign for it has been triggered/ clicked
-     * if that doesn't work, we check if there's an Article in the Products array, that has "'am' = 0"
-     * Which also shows we're in that state rn
-     */
-    protected function isArticleRemovedState(array $productsArray) :bool
-    {
-        if (Registry::getRequest()->getRequestEscapedParameter('removeBtn')
-            or Registry::getRequest()->getRequestEscapedParameter('updateBtn')
-        ){
-            return true;
-        }else{
-            foreach ($productsArray as $aProduct) {
-                if (intval($aProduct['am']) === 0) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-}

Modules/Application/Controller/ThankYouController.php

@@ -1,25 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Application\Controller;
-
-use OxidEsales\Eshop\Application\Model\Country;
-use OxidEsales\Eshop\Application\Model\Order;
-
-class ThankYouController extends ThankYouController_parent
-{
-    /**
-     * @return Country
-     */
-    public function d3GAGetUserCountry()
-    {
-        /** @var Order $oOrder */
-        $oOrder = $this->getOrder();
-        $sCountryId = $oOrder->getFieldData('oxbillcountryid');
-
-        /** @var Country $oCountry */
-        $oCountry = oxNew(Country::class);
-        $oCountry->load($sCountryId);
-
-        return $oCountry;
-    }
-}

Modules/Application/Controller/d3GtmAccountNoticeListController.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Application\Controller;
-
-class d3GtmAccountNoticeListController extends d3GtmAccountNoticeListController_parent
-{
-    protected $_sThisTemplate = 'page/account/d3gtmnoticelist.tpl';
-
-    public function render()
-    {
-        $return = parent::render();
-
-        $this->addTplParam('d3CmpBasket', $this->getComponent('oxcmp_basket'));
-
-        return $return;
-    }
-}

Modules/Application/Controller/d3GtmAccountRecommlistController.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Application\Controller;
-
-class d3GtmAccountRecommlistController extends d3GtmAccountRecommlistController_parent
-{
-    protected $_sThisTemplate = 'page/account/d3gtmrecommendationlist.tpl';
-
-    public function render()
-    {
-        $return = parent::render();
-
-        $this->addTplParam('d3CmpBasket', $this->getComponent('oxcmp_basket'));
-
-        return $return;
-    }
-}

Modules/Application/Controller/d3GtmAccountWishlistController.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Application\Controller;
-
-class d3GtmAccountWishlistController extends d3GtmAccountWishlistController_parent
-{
-    protected $_sThisTemplate = 'page/account/d3gtmwishlist.tpl';
-
-    public function render()
-    {
-        $return = parent::render();
-
-        $this->addTplParam('d3CmpBasket', $this->getComponent('oxcmp_basket'));
-
-        return $return;
-    }
-}

Modules/Application/Controller/d3GtmManufacturerListController.php

@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace D3\GoogleAnalytics4\Modules\Application\Controller;
-
-
-class d3GtmManufacturerListController extends d3GtmManufacturerListController_parent
-{
-    public function render()
-    {
-        $return = parent::render();
-
-        $this->addTplParam('d3CmpBasket', $this->getComponent('oxcmp_basket'));
-
-        return $return;
-    }
-}

Modules/Application/Controller/d3GtmSearchController.php

@@ -1,23 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace D3\GoogleAnalytics4\Modules\Application\Controller;
-
-
-class d3GtmSearchController extends d3GtmSearchController_parent
-{
-    /**
-     * @return string
-     */
-    public function render()
-    {
-        $return = parent::render();
-
-        if (false === in_array('oxcmp_basket', $this->getComponents())){
-            $this->addTplParam('d3CmpBasket', $this->getComponent('oxcmp_basket'));
-        }
-
-        return $return;
-    }
-}

Modules/Application/Controller/d3GtmStartController.php

@@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace D3\GoogleAnalytics4\Modules\Application\Controller;
-
-class d3GtmStartController extends d3GtmStartController_parent
-{
-    public function render()
-    {
-        $return = parent::render();
-
-        if (false === in_array('oxcmp_basket', $this->getComponents())){
-            $this->addTplParam('d3CmpBasket', $this->getComponent('oxcmp_basket'));
-        }
-
-        return $return;
-    }
-}

Modules/Application/Model/Basket.php

@@ -1,23 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Application\Model;
-
-use OxidEsales\Eshop\Application\Model\Payment;
-
-class Basket extends Basket_parent
-{
-    /**
-     * @return string
-     */
-    public function getPaymentOnPaymentId() :string
-    {
-        if ($this->getPaymentId()){
-            $oPayment = oxNew(Payment::class);
-            if ($oPayment->load($this->getPaymentId())){
-                return $oPayment->getFieldData('oxdesc');
-            }
-        }
-
-        return "couldn't load payment!";
-    }
-}

Modules/Application/Model/Category.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Application\Model;
-
-class Category extends Category_parent
-{
-    /**
-     * @param int $indexOfArray
-     * @return string
-     */
-    public function getSplitCategoryArray(int $indexOfArray = -1, bool $bShallTakeStd = false) :string
-    {
-        if ($bShallTakeStd){
-            $splitCatArray =
-                array_values(
-                    array_filter(
-                        explode(
-                            '/',
-                            trim(
-                                parse_url(
-                                    $this->getLink(),
-                                    5
-                                )
-                            )
-                        )
-                    )
-                );
-
-            if (($indexOfArray >= 0) and (false === empty($splitCatArray[$indexOfArray]))){
-                return $splitCatArray[$indexOfArray];
-            }else{
-                return "";
-            }
-        }
-
-        return
-            trim(
-                parse_url(
-                    $this->getLink(),
-                    5
-                )
-            );
-    }
-}

Modules/Application/Model/Manufacturer.php

@@ -1,44 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Application\Model;
-
-class Manufacturer extends Manufacturer_parent
-{
-    /**
-     * @param int $indexOfArray
-     * @return string
-     */
-    public function getSplitCategoryArray(int $indexOfArray = -1, bool $bShallTakeStd = false) :string
-    {
-        if ($bShallTakeStd){
-            $splitCatArray =
-                array_values(
-                    array_filter(
-                        explode(
-                            '/',
-                            trim(
-                                parse_url(
-                                    $this->getLink(),
-                                    5
-                                )
-                            )
-                        )
-                    )
-                );
-
-            if (($indexOfArray >= 0) and (false === empty($splitCatArray[$indexOfArray]))){
-                return $splitCatArray[$indexOfArray];
-            }else{
-                return "";
-            }
-        }
-
-        return
-            trim(
-                parse_url(
-                    $this->getLink(),
-                    5
-                )
-            );
-    }
-}

Modules/Core/ViewConfig.php

@@ -15,9 +15,11 @@ 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\Application\Model\User;
 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
 {
 
@@ -29,7 +31,10 @@ class ViewConfig extends ViewConfig_parent
     {
         if ($this->sContainerId === null)
         {
-            $this->sContainerId = Registry::getConfig()->getConfigParam('d3_gtm_sContainerID');
+            $this->sContainerId = ContainerFactory::getInstance()
+                                                  ->getContainer()
+                                                  ->get(ModuleSettingBridgeInterface::class)
+                                                  ->get('d3_gtm_sContainerID', 'd3googleanalytics4');
         }
         return $this->sContainerId;
     }
@@ -70,7 +75,7 @@ class ViewConfig extends ViewConfig_parent
 
         $this->defineCookieManagerType();
 
-        $sCookieID = trim($oConfig->getConfigParam('d3_gtm_settings_controlParameter'));
+        $sCookieID = $oConfig->getConfigParam('d3_gtm_settings_cookieName');
 
         // Netensio Cookie Manager
         if ($this->sCookieManagerType === ManagerTypes::NET_COOKIE_MANAGER) {
@@ -92,8 +97,6 @@ class ViewConfig extends ViewConfig_parent
             $this->sCookieManagerType       === ManagerTypes::USERCENTRICS_MODULE
             or $this->sCookieManagerType    === ManagerTypes::USERCENTRICS_MANUALLY
             or $this->sCookieManagerType    === ManagerTypes::CONSENTMANAGER
-            or $this->sCookieManagerType    === ManagerTypes::COOKIEFIRST
-            or $this->sCookieManagerType    === ManagerTypes::COOKIEBOT
             or $this->sCookieManagerType    === ManagerTypes::EXTERNAL_SERVICE
         )
         {
@@ -112,9 +115,10 @@ class ViewConfig extends ViewConfig_parent
      */
     public function getGtmScriptAttributes() :string
     {
-        $sControlParameter = trim(Registry::getConfig()->getConfigParam('d3_gtm_settings_controlParameter'));
+        $oConfig = Registry::getConfig();
+        $sCookieId = $oConfig->getConfigParam('d3_gtm_settings_cookieName');
 
-        if (false === $this->shallUseOwnCookieManager() or ($sControlParameter === '')){
+        if (false === $this->shallUseOwnCookieManager()){
             return "";
         }
 
@@ -123,20 +127,21 @@ class ViewConfig extends ViewConfig_parent
             or $this->sCookieManagerType === ManagerTypes::USERCENTRICS_MANUALLY
         )
         {
-            return 'data-usercentrics="' . $sControlParameter . '" type="text/plain" async=""';
+            if ($sCookieId) {
+                return 'data-usercentrics="' . $sCookieId . '" type="text/plain" async=""';
+            }
         }
 
         if ($this->sCookieManagerType === ManagerTypes::CONSENTMANAGER)
         {
-            return 'type="text/plain" class="cmplazyload" data-cmp-vendor="'.$sControlParameter.'"';
-        }
-
-        if ($this->sCookieManagerType === ManagerTypes::COOKIEFIRST){
-            return 'type="text/plain" data-cookiefirst-category="' . $sControlParameter .'"';
-        }
-
-        if ($this->sCookieManagerType === ManagerTypes::COOKIEBOT){
-            return 'type="text/plain" data-cookieconsent="' . $sControlParameter .'"';
+            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 "";
@@ -144,12 +149,14 @@ class ViewConfig extends ViewConfig_parent
 
     private $blGA4enabled = null;
 
-    
     public function isGA4enabled()
     {
         if ($this->blGA4enabled === null)
         {
-            $this->sContainerId = Registry::getConfig()->getConfigParam('d3_gtm_blEnableGA4');
+            $this->sContainerId = ContainerFactory::getInstance()
+                                                  ->getContainer()
+                                                  ->get(ModuleSettingBridgeInterface::class)
+                                                  ->get('d3_gtm_blEnableGA4', 'd3googleanalytics4');
         }
 
         return $this->blGA4enabled;
@@ -161,8 +168,7 @@ class ViewConfig extends ViewConfig_parent
 
         $oConfig = Registry::getConfig();
         $oView   = $oConfig->getTopActiveView();
-
-        /** @var User|false|null $oUser */
+        /** @var FrontendController $oShop */
         $oUser = $oConfig->getUser();
 
         $cl         = $this->getTopActiveClassName();
@@ -185,19 +191,14 @@ class ViewConfig extends ViewConfig_parent
                 'title' => $oView->getTitle(),
                 'cl'    => $cl,
             ],
-            'userid'    => $oUser instanceof User ? $oUser->getId() : false,
-            'sessionid' => session_id(),
+            'userid'    => ($oUser ? $oUser->getId() : false),
+            'sessionid' => session_id() ?? false,
             //'httpref'   => $_SERVER["HTTP_REFERER"] ?? "unknown"
         ];
 
         return json_encode([$dataLayer], JSON_PRETTY_PRINT);
     }
 
-    public function isDebugModeOn() :bool
-    {
-        return Registry::getConfig()->getConfigParam('d3_gtm_blEnableDebug');
-    }
-
     public function isPromotionList($listId)
     {
         $oConfig           = Registry::getConfig();

composer.json

@@ -1,57 +1,56 @@
-{
-  "name": "d3/google-analytics4",
-  "description": "Google Tag Manager with new Google Analytics 4 for OXID eShop v6",
-  "type": "oxideshop-module",
-  "keywords": [
-    "oxid",
-    "modules",
-    "eShop",
-    "d3",
-    "google",
-    "ga4",
-    "googleanalytics",
-    "gtm",
-    "configuration"
-  ],
-  "homepage": "https://www.d3data.de",
-  "license": [
-    "GPL-3.0"
-  ],
-  "authors": [
-    {
-      "name": "Marat Bedoev",
-      "email": "hello@mb-dev.pro"
-    },
-    {
-      "name": "D3 Data Development (Inh. Thomas Dartsch)",
-      "email": "info@shopmodule.com",
-      "homepage": "https://www.d3data.de"
-    }
-  ],
-  "support": {
-    "email": "support@shopmodule.com"
-  },
-  "extra": {
-    "oxideshop": {
-      "blacklist-filter": [
-        "*.md",
-        "composer.json",
-        ".php-cs-fixer.php",
-        "*.xml",
-        "*.neon"
-      ],
-      "target-directory": "d3/googleanalytics4"
-    }
-  },
-  "require": {
-    "php": ">=7.1",
-    "oxid-esales/oxideshop-ce": "v6.0 - v6.3",
-    "google/apiclient":"^2.0",
-    "phpstan/phpstan": "^1.8"
-  },
-  "autoload": {
-    "psr-4": {
-      "D3\\GoogleAnalytics4\\": "../../../source/modules/d3/googleanalytics4"
-    }
-  }
+{
+  "name": "d3/google-analytics4",
+  "description": "Google Tag Manager with new Google Analytics 4 for OXID eShop v6",
+  "type": "oxideshop-module",
+  "keywords": [
+    "oxid",
+    "modules",
+    "eShop",
+    "d3",
+    "google",
+    "ga4",
+    "googleanalytics",
+    "gtm",
+    "configuration"
+  ],
+  "homepage": "https://www.d3data.de",
+  "license": [
+    "GPL-3.0"
+  ],
+  "authors": [
+    {
+      "name": "Marat Bedoev",
+      "email": "hello@mb-dev.pro"
+    },
+    {
+      "name": "D3 Data Development (Inh. Thomas Dartsch)",
+      "email": "info@shopmodule.com",
+      "homepage": "https://www.d3data.de"
+    }
+  ],
+  "support": {
+    "email": "support@shopmodule.com"
+  },
+  "extra": {
+    "oxideshop": {
+      "blacklist-filter": [
+        "*.md",
+        "composer.json",
+        ".php-cs-fixer.php",
+        "*.xml",
+        "*.neon"
+      ],
+      "target-directory": "d3/googleanalytics4"
+    }
+  },
+  "require": {
+    "php": ">=7.1",
+    "oxid-esales/oxideshop-ce": "^6.5",
+    "google/apiclient":" ^2.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "D3\\GoogleAnalytics4\\": "../../../source/modules/d3/googleanalytics4"
+    }
+  }
 }

metadata.php

@@ -1,36 +1,5 @@
 <?php
-
-use D3\GoogleAnalytics4\Modules\Application\Component\d3GtmBasketComponentExtension;
-use D3\GoogleAnalytics4\Modules\Application\Component\Widget\d3GtmWidgetArticleDetails as d3GtmWidgetArticleDetails;
-use D3\GoogleAnalytics4\Modules\Application\Controller\ArticleDetailsController;
-use D3\GoogleAnalytics4\Modules\Application\Controller\ArticleListController_AddToCartHelpMethods;
-use D3\GoogleAnalytics4\Modules\Application\Controller\BasketController;
-use D3\GoogleAnalytics4\Modules\Application\Controller\d3GtmAccountNoticeListController;
-use D3\GoogleAnalytics4\Modules\Application\Controller\d3GtmAccountRecommlistController;
-use D3\GoogleAnalytics4\Modules\Application\Controller\d3GtmAccountWishlistController;
-use D3\GoogleAnalytics4\Modules\Application\Controller\d3GtmManufacturerListController as d3GtmManufacturerListController;
-use D3\GoogleAnalytics4\Modules\Application\Controller\d3GtmSearchController;
-use D3\GoogleAnalytics4\Modules\Application\Controller\d3GtmStartController;
-use D3\GoogleAnalytics4\Modules\Application\Controller\ThankYouController;
-use D3\GoogleAnalytics4\Modules\Application\Model\Basket as Basket;
-use D3\GoogleAnalytics4\Modules\Application\Model\Category as Category;
-use D3\GoogleAnalytics4\Modules\Application\Model\Manufacturer as Manufacturer;
 use D3\GoogleAnalytics4\Modules\Core\ViewConfig;
-use OxidEsales\Eshop\Application\Component\BasketComponent as OEBasketComponent;
-use OxidEsales\Eshop\Application\Component\Widget\ArticleDetails as OEArticleDetails;
-use OxidEsales\Eshop\Application\Controller\AccountNoticeListController as OEAccountNoticeListController;
-use OxidEsales\Eshop\Application\Controller\AccountRecommlistController as OEAccountRecommlistController;
-use OxidEsales\Eshop\Application\Controller\AccountWishlistController as OEAccountWishlistController;
-use OxidEsales\Eshop\Application\Controller\ArticleDetailsController as OEArticleDetailsController;
-use OxidEsales\Eshop\Application\Controller\ArticleListController as OEArticleListController;
-use OxidEsales\Eshop\Application\Controller\BasketController as OEBasketController;
-use OxidEsales\Eshop\Application\Controller\ManufacturerListController as OEManufacturerListController;
-use OxidEsales\Eshop\Application\Controller\SearchController as OESearchController;
-use OxidEsales\Eshop\Application\Controller\StartController as OEStartController;
-use OxidEsales\Eshop\Application\Controller\ThankYouController as OEThankYouController;
-use OxidEsales\Eshop\Application\Model\Basket as OEBasket;
-use OxidEsales\Eshop\Application\Model\Category as OECategory;
-use OxidEsales\Eshop\Application\Model\Manufacturer as OEManufacturer;
 use OxidEsales\Eshop\Core\ViewConfig as OEViewConfig;
 
 $sMetadataVersion = '2.1';
@@ -48,50 +17,18 @@ $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.15.1',
+    'version'     => '2.7.0',
     'author'      => 'Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'https://www.oxidmodule.com/',
     'extend'      => [
-        // Core
-        OEViewConfig::class                     => ViewConfig::class,
-
-        // Model
-        OECategory::class                       => Category::class,
-        OEBasket::class                         => Basket::class,
-        OEManufacturer::class                   => Manufacturer::class,
-
-        // Controller
-        OEBasketController::class               => BasketController::class,
-        OEThankYouController::class             => ThankYouController::class,
-        OEArticleListController::class          => ArticleListController_AddToCartHelpMethods::class,
-        OEArticleDetailsController::class       => ArticleDetailsController::class,
-        OEAccountNoticeListController::class    => d3GtmAccountNoticeListController::class,
-        OEAccountRecommlistController::class    => d3GtmAccountRecommlistController::class,
-        OEAccountWishlistController::class      => d3GtmAccountWishlistController::class,
-        OEStartController::class                => d3GtmStartController::class,
-        OESearchController::class               => d3GtmSearchController::class,
-        OEManufacturerListController::class     => d3GtmManufacturerListController::class,
-
-        // Component
-        OEArticleDetails::class                 => d3GtmWidgetArticleDetails::class,
-        OEBasketComponent::class                => d3GtmBasketComponentExtension::class,
+        OEViewConfig::class => ViewConfig::class
     ],
     'templates'   => [
-        // Event files that store the GA4 Event-Information
-        'event/add_to_cart.tpl'                     => 'd3/googleanalytics4/Application/views/event/add_to_cart.tpl',
-        'event/view_item.tpl'                       => 'd3/googleanalytics4/Application/views/event/view_item.tpl',
-        'event/view_cart.tpl'                       => 'd3/googleanalytics4/Application/views/event/view_cart.tpl',
-        'event/purchase.tpl'                        => 'd3/googleanalytics4/Application/views/event/purchase.tpl',
-        'event/view_item_list.tpl'                  => 'd3/googleanalytics4/Application/views/event/view_item_list.tpl',
-        'event/view_search_result.tpl'              => 'd3/googleanalytics4/Application/views/event/view_search_result.tpl',
-        'event/remove_from_cart.tpl'                => 'd3/googleanalytics4/Application/views/event/remove_from_cart.tpl',
-
-        // complete overwritten file of OXID-Originals
-        // the path of the template-name is the original path to the file in OXID-context from tpl/->
-        'page/account/d3gtmnoticelist.tpl'          => 'd3/googleanalytics4/Application/views/tpl/page/account/d3gtmnoticelist.tpl',
-        'page/account/d3gtmrecommendationlist.tpl'  => 'd3/googleanalytics4/Application/views/tpl/page/account/d3gtmrecommendationlist.tpl',
-        'page/account/d3gtmwishlist.tpl'            => 'd3/googleanalytics4/Application/views/tpl/page/account/d3gtmwishlist.tpl',
+        // GA4 events
+        'ga4_add_to_cart.tpl'      => 'd3/googleanalytics4/Application/views/ga4/add_to_cart.tpl',
+        'ga4_search.tpl'           => 'd3/googleanalytics4/Application/views/ga4/search.tpl',
+        'ga4_view_item_list.tpl'   => 'd3/googleanalytics4/Application/views/ga4/view_item_list.tpl',
     ],
     'blocks'      => [
         // tag manager js
@@ -118,52 +55,33 @@ $aModule          = [
         [
             'template' => 'page/checkout/basket.tpl',
             'block'    => 'checkout_basket_main',
-            'file'     => '/Application/views/blocks/view_cart.tpl'
+            'file'     => '/Application/views/blocks/checkout_s1.tpl'
         ],
         [
             'template' => 'page/checkout/thankyou.tpl',
             'block'    => 'checkout_thankyou_main',
-            'file'     => '/Application/views/blocks/purchase.tpl'
+            'file'     => '/Application/views/blocks/checkout_s5.tpl'
         ],
         // Lists
         // view_item_list
         [
             'template' => 'page/list/list.tpl',
             'block'    => 'page_list_productlist',
-            'file'     => '/Application/views/blocks/view_item_list.tpl',
+            'file'     => '/Application/views/ga4/view_item_list.tpl',
             'position' => 150
         ],
         // view_search_result
         [
             'template' => 'page/search/search.tpl',
             'block'    => 'search_results',
-            'file'     => '/Application/views/blocks/view_search_result.tpl',
+            'file'     => '/Application/views/ga4/search.tpl',
             'position' => 150
         ],
         // add_to_cart
         [
             'template' => 'page/details/inc/productmain.tpl',
             'block'    => 'details_productmain_tobasket',
-            'file'     => '/Application/views/blocks/details_productmain_tobasket.tpl',
-            'position' => 150
-        ],
-        [
-            'template' => 'page/list/list.tpl',
-            'block'    => 'page_list_listbody',
-            'file'     => '/Application/views/blocks/page_list_listbody.tpl',
-            'position' => 150
-        ],
-        [
-            'template' => 'page/shop/start.tpl',
-            'block'    => 'start_welcome_text',
-            'file'     => '/Application/views/blocks/start_welcome_text.tpl',
-            'position' => 150
-        ],
-        // remove_from_cart
-        [
-            'template' => 'page/checkout/basket.tpl',
-            'block'    => 'checkout_basket_main',
-            'file'     => '/Application/views/blocks/remove_from_cart.tpl',
+            'file'     => '/Application/views/ga4/add_to_cart.tpl',
             'position' => 150
         ]
     ],
@@ -198,9 +116,9 @@ $aModule          = [
         ],
         [
             'group'    => 'd3_gtm_settings_cookiemanager',
-            'name'     => 'd3_gtm_settings_controlParameter',
+            'name'     => 'd3_gtm_settings_cookieName',
             'type'     => 'str',
-            'value'    => '',
+            'value'    => 'example',
             'position' => 999
         ],
         [
@@ -208,7 +126,7 @@ $aModule          = [
             'name' => 'd3_gtm_settings_HAS_STD_MANAGER',
             'type' => 'select',
             'value' => 'none',
-            'constraints' => 'NONE|CONSENTMANAGER|USERCENTRICS|COOKIEFIRST|COOKIEBOT',
+            'constraints' => 'NONE|CONSENTMANAGER|USERCENTRICS',
         ],
     ]
 ];

phpstan.neon

@@ -1,16 +1,10 @@
 parameters:
     scanFiles:
         - IntelliSenseHelper.php
-        - ../../../../Shops/CE/6.1.x/616_/vendor/oxid-esales/oxideshop-ce/source/bootstrap.php
-        - ../../../../Shops/CE/6.1.x/616_/vendor/oxid-esales/oxideshop-ce/source/oxfunctions.php
-        - ../../../../Shops/CE/6.1.x/616_/vendor/oxid-esales/oxideshop-ce/source/overridablefunctions.php
-    scanDirectories:
-        - ../../../../Shops/CE/6.1.x/616_/vendor/oxid-esales
-    ignoreErrors:
-        - '#.*is not subtype of Throwable.*#'
-        - '#\$sValue of method OxidEsales\\EshopCommunity\\Core\\Controller\\BaseController::addTplParam\(\) expects string,[ a-zA-Z\.]+#'
-    paths:
-        - ./
-    level: 5
-    phpVersion: 70200
+        - ../../oxid-esales/oxideshop-ce/source/oxfunctions.php
+        - ../../oxid-esales/oxideshop-ce/source/overridablefunctions.php
+    level: 9
+    phpVersion: 70100
     checkMissingIterableValueType: false
+    ignoreErrors:
+        - '#Psr\\Container\\ContainerExceptionInterface is not subtype of Throwable#'