bump metadata and readme

adjust set-param check
switch param-name
2023-09-13 16:00:12 +02:00 · 2023-09-13 15:13:35 +02:00 · 2023-09-13 15:08:58 +02:00 · 2023-09-13 14:56:05 +02:00 · 2023-09-13 14:42:12 +02:00 · 2023-09-07 15:11:04 +02:00
--- a/.gitignore
+++ b/.gitignore
@ -1 +0,0 @@
-.idea
--- a/Application/Model/Constants.php
+++ b/Application/Model/Constants.php
@ -1,11 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace D3\GoogleAnalytics4\Application\Model;
-
-
-class Constants
-{
-    public const OXID_MODULE_ID = 'd3googleanalytics4';
-}
--- a/Application/views/admin/de/module_options.php
+++ b/Application/views/admin/de/module_options.php
@ -27,61 +27,15 @@ $aLang = [
    'SHOP_MODULE_d3_gtm_blGA4enab'          => 'GA4 Aktivieren',
    'SHOP_MODULE_d3_gtm_blUAenabled'        => 'UA Aktivieren',
    'SHOP_MODULE_d3_gtm_blEnableDebug'      => 'Debug-Modus aktivieren',
-    'SHOP_MODULE_GROUP_d3_gtm_settings_serversidetagging'         => 'Server-Side tagging',
-    'SHOP_MODULE_d3_gtm_settings_serversidetagging_js'      => 'Servercontainer Ausführender-Code',
-    'HELP_SHOP_MODULE_d3_gtm_settings_serversidetagging_js'      => 'Diese Domain wird im <strong>aktiven</strong>-code ausgefüht. Das heißt,
-                                                                        dass es sich hierbei um das HTML-Tag <code>script</code> handelt.
-                                                                        Dieses kümmert sich darum, dass die, im data_layer
-                                                                        zusammengefassten Daten an den GTM weitergeleitet werden.<br>
-                                                                        <br>
-                                                                        <h4>Folgend eine Darstellung, was genau ausgetauscht wird</h4>
-                                                                        <pre>
-<code>
-Vorher:
-https://www.googletagmanager.com/gtm.js?id=
-
-Nachher:
-{Domain}?id=
-</code>
-                                                                        </pre>
-                                                                        Die Conatiner-ID wird weiterhin im Punkt "Einstellung" eingetragen!
-                                                                        ',
-    'SHOP_MODULE_d3_gtm_settings_serversidetagging_nojs'    => 'Servercontainer NICHT Ausführender-Code<br><br>
-    "Serverseitiges Tagging ist eine neue Möglichkeit, mit Google Tag Manager Ihre Anwendung geräteübergreifend zu verwalten.<br>
-    Servercontainer verwenden dasselbe Tag-, Trigger- und Variablenmodell, das Sie gewohnt sind.<br> 
-    Außerdem bieten sie neue Tools, mit denen Sie Nutzeraktivitäten überall messen können." <br>
-    <br>
-    - Quelle <a href="https://developers.google.com/tag-platform/tag-manager/server-side/intro">Developers-Google Server-Side tagging</a><br>
-    <br>
-    <strong>Verändern Sie die Werte nur, wenn Sie Server-Side tagging verwenden wollen!</strong>
-',
-    'HELP_SHOP_MODULE_d3_gtm_settings_serversidetagging_nojs'    => 'Diese Domain wird im <strong>passiven</strong>-code ausgefüht. Das heißt,
-                                                                        dass es sich hierbei um das HTML-Tag <code>noscript</code> handelt.
-                                                                        Dieses wird ausgeführt, wenn aus einem bestimmten Grund
-                                                                        das Javascript nicht ausgeführt wird.<br>
-                                                                        ( keine Cookies erlaubt, JavaScript-Unterbindung, ... )
-                                                                        <br>
-                                                                        <h4>Folgend eine Darstellung, was genau ausgetauscht wird</h4>
-                                                                        <pre>
-<code>
-Vorher:
-src="https://www.googletagmanager.com/ns.html?id={Container-ID}"
-
-Nachher:
-src="{Domain}?id={Container-ID}"
-</code>
-                                                                        </pre>
-                                                                        Die Conatiner-ID wird weiterhin im Punkt "Einstellung" eingetragen!
-                                                                        ',

    // 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>
+    'HELP_SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER'              => 'Mehr Informationen zu den genannten Coookie-Manager finden Sie auf den folgenden Home-Pages<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.',
@ -95,10 +49,5 @@ src="{Domain}?id={Container-ID}"
                                                        <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_blActivateConsentMode'            => "Google Consent Mode 'Default Values' aktivieren",
-    'HELP_SHOP_MODULE_d3_gtm_blActivateConsentMode'       => 'Diese Einstellung ist zu aktivieren, wenn Sie den Google-Consent-Mode ( Einwilligungsmodus ) verwenden wollen.
-                                                                    <hr>
-                                                                    "Im Einwilligungsmodus können Sie Google über den Cookie- oder App-ID-Einwilligungsstatus Ihrer Nutzer informieren. 
-                                                                    Mit Tags wird das Verhalten angepasst. Dabei werden die Einstellungen der Nutzer berücksichtigt." ~ <a href="https://support.google.com/google-ads/answer/10000067">Google Einwilligungsmodus</a>',
+                                                        '
 ];
--- a/Application/views/blocks/_gtm_js.tpl
+++ b/Application/views/blocks/_gtm_js.tpl
@ -3,28 +3,9 @@
  var dataLayer = [{$oViewConf->getGtmDataLayer()}] || [];
 </script>

-[{assign var="d3GtmContainerIdString" value=$oViewConf->getGtmContainerId()}]
-
 [{if $oViewConf->D3blShowGtmScript()}]
-    [{if $d3GtmContainerIdString}]
+    [{if $oViewConf->getGtmContainerId()}]
        [{strip}]
-
-            [{if $oViewConf->isGtmConsentModeSetActivated()}]
-                <script type="text/javascript">
-                    function gtag() {
-                        dataLayer.push(arguments);
-                    }
-
-                    gtag("consent", "default", {
-                        ad_user_data: "denied",
-                        ad_personalization: "denied",
-                        ad_storage: "denied",
-                        analytics_storage: "denied",
-                        wait_for_update: 2000
-                    });
-                </script>
-            [{/if}]
-
            <!-- Google Tag Manager -->
            <script [{$oViewConf->getGtmScriptAttributes()}]>
              (function (w, d, s, l, i) {
@ -32,9 +13,9 @@
                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 = '[{$oViewConf->getServerSidetaggingJsDomain()}]?id=' + i + dl;
+                j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
                f.parentNode.insertBefore(j, f);
-              })(window, document, 'script', 'dataLayer', '[{$d3GtmContainerIdString}]');
+              })(window, document, 'script', 'dataLayer', '[{$oViewConf->getGtmContainerId()}]');
            </script>
            <!-- End Google Tag Manager -->
        [{/strip}]
--- a/Application/views/blocks/_gtm_nojs.tpl
+++ b/Application/views/blocks/_gtm_nojs.tpl
@ -2,7 +2,7 @@
    [{if $oViewConf->getGtmContainerId()}][{strip}]
    <!-- Google Tag Manager (noscript) -->
    <noscript>
-        <iframe src="[{$oViewConf->getServerSidetaggingNoJsDomain()}]?id=[{$oViewConf->getGtmContainerId()}]"
+        <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) -->
--- a/Application/views/blocks/details_productmain_tobasket.tpl
+++ b/Application/views/blocks/details_productmain_tobasket.tpl
@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]
--- a/Application/views/blocks/page_list_listbody.tpl
+++ b/Application/views/blocks/page_list_listbody.tpl
@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]
--- a/Application/views/blocks/purchase.tpl
+++ b/Application/views/blocks/purchase.tpl
@ -1,3 +1,56 @@
 [{$smarty.block.parent}]

-[{include file="event/purchase.tpl"}]
+[{block name="d3_ga4_purchase_block"}]
+    [{capture assign=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)}]',
+                                'item_category_2':  '[{$gtmPurchaseItemCategory->getSplitCategoryArray(1)}]',
+                                'item_category_3':  '[{$gtmPurchaseItemCategory->getSplitCategoryArray(2)}]',
+                                'item_category_4':  '[{$gtmPurchaseItemCategory->getSplitCategoryArray(3)}]',
+                                '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=$d3_ga4_purchase}]
+[{/block}]
--- a/Application/views/blocks/remove_from_cart.tpl
+++ b/Application/views/blocks/remove_from_cart.tpl
@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/remove_from_cart.tpl"}]
--- a/Application/views/blocks/start_welcome_text.tpl
+++ b/Application/views/blocks/start_welcome_text.tpl
@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]
--- a/Application/views/blocks/view_cart.tpl
+++ b/Application/views/blocks/view_cart.tpl
@ -1,3 +1,50 @@
 [{$smarty.block.parent}]

-[{include file="event/view_cart.tpl"}]
+[{*$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 assign=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)}]',
+                                'item_category_2':  '[{$gtmBasketItemCategory->getSplitCategoryArray(1)}]',
+                                'item_category_3':  '[{$gtmBasketItemCategory->getSplitCategoryArray(2)}]',
+                                'item_category_4':  '[{$gtmBasketItemCategory->getSplitCategoryArray(3)}]',
+                                '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=$d3_ga4_view_cart}]
+[{/block}]
--- a/Application/views/blocks/view_item.tpl
+++ b/Application/views/blocks/view_item.tpl
@ -1,3 +1,40 @@
 [{$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"}]
+[{block name="d3_ga4_view_item_block"}]
+  [{capture assign=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)}]',
+              'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1)}]',
+              'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2)}]',
+              'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3)}]',
+              '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=$d3_ga4_view_item}]
+[{/block}]
--- a/Application/views/blocks/view_item_list.tpl
+++ b/Application/views/blocks/view_item_list.tpl
@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/view_item_list.tpl"}]
--- a/Application/views/blocks/view_search_result.tpl
+++ b/Application/views/blocks/view_search_result.tpl
@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/view_search_result.tpl"}]
--- a/Application/views/event/add_to_cart.tpl
+++ b/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}]
--- a/Application/views/event/purchase.tpl
+++ b/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}]
--- a/Application/views/event/view_cart.tpl
+++ b/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}]
--- a/Application/views/event/view_item.tpl
+++ b/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}]
--- a/Application/views/ga4/add_to_cart.tpl
+++ b/Application/views/ga4/add_to_cart.tpl
@ -0,0 +1,52 @@
+[{$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()}]
+
+[{block name="d3_ga4_add_to_cart_block"}]
+  [{capture assign=d3_ga4_add_to_cart}]
+    [{strip}]
+      $("#toBasket").click(function(event) {
+        dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+
+        [{*** 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}]',
+              [{if $gtmCategory}]
+              'item_category':  '[{$gtmCategory->getSplitCategoryArray(0)}]',
+              'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1)}]',
+              'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2)}]',
+              'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3)}]',
+              'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
+              [{/if}]
+              'quantity': iArtQuantity
+              }
+            ]
+          }[{if $oViewConf->isDebugModeOn()}],
+          'debug_mode': 'true'
+          [{/if}]
+        });
+      });
+    [{/strip}]
+  [{/capture}]
+  [{oxscript add=$d3_ga4_add_to_cart}]
+[{/block}]
--- a/Application/views/event/remove_from_cart.tpl
+++ b/Application/views/event/remove_from_cart.tpl
@ -1,7 +1,9 @@
+[{$smarty.block.parent}]
+
 [{block name="d3_ga4_remove_from_cart_block"}]
    [{if $hasBeenReloaded}]
        [{assign var="d3BasketPrice" value=$oxcmp_basket->getPrice()}]
-        [{capture name="d3_ga4_remove_from_cart"}]
+        [{capture assign=d3_ga4_remove_from_cart}]
            [{strip}]
                dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
                dataLayer.push({
@ -22,10 +24,10 @@
                            '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_category':    '[{$gtmBasketItemCategory->getSplitCategoryArray(0)}]',
+                            'item_category_2':  '[{$gtmBasketItemCategory->getSplitCategoryArray(1)}]',
+                            'item_category_3':  '[{$gtmBasketItemCategory->getSplitCategoryArray(2)}]',
+                            'item_category_4':  '[{$gtmBasketItemCategory->getSplitCategoryArray(3)}]',
                            'item_list_name':   '[{$gtmBasketItemCategory->getSplitCategoryArray()}]',
                            [{/if}]
                            'price':            [{$d3oItemPrice->getPrice()}],
@ -41,6 +43,6 @@
                });
            [{/strip}]
        [{/capture}]
-        [{oxscript add=$smarty.capture.d3_ga4_remove_from_cart}]
+        [{oxscript add=$d3_ga4_remove_from_cart}]
    [{/if}]
 [{/block}]
--- a/Application/views/event/view_item_list.tpl
+++ b/Application/views/event/view_item_list.tpl
@ -1,3 +1,4 @@
+[{$smarty.block.parent}]
 [{assign var="gtmProducts" value=$oView->getArticleList()}]
 [{assign var="gtmCategory" value=$oView->getActiveCategory()}]

@ -5,7 +6,7 @@

 [{block name="d3_ga4_view_item_list_block"}]
    [{if $gtmProducts|@count}]
-        [{capture name="d3_ga4_view_item_list"}]
+        [{capture assign=d3_ga4_view_item_list}]
            [{strip}]
                dataLayer.push({ecommerce: null});
                dataLayer.push({
@ -25,10 +26,10 @@
                                '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_category':  '[{$gtmCategory->getSplitCategoryArray(0)}]',
+                                'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1)}]',
+                                'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2)}]',
+                                'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3)}]',
                                [{/if}]
                                'quantity': 1
                            }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
@ -40,6 +41,6 @@
                });
            [{/strip}]
        [{/capture}]
-        [{oxscript add=$smarty.capture.d3_ga4_view_item_list}]
+        [{oxscript add=$d3_ga4_view_item_list}]
    [{/if}]
 [{/block}]
--- a/Application/views/event/view_search_result.tpl
+++ b/Application/views/event/view_search_result.tpl
@ -1,8 +1,10 @@
+[{$smarty.block.parent}]
+
 [{assign var="gtmProducts" value=$oView->getArticleList()}]

 [{block name="d3_ga4_view_search_result_block"}]
-  [{if $gtmProducts}]
-    [{capture name="d3_ga4_view_search_result"}]
+  [{if $gtmProducts|@count}]
+    [{capture assign=d3_ga4_view_search_result}]
      [{strip}]
        dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
        dataLayer.push({
@ -21,10 +23,10 @@
                '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_category':  '[{$gtmCategory->getSplitCategoryArray(0)}]',
+                'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1)}]',
+                'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2)}]',
+                'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3)}]',
                'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
                [{/if}]
                'quantity': 1
@ -37,8 +39,6 @@
        });
      [{/strip}]
    [{/capture}]
-    [{oxscript add=$smarty.capture.d3_ga4_view_search_result}]
+    [{oxscript add=$d3_ga4_view_search_result}]
  [{/if}]
-[{/block}]
-
-[{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]
+[{/block}]
--- a/Application/views/tpl/page/account/d3gtmnoticelist.tpl
+++ b/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"}]
--- a/Application/views/tpl/page/account/d3gtmrecommendationlist.tpl
+++ b/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"}]
-
--- a/Application/views/tpl/page/account/d3gtmwishlist.tpl
+++ b/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"}]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,35 +4,7 @@ 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.17.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.16.0...1.17.0) - 2024-04-11
-### Added
- multilang translations
- GA4 consent-mode default values
-
-### Changed
- metadataID centralized
-
-## [1.16.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.15.1...1.16.0) - 2024-04-11
-### Added
- ( Google ) Server-Side tagging usability
-
-## [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
+## [2.13.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.12.0...2.13.0) - 2023-09-13
 ### Added
 - extended Docs
 ### Changed
@ -41,22 +13,119 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - 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
+## [2.12.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.11.1...2.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
+## [2.11.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.10.1...2.11.0) - 2023-08-23
 ### Added
- remove_from_cart
- auto debug_mode setter
- manufacturer extension for breadcrumb
+- manufacturer extension
+- working debug_mode
 ### Changed
+- check for 'article has been removed'
 - general template cleanup

+## [2.10.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.10.0...2.10.1) - 2023-08-03
+### Added
+- missing param to identify the event
+
+## [2.10.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.9.2...2.10.0) - 2023-08-02
+### Added
+- new Event "remove_from_cart"
+
+## [2.9.2](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.9.1...2.9.2) - 2023-06-29
+### Fixed
+- wrong variable for category-object check
+
+## [2.9.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.9.0...2.9.1) - 2023-06-27
+### Fixed
+- deny method call on no category
+
+## [2.9.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.8.0...2.9.0) - 2023-06-27
+### Added
+- Cookiefirst usability
+
+## [2.8.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.7.0...2.8.0) - 2023-06-23
+### Added
+- Method to get the in order used Payment-Name
+- Method to get the current Article Category
+- Following Entries to dedicated event-templates
+  - coupon
+  - paymentType
+  - item_list_name
+  - item_category
+### Changed
+- all used template-files have a more dedicated name
+- general code cleanup
+
+## [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.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
--- a/Docs/README.md
+++ b/Docs/README.md
@ -1,6 +1,6 @@
 # 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/
@ -19,7 +19,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 +30,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
@ -88,6 +84,6 @@ Aktivieren Sie anschließend diese Weiche. Setzen Sie den Haken bei "Eigenen Coo
      - 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.
--- a/IntelliSenseHelper.php
+++ b/IntelliSenseHelper.php
@ -20,49 +20,8 @@ namespace D3\GoogleAnalytics4\Modules\Core{
 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 {}
 }
--- a/Modules/Application/Component/Widget/d3GtmWidgetArticleDetails.php
+++ b/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;
-    }
-}
--- a/Modules/Application/Component/d3GtmBasketComponentExtension.php
+++ b/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;
-    }
-}
--- a/Modules/Application/Controller/ArticleDetailsController.php
+++ b/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;
-    }
-}
--- a/Modules/Application/Controller/ArticleListController_AddToCartHelpMethods.php
+++ b/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;
-    }
-}
--- a/Modules/Application/Controller/BasketController.php
+++ b/Modules/Application/Controller/BasketController.php
@ -11,7 +11,7 @@ use oxSystemComponentException;
 class BasketController extends BasketController_parent
 {
    /**
-     * @return string
+     * @throws oxSystemComponentException
     */
    public function render()
    {
@ -33,18 +33,22 @@ class BasketController extends BasketController_parent
        $aProducts = Registry::getRequest()->getRequestEscapedParameter('aproducts');

        // collecting specified item
-        $sProductId = Registry::getRequest()->getRequestEscapedParameter('aid');
+        $sProductId = $sProductId ?? Registry::getRequest()->getRequestEscapedParameter('aid');
        if ($sProductId) {
            // additionally fetching current product info
-            $dAmount = Registry::getRequest()->getRequestEscapedParameter('am');
+            $dAmount = $dAmount ?? Registry::getRequest()->getRequestEscapedParameter('am');

            // select lists
-            $aSel = Registry::getRequest()->getRequestEscapedParameter('sel');
+            $aSel = $aSel ?? Registry::getRequest()->getRequestEscapedParameter('sel');

-            /** @var BasketComponent $oBasketComponent */
-            $oBasketComponent = $this->getComponent('oxcmp_basket');
+            // persistent parameters
+            if (empty($aPersParam)) {

-            $aPersParam = $oBasketComponent->__call('getPersistedParameters', []);
+                /** @var BasketComponent $oBasketComponent */
+                $oBasketComponent = $this->getComponent('oxcmp_basket');
+
+                $aPersParam = $oBasketComponent->__call('getPersistedParameters', []);
+            }

            $sBasketItemId = Registry::getRequest()->getRequestEscapedParameter('bindex');

--- a/Modules/Application/Controller/ThankYouController.php
+++ b/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;
-    }
-}
--- a/Modules/Application/Controller/d3GtmAccountNoticeListController.php
+++ b/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;
-    }
-}
--- a/Modules/Application/Controller/d3GtmAccountRecommlistController.php
+++ b/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;
-    }
-}
--- a/Modules/Application/Controller/d3GtmAccountWishlistController.php
+++ b/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;
-    }
-}
--- a/Modules/Application/Controller/d3GtmManufacturerListController.php
+++ b/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;
-    }
-}
--- a/Modules/Application/Controller/d3GtmSearchController.php
+++ b/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;
-    }
-}
--- a/Modules/Application/Controller/d3GtmStartController.php
+++ b/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;
-    }
-}
--- a/Modules/Application/Model/Basket.php
+++ b/Modules/Application/Model/Basket.php
@ -7,7 +7,7 @@ use OxidEsales\Eshop\Application\Model\Payment;
 class Basket extends Basket_parent
 {
    /**
-     * @return string
+     * @return void
     */
    public function getPaymentOnPaymentId() :string
    {
--- a/Modules/Application/Model/Category.php
+++ b/Modules/Application/Model/Category.php
@ -8,9 +8,9 @@ class Category extends Category_parent
     * @param int $indexOfArray
     * @return string
     */
-    public function getSplitCategoryArray(int $indexOfArray = -1, bool $bShallTakeStd = false) :string
+    public function getSplitCategoryArray(int $indexOfArray = -1) :string
    {
-        if ($bShallTakeStd){
+        if ($indexOfArray > -1){
            $splitCatArray =
                array_values(
                    array_filter(
@ -26,7 +26,7 @@ class Category extends Category_parent
                    )
                );

-            if (($indexOfArray >= 0) and (false === empty($splitCatArray[$indexOfArray]))){
+            if ($splitCatArray[$indexOfArray]){
                return $splitCatArray[$indexOfArray];
            }else{
                return "";
--- a/Modules/Application/Model/Manufacturer.php
+++ b/Modules/Application/Model/Manufacturer.php
@ -8,9 +8,9 @@ class Manufacturer extends Manufacturer_parent
     * @param int $indexOfArray
     * @return string
     */
-    public function getSplitCategoryArray(int $indexOfArray = -1, bool $bShallTakeStd = false) :string
+    public function getSplitCategoryArray(int $indexOfArray = -1) :string
    {
-        if ($bShallTakeStd){
+        if ($indexOfArray > -1){
            $splitCatArray =
                array_values(
                    array_filter(
@ -26,7 +26,7 @@ class Manufacturer extends Manufacturer_parent
                    )
                );

-            if (($indexOfArray >= 0) and (false === empty($splitCatArray[$indexOfArray]))){
+            if ($splitCatArray[$indexOfArray]){
                return $splitCatArray[$indexOfArray];
            }else{
                return "";
--- a/Modules/Core/ViewConfig.php
+++ b/Modules/Core/ViewConfig.php
@ -15,9 +15,13 @@ namespace D3\GoogleAnalytics4\Modules\Core;
 use D3\GoogleAnalytics4\Application\Model\ManagerHandler;
 use D3\GoogleAnalytics4\Application\Model\ManagerTypes;
 use OxidEsales\Eshop\Application\Controller\FrontendController;
-use OxidEsales\Eshop\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;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
+
 class ViewConfig extends ViewConfig_parent
 {

@ -29,7 +33,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;
    }
@ -144,39 +151,30 @@ class ViewConfig extends ViewConfig_parent

    private $blGA4enabled = null;

-
    /**
-     * @return null
+     * @throws ContainerExceptionInterface
+     * @throws NotFoundExceptionInterface
     */
    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;
    }

-    /**
-     * @return bool
-     */
-    public function isGtmConsentModeSetActivated() :bool
-    {
-        return Registry::getConfig()->getConfigParam('d3_gtm_blActivateConsentMode');
-    }
-
-    /**
-     * @return false|string
-     */
    public function getGtmDataLayer()
    {
        if (!$this->getGtmContainerId()) return "[]";

        $oConfig = Registry::getConfig();
        $oView   = $oConfig->getTopActiveView();
-
-        /** @var User|false|null $oUser */
+        /** @var FrontendController $oShop */
        $oUser = $oConfig->getUser();

        $cl         = $this->getTopActiveClassName();
@ -199,45 +197,22 @@ 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);
    }

-    /**
-     * @return bool
-     */
    public function isDebugModeOn() :bool
    {
        return Registry::getConfig()->getConfigParam('d3_gtm_blEnableDebug');
    }

-    /**
-     * @param $listId
-     * @return void
-     */
    public function isPromotionList($listId)
    {
        $oConfig           = Registry::getConfig();
        $aPromotionListIds = $oConfig->getConfigParam("") ?? ['bargainItems', 'newItems', 'topBox', 'alsoBought', 'accessories', 'cross'];
    }
-
-    /**
-     * @return string
-     */
-    public function getServerSidetaggingJsDomain() :string
-    {
-        return Registry::getConfig()->getConfigParam('d3_gtm_settings_serversidetagging_js');
-    }
-
-    /**
-     * @return string
-     */
-    public function getServerSidetaggingNoJsDomain() :string
-    {
-        return Registry::getConfig()->getConfigParam('d3_gtm_settings_serversidetagging_nojs');
-    }
 }
--- a/composer.json
+++ b/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"
+    }
+  }
 }
--- a/metadata.php
+++ b/metadata.php
@ -1,34 +1,11 @@
 <?php

-use D3\GoogleAnalytics4\Application\Model\Constants as Constants;
-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;
@ -36,7 +13,7 @@ use OxidEsales\Eshop\Core\ViewConfig as OEViewConfig;

 $sMetadataVersion = '2.1';
 $aModule          = [
-    'id'          => Constants::OXID_MODULE_ID,
+    'id'          => 'd3googleanalytics4',
    'title'       => 'Google Analytics 4',
    'description' => "Dieses Modul bietet die Möglichkeit in Ihrem OXID eShop (6.x) die neue 'Property' 
                      Google Analytics 4 (GA4) von Google zu integrieren.<br>
@ -49,51 +26,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.17.0',
+    'version'     => '2.13.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,
-    ],
-    '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',
+        OEViewConfig::class => ViewConfig::class,
+        OECategory::class => Category::class,
+        OEManufacturer::class => Manufacturer::class,
+        OEBasket::class => Basket::class,
+        OEBasketController::class => BasketController::class
    ],
+    'templates'   => [],
    'blocks'      => [
        // tag manager js
        [
@ -131,40 +75,28 @@ $aModule          = [
        [
            '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/view_search_result.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',
+            'file'     => '/Application/views/ga4/add_to_cart.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/remove_from_cart.tpl',
            'position' => 150
        ]
    ],
@ -190,13 +122,6 @@ $aModule          = [
            'value'    => false,
            'position' => 999
        ],
-        [
-            'group'    => 'd3_gtm_settings',
-            'name'     => 'd3_gtm_blActivateConsentMode',
-            'type'     => 'bool',
-            'value'    => false,
-            'position' => 999
-        ],
        [
            'group'    => 'd3_gtm_settings_cookiemanager',
            'name'     => 'd3_gtm_settings_hasOwnCookieManager',
@ -218,18 +143,5 @@ $aModule          = [
            'value' => 'none',
            'constraints' => 'NONE|CONSENTMANAGER|USERCENTRICS|COOKIEFIRST|COOKIEBOT',
        ],
-        // OST929760 - Erweiterung für Serverside Tagging
-        [
-            'group' => 'd3_gtm_settings_serversidetagging',
-            'name' => 'd3_gtm_settings_serversidetagging_js',
-            'type'     => 'str',
-            'value'    => 'https://www.googletagmanager.com/gtm.js',
-        ],
-        [
-            'group' => 'd3_gtm_settings_serversidetagging',
-            'name' => 'd3_gtm_settings_serversidetagging_nojs',
-            'type'     => 'str',
-            'value'    => 'https://www.googletagmanager.com/ns.html',
-        ],
    ]
 ];
--- a/phpstan.neon
+++ b/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#'
Auteur	SHA1	Bericht	Datum
MaxBUhe	19553fcee2	bump metadata and readme	2023-09-13 16:00:12 +02:00
MaxBUhe	bb513e6ded	adjust set-param check	2023-09-13 15:13:35 +02:00
MaxBUhe	36b3aa9ef2	switch param-name	2023-09-13 15:08:58 +02:00
MaxBUhe	ef4e4625cd	switch name of control-parameter; switch consentmanager-script-adjustments	2023-09-13 14:56:05 +02:00
MaxBUhe	84a9aba764	adjust Doku with further infos new cookieid -> Control parameter	2023-09-13 14:42:12 +02:00
MaxBUhe	7d12dd68a7	bump metadata && changelog	2023-09-07 15:11:04 +02:00
MaxBUhe	565f47b1ff	add cookiebot essentials	2023-09-07 15:08:06 +02:00
MaxBUhe	7c6b0215a5	bump metadata && changelog	2023-08-23 17:16:58 +02:00
MarkusGaertner	84e3895db8	extend Manufacturer	2023-08-23 17:12:18 +02:00
MaxBUhe	1e479503a7	[changed] 'an article has been removed from basket'-check	2023-08-23 17:09:49 +02:00
MaxBUhe	9e7b4653ea	add deug_mode switch	2023-08-16 10:44:50 +02:00
MaxBUhe	7b1241ab97	correct naming in view_search_result	2023-08-16 09:38:03 +02:00
MaxBUhe	0f15df8364	[working-state] rebuilding meta structure	2023-08-03 15:55:07 +02:00
MaxBUhe	71b743ddcc	bump changelog && version to 2.10.1	2023-08-03 15:10:38 +02:00
MaxBUhe	c0206f741f	add missing param to check if isRemoveFromCart	2023-08-03 15:09:12 +02:00
MaxBUhe	22bec30621	add remove_from_cart	2023-08-03 14:57:26 +02:00
MaxBUhe	49bfd5be09	bump changelog && version to 2.10.0	2023-08-02 11:55:28 +02:00
MaxBUhe	6002540268	bump changelog && version to 2.9.2	2023-06-29 08:33:07 +02:00
MaxBUhe	cc89303595	[fix-bug] wrong category method used for check	2023-06-29 08:31:57 +02:00
MaxBUhe	7062d935f4	bump changelog && metadata to 2.9.1	2023-06-27 12:16:43 +02:00
MaxBUhe	9f1deab099	[bug-fix] non-category having articles throw exception deny method-call on no category	2023-06-27 12:15:21 +02:00
MaxBUhe	2cc0368633	bump version and changelog to 2.9.0	2023-06-27 09:53:00 +02:00
MaxBUhe	b0a1c20419	add missing cmp-entry in cmp-list	2023-06-27 08:58:05 +02:00
MaxBUhe	54fcbf88c9	add cookiefirst necessary script-attributes	2023-06-27 08:46:51 +02:00
MaxBUhe	0ae67c823b	add metadata cookiefirst entry plus multilang-usability	2023-06-27 08:46:39 +02:00
MaxBUhe	ab4232fb4a	add cookiefirst to manager-list	2023-06-27 08:33:49 +02:00
MaxBUhe	0ec765955e	bump version && changelog to 2.8.0	2023-06-23 15:15:42 +02:00
MaxBUhe	d505d8530a	rm unnecessary code	2023-06-23 15:08:09 +02:00
MaxBUhe	fd79710158	add coupon to view_cart	2023-06-22 10:43:50 +02:00
MaxBUhe	d2ef663dd3	add paymentType to puchase-event extend Basket-Model to add method to get payment-desc	2023-06-22 10:37:40 +02:00
MaxBUhe	fec30b1109	add coupon to puchase-event	2023-06-22 09:57:30 +02:00
MaxBUhe	5c53d83f32	[finished] item_category added to purchase-Event	2023-06-22 09:39:03 +02:00
MaxBUhe	8a7c25fad9	[working state] add method for article category steps change naming of vars Not working yet: getting of category-steps	2023-06-21 15:58:46 +02:00
MaxBUhe	429069e0cf	fix wrong var usage	2023-06-21 15:56:58 +02:00
MaxBUhe	50f9fbca23	renaming vars on puchase-tpl	2023-06-21 15:47:06 +02:00
MaxBUhe	cb18feba82	add missing item_list_name	2023-06-21 15:45:12 +02:00
MaxBUhe	47b8622018	implementing Category->getSplitCategoryArray() method for category-step	2023-06-21 15:43:43 +02:00
MaxBUhe	92a91d0194	implementing Category->getSplitCategoryArray() method for category-step	2023-06-21 15:33:38 +02:00
MaxBUhe	226a80f138	implementing Category->getSplitCategoryArray() method for category-step	2023-06-21 15:29:27 +02:00
MaxBUhe	5dd7b51fb5	adjust view_cart; extend Model\Category add categories to ecommerce-DataLayer; add method to immediately get the requested Category-Steps	2023-06-21 15:23:50 +02:00
MaxBUhe	7b82476e8b	adjust view_item add categories to ecommerce-DataLayer	2023-06-21 14:24:47 +02:00
MaxBUhe	bfc2ca8ad6	adjust view_item_list add categories to ecommerce-DataLayer	2023-06-21 14:19:48 +02:00
MaxBUhe	e48b21022c	bump version && changelog to 2.7.0	2023-06-19 15:17:43 +02:00
MaxBUhe	b4bf91660e	[rework] change structure of GA-event moving the procedere into one step so there's not an accidental triggering of an GA-Push-Event which at the end overwrites the View-Item-Push-Event in the cmpEvent	2023-06-19 14:57:12 +02:00
MaxBUhe	3d62993dfc	add missing consentmanager readme entry	2023-06-01 14:19:29 +02:00
MaxBUhe	679a49823c	add missing changelog 1.x changes	2023-05-31 14:33:49 +02:00
MaxBUhe	106fea9c91	fix explicit manager bug bug would make script apply anyway, even if no manager is found	2023-05-31 14:29:46 +02:00
MaxBUhe	13132e6da0	Merge branch 'rel_2_prep_porting_rel_1.x' of git.d3data.de:D3Public/GoogleAnalytics4 into rel_2_prep_porting_rel_1.x	2023-05-31 13:42:54 +02:00
MaxBUhe	5c478124bc	bump version && changelog to 2.6.0	2023-05-31 13:40:51 +02:00
MaxBUhe	12613357b3	bump version && changelog to 2.6.0	2023-05-31 13:38:32 +02:00
MaxBUhe	95e0cab68c	rework 'Manager Type Handling'; add ManagerHandler + ManagerTypes	2023-05-31 12:17:00 +02:00
MaxBUhe	1d194d445a	rm unnecessary check	2023-05-31 12:16:10 +02:00
MaxBUhe	bf3fee5ce5	add missing article-getter	2023-05-31 10:35:18 +02:00
MaxBUhe	3c280a3adb	adjust readme and switch used block-extension	2023-05-31 10:34:34 +02:00
MaxBUhe	6217524828	adjusted usercentrics script	2023-05-31 10:34:24 +02:00
MaxBUhe	5ef600ff2a	added position to block-extension	2023-05-31 10:34:14 +02:00
MaxBUhe	a40d922f42	[working-state] restructuring usercentricts & consentmanager decision consentmanager decision is working so far; next step is implementing usercentricts	2023-05-31 10:33:59 +02:00
MaxBUhe	dae5f66f81	add usercentrics chosable settings-value; add additional methods; add new multilang-idents	2023-05-31 10:33:43 +02:00
MaxBUhe	347e551194	merge rel_1.x changelog	2023-05-23 11:49:09 +02:00
MaxBUhe	000c49c56b	bump version && changelog to 2.5.0	2023-05-23 11:32:20 +02:00
MaxBUhe	002cc69d2a	switch metadata entries; fix getPrice-bug	2023-05-23 10:06:21 +02:00
MaxBUhe	af78809ae5	add settings-entry; add consentmanager-option	2023-05-15 15:06:25 +02:00
MaxBUhe	d531ba648b	fix unnecessary convert of int to str	2023-05-12 14:08:52 +02:00
MaxBUhe	a0c650fca3	Merge branch 'rel_2.x'	2023-05-11 15:26:45 +02:00
MaxBUhe	af341a984b	Merge branch 'rel_1.x' # Conflicts: # CHANGELOG.md # metadata.php	2023-05-11 15:26:31 +02:00
MaxBUhe	122dd4cf53	genuine code cleanup; switch hard-getter to methods and use price-object	2023-05-10 15:01:56 +02:00
MaxBUhe	27798703b0	bump version && changelog to 2.4.0	2023-05-02 14:36:52 +02:00
Christoph Staeblein	8eb734be8a	OXID UserCentrics support, general overhaul for cookie managers	2023-05-02 14:28:47 +02:00
MaxBUhe	616f31ecba	Merge remote-tracking branch 'remotes/origin/rel_2.x'	2023-03-20 15:46:58 +01:00
MaxBUhe	527eec1355	bump changelog	2023-03-20 11:01:03 +01:00
MaxBUhe	1966d3008e	Merge remote-tracking branch 'remotes/origin/rel_2.x_custB' into rel_2.x	2023-03-20 10:56:29 +01:00
MaxBUhe	bd51b37159	hot-fix: add missing view_item file; add metadata entry	2023-03-20 09:49:49 +01:00
MaxBuhe01	718b60e12c	Merge remote-tracking branch 'remotes/origin/rel_2.x'	2023-03-17 15:31:34 +01:00
MaxBuhe01	d4df87bfff	Merge remote-tracking branch 'remotes/origin/rel_1.x' into rel_2.x	2023-03-17 15:30:03 +01:00
MaxBUhe	63007e9b02	bump version	2023-03-10 11:25:12 +01:00
MaxBUhe	5fe656988c	genuine cleaning off of unnecessary files (prevent confusion)	2023-03-10 11:22:49 +01:00
MaxBUhe	9cb3a54824	Merge remote-tracking branch 'remotes/origin/rel_2.x'	2023-02-22 14:35:22 +01:00
MaxBUhe	2f6fd8a31c	bump version	2023-02-22 14:31:28 +01:00
MaxBUhe	8f9ed021d6	bump version	2023-02-22 14:07:14 +01:00
MaxBUhe	0ef3d3373a	Merge remote-tracking branch 'remotes/origin/dev/view_cart/illegal_character_U+20AC' into rel_2.x	2023-02-22 14:05:56 +01:00
MaxBUhe	fd2b4a5bbe	add special price formatting	2023-02-22 13:46:27 +01:00
MaxBuhe01	1c0d55bdc3	Merge remote-tracking branch 'remotes/origin/rel_2.x'	2023-02-21 12:47:38 +01:00
MaxBuhe01	7c1f99e678	Merge remote-tracking branch 'remotes/origin/rel_2.x'	2023-02-21 12:47:02 +01:00
MaxBUhe	126e746651	missing changelog-entry	2023-02-21 12:46:34 +01:00
MaxBuhe01	1c45a16356	bump version	2023-02-21 12:27:52 +01:00
MaxBUhe	1589f202a9	add own cookie-check method; rm unnecessary help-text	2023-02-21 12:09:04 +01:00
MaxBUhe	55bd7b7fb4	adjust module_options meta-docs	2023-02-01 14:27:49 +01:00
MaxBUhe	3c1e6a11ff	bump version	2023-01-27 13:47:13 +01:00
MaxBUhe	9ac78a0d43	OST:#573111 fix bug - missing use	2023-01-27 13:43:29 +01:00
MaxBUhe	e2bcb34051	bump version	2023-01-27 11:11:09 +01:00
MaxBUhe	4ea0c19d7b	Merge remote-tracking branch 'remotes/origin/rel_1.x' into rel_2.x	2023-01-27 11:04:23 +01:00
MaxBUhe	56740f1f10	rm unnecessary method call in gtm_js.tpl	2023-01-27 09:19:05 +01:00
MaxBUhe	daed30a585	rm unnecessary entries in metadata	2023-01-27 09:07:22 +01:00
MaxBUhe	48d411ac3f	switch head-meta-infos	2023-01-27 09:07:09 +01:00
MaxBUhe	b530366cb8	rm unnecessary lang file	2023-01-27 09:06:49 +01:00
MaxBUhe	975d07056a	cleaning off branding	2023-01-27 08:59:06 +01:00
MaxBUhe	24bf113d30	switch comment in changelog of 2.0	2023-01-26 09:20:56 +01:00
MaxBUhe	ca6a810fa3	add 1.0 section to changelog	2023-01-26 09:16:51 +01:00
MaxBUhe	62b382eadf	adding tech-docs; rm unnecessary sections in readme; fixing wrong links	2023-01-26 09:15:10 +01:00
MaxBUhe	45d8e45137	fix missing entries in changelog	2023-01-25 10:58:24 +01:00
MaxBUhe	70f2308575	extend changelog and readme	2023-01-25 10:48:02 +01:00
MaxBUhe	6eb15ec080	add block description	2023-01-20 14:31:39 +01:00
MaxBUhe	d722c46a74	bump metadata-version	2023-01-20 11:26:09 +01:00
MaxBUhe	d847a34e99	set compatibility to oxid 6.5 and above	2023-01-20 11:24:30 +01:00
MaxBUhe	7b55d1d57c	adjust requirements	2023-01-20 11:18:48 +01:00
MaxBUhe	a25be1069c	rework code to actually fit 6.0.x && 6.1x	2023-01-20 11:18:17 +01:00
MaxBUhe	5200232a32	Merge remote-tracking branch 'remotes/origin/rel_1.x' into dev_1.x_OXID_6.3	2023-01-20 11:11:17 +01:00
MaxBUhe	bcd785774b	adjusting composer.json to fit corresponding shop-version	2022-12-22 08:56:45 +01:00
MaxBUhe	5ba613df30	add currency to the params	2022-12-21 11:12:35 +01:00
MaxBUhe	a1dc0a6a58	fix bug that'd fail in wave and fail iIndex	2022-12-09 14:51:45 +01:00