bump version

Merge remote-tracking branch 'remotes/origin/rel_1.x' into rel_2.x
rm unnecessary method call in gtm_js.tpl
2023-01-27 11:11:09 +01:00 · 2023-01-27 11:04:23 +01:00 · 2023-01-27 09:19:05 +01:00 · 2023-01-27 09:07:22 +01:00 · 2023-01-27 09:07:09 +01:00 · 2023-01-27 09:06:49 +01:00
76 changed files with 651 additions and 1820 deletions
--- 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/Model/ManagerHandler.php
+++ b/Application/Model/ManagerHandler.php
@ -1,53 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Application\Model;
-
-use OxidEsales\Eshop\Core\Registry;
-use OxidEsales\Eshop\Core\ViewConfig;
-
-class ManagerHandler
-{
-    /**
-     * @return string
-     */
-    public function getCurrManager() :string
-    {
-        /** @var ManagerTypes $oManagerTypes */
-        $oManagerTypes = oxNew(ManagerTypes::class);
-
-        /** @var ViewConfig $oViewConfig */
-        $oViewConfig = oxNew(ViewConfig::class);
-
-        $aManagerList =  $oManagerTypes->getManagerList();
-
-        foreach ($aManagerList as $managerName){
-           if ($oViewConfig->isModuleActive($managerName)){
-               return $managerName;
-           }
-        }
-
-       return $this->getExplicitManager();
-    }
-
-    /**
-     * @return string
-     */
-    public function getModuleSettingExplicitManagerSelectValue() :string
-    {
-        return Registry::getConfig()->getConfigParam('d3_gtm_settings_HAS_STD_MANAGER');
-    }
-
-    /**
-     * @return string
-     */
-    public function getExplicitManager() :string
-    {
-        $sPotentialManagerName = $this->getModuleSettingExplicitManagerSelectValue();
-
-        /** @var ManagerTypes $oManagerTypes */
-        $oManagerTypes = oxNew(ManagerTypes::class);
-        return $oManagerTypes->isManagerInList($sPotentialManagerName)
-            ? $sPotentialManagerName
-            : "NONE";
-    }
-}
--- a/Application/Model/ManagerTypes.php
+++ b/Application/Model/ManagerTypes.php
@ -1,66 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Application\Model;
-
-class ManagerTypes
-{
-    #ToDo: make own classes for each of the manager
-
-
-    const EXTERNAL_SERVICE          = "externalService";
-    const NET_COOKIE_MANAGER        = "net_cookie_manager";
-
-    /**
-     * Further information's:
-     * https://github.com/aggrosoft/oxid-cookie-compliance
-     */
-    const AGCOOKIECOMPLIANCE        = "agcookiecompliance";
-
-    /**
-     * Used the OXID Module.
-     *
-     * Further information's:
-     * https://docs.oxid-esales.com/modules/usercentrics/de/latest/einfuehrung.html
-     *
-     * Usercentrics homepage:
-     * https://usercentrics.com
-     */
-    const USERCENTRICS_MODULE       = "oxps_usercentrics";
-
-    /**
-     * manually included usercentrics script
-     */
-    const USERCENTRICS_MANUALLY     = "USERCENTRICS";
-
-    const CONSENTMANAGER            = "CONSENTMANAGER";
-
-    const COOKIEFIRST               = "COOKIEFIRST";
-
-    const COOKIEBOT               = "COOKIEBOT";
-
-    /**
-     * @return array
-     */
-    public function getManagerList(): array
-    {
-        return [
-            "externalService"       => self::EXTERNAL_SERVICE,
-            "agcookiecompliance"    => self::AGCOOKIECOMPLIANCE,
-            "net_cookie_manager"    => self::NET_COOKIE_MANAGER,
-            "oxps_usercentrics"     => self::USERCENTRICS_MODULE,
-            "usercentrics"          => self::USERCENTRICS_MANUALLY,
-            "consentmanager"        => self::CONSENTMANAGER,
-            "cookiefirst"           => self::COOKIEFIRST,
-            "cookiebot"             => self::COOKIEBOT,
-        ];
-    }
-
-    /**
-     * @param string $sManager
-     * @return bool
-     */
-    public function isManagerInList(string $sManager) :bool
-    {
-        return in_array($sManager, $this->getManagerList(), true);
-    }
-}
--- a/Application/views/admin/de/module_options.php
+++ b/Application/views/admin/de/module_options.php
@ -1,13 +1,16 @@
 <?php
+
 /**
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * https://www.d3data.de
+ * This Software is the property of Data Development and is protected
+ * by copyright law - it is NOT Freeware.
+ * Any unauthorized use of this software without a valid license
+ * is a violation of the license agreement and will be prosecuted by
+ * civil and criminal law.
+ * http://www.shopmodule.com
 *
 * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Daniel Seifert <info@shopmodule.com>
- * @link      https://www.oxidmodule.com
+ * @author        D3 Data Development - Daniel Seifert <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
 */

 $style = '<style type="text/css">
@ -27,78 +30,17 @@ $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>
-                                                                        <a href="https://consentmanager.net/">Consentmanager</a><br>
-                                                                        <a href="https://usercentrics.com/">Usercentrics</a><br>
-                                                                        <a href="https://cookiefirst.com">Cookiefirst</a><br>
-                                                                        <hr>
-                                                                        Bei weiteren Fragen stehen wir gern zur Verfügung! Kontaktieren Sie uns einfach unter <a href="https://www.d3data.de/">https://www.d3data.de/</a>',
-    'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER'                   => 'Nutzen Sie eine der folgenden Einbindungen?<br>
-                                                                        Dann wählen Sie bitte die zutreffende aus.',
-    'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER_NONE'              => '---',
-    'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER_CONSENTMANAGER'    => 'consentmanager',
-    'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER_USERCENTRICS'      => 'usercentrics',
-    'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER_COOKIEFIRST'       => 'cookiefirst',
-    'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER_COOKIEBOT'         => 'Cookiebot',
-    'SHOP_MODULE_d3_gtm_settings_controlParameter'        => 'Steuerungsparameter',
-    'HELP_SHOP_MODULE_d3_gtm_settings_controlParameter'   => 'Nähere infos zum <a target="_blank" href="https://git.d3data.de/D3Public/GoogleAnalytics4/src/branch/master/Docs">"<strong>Steuerungsparameter</strong>"</a><hr>
-                                                        <strong>Beachte:</strong><br>
-                                                        Sofern Sie die <a target="_blank" href="https://consentmanager.net" style="color: blue">consentmanager</a> CMP verwenden,
-                                                        bitte ich Sie, gründlichst, die Hinweise der <a target="_blank" href="https://git.d3data.de/D3Public/GoogleAnalytics4/src/branch/master/Docs/CMP/consentmanager.md">Moduldokumentation/Consentmanager</a> zu lesen.
-                                                        ',
-    'SHOP_MODULE_d3_gtm_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>',
+    'SHOP_MODULE_d3_gtm_settings_hasOwnCookieManager'   => 'Eigenen Cookie Manager nutzen?
+                                                            <strong style="color: red">Hinweis (Fragezeichen) lesen!</strong>',
+    'HELP_SHOP_MODULE_d3_gtm_settings_hasOwnCookieManager'   => 'Stellen Sie sicher, dass Sie ein Modul installiert haben,
+    dass die Methode "blAcceptedCookie" implementiert.<br> Sollten Sie sich nicht sicher sein kontaktieren Sie Ihren
+    technischen Ansprechpartner.<br><br>
+    
+    <strong>Wichtig!</strong> Das Aktivieren dieser Checkbox kann <u>ohne dem nötigen technischen Wissen</u> den Shop-Ablauf im Frontend stören!<hr>
+    Die Checkbox muss nicht aktiviert werden, sofern die Cookies beispielsweise direkt via Google Cookie-Banner integriert werden.
+    Bei Fragen <u>kontaktieren Sie bitte</u> auch hier einen entsprechenden technischen Ansprechpartner.',
+    'SHOP_MODULE_d3_gtm_settings_cookieName'            => 'Cookie-Name',
 ];
--- a/Application/views/blocks/_gtm_js.tpl
+++ b/Application/views/blocks/_gtm_js.tpl
@ -1,44 +1,59 @@
-[{* Always prepare the data layer to avoid errors *}]
-<script>
-  var dataLayer = [{$oViewConf->getGtmDataLayer()}] || [];
-</script>
+[{assign var="d3VtConfigObject" value=$oViewConf->getConfig()}]
+[{if $d3VtConfigObject->getConfigParam('d3_gtm_settings_hasOwnCookieManager')}]
+    [{if $oViewConf->blAcceptedCookie($d3VtConfigObject->getConfigParam('d3_gtm_settings_cookieName'))}]

-[{assign var="d3GtmContainerIdString" value=$oViewConf->getGtmContainerId()}]
+        [{if $oViewConf->getGtmContainerId()}][{strip}]
+        <!-- Google Tag Manager -->
+        <script>
+          var dataLayer = [{$oViewConf->getGtmDataLayer()}] || [];
+          (function (w, d, s, l, i) {
+            w[l] = w[l] || [];
+            w[l].push({'gtm.start': new Date().getTime(), event: 'gtm.js'});
+            var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
+            j.async = true;
+            j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
+            f.parentNode.insertBefore(j, f);
+          })(window, document, 'script', 'dataLayer', '[{$oViewConf->getGtmContainerId()}]');
+        </script>
+        <!-- End Google Tag Manager -->
+        [{if $oViewConf->getTopActionClassName() === "alist" }]
+        [{* include file="ga4_view_item_list.tpl" gtmCategory=$oView->getActiveCategory() gtmProducts=$oView->getArticleList() listtype=$oView->getListType() *}]
+        [{elseif $oViewConf->getTopActionClassName() === "details" }]
+        [{* include file="ga4_view_item.tpl" gtmProduct=$oView->getProduct() *}]
+        [{elseif $oViewConf->getTopActionClassName() === "search" }]
+        [{elseif $oViewConf->getTopActionClassName() === "basket" }]

-[{if $oViewConf->D3blShowGtmScript()}]
-    [{if $d3GtmContainerIdString}]
-        [{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) {
-                w[l] = w[l] || [];
-                w[l].push({'gtm.start': new Date().getTime(), event: 'gtm.js'});
-                var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
-                j.async = true;
-                j.src = '[{$oViewConf->getServerSidetaggingJsDomain()}]?id=' + i + dl;
-                f.parentNode.insertBefore(j, f);
-              })(window, document, 'script', 'dataLayer', '[{$d3GtmContainerIdString}]');
-            </script>
-            <!-- End Google Tag Manager -->
-        [{/strip}]
+        [{/if}]
+        [{/strip}][{/if}]
+    [{else}]
+    <script>
+      var dataLayer = [{$oViewConf->getGtmDataLayer()}] || [];
+    </script>
    [{/if}]
+[{else}]
+    [{if $oViewConf->getGtmContainerId()}][{strip}]
+    <!-- Google Tag Manager -->
+    <script>
+      var dataLayer = [{$oViewConf->getGtmDataLayer()}] || [];
+      (function (w, d, s, l, i) {
+        w[l] = w[l] || [];
+        w[l].push({'gtm.start': new Date().getTime(), event: 'gtm.js'});
+        var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
+        j.async = true;
+        j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
+        f.parentNode.insertBefore(j, f);
+      })(window, document, 'script', 'dataLayer', '[{$oViewConf->getGtmContainerId()}]');
+    </script>
+    <!-- End Google Tag Manager -->
+    [{if $oViewConf->getTopActionClassName() === "alist" }]
+    [{* include file="ga4_view_item_list.tpl" gtmCategory=$oView->getActiveCategory() gtmProducts=$oView->getArticleList() listtype=$oView->getListType() *}]
+    [{elseif $oViewConf->getTopActionClassName() === "details" }]
+    [{* include file="ga4_view_item.tpl" gtmProduct=$oView->getProduct() *}]
+    [{elseif $oViewConf->getTopActionClassName() === "search" }]
+    [{elseif $oViewConf->getTopActionClassName() === "basket" }]
+
+    [{/if}]
+    [{/strip}][{/if}]
 [{/if}]

-[{$smarty.block.parent}]
+[{$smarty.block.parent}]
--- a/Application/views/blocks/_gtm_nojs.tpl
+++ b/Application/views/blocks/_gtm_nojs.tpl
@ -1,12 +1,8 @@
-[{if $oViewConf->D3blShowGtmScript()}]
-    [{if $oViewConf->getGtmContainerId()}][{strip}]
+[{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) -->
-    [{/strip}][{/if}]
-    [{/if}]
-
+    <!-- End Google Tag Manager (noscript) -->[{/strip}][{/if}]
 [{$smarty.block.parent}]
--- a/Application/views/blocks/_impression.tpl
+++ b/Application/views/blocks/_impression.tpl
@ -0,0 +1,66 @@
+[{$smarty.block.parent}]
+[{*
+[{strip}]
+    [{assign var="gtmProduct" value=$oView->getProduct()}]
+    [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
+    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+
+    [{if !$head }]
+        [{assign var=$head value=$oView->getViewParameter('head')}]
+    [{/if}]
+    <script>
+        var gtmItem = {
+            'id': '[{$gtmProduct->oxarticles__oxartnum->value}]',
+            'item_id': '[{$gtmProduct->oxarticles__oxartnum->value}]',
+
+            'name': '[{$gtmProduct->oxarticles__oxtitle->value}]',
+            'item_name': '[{$gtmProduct->oxarticles__oxtitle->value}]',
+
+            'variant': '[{if $gtmProduct->oxarticles__oxvarselect->value}][{$gtmProduct->oxarticles__oxvarselect->value}][{/if}]',
+            'item_variant': '[{if $gtmProduct->oxarticles__oxvarselect->value}][{$gtmProduct->oxarticles__oxvarselect->value}][{/if}]',
+
+            'brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+            'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+
+            'price': [{$gtmProduct->oxarticles__oxprice->value}],
+
+            'category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]no category[{/if}]',
+            'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]no category[{/if}]',
+
+            [{if $listId == 'productList' || $listId == 'categoryList'}]
+                /* category list */
+                'list': '[{$listId}]',
+                'item_list_id': '[{$listId}]',
+                'item_list_name': '[{$head}]',
+            [{elseif $listId}]
+                /* category list */
+                'list': '[{$listId}]',
+                'promotion_id': '[{$listId}]',
+                'promotion_name': '[{$head}]',
+            [{/if}]
+            'position': [{$iIndex}],
+            'index': [{$iIndex}],
+            'quantity': '1'
+        };
+        /* UA */
+        dataLayer.push({ ecommerce: null });
+        dataLayer.push({
+            'event': 'UA_event',
+            'event_name': 'Impression',
+            'ecommerce': {
+                'currencyCode': '[{$currency->name}]',
+                'impressions': [gtmItem]
+            }
+        });
+        /* GA4 */
+        dataLayer.push({ ecommerce: null });
+        dataLayer.push({
+            'event': 'GA4_event',
+            'event_name': 'view_item_list',
+            'ecommerce': {
+                'items': [gtmItem]
+            }
+        });
+    </script>
+[{/strip}]
+*}]
--- a/Application/views/blocks/add_to_cart.tpl
+++ b/Application/views/blocks/add_to_cart.tpl
@ -0,0 +1,5 @@
+[{if $oxcmp_basket->isNewItemAdded() && $smarty.session._newitem}]
+    <!-- [{$smarty.session._newitem|@var_dump}] -->
+    [{* include file="ga4_add_to_cart.tpl" gtmProduct=$smarty.session._newitem *}]
+[{/if}]
+[{$smarty.block.parent}]
--- a/Application/views/blocks/checkout_s1.tpl
+++ b/Application/views/blocks/checkout_s1.tpl
@ -0,0 +1,31 @@
+[{$smarty.block.parent}]
+
+[{*$oxcmp_basket|get_class_methods|dumpvar*}]
+
+[{assign var='gtmCartArticles' value=$oView->getBasketArticles()}]
+[{strip}][{capture assign=d3_ga4_view_cart}]
+    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+    dataLayer.push({
+        'event': 'view_cart',
+        'eventLabel':'Checkout Step 1',
+        'ecommerce': {
+            'actionField': "step: 1",
+            'currency': "[{$currency->name}]",
+            'value': [{oxprice price=$oxcmp_basket->getPrice()}],
+            'items': [
+                [{foreach from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents  key=basketindex}]
+                [{assign var='_price' value=$basketitem->getUnitPrice()}]
+                {
+                    'item_id': '[{$gtmCartArticles[$basketindex]->oxarticles__oxartnum->value}]',
+                    'item_name': '[{$gtmCartArticles[$basketindex]->oxarticles__oxtitle->value}]',
+                    'item_variant': '[{$gtmCartArticles[$basketindex]->oxarticles__oxvarselect->value}]',
+                    'price': [{$_price->getPrice()}],
+                    'quantity':[{$basketitem->getAmount()}],
+                    'position':[{$smarty.foreach.gtmCartContents.index}]
+                }[{if !$smarty.foreach.gtmCartContents.last}],[{/if}]
+                [{/foreach}]
+                ]
+        }
+    });
+[{/capture}][{/strip}]
+[{oxscript add=$d3_ga4_view_cart}]
--- a/Application/views/blocks/checkout_s2.tpl
+++ b/Application/views/blocks/checkout_s2.tpl
@ -0,0 +1,18 @@
+[{strip}]
+<script>
+    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+    dataLayer.push({
+        'event':'ee.checkout',
+        'eventLabel':'Checkout Step 2',
+        'ecommerce': {
+            'checkout': {
+                'actionField': {
+                    'step': 2,
+                    'option':'[{oxmultilang ident="vt_GTM_EE_LOGINOPTION"|cat:$oView->getLoginOption()}]'
+                }
+            }
+        }
+    });
+</script>
+[{/strip}]
+[{$smarty.block.parent}]
--- a/Application/views/blocks/checkout_s3.tpl
+++ b/Application/views/blocks/checkout_s3.tpl
@ -0,0 +1,9 @@
+<script>
+    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+    dataLayer.push({
+        'event': 'ee.checkout',
+        'eventLabel': 'Checkout Step 3',
+        'ecommerce': {'checkout': {'actionField': {'step': 3}}}
+    });
+</script>
+[{$smarty.block.parent}]
--- a/Application/views/blocks/checkout_s4.tpl
+++ b/Application/views/blocks/checkout_s4.tpl
@ -0,0 +1,9 @@
+<script>
+    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+    dataLayer.push({
+        "event": "ee.checkout",
+        'eventLabel': 'Checkou Step 4',
+        "ecommerce": {"checkout": {"actionField": {"step": 4}}}
+    });
+</script>
+[{$smarty.block.parent}]
--- a/Application/views/blocks/checkout_s5.tpl
+++ b/Application/views/blocks/checkout_s5.tpl
@ -0,0 +1,35 @@
+[{$smarty.block.parent}]
+
+[{strip}]
+<script>
+    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+    [{assign var="_gtmOrder" value=$oView->getOrder()}]
+    [{assign var="_gtmArticles" value=$_gtmOrder->getOrderArticles()}]
+    
+    dataLayer.push({
+        'event': 'purchase',
+        'eventLabel':'Checkout Step 5',
+        'ecommerce': {
+          'transaction_id': '[{$_gtmOrder->oxorder__oxordernr->value}]',
+          'affiliation':    '[{$oxcmp_shop->oxshops__oxname->value}]',
+          'value':          '[{$_gtmOrder->oxorder__oxtotalordersum->value}]',
+          'tax':            '[{math equation="x+y" x=$_gtmOrder->oxorder__oxartvatprice1->value y=$_gtmOrder->oxorder__oxartvatprice2->value }]',
+          'shipping':       '[{$_gtmOrder->oxorder__oxdelcost->value}]',
+          'currency':       '[{$_gtmOrder->getFieldData('oxcurrency')}]',
+          'items':
+              [
+                [{foreach from=$_gtmArticles item="_gtmArticle" name="gtmArticles"}]
+                {
+                    'id':       '[{$_gtmArticle->oxorderarticles__oxartnum->value}]',
+                    'name':     '[{$_gtmArticle->oxorderarticles__oxtitle->value}]',
+                    'variant':  '[{$_gtmArticle->oxorderarticles__oxselvariant->value}]',
+                    'price':    [{$_gtmArticle->oxorderarticles__oxprice->value}],
+                    'quantity': [{$_gtmArticle->oxorderarticles__oxamount->value}],
+                    'position': [{$smarty.foreach.gtmArticles.iteration}]
+                }[{if !$smarty.foreach.gtmArticles.last}],[{/if}]
+                [{/foreach}]
+              ]
+        }
+    })
+</script>
+[{/strip}]
--- a/Application/views/blocks/detail.tpl
+++ b/Application/views/blocks/detail.tpl
@ -0,0 +1,25 @@
+[{$smarty.block.parent}]
+[{assign var="gtmProduct" value=$oView->getProduct()}]
+[{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
+[{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+
+<script>
+    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+    dataLayer.push({
+        'event': 'view_item',
+        'eventLabel':'Product View',
+        'ecommerce': {
+            'currency': '[{$currency->name}]',
+            'items': [
+                {
+                    'item_name': '[{$gtmProduct->oxarticles__oxtitle->value}]',
+                    'item_id': '[{$gtmProduct->oxarticles__oxartnum->value}]',
+                    'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+                    'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
+                    'item_variant': '[{if $gtmProduct->oxarticles__oxvarselect->value}][{$gtmProduct->oxarticles__oxvarselect->value}][{/if}]',
+                    'price': [{$gtmProduct->oxarticles__oxprice->value}]
+                }
+            ]
+        }
+    });
+</script>
--- 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 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/purchase.tpl"}]
--- 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 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/view_cart.tpl"}]
--- a/Application/views/blocks/view_item.tpl
+++ b/Application/views/blocks/view_item.tpl
@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/view_item.tpl"}]
--- 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/blocks/widget_product_list.tpl
+++ b/Application/views/blocks/widget_product_list.tpl
@ -0,0 +1,37 @@
+[{$smarty.block.parent}]
+[{assign var="gtmProduct" value=$oView->getProduct()}]
+[{if $gtmProduct}]
+    [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
+    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+    <script>
+      dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+      dataLayer.push({
+        'event': 'ee.impression',
+        'eventLabel':'Impression',
+        'ecommerce': {
+          'currencyCode': '[{$currency->name}]',
+          'impressions': [
+            {
+              'name': '[{$gtmProduct->getFieldData('oxtitle')}]',
+              'id': '[{$gtmProduct->getFieldData('oxartnum')}]',
+              'price': [{$gtmProduct->getFieldData('oxprice')}],
+              'brand': '[{if $gtmManufacturer}][{$gtmManufacturer->getFieldData('oxtitle')}][{/if}]',
+              'category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
+              'variant': '[{if $gtmProduct->getFieldData('oxvarselect')}][{$gtmProduct->getFieldData('oxvarselect')}][{/if}]'
+                  [{if $list && $position}],
+              'list': '[{$list}]',
+              'position': [{"_"|str_replace:"":$position}]
+                  [{/if}]
+            }
+          ]
+        }
+      });
+    </script>
+<!--
+sWidgetType [{$sWidgetType}] | [{$oView->getViewParameter('sWidgetType')}]
+sListType [{$sListType}] | [{$oView->getViewParameter('sListType')}]
+iIndex [{$iIndex}] | [{$oView->getViewParameter('iIndex')}]
+listId [{$listId}] | [{$oView->getViewParameter('listId')}]
+testid [{$testid}] | [{$oView->getViewParameter('testid')}]
+-->
+[{/if}]
--- 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/remove_from_cart.tpl
+++ b/Application/views/event/remove_from_cart.tpl
@ -1,46 +0,0 @@
-[{block name="d3_ga4_remove_from_cart_block"}]
-    [{if $hasBeenReloaded}]
-        [{assign var="d3BasketPrice" value=$oxcmp_basket->getPrice()}]
-        [{capture name="d3_ga4_remove_from_cart"}]
-            [{strip}]
-                dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-                dataLayer.push({
-                    'isRemoveFromCart': true,
-                    'event': 'remove_from_cart',
-                    'eventLabel':'remove_from_cart',
-                    'ecommerce': {
-                        'actionField': "step: 1",
-                        'currency': "[{$currency->name}]",
-                        'value': [{$d3BasketPrice->getPrice()}],
-                        'coupon':         '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
-                        'items': [
-                            [{foreach from=$toRemoveArticles->getArray() name=gtmRemovedItems item=rmItem  key=rmItemindex}]
-                            [{assign var="d3oItemPrice" value=$rmItem->getPrice()}]
-                            [{assign var="gtmBasketItemCategory" value=$rmItem->getCategory()}]
-                            {
-                            'item_id':          '[{$rmItem->getFieldData('oxartnum')}]',
-                            'item_name':        '[{$rmItem->getFieldData('oxtitle')}]',
-                            'item_variant':     '[{$rmItem->getFieldData('oxvarselect')}]',
-                            [{if $gtmBasketItemCategory}]
-                            'item_category':    '[{$gtmBasketItemCategory->getSplitCategoryArray(0, true)}]',
-                            'item_category_2':  '[{$gtmBasketItemCategory->getSplitCategoryArray(1, true)}]',
-                            'item_category_3':  '[{$gtmBasketItemCategory->getSplitCategoryArray(2, true)}]',
-                            'item_category_4':  '[{$gtmBasketItemCategory->getSplitCategoryArray(3, true)}]',
-                            'item_list_name':   '[{$gtmBasketItemCategory->getSplitCategoryArray()}]',
-                            [{/if}]
-                            'price':            [{$d3oItemPrice->getPrice()}],
-                            'coupon':           '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
-                            'quantity':         '[{$rmItem->getFieldData('d3AmountThatGotRemoved')}]',
-                            'position':         [{$smarty.foreach.gtmRemovedItems.index}]
-                            }[{if !$smarty.foreach.gtmRemovedItems.last}],[{/if}]
-                            [{/foreach}]
-                        ]
-                    }[{if $oViewConf->isDebugModeOn()}],
-                    'debug_mode': 'true'
-                    [{/if}]
-                });
-            [{/strip}]
-        [{/capture}]
-        [{oxscript add=$smarty.capture.d3_ga4_remove_from_cart}]
-    [{/if}]
-[{/block}]
--- 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/event/view_item_list.tpl
+++ b/Application/views/event/view_item_list.tpl
@ -1,45 +0,0 @@
-[{assign var="gtmProducts" value=$oView->getArticleList()}]
-[{assign var="gtmCategory" value=$oView->getActiveCategory()}]
-
-[{assign var="breadCrumb" value=''}]
-
-[{block name="d3_ga4_view_item_list_block"}]
-    [{if $gtmProducts|@count}]
-        [{capture name="d3_ga4_view_item_list"}]
-            [{strip}]
-                dataLayer.push({ecommerce: null});
-                dataLayer.push({
-                    'event':'view_item_list',
-                    'event_name': 'view_item_list',
-                    'ecommerce': {
-                        'item_list_id': '[{$oView->getCategoryId()}]',
-                        'item_list_name': '[{foreach from=$oView->getBreadCrumb() item=sCrum}][{if $sCrum.title }][{$breadCrumb|cat:$sCrum.title|cat:" > "}][{/if}][{/foreach}]',
-                        'items': [
-                            [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
-                            [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
-                            [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
-                            [{if !$gtmCategory}][{assign var="gtmCategory" value=$gtmProduct->getCategory()}][{/if}]
-                            {
-                                'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
-                                'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
-                                'price': [{$d3PriceObject->getPrice()}],
-                                'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-                                [{if $gtmCategory}]
-                                'item_category':  '[{$gtmCategory->getSplitCategoryArray(0, true)}]',
-                                'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1, true)}]',
-                                'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2, true)}]',
-                                'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3, true)}]',
-                                [{/if}]
-                                'quantity': 1
-                            }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
-                            [{/foreach}]
-                        ]
-                    }[{if $oViewConf->isDebugModeOn()}],
-                    'debug_mode': 'true'
-                    [{/if}]
-                });
-            [{/strip}]
-        [{/capture}]
-        [{oxscript add=$smarty.capture.d3_ga4_view_item_list}]
-    [{/if}]
-[{/block}]
--- a/Application/views/event/view_search_result.tpl
+++ b/Application/views/event/view_search_result.tpl
@ -1,44 +0,0 @@
-[{assign var="gtmProducts" value=$oView->getArticleList()}]
-
-[{block name="d3_ga4_view_search_result_block"}]
-  [{if $gtmProducts}]
-    [{capture name="d3_ga4_view_search_result"}]
-      [{strip}]
-        dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-        dataLayer.push({
-          'event': 'view_search_result',
-          'eventLabel':'view_search_result[{if $oViewConf->isDebugModeOn()}]_test[{/if}]',
-          'ecommerce': {
-            'search_term': '[{$searchparamforhtml}]',
-            'items': [
-              [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
-              [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
-              [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
-              [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
-              {
-                'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
-                'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
-                'price': [{$d3PriceObject->getPrice()}],
-                'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-                [{if $gtmCategory}]
-                'item_category':  '[{$gtmCategory->getSplitCategoryArray(0, true)}]',
-                'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1, true)}]',
-                'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2, true)}]',
-                'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3, true)}]',
-                'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
-                [{/if}]
-                'quantity': 1
-              }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
-              [{/foreach}]
-            ]
-          }[{if $oViewConf->isDebugModeOn()}],
-          'debug_mode': 'true'
-          [{/if}]
-        });
-      [{/strip}]
-    [{/capture}]
-    [{oxscript add=$smarty.capture.d3_ga4_view_search_result}]
-  [{/if}]
-[{/block}]
-
-[{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]
--- a/Application/views/ga4/add_payment_info.tpl
+++ b/Application/views/ga4/add_payment_info.tpl
--- a/Application/views/ga4/add_shipping_info.tpl
+++ b/Application/views/ga4/add_shipping_info.tpl
--- a/Application/views/ga4/add_to_cart.tpl
+++ b/Application/views/ga4/add_to_cart.tpl
@ -0,0 +1,59 @@
+[{$smarty.block.parent}]
+
+[{*$gtmProduct|get_class_methods|dumpvar*}]
+
+[{capture assign=d3_ga4_add_to_cart}]
+[{block name="d3_ga4_add_to_basket"}]
+  $("#toBasket").click(function(event) {
+    [{*event.preventDefault();*}]
+
+    let iArtQuantity = $("#amountToBasket").val();
+
+    dataLayer.push({
+        'isAddToBasket': true,
+      'event':'add_to_cart',
+      'eventLabel': 'add_to_cart',
+      'ecommerce': {
+        'currency':   "[{$currency->name}]",
+        'value':      iArtQuantity*[{$gtmProduct->getFieldData('oxprice')}],
+        'items':      [
+          {
+            'item_id':        '[{$gtmProduct->getFieldData('oxartnum')}]',
+            'item_name':      '[{$gtmProduct->getFieldData('oxtitle')}]',
+            'price':          '[{$gtmProduct->getFieldData('oxprice')}]',
+            'item_brand':     '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+            'item_variant':   '[{if $gtmProduct->getFieldData('oxvarselect')}][{$gtmProduct->getFieldData('oxvarselect')}][{/if}]',
+            'item_category':  itemCategories[0] || 'no category',
+            'item_category_2':itemCategories[1] || '',
+            'item_category_3':itemCategories[2] || '',
+            'item_category_4':itemCategories[3] || '',
+            [{if false}]
+            [{* ??? what *}]
+            'item_list_name': 'Search Results',  // If associated with a list selection.
+            'item_list_id': 'SR123',  // If associated with a list selection.
+            'index': 1,  // If associated with a list selection.
+            [{/if}]
+            'quantity': iArtQuantity
+          }
+        ]
+      }
+    });
+  });
+[{/block}]
+[{/capture}]
+[{oxscript add=$d3_ga4_add_to_cart}]
+
+[{strip}]
+    [{* variable $gtmProduct is passed from parent tempalte *}]
+
+    [{assign var="gtmCurrency" value=$oView->getActCurrency()}]
+    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+    [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
+
+    <script>
+      dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+
+      let itemCategories = '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]no category[{/if}]'.split('/');
+
+    </script>
+[{/strip}]
--- a/Application/views/ga4/begin_checkout.tpl
+++ b/Application/views/ga4/begin_checkout.tpl
--- a/Application/views/ga4/generate_lead.tpl
+++ b/Application/views/ga4/generate_lead.tpl
--- a/Application/views/ga4/login.tpl
+++ b/Application/views/ga4/login.tpl
--- a/Application/views/ga4/purchase.tpl
+++ b/Application/views/ga4/purchase.tpl
@ -0,0 +1,36 @@
+[{strip}]
+    <script type="text/javascript">
+      window.dataLayer = window.dataLayer || [];
+      dataLayer.push({ ecommerce: null });
+      dataLayer.push({
+        [{assign var="oBasket" value=$order->getBasket()}]
+        [{assign var="iVat" value=0}]
+
+        'event':'purchase',
+        'ecommerce':{
+          'purchase':{
+            'actionField':{
+              'id': [{$order->getFieldData('oxordernr')}],
+              'ordernr': [{$order->getFieldData('oxtotalordersum')}],
+              'tax': [{$order->d3GetSumOrderVat()}],
+              'shipping': [{$order->getFieldData('oxdelcost')}],
+              'currency': "[{$order->getFieldData('oxcurrency')}]"
+            },
+            'products':[
+              [{foreach from=$order->getOrderArticles() item=listItem}]
+                  [{assign var="orderArticle" value=$listItem->getArticle()}]
+              {
+                'item_id':    "[{$listItem->getFieldData('oxartnum')}]",
+                'item_name':  "[{$listItem->getFieldData('oxtitle')}]",
+                'currency':   "[{$order->getFieldData('oxcurrency')}]",
+                'articleVat':   [{$orderArticle->getArticleVat()}],
+                'price':      [{$orderArticle->getBasePrice()}],
+                'quantity':   [{$listItem->getFieldData('oxamount')}]
+              },
+              [{/foreach}]
+            ]
+          }
+        }
+      });
+    </script>
+[{/strip}]
--- a/Application/views/ga4/remove_from_cart.tpl
+++ b/Application/views/ga4/remove_from_cart.tpl
--- a/Application/views/ga4/search.tpl
+++ b/Application/views/ga4/search.tpl
@ -0,0 +1,32 @@
+[{$smarty.block.parent}]
+
+[{assign var="gtmProducts" value=$oView->getArticleList()}]
+
+[{if $gtmProducts|@count}]
+  [{strip}]
+    <script>
+      dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+      dataLayer.push({
+        'event': 'view_search_result',
+        'eventLabel':'view_search_result',
+        'ecommerce': {
+          'search_term': '[{$searchparamforhtml}]',
+          'items': [
+            [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
+            [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+            [{if !$gtmCategory}][{assign var="gtmCategory" value=$gtmProduct->getCategory()}][{/if}]
+            {
+              'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
+              'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
+              'price': [{$gtmProduct->oxarticles__oxprice->value|default:'0'}],
+              'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+              'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
+              'quantity': 1
+            }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
+            [{/foreach}]
+          ]
+        }
+      });
+    </script>
+  [{/strip}]
+[{/if}]
--- a/Application/views/ga4/select_content.tpl
+++ b/Application/views/ga4/select_content.tpl
--- a/Application/views/ga4/select_item.tpl
+++ b/Application/views/ga4/select_item.tpl
--- a/Application/views/ga4/select_promotion.tpl
+++ b/Application/views/ga4/select_promotion.tpl
--- a/Application/views/ga4/sign_up.tpl
+++ b/Application/views/ga4/sign_up.tpl
--- a/Application/views/ga4/view_cart.tpl
+++ b/Application/views/ga4/view_cart.tpl
--- a/Application/views/ga4/view_item.tpl
+++ b/Application/views/ga4/view_item.tpl
@ -0,0 +1,26 @@
+[{strip}]
+    [{* variable $gtmProduct is passed from parent tempalte *}]
+    [{assign var="gtmCurrency" value=$oView->getActCurrency()}]
+    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+    [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
+    <script type="text/javascript">
+        dataLayer.push({ecommerce: null});
+        dataLayer.push({
+            'event':'GA4_event',
+            'event_name': 'view_item',
+            'ecommerce': {
+                'items': [
+                    {
+                        'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
+                        'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
+                        'item_variant': '[{if $gtmProduct->oxarticles__oxvarselect->value}][{$gtmProduct->oxarticles__oxvarselect->value}][{/if}]',
+                        'price': [{$gtmProduct->oxarticles__oxprice->value|default:0}],
+                        'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+                        'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
+                        'quantity': '1'
+                    }
+                ]
+            }
+        });
+    </script>
+[{/strip}]
--- a/Application/views/ga4/view_item_list.tpl
+++ b/Application/views/ga4/view_item_list.tpl
@ -0,0 +1,34 @@
+[{assign var="gtmProducts" value=$products}]
+
+[{assign var="breadCrumb" value=''}]
+
+[{if $gtmProducts|@count}]
+[{strip}]
+    <script>
+        /* ga4 */
+        dataLayer.push({ecommerce: null});
+        dataLayer.push({
+            'event':'view_item_list',
+            'event_name': 'view_item_list',
+            'ecommerce': {
+              'item_list_id': '[{$oView->getCategoryId()}]',
+              'item_list_name': '[{foreach from=$oView->getBreadCrumb() item=sCrum}][{if $sCrum.title }][{$breadCrumb|cat:$sCrum.title|cat:" > "}][{/if}][{/foreach}]',
+                'items': [
+                    [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
+                    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+                    [{if !$gtmCategory}][{assign var="gtmCategory" value=$gtmProduct->getCategory()}][{/if}]
+                    {
+                        'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
+                        'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
+                        'price': [{$gtmProduct->oxarticles__oxprice->value|default:'0'}],
+                        'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+                        'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
+                        'quantity': 1
+                    }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
+                    [{/foreach}]
+                ]
+            }
+        });
+    </script>
+[{/strip}]
+[{/if}]
--- a/Application/views/ga4/view_promotion.tpl
+++ b/Application/views/ga4/view_promotion.tpl
--- 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,135 +4,20 @@ 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
+## [2.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.0...2.1) - 2023-01-27
 ### Added
- multilang translations
- GA4 consent-mode default values
+- block section for add_to_basket js
+- template block order positions

-### Changed
- metadataID centralized
-
-## [1.16.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.15.1...1.16.0) - 2024-04-11
+## [2.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.1...2.0) - 2023-01-20
 ### 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
-### Added
- extended Docs
-### Changed
- control-param name
- control-param function
- adjusted check for set control-param
- consentmanager-script-adjustments
-
-## [1.12.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.11.1...1.12.0) - 2023-09-07
-### Added
- cookiebot functionality
-
-## [1.11.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.11.0...1.11.1) - 2023-08-17
-### Fixed
- metadata class entry
-
-## [1.11.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.10.0...1.11.0) - 2023-08-16
-### Added
- remove_from_cart
- auto debug_mode setter
- manufacturer extension for breadcrumb
-### Changed
- general template cleanup
-
-## [1.10.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.9.0...1.10.0) - 2023-06-27
-### Added
- Following Entries to dedicated event-templates
-  - coupon
-  - paymentType
-  - item_list_name
-  - item_category
- Method to get the in order used Payment-Name
- Method to get the current Article Category
-### Changed
- cookieManager handling
- general template cleanup
- renaming the template to a more intuitive name
-
-## [1.9.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.8.0...1.9.0) - 2023-06-19
-### Changed
- add_to_cart event template-structure
-
-## [1.8.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.7.0...1.8.0) - 2023-05-31
-### Fixed
- bug in explicit manager selection
-
-## [1.7.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.6.0...1.7.0) - 2023-05-31
-### Added
- extended call to read the technical documentation
-### Changed
- block-extension for view_item_list
- way of getting list-articles in view_item_list
-
-## [1.6.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.5.0...1.6.0) - 2023-05-30
-### Added
- possibility to choose between consentmanager && usercentrics
- position to block extension
-### Changed
- genuine code cleanup
- usercentrics includation script
-
-## [1.5.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.4.0...1.5.0) - 2023-05-23
-### Added
- additional settings to explicitly indicate that consentmanager is used
-### Fixed
- unnecessary converting of int to str
- missing PriceObject-bug
-### Changed
- genuine code cleanup
-
-## [1.4.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.3.1...1.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
-
-## [1.3.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.2.1...1.3.1) - 2023-03-17
-### Added
- Aggrosoft-Cookie-Consent compatibility
-### Fixed
- wrong function for pageview on thankyou page
-
-## [1.2.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.2...1.2.1) - 2023-02-22
-### Fixed
- price formatting in view_cart
-
-## [1.2](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.1...1.2) - 2023-02-01
-### Added
- own cookie-check-handler
+- using of ContainerFactory in ViewConfig

 ## [1.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.0...1.1) - 2023-01-27
 ### Added
 - block section for add_to_basket js
 - template block order positions

-### Changed
- switched price formatting
-
-## [1.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.0...1.0) - 2023-01-20
+## [1.0](https://git.d3data.de/D3Public/GoogleAnalytics4/releases/tag/1.0) - 2023-01-20
 ### Added
 - publication of app features
--- a/Docs/CMP/consentmanager.md
+++ b/Docs/CMP/consentmanager.md
@ -1,18 +0,0 @@
-# Consentmanager
-## 1. Steuerungsparameter
-Tragen Sie hier die gewünschte ID des zu prüfenden Anbieters (Vendor-ID) ein.<br>
-Diese ID finden Sie in Ihrem Consentmanager-Dashboard, links, unter "CMP > Anbieter".
-
-Nähere Informationen hierzu suchen Sie bitte auf der offiziellen Webseite von [app.consentmanager](https://help.consentmanager.de/books/cmp/page/4-configuring-vendors-and-cookies).
-
-## 2. Gebräuchliche ID's
- s26 (Google Analytics/ GA/ GA4)
- s905 (Google Tag Manager/ GTM)
-
-## 3. Einrichtung GTM
-Die von Ihnen eingetragene ID muss oder ist schlussendlich die ID, auf die im GTM-Umfeld geprüft wird.  
-Das heißt, dass sich die Eintragung nach GTM, oder umgekehrt, richtet.
-
-### Unterstützung benötigt?
-Kein Problem!  
-Kontaktieren Sie uns gern unter [d3data.de](https://www.d3data.de)
--- a/Docs/README.md
+++ b/Docs/README.md
@ -1,26 +1,19 @@
-# 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.
+## Technische Doku
+### GA4 Events / Customizing
+Für alle implementierten GA4 Events existieren Templates unter `source/modules/d3/googleanalytics4/Application/views/ga4/`, dabei entspricht der Dateiname dem Eventnamen in GA4.
 Die Einbindung dieser Event-Templates erfolgt über TPL-Blöcke unter `source/modules/d3/googleanalytics4/Application/views/blocks/`.  
 *Hinweis: nicht alle templates sind bereits gefüllt. Wünschen Sie die Implementierung eines unausgefüllten templates?
 Kommen Sie auf uns zu unter https://www.d3data.de/

-## Steuerungsparameter
-Tragen Sie hier im Normalfall die ID des zu prüfenden Cookies ein.  
-In bestimmten Fällen, müssen Sie hier alternative Werte eintragen. Diese Fälle sind bedingt
-nach der gewählten CMP (Consent Manager Platform).  
-  
-> nähere Infos unter [CMP](#consent-manager-platform-cmp)  
-
-## Blöcke
+### Blöcke
 Für den geregelten Ablauf sind folgende Blöcke nötig:
 - Suchergebnisse
    - Blockname: search_results
    - Datei: page/search/search.tpl
    - GA4 Event: view_search_results
 - Artikelliste
-    - Blockname: page_list_productlist
-    - Datei: page/list/list.tpl
+    - Blockname: d3Ga4_view_item_list (muss hinzugefügt werden)
+    - Datei: widget/product/list.tpl
    - GA4 Event: view_item_list
 - Detailseite
    - Blockname: details_productmain_title
@ -30,10 +23,6 @@ Für den geregelten Ablauf sind folgende Blöcke nötig:
    - Blockname: details_productmain_tobasket
    - Datei: page/details/inc/productmain.tpl
    - GA4 Event: add_to_cart
- aus dem WK entfernen
-    - Blockname: checkout_basket_main
-    - Datei: page/checkout/basket.tpl
-    - GA4 Event: remove_from_cart
 - Warenkorb
    - Blockname: checkout_basket_main
    - Datei: page/checkout/basket.tpl
@ -43,7 +32,7 @@ Für den geregelten Ablauf sind folgende Blöcke nötig:
    - Datei: page/checkout/thankyou.tpl
    - GA4 Event: purchase

-## Verfügbare Datalayer Variablen
+### Verfügbare Datalayer Variablen
 Für die einfachste Übersicht der enthaltenen Daten empfehle ich den Vorschau-Modus vom Google Tag Manager.

 Bei jedem Seitenaufruf wird die Datenschicht mit einigen wenigen Infos erstellt, die man zum reinen Erfassen der Seitenaufrufe benötigt:
@ -55,39 +44,8 @@ Bei jedem Seitenaufruf wird die Datenschicht mit einigen wenigen Infos erstellt,

 Alle für Ecommerce Tracking relevanten Daten werden mit speziellen Ecommerce Events in die Datenschicht eingefügt.

-## Cookie-Handling
+### Cookie-Handling
 Sie nutzen einen eigenen, als Modul im Shop installierten, Cookie-manager?  
 Dann tragen Sie in den Folgeeinstellungen unter "Cookie Manager Einstellungen", 
-die Cookie-ID des zugehörigen Cookies ein.  
-Aktivieren Sie anschließend diese Weiche. Setzen Sie den Haken bei "Eigenen Cookie Manager nutzen?".
-
-## Consent Manager Platform (CMP)
- [Consentmanager](https://git.d3data.de/D3Public/GoogleAnalytics4/src/branch/master/Docs/CMP/consentmanager.md)
-
-### Unterstützung für
- [aggrosoft - oxid-cookie-compliance](https://github.com/aggrosoft/oxid-cookie-compliance)
-  - https://github.com/aggrosoft/oxid-cookie-compliance
-  - die entsprechend gewählte Kategorie in den Moduleinstellungen des 'Google Analytics 4' unter
-    ```Einstell. > Cookie Manager Einstellungen > Cookie-ID``` eintragen
-  - Default-Werte sind entweder ```ANALYTICS``` oder ```MARKETING```. Bitte auf die Großschreibung achten.
-
- [Netensio - Cookie Consent Manager](https://www.netensio.de/oxid-eshop-module/cookie-consent-manager-fuer-oxid-eshop.html)
-  - Modul entsprechend konfigurieren
-  - CookieID des angelegten Cookies in den Moduleinstellungen des 'Google Analytics 4' unter
-    ```Einstell. > Cookie Manager Einstellungen > Cookie-ID``` eintragen
-
- [OXID Cookie Management powered by usercentrics](https://docs.oxid-esales.com/modules/usercentrics/de/latest/einfuehrung.html)
-  - In der Usercentrics-Verwaltung die Services "Google Analytics" und "Google Tag Manager" anlegen
-  - Den Service ```Google Tag Manager``` in den Moduleinstellungen des 'Google Analytics 4' unter
-    Google Tag Manager eintragen
-  - 
- [Consent Management Provider](https://www.consentmanager.net/)
-  - In der Consentmanager-Oberfläche den Anbieter "Google Tag Manager" mit der ID s905 hinzufügen
-  - Im Frontend, im consentmanager-Pop-up nach dem 'Google Tag Manager' suchen
-    - kleines Fragezeichen neben den Namen anklicken und ganz runter scrollen
-      - prüfen, ob ein Cookie vorgegeben ist
-      - sonst, in der Consentmanager-Oberfläche Cookie-Liste entsprechendes Cookie suchen und im Admin unter
-        ```Einstell. > Cookie Manager Einstellungen > Cookie-ID``` eintragen
-  
- [Cookiebot](https://www.cookiebot.com)
-  - Nähere Informationen folgen bald! Bis dato, besuchen Sie bitte die offizielle Webseite.
+die Cookie-ID des zugehörigen Cookies ein. Und aktivieren Sie diese Weiche, 
+indem Sie den Haken bei "Eigenen Cookie Manager nutzen?" setzen.
--- a/IntelliSenseHelper.php
+++ b/IntelliSenseHelper.php
@ -15,54 +15,4 @@

 namespace D3\GoogleAnalytics4\Modules\Core{
    class ViewConfig_parent extends \OxidEsales\Eshop\Core\ViewConfig{}
-}
-
-namespace D3\GoogleAnalytics4\Modules\Application\Model{
-    class Category_parent extends \OxidEsales\Eshop\Application\Model\Category {}
-    class Basket_parent extends \OxidEsales\Eshop\Application\Model\Basket {}
-    class Manufacturer_parent extends \OxidEsales\Eshop\Application\Model\Manufacturer {}
-}
-
-namespace D3\GoogleAnalytics4\Modules\Application\Controller{
-
-    use OxidEsales\Eshop\Application\Controller\AccountNoticeListController;
-    use OxidEsales\Eshop\Application\Controller\AccountRecommlistController;
-    use OxidEsales\Eshop\Application\Controller\AccountWishlistController;
-    use OxidEsales\Eshop\Application\Controller\Admin\ManufacturerController;
-    use OxidEsales\Eshop\Application\Controller\ArticleListController;
-    use OxidEsales\Eshop\Application\Controller\SearchController;
-    use OxidEsales\Eshop\Application\Controller\StartController;
-
-    class BasketController_parent extends \OxidEsales\Eshop\Application\Controller\BasketController {}
-    class ThankYouController_parent extends \OxidEsales\Eshop\Application\Controller\ThankYouController {}
-
-    class ArticleListController_AddToCartHelpMethods_parent extends ArticleListController {}
-
-    class ArticleDetailsController_parent extends \OxidEsales\Eshop\Application\Controller\ArticleDetailsController {}
-
-    class d3GtmAccountNoticeListController_parent extends AccountNoticeListController {}
-
-    class d3GtmAccountRecommlistController_parent extends AccountRecommlistController {}
-
-    class d3GtmAccountWishlistController_parent extends AccountWishlistController {}
-
-    class d3GtmStartController_parent extends StartController {}
-
-    class d3GtmSearchController_parent extends SearchController {}
-
-    class d3GtmManufacturerListController_parent extends ManufacturerController {}
-}
-
-namespace D3\GoogleAnalytics4\Modules\Application\Component{
-
-    use OxidEsales\Eshop\Application\Component\BasketComponent;
-
-    class d3GtmBasketComponentExtension_parent extends BasketComponent {}
-}
-
-namespace D3\GoogleAnalytics4\Modules\Application\Component\Widget{
-
-    use OxidEsales\Eshop\Application\Component\Widget\ArticleDetails;
-
-    class d3GtmWidgetArticleDetails_parent extends ArticleDetails {}
 }
--- 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
@ -1,123 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Application\Controller;
-
-use OxidEsales\Eshop\Application\Component\BasketComponent;
-use OxidEsales\Eshop\Application\Model\Article;
-use OxidEsales\Eshop\Application\Model\ArticleList;
-use OxidEsales\Eshop\Core\Registry;
-use oxSystemComponentException;
-
-class BasketController extends BasketController_parent
-{
-    /**
-     * @return string
-     */
-    public function render()
-    {
-        $return = parent::render();
-
-        $this->d3GA4getRemovedArticlesListObject();
-
-        return $return;
-    }
-
-    /**
-     * @return void
-     * @throws oxSystemComponentException
-     */
-    public function d3GA4getRemovedArticlesListObject() :void
-    {
-        $this->addTplParam('hasBeenReloaded', false);
-        // collecting items to add
-        $aProducts = Registry::getRequest()->getRequestEscapedParameter('aproducts');
-
-        // collecting specified item
-        $sProductId = Registry::getRequest()->getRequestEscapedParameter('aid');
-        if ($sProductId) {
-            // additionally fetching current product info
-            $dAmount = Registry::getRequest()->getRequestEscapedParameter('am');
-
-            // select lists
-            $aSel = Registry::getRequest()->getRequestEscapedParameter('sel');
-
-            /** @var BasketComponent $oBasketComponent */
-            $oBasketComponent = $this->getComponent('oxcmp_basket');
-
-            $aPersParam = $oBasketComponent->__call('getPersistedParameters', []);
-
-            $sBasketItemId = Registry::getRequest()->getRequestEscapedParameter('bindex');
-
-            $aProducts[$sProductId] = [
-                'am'           => $dAmount,
-                'sel'          => $aSel,
-                'persparam'    => $aPersParam,
-                'basketitemid' => $sBasketItemId
-            ];
-        }
-
-        if (is_array($aProducts) && count($aProducts)) {
-            $toRemoveArticleIdList = [];
-            $artIdOnArtAmountList = [];
-
-            if ($this->isArticleRemovedState($aProducts)) {
-                //setting amount to 0 if removing article from basket
-                foreach ($aProducts as $sProductId => $aProduct) {
-                    if ((isset($aProduct['remove']) && $aProduct['remove']) or intval($aProduct['am']) === 0) {
-                        if (!in_array($aProduct, $toRemoveArticleIdList)) {
-                            $toRemoveArticleIdList[] = $aProduct['aid'];
-                            $artIdOnArtAmountList[$aProduct['aid']] = $aProduct['am'];
-                        }
-
-                        $aProducts[$sProductId]['am'] = 0;
-                        #for GA4 Event
-                        $this->addTplParam('hasBeenReloaded', true);
-                    } else {
-                        unset($aProducts[$sProductId]);
-                    }
-                }
-            }
-
-            $oArtList = oxNew(ArticleList::class);
-            $oArtList->loadIds($toRemoveArticleIdList);
-
-            #dumpVar($this->getBasketArticles());
-
-            /** @var Article $item */
-            foreach ($oArtList->getArray() as $item){
-                foreach ($artIdOnArtAmountList as $artId => $artAmount){
-                    if ($item->getId() === $artId){
-                        $item->assign(['d3AmountThatGotRemoved' => $artAmount]);
-                    }
-                }
-            }
-
-            $this->addTplParam('toRemoveArticles', $oArtList);
-        }
-    }
-
-    /**
-     * @return bool
-     *
-     * checks, if we're in the short state of "an Article has been removed"
-     * We check by looking for the "'removeBtn' is not null", as a sign for it has been triggered/ clicked
-     * if that doesn't work, we check if there's an Article in the Products array, that has "'am' = 0"
-     * Which also shows we're in that state rn
-     */
-    protected function isArticleRemovedState(array $productsArray) :bool
-    {
-        if (Registry::getRequest()->getRequestEscapedParameter('removeBtn')
-            or Registry::getRequest()->getRequestEscapedParameter('updateBtn')
-        ){
-            return true;
-        }else{
-            foreach ($productsArray as $aProduct) {
-                if (intval($aProduct['am']) === 0) {
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-}
--- 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
@ -1,23 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Application\Model;
-
-use OxidEsales\Eshop\Application\Model\Payment;
-
-class Basket extends Basket_parent
-{
-    /**
-     * @return string
-     */
-    public function getPaymentOnPaymentId() :string
-    {
-        if ($this->getPaymentId()){
-            $oPayment = oxNew(Payment::class);
-            if ($oPayment->load($this->getPaymentId())){
-                return $oPayment->getFieldData('oxdesc');
-            }
-        }
-
-        return "couldn't load payment!";
-    }
-}
--- a/Modules/Application/Model/Category.php
+++ b/Modules/Application/Model/Category.php
@ -1,44 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Application\Model;
-
-class Category extends Category_parent
-{
-    /**
-     * @param int $indexOfArray
-     * @return string
-     */
-    public function getSplitCategoryArray(int $indexOfArray = -1, bool $bShallTakeStd = false) :string
-    {
-        if ($bShallTakeStd){
-            $splitCatArray =
-                array_values(
-                    array_filter(
-                        explode(
-                            '/',
-                            trim(
-                                parse_url(
-                                    $this->getLink(),
-                                    5
-                                )
-                            )
-                        )
-                    )
-                );
-
-            if (($indexOfArray >= 0) and (false === empty($splitCatArray[$indexOfArray]))){
-                return $splitCatArray[$indexOfArray];
-            }else{
-                return "";
-            }
-        }
-
-        return
-            trim(
-                parse_url(
-                    $this->getLink(),
-                    5
-                )
-            );
-    }
-}
--- a/Modules/Application/Model/Manufacturer.php
+++ b/Modules/Application/Model/Manufacturer.php
@ -1,44 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Application\Model;
-
-class Manufacturer extends Manufacturer_parent
-{
-    /**
-     * @param int $indexOfArray
-     * @return string
-     */
-    public function getSplitCategoryArray(int $indexOfArray = -1, bool $bShallTakeStd = false) :string
-    {
-        if ($bShallTakeStd){
-            $splitCatArray =
-                array_values(
-                    array_filter(
-                        explode(
-                            '/',
-                            trim(
-                                parse_url(
-                                    $this->getLink(),
-                                    5
-                                )
-                            )
-                        )
-                    )
-                );
-
-            if (($indexOfArray >= 0) and (false === empty($splitCatArray[$indexOfArray]))){
-                return $splitCatArray[$indexOfArray];
-            }else{
-                return "";
-            }
-        }
-
-        return
-            trim(
-                parse_url(
-                    $this->getLink(),
-                    5
-                )
-            );
-    }
-}
--- a/Modules/Core/ViewConfig.php
+++ b/Modules/Core/ViewConfig.php
@ -12,174 +12,52 @@

 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;
+
 class ViewConfig extends ViewConfig_parent
 {

    // Google Tag Manager Container ID
    private $sContainerId = null;
-    private $sCookieManagerType = null;

    public function getGtmContainerId()
    {
        if ($this->sContainerId === null)
        {
-            $this->sContainerId = Registry::getConfig()->getConfigParam('d3_gtm_sContainerID');
+            $this->sContainerId = ContainerFactory::getInstance()
+                                                  ->getContainer()
+                                                  ->get(ModuleSettingBridgeInterface::class)
+                                                  ->get('d3_gtm_sContainerID', 'd3googleanalytics4');
        }
        return $this->sContainerId;
    }

-    /**
-     * @return void
-     */
-    public function defineCookieManagerType() :void
-    {
-        if ($this->sCookieManagerType === null)
-        {
-            /** @var ManagerHandler $oManagerHandler */
-            $oManagerHandler = oxNew(ManagerHandler::class);
-            $this->sCookieManagerType = $oManagerHandler->getCurrManager();
-        }
-    }
-
-    /**
-     * @return bool
-     */
-    public function shallUseOwnCookieManager() :bool
-    {
-        return (bool) Registry::getConfig()->getConfigParam('d3_gtm_settings_hasOwnCookieManager');
-    }
-
-    /**
-     * @return bool
-     */
-    public function D3blShowGtmScript()
-    {
-        /** @var Config $oConfig */
-        $oConfig = Registry::getConfig();
-
-        // No Cookie Manager in use
-        if (!$this->shallUseOwnCookieManager()) {
-            return true;
-        }
-
-        $this->defineCookieManagerType();
-
-        $sCookieID = trim($oConfig->getConfigParam('d3_gtm_settings_controlParameter'));
-
-        // Netensio Cookie Manager
-        if ($this->sCookieManagerType === ManagerTypes::NET_COOKIE_MANAGER) {
-            $oSession = Registry::getSession();
-            $aCookies = $oSession->getVariable("aCookieSel");
-
-            return (is_array($aCookies) && array_key_exists($sCookieID, $aCookies) && $aCookies[$sCookieID] == "1");
-        }
-
-        // Aggrosoft Cookie Consent
-        if ($this->sCookieManagerType === ManagerTypes::AGCOOKIECOMPLIANCE) {
-            if (method_exists($this, "isCookieCategoryEnabled")) {
-                return $this->isCookieCategoryEnabled($sCookieID);
-            }
-        }
-
-        // UserCentrics or consentmanager
-        if (
-            $this->sCookieManagerType       === ManagerTypes::USERCENTRICS_MODULE
-            or $this->sCookieManagerType    === ManagerTypes::USERCENTRICS_MANUALLY
-            or $this->sCookieManagerType    === ManagerTypes::CONSENTMANAGER
-            or $this->sCookieManagerType    === ManagerTypes::COOKIEFIRST
-            or $this->sCookieManagerType    === ManagerTypes::COOKIEBOT
-            or $this->sCookieManagerType    === ManagerTypes::EXTERNAL_SERVICE
-        )
-        {
-            // Always needs the script-tags delivered to the DOM.
-            return true;
-        }
-
-        // Cookie Manager not (yet) supported
-        return false;
-    }
-
-    /**
-     * Get additional attributes for script tags.
-     * This is especially important for UserCentrics.
-     * @return string
-     */
-    public function getGtmScriptAttributes() :string
-    {
-        $sControlParameter = trim(Registry::getConfig()->getConfigParam('d3_gtm_settings_controlParameter'));
-
-        if (false === $this->shallUseOwnCookieManager() or ($sControlParameter === '')){
-            return "";
-        }
-
-        if (
-            $this->sCookieManagerType === ManagerTypes::USERCENTRICS_MODULE
-            or $this->sCookieManagerType === ManagerTypes::USERCENTRICS_MANUALLY
-        )
-        {
-            return 'data-usercentrics="' . $sControlParameter . '" type="text/plain" async=""';
-        }
-
-        if ($this->sCookieManagerType === ManagerTypes::CONSENTMANAGER)
-        {
-            return 'type="text/plain" class="cmplazyload" data-cmp-vendor="'.$sControlParameter.'"';
-        }
-
-        if ($this->sCookieManagerType === ManagerTypes::COOKIEFIRST){
-            return 'type="text/plain" data-cookiefirst-category="' . $sControlParameter .'"';
-        }
-
-        if ($this->sCookieManagerType === ManagerTypes::COOKIEBOT){
-            return 'type="text/plain" data-cookieconsent="' . $sControlParameter .'"';
-        }
-
-        return "";
-    }
-
    private $blGA4enabled = null;

-
-    /**
-     * @return null
-     */
    public function isGA4enabled()
    {
        if ($this->blGA4enabled === null)
        {
-            $this->sContainerId = Registry::getConfig()->getConfigParam('d3_gtm_blEnableGA4');
+            $this->sContainerId = ContainerFactory::getInstance()
+                                                  ->getContainer()
+                                                  ->get(ModuleSettingBridgeInterface::class)
+                                                  ->get('d3_gtm_blEnableGA4', 'd3googleanalytics4');
        }

        return $this->blGA4enabled;
    }

-    /**
-     * @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();
+        $cl         = $this->getTopActionClassName();
        $aPageTypes = [
            "content"  => "cms",
            "details"  => "product",
@ -190,7 +68,6 @@ class ViewConfig extends ViewConfig_parent
            "payment"  => "checkout",
            "order"    => "checkout",
            "thankyou" => "checkout",
-            "start"    => "start",
        ];

        $dataLayer = [
@ -199,45 +76,17 @@ 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/README.md
+++ b/README.md
@ -30,10 +30,6 @@ Sofern nötig, bestätigen Sie bitte, dass Sie `package-name` erlauben, Code aus

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

-### Wichtig!
-Bitte stellen Sie sicher, dass die nötigen Template-Blöcke im OXID-Shop zur Verfügung stehen. 
-Lesen Sie mehr in der [technischen Doku](./Docs/README.md) unter "Blöcke"!
-
 ## Verwendung
 ### Grundfunktionalität
 Nach erfolgreicher Installation finden Sie in Ihrem Shop-Admin unter "Erweiterungen > Module" 
@ -81,6 +77,5 @@ Die vollständigen Copyright- und Lizenzinformationen entnehmen Sie bitte der [L
 Zu diesem Modul haben beigetragen:

 - [Marat Bedoev](https://github.com/vanilla-thunder)
- [Christoph Stäblein [gn2]](https://github.com/reyneke-vosz)

 Vielen Dank.
--- 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,42 +1,10 @@
 <?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;
 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,58 +17,39 @@ $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.1.0',
    'author'      => 'Data Development (Inh.: Thomas Dartsch)',
    'email'       => 'support@shopmodule.com',
    'url'         => 'https://www.oxidmodule.com/',
    'extend'      => [
-        // Core
-        OEViewConfig::class                     => ViewConfig::class,
-
-        // Model
-        OECategory::class                       => Category::class,
-        OEBasket::class                         => Basket::class,
-        OEManufacturer::class                   => Manufacturer::class,
-
-        // Controller
-        OEBasketController::class               => BasketController::class,
-        OEThankYouController::class             => ThankYouController::class,
-        OEArticleListController::class          => ArticleListController_AddToCartHelpMethods::class,
-        OEArticleDetailsController::class       => ArticleDetailsController::class,
-        OEAccountNoticeListController::class    => d3GtmAccountNoticeListController::class,
-        OEAccountRecommlistController::class    => d3GtmAccountRecommlistController::class,
-        OEAccountWishlistController::class      => d3GtmAccountWishlistController::class,
-        OEStartController::class                => d3GtmStartController::class,
-        OESearchController::class               => d3GtmSearchController::class,
-        OEManufacturerListController::class     => d3GtmManufacturerListController::class,
-
-        // Component
-        OEArticleDetails::class                 => d3GtmWidgetArticleDetails::class,
-        OEBasketComponent::class                => d3GtmBasketComponentExtension::class,
+        OEViewConfig::class => ViewConfig::class
    ],
    'templates'   => [
-        // Event files that store the GA4 Event-Information
-        'event/add_to_cart.tpl'                     => 'd3/googleanalytics4/Application/views/event/add_to_cart.tpl',
-        'event/view_item.tpl'                       => 'd3/googleanalytics4/Application/views/event/view_item.tpl',
-        'event/view_cart.tpl'                       => 'd3/googleanalytics4/Application/views/event/view_cart.tpl',
-        'event/purchase.tpl'                        => 'd3/googleanalytics4/Application/views/event/purchase.tpl',
-        'event/view_item_list.tpl'                  => 'd3/googleanalytics4/Application/views/event/view_item_list.tpl',
-        'event/view_search_result.tpl'              => 'd3/googleanalytics4/Application/views/event/view_search_result.tpl',
-        'event/remove_from_cart.tpl'                => 'd3/googleanalytics4/Application/views/event/remove_from_cart.tpl',
-
-        // complete overwritten file of OXID-Originals
-        // the path of the template-name is the original path to the file in OXID-context from tpl/->
-        'page/account/d3gtmnoticelist.tpl'          => 'd3/googleanalytics4/Application/views/tpl/page/account/d3gtmnoticelist.tpl',
-        'page/account/d3gtmrecommendationlist.tpl'  => 'd3/googleanalytics4/Application/views/tpl/page/account/d3gtmrecommendationlist.tpl',
-        'page/account/d3gtmwishlist.tpl'            => 'd3/googleanalytics4/Application/views/tpl/page/account/d3gtmwishlist.tpl',
+        // GA4 events
+        'ga4_add_payment_info.tpl' => 'd3/googleanalytics4/Application/views/ga4/add_payment_info.tpl',
+        'add_shipping_info.tpl'    => 'd3/googleanalytics4/Application/views/ga4/add_shipping_info.tpl',
+        'ga4_add_to_cart.tpl'      => 'd3/googleanalytics4/Application/views/ga4/add_to_cart.tpl',
+        'ga4_begin_checkout.tpl'   => 'd3/googleanalytics4/Application/views/ga4/begin_checkout.tpl',
+        'ga4_generate_lead.tpl'    => 'd3/googleanalytics4/Application/views/ga4/generate_lead.tpl',
+        'ga4_login.tpl'            => 'd3/googleanalytics4/Application/views/ga4/login.tpl',
+        'ga4_purchase.tpl'         => 'd3/googleanalytics4/Application/views/ga4/purchase.tpl',
+        'ga4_remove_from_cart.tpl' => 'd3/googleanalytics4/Application/views/ga4/remove_from_cart.tpl',
+        'ga4_search.tpl'           => 'd3/googleanalytics4/Application/views/ga4/search.tpl',
+        'ga4_select_content.tpl'   => 'd3/googleanalytics4/Application/views/ga4/select_content.tpl',
+        'ga4_select_item.tpl'      => 'd3/googleanalytics4/Application/views/ga4/select_item.tpl',
+        'ga4_select_promotion.tpl' => 'd3/googleanalytics4/Application/views/ga4/select_promotion.tpl',
+        'ga4_sign_up.tpl'          => 'd3/googleanalytics4/Application/views/ga4/sign_up.tpl',
+        'ga4_view_cart.tpl'        => 'd3/googleanalytics4/Application/views/ga4/view_cart.tpl',
+        'ga4_view_item.tpl'        => 'd3/googleanalytics4/Application/views/ga4/view_item.tpl',
+        'ga4_view_item_list.tpl'   => 'd3/googleanalytics4/Application/views/ga4/view_item_list.tpl',
+        'ga4_view_promotion.tpl'   => 'd3/googleanalytics4/Application/views/ga4/view_promotion.tpl',
    ],
    'blocks'      => [
        // tag manager js
        [
            'template' => 'layout/base.tpl',
            'block'    => 'head_meta_robots',
-            'file'     => '/Application/views/blocks/_gtm_js.tpl',
-            'position' => 150
+            'file'     => '/Application/views/blocks/_gtm_js.tpl'
        ],
        // tag manager nojs
        [
@ -108,63 +57,75 @@ $aModule          = [
            'block'    => 'theme_svg_icons',
            'file'     => '/Application/views/blocks/_gtm_nojs.tpl'
        ],
+        // widget_product_list
+        [
+            'template' => 'widget/product/list.tpl',
+            'block'    => 'widget_product_list',
+            'file'     => '/Application/views/blocks/widget_product_list.tpl'
+        ],
        // details
        [
            'template' => 'page/details/inc/productmain.tpl',
            'block'    => 'details_productmain_title',
-            'file'     => '/Application/views/blocks/view_item.tpl',
+            'file'     => '/Application/views/blocks/detail.tpl',
            'position' => 150
        ],
        // checkout
        [
            'template' => 'page/checkout/basket.tpl',
            'block'    => 'checkout_basket_main',
-            'file'     => '/Application/views/blocks/view_cart.tpl'
+            'file'     => '/Application/views/blocks/checkout_s1.tpl'
+        ],
+        [
+            'template' => 'form/user_checkout_change.tpl',
+            'block'    => 'user_checkout_change',
+            'file'     => '/Application/views/blocks/checkout_s2.tpl'
+        ],
+        [
+            'template' => 'form/user_checkout_register.tpl',
+            'block'    => 'user_checkout_register',
+            'file'     => '/Application/views/blocks/checkout_s2.tpl'
+        ],
+        [
+            'template' => 'form/user_checkout_noregister.tpl',
+            'block'    => 'user_checkout_noregister',
+            'file'     => '/Application/views/blocks/checkout_s2.tpl'
+        ],
+        [
+            'template' => 'page/checkout/payment.tpl',
+            'block'    => 'checkout_payment_main',
+            'file'     => '/Application/views/blocks/checkout_s3.tpl'
+        ],
+        [
+            'template' => 'page/checkout/order.tpl',
+            'block'    => 'checkout_order_main',
+            'file'     => '/Application/views/blocks/checkout_s4.tpl'
        ],
        [
            'template' => 'page/checkout/thankyou.tpl',
            'block'    => 'checkout_thankyou_main',
-            'file'     => '/Application/views/blocks/purchase.tpl'
+            'file'     => '/Application/views/blocks/checkout_s5.tpl'
        ],
        // Lists
        // view_item_list
        [
-            'template' => 'page/list/list.tpl',
-            'block'    => 'page_list_productlist',
-            'file'     => '/Application/views/blocks/view_item_list.tpl',
+            'template' => 'widget/product/list.tpl',
+            'block'    => 'd3Ga4_view_item_list',
+            'file'     => '/Application/views/ga4/view_item_list.tpl',
            'position' => 150
        ],
        // view_search_result
        [
            'template' => 'page/search/search.tpl',
            'block'    => 'search_results',
-            'file'     => '/Application/views/blocks/view_search_result.tpl',
+            'file'     => '/Application/views/ga4/search.tpl',
            'position' => 150
        ],
        // add_to_cart
        [
            'template' => 'page/details/inc/productmain.tpl',
            'block'    => 'details_productmain_tobasket',
-            'file'     => '/Application/views/blocks/details_productmain_tobasket.tpl',
-            'position' => 150
-        ],
-        [
-            'template' => 'page/list/list.tpl',
-            'block'    => 'page_list_listbody',
-            'file'     => '/Application/views/blocks/page_list_listbody.tpl',
-            'position' => 150
-        ],
-        [
-            'template' => 'page/shop/start.tpl',
-            'block'    => 'start_welcome_text',
-            'file'     => '/Application/views/blocks/start_welcome_text.tpl',
-            'position' => 150
-        ],
-        // remove_from_cart
-        [
-            'template' => 'page/checkout/basket.tpl',
-            'block'    => 'checkout_basket_main',
-            'file'     => '/Application/views/blocks/remove_from_cart.tpl',
+            'file'     => '/Application/views/ga4/add_to_cart.tpl',
            'position' => 150
        ]
    ],
@ -190,13 +151,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',
@ -206,30 +160,10 @@ $aModule          = [
        ],
        [
            'group'    => 'd3_gtm_settings_cookiemanager',
-            'name'     => 'd3_gtm_settings_controlParameter',
+            'name'     => 'd3_gtm_settings_cookieName',
            'type'     => 'str',
-            'value'    => '',
+            'value'    => 'example',
            'position' => 999
        ],
-        [
-            'group' => 'd3_gtm_settings_cookiemanager',
-            'name' => 'd3_gtm_settings_HAS_STD_MANAGER',
-            'type' => 'select',
-            '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#'
Author	SHA1	Message	Date
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