[Bump] metadata + changelog

if no basket-component is given, error occurs

.gitignore

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

.php-cs-fixer.php

@@ -0,0 +1,13 @@
+<?php
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__)
+;
+
+$config = new PhpCsFixer\Config();
+return $config->setRules([
+        '@PHP73Migration' => true,
+        '@PSR12' => true
+    ])
+    ->setFinder($finder)
+;

Application/Extend/.ide-helper.php

@@ -1,5 +0,0 @@
-<?php
-
-namespace VanillaThunder\GoogleTagManager\Application\Extend;
-
-class ViewConfig_parent extends \OxidEsales\Eshop\Core\ViewConfig {};

Application/Extend/ViewConfig.php

@@ -1,97 +0,0 @@
-<?php
-
-/*
- * vanilla-thunder/oxid-module-gtm
- * Google Tag Manager Integration for OXID eShop v6.2+
- *
- * This program is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
- * either version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
- */
-
-namespace VanillaThunder\GoogleTagManager\Application\Extend;
-
-use OxidEsales\Eshop\Application\Controller\FrontendController;
-use OxidEsales\Eshop\Core\Registry;
-use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ModuleSettingBridgeInterface;
-
-class ViewConfig extends ViewConfig_parent
-{
-
-    // Google Tag Manager Container ID
-    private $sContainerId = null;
-    public function getGtmContainerId()
-    {
-        if ( $this->sContainerId === null ) {
-            $this->sContainerId = ContainerFactory::getInstance()
-                ->getContainer()
-                ->get(ModuleSettingBridgeInterface::class)
-                ->get('vt_gtm_containerid', 'vt-gtm');
-        }
-        return $this->sContainerId;
-    }
-
-
-
-    public function getGtmDataLayer()
-    {
-    	if( !$this->getGtmContainerId() ) return "[]";
-
-        $oConfig = Registry::getConfig();
-        $oView = $oConfig->getTopActiveView(); /** @var FrontendController $oShop */
-        //$oShop = oxRegistry::getConfig()->getActiveShop(); /** @var oxShop $oShop */
-        $oUser = $oConfig->getUser();
-
-        $dataLayer = [
-            'page_title' => $oView->getTitle(),
-            'controller' => $this->getTopActionClassName(),
-            'user' => ( $oUser ? "true" : "false" )
-        ];
-
-        return json_encode([$dataLayer],JSON_PRETTY_PRINT);
-
-        unset($dataLayer["user"]["http"]); // das brauchen wir hier nicht
-
-        $cl = $this->getActiveClassName();
-        if( $cl === "content" ) $dataLayer["page"]["type"] = "cms";
-        elseif( $cl === "details" ) $dataLayer["page"]["type"] = "product";
-        elseif( in_array($cl,["alist","search"]) ) $dataLayer["page"]["type"] = "listing";
-        elseif( in_array($cl,["basket","user","payment","order","thankyou"]) ) $dataLayer["page"]["type"] = "checkout";
-
-
-        return json_encode([$dataLayer],JSON_PRETTY_PRINT);
-        /*
-                // --- Produktdaten ---
-                $transactionProducts = [];
-                foreach($oOrder->getOrderArticles() as $_prod ) $transactionProducts[] = [
-                    'name' => '', // (erforderlich)	Produktname	String
-                    'sku' => '', // (erforderlich)	Produkt-SKU	String
-                    'category' => '', // (optional)	Produktkategorie	String
-                    'price' => '', // (erforderlich)	Preis pro Einheit	Numerischer Wert
-                    'quantity' => '' // (erforderlich)	Anzahl der Artikel	Numerischer Wert
-                ];
-
-                // --- Transaktionsdaten ---
-
-                $dataLayer['transactionId'] = $oOrder->oxorder__oxordernr->value; // (erforderlich)	Eindeutige Transaktionskennung	String
-                $dataLayer['transactionAffiliation'] = $oShop->oxshops__oxname->value; // (optional)	Partner oder Geschäft	String
-                $dataLayer['transactionTotal'] = $oOrder->oxorder__oxtotalordersum->value; // (erforderlich)	Gesamtwert der Transaktion	Numerischer Wert
-                $dataLayer['transactionShipping'] = $oOrder->oxorder__oxdelcost->value; // (optional)	Versandkosten für die Transaktion	Numerischer Wert
-                $dataLayer['transactionTax'] = ''; // (optional)	Steuerbetrag für die Transaktion	Numerischer Wert
-                $dataLayer['transactionProducts'] = $transactionProducts; // (optional)	Liste der bei der Transaktion erworbenen Artikel	Array von Produktobjekten
-        */
-    }
-
-    public function isPromotionList($listId)
-    {
-        $oConfig = Registry::getConfig();
-        $aPromotionListIds = $oConfig->getConfigParam("") ?? [ 'bargainItems', 'newItems', 'topBox', 'alsoBought', 'accessories', 'cross' ];
-
-
-    }
-}

Application/Model/ManagerHandler.php

@@ -0,0 +1,53 @@
+<?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";
+    }
+}

Application/Model/ManagerTypes.php

@@ -0,0 +1,66 @@
+<?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);
+    }
+}

Application/translations/de/module_lang.php

@@ -1,39 +0,0 @@
-<?php
-/**
- * [bla] tag-manager
- * Copyright (C) 2018  bestlife AG
- * info:  oxid@bestlife.ag
- *
- * This program is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
- * either version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
- **/
-
-$aLang = [
-	'charset'                 => 'UTF-8',
-
-	// das hier wird nicht mehr benötigt, aber ich lasse es drin, falls doch
-	// leserliche Namen für product list performance (GA)
-	'VT_GTM_EE_productList'  => 'Kategorie',
-	'VT_GTM_EE_categoryList' => 'Kategorie',
-	'VT_GTM_EE_searchList'   => 'Suchergebnisse',
-	'VT_GTM_EE_cross'        => 'Crossselling',
-	'VT_GTM_EE_accessories'  => 'Zubehör',
-	'VT_GTM_EE_alsoBought'   => 'Kunden kaufen auch',
-	'VT_GTM_EE_last'         => 'Zuletzt angesehen',
-	'VT_GTM_EE_bargainItems' => 'Angebot der Woche',
-	'VT_GTM_EE_newItems'     => 'Frisch eingetroffen',
-	'VT_GTM_EE_topBox'       => 'Topseller',
-	// ab hier wird wieder benötigt
-
-	// Dimensionen im checkout
-	'VT_GTM_EE_LOGINOPTION'  => 'Bestandskunde',
-	'VT_GTM_EE_LOGINOPTION1' => 'Gastbestellung',
-	'VT_GTM_EE_LOGINOPTION2' => 'Bestandskunde',
-	'VT_GTM_EE_LOGINOPTION3' => 'Neukunde'
-
-];

Application/translations/en/blagtm_lang.php

@@ -1,37 +0,0 @@
-<?php
-/**
- * [bla] tag-manager
- * Copyright (C) 2018  bestlife AG
- * info:  oxid@bestlife.ag
- *
- * This program is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
- * either version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
- **/
-
-$aLang = [
-	'charset'                 => 'UTF-8',
-
-
-	// das hier wird nicht mehr benötigt, aber ich lasse es drin, falls doch
-	// leserliche Namen für product list performance (GA)
-	'VT_GTM_EE_productList'  => 'Category',
-	'VT_GTM_EE_searchList'   => 'Search',
-	'VT_GTM_EE_cross'        => 'Crossselling',
-	'VT_GTM_EE_accessories'  => 'Accessories',
-	'VT_GTM_EE_last'         => 'Last Seen',
-	'VT_GTM_EE_bargainItems' => 'Offer of the Week',
-	'VT_GTM_EE_newItems'     => 'Just Arrived',
-	'VT_GTM_EE_topBox'       => 'Topseller',
-	// ab hier wird wieder benötigt
-
-	// Dimensionen im checkout
-	'VT_GTM_EE_LOGINOPTION'  => 'Existing Customer',
-	'VT_GTM_EE_LOGINOPTION1' => 'Guest',
-	'VT_GTM_EE_LOGINOPTION2' => 'Existing Customer',
-	'VT_GTM_EE_LOGINOPTION3' => 'New Customer'
-];

Application/views/admin/de/module_options.php

@@ -1,31 +1,53 @@
 <?php
-
-/*
- * vanilla-thunder/oxid-module-gtm
- * Google Tag Manager Integration for OXID eShop v6.2+
+/**
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
  *
- * This program is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
- * either version 3 of the License, or (at your option) any later version.
+ * https://www.d3data.de
  *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
  */
 
 $style = '<style type="text/css">
 .groupExp a.rc b {font-size:medium;color:#ff3600;}
 .groupExp dt .txt,
 .groupExp dt .select,
- .groupExp dt .txtfield {width:250px !important; margin: 2px !important; padding: 1px 4px !important; border: 1px solid #ccc !important; }
+.groupExp dt .txtfield {width:250px !important; margin: 2px !important; padding: 1px 4px !important; border: 1px solid #ccc !important; }
 .groupExp dt textarea.txtfield { min-height: 125px;}
 .groupExp dl { display:block !important;}
 input.confinput {position:fixed;top:20px;right:70px;background:#008B2D;padding:10px 25px;color:white;border:1px solid black;cursor:pointer;font-size:125%;}
 input.confinput:hover {outline:3px solid #ff3600;}
 </style>';
 $aLang = [
-    'charset'                             => 'UTF-8',
-    'SHOP_MODULE_GROUP_vt_gtm_settings'   => $style . 'Einstellungen',
-    'SHOP_MODULE_vt_gtm_containerid'      => 'Container ID',
-    'SHOP_MODULE_vt_gtm_promotionlistids' => 'Promotion Produktlisten IDs <div>Weitere Infos zu dieser Einstellung: <b><u><a href="https://github.com/vanilla-thunder/oxid-module-gtm/wiki/Promotion-Produktlisten" target="_blank">Modui-Wiki</a></u></b></div>',
+    'charset'                               => 'UTF-8',
+    'SHOP_MODULE_d3_gtm_sContainerID'      => 'Container ID',
+    'SHOP_MODULE_GROUP_d3_gtm_settings'     => 'Einstellungen',
+    'SHOP_MODULE_d3_gtm_blGA4enab'          => 'GA4 Aktivieren',
+    'SHOP_MODULE_d3_gtm_blUAenabled'        => 'UA Aktivieren',
+    'SHOP_MODULE_d3_gtm_blEnableDebug'      => 'Debug-Modus aktivieren',
+
+    // 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.
+                                                        '
 ];

Application/views/blocks/_gtm_js.tpl

@@ -1,24 +1,25 @@
-[{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" }]
+[{* Always prepare the data layer to avoid errors *}]
+<script>
+  var dataLayer = [{$oViewConf->getGtmDataLayer()}] || [];
+</script>
 
+[{if $oViewConf->D3blShowGtmScript()}]
+    [{if $oViewConf->getGtmContainerId()}]
+        [{strip}]
+            <!-- Google Tag Manager -->
+            <script [{$oViewConf->getGtmScriptAttributes()}]>
+              (function (w, d, s, l, i) {
+                w[l] = w[l] || [];
+                w[l].push({'gtm.start': new Date().getTime(), event: 'gtm.js'});
+                var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
+                j.async = true;
+                j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
+                f.parentNode.insertBefore(j, f);
+              })(window, document, 'script', 'dataLayer', '[{$oViewConf->getGtmContainerId()}]');
+            </script>
+            <!-- End Google Tag Manager -->
+        [{/strip}]
     [{/if}]
-[{/strip}][{/if}]
-[{$smarty.block.parent}]
+[{/if}]
+
+[{$smarty.block.parent}]

Application/views/blocks/_gtm_nojs.tpl

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

Application/views/blocks/_impression.tpl

@@ -1,66 +0,0 @@
-[{$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}]
-*}]

Application/views/blocks/add_to_cart.tpl

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

Application/views/blocks/checkout_s1.tpl

@@ -1,57 +0,0 @@
-[{strip}]
-    [{assign var='gtmCartArticles' value=$oView->getBasketArticles()}]
-    <script>
-        dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-        dataLayer.push({
-            'event': 'ee.checkout',
-            'eventLabel':'Checkout Step 1',
-            'ecommerce': {
-                'checkout': {
-                    'actionField': {'step': 1},
-                    'products': [
-                        [{foreach from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents  key=basketindex}]
-                        [{assign var='_price' value=$basketitem->getUnitPrice()}]
-                        {
-                            'id': '[{$gtmCartArticles[$basketindex]->oxarticles__oxartnum->value}]',
-                            'name': '[{$gtmCartArticles[$basketindex]->oxarticles__oxtitle->value}]',
-                            'variant': '[{$gtmCartArticles[$basketindex]->oxarticles__oxvarselect->value}]',
-                            'price': [{$_price->getPrice()}],
-                            'quantity':[{$basketitem->getAmount()}],
-                            'position':[{$smarty.foreach.gtmCartContents.index}]
-                        }[{if !$smarty.foreach.gtmCartContents.last}],[{/if}]
-                        [{/foreach}]
-                    ]
-                }
-            }
-        });
-        [{*
-        var gtmCartContents = {[{foreach key=basketindex from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents}]
-            '[{$basketindex}]':{ 'id':'[{$gtmCartArticles[$basketindex]->oxarticles__oxartnum->value}]' }[{if !$smarty.foreach.gtmCartContents.last}],[{/if}][{/foreach}]
-        };
-
-                [{capture name='removeFromBasket'}]
-                $('#basketRemove').on('click', function() {
-                    var _checked = [],
-                        _products = [];
-
-                    $('input:checkbox:checked[name^="aproducts"][name*="remove"]').each(function() { _checked.push($(this).attr('name').replace('aproducts[','').replace('][remove]','')); });
-                    if(_checked.length == 0) return;
-                    _checked.forEach(function(_oxid) { _products.push({ 'id':gtmCartContents[_oxid].id}) });
-
-                    dataLayer.push({
-                        'event':'ee.removeFromCart',
-                        'ecommerce': {
-                            'currencyCode': '[{$currency->name}]',
-                            'remove': {
-                                'products': _products
-                            }
-                        }
-
-                    });
-                });
-                [{/capture }]
-        [{oxscript add=$smarty.capture.removeFromBasket}]
-        *}]
-    </script>
-[{/strip}]
-[{$smarty.block.parent}]

Application/views/blocks/checkout_s2.tpl

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

Application/views/blocks/checkout_s3.tpl

@@ -1,9 +0,0 @@
-<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}]

Application/views/blocks/checkout_s4.tpl

@@ -1,9 +0,0 @@
-<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}]

Application/views/blocks/checkout_s5.tpl

@@ -1,37 +0,0 @@
-[{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': 'ee.transaction',
-        'eventLabel':'Checkout Step 5',
-        'ecommerce': {
-            'purchase': {
-                'actionField': {
-                    'id':'[{$_gtmOrder->oxorder__oxordernr->value}]',
-                    'affiliation':'[{$oxcmp_shop->oxshops__oxname->value}]',
-                    'revenue':'[{$_gtmOrder->oxorder__oxtotalordersum->value}]',
-                    'tax':'[{math equation="x+y" x=$_gtmOrder->oxorder__oxartvatprice1->value y=$_gtmOrder->oxorder__oxartvatprice2->value }]',
-                    'shipping':'[{$_gtmOrder->oxorder__oxdelcost->value}]'
-                    /*'coupon':'CANO25' //if a coupon code was used for this order*/
-                },
-                'products':[
-                    [{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}]
-[{$smarty.block.parent}]

Application/views/blocks/detail.tpl

@@ -1,27 +0,0 @@
-[{$smarty.block.parent}]
-[{assign var="gtmProduct" value=$oView->getProduct()}]
-[{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
-[{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
-[{strip}][{/strip}]
-<script>
-    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-    dataLayer.push({
-        'event': 'ee.detail',
-        'eventLabel':'Product View',
-        'ecommerce': {
-            'currencyCode': '[{$currency->name}]',
-            'detail': {
-                'products': [
-                    {
-                        'name': '[{$gtmProduct->oxarticles__oxtitle->value}]',
-                        'id': '[{$gtmProduct->oxarticles__oxartnum->value}]',
-                        'price': [{$gtmProduct->oxarticles__oxprice->value}],
-                        'brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-                        'category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
-                        'variant': '[{if $gtmProduct->oxarticles__oxvarselect->value}][{$gtmProduct->oxarticles__oxvarselect->value}][{/if}]'
-                    }
-                ]
-            }
-        }
-    });
-</script>

Application/views/blocks/details_productmain_tobasket.tpl

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

Application/views/blocks/impression.tpl

@@ -1,35 +0,0 @@
-[{$smarty.block.parent}]
-[{assign var="gtmProduct" value=$oView->getProduct()}]
-[{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
-[{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
-<script>
-    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-    dataLayer.push({
-        'event': 'ee.impression',
-        'eventLabel':'Impression',
-        'ecommerce': {
-            'currencyCode': '[{$currency->name}]',
-            'impressions': [
-                {
-                    'name': '[{$gtmProduct->oxarticles__oxtitle->value}]',
-                    'id': '[{$gtmProduct->oxarticles__oxartnum->value}]',
-                    'price': [{$gtmProduct->oxarticles__oxprice->value}],
-                    'brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-                    'category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
-                    'variant': '[{if $gtmProduct->oxarticles__oxvarselect->value}][{$gtmProduct->oxarticles__oxvarselect->value}][{/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->getIndex()}]
-listId [{$listId}] | [{$oView->getViewParameter('listId')}]
-testid [{$testid}] | [{$oView->getViewParameter('testid')}]
--->

Application/views/blocks/page_list_listbody.tpl

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

Application/views/blocks/purchase.tpl

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

Application/views/blocks/remove_from_cart.tpl

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

Application/views/blocks/start_welcome_text.tpl

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

Application/views/blocks/view_cart.tpl

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

Application/views/blocks/view_item.tpl

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

Application/views/blocks/view_item_list.tpl

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

Application/views/blocks/view_search_result.tpl

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

Application/views/event/add_to_cart.tpl

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

Application/views/event/purchase.tpl

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

Application/views/event/remove_from_cart.tpl

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

Application/views/event/view_cart.tpl

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

Application/views/event/view_item.tpl

@@ -0,0 +1,41 @@
+[{assign var="gtmProduct" value=$oView->getProduct()}]
+[{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
+[{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+
+[{block name="d3_ga4_view_item_block"}]
+    [{capture name="d3_ga4_view_item"}]
+        [{strip}]
+            dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+
+            dataLayer.push({
+                'event': 'view_item',
+                'eventLabel':'Product View',
+                'ecommerce':
+                {
+                    'currency': '[{$currency->name}]',
+                    'items':
+                        [
+                            {
+                                'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
+                                'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
+                                'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+                                'item_variant': '[{if $gtmProduct->getFieldData("oxvarselect")}][{$gtmProduct->getFieldData("oxvarselect")}][{/if}]',
+                                [{if $gtmCategory}]
+                                'item_category':  '[{$gtmCategory->getSplitCategoryArray(0, true)}]',
+                                'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1, true)}]',
+                                'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2, true)}]',
+                                'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3, true)}]',
+                                'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
+                                [{/if}]
+                                [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
+                                'price': [{$d3PriceObject->getPrice()}]
+                            }
+                        ]
+                }[{if $oViewConf->isDebugModeOn()}],
+                'debug_mode': 'true'
+                [{/if}]
+            });
+        [{/strip}]
+    [{/capture}]
+    [{oxscript add=$smarty.capture.d3_ga4_view_item}]
+[{/block}]

Application/views/event/view_item_list.tpl

@@ -0,0 +1,45 @@
+[{assign var="gtmProducts" value=$oView->getArticleList()}]
+[{assign var="gtmCategory" value=$oView->getActiveCategory()}]
+
+[{assign var="breadCrumb" value=''}]
+
+[{block name="d3_ga4_view_item_list_block"}]
+    [{if $gtmProducts|@count}]
+        [{capture name="d3_ga4_view_item_list"}]
+            [{strip}]
+                dataLayer.push({ecommerce: null});
+                dataLayer.push({
+                    'event':'view_item_list',
+                    'event_name': 'view_item_list',
+                    'ecommerce': {
+                        'item_list_id': '[{$oView->getCategoryId()}]',
+                        'item_list_name': '[{foreach from=$oView->getBreadCrumb() item=sCrum}][{if $sCrum.title }][{$breadCrumb|cat:$sCrum.title|cat:" > "}][{/if}][{/foreach}]',
+                        'items': [
+                            [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
+                            [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
+                            [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+                            [{if !$gtmCategory}][{assign var="gtmCategory" value=$gtmProduct->getCategory()}][{/if}]
+                            {
+                                'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
+                                'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
+                                'price': [{$d3PriceObject->getPrice()}],
+                                'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+                                [{if $gtmCategory}]
+                                'item_category':  '[{$gtmCategory->getSplitCategoryArray(0, true)}]',
+                                'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1, true)}]',
+                                'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2, true)}]',
+                                'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3, true)}]',
+                                [{/if}]
+                                'quantity': 1
+                            }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
+                            [{/foreach}]
+                        ]
+                    }[{if $oViewConf->isDebugModeOn()}],
+                    'debug_mode': 'true'
+                    [{/if}]
+                });
+            [{/strip}]
+        [{/capture}]
+        [{oxscript add=$smarty.capture.d3_ga4_view_item_list}]
+    [{/if}]
+[{/block}]

Application/views/event/view_search_result.tpl

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

Application/views/ga4/add_to_cart.tpl

@@ -1,41 +0,0 @@
-[{strip}]
-    [{$gtmProduct|@var_dump}]
-    [{* 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">
-
-        var itemCategories = '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]no category[{/if}]'.split('/');
-        //console.log(itemCategories);
-        var _gtmProduct = {
-            'item_name': '[{$gtmProduct->oxarticles__oxtitle->value}]',
-            'item_id': '[{$gtmProduct->oxarticles__oxartnum->value}]',
-            'price': '[{$gtmProduct->oxarticles__oxprice->value}]',
-            'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-            'item_variant': '[{if $gtmProduct->oxarticles__oxvarselect->value}][{$gtmProduct->oxarticles__oxvarselect->value}][{/if}]',
-            'item_category': itemCategories[0] || 'no category',
-            'item_category_2': itemCategories[1] || '',
-            'item_category_3': itemCategories[2] || '',
-            'item_category_4': itemCategories[3] || '',
-            [{if false}]
-            'item_list_name': 'Search Results',  // If associated with a list selection.
-            'item_list_id': 'SR123',  // If associated with a list selection.
-            'index': 1,  // If associated with a list selection.
-            [{/if}]
-            'quantity': '1'
-        };
-
-        console.log(_gtmProduct);
-        dataLayer.push({
-            'event':'ecommerce',
-            'ga4event': 'add_to_cart',
-            'ecommerce': {
-                'items': [ _gtmProduct ]
-            }
-        });
-
-    </script>
-    *}]
-[{/strip}]

Application/views/ga4/view_item.tpl

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

Application/views/ga4/view_item_list.tpl

@@ -1,51 +0,0 @@
-[{if $gtmProducts|@count}]
-[{strip}]
-    <script>
-        /* ga4 */
-        dataLayer.push({ecommerce: null});
-        dataLayer.push({
-            'event':'GA4_event',
-            'event_name': 'view_item_list',
-            'ecommerce': {
-                '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}]
-                ]
-            }
-        });
-        /* ua */
-        dataLayer.push({ecommerce: null});
-        dataLayer.push({
-            'event':'UA_event',
-            'event_name': 'view_item_list',
-            'ecommerce': {
-                'currencyCode':'EUR',
-                'impressions': [
-                    [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
-                    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
-                    [{if !$gtmCategory}][{assign var="gtmCategory" value=$gtmProduct->getCategory()}][{/if}]
-                    {
-                        'id': '[{$gtmProduct->getFieldData("oxartnum")}]',
-                        'name': '[{$gtmProduct->getFieldData("oxtitle")}]',
-                        'price': [{$gtmProduct->oxarticles__oxprice->value|default:'0'}],
-                        'brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-                        'category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
-                        'position': [{$smarty.foreach.gtmProducts.iterator|default:1}]
-                    }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
-                    [{/foreach}]
-                ]
-            }
-        });
-    </script>
-[{/strip}]
-[{/if}]

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

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

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

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

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

@@ -0,0 +1,44 @@
+[{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"}]

Application/views/ua/impression.tpl

@@ -1,29 +0,0 @@
-[{strip}]
-    [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
-    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
-    <script>
-        /* UA */
-        dataLayer.push({ecommerce: null});
-        dataLayer.push({
-            'event': 'UA_ecommerce',
-            'event_name': 'Impression',
-            'ecommerce': {
-                'currencyCode': '[{$currency->name}]',
-                'impressions': [
-                    {
-                        'name': '[{$gtmProduct->oxarticles__oxtitle->value}]',
-                        'id': '[{$gtmProduct->oxarticles__oxartnum->value}]',
-                        'price': [{$gtmProduct->oxarticles__oxprice->value}],
-                        'brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-                        'category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]no category[{/if}]',
-                        'variant': '[{if $gtmProduct->oxarticles__oxvarselect->value}][{$gtmProduct->oxarticles__oxvarselect->value}][{/if}]'
-                        [{if $list && $position}],
-                        'list': '[{$list}]',
-                        'position': [{"_"|str_replace:"":$position}]
-                        [{/if}]
-                    }
-                ]
-            }
-        });
-    </script>
-[{/strip}]

Application/views/ua/s1_cart.tpl

@@ -1,62 +0,0 @@
-[{strip}]
-    [{assign var="gtmCartArticles" value=$oView->getBasketArticles()}]
-    <script>
-        dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});
-        dataLayer.push({
-            "event":"enhanced-ecommerce",
-            "ecommerce": {
-                "checkout": {
-                    "actionField": {"step":1},
-                    "products": [
-[{foreach key=basketindex from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents}]
-                        [{assign var="_price" value=$basketitem->getPrice()}]
-                        {
-                            'id':'[{$gtmCartArticles[$basketindex]->oxarticles__oxartnum->value}]',
-                            'name': '[{$gtmCartArticles[$basketindex]->oxarticles__oxtitle->value}]',
-                            'variant':'[{$gtmCartArticles[$basketindex]->oxarticles__oxvarselect->value}]',
-                            'price': [{$_price->getPrice()}],
-                            'quantity':[{$basketitem->getAmount()}],
-                            'position':[{$smarty.foreach.gtmCartContents.index}]
-                        }[{if !$smarty.foreach.gtmCartContents.last}],[{/if}]
-[{/foreach}]
-                    ]
-                }
-            }
-        });
-
-        var gtmCartContents = {
-            [{foreach key=basketindex from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents}]
-            '[{$basketindex}]':{
-                'id':'[{$gtmCartArticles[$basketindex]->oxarticles__oxartnum->value}]'
-            }[{if !$smarty.foreach.gtmCartContents.last}],[{/if}]
-            [{/foreach}]
-        };
-
-        [{capture name="removeFromBasket"}]
-            $("#basketRemove").on("click", function() {
-               var _checked = [],
-                   _products = [];
-
-               $("input:checkbox:checked[name^='aproducts'][name*='remove']").each(function() { _checked.push($(this).attr('name').replace("aproducts[","").replace("][remove]","")); });
-                if(_checked.length == 0) return;
-                _checked.forEach(function(_oxid) { _products.push({ 'id':gtmCartContents[_oxid].id}) });
-
-                dataLayer.push({
-                    'event':'ee.removeFromCart',
-                    'ecommerce': {
-                        'currencyCode': '[{$currency->name}]',
-                        'remove': {
-                            'products': _products
-                        }
-                    }
-
-                });
-            });
-            /*
-
-         */
-        [{/capture}]
-        [{oxscript add=$smarty.capture.removeFromBasket}]
-    </script>
-[{/strip}]
-[{$smarty.block.parent}]

Application/views/ua/s2_user.tpl

@@ -1,13 +0,0 @@
-<script>
-    dataLayer.push({
-        'event':'ee.checkout',
-        'eventLabel':'Checkout 2',
-        'ecommerce': {
-            'checkout': { 'actionField': {
-                'step': 2,
-                'option':'[{oxmultilang ident="VT_GTM_EE_LOGINOPTION"|cat:$oView->getLoginOption()}]'
-            } }
-        }
-    });
-</script>
-[{$smarty.block.parent}]

Application/views/ua/s3_payment.tpl

@@ -1,8 +0,0 @@
-<script>
-    dataLayer.push({
-        'event': 'ee.checkout',
-        'eventLabel': 'Checkout 3',
-        'ecommerce': {'checkout': {'actionField': {'step': 3}}}
-    });
-</script>
-[{$smarty.block.parent}]

Application/views/ua/s4_order.tpl

@@ -1,8 +0,0 @@
-<script>
-    dataLayer.push({
-        "event": "ee.checkout",
-        'eventLabel': 'Checkout 4',
-        "ecommerce": {"checkout": {"actionField": {"step": 4}}}
-    });
-</script>
-[{$smarty.block.parent}]

Application/views/ua/s5_thankyou.tpl

@@ -1,44 +0,0 @@
-<script>
-[{*
-    dataLayer.push({
-        'event': 'ee.checkout',
-            'eventLabel':'Checkout 5',
-        'ecommerce': {'checkout': {'actionField': {'step': 5}}}
-    });
-*}]
-    [{assign var="_gtmOrder" value=$oView->getOrder()}]
-    [{assign var="_gtmBasket" value=$_gtmOrder->getBasket()}]
-    [{assign var="_gtmArticles" value=$_gtmOrder->getOrderArticles()}]
-    
-    dataLayer.push({
-        'event': 'ee.transaction',
-        'eventLabel':'[{oxmultilang ident="ORDER_COMPLETED"}]',
-        'ecommerce': {
-            'purchase': {
-                'actionField': {
-                    'id':'[{$_gtmOrder->oxorder__oxordernr->value}]',
-                    'affiliation':'[{$oxcmp_shop->oxshops__oxname->value}]',
-                    'revenue':'[{$_gtmOrder->oxorder__oxtotalordersum->value}]',
-                    'tax':'[{math equation="x+y" x=$_gtmOrder->oxorder__oxartvatprice1->value y=$_gtmOrder->oxorder__oxartvatprice2->value }]',
-                    'shipping':'[{$_gtmOrder->oxorder__oxdelcost->value}]'
-                    /*'coupon':'CANO25' //if a coupon code was used for this order*/
-                },
-                'products':[
-                    [{foreach key="_index" from=$_gtmBasket->getContents() item="_gtmBasketitem" name="gtmTransactionProducts"}]
-                    [{assign var="_price" value=$_gtmBasketitem->getPrice()}]
-                    {
-                        'id':'[{$_gtmArticles[$_index]->oxarticles__oxartnum->value}]',
-                        'name': '[{$_gtmArticles[$_index]->oxarticles__oxtitle->value}]',
-                        'variant':'[{$_gtmArticles[$_index]->oxarticles__oxvarselect->value}]',
-                        'price': [{$_price->getPrice()}],
-                        'item_price': [{$_price->getPrice()}],
-                        'quantity':[{$_gtmBasketitem->getAmount()}],
-                        'position':[{$smarty.foreach.gtmTransactionProducts.iteration}]
-                    }[{if !$smarty.foreach.gtmTransactionProducts.last}],[{/if}]
-                    [{/foreach}]
-                ]
-            }
-        }
-    });
-</script>
-[{$smarty.block.parent}]

CHANGELOG.md

@@ -0,0 +1,126 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.15.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.15.0...1.15.1) - 2024-04-11
+### Fixed
+- false processing of template during missing necessary-component
+
+## [1.15.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.14.0...1.15.0) - 2024-01-25
+### Fixed
+- missing Component-ArticleDetails extension, missing ManufacturerListController extension
+
+## [1.14.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.13.0...1.14.0) - 2024-01-03
+### Added
+- add_to_cart Event to several new shop-pages (landing-page, Account, category article-list, start)
+- PHPStan code-cleanup
+### Changed
+- template structure
+- code cleanup
+
+## [1.13.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.12.0...1.13.0) - 2023-09-13
+### Added
+- extended Docs
+### Changed
+- control-param name
+- control-param function
+- adjusted check for set control-param
+- consentmanager-script-adjustments
+
+## [1.12.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.11.1...1.12.0) - 2023-09-07
+### Added
+- cookiebot functionality
+
+## [1.11.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.11.0...1.11.1) - 2023-08-17
+### Fixed
+- metadata class entry
+
+## [1.11.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.10.0...1.11.0) - 2023-08-16
+### Added
+- remove_from_cart
+- auto debug_mode setter
+- manufacturer extension for breadcrumb
+### Changed
+- general template cleanup
+
+## [1.10.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.9.0...1.10.0) - 2023-06-27
+### Added
+- Following Entries to dedicated event-templates
+  - coupon
+  - paymentType
+  - item_list_name
+  - item_category
+- Method to get the in order used Payment-Name
+- Method to get the current Article Category
+### Changed
+- cookieManager handling
+- general template cleanup
+- renaming the template to a more intuitive name
+
+## [1.9.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.8.0...1.9.0) - 2023-06-19
+### 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
+
+## [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
+### Added
+- publication of app features

Docs/CMP/consentmanager.md

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

Docs/README.md

@@ -0,0 +1,93 @@
+# 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.
+Die Einbindung dieser Event-Templates erfolgt über TPL-Blöcke unter `source/modules/d3/googleanalytics4/Application/views/blocks/`.  
+*Hinweis: nicht alle templates sind bereits gefüllt. Wünschen Sie die Implementierung eines unausgefüllten templates?
+Kommen Sie auf uns zu unter https://www.d3data.de/
+
+## Steuerungsparameter
+Tragen Sie hier im Normalfall die ID des zu prüfenden Cookies ein.  
+In bestimmten Fällen, müssen Sie hier alternative Werte eintragen. Diese Fälle sind bedingt
+nach der gewählten CMP (Consent Manager Platform).  
+  
+> nähere Infos unter [CMP](#consent-manager-platform-cmp)  
+
+## Blöcke
+Für den geregelten Ablauf sind folgende Blöcke nötig:
+- Suchergebnisse
+    - Blockname: search_results
+    - Datei: page/search/search.tpl
+    - GA4 Event: view_search_results
+- Artikelliste
+    - Blockname: page_list_productlist
+    - Datei: page/list/list.tpl
+    - GA4 Event: view_item_list
+- Detailseite
+    - Blockname: details_productmain_title
+    - Datei: page/details/inc/productmain.tpl
+    - GA4 Event: view_item
+- dem WK hinzufügen (button)
+    - 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
+    - GA4 Event: view_cart
+- abgeschlossener Kauf
+    - Blockname: checkout_thankyou_main
+    - Datei: page/checkout/thankyou.tpl
+    - GA4 Event: purchase
+
+## 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:
++ **page.type** - Seitentyp: default / cms / product / listing / checkout (an google analytics angelehnt)
++ **page.title** - Seitentitel (außer Startseite, sie hat keinen Titel)
++ **page.cl** - OXID Controller Klasse (start, search, etc)
++ **userid** - oxId vom Benutzer bzw `false` falls nicht eingeloggt
++ **sessionid** - session iD
+
+Alle für Ecommerce Tracking relevanten Daten werden mit speziellen Ecommerce Events in die Datenschicht eingefügt.
+
+## 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.

IntelliSenseHelper.php

@@ -0,0 +1,68 @@
+<?php
+
+/**
+ * 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 <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
+ */
+
+namespace D3\GoogleAnalytics4\Modules\Core{
+    class ViewConfig_parent extends \OxidEsales\Eshop\Core\ViewConfig{}
+}
+
+namespace D3\GoogleAnalytics4\Modules\Application\Model{
+    class Category_parent extends \OxidEsales\Eshop\Application\Model\Category {}
+    class Basket_parent extends \OxidEsales\Eshop\Application\Model\Basket {}
+    class Manufacturer_parent extends \OxidEsales\Eshop\Application\Model\Manufacturer {}
+}
+
+namespace D3\GoogleAnalytics4\Modules\Application\Controller{
+
+    use OxidEsales\Eshop\Application\Controller\AccountNoticeListController;
+    use OxidEsales\Eshop\Application\Controller\AccountRecommlistController;
+    use OxidEsales\Eshop\Application\Controller\AccountWishlistController;
+    use OxidEsales\Eshop\Application\Controller\Admin\ManufacturerController;
+    use OxidEsales\Eshop\Application\Controller\ArticleListController;
+    use OxidEsales\Eshop\Application\Controller\SearchController;
+    use OxidEsales\Eshop\Application\Controller\StartController;
+
+    class BasketController_parent extends \OxidEsales\Eshop\Application\Controller\BasketController {}
+    class ThankYouController_parent extends \OxidEsales\Eshop\Application\Controller\ThankYouController {}
+
+    class ArticleListController_AddToCartHelpMethods_parent extends ArticleListController {}
+
+    class ArticleDetailsController_parent extends \OxidEsales\Eshop\Application\Controller\ArticleDetailsController {}
+
+    class d3GtmAccountNoticeListController_parent extends AccountNoticeListController {}
+
+    class d3GtmAccountRecommlistController_parent extends AccountRecommlistController {}
+
+    class d3GtmAccountWishlistController_parent extends AccountWishlistController {}
+
+    class d3GtmStartController_parent extends StartController {}
+
+    class d3GtmSearchController_parent extends SearchController {}
+
+    class d3GtmManufacturerListController_parent extends ManufacturerController {}
+}
+
+namespace D3\GoogleAnalytics4\Modules\Application\Component{
+
+    use OxidEsales\Eshop\Application\Component\BasketComponent;
+
+    class d3GtmBasketComponentExtension_parent extends BasketComponent {}
+}
+
+namespace D3\GoogleAnalytics4\Modules\Application\Component\Widget{
+
+    use OxidEsales\Eshop\Application\Component\Widget\ArticleDetails;
+
+    class d3GtmWidgetArticleDetails_parent extends ArticleDetails {}
+}

Modules/Application/Component/Widget/d3GtmWidgetArticleDetails.php

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

Modules/Application/Component/d3GtmBasketComponentExtension.php

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

Modules/Application/Controller/ArticleDetailsController.php

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

Modules/Application/Controller/ArticleListController_AddToCartHelpMethods.php

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

Modules/Application/Controller/BasketController.php

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

Modules/Application/Controller/ThankYouController.php

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

Modules/Application/Controller/d3GtmAccountNoticeListController.php

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

Modules/Application/Controller/d3GtmAccountRecommlistController.php

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

Modules/Application/Controller/d3GtmAccountWishlistController.php

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

Modules/Application/Controller/d3GtmManufacturerListController.php

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

Modules/Application/Controller/d3GtmSearchController.php

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

Modules/Application/Controller/d3GtmStartController.php

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

Modules/Application/Model/Basket.php

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

Modules/Application/Model/Category.php

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

Modules/Application/Model/Manufacturer.php

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

Modules/Core/ViewConfig.php

@@ -0,0 +1,206 @@
+<?php
+/**
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
+ */
+
+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');
+        }
+        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;
+
+    
+    public function isGA4enabled()
+    {
+        if ($this->blGA4enabled === null)
+        {
+            $this->sContainerId = Registry::getConfig()->getConfigParam('d3_gtm_blEnableGA4');
+        }
+
+        return $this->blGA4enabled;
+    }
+
+    public function getGtmDataLayer()
+    {
+        if (!$this->getGtmContainerId()) return "[]";
+
+        $oConfig = Registry::getConfig();
+        $oView   = $oConfig->getTopActiveView();
+
+        /** @var User|false|null $oUser */
+        $oUser = $oConfig->getUser();
+
+        $cl         = $this->getTopActiveClassName();
+        $aPageTypes = [
+            "content"  => "cms",
+            "details"  => "product",
+            "alist"    => "listing",
+            "search"   => "listing",
+            "basket"   => "checkout",
+            "user"     => "checkout",
+            "payment"  => "checkout",
+            "order"    => "checkout",
+            "thankyou" => "checkout",
+            "start"    => "start",
+        ];
+
+        $dataLayer = [
+            'page'      => [
+                'type'  => $aPageTypes[$cl] ?? "unknown",
+                'title' => $oView->getTitle(),
+                'cl'    => $cl,
+            ],
+            'userid'    => $oUser instanceof User ? $oUser->getId() : false,
+            'sessionid' => session_id(),
+            //'httpref'   => $_SERVER["HTTP_REFERER"] ?? "unknown"
+        ];
+
+        return json_encode([$dataLayer], JSON_PRETTY_PRINT);
+    }
+
+    public function isDebugModeOn() :bool
+    {
+        return Registry::getConfig()->getConfigParam('d3_gtm_blEnableDebug');
+    }
+
+    public function isPromotionList($listId)
+    {
+        $oConfig           = Registry::getConfig();
+        $aPromotionListIds = $oConfig->getConfigParam("") ?? ['bargainItems', 'newItems', 'topBox', 'alsoBought', 'accessories', 'cross'];
+    }
+}

README.md

@@ -1,61 +1,86 @@
-# [vt] Google Tag Manager  
-Google Tag Manager integration for OXID eShop v6.2 und höher  
-module version 0.2.0 ( 2018-12-04 )
+[![deutsche Version](https://logos.oxidmodule.com/de2_xs.svg)](README.md)
 
-# Installation
-* ``composer require vanilla-thunder/oxid-module-gtm --no-update``
+# ![D3 Logo](https://logos.oxidmodule.com/d3logo_24x24.svg) Google-Analytics 4 für OXID eShop
 
-* Inhalt von "copy_this" in den Shop hochladen
-* Modul aktivieren und Moduleinstellungen konfigurieren
+Dieses Modul bietet die Möglichkeit in Ihrem OXID eShop (6.x) die neue 'Property' Google Analytics 4 (GA4) von Google
+zu integrieren.  
+Hierfür stehen Ihnen verschiedene 'templates' zur verfügung, mit denen Sie bestimmte Events tracken können.  
+Beispiele dafür sind: view_item, add_to_basket, purchase, ...
 
-# Tag Manager konfigurieren:
-+ https://support.google.com/tagmanager/answer/9442095
+Weiterführende Informationen: https://developers.google.com/analytics/devguides/collection/ga4
 
+## Inhaltsverzeichnis
 
+- [Installation](#installation)
+- [Verwendung](#verwendung)
+- [Changelog](#changelog)
+- [Lizenz](#lizenz)
 
+## Installation
 
+Dieses Paket erfordert einen mit Composer installierten OXID eShop in einer in der [composer.json](composer.json) definierten Version.
 
-Alle drei unterstützten Tag Manager werden mit Daten aus einer gemeinsamen Datenschicht (dataLayer) gefüttert.   
-Für die einfachste Übersicht der enthaltenen Daten empfehle ich den Vorschau-Modus vom Google Tag Manager.
+Öffnen Sie eine Kommandozeile und navigieren Sie zum Stammverzeichnis des Shops (Elternverzeichnis von source und vendor). Führen Sie den folgenden Befehl aus. Passen Sie die Pfadangaben an Ihre Installationsumgebung an.
 
-Bei jedem Seitenaufruf wird die Datenschicht mit einigen wenigen Infos erstellt, die man zum reinen Erfassen der Seitenaufrufe benötigt:
- + **page.type** - Seitentyp: default / cms / product / listing / checkout (an google analytics angelehnt) 
- + **page.title** - Seitentitel (außer Startseite, sie hat keinen Titel. Danke OXID...)
- + **page.class** - OXID Controller Klasse (start, search, etc)
- + **user.country** - Land des Benutzers, sofern dieser angemeldet ist.
- + **user.httpref** - http referrer
- 
-Alle für Ecommerce Tracking releavanten Daten werden mit speziellen Ecommerce Events in die Datenschicht eingefügt.
-Hier ist ein Beispiel für die Einrichtung von Enhanced Ecomemrce Tracking über Google Tag Manager:
-  
-**"EE-Trigger" für Ecomemrce-Tags (Beispiel für Google Tag Manager):**  
-+ Triggertyp: Benutzerdefiniertes Ereignis
-+ Ereignisname: ``ee\..*``
-+ Übereinstimmung mit regulärem Ausdruck verwenden
-+ Diesen Trigger auslösen bei: Alle benutzerdefinierten Ereignisse
+```bash
+php composer require d3/google-analytics4:^2
+```
 
-**"EE-Tag" für Google Analytics Enhanced Ecommerce:**
-+ Tag-Typ: Google Analytics - Universal Analytics
-+ Tracking-Typ: Ereignis
-+ Aktion: {{Event}}
-+ Label: {{Event Label}}
-+ Trigger : EE-Trigger
+Sofern nötig, bestätigen Sie bitte, dass Sie `package-name` erlauben, Code auszuführen.
 
-Eine Video-Anleitung mit der kompletten Google Analytics Einrichtung folgt in Kürze.
+Aktivieren Sie das Modul im Shopadmin unter "Erweiterungen -> Module".
 
-### Google Analytics 4 Referenz
-https://developers.google.com/tag-manager/ecommerce-ga4
+### 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" 
+den Eintrag 'Google Analytics 4'.
+Aktivieren Sie dieses Modul, um die Funktionalitäten nutzen zu können.
 
-### LICENSE AGREEMENT
-   [bla] tag-manager  
-   Copyright (C) 2018 bestlife AG  
-   info:  oxid@bestlife.ag  
-  
-   This program is free software;  
-   you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
-   either version 3 of the License, or (at your option) any later version.
-  
-   This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;  
-   without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-   You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
+Navigieren Sie danach zum Reiter 'Einstell.'.
+Tragen Sie die nötige sog. 'Container ID' ein. Diese sieht in etwa so aus: 'GTM-W34LLOP'.
+
+Aktivieren Sie GA4 selbst, indem Sie dieses direkt darunter anhaken.
+
+### Technische Infos
+- Navigieren Sie bitte zur [technischen Doku](./Docs/README.md)
+
+---
+
+## Changelog
+
+Siehe [CHANGELOG](CHANGELOG.md) für weitere Informationen.
+
+## Beitragen
+
+Wenn Sie einen Verbesserungsvorschlag haben, legen Sie einen Fork des Repositories an und erstellen Sie einen Pull Request. Alternativ können Sie einfach ein Issue erstellen. Fügen Sie das Projekt zu Ihren Favoriten hinzu. Vielen Dank.
+
+- Erstellen Sie einen Fork des Projekts
+- Erstellen Sie einen Feature Branch (git checkout -b feature/AmazingFeature)
+- Fügen Sie Ihre Änderungen hinzu (git commit -m 'Add some AmazingFeature')
+- Übertragen Sie den Branch (git push origin feature/AmazingFeature)
+- Öffnen Sie einen Pull Request
+
+## Lizenz
+(Stand: 06.05.2021)
+
+Vertrieben unter der GPLv3 Lizenz.
+
+```
+Copyright (c) D3 Data Development (Inh. Thomas Dartsch)
+
+Diese Software wird unter der GNU GENERAL PUBLIC LICENSE Version 3 vertrieben.
+```
+
+Die vollständigen Copyright- und Lizenzinformationen entnehmen Sie bitte der [LICENSE](LICENSE)-Datei, die mit diesem Quellcode verteilt wurde.
+
+## Credits
+Zu diesem Modul haben beigetragen:
+
+- [Marat Bedoev](https://github.com/vanilla-thunder)
+- [Christoph Stäblein [gn2]](https://github.com/reyneke-vosz)
+
+Vielen Dank.

composer.json

@@ -1,30 +1,57 @@
-{
-  "name": "vanilla-thunder/oxid-module-gtm",
-  "description": "Google Tag Manager with new Google Analytics 4 for OXID eShop v6.2+<br/>more about GA4: <a href='https://developers.google.com/tag-manager/ecommerce-ga4' target='_blank'>Ecommerce (GA4) Developer Guide</a>",
-  "type": "oxideshop-module",
-  "homepage": "https://github.com/vanilla-thunder/oxid-module-gtm",
-  "license": [
-    "GPL-3.0"
-  ],
-  "authors": [
-    {
-      "name": "Marat Bedoev",
-      "email": "hello@mb-dev.pro"
-    }
-  ],
-  "extra": {
-    "oxideshop": {
-      "target-directory": "vt/GoogleTagManager"
-    }
-  },
-  "require": {
-    "php": ">=7.1",
-    "oxid-esales/oxideshop-ce": "^v6.2",
-    "google/apiclient":" ^2.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "VanillaThunder\\": "../../../source/modules/vt"
-    }
-  }
+{
+  "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"
+    }
+  }
 }

metadata.php

@@ -1,156 +1,214 @@
 <?php
-/**
- * vanilla-thunder/oxid-module-gtm
- * Google Tag Manager Integration for OXID eShop v6.2+
- *
- * This program is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
- * either version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
- **/
+
+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' => 'vt-gtm',
-    'title' => '[vt] Google Tag Manager',
-    'description' => 'Google Tag Manager Integration for OXID eShop v6.2+',
-    'thumbnail' => 'thumbnail.png',
-    'version' => '0.5.0 ( 2021-07-17 )',
-    'author' => 'Marat Bedoev',
-    'email' => openssl_decrypt("Az6pE7kPbtnTzjHlPhPCa4ktJLphZ/w9gKgo5vA//p4=", str_rot13("nrf-128-pop"), str_rot13("gvalzpr")),
-    'url' => 'https://github.com/vanilla-thunder/oxid-module-gtm',
-    'extend' => [
-        \OxidEsales\Eshop\Core\ViewConfig::class => VanillaThunder\GoogleTagManager\Application\Extend\ViewConfig::class
-    ],
-    'templates' => [
-        // separate ee-event templates for easy integration
-        //'ga4_add_to_cart.tpl' => 'vt/GoogleTagManager/Application/views/ga4/add_to_cart.tpl',
-        //'ga4_view_item.tpl' => 'vt/GoogleTagManager/Application/views/ga4/view_item.tpl',
-        //'ga4_view_item_list.tpl' => 'vt/GoogleTagManager/Application/views/ga4/view_item_list.tpl',
-        'gtm_ua_impression' => 'vt/GoogleTagManager/Application/views/ua/impression.tpl'
-        /*
+$aModule          = [
+    '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>
+                      Hierfür stehen Ihnen verschiedene 'templates' zur verfügung, 
+                      mit denen Sie bestimmte Events tracken können.<br>
+                      Beispiele dafür sind: view_item, add_to_basket, purchase, ...<br><br>
+                      Die Integration und Verbindung zu Google wird mithilfe des gtag (Google Tag Manager) realisiert.<br><br>
+                      Weiterführende Informationen: https://developers.google.com/analytics/devguides/collection/ga4<br>
+                      <hr>
+                      Die Entwicklung basiert auf einem Fork von Marat Bedoev - <a href='https://github.com/vanilla-thunder/oxid-module-gtm'>Github-Link</a>
+                      ",
+    'thumbnail'   => 'thumbnail.png',
+    'version'     => '1.15.1',
+    'author'      => 'Data Development (Inh.: Thomas Dartsch)',
+    'email'       => 'support@shopmodule.com',
+    'url'         => 'https://www.oxidmodule.com/',
+    'extend'      => [
+        // Core
+        OEViewConfig::class                     => ViewConfig::class,
 
-        'gtm_view_promotion.tpl'   => 'vt/GoogleTagManager/Application/views/view_promotion.tpl',
-        'gtm_select_promotion.tpl' => 'vt/GoogleTagManager/Application/views/select_promotion.tpl',
-        'gtm_begin_checkout.tpl'   => 'vt/GoogleTagManager/Application/views/begin_checkout.tpl',
-        */
+        // 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,
     ],
-    'blocks' => [
+    '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',
+    ],
+    'blocks'      => [
         // tag manager js
         [
             'template' => 'layout/base.tpl',
-            'block' => 'head_meta_robots',
-            'file' => '/Application/views/blocks/_gtm_js.tpl'
+            'block'    => 'head_meta_robots',
+            'file'     => '/Application/views/blocks/_gtm_js.tpl',
+            'position' => 150
         ],
         // tag manager nojs
         [
             'template' => 'layout/base.tpl',
-            'block' => 'theme_svg_icons',
-            'file' => '/Application/views/blocks/_gtm_nojs.tpl'
-        ],
-        // add to cart
-        [
-            'template' => 'layout/header.tpl',
-            'block' => 'header_main',
-            'file' => '/Application/views/blocks/add_to_cart.tpl'
-        ],
-        // impressions
-        [
-            'template' => 'widget/product/listitem_grid.tpl',
-            'block' => 'widget_product_listitem_grid',
-            'file' => '/Application/views/blocks/impression.tpl'
-        ],
-        [
-            'template' => 'widget/product/listitem_infogrid.tpl',
-            'block' => 'widget_product_listitem_infogrid',
-            'file' => '/Application/views/blocks/impression.tpl'
-        ],
-        [
-            'template' => 'widget/product/listitem_line.tpl',
-            'block' => 'widget_product_listitem_line',
-            'file' => '/Application/views/blocks/impression.tpl'
+            'block'    => 'theme_svg_icons',
+            'file'     => '/Application/views/blocks/_gtm_nojs.tpl'
         ],
         // details
         [
             'template' => 'page/details/inc/productmain.tpl',
-            'block' => 'details_productmain_title',
-            'file' => '/Application/views/blocks/detail.tpl'
+            'block'    => 'details_productmain_title',
+            'file'     => '/Application/views/blocks/view_item.tpl',
+            'position' => 150
         ],
         // checkout
         [
             'template' => 'page/checkout/basket.tpl',
-            'block' => 'checkout_basket_main',
-            'file' => '/Application/views/blocks/checkout_s1.tpl'
-        ],
-        [
-            'template' => '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'
+            'block'    => 'checkout_basket_main',
+            'file'     => '/Application/views/blocks/view_cart.tpl'
         ],
         [
             'template' => 'page/checkout/thankyou.tpl',
-            'block' => 'checkout_thankyou_main',
-            'file' => '/Application/views/blocks/checkout_s5.tpl'
+            'block'    => 'checkout_thankyou_main',
+            'file'     => '/Application/views/blocks/purchase.tpl'
+        ],
+        // Lists
+        // view_item_list
+        [
+            'template' => 'page/list/list.tpl',
+            'block'    => 'page_list_productlist',
+            'file'     => '/Application/views/blocks/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',
+            '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',
+            'position' => 150
         ]
     ],
-    'settings' => [
+    'settings'    => [
         [
-            'group' => 'vt_gtm_settings',
-            'name' => 'vt_gtm_containerid',
-            'type' => 'str',
-            'value' => 'GTM-',
+            'group'    => 'd3_gtm_settings',
+            'name'     => 'd3_gtm_sContainerID',
+            'type'     => 'str',
+            'value'    => 'GTM-',
             'position' => 0
         ],
         [
-            'group' => 'vt_gtm_settings',
-            'name' => 'vt_gtm_enable_ga4',
-            'type' => 'bool',
-            'value' => true,
+            'group'    => 'd3_gtm_settings',
+            'name'     => 'd3_gtm_blGA4enab',
+            'type'     => 'bool',
+            'value'    => true,
             'position' => 1
         ],
         [
-            'group' => 'vt_gtm_settings',
-            'name' => 'vt_gtm_enable_ua',
-            'type' => 'bool',
-            'value' => true,
-            'position' => 2
+            'group'    => 'd3_gtm_settings',
+            'name'     => 'd3_gtm_blEnableDebug',
+            'type'     => 'bool',
+            'value'    => false,
+            'position' => 999
         ],
         [
-            'group' => 'vt_gtm_settings',
-            'name' => 'vt_gtm_mpapisecret',
-            'type' => 'str',
-            'value' => '',
-            'position' => 3
+            'group'    => 'd3_gtm_settings_cookiemanager',
+            'name'     => 'd3_gtm_settings_hasOwnCookieManager',
+            'type'     => 'bool',
+            'value'    => false,
+            'position' => 999
         ],
         [
-            'group' => 'vt_gtm_settings',
-            'name' => 'vt_gtm_promotionlistids',
-            'type' => 'arr',
-            'value' => [],
-            'position' => 4
-        ]
+            'group'    => 'd3_gtm_settings_cookiemanager',
+            'name'     => 'd3_gtm_settings_controlParameter',
+            'type'     => 'str',
+            'value'    => '',
+            'position' => 999
+        ],
+        [
+            'group' => 'd3_gtm_settings_cookiemanager',
+            'name' => 'd3_gtm_settings_HAS_STD_MANAGER',
+            'type' => 'select',
+            'value' => 'none',
+            'constraints' => 'NONE|CONSENTMANAGER|USERCENTRICS|COOKIEFIRST|COOKIEBOT',
+        ],
     ]
 ];

phpstan.neon

@@ -0,0 +1,16 @@
+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
+    checkMissingIterableValueType: false

phpunit.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0"?>
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         bootstrap="vendor/autoload.php"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory suffix=".php">src</directory>
+    </include>
+    <report>
+      <clover outputFile="build/logs/clover.xml"/>
+    </report>
+  </coverage>
+  <testsuite name="myModule">
+    <directory>./Tests</directory>
+  </testsuite>
+  <logging/>
+</phpunit>