bump version && changelog to 1.6.0

adjusted usercentrics script
added position to block-extension
2023-05-30 08:56:19 +02:00 · 2023-05-26 13:49:50 +02:00 · 2023-05-24 11:09:36 +02:00 · 2023-05-23 14:52:07 +02:00 · 2023-05-23 14:33:35 +02:00 · 2023-05-23 11:44:07 +02:00
38 changed files with 808 additions and 876 deletions
--- a/.php-cs-fixer.php
+++ b/.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)
+;
--- a/Application/Extend/.ide-helper.php
+++ b/Application/Extend/.ide-helper.php
@ -1,5 +0,0 @@
-<?php
-
-namespace VanillaThunder\GoogleTagManager\Application\Extend;
-
-class ViewConfig_parent extends \OxidEsales\Eshop\Core\ViewConfig {};
--- a/Application/Extend/ViewConfig.php
+++ b/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' ];
-
-
-    }
-}
--- a/Application/translations/de/module_lang.php
+++ b/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'
-
-];
--- a/Application/translations/en/blagtm_lang.php
+++ b/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'
-];
--- a/Application/views/admin/de/module_options.php
+++ b/Application/views/admin/de/module_options.php
@ -1,31 +1,40 @@
 <?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?',
+    'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER'                   => 'Nutzen Sie eine der folgenden Einbindungen?<br>
+                                                                        Dann wählen Sie bitte die zutreffende aus.',
+    'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER_NONE'              => '---',
+    'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER_CONSENTMANAGER'    => 'consentmanager',
+    'SHOP_MODULE_d3_gtm_settings_HAS_STD_MANAGER_USERCENTRICS'      => 'usercentrics',
+    'SHOP_MODULE_d3_gtm_settings_cookieName'  => 'CookieID',
 ];
--- a/Application/views/blocks/_gtm_js.tpl
+++ b/Application/views/blocks/_gtm_js.tpl
@ -1,24 +1,31 @@
-[{if $oViewConf->getGtmContainerId()}][{strip}]
+[{* 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>
-        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 [{$oViewConf->getGtmScriptAttributes()}]>
+      (function (w, d, s, l, i) {
+        w[l] = w[l] || [];
+        w[l].push({'gtm.start': new Date().getTime(), event: 'gtm.js'});
+        var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
+        j.async = true;
+        j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
+        f.parentNode.insertBefore(j, f);
+      })(window, document, 'script', 'dataLayer', '[{$oViewConf->getGtmContainerId()}]');
    </script>
    <!-- End Google Tag Manager -->
+
    [{if $oViewConf->getTopActionClassName() === "alist" }]
-        [{* include file="ga4_view_item_list.tpl" gtmCategory=$oView->getActiveCategory() gtmProducts=$oView->getArticleList() listtype=$oView->getListType() *}]
+    [{* 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() *}]
+    [{* include file="ga4_view_item.tpl" gtmProduct=$oView->getProduct() *}]
    [{elseif $oViewConf->getTopActionClassName() === "search" }]
    [{elseif $oViewConf->getTopActionClassName() === "basket" }]
-
    [{/if}]
-[{/strip}][{/if}]
-[{$smarty.block.parent}]
+    [{/strip}][{/if}]
+    [{/if}]
+
+[{$smarty.block.parent}]
--- a/Application/views/blocks/_gtm_nojs.tpl
+++ b/Application/views/blocks/_gtm_nojs.tpl
@ -1,8 +1,12 @@
-[{if $oViewConf->getGtmContainerId()}][{strip}]
+[{if $oViewConf->D3blShowGtmScript() && !$oViewConf->getCookieManagerType()}]
+    [{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}]
--- a/Application/views/blocks/_impression.tpl
+++ b/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}]
-*}]
--- a/Application/views/blocks/add_to_cart.tpl
+++ b/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}]
--- a/Application/views/blocks/checkout_s1.tpl
+++ b/Application/views/blocks/checkout_s1.tpl
@ -1,57 +1,33 @@
-[{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}]
-        };
+[{$smarty.block.parent}]

-                [{capture name='removeFromBasket'}]
-                $('#basketRemove').on('click', function() {
-                    var _checked = [],
-                        _products = [];
+[{*$oxcmp_basket|get_class_methods|dumpvar*}]

-                    $('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}) });
+[{assign var="d3BasketPrice" value=$oxcmp_basket->getPrice()}]

-                    dataLayer.push({
-                        'event':'ee.removeFromCart',
-                        'ecommerce': {
-                            'currencyCode': '[{$currency->name}]',
-                            'remove': {
-                                'products': _products
-                            }
-                        }
-
-                    });
-                });
-                [{/capture }]
-        [{oxscript add=$smarty.capture.removeFromBasket}]
-        *}]
-    </script>
-[{/strip}]
-[{$smarty.block.parent}]
+[{assign var='gtmCartArticles' value=$oView->getBasketArticles()}]
+[{strip}][{capture assign=d3_ga4_view_cart}]
+    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+    dataLayer.push({
+        'event': 'view_cart',
+        'eventLabel':'Checkout Step 1',
+        'ecommerce': {
+            'actionField': "step: 1",
+            'currency': "[{$currency->name}]",
+            'value': [{$d3BasketPrice->getPrice()}],
+            'items': [
+                [{foreach from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents  key=basketindex}]
+                [{assign var="d3oItemPrice" value=$basketitem->getPrice()}]
+                {
+                    'item_id': '[{$gtmCartArticles[$basketindex]->getFieldData('oxartnum')}]',
+                    'item_name': '[{$gtmCartArticles[$basketindex]->getFieldData('oxtitle')}]',
+                    'item_variant': '[{$gtmCartArticles[$basketindex]->getFieldData('oxvarselect')}]',
+                    'price': [{$d3oItemPrice->getPrice()}],
+                    'quantity':[{$basketitem->getAmount()}],
+                    'position':[{$smarty.foreach.gtmCartContents.index}]
+                }[{if !$smarty.foreach.gtmCartContents.last}],[{/if}]
+                [{/foreach}]
+                ]
+        }
+    });
+[{/capture}][{/strip}]
+[{oxscript add=$d3_ga4_view_cart}]
--- a/Application/views/blocks/checkout_s2.tpl
+++ b/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}]
--- a/Application/views/blocks/checkout_s3.tpl
+++ b/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}]
--- a/Application/views/blocks/checkout_s4.tpl
+++ b/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}]
--- a/Application/views/blocks/checkout_s5.tpl
+++ b/Application/views/blocks/checkout_s5.tpl
@ -1,3 +1,5 @@
+[{$smarty.block.parent}]
+
 [{strip}]
 <script>
    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
@ -5,33 +7,30 @@
    [{assign var="_gtmArticles" value=$_gtmOrder->getOrderArticles()}]
    
    dataLayer.push({
-        'event': 'ee.transaction',
+        'event': 'purchase',
        '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}]
-                ]
-            }
+          'transaction_id': '[{$_gtmOrder->getFieldData("oxordernr")}]',
+          'affiliation':    '[{$oxcmp_shop->getFieldData("oxname")}]',
+          'value':          [{$_gtmOrder->getTotalOrderSum()}],
+          'tax':            [{math equation="x+y" x=$_gtmOrder->getFieldData("oxartvatprice1") y=$_gtmOrder->getFieldData("oxartvatprice2") }],
+          'shipping':       [{$_gtmOrder->getFieldData("oxdelcost")}],
+          'currency':       '[{$_gtmOrder->getFieldData('oxcurrency')}]',
+          'items':
+              [
+                [{foreach from=$_gtmArticles item="d3BasketArticle" name="gtmArticles"}]
+                  [{assign var="d3oArticlePrice" value=$d3BasketArticle->getPrice()}]
+                {
+                    'id':       '[{$d3BasketArticle->getFieldData("oxartnum")}]',
+                    'name':     '[{$d3BasketArticle->getFieldData("oxtitle")}]',
+                    'variant':  '[{$d3BasketArticle->getFieldData("oxselvariant")}]',
+                    'price':    [{$d3oArticlePrice->getPrice()}],
+                    'quantity': [{$d3BasketArticle->getFieldData("oxamount")}],
+                    'position': [{$smarty.foreach.gtmArticles.iteration}]
+                }[{if !$smarty.foreach.gtmArticles.last}],[{/if}]
+                [{/foreach}]
+              ]
        }
-    });
+    })
 </script>
 [{/strip}]
-[{$smarty.block.parent}]
--- a/Application/views/blocks/detail.tpl
+++ b/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>
--- a/Application/views/blocks/impression.tpl
+++ b/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')}]
-->
--- a/Application/views/blocks/view_item.tpl
+++ b/Application/views/blocks/view_item.tpl
@ -0,0 +1,26 @@
+[{$smarty.block.parent}]
+[{assign var="gtmProduct" value=$oView->getProduct()}]
+[{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
+[{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+
+<script>
+  dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+  dataLayer.push({
+    'event': 'view_item',
+    'eventLabel':'Product View',
+    'ecommerce': {
+      'currency': '[{$currency->name}]',
+      'items': [
+        {
+          'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
+          'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
+          'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+          'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
+          'item_variant': '[{if $gtmProduct->getFieldData("oxvarselect")}][{$gtmProduct->getFieldData("oxvarselect")}][{/if}]',
+          [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
+          'price': [{$d3PriceObject->getPrice()}]
+        }
+      ]
+    }
+  });
+</script>
--- a/Application/views/ga4/add_to_cart.tpl
+++ b/Application/views/ga4/add_to_cart.tpl
@ -1,41 +1,56 @@
+[{$smarty.block.parent}]
+
+[{assign var="d3ProductObject" value=$oView->getProduct()}]
+[{assign var="d3PriceObject" value=$d3ProductObject->getPrice()}]
+
+[{capture assign=d3_ga4_add_to_cart}]
+[{block name="d3_ga4_add_to_basket"}]
+  $("#toBasket").click(function(event) {
+
+    [{*** Debug cases ***}]
+    [{*event.preventDefault();*}]
+
+    let iArtQuantity = $("#amountToBasket").val();
+
+    dataLayer.push({
+        'isAddToBasket': true,
+      'event':'add_to_cart',
+      'eventLabel': 'add_to_cart',
+      'ecommerce': {
+        'currency':   "[{$currency->name}]",
+        'value':      iArtQuantity*[{$d3PriceObject->getPrice()}],
+        'items':      [
+          {
+            'item_id':        '[{$gtmProduct->getFieldData('oxartnum')}]',
+            'item_name':      '[{$gtmProduct->getFieldData('oxtitle')}]',
+            'price':          [{$d3PriceObject->getPrice()}],
+            'item_brand':     '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+            'item_variant':   '[{if $gtmProduct->getFieldData('oxvarselect')}][{$gtmProduct->getFieldData('oxvarselect')}][{/if}]',
+            'item_category':  itemCategories[0] || 'no category',
+            'item_category_2':itemCategories[1] || '',
+            'item_category_3':itemCategories[2] || '',
+            'item_category_4':itemCategories[3] || '',
+            'quantity': iArtQuantity
+          }
+        ]
+      }
+    });
+  });
+[{/block}]
+[{/capture}]
+[{oxscript add=$d3_ga4_add_to_cart}]
+
 [{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'
-        };
+    <script>
+      dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */

-        console.log(_gtmProduct);
-        dataLayer.push({
-            'event':'ecommerce',
-            'ga4event': 'add_to_cart',
-            'ecommerce': {
-                'items': [ _gtmProduct ]
-            }
-        });
+      let itemCategories = '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]no category[{/if}]'.split('/');

    </script>
-    *}]
 [{/strip}]
--- a/Application/views/ga4/search.tpl
+++ b/Application/views/ga4/search.tpl
@ -0,0 +1,33 @@
+[{$smarty.block.parent}]
+
+[{assign var="gtmProducts" value=$oView->getArticleList()}]
+
+[{if $gtmProducts|@count}]
+  [{strip}]
+    <script>
+      dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+      dataLayer.push({
+        'event': 'view_search_result',
+        'eventLabel':'view_search_result',
+        'ecommerce': {
+          'search_term': '[{$searchparamforhtml}]',
+          'items': [
+            [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
+            [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
+            [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+            [{if !$gtmCategory}][{assign var="gtmCategory" value=$gtmProduct->getCategory()}][{/if}]
+            {
+              'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
+              'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
+              'price': [{$d3PriceObject->getPrice()}],
+              'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+              'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
+              'quantity': 1
+            }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
+            [{/foreach}]
+          ]
+        }
+      });
+    </script>
+  [{/strip}]
+[{/if}]
--- a/Application/views/ga4/view_item.tpl
+++ b/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}]
--- a/Application/views/ga4/view_item_list.tpl
+++ b/Application/views/ga4/view_item_list.tpl
@ -1,20 +1,28 @@
+[{$smarty.block.parent}]
+[{assign var="gtmProducts" value=$products}]
+
+[{assign var="breadCrumb" value=''}]
+
 [{if $gtmProducts|@count}]
 [{strip}]
    <script>
        /* ga4 */
        dataLayer.push({ecommerce: null});
        dataLayer.push({
-            'event':'GA4_event',
+            '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': [{$gtmProduct->oxarticles__oxprice->value|default:'0'}],
+                        'price': [{$d3PriceObject->getPrice()}],
                        'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
                        'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
                        'quantity': 1
@ -23,29 +31,6 @@
                ]
            }
        });
-        /* 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}]
--- a/Application/views/ua/impression.tpl
+++ b/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}]
--- a/Application/views/ua/s1_cart.tpl
+++ b/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}]
--- a/Application/views/ua/s2_user.tpl
+++ b/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}]
--- a/Application/views/ua/s3_payment.tpl
+++ b/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}]
--- a/Application/views/ua/s4_order.tpl
+++ b/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}]
--- a/Application/views/ua/s5_thankyou.tpl
+++ b/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}]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -0,0 +1,56 @@
+# 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.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
--- a/Docs/README.md
+++ b/Docs/README.md
@ -0,0 +1,68 @@
+# Technische Doku
+## GA4 Events / Customizing
+Für alle implementierten GA4 Events existieren Templates unter `source/modules/d3/googleanalytics4/Application/views/ga4/`, dabei entspricht der Dateiname dem Eventnamen in GA4.
+Die Einbindung dieser Event-Templates erfolgt über TPL-Blöcke unter `source/modules/d3/googleanalytics4/Application/views/blocks/`.  
+*Hinweis: nicht alle templates sind bereits gefüllt. Wünschen Sie die Implementierung eines unausgefüllten templates?
+Kommen Sie auf uns zu unter https://www.d3data.de/
+
+## 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: d3Ga4_view_item_list (muss hinzugefügt werden)
+    - Datei: widget/product/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
+- 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?".
+
+### 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 einen Service für Google Analytics anlegen
+  - Den Service-Namen in den Moduleinstellungen des 'Google Analytics 4' unter
+    ```Einstell. > Cookie Manager Einstellungen > Cookie-ID``` eintragen
--- a/IntelliSenseHelper.php
+++ b/IntelliSenseHelper.php
@ -0,0 +1,18 @@
+<?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{}
+}
--- a/Modules/Core/ViewConfig.php
+++ b/Modules/Core/ViewConfig.php
@ -0,0 +1,207 @@
+<?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 OxidEsales\Eshop\Application\Controller\FrontendController;
+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 = $this->getConfig()->getConfigParam('d3_gtm_sContainerID');
+        }
+        return $this->sContainerId;
+    }
+
+    /**
+     * @return mixed
+     */
+    public function getModuleSettingExplicitManagerSelectValue()
+    {
+        return Registry::getConfig()->getConfigParam('d3_gtm_settings_HAS_STD_MANAGER');
+    }
+
+    /**
+     * @return false|mixed
+     */
+    public function getExplicitManager()
+    {
+        $sManagerName = $this->getModuleSettingExplicitManagerSelectValue();
+        return $sManagerName === "NONE" ? false : $sManagerName;
+    }
+
+    public function getCookieManagerType()
+    {
+        if ($this->sCookieManagerType === null)
+        {
+            $this->sCookieManagerType = false;
+
+            $allowedManagerTypes = [
+                'net_cookie_manager',
+                'agcookiecompliance',
+                'oxps_usercentrics'
+            ];
+
+            foreach ($allowedManagerTypes as $type) {
+                if ($this->isModuleActive($type)) {
+                    $this->sCookieManagerType = $type;
+                    break;
+                }
+            }
+        }
+
+        if ($this->sCookieManagerType === false and $this->getExplicitManager()){
+            return "externalService";
+        }
+
+        return $this->sCookieManagerType;
+    }
+
+    /**
+     * @return bool
+     */
+    public function D3blShowGtmScript()
+    {
+        /** @var Config $oConfig */
+        $oConfig = Registry::getConfig();
+
+        // No Cookie Manager in use
+        if (!$oConfig->getConfigParam('d3_gtm_settings_hasOwnCookieManager')) {
+            return true;
+        }
+
+        $sCookieID = $oConfig->getConfigParam('d3_gtm_settings_cookieName');
+
+        // Netensio Cookie Manager
+        if ($this->getCookieManagerType() == "net_cookie_manager") {
+            $oSession = Registry::getSession();
+            $aCookies = $oSession->getVariable("aCookieSel");
+
+            return (!is_null($aCookies) && is_array($aCookies) && array_key_exists($sCookieID, $aCookies) && $aCookies[$sCookieID] == "1");
+        }
+
+        // Aggrosoft Cookie Consent
+        if ($this->getCookieManagerType() == "agcookiecompliance") {
+            if (method_exists($this, "isCookieCategoryEnabled")) {
+                return $this->isCookieCategoryEnabled($sCookieID);
+            }
+        }
+
+        // UserCentrics or consentmanager
+        if ($this->getCookieManagerType() === "oxps_usercentrics" or $this->getCookieManagerType() === 'externalService') {
+            // Always needs the script-tags delivered to the DOM.
+            return true;
+        }
+
+        // Cookie Manager not (yet) supported
+        return false;
+    }
+
+    /**
+     * Get additional attributes for script tags.
+     * This is especially important for UserCentrics.
+     * @return string
+     */
+    public function getGtmScriptAttributes()
+    {
+        $oConfig = Registry::getConfig();
+
+        if ($this->getCookieManagerType() === "oxps_usercentrics" or $this->getExplicitManager() === 'USERCENTRICS') {
+            $sCookieId = $oConfig->getConfigParam('d3_gtm_settings_cookieName');
+
+            if ($sCookieId) {
+                return 'data-usercentrics="' . $sCookieId . '" type="text/plain" async=""';
+            }
+        }
+
+        if ($this->getCookieManagerType() === "externalService" and $this->getExplicitManager() === 'CONSENTMANAGER') {
+            $sCookieId = $oConfig->getConfigParam('d3_gtm_settings_cookieName');
+
+            if ($sCookieId) {
+                return 'async 
+                        type="text/plain"
+                        data-cmp-src="https://www.googletagmanager.com/gtm.js?id='.$this->getGtmContainerId().'"
+                        class="cmplazyload"
+                        data-cmp-vendor="s905"
+                        ';
+            }
+        }
+
+        return "";
+    }
+
+    private $blGA4enabled = null;
+
+    public function isGA4enabled()
+    {
+        if ($this->blGA4enabled === null)
+        {
+            $this->sContainerId = $this->getConfig()->getConfigParam('d3_gtm_blEnableGA4');
+        }
+
+        return $this->blGA4enabled;
+    }
+
+    public function getGtmDataLayer()
+    {
+        if (!$this->getGtmContainerId()) return "[]";
+
+        $oConfig = Registry::getConfig();
+        $oView   = $oConfig->getTopActiveView();
+        /** @var FrontendController $oShop */
+        $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 ? $oUser->getId() : false),
+            'sessionid' => session_id() ?? false,
+            //'httpref'   => $_SERVER["HTTP_REFERER"] ?? "unknown"
+        ];
+
+        return json_encode([$dataLayer], JSON_PRETTY_PRINT);
+    }
+
+    public function isPromotionList($listId)
+    {
+        $oConfig           = Registry::getConfig();
+        $aPromotionListIds = $oConfig->getConfigParam("") ?? ['bargainItems', 'newItems', 'topBox', 'alsoBought', 'accessories', 'cross'];
+    }
+}
--- a/README.md
+++ b/README.md
@ -1,61 +1,82 @@
-# [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:^1
+```

-**"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
+## 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.

+Navigieren Sie danach zum Reiter 'Einstell.'.
+Tragen Sie die nötige sog. 'Container ID' ein. Diese sieht in etwa so aus: 'GTM-W34LLOP'.

-### 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/>
+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.
--- a/composer.json
+++ b/composer.json
@ -1,8 +1,19 @@
 {
-  "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>",
+  "name": "d3/google-analytics4",
+  "description": "Google Tag Manager with new Google Analytics 4 for OXID eShop v6",
  "type": "oxideshop-module",
-  "homepage": "https://github.com/vanilla-thunder/oxid-module-gtm",
+  "keywords": [
+    "oxid",
+    "modules",
+    "eShop",
+    "d3",
+    "google",
+    "ga4",
+    "googleanalytics",
+    "gtm",
+    "configuration"
+  ],
+  "homepage": "https://www.d3data.de",
  "license": [
    "GPL-3.0"
  ],
@ -10,21 +21,36 @@
    {
      "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": {
-      "target-directory": "vt/GoogleTagManager"
+      "blacklist-filter": [
+        "*.md",
+        "composer.json",
+        ".php-cs-fixer.php",
+        "*.xml",
+        "*.neon"
+      ],
+      "target-directory": "d3/googleanalytics4"
    }
  },
  "require": {
    "php": ">=7.1",
-    "oxid-esales/oxideshop-ce": "^v6.2",
+    "oxid-esales/oxideshop-ce": "v6.0 - 6.3",
    "google/apiclient":" ^2.0"
  },
  "autoload": {
    "psr-4": {
-      "VanillaThunder\\": "../../../source/modules/vt"
+      "D3\\GoogleAnalytics4\\": "../../../source/modules/d3/googleanalytics4"
    }
  }
 }
--- a/metadata.php
+++ b/metadata.php
@ -1,156 +1,132 @@
 <?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\Core\ViewConfig;
+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
+$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.6.0',
+    'author'      => 'Data Development (Inh.: Thomas Dartsch)',
+    'email'       => 'support@shopmodule.com',
+    'url'         => 'https://www.oxidmodule.com/',
+    'extend'      => [
+        OEViewConfig::class => 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'
-        /*
-
-        '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',
-        */
+    'templates'   => [
+        // GA4 events
+        'ga4_add_to_cart.tpl'      => 'd3/googleanalytics4/Application/views/ga4/add_to_cart.tpl',
+        'ga4_search.tpl'           => 'd3/googleanalytics4/Application/views/ga4/search.tpl',
+        'ga4_view_item_list.tpl'   => 'd3/googleanalytics4/Application/views/ga4/view_item_list.tpl',
    ],
-    'blocks' => [
+    '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/checkout_s1.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/checkout_s5.tpl'
+        ],
+        // Lists
+        // view_item_list
+        [
+            'template' => 'widget/product/list.tpl',
+            'block'    => 'widget_product_list',
+            'file'     => '/Application/views/ga4/view_item_list.tpl',
+            'position' => 150
+        ],
+        // view_search_result
+        [
+            'template' => 'page/search/search.tpl',
+            'block'    => 'search_results',
+            'file'     => '/Application/views/ga4/search.tpl',
+            'position' => 150
+        ],
+        // add_to_cart
+        [
+            'template' => 'page/details/inc/productmain.tpl',
+            'block'    => 'details_productmain_tobasket',
+            'file'     => '/Application/views/ga4/add_to_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_cookieName',
+            'type'     => 'str',
+            'value'    => 'example',
+            'position' => 999
+        ],
+        [
+            'group' => 'd3_gtm_settings_cookiemanager',
+            'name' => 'd3_gtm_settings_HAS_STD_MANAGER',
+            'type' => 'select',
+            'value' => 'none',
+            'constraints' => 'NONE|CONSENTMANAGER|USERCENTRICS',
+        ],
    ]
 ];
--- a/phpstan.neon
+++ b/phpstan.neon
@ -0,0 +1,10 @@
+parameters:
+    scanFiles:
+        - IntelliSenseHelper.php
+        - ../../oxid-esales/oxideshop-ce/source/oxfunctions.php
+        - ../../oxid-esales/oxideshop-ce/source/overridablefunctions.php
+    level: 9
+    phpVersion: 70100
+    checkMissingIterableValueType: false
+    ignoreErrors:
+        - '#Psr\\Container\\ContainerExceptionInterface is not subtype of Throwable#'
--- a/phpunit.xml
+++ b/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>
--- a/thumbnail.png
+++ b/thumbnail.png
Author	SHA1	Message	Date
MaxBUhe	e624cfdfcb	bump version && changelog to 1.6.0	2023-05-30 08:56:19 +02:00
MaxBUhe	e2cdda530b	adjusted usercentrics script	2023-05-26 13:49:50 +02:00
MaxBUhe	3e65d05c0b	added position to block-extension	2023-05-24 11:09:36 +02:00
MaxBUhe	561a2101f1	[working-state] restructuring usercentricts & consentmanager decision consentmanager decision is working so far; next step is implementing usercentricts	2023-05-23 14:52:07 +02:00
MaxBUhe	6fca52cc06	add usercentrics chosable settings-value; add additional methods; add new multilang-idents	2023-05-23 14:33:35 +02:00
MaxBUhe	dfdc5d5edf	bump version && changelog to 1.5.0	2023-05-23 11:44:07 +02:00
MaxBUhe	ae6f9bfaa9	switch php-file-header hint	2023-05-23 10:49:59 +02:00
MaxBUhe	1d9e09b8b1	switch view_item and item_list template	2023-05-23 10:49:05 +02:00
MaxBUhe	f9a0834d26	add settings-entry; add consentmanager-option	2023-05-16 14:42:12 +02:00
MaxBUhe	bb70cda626	fix unnecessary convert of int to str	2023-05-16 14:41:47 +02:00
MaxBUhe	c9a1174c98	genuine code cleanup; switch hard-getter to methods and use price-object # Conflicts: # Application/views/blocks/view_item.tpl # Application/views/ga4/add_to_cart.tpl	2023-05-16 14:41:32 +02:00
Christoph Staeblein	f3b2911679	OXID UserCentrics support, general overhaul for cookie managers	2023-05-16 14:24:50 +02:00
MaxBUhe	6d155d310b	bump version && changelog to 1.4.0	2023-05-02 14:21:43 +02:00
Christoph Staeblein	6e62f39b71	OXID UserCentrics support, general overhaul for cookie managers taken from pull-request; thank you C. Stäblein	2023-04-04 10:15:15 +02:00
MaxBuhe01	4222c947a9	bump versions and changelog	2023-03-17 14:49:49 +01:00
MaxBuhe01	d8fa06233b	adjust translation	2023-03-17 14:49:28 +01:00
MaxBuhe01	4e0988307a	bump readme files	2023-03-17 14:03:53 +01:00
Christoph Staeblein	0e55c3e38f	add: Aggrosoft-Cookie-Consent compatibility	2023-03-17 10:59:50 +01:00
Christoph Staeblein	13df965a03	bug-fix: wrong function for pageview on thankyou page	2023-03-17 08:58:15 +01:00
MaxBUhe	1ff6f0159f	rm overblowing files	2023-03-16 10:59:39 +01:00
MaxBUhe	707e389f54	bump version	2023-02-22 14:21:24 +01:00
MaxBUhe	98533cf7f7	add special price formatting	2023-02-22 14:19:38 +01:00
MaxBUhe	25234abfd8	bump version	2023-02-01 15:42:59 +01:00
MaxBUhe	667b48ac4b	rm unnecessary hint	2023-02-01 15:33:52 +01:00
MaxBUhe	5e358fc684	add own cookie-check method; rm unnecessary help-text	2023-02-01 15:32:28 +01:00
MaxBUhe	3ff03ee0df	bump version	2023-01-27 10:50:00 +01:00
MaxBUhe	09c1e31efe	rm unnecessary import	2023-01-27 09:37:28 +01:00
MaxBUhe	6d057971a7	rm unnecessary method call in gtm_js.tpl	2023-01-27 09:36:05 +01:00
MaxBUhe	0b134321ef	rm unnecessary entries in metadata	2023-01-27 09:35:55 +01:00
MaxBUhe	b5d056fd83	switch head-meta-infos	2023-01-27 09:35:44 +01:00
MaxBUhe	410be2fb40	rm unnecessary lang file	2023-01-27 09:27:38 +01:00
MaxBUhe	bd17c3370d	cleaning off branding	2023-01-27 09:27:27 +01:00
MaxBUhe	d028f418ad	add block positions to metadata	2023-01-26 15:31:45 +01:00
MaxBUhe	cecbc0dec8	adding tech-docs; rm unnecessary sections in readme; fixing wrong links	2023-01-26 09:09:09 +01:00
MaxBUhe	6a0fb759e1	add block to add_to_basket for indiv handling	2023-01-25 14:32:22 +01:00
MaxBUhe	120c765d0c	rather using basket_component to get formatted price	2023-01-25 14:30:59 +01:00
MaxBUhe	4f73f18080	fix wrong changelog comparisons	2023-01-25 11:01:02 +01:00
MaxBUhe	00f76d9908	extend changelog and readme	2023-01-25 10:39:23 +01:00
MaxBUhe	306af0f7bd	add shop-block description to readme	2023-01-20 14:32:00 +01:00
MaxBUhe	f6f4f87627	adjusted general texts of the mod	2023-01-20 11:04:22 +01:00
MaxBUhe	d9b8c274ce	adjusted keywords and desc in composer.json	2023-01-20 11:04:04 +01:00
MaxBUhe	f41b2edeed	adjust target-directory	2023-01-20 09:58:21 +01:00
MaxBUhe	69073c0109	adjusted desc text in metadata and paths to template files	2023-01-20 09:57:38 +01:00
MaxBUhe	b12884f99b	fix namespace bug in composer.json	2023-01-20 09:38:25 +01:00
MaxBUhe	c7d8fdcf6a	extend readme and metadata-desc	2023-01-20 09:33:36 +01:00
MaxBUhe	87ce3efc5f	rm unnecessary files	2023-01-20 09:33:21 +01:00
MaxBUhe	f9d7f0b2e9	add missing blacklist-filter in composer.json	2023-01-19 15:36:54 +01:00
MaxBUhe	dfab91a71a	adding missing standard-files; rebranding and moving ViewConfig extension	2023-01-19 15:31:56 +01:00
MaxBUhe	ed75197a64	add info to readme	2023-01-19 11:37:40 +01:00
MaxBUhe	b861aef8a9	fix bug that'd stop jquery from running duo to no-datalayer error	2023-01-19 09:32:38 +01:00
MaxBUhe	a74b6d9f15	add cookieManager switch	2023-01-17 14:42:17 +01:00
MaxBUhe	633c1336a8	fix bug that would display cat path	2023-01-17 09:57:37 +01:00
MaxBUhe	a5378ec70e	adding position to detail.tpl metadata entry	2023-01-16 15:25:59 +01:00
MaxBUhe	34c27d101d	commenting out debug	2023-01-12 08:38:51 +01:00
MaxBUhe	fec7bf5c13	add list mandatory params	2023-01-11 15:54:52 +01:00
MaxBUhe	2b864f41e8	cleaning + rm unnecessary " } "	2023-01-11 15:31:56 +01:00
MaxBUhe	9ae1afa326	reworking structure and add 2 missing mandatory params	2023-01-11 15:25:27 +01:00
MaxBUhe	664119f89e	genuine reworking structure and aligning all	2023-01-11 15:25:02 +01:00
MaxBUhe	c83e908da1	reworking view_cart to add necessary parameters	2023-01-11 15:04:41 +01:00
MaxBUhe	95de52600d	add add_to_cart	2023-01-11 14:43:13 +01:00
MaxBUhe	6b039b6c9a	add view_search_result	2023-01-10 15:49:54 +01:00
MaxBUhe	1aad369e36	add view_item_list	2023-01-10 14:22:49 +01:00
MaxBUhe	76e7bd10f6	switching event names to recommendation form google	2023-01-10 09:54:34 +01:00
MaxBUhe	6bfe8b90e6	add translations + add currency	2022-12-20 11:52:25 +01:00
MaxBUhe	4c08f58777	fix typo in composer.json	2022-12-01 13:57:52 +01:00
MaxBUhe	5de90a2488	config composer.json to fit ce-metapackage 6.0 - 6.1	2022-12-01 13:53:16 +01:00
MaxBUhe	f0466493b3	rework code to actually fit 6.0.x && 6.1x	2022-12-01 13:30:09 +01:00
MaxBUhe	5b4bd5a05a	add purchase.tpl content	2022-12-01 13:29:35 +01:00
Marat	ed767efa8a	alter Zwiscehnstand	2022-06-09 20:41:59 +02:00