bump metadata && changelog

add cookiebot essentials
[changed] 'an article has been removed from basket'-check
2023-09-07 15:16:54 +02:00 · 2023-09-07 15:15:05 +02:00 · 2023-08-18 14:07:53 +02:00 · 2023-08-17 10:59:57 +02:00 · 2023-08-17 10:30:19 +02:00 · 2023-08-17 10:27:21 +02:00
48 changed files with 1127 additions and 623 deletions
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1 @@
+.idea
--- a/Application/Model/ManagerHandler.php
+++ b/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";
+    }
+}
--- a/Application/Model/ManagerTypes.php
+++ b/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);
+    }
+}
--- a/Application/views/admin/de/module_options.php
+++ b/Application/views/admin/de/module_options.php
@ -1,16 +1,13 @@
 <?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
+ * 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 <support@shopmodule.com>
- * @link          http://www.oxidmodule.com
+ * @author    D3 Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
 */

 $style = '<style type="text/css">
@ -33,14 +30,19 @@ $aLang = [

    // for cookie manager settings
    'SHOP_MODULE_GROUP_d3_gtm_settings_cookiemanager'   => 'Cookie Manager Einstellungen',
-    'SHOP_MODULE_d3_gtm_settings_hasOwnCookieManager'   => 'Eigenen Cookie Manager nutzen?
-                                                            <strong style="color: red">Hinweis (Fragezeichen) lesen!</strong>',
-    'HELP_SHOP_MODULE_d3_gtm_settings_hasOwnCookieManager'   => 'Stellen Sie sicher, dass Sie ein Modul installiert haben,
-    dass die Methode "blAcceptedCookie" implementiert.<br> Sollten Sie sich nicht sicher sein kontaktieren Sie Ihren
-    technischen Ansprechpartner.<br><br>
-    
-    <strong>Wichtig!</strong> Das Aktivieren dieser Checkbox kann <u>ohne dem nötigen technischen Wissen</u> den Shop-Ablauf im Frontend stören!<hr>
-    Die Checkbox muss nicht aktiviert werden, sofern die Cookies beispielsweise direkt via Google Cookie-Banner integriert werden.
-    Bei Fragen <u>kontaktieren Sie bitte</u> auch hier einen entsprechenden technischen Ansprechpartner.',
-    'SHOP_MODULE_d3_gtm_settings_cookieName'            => 'Cookie-Name',
+    '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_cookieName'  => 'CookieID',
 ];
--- a/Application/views/blocks/_gtm_js.tpl
+++ b/Application/views/blocks/_gtm_js.tpl
@ -1,59 +1,25 @@
-[{assign var="d3VtConfigObject" value=$oViewConf->getConfig()}]
-[{if $d3VtConfigObject->getConfigParam('d3_gtm_settings_hasOwnCookieManager')}]
-    [{if $oViewConf->blAcceptedCookie($d3VtConfigObject->getConfigParam('d3_gtm_settings_cookieName'))}]
+[{* Always prepare the data layer to avoid errors *}]
+<script>
+  var dataLayer = [{$oViewConf->getGtmDataLayer()}] || [];
+</script>

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

-[{$smarty.block.parent}]
+[{$smarty.block.parent}]
--- a/Application/views/blocks/_gtm_nojs.tpl
+++ b/Application/views/blocks/_gtm_nojs.tpl
@ -1,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}]
--- 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,31 +0,0 @@
-[{$smarty.block.parent}]
-
-[{*$oxcmp_basket|get_class_methods|dumpvar*}]
-
-[{assign var='gtmCartArticles' value=$oView->getBasketArticles()}]
-[{strip}][{capture assign=d3_ga4_view_cart}]
-    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-    dataLayer.push({
-        'event': 'view_cart',
-        'eventLabel':'Checkout Step 1',
-        'ecommerce': {
-            'actionField': "step: 1",
-            'currency': "[{$currency->name}]",
-            'value': [{oxprice price=$oxcmp_basket->getPrice()}],
-            'items': [
-                [{foreach from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents  key=basketindex}]
-                [{assign var='_price' value=$basketitem->getUnitPrice()}]
-                {
-                    'item_id': '[{$gtmCartArticles[$basketindex]->oxarticles__oxartnum->value}]',
-                    'item_name': '[{$gtmCartArticles[$basketindex]->oxarticles__oxtitle->value}]',
-                    'item_variant': '[{$gtmCartArticles[$basketindex]->oxarticles__oxvarselect->value}]',
-                    'price': [{$_price->getPrice()}],
-                    'quantity':[{$basketitem->getAmount()}],
-                    'position':[{$smarty.foreach.gtmCartContents.index}]
-                }[{if !$smarty.foreach.gtmCartContents.last}],[{/if}]
-                [{/foreach}]
-                ]
-        }
-    });
-[{/capture}][{/strip}]
-[{oxscript add=$d3_ga4_view_cart}]
--- a/Application/views/blocks/checkout_s2.tpl
+++ b/Application/views/blocks/checkout_s2.tpl
@ -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,35 +0,0 @@
-[{$smarty.block.parent}]
-
-[{strip}]
-<script>
-    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-    [{assign var="_gtmOrder" value=$oView->getOrder()}]
-    [{assign var="_gtmArticles" value=$_gtmOrder->getOrderArticles()}]
-    
-    dataLayer.push({
-        'event': 'purchase',
-        'eventLabel':'Checkout Step 5',
-        'ecommerce': {
-          'transaction_id': '[{$_gtmOrder->oxorder__oxordernr->value}]',
-          'affiliation':    '[{$oxcmp_shop->oxshops__oxname->value}]',
-          'value':          '[{$_gtmOrder->oxorder__oxtotalordersum->value}]',
-          'tax':            '[{math equation="x+y" x=$_gtmOrder->oxorder__oxartvatprice1->value y=$_gtmOrder->oxorder__oxartvatprice2->value }]',
-          'shipping':       '[{$_gtmOrder->oxorder__oxdelcost->value}]',
-          'currency':       '[{$_gtmOrder->getFieldData('oxcurrency')}]',
-          'items':
-              [
-                [{foreach from=$_gtmArticles item="_gtmArticle" name="gtmArticles"}]
-                {
-                    'id':       '[{$_gtmArticle->oxorderarticles__oxartnum->value}]',
-                    'name':     '[{$_gtmArticle->oxorderarticles__oxtitle->value}]',
-                    'variant':  '[{$_gtmArticle->oxorderarticles__oxselvariant->value}]',
-                    'price':    [{$_gtmArticle->oxorderarticles__oxprice->value}],
-                    'quantity': [{$_gtmArticle->oxorderarticles__oxamount->value}],
-                    'position': [{$smarty.foreach.gtmArticles.iteration}]
-                }[{if !$smarty.foreach.gtmArticles.last}],[{/if}]
-                [{/foreach}]
-              ]
-        }
-    })
-</script>
-[{/strip}]
--- a/Application/views/blocks/detail.tpl
+++ b/Application/views/blocks/detail.tpl
@ -1,25 +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': 'view_item',
-        'eventLabel':'Product View',
-        'ecommerce': {
-            'currency': '[{$currency->name}]',
-            'items': [
-                {
-                    'item_name': '[{$gtmProduct->oxarticles__oxtitle->value}]',
-                    'item_id': '[{$gtmProduct->oxarticles__oxartnum->value}]',
-                    'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-                    'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
-                    'item_variant': '[{if $gtmProduct->oxarticles__oxvarselect->value}][{$gtmProduct->oxarticles__oxvarselect->value}][{/if}]',
-                    'price': [{$gtmProduct->oxarticles__oxprice->value}]
-                }
-            ]
-        }
-    });
-</script>
--- a/Application/views/blocks/purchase.tpl
+++ b/Application/views/blocks/purchase.tpl
@ -0,0 +1,56 @@
+[{$smarty.block.parent}]
+
+[{block name="d3_ga4_purchase_block"}]
+    [{capture assign=d3_ga4_purchase}]
+        [{strip}]
+            dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+            [{assign var="gtmOrder"         value=$oView->getOrder()}]
+            [{assign var="gtmBasket"         value=$oView->getBasket()}]
+            [{assign var="gtmArticles"      value=$gtmOrder->getOrderArticles()}]
+            [{assign var="gtmOrderVouchers"  value=$gtmOrder->getVoucherNrList()}]
+
+            dataLayer.push({
+                'event': 'purchase',
+                'eventLabel':'Checkout Step 5',
+                'ecommerce': {
+                    'transaction_id': '[{$gtmOrder->getFieldData("oxordernr")}]',
+                    'affiliation':    '[{$oxcmp_shop->getFieldData("oxname")}]',
+                    'value':          [{$gtmOrder->getTotalOrderSum()}],
+                    'tax':            [{math equation="x+y" x=$gtmOrder->getFieldData("oxartvatprice1") y=$gtmOrder->getFieldData("oxartvatprice2") }],
+                    'shipping':       [{$gtmOrder->getFieldData("oxdelcost")}],
+                    'currency':       '[{$gtmOrder->getFieldData('oxcurrency')}]',
+                    'coupon':         '[{foreach from=$gtmOrderVouchers item="gtmOrderVoucher" name="gtmOrderVoucherIteration"}][{$gtmOrderVoucher}][{if !$smarty.foreach.gtmOrderVoucherIteration.last}], [{/if}][{/foreach}]',
+                    'paymentType':    '[{$gtmBasket->getPaymentOnPaymentId()}]',
+                    'items': [
+                        [{foreach from=$gtmArticles item="gtmBasketItem" name="gtmArticles"}]
+                            [{assign var="gtmPurchaseItemPriceObject"   value=$gtmBasketItem->getPrice()}]
+                            [{assign var="gtmPurchaseItem"              value=$gtmBasketItem->getArticle()}]
+                            [{assign var="gtmPurchaseItemCategory"      value=$gtmPurchaseItem->getCategory()}]
+
+                            {
+                                'item_id':          '[{$gtmBasketItem->getFieldData("oxartnum")}]',
+                                'item_name':        '[{$gtmBasketItem->getFieldData("oxtitle")}]',
+                                'affiliation':      '[{$gtmBasketItem->getFieldData("oxtitle")}]',
+                                'coupon':           '[{foreach from=$gtmOrderVouchers item="gtmOrderVoucher" name="gtmOrderVoucherIteration"}][{$gtmOrderVoucher}][{if !$smarty.foreach.gtmOrderVoucherIteration.last}], [{/if}][{/foreach}]',
+                                'item_variant':     '[{$gtmBasketItem->getFieldData("oxselvariant")}]',
+                                [{if $gtmPurchaseItemCategory}]
+                                'item_category':    '[{$gtmPurchaseItemCategory->getSplitCategoryArray(0)}]',
+                                'item_category_2':  '[{$gtmPurchaseItemCategory->getSplitCategoryArray(1)}]',
+                                'item_category_3':  '[{$gtmPurchaseItemCategory->getSplitCategoryArray(2)}]',
+                                'item_category_4':  '[{$gtmPurchaseItemCategory->getSplitCategoryArray(3)}]',
+                                'item_list_name':   '[{$gtmPurchaseItemCategory->getSplitCategoryArray()}]',
+                                [{/if}]
+                                'price':            [{$gtmPurchaseItemPriceObject->getPrice()}],
+                                'quantity':         [{$gtmBasketItem->getFieldData("oxamount")}],
+                                'position':         [{$smarty.foreach.gtmArticles.iteration}]
+                            }[{if !$smarty.foreach.gtmArticles.last}],[{/if}]
+                        [{/foreach}]
+                    ]
+                }[{if $oViewConf->isDebugModeOn()}],
+                'debug_mode': 'true'
+                [{/if}]
+            })
+        [{/strip}]
+    [{/capture}]
+    [{oxscript add=$d3_ga4_purchase}]
+[{/block}]
--- a/Application/views/blocks/view_cart.tpl
+++ b/Application/views/blocks/view_cart.tpl
@ -0,0 +1,50 @@
+[{$smarty.block.parent}]
+
+[{*$oxcmp_basket|get_class_methods|dumpvar*}]
+
+[{assign var="d3BasketPrice" value=$oxcmp_basket->getPrice()}]
+[{assign var='gtmCartArticles' value=$oView->getBasketArticles()}]
+
+[{block name="d3_ga4_view_cart_block"}]
+    [{capture assign=d3_ga4_view_cart}]
+        [{strip}]
+            dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+            dataLayer.push({
+                'event': 'view_cart',
+                'eventLabel':'Checkout Step 1',
+                'ecommerce': {
+                    'actionField': "step: 1",
+                    'currency': "[{$currency->name}]",
+                    'value': [{$d3BasketPrice->getPrice()}],
+                    'coupon':         '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
+                    'items': [
+                        [{foreach from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents  key=basketindex}]
+                            [{assign var="d3oItemPrice" value=$basketitem->getPrice()}]
+                            [{assign var="gtmBasketItem" value=$basketitem->getArticle()}]
+                            [{assign var="gtmBasketItemCategory" value=$gtmBasketItem->getCategory()}]
+                            {
+                                'item_id':          '[{$gtmCartArticles[$basketindex]->getFieldData('oxartnum')}]',
+                                'item_name':        '[{$gtmCartArticles[$basketindex]->getFieldData('oxtitle')}]',
+                                'item_variant':     '[{$gtmCartArticles[$basketindex]->getFieldData('oxvarselect')}]',
+                                [{if $gtmBasketItemCategory}]
+                                'item_category':    '[{$gtmBasketItemCategory->getSplitCategoryArray(0)}]',
+                                'item_category_2':  '[{$gtmBasketItemCategory->getSplitCategoryArray(1)}]',
+                                'item_category_3':  '[{$gtmBasketItemCategory->getSplitCategoryArray(2)}]',
+                                'item_category_4':  '[{$gtmBasketItemCategory->getSplitCategoryArray(3)}]',
+                                'item_list_name':   '[{$gtmBasketItemCategory->getSplitCategoryArray()}]',
+                                [{/if}]
+                                'price':            [{$d3oItemPrice->getPrice()}],
+                                'coupon':           '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
+                                'quantity':         [{$basketitem->getAmount()}],
+                                'position':         [{$smarty.foreach.gtmCartContents.index}]
+                            }[{if !$smarty.foreach.gtmCartContents.last}],[{/if}]
+                        [{/foreach}]
+                        ]
+                }[{if $oViewConf->isDebugModeOn()}],
+                'debug_mode': 'true'
+                [{/if}]
+            });
+        [{/strip}]
+    [{/capture}]
+    [{oxscript add=$d3_ga4_view_cart}]
+[{/block}]
--- a/Application/views/blocks/view_item.tpl
+++ b/Application/views/blocks/view_item.tpl
@ -0,0 +1,40 @@
+[{$smarty.block.parent}]
+[{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 assign=d3_ga4_view_item}]
+    [{strip}]
+      dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+
+      dataLayer.push({
+        'event': 'view_item',
+        'eventLabel':'Product View',
+        'ecommerce': {
+          'currency': '[{$currency->name}]',
+          'items': [
+            {
+              'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
+              'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
+              'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+              'item_variant': '[{if $gtmProduct->getFieldData("oxvarselect")}][{$gtmProduct->getFieldData("oxvarselect")}][{/if}]',
+              [{if $gtmCategory}]
+              'item_category':  '[{$gtmCategory->getSplitCategoryArray(0)}]',
+              'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1)}]',
+              'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2)}]',
+              'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3)}]',
+              'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
+              [{/if}]
+              [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
+              'price': [{$d3PriceObject->getPrice()}]
+            }
+          ]
+        }[{if $oViewConf->isDebugModeOn()}],
+        'debug_mode': 'true'
+        [{/if}]
+      });
+    [{/strip}]
+  [{/capture}]
+  [{oxscript add=$d3_ga4_view_item}]
+[{/block}]
--- a/Application/views/blocks/widget_product_list.tpl
+++ b/Application/views/blocks/widget_product_list.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/ga4/add_payment_info.tpl
+++ b/Application/views/ga4/add_payment_info.tpl
--- a/Application/views/ga4/add_shipping_info.tpl
+++ b/Application/views/ga4/add_shipping_info.tpl
--- a/Application/views/ga4/add_to_cart.tpl
+++ b/Application/views/ga4/add_to_cart.tpl
@ -1,59 +1,52 @@
 [{$smarty.block.parent}]

-[{*$gtmProduct|get_class_methods|dumpvar*}]
+[{* variable $gtmProduct is passed from parent tempalte *}]
+[{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
+[{assign var="gtmCurrency" value=$oView->getActCurrency()}]
+[{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+[{assign var="gtmCategory" value=$gtmProduct->getCategory()}]

-[{capture assign=d3_ga4_add_to_cart}]
-[{block name="d3_ga4_add_to_basket"}]
-  $("#toBasket").click(function(event) {
-    [{*event.preventDefault();*}]
+[{block name="d3_ga4_add_to_cart_block"}]
+  [{capture assign=d3_ga4_add_to_cart}]
+    [{strip}]
+      $("#toBasket").click(function(event) {
+        dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */

-    let iArtQuantity = $("#amountToBasket").val();
+        [{*** Debug cases ***}]
+        [{*event.preventDefault();*}]

-    dataLayer.push({
-        'isAddToBasket': true,
-      'event':'add_to_cart',
-      'eventLabel': 'add_to_cart',
-      'ecommerce': {
-        'currency':   "[{$currency->name}]",
-        'value':      iArtQuantity*[{$gtmProduct->getFieldData('oxprice')}],
-        'items':      [
-          {
-            'item_id':        '[{$gtmProduct->getFieldData('oxartnum')}]',
-            'item_name':      '[{$gtmProduct->getFieldData('oxtitle')}]',
-            'price':          '[{$gtmProduct->getFieldData('oxprice')}]',
-            'item_brand':     '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-            'item_variant':   '[{if $gtmProduct->getFieldData('oxvarselect')}][{$gtmProduct->getFieldData('oxvarselect')}][{/if}]',
-            'item_category':  itemCategories[0] || 'no category',
-            'item_category_2':itemCategories[1] || '',
-            'item_category_3':itemCategories[2] || '',
-            'item_category_4':itemCategories[3] || '',
-            [{if false}]
-            [{* ??? what *}]
-            'item_list_name': 'Search Results',  // If associated with a list selection.
-            'item_list_id': 'SR123',  // If associated with a list selection.
-            'index': 1,  // If associated with a list selection.
-            [{/if}]
-            'quantity': iArtQuantity
-          }
-        ]
-      }
-    });
-  });
-[{/block}]
-[{/capture}]
-[{oxscript add=$d3_ga4_add_to_cart}]
+        let iArtQuantity = $("#amountToBasket").val();

-[{strip}]
-    [{* variable $gtmProduct is passed from parent tempalte *}]
-
-    [{assign var="gtmCurrency" value=$oView->getActCurrency()}]
-    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
-    [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
-
-    <script>
-      dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-
-      let itemCategories = '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]no category[{/if}]'.split('/');
-
-    </script>
-[{/strip}]
+        dataLayer.push({
+          'isAddToBasket': true,
+          'event':'add_to_cart',
+          'eventLabel': 'add_to_cart',
+          'ecommerce': {
+            'currency':   "[{$currency->name}]",
+            'value':      iArtQuantity*[{$d3PriceObject->getPrice()}],
+            'items':      [
+              {
+              'item_id':        '[{$gtmProduct->getFieldData('oxartnum')}]',
+              'item_name':      '[{$gtmProduct->getFieldData('oxtitle')}]',
+              'price':          [{$d3PriceObject->getPrice()}],
+              'item_brand':     '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+              'item_variant':   '[{if $gtmProduct->getFieldData('oxvarselect')}][{$gtmProduct->getFieldData('oxvarselect')}][{/if}]',
+              [{if $gtmCategory}]
+              'item_category':  '[{$gtmCategory->getSplitCategoryArray(0)}]',
+              'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1)}]',
+              'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2)}]',
+              'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3)}]',
+              'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
+              [{/if}]
+              'quantity': iArtQuantity
+              }
+            ]
+          }[{if $oViewConf->isDebugModeOn()}],
+          'debug_mode': 'true'
+          [{/if}]
+        });
+      });
+    [{/strip}]
+  [{/capture}]
+  [{oxscript add=$d3_ga4_add_to_cart}]
+[{/block}]
--- a/Application/views/ga4/begin_checkout.tpl
+++ b/Application/views/ga4/begin_checkout.tpl
--- a/Application/views/ga4/generate_lead.tpl
+++ b/Application/views/ga4/generate_lead.tpl
--- a/Application/views/ga4/login.tpl
+++ b/Application/views/ga4/login.tpl
--- a/Application/views/ga4/purchase.tpl
+++ b/Application/views/ga4/purchase.tpl
@ -1,36 +0,0 @@
-[{strip}]
-    <script type="text/javascript">
-      window.dataLayer = window.dataLayer || [];
-      dataLayer.push({ ecommerce: null });
-      dataLayer.push({
-        [{assign var="oBasket" value=$order->getBasket()}]
-        [{assign var="iVat" value=0}]
-
-        'event':'purchase',
-        'ecommerce':{
-          'purchase':{
-            'actionField':{
-              'id': [{$order->getFieldData('oxordernr')}],
-              'ordernr': [{$order->getFieldData('oxtotalordersum')}],
-              'tax': [{$order->d3GetSumOrderVat()}],
-              'shipping': [{$order->getFieldData('oxdelcost')}],
-              'currency': "[{$order->getFieldData('oxcurrency')}]"
-            },
-            'products':[
-              [{foreach from=$order->getOrderArticles() item=listItem}]
-                  [{assign var="orderArticle" value=$listItem->getArticle()}]
-              {
-                'item_id':    "[{$listItem->getFieldData('oxartnum')}]",
-                'item_name':  "[{$listItem->getFieldData('oxtitle')}]",
-                'currency':   "[{$order->getFieldData('oxcurrency')}]",
-                'articleVat':   [{$orderArticle->getArticleVat()}],
-                'price':      [{$orderArticle->getBasePrice()}],
-                'quantity':   [{$listItem->getFieldData('oxamount')}]
-              },
-              [{/foreach}]
-            ]
-          }
-        }
-      });
-    </script>
-[{/strip}]
--- a/Application/views/ga4/remove_from_cart.tpl
+++ b/Application/views/ga4/remove_from_cart.tpl
@ -0,0 +1,48 @@
+[{$smarty.block.parent}]
+
+[{block name="d3_ga4_remove_from_cart_block"}]
+    [{if $hasBeenReloaded}]
+        [{assign var="d3BasketPrice" value=$oxcmp_basket->getPrice()}]
+        [{capture assign=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)}]',
+                            'item_category_2':  '[{$gtmBasketItemCategory->getSplitCategoryArray(1)}]',
+                            'item_category_3':  '[{$gtmBasketItemCategory->getSplitCategoryArray(2)}]',
+                            'item_category_4':  '[{$gtmBasketItemCategory->getSplitCategoryArray(3)}]',
+                            'item_list_name':   '[{$gtmBasketItemCategory->getSplitCategoryArray()}]',
+                            [{/if}]
+                            'price':            [{$d3oItemPrice->getPrice()}],
+                            'coupon':           '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
+                            'quantity':         '[{$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=$d3_ga4_remove_from_cart}]
+    [{/if}]
+[{/block}]
--- a/Application/views/ga4/search.tpl
+++ b/Application/views/ga4/search.tpl
@ -1,32 +0,0 @@
-[{$smarty.block.parent}]
-
-[{assign var="gtmProducts" value=$oView->getArticleList()}]
-
-[{if $gtmProducts|@count}]
-  [{strip}]
-    <script>
-      dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-      dataLayer.push({
-        'event': 'view_search_result',
-        'eventLabel':'view_search_result',
-        'ecommerce': {
-          'search_term': '[{$searchparamforhtml}]',
-          'items': [
-            [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
-            [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
-            [{if !$gtmCategory}][{assign var="gtmCategory" value=$gtmProduct->getCategory()}][{/if}]
-            {
-              'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
-              'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
-              'price': [{$gtmProduct->oxarticles__oxprice->value|default:'0'}],
-              'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-              'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
-              'quantity': 1
-            }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
-            [{/foreach}]
-          ]
-        }
-      });
-    </script>
-  [{/strip}]
-[{/if}]
--- a/Application/views/ga4/select_content.tpl
+++ b/Application/views/ga4/select_content.tpl
--- a/Application/views/ga4/select_item.tpl
+++ b/Application/views/ga4/select_item.tpl
--- a/Application/views/ga4/select_promotion.tpl
+++ b/Application/views/ga4/select_promotion.tpl
--- a/Application/views/ga4/sign_up.tpl
+++ b/Application/views/ga4/sign_up.tpl
--- a/Application/views/ga4/view_cart.tpl
+++ b/Application/views/ga4/view_cart.tpl
--- a/Application/views/ga4/view_item.tpl
+++ b/Application/views/ga4/view_item.tpl
@ -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,34 +1,46 @@
-[{assign var="gtmProducts" value=$products}]
+[{$smarty.block.parent}]
+[{assign var="gtmProducts" value=$oView->getArticleList()}]
+[{assign var="gtmCategory" value=$oView->getActiveCategory()}]

 [{assign var="breadCrumb" value=''}]

-[{if $gtmProducts|@count}]
-[{strip}]
-    <script>
-        /* ga4 */
-        dataLayer.push({ecommerce: null});
-        dataLayer.push({
-            'event':'view_item_list',
-            'event_name': 'view_item_list',
-            'ecommerce': {
-              'item_list_id': '[{$oView->getCategoryId()}]',
-              'item_list_name': '[{foreach from=$oView->getBreadCrumb() item=sCrum}][{if $sCrum.title }][{$breadCrumb|cat:$sCrum.title|cat:" > "}][{/if}][{/foreach}]',
-                'items': [
-                    [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
-                    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
-                    [{if !$gtmCategory}][{assign var="gtmCategory" value=$gtmProduct->getCategory()}][{/if}]
-                    {
-                        'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
-                        'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
-                        'price': [{$gtmProduct->oxarticles__oxprice->value|default:'0'}],
-                        'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-                        'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
-                        'quantity': 1
-                    }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
-                    [{/foreach}]
-                ]
-            }
-        });
-    </script>
-[{/strip}]
-[{/if}]
+[{block name="d3_ga4_view_item_list_block"}]
+    [{if $gtmProducts|@count}]
+        [{capture assign=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)}]',
+                                'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1)}]',
+                                'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2)}]',
+                                'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3)}]',
+                                [{/if}]
+                                'quantity': 1
+                            }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
+                            [{/foreach}]
+                        ]
+                    }[{if $oViewConf->isDebugModeOn()}],
+                    'debug_mode': 'true'
+                    [{/if}]
+                });
+            [{/strip}]
+        [{/capture}]
+        [{oxscript add=$d3_ga4_view_item_list}]
+    [{/if}]
+[{/block}]
--- a/Application/views/ga4/view_promotion.tpl
+++ b/Application/views/ga4/view_promotion.tpl
--- a/Application/views/ga4/view_search_result.tpl
+++ b/Application/views/ga4/view_search_result.tpl
@ -0,0 +1,44 @@
+[{$smarty.block.parent}]
+
+[{assign var="gtmProducts" value=$oView->getArticleList()}]
+
+[{block name="d3_ga4_view_search_result_block"}]
+  [{if $gtmProducts|@count}]
+    [{capture assign=d3_ga4_view_search_result}]
+      [{strip}]
+        dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+        dataLayer.push({
+          '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)}]',
+                'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1)}]',
+                'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2)}]',
+                'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3)}]',
+                'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
+                [{/if}]
+                'quantity': 1
+              }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
+              [{/foreach}]
+            ]
+          }[{if $oViewConf->isDebugModeOn()}],
+          'debug_mode': 'true'
+          [{/if}]
+        });
+      [{/strip}]
+    [{/capture}]
+    [{oxscript add=$d3_ga4_view_search_result}]
+  [{/if}]
+[{/block}]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,6 +4,90 @@ 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.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
--- a/Docs/README.md
+++ b/Docs/README.md
@ -1,19 +1,19 @@
-## Technische Doku
-### GA4 Events / Customizing
+# 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
+## 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
+    - Blockname: page_list_productlist
+    - Datei: page/list/list.tpl
    - GA4 Event: view_item_list
 - Detailseite
    - Blockname: details_productmain_title
@ -23,6 +23,10 @@ Für den geregelten Ablauf sind folgende Blöcke nötig:
    - Blockname: details_productmain_tobasket
    - Datei: page/details/inc/productmain.tpl
    - GA4 Event: add_to_cart
+- aus dem WK entfernen
+    - Blockname: checkout_basket_main
+    - Datei: page/checkout/basket.tpl
+    - GA4 Event: remove_from_cart
 - Warenkorb
    - Blockname: checkout_basket_main
    - Datei: page/checkout/basket.tpl
@ -32,7 +36,7 @@ Für den geregelten Ablauf sind folgende Blöcke nötig:
    - Datei: page/checkout/thankyou.tpl
    - GA4 Event: purchase

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

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

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

-### Cookie-Handling
+## Cookie-Handling
 Sie nutzen einen eigenen, als Modul im Shop installierten, Cookie-manager?  
 Dann tragen Sie in den Folgeeinstellungen unter "Cookie Manager Einstellungen", 
-die Cookie-ID des zugehörigen Cookies ein. Und aktivieren Sie diese Weiche, 
-indem Sie den Haken bei "Eigenen Cookie Manager nutzen?" setzen.
+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 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.
--- a/IntelliSenseHelper.php
+++ b/IntelliSenseHelper.php
@ -15,4 +15,14 @@

 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 {}
+}
+
+namespace D3\GoogleAnalytics4\Modules\Application\Controller{
+    class BasketController_parent extends \OxidEsales\Eshop\Application\Controller\BasketController {}
+    class ThankYouController_parent extends \OxidEsales\Eshop\Application\Controller\ThankYouController {}
 }
--- a/Modules/Application/Controller/BasketController.php
+++ b/Modules/Application/Controller/BasketController.php
@ -0,0 +1,127 @@
+<?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
+{
+    /**
+     * @throws oxSystemComponentException
+     */
+    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 = $sProductId ?? Registry::getRequest()->getRequestEscapedParameter('aid');
+        if ($sProductId) {
+            // additionally fetching current product info
+            $dAmount = $dAmount ?? Registry::getRequest()->getRequestEscapedParameter('am');
+
+            // select lists
+            $aSel = $aSel ?? Registry::getRequest()->getRequestEscapedParameter('sel');
+
+            // persistent parameters
+            if (empty($aPersParam)) {
+
+                /** @var BasketComponent $oBasketComponent */
+                $oBasketComponent = $this->getComponent('oxcmp_basket');
+
+                $aPersParam = $oBasketComponent->__call('getPersistedParameters', []);
+            }
+
+            $sBasketItemId = Registry::getRequest()->getRequestEscapedParameter('bindex');
+
+            $aProducts[$sProductId] = [
+                'am'           => $dAmount,
+                'sel'          => $aSel,
+                'persparam'    => $aPersParam,
+                'basketitemid' => $sBasketItemId
+            ];
+        }
+
+        if (is_array($aProducts) && count($aProducts)) {
+            $toRemoveArticleIdList = [];
+            $artIdOnArtAmountList = [];
+
+            if ($this->isArticleRemovedState($aProducts)) {
+                //setting amount to 0 if removing article from basket
+                foreach ($aProducts as $sProductId => $aProduct) {
+                    if ((isset($aProduct['remove']) && $aProduct['remove']) or intval($aProduct['am']) === 0) {
+                        if (!in_array($aProduct, $toRemoveArticleIdList)) {
+                            $toRemoveArticleIdList[] = $aProduct['aid'];
+                            $artIdOnArtAmountList[$aProduct['aid']] = $aProduct['am'];
+                        }
+
+                        $aProducts[$sProductId]['am'] = 0;
+                        #for GA4 Event
+                        $this->addTplParam('hasBeenReloaded', true);
+                    } else {
+                        unset($aProducts[$sProductId]);
+                    }
+                }
+            }
+
+            $oArtList = oxNew(ArticleList::class);
+            $oArtList->loadIds($toRemoveArticleIdList);
+
+            #dumpVar($this->getBasketArticles());
+
+            /** @var Article $item */
+            foreach ($oArtList->getArray() as $item){
+                foreach ($artIdOnArtAmountList as $artId => $artAmount){
+                    if ($item->getId() === $artId){
+                        $item->assign(['d3AmountThatGotRemoved' => $artAmount]);
+                    }
+                }
+            }
+
+            $this->addTplParam('toRemoveArticles', $oArtList);
+        }
+    }
+
+    /**
+     * @return bool
+     *
+     * checks, if we're in the short state of "an Article has been removed"
+     * We check by looking for the "'removeBtn' is not null", as a sign for it has been triggered/ clicked
+     * if that doesn't work, we check if there's an Article in the Products array, that has "'am' = 0"
+     * Which also shows we're in that state rn
+     */
+    protected function isArticleRemovedState(array $productsArray) :bool
+    {
+        if (Registry::getRequest()->getRequestEscapedParameter('removeBtn')
+            or Registry::getRequest()->getRequestEscapedParameter('updateBtn')
+        ){
+            return true;
+        }else{
+            foreach ($productsArray as $aProduct) {
+                if (intval($aProduct['am']) === 0) {
+                    return true;
+                }
+            }
+        }
+
+        return false;
+    }
+}
--- a/Modules/Application/Controller/ThankYouController.php
+++ b/Modules/Application/Controller/ThankYouController.php
@ -0,0 +1,22 @@
+<?php
+
+namespace D3\GoogleAnalytics4\Modules\Application\Controller;
+
+use OxidEsales\Eshop\Application\Model\Country;
+
+class ThankYouController extends ThankYouController_parent
+{
+    /**
+     * @return Country
+     */
+    public function d3GAGetUserCountry()
+    {
+        $sCountryId = $this->getOrder()->getFieldData('oxbillcountryid');
+
+        /** @var Country $oCountry */
+        $oCountry = oxNew(Country::class);
+        $oCountry->load($sCountryId);
+
+        return $oCountry;
+    }
+}
--- a/Modules/Application/Model/Basket.php
+++ b/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 void
+     */
+    public function getPaymentOnPaymentId() :string
+    {
+        if ($this->getPaymentId()){
+            $oPayment = oxNew(Payment::class);
+            if ($oPayment->load($this->getPaymentId())){
+                return $oPayment->getFieldData('oxdesc');
+            }
+        }
+
+        return "couldn't load payment!";
+    }
+}
--- a/Modules/Application/Model/Category.php
+++ b/Modules/Application/Model/Category.php
@ -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) :string
+    {
+        if ($indexOfArray > -1){
+            $splitCatArray =
+                array_values(
+                    array_filter(
+                        explode(
+                            '/',
+                            trim(
+                                parse_url(
+                                    $this->getLink(),
+                                    5
+                                )
+                            )
+                        )
+                    )
+                );
+
+            if ($splitCatArray[$indexOfArray]){
+                return $splitCatArray[$indexOfArray];
+            }else{
+                return "";
+            }
+        }
+
+        return
+            trim(
+                parse_url(
+                    $this->getLink(),
+                    5
+                )
+            );
+    }
+}
--- a/Modules/Application/Model/Manufacturer.php
+++ b/Modules/Application/Model/Manufacturer.php
@ -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) :string
+    {
+        if ($indexOfArray > -1){
+            $splitCatArray =
+                array_values(
+                    array_filter(
+                        explode(
+                            '/',
+                            trim(
+                                parse_url(
+                                    $this->getLink(),
+                                    5
+                                )
+                            )
+                        )
+                    )
+                );
+
+            if ($splitCatArray[$indexOfArray]){
+                return $splitCatArray[$indexOfArray];
+            }else{
+                return "";
+            }
+        }
+
+        return
+            trim(
+                parse_url(
+                    $this->getLink(),
+                    5
+                )
+            );
+    }
+}
--- a/Modules/Core/ViewConfig.php
+++ b/Modules/Core/ViewConfig.php
@ -1,19 +1,21 @@
 <?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
+ * 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 <support@shopmodule.com>
- * @link          http://www.oxidmodule.com
+ * @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\Core\Config;
 use OxidEsales\Eshop\Core\Registry;

 class ViewConfig extends ViewConfig_parent
@ -21,17 +23,134 @@ 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 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_cookieName'));
+
+        // 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
+    {
+        $sCookieId = trim(Registry::getConfig()->getConfigParam('d3_gtm_settings_cookieName'));
+
+        if (false === $this->shallUseOwnCookieManager()){
+            return "";
+        }
+
+        if (
+            $this->sCookieManagerType === ManagerTypes::USERCENTRICS_MODULE
+            or $this->sCookieManagerType === ManagerTypes::USERCENTRICS_MANUALLY
+        )
+        {
+            if ($sCookieId) {
+                return 'data-usercentrics="' . $sCookieId . '" type="text/plain" async=""';
+            }
+        }
+
+        if ($this->sCookieManagerType === ManagerTypes::CONSENTMANAGER)
+        {
+            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"
+                        ';
+            }
+        }
+
+        if ($this->sCookieManagerType === ManagerTypes::COOKIEFIRST){
+            return 'type="text/plain" data-cookiefirst-category="' . $sCookieId .'"';
+        }
+
+        if ($this->sCookieManagerType === ManagerTypes::COOKIEBOT){
+            return 'type="text/plain" data-cookieconsent="' . $sCookieId .'"';
+        }
+
+        return "";
+    }
+
    private $blGA4enabled = null;

    public function isGA4enabled()
@ -51,10 +170,9 @@ class ViewConfig extends ViewConfig_parent
        $oConfig = Registry::getConfig();
        $oView   = $oConfig->getTopActiveView();
        /** @var FrontendController $oShop */
-
        $oUser = $oConfig->getUser();

-        $cl         = $this->getTopActionClassName();
+        $cl         = $this->getTopActiveClassName();
        $aPageTypes = [
            "content"  => "cms",
            "details"  => "product",
@ -65,6 +183,7 @@ class ViewConfig extends ViewConfig_parent
            "payment"  => "checkout",
            "order"    => "checkout",
            "thankyou" => "checkout",
+            "start"    => "start",
        ];

        $dataLayer = [
@ -81,6 +200,11 @@ class ViewConfig extends ViewConfig_parent
        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();
--- a/README.md
+++ b/README.md
@ -23,13 +23,17 @@ Dieses Paket erfordert einen mit Composer installierten OXID eShop in einer in d
 Ö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.

 ```bash
-php composer require d3/google-analytics4:^1
+php composer require d3/google-analytics4:^2
 ```

 Sofern nötig, bestätigen Sie bitte, dass Sie `package-name` erlauben, Code auszuführen.

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

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

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

 Vielen Dank.
--- a/composer.json
+++ b/composer.json
@ -1,56 +1,56 @@
-{
-  "name": "d3/google-analytics4",
-  "description": "Google Tag Manager with new Google Analytics 4 for OXID eShop v6",
-  "type": "oxideshop-module",
-  "keywords": [
-    "oxid",
-    "modules",
-    "eShop",
-    "d3",
-    "google",
-    "ga4",
-    "googleanalytics",
-    "gtm",
-    "configuration"
-  ],
-  "homepage": "https://www.d3data.de",
-  "license": [
-    "GPL-3.0"
-  ],
-  "authors": [
-    {
-      "name": "Marat Bedoev",
-      "email": "hello@mb-dev.pro"
-    },
-    {
-      "name": "D3 Data Development (Inh. Thomas Dartsch)",
-      "email": "info@shopmodule.com",
-      "homepage": "https://www.d3data.de"
-    }
-  ],
-  "support": {
-    "email": "support@shopmodule.com"
-  },
-  "extra": {
-    "oxideshop": {
-      "blacklist-filter": [
-        "*.md",
-        "composer.json",
-        ".php-cs-fixer.php",
-        "*.xml",
-        "*.neon"
-      ],
-      "target-directory": "d3/googleanalytics4"
-    }
-  },
-  "require": {
-    "php": ">=7.1",
-    "oxid-esales/oxideshop-ce": "v6.0 - 6.3",
-    "google/apiclient":" ^2.0"
-  },
-  "autoload": {
-    "psr-4": {
-      "D3\\GoogleAnalytics4\\": "../../../source/modules/d3/googleanalytics4"
-    }
-  }
+{
+  "name": "d3/google-analytics4",
+  "description": "Google Tag Manager with new Google Analytics 4 for OXID eShop v6",
+  "type": "oxideshop-module",
+  "keywords": [
+    "oxid",
+    "modules",
+    "eShop",
+    "d3",
+    "google",
+    "ga4",
+    "googleanalytics",
+    "gtm",
+    "configuration"
+  ],
+  "homepage": "https://www.d3data.de",
+  "license": [
+    "GPL-3.0"
+  ],
+  "authors": [
+    {
+      "name": "Marat Bedoev",
+      "email": "hello@mb-dev.pro"
+    },
+    {
+      "name": "D3 Data Development (Inh. Thomas Dartsch)",
+      "email": "info@shopmodule.com",
+      "homepage": "https://www.d3data.de"
+    }
+  ],
+  "support": {
+    "email": "support@shopmodule.com"
+  },
+  "extra": {
+    "oxideshop": {
+      "blacklist-filter": [
+        "*.md",
+        "composer.json",
+        ".php-cs-fixer.php",
+        "*.xml",
+        "*.neon"
+      ],
+      "target-directory": "d3/googleanalytics4"
+    }
+  },
+  "require": {
+    "php": ">=7.1",
+    "oxid-esales/oxideshop-ce": "v6.0 - 6.3",
+    "google/apiclient":" ^2.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "D3\\GoogleAnalytics4\\": "../../../source/modules/d3/googleanalytics4"
+    }
+  }
 }
--- a/metadata.php
+++ b/metadata.php
@ -1,5 +1,16 @@
 <?php
+
+use D3\GoogleAnalytics4\Modules\Application\Controller\BasketController;
+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\Controller\BasketController as OEBasketController;
+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';
@ -17,39 +28,26 @@ $aModule          = [
                      Die Entwicklung basiert auf einem Fork von Marat Bedoev - <a href='https://github.com/vanilla-thunder/oxid-module-gtm'>Github-Link</a>
                      ",
    'thumbnail'   => 'thumbnail.png',
-    'version'     => '1.1.0',
+    'version'     => '1.12.0',
    'author'      => 'Data Development (Inh.: Thomas Dartsch)',
    'email'       => 'support@shopmodule.com',
    'url'         => 'https://www.oxidmodule.com/',
    'extend'      => [
-        OEViewConfig::class => ViewConfig::class
-    ],
-    'templates'   => [
-        // GA4 events
-        'ga4_add_payment_info.tpl' => 'd3/googleanalytics4/Application/views/ga4/add_payment_info.tpl',
-        'add_shipping_info.tpl'    => 'd3/googleanalytics4/Application/views/ga4/add_shipping_info.tpl',
-        'ga4_add_to_cart.tpl'      => 'd3/googleanalytics4/Application/views/ga4/add_to_cart.tpl',
-        'ga4_begin_checkout.tpl'   => 'd3/googleanalytics4/Application/views/ga4/begin_checkout.tpl',
-        'ga4_generate_lead.tpl'    => 'd3/googleanalytics4/Application/views/ga4/generate_lead.tpl',
-        'ga4_login.tpl'            => 'd3/googleanalytics4/Application/views/ga4/login.tpl',
-        'ga4_purchase.tpl'         => 'd3/googleanalytics4/Application/views/ga4/purchase.tpl',
-        'ga4_remove_from_cart.tpl' => 'd3/googleanalytics4/Application/views/ga4/remove_from_cart.tpl',
-        'ga4_search.tpl'           => 'd3/googleanalytics4/Application/views/ga4/search.tpl',
-        'ga4_select_content.tpl'   => 'd3/googleanalytics4/Application/views/ga4/select_content.tpl',
-        'ga4_select_item.tpl'      => 'd3/googleanalytics4/Application/views/ga4/select_item.tpl',
-        'ga4_select_promotion.tpl' => 'd3/googleanalytics4/Application/views/ga4/select_promotion.tpl',
-        'ga4_sign_up.tpl'          => 'd3/googleanalytics4/Application/views/ga4/sign_up.tpl',
-        'ga4_view_cart.tpl'        => 'd3/googleanalytics4/Application/views/ga4/view_cart.tpl',
-        'ga4_view_item.tpl'        => 'd3/googleanalytics4/Application/views/ga4/view_item.tpl',
-        'ga4_view_item_list.tpl'   => 'd3/googleanalytics4/Application/views/ga4/view_item_list.tpl',
-        'ga4_view_promotion.tpl'   => 'd3/googleanalytics4/Application/views/ga4/view_promotion.tpl',
+        OEViewConfig::class => ViewConfig::class,
+        OECategory::class => Category::class,
+        OEBasket::class => Basket::class,
+        OEBasketController::class => BasketController::class,
+        OEManufacturer::class => Manufacturer::class,
+        OEThankYouController::class => ThankYouController::class
    ],
+    'templates'   => [],
    'blocks'      => [
        // tag manager js
        [
            'template' => 'layout/base.tpl',
            'block'    => 'head_meta_robots',
-            'file'     => '/Application/views/blocks/_gtm_js.tpl'
+            'file'     => '/Application/views/blocks/_gtm_js.tpl',
+            'position' => 150
        ],
        // tag manager nojs
        [
@ -57,60 +55,29 @@ $aModule          = [
            'block'    => 'theme_svg_icons',
            'file'     => '/Application/views/blocks/_gtm_nojs.tpl'
        ],
-        // widget_product_list
-        [
-            'template' => 'widget/product/list.tpl',
-            'block'    => 'widget_product_list',
-            'file'     => '/Application/views/blocks/widget_product_list.tpl'
-        ],
        // details
        [
            'template' => 'page/details/inc/productmain.tpl',
            'block'    => 'details_productmain_title',
-            'file'     => '/Application/views/blocks/detail.tpl',
+            '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'
+            'file'     => '/Application/views/blocks/view_cart.tpl'
        ],
        [
            'template' => 'page/checkout/thankyou.tpl',
            'block'    => 'checkout_thankyou_main',
-            'file'     => '/Application/views/blocks/checkout_s5.tpl'
+            'file'     => '/Application/views/blocks/purchase.tpl'
        ],
        // Lists
        // view_item_list
        [
-            'template' => 'widget/product/list.tpl',
-            'block'    => 'd3Ga4_view_item_list',
+            'template' => 'page/list/list.tpl',
+            'block'    => 'page_list_productlist',
            'file'     => '/Application/views/ga4/view_item_list.tpl',
            'position' => 150
        ],
@ -118,7 +85,7 @@ $aModule          = [
        [
            'template' => 'page/search/search.tpl',
            'block'    => 'search_results',
-            'file'     => '/Application/views/ga4/search.tpl',
+            'file'     => '/Application/views/ga4/view_search_result.tpl',
            'position' => 150
        ],
        // add_to_cart
@ -127,6 +94,13 @@ $aModule          = [
            'block'    => 'details_productmain_tobasket',
            'file'     => '/Application/views/ga4/add_to_cart.tpl',
            'position' => 150
+        ],
+        // remove_from_cart
+        [
+            'template' => 'page/checkout/basket.tpl',
+            'block'    => 'checkout_basket_main',
+            'file'     => '/Application/views/ga4/remove_from_cart.tpl',
+            'position' => 150
        ]
    ],
    'settings'    => [
@ -165,5 +139,12 @@ $aModule          = [
            'value'    => 'example',
            'position' => 999
        ],
+        [
+            'group' => 'd3_gtm_settings_cookiemanager',
+            'name' => 'd3_gtm_settings_HAS_STD_MANAGER',
+            'type' => 'select',
+            'value' => 'none',
+            'constraints' => 'NONE|CONSENTMANAGER|USERCENTRICS|COOKIEFIRST|COOKIEBOT',
+        ],
    ]
 ];
Author	SHA1	Message	Date
MaxBUhe	99af4cdfa9	bump metadata && changelog	2023-09-07 15:16:54 +02:00
MaxBUhe	eb2c7f73b9	add cookiebot essentials	2023-09-07 15:15:05 +02:00
MaxBUhe	575e35ffbc	[changed] 'an article has been removed from basket'-check	2023-08-18 14:07:53 +02:00
MaxBUhe	2e6acbe675	[fixed] metadata class entry	2023-08-17 10:59:57 +02:00
MaxBUhe	aae6c43786	extends changelog	2023-08-17 10:30:19 +02:00
MaxBUhe	17840d33b1	Merge remote-tracking branch 'remotes/origin/dev_1.x_manufacturer' into dev_1.x # Conflicts: # metadata.php	2023-08-17 10:27:21 +02:00
MaxBUhe	a49c29d7aa	add CountryObjectGetter to ThankYouController	2023-08-17 09:20:58 +02:00
MaxBUhe	e90aba2c55	add gitignore	2023-08-17 08:53:00 +02:00
MaxBUhe	ea6b63fd2f	extended docs	2023-08-17 08:53:00 +02:00
MaxBUhe	6b18c50b42	add 'remove_from_cart' event	2023-08-17 08:53:00 +02:00
MaxBUhe	443b456a0d	add new method for debug-check	2023-08-17 08:53:00 +02:00
MaxBUhe	216c53fa90	general structure rework, debug_mode setter	2023-08-17 08:52:58 +02:00
MarkusGaertner	5355b0a7ad	extend Manufacturer	2023-08-15 11:59:27 +02:00
MaxBUhe	432ba54c84	bump version && changelog to 1.10.0	2023-06-27 09:48:29 +02:00
MaxBUhe	8b344ffb85	add cookiefirst	2023-06-27 09:39:43 +02:00
MaxBUhe	0009926313	revert php adjustment in composer.json	2023-06-27 09:30:10 +02:00
MaxBUhe	50be757355	reduce minimal usable php to 7.0	2023-06-27 09:08:17 +02:00
MaxBuhe01	60f61f4bab	[working state] add rel_2.x adjustments	2023-06-26 17:45:26 +02:00
MaxBuhe01	a93b1cf582	[working state] add rel_2.x adjustments	2023-06-26 17:41:00 +02:00
MaxBUhe	3f59d1f210	bump version && changelog to 1.9.0	2023-06-19 14:50:34 +02:00
MaxBUhe	5ed924e840	[rework] change structure of GA-event moving the procedere into one step so there's not an accidental triggering of an GA-Push-Event which at the end overwrites the View-Item-Push-Event in the cmpEvent	2023-06-19 11:34:45 +02:00
MaxBUhe	d4ef0f35f9	bump version && changelog to 1.8.0	2023-05-31 14:22:11 +02:00
MaxBUhe	c17ae1cef5	fix explicit manager bug bug would adjust the script even if the check for an own cookieManager is not set	2023-05-31 14:11:50 +02:00
MaxBUhe	32e08a88ca	rm typo in readme	2023-05-31 10:29:49 +02:00
MaxBUhe	9d9daf9a85	bump version && changelog to 1.7.0	2023-05-31 10:28:19 +02:00
MaxBUhe	6eefc062ba	add missing article-getter	2023-05-31 10:17:51 +02:00
MaxBUhe	3f89e26bde	adjust readme and switch used block-extension	2023-05-30 16:41:59 +02:00
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