[Unknown-State] first base for it

came formerly from an OS-Ticket but ticket got canceled from the customer
Merge remote-tracking branch 'remotes/origin/rel_2.x' into dev_2.x_remove_from_cart_integration
2024-07-30 14:54:03 +02:00 · 2024-07-30 14:51:51 +02:00 · 2024-05-30 09:15:03 +02:00 · 2024-05-30 09:14:31 +02:00 · 2024-05-30 08:42:27 +02:00
--- a/.php-cs-fixer.php
+++ b/.php-cs-fixer.php
@ -1,15 +1,13 @@
 <?php
-	
-	$finder = PhpCsFixer\Finder::create()
-		->in(__DIR__)
-	;
-	
-	$config = new PhpCsFixer\Config();
-	return $config->setRules([
-		'@PHP81Migration' => true,
-		'@PSR12' => true,
-		'php_unit_test_class_requires_covers' => true,
-		'doctrine_annotation_indentation' => true,
-	])
-		->setFinder($finder)
-		;
+
+$finder = PhpCsFixer\Finder::create()
+    ->in(__DIR__)
+;
+
+$config = new PhpCsFixer\Config();
+return $config->setRules([
+        '@PHP73Migration' => true,
+        '@PSR12' => true
+    ])
+    ->setFinder($finder)
+;
--- a/Application/Component/Widget/d3GtmStartWidget.php
+++ b/Application/Component/Widget/d3GtmStartWidget.php
@ -1,15 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace D3\GoogleAnalytics4\Application\Component\Widget;
-
-class d3GtmStartWidget extends \OxidEsales\Eshop\Application\Component\Widget\WidgetController
-{
-    public function render()
-    {
-        parent::render();
-
-        return '';
-    }
-}
--- a/Application/Controller/Admin/GA4AdminUserInterface_main.php
+++ b/Application/Controller/Admin/GA4AdminUserInterface_main.php
@ -12,7 +12,7 @@ use OxidEsales\Eshop\Core\ViewConfig;

 class GA4AdminUserInterface_main extends \OxidEsales\Eshop\Application\Controller\Admin\AdminDetailsController
 {
-    protected $_sThisTemplate = '@' . Constants::OXID_MODULE_ID . '/admin/d3ga4uimain';
+    protected $_sThisTemplate = 'ga4/admin/d3ga4uimain.tpl';

    public function render()
    {
@ -41,10 +41,10 @@ class GA4AdminUserInterface_main extends \OxidEsales\Eshop\Application\Controlle
            '_blEnableUsercentricsConsentModeApi',
        ];

-        foreach ($aCheckBoxParams as $checkBoxName) {
-            if (isset($aParams['bool'][$checkBoxName])) {
+        foreach ($aCheckBoxParams as $checkBoxName){
+            if (isset($aParams['bool'][$checkBoxName])){
                $aParams['bool'][$checkBoxName] = true;
-            } else {
+            }else{
                $aParams['bool'][$checkBoxName] = false;
            }
        }
@ -60,8 +60,8 @@ class GA4AdminUserInterface_main extends \OxidEsales\Eshop\Application\Controlle
    {
        $oConfig = Registry::getConfig();
        foreach ($aParams as $sConfigType => $aConfigParams) {
-            foreach ($aConfigParams as $sParamName => $sParamValue) {
-                if ($this->d3GetModuleConfigParam($sParamName) !== $sParamValue) {
+            foreach ($aConfigParams as $sParamName => $sParamValue){
+                if($this->d3GetModuleConfigParam($sParamName) !== $sParamValue){
                    $oConfig->saveShopConfVar(
                        $sConfigType,
                        Constants::OXID_MODULE_ID.$sParamName,
@ -82,4 +82,4 @@ class GA4AdminUserInterface_main extends \OxidEsales\Eshop\Application\Controlle
    {
        return Registry::get(ViewConfig::class)->d3GetModuleConfigParam($configParamName);
    }
-}
+}
--- a/Application/Model/CMP/ConsentManagementPlatformBaseModel.php
+++ b/Application/Model/CMP/ConsentManagementPlatformBaseModel.php
@ -4,6 +4,7 @@ declare(strict_types=1);

 namespace D3\GoogleAnalytics4\Application\Model\CMP;

+
 abstract class ConsentManagementPlatformBaseModel extends \OxidEsales\Eshop\Core\Model\BaseModel implements ConsentManagementPlatformInterface
 {
    public string $sCMPName;
@ -15,4 +16,4 @@ abstract class ConsentManagementPlatformBaseModel extends \OxidEsales\Eshop\Core
    {
        return $this->sCMPName;
    }
-}
+}
--- a/Application/Model/CMP/ConsentManagementPlatformInterface.php
+++ b/Application/Model/CMP/ConsentManagementPlatformInterface.php
@ -5,4 +5,4 @@ namespace D3\GoogleAnalytics4\Application\Model\CMP;
 interface ConsentManagementPlatformInterface
 {
    public function getCMPName();
-}
+}
--- a/Application/Model/CMP/Usercentrics.php
+++ b/Application/Model/CMP/Usercentrics.php
@ -4,6 +4,7 @@ declare(strict_types=1);

 namespace D3\GoogleAnalytics4\Application\Model\CMP;

+
 use D3\GoogleAnalytics4\Application\Model\ManagerTypes;

 /**
@ -17,8 +18,8 @@ use D3\GoogleAnalytics4\Application\Model\ManagerTypes;
 */
 class Usercentrics extends ConsentManagementPlatformBaseModel
 {
-    public const sExternalIncludationPublicName    = "( Externe Einbindung ) Usercentrics";
-    public const sExternalIncludationInternalName  = "usercentrics";
-    public const sModuleIncludationPublicName      = "( Modul ) Usercentrics";
-    public const sModuleIncludationInternalName    = "oxps_usercentrics";
-}
+    const sExternalIncludationPublicName    = "( Externe Einbindung ) Usercentrics";
+    const sExternalIncludationInternalName  = "usercentrics";
+    const sModuleIncludationPublicName      = "( Modul ) Usercentrics";
+    const sModuleIncludationInternalName    = "oxps_usercentrics";
+}
--- a/Application/Model/Constants.php
+++ b/Application/Model/Constants.php
@ -4,7 +4,8 @@ declare(strict_types=1);

 namespace D3\GoogleAnalytics4\Application\Model;

+
 class Constants
 {
    public const OXID_MODULE_ID = 'd3googleanalytics4';
-}
+}
--- a/Application/Model/ManagerHandler.php
+++ b/Application/Model/ManagerHandler.php
@ -12,25 +12,25 @@ class ManagerHandler
     *
     * @return string
     */
-    public function getCurrManager(): string
+    public function getCurrManager() :string
    {
        /** @var ManagerTypes $oManagerTypes */
        $oManagerTypes = oxNew(ManagerTypes::class);

-        /** @var ViewConfig|\D3\GoogleAnalytics4\Modules\Core\ViewConfig $oViewConfig */
+        /** @var ViewConfig $oViewConfig */
        $oViewConfig = oxNew(ViewConfig::class);

        $aManagerList =  $oManagerTypes->getManagerList();

-        if ($this->getModuleSettingExplicitManagerSelectValue()) {
+        if ($this->getModuleSettingExplicitManagerSelectValue()){
            return $this->getExplicitManager();
        }

-        foreach ($aManagerList as $shopModuleId => $publicCMPName) {
-            if ($oViewConfig->d3IsModuleActive($shopModuleId)) {
-                $this->d3SaveShopConfVar($shopModuleId);
-                return $shopModuleId;
-            }
+        foreach ($aManagerList as $shopModuleId => $publicCMPName){
+           if ($oViewConfig->isModuleActive($shopModuleId)){
+               $this->d3SaveShopConfVar($shopModuleId);
+               return $shopModuleId;
+           }
        }

        return "";
@ -40,8 +40,7 @@ class ManagerHandler
     * @param string $sParam
     * @return void
     */
-    public function d3SaveShopConfVar(string $sParam)
-    {
+    public function d3SaveShopConfVar(string $sParam){
        Registry::getConfig()->saveShopConfVar(
            'select',
            Constants::OXID_MODULE_ID."_HAS_STD_MANAGER",
@ -54,15 +53,15 @@ class ManagerHandler
    /**
     * @return string
     */
-    public function getModuleSettingExplicitManagerSelectValue(): string
+    public function getModuleSettingExplicitManagerSelectValue() :string
    {
-        return Registry::get(ViewConfig::class)->d3GetModuleConfigParam('_HAS_STD_MANAGER') ?: "";
+        return Registry::get(ViewConfig::class)->d3GetModuleConfigParam('_HAS_STD_MANAGER')?:"";
    }

    /**
     * @return string
     */
-    public function getExplicitManager(): string
+    public function getExplicitManager() :string
    {
        $sPotentialManagerName = $this->getModuleSettingExplicitManagerSelectValue();

@ -76,4 +75,4 @@ class ManagerHandler

        return $sCMPName;
    }
-}
+}
--- a/Application/Model/ManagerTypes.php
+++ b/Application/Model/ManagerTypes.php
@ -6,26 +6,20 @@ use D3\GoogleAnalytics4\Application\Model\CMP\Usercentrics;

 class ManagerTypes
 {
-    public const EXTERNAL_SERVICE          = "eigener Service";
-    public const INTERNAL_EXTERNAL_SERVICE          = "externalService";
-    public const NET_COOKIE_MANAGER        = "Netensio Cookie Manager";
-    public const INTERNAL_NET_COOKIE_MANAGER        = "net_cookie_manager";
+    const EXTERNAL_SERVICE          = "eigener Service";
+    const NET_COOKIE_MANAGER        = "Netensio Cookie Manager";

    /**
     * Further information's:
     * https://github.com/aggrosoft/oxid-cookie-compliance
     */
-    public const AGCOOKIECOMPLIANCE        = "Aggrosoft Cookie Compliance";
-    public const INTERNAL_AGCOOKIECOMPLIANCE        = "agcookiecompliance";
+    const AGCOOKIECOMPLIANCE        = "Aggrosoft Cookie Compliance";

-    public const CONSENTMANAGER            = "Consentmanager";
-    public const INTERNAL_CONSENTMANAGER            = "cmconsentmanager";
+    const CONSENTMANAGER            = "Consentmanager";

-    public const COOKIEFIRST               = "Cookiefirst";
-    public const INTERNAL_COOKIEFIRST               = "cookiefirst";
+    const COOKIEFIRST               = "Cookiefirst";

-    public const COOKIEBOT                 = "Cookiebot";
-    public const INTERNAL_COOKIEBOT                 = "cookiebot";
+    const COOKIEBOT                 = "Cookiebot";

    /**
     * @return array
@ -33,14 +27,14 @@ class ManagerTypes
    public function getManagerList(): array
    {
        return [
-            self::INTERNAL_EXTERNAL_SERVICE       => self::EXTERNAL_SERVICE,
-            self::INTERNAL_AGCOOKIECOMPLIANCE    => self::AGCOOKIECOMPLIANCE,
-            self::INTERNAL_NET_COOKIE_MANAGER    => self::NET_COOKIE_MANAGER,
+            "externalService"       => self::EXTERNAL_SERVICE,
+            "agcookiecompliance"    => self::AGCOOKIECOMPLIANCE,
+            "net_cookie_manager"    => self::NET_COOKIE_MANAGER,
            Usercentrics::sModuleIncludationInternalName    => Usercentrics::sModuleIncludationPublicName,
            Usercentrics::sExternalIncludationInternalName  => Usercentrics::sExternalIncludationPublicName,
-            self::INTERNAL_CONSENTMANAGER      => self::CONSENTMANAGER,
-            self::INTERNAL_COOKIEFIRST           => self::COOKIEFIRST,
-            self::INTERNAL_COOKIEBOT             => self::COOKIEBOT,
+            "cmconsentmanager"      => self::CONSENTMANAGER,
+            "cookiefirst"           => self::COOKIEFIRST,
+            "cookiebot"             => self::COOKIEBOT,
        ];
    }

@ -48,25 +42,8 @@ class ManagerTypes
     * @param string $sManager
     * @return bool
     */
-    public function isManagerInList(string $sManager): bool
+    public function isManagerInList(string $sManager) :bool
    {
        return in_array($sManager, array_keys($this->getManagerList()), true);
    }
-
-    /**
-     * @return array
-     *
-     * the CMP from this method always needs the script tag delivered to the dom.
-     */
-    public function scriptTagDeliveredByDefaultArray(): array
-    {
-        return [
-            Usercentrics::sModuleIncludationInternalName,
-            Usercentrics::sExternalIncludationInternalName,
-            ManagerTypes::INTERNAL_CONSENTMANAGER,
-            ManagerTypes::INTERNAL_COOKIEFIRST,
-            ManagerTypes::INTERNAL_COOKIEBOT,
-            ManagerTypes::INTERNAL_EXTERNAL_SERVICE,
-        ];
-    }
-}
+}
--- a/Application/views/admin_smarty/de/d3googleanalytics4_lang.php
+++ b/Application/views/admin_smarty/de/d3googleanalytics4_lang.php
@ -1,14 +1,14 @@
 <?php
-
 $sLangName = "Deutsch";
 // -------------------------------
 // RESOURCE IDENTITFIER = STRING
 // -------------------------------
-$aLang = [
+$aLang = array(
    'charset'                   => 'UTF-8',

    'd3mxgoogleanalytics4'      => 'Google Analytics 4',
    'd3mxgoogleanalytics4set'   => 'Einstellungen',
+    'd3mxd3modules'             => "<i class='fab fa-fw fa-d3 d3fa-color-blue'></i> Module",

    // Base Translations
    'D3BASECONFIG'              => 'Grundeinstellungen',
@ -19,7 +19,7 @@ $aLang = [
    'D3ACTIVATEMOD'             => 'Modul aktivieren',
    'D3CNTRLPARAM'              => 'Steuerungsparameter',
    'D3CNTRLPARAM_HELP'         => '<a target="_blank" href="https://github.com/d3datadevelopment/GoogleAnalytics4/blob/master/Docs/README.md#steuerungsparameter" class="text-muted text-decoration-none"><i class="bi bi-book-half"></i> Was ist der <strong>Steuerungsparameter</strong>?</a>',
-    'D3INACTIVATEMOD'           => 'Modul ist nicht aktiv! Es werden keine Funktionen ausgespielt!',
+    'D3INACTIVATEMOD'           => 'Modul ist nicht aktiv! Es werde keine Funktionen ausgespielt!',
    // Usercentrics Dynamische Optionen
    'D3USRCNTRCSDYNOPT'         => 'Usercentrics Dynamische Optionen',

@ -41,7 +41,7 @@ $aLang = [
                                        völlig verhindert, solange keine Zustimmung erteilt wurde.<br>
                                        <br>
                                        Ein einfaches anschalten dieser Funktion regelt noch <strong>nicht</strong> die völlige Funktionsweise
-                                        aller beteiligten Instanzen; diese bedarf eine detailliertere Konfiguration!<br>",
+                                        aller beteiligten Instanzen; diese bedarf eine detailiertere Konfiguration!<br>",

    // Use CMP?
    'D3CMPTABTITLE'             => 'Cookie Manager Einstellungen',
@ -58,12 +58,12 @@ $aLang = [
                                    Diese konformen CMP sind in 
                                    <a target="_blank" href="https://cmppartnerprogram.withgoogle.com/">offizieller Partnerschaft mit Google ( Liste der Partner )</a> 
                                    und unterliegen strengen Vorschriften, um ein ordnungsgemäßes Senden und 
-                                    Verarbeiten der Zustimmung unterliegenden Daten sicher stellen zu können.',
+                                    Verarbeiten der Zustimmung unterliegenden Daten sicher zu stellen.',
    'D3CMP'                     => 'Consent Management Platform ( CMP ) wählen',

    // Usercentrics Config
    // activate Individual Default Values
-    'D3USRCNTRCSCFG_ACT_INDIVDEFVAL'    => "Usercentrics individual 'Default Values' aktiveren",
+    'D3USRCNTRCSCFG_ACT_INDIVDEFVAL'    => "usercentrics individual 'Default Values' aktiveren",
    // standard Consent
    'D3USRCNTRCSCFG_STD_CNST'           => "GTM Standard Consent",
    // activate consent mode API
@ -71,7 +71,7 @@ $aLang = [
    // consent mode api
    'D3USRCNTRCSCFG_CNSTMDE_API'        => "Consent Mode API",
    'D3USRCNTRCSCFG_DOCS'               => 'Nähere Infos zu den hier konfigurierbaren Einstellungen entnehmen Sie bitte der offiziellen
-                                            Dokumentation von Usercentrics selbst: <a target="_blank" href="https://docs.usercentrics.com/#/consent-mode" class="text-primary"><i class="bi bi-book-half"></i> Dokumentation</a>',
+                                            Dokumentation von Usercentrics selbst: <a href="https://docs.usercentrics.com/#/consent-mode" class="text-primary"><i class="bi bi-book-half"></i> Dokumentation</a>',
    'D3USRCNTRCSCFG_WARNING'            => "Bevor Sie hier Anpassungen machen, konsultieren Sie bitte einen technischen Support!<br>
                                            Anpassungen können zu Beeinträchtigungen und Ausfall von Funktionen im Frontend führen!",

@ -121,4 +121,4 @@ Nachher:
 src="{Domain}?id={Container-ID}"
 </code>
                                                                        </pre>',
-];
+);
--- a/Application/views/admin_smarty/de/module_options.php
+++ b/Application/views/admin_smarty/de/module_options.php
@ -1,5 +1,4 @@
 <?php
-
 /**
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
--- a/Application/views/admin/tpl/d3googleanalytics4_headitem.tpl
+++ b/Application/views/admin/tpl/d3googleanalytics4_headitem.tpl
--- a/Application/views/admin/tpl/d3googleanalytics4_main.tpl
+++ b/Application/views/admin/tpl/d3googleanalytics4_main.tpl
@ -1,4 +1,4 @@
-[{include file="@d3googleanalytics4/admin/d3ga4uiheaditem.tpl" title="GENERAL_ADMIN_TITLE"|oxmultilangassign}]
+[{include file="ga4/admin/d3ga4uiheaditem.tpl" title="GENERAL_ADMIN_TITLE"|oxmultilangassign}]
 <style>
    body {
        background-image: linear-gradient(to top, #d5d4d0 0%, #d5d4d0 1%, #eeeeec 31%, #efeeec 75%, #e9e9e7 100%);
@ -80,6 +80,7 @@
                                            [{oxmultilang ident="D3CMP"}]
                                        </label>
                                        <select class="form-select w-50" name="editval[select][_HAS_STD_MANAGER]" aria-label="Default select example">
+                                            <option value="NONE" selected>[{oxmultilang ident="D3NONE"}]</option>
                                            [{foreach from=$d3ManagerTypeArray key="sInternalName" item="sPublicName" name="editval[aCmpNameArray]"}]
                                            <option value="[{$sInternalName}]" [{if $sInternalName === $d3CurrentCMP}]SELECTED[{/if}]>[{$sPublicName}]</option>
                                            [{/foreach}]
--- a/Application/views/blocks/_gtm_js.tpl
+++ b/Application/views/blocks/_gtm_js.tpl
--- a/Application/views/blocks/_gtm_nojs.tpl
+++ b/Application/views/blocks/_gtm_nojs.tpl
@ -1,12 +1,12 @@
-[{if $oViewConf->D3blShowGtmScript()}]
-    [{if $oViewConf->getGtmContainerId()}][{strip}]
-    <!-- Google Tag Manager (noscript) -->
-    <noscript>
-        <iframe src="[{$oViewConf->getServerSidetaggingNoJsDomain()}]?id=[{$oViewConf->getGtmContainerId()}]"
-                height="0" width="0" style="display:none;visibility:hidden"></iframe>
-    </noscript>
-<!-- End Google Tag Manager (noscript) -->
-    [{/strip}][{/if}]
-    [{/if}]
-
+[{if $oViewConf->D3blShowGtmScript()}]
+    [{if $oViewConf->getGtmContainerId()}][{strip}]
+    <!-- Google Tag Manager (noscript) -->
+    <noscript>
+        <iframe src="[{$oViewConf->getServerSidetaggingNoJsDomain()}]?id=[{$oViewConf->getGtmContainerId()}]"
+                height="0" width="0" style="display:none;visibility:hidden"></iframe>
+    </noscript>
+<!-- End Google Tag Manager (noscript) -->
+    [{/strip}][{/if}]
+    [{/if}]
+
 [{$smarty.block.parent}]
--- a/Application/views/blocks/details_productmain_tobasket.tpl
+++ b/Application/views/blocks/details_productmain_tobasket.tpl
@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]
--- a/Application/views/blocks/page_list_listbody.tpl
+++ b/Application/views/blocks/page_list_listbody.tpl
@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]
--- a/Application/views/blocks/purchase.tpl
+++ b/Application/views/blocks/purchase.tpl
@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="event/purchase.tpl"}]
--- a/Application/views/blocks/remove_from_cart.tpl
+++ b/Application/views/blocks/remove_from_cart.tpl
@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="event/remove_from_cart.tpl"}]
--- a/Application/views/blocks/start_welcome_text.tpl
+++ b/Application/views/blocks/start_welcome_text.tpl
@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]
--- a/Application/views/blocks/view_cart.tpl
+++ b/Application/views/blocks/view_cart.tpl
@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="event/view_cart.tpl"}]
--- a/Application/views/blocks/view_item.tpl
+++ b/Application/views/blocks/view_item.tpl
@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="event/view_item.tpl"}]
--- a/Application/views/blocks/view_item_list.tpl
+++ b/Application/views/blocks/view_item_list.tpl
@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="event/view_item_list.tpl"}]
--- a/Application/views/blocks/view_search_result.tpl
+++ b/Application/views/blocks/view_search_result.tpl
@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="event/view_search_result.tpl"}]
--- a/Application/views/event/add_to_cart.tpl
+++ b/Application/views/event/add_to_cart.tpl
--- a/Application/views/event/purchase.tpl
+++ b/Application/views/event/purchase.tpl
--- a/Application/views/event/remove_from_cart.tpl
+++ b/Application/views/event/remove_from_cart.tpl
--- a/Application/views/event/view_cart.tpl
+++ b/Application/views/event/view_cart.tpl
--- a/Application/views/event/view_item.tpl
+++ b/Application/views/event/view_item.tpl
--- a/Application/views/event/view_item_list.tpl
+++ b/Application/views/event/view_item_list.tpl
--- a/Application/views/event/view_search_result.tpl
+++ b/Application/views/event/view_search_result.tpl
@ -41,4 +41,4 @@
  [{/if}]
 [{/block}]

-[{include file='@d3googleanalytics4/event/add_to_cart.tpl' htmlIdAmountOfArticles='#amountToBasket'}]
+[{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]
--- a/Application/views/tpl/page/account/d3gtmnoticelist.tpl
+++ b/Application/views/tpl/page/account/d3gtmnoticelist.tpl
@ -8,7 +8,7 @@
    <p class="alert alert-info">[{oxmultilang ident="WISH_LIST_EMPTY"}]</p>
    [{/if}]

-    [{include file='@d3googleanalytics4/event/add_to_cart.tpl' htmlIdAmountOfArticles='#amountToBasket'}]
+    [{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]

    [{insert name="oxid_tracker" title=$template_title}]
    [{/capture}]
--- a/Application/views/tpl/page/account/d3gtmrecommendationlist.tpl
+++ b/Application/views/tpl/page/account/d3gtmrecommendationlist.tpl
@ -21,7 +21,7 @@
        [{/if}]
    [{/block}]

-    [{include file='@d3googleanalytics4/event/add_to_cart.tpl' htmlIdAmountOfArticles='#amountToBasket'}]
+    [{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]

    [{insert name="oxid_tracker" title=$template_title}]
 [{/capture}]
--- a/Application/views/tpl/page/account/d3gtmwishlist.tpl
+++ b/Application/views/tpl/page/account/d3gtmwishlist.tpl
@ -34,7 +34,7 @@
        </p>
    [{/if}]

-    [{include file='@d3googleanalytics4/event/add_to_cart.tpl' htmlIdAmountOfArticles='#amountToBasket'}]
+    [{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]

    [{insert name="oxid_tracker" title=$template_title}]
 [{/capture}]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,34 +6,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

 ## [unreleased](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.17.2...rel_2.x) - 2024-x

-## [3.0.0.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.22.0...3.0.0.0) - 2024-11-25
-### Added
- installability OXID 7
- don't submit item prices, if user doesn't have "show price" right
-
-## [2.22.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.21.0...2.22.0) - 2024-09-21
-### Fixed
- Consentmanager didn't get delivered
-### Changed
- write "internal_names" of CMP to constants
-
-## [2.21.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.20.1...2.21.0) - 2024-09-19
-### Fixed
- missing parameters for widget.php call
-
-## [2.20.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.20.0...2.20.1) - 2024-09-11
-### Fixed
- missing currency name in begin_checkout template
-## [2.20.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.19.0...2.20.0) - 2024-08-20
-### Added
- new event "begin_checkout"
- new event "add_payment_info"
-
-## [2.19.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.18.2...2.19.0) - 2024-08-10
-### Fixed
- usage of not yet existing function
-
-## [2.18.2](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.18.1...2.18.2) - 2024-06-25
+## [2.18.2](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.18.0...2.18.1) - 2024-06-25
 ### Fixed
 - oe-console apply-configuration triggers on-activate and overwrites existing values

--- a/IntelliSenseHelper.php
+++ b/IntelliSenseHelper.php
@ -14,28 +14,13 @@
 */

 namespace D3\GoogleAnalytics4\Modules\Core{
-    class ViewConfig_parent extends \OxidEsales\Eshop\Core\ViewConfig
-    {
-    }
+    class ViewConfig_parent extends \OxidEsales\Eshop\Core\ViewConfig{}
 }

 namespace D3\GoogleAnalytics4\Modules\Application\Model{
-
-    use OxidEsales\Eshop\Application\Model\Payment;
-
-    class Category_parent extends \OxidEsales\Eshop\Application\Model\Category
-    {
-    }
-    class Basket_parent extends \OxidEsales\Eshop\Application\Model\Basket
-    {
-    }
-    class Manufacturer_parent extends \OxidEsales\Eshop\Application\Model\Manufacturer
-    {
-    }
-
-    class gtmPayment_parent extends Payment
-    {
-    }
+    class Category_parent extends \OxidEsales\Eshop\Application\Model\Category {}
+    class Basket_parent extends \OxidEsales\Eshop\Application\Model\Basket {}
+    class Manufacturer_parent extends \OxidEsales\Eshop\Application\Model\Manufacturer {}
 }

 namespace D3\GoogleAnalytics4\Modules\Application\Controller{
@ -48,60 +33,36 @@ namespace D3\GoogleAnalytics4\Modules\Application\Controller{
    use OxidEsales\Eshop\Application\Controller\SearchController;
    use OxidEsales\Eshop\Application\Controller\StartController;

-    class BasketController_parent extends \OxidEsales\Eshop\Application\Controller\BasketController
-    {
-    }
-    class ThankYouController_parent extends \OxidEsales\Eshop\Application\Controller\ThankYouController
-    {
-    }
+    class BasketController_parent extends \OxidEsales\Eshop\Application\Controller\BasketController {}
+    class ThankYouController_parent extends \OxidEsales\Eshop\Application\Controller\ThankYouController {}

-    class ArticleListController_AddToCartHelpMethods_parent extends ArticleListController
-    {
-    }
+    class ArticleListController_AddToCartHelpMethods_parent extends ArticleListController {}

-    class ArticleDetailsController_parent extends \OxidEsales\Eshop\Application\Controller\ArticleDetailsController
-    {
-    }
+    class ArticleDetailsController_parent extends \OxidEsales\Eshop\Application\Controller\ArticleDetailsController {}

-    class d3GtmAccountNoticeListController_parent extends AccountNoticeListController
-    {
-    }
+    class d3GtmAccountNoticeListController_parent extends AccountNoticeListController {}

-    class d3GtmAccountRecommlistController_parent extends AccountRecommlistController
-    {
-    }
+    class d3GtmAccountRecommlistController_parent extends AccountRecommlistController {}

-    class d3GtmAccountWishlistController_parent extends AccountWishlistController
-    {
-    }
+    class d3GtmAccountWishlistController_parent extends AccountWishlistController {}

-    class d3GtmStartController_parent extends StartController
-    {
-    }
+    class d3GtmStartController_parent extends StartController {}

-    class d3GtmSearchController_parent extends SearchController
-    {
-    }
+    class d3GtmSearchController_parent extends SearchController {}

-    class d3GtmManufacturerListController_parent extends ManufacturerController
-    {
-    }
+    class d3GtmManufacturerListController_parent extends ManufacturerController {}
 }

 namespace D3\GoogleAnalytics4\Modules\Application\Component{

    use OxidEsales\Eshop\Application\Component\BasketComponent;

-    class d3GtmBasketComponentExtension_parent extends BasketComponent
-    {
-    }
+    class d3GtmBasketComponentExtension_parent extends BasketComponent {}
 }

 namespace D3\GoogleAnalytics4\Modules\Application\Component\Widget{

    use OxidEsales\Eshop\Application\Component\Widget\ArticleDetails;

-    class d3GtmWidgetArticleDetails_parent extends ArticleDetails
-    {
-    }
-}
+    class d3GtmWidgetArticleDetails_parent extends ArticleDetails {}
+}
--- a/Modules/Application/Component/Widget/d3GtmWidgetArticleDetails.php
+++ b/Modules/Application/Component/Widget/d3GtmWidgetArticleDetails.php
@ -4,6 +4,7 @@ declare(strict_types=1);

 namespace D3\GoogleAnalytics4\Modules\Application\Component\Widget;

+
 class d3GtmWidgetArticleDetails extends d3GtmWidgetArticleDetails_parent
 {
    public function render()
@ -14,4 +15,4 @@ class d3GtmWidgetArticleDetails extends d3GtmWidgetArticleDetails_parent

        return $return;
    }
-}
+}
--- a/Modules/Application/Component/d3GtmBasketComponentExtension.php
+++ b/Modules/Application/Component/d3GtmBasketComponentExtension.php
@ -24,9 +24,9 @@ class d3GtmBasketComponentExtension extends d3GtmBasketComponentExtension_parent

        $iAmountArticlesAddedToCart = (int) Registry::getRequest()->getRequestEscapedParameter('am');

-        if ($iAmountArticlesAddedToCart) {
+        if ($iAmountArticlesAddedToCart){
            Registry::getSession()->setVariable('d3GtmAddToCartAmountArticles', $iAmountArticlesAddedToCart);
-        } else {
+        }else{
            Registry::getSession()->setVariable('d3GtmAddToCartAmountArticles', 1);
        }

@ -36,7 +36,7 @@ class d3GtmBasketComponentExtension extends d3GtmBasketComponentExtension_parent
    /**
     * @return int
     */
-    public function getD3GtmAddToCartAmountArticles(): int
+    public function getD3GtmAddToCartAmountArticles() :int
    {
        $iAmount = Registry::getSession()->getVariable('d3GtmAddToCartAmountArticles');

@ -48,7 +48,7 @@ class d3GtmBasketComponentExtension extends d3GtmBasketComponentExtension_parent
    /**
     * @return bool
     */
-    public function getAddToBasketDecision(): bool
+    public function getAddToBasketDecision() :bool
    {
        $decision = Registry::getSession()->getVariable('d3GtmAddToBasketTrigger');

@ -57,6 +57,26 @@ class d3GtmBasketComponentExtension extends d3GtmBasketComponentExtension_parent
        return (bool) $decision;
    }

+    public function getRemoveFromBasketDecision() :bool
+    {
+        $decision = Registry::getSession()->getVariable('d3GtmRemoveFromBasketTrigger');
+
+        Registry::getSession()->setVariable('d3GtmRemoveFromBasketTrigger', false);
+
+        return (bool) $decision;
+    }
+
+    protected function _getItems($sProductId = null, $dAmount = null, $aSel = null, $aPersParam = null, $blOverride = false)
+    {
+        $aProducts = parent::_getItems($sProductId, $dAmount, $aSel, $aPersParam, $blOverride);
+
+        if (is_array($aProducts) && count($aProducts)) {
+            Registry::getSession()->setVariable('d3GtmRemoveFromBasketTrigger', true);
+        }
+
+        return $return;
+    }
+
    /**
     * @return Article|null
     */
@ -66,7 +86,7 @@ class d3GtmBasketComponentExtension extends d3GtmBasketComponentExtension_parent

        $oArticle = null;

-        if ($sAnid) {
+        if ($sAnid){
            /** @var Article $oArticle */
            $oArticle = oxNew(Article::class);
            $oArticle->load($sAnid);
@ -74,4 +94,4 @@ class d3GtmBasketComponentExtension extends d3GtmBasketComponentExtension_parent

        return $oArticle;
    }
-}
+}
--- a/Modules/Application/Controller/ArticleDetailsController.php
+++ b/Modules/Application/Controller/ArticleDetailsController.php
@ -12,4 +12,4 @@ class ArticleDetailsController extends ArticleDetailsController_parent

        return $return;
    }
-}
+}
--- a/Modules/Application/Controller/ArticleListController_AddToCartHelpMethods.php
+++ b/Modules/Application/Controller/ArticleListController_AddToCartHelpMethods.php
@ -12,4 +12,4 @@ class ArticleListController_AddToCartHelpMethods extends ArticleListController_A

        return $render;
    }
-}
+}
--- a/Modules/Application/Controller/BasketController.php
+++ b/Modules/Application/Controller/BasketController.php
@ -26,7 +26,7 @@ class BasketController extends BasketController_parent
     * @return void
     * @throws oxSystemComponentException
     */
-    public function d3GA4getRemovedArticlesListObject(): void
+    public function d3GA4getRemovedArticlesListObject() :void
    {
        $this->addTplParam('hasBeenReloaded', false);
        // collecting items to add
@ -52,7 +52,7 @@ class BasketController extends BasketController_parent
                'am'           => $dAmount,
                'sel'          => $aSel,
                'persparam'    => $aPersParam,
-                'basketitemid' => $sBasketItemId,
+                'basketitemid' => $sBasketItemId
            ];
        }

@ -84,9 +84,9 @@ class BasketController extends BasketController_parent
            #dumpVar($this->getBasketArticles());

            /** @var Article $item */
-            foreach ($oArtList->getArray() as $item) {
-                foreach ($artIdOnArtAmountList as $artId => $artAmount) {
-                    if ($item->getId() === $artId) {
+            foreach ($oArtList->getArray() as $item){
+                foreach ($artIdOnArtAmountList as $artId => $artAmount){
+                    if ($item->getId() === $artId){
                        $item->assign(['d3AmountThatGotRemoved' => $artAmount]);
                    }
                }
@ -104,13 +104,13 @@ class BasketController extends BasketController_parent
     * 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
+    protected function isArticleRemovedState(array $productsArray) :bool
    {
        if (Registry::getRequest()->getRequestEscapedParameter('removeBtn')
            or Registry::getRequest()->getRequestEscapedParameter('updateBtn')
-        ) {
+        ){
            return true;
-        } else {
+        }else{
            foreach ($productsArray as $aProduct) {
                if (intval($aProduct['am']) === 0) {
                    return true;
--- a/Modules/Application/Controller/ThankYouController.php
+++ b/Modules/Application/Controller/ThankYouController.php
@ -16,10 +16,10 @@ class ThankYouController extends ThankYouController_parent
        $oOrder = $this->getOrder();
        $sCountryId = $oOrder->getFieldData('oxbillcountryid');

-        /** @var Country::class $oCountry */
+        /** @var Country $oCountry */
        $oCountry = oxNew(Country::class);
        $oCountry->load($sCountryId);

        return $oCountry;
    }
-}
+}
--- a/Modules/Application/Controller/d3GtmAccountNoticeListController.php
+++ b/Modules/Application/Controller/d3GtmAccountNoticeListController.php
@ -2,11 +2,9 @@

 namespace D3\GoogleAnalytics4\Modules\Application\Controller;

-use D3\GoogleAnalytics4\Application\Model\Constants;
-
 class d3GtmAccountNoticeListController extends d3GtmAccountNoticeListController_parent
 {
-    protected $_sThisTemplate = '@' . Constants::OXID_MODULE_ID . '/page/account/d3gtmnoticelist.tpl';
+    protected $_sThisTemplate = 'page/account/d3gtmnoticelist.tpl';

    public function render()
    {
@ -16,4 +14,4 @@ class d3GtmAccountNoticeListController extends d3GtmAccountNoticeListController_

        return $return;
    }
-}
+}
--- a/Modules/Application/Controller/d3GtmAccountRecommlistController.php
+++ b/Modules/Application/Controller/d3GtmAccountRecommlistController.php
@ -2,11 +2,9 @@

 namespace D3\GoogleAnalytics4\Modules\Application\Controller;

-use D3\GoogleAnalytics4\Application\Model\Constants;
-
 class d3GtmAccountRecommlistController extends d3GtmAccountRecommlistController_parent
 {
-    protected $_sThisTemplate = '@' . Constants::OXID_MODULE_ID . '/page/account/d3gtmrecommendationlist.tpl';
+    protected $_sThisTemplate = 'page/account/d3gtmrecommendationlist.tpl';

    public function render()
    {
@ -16,4 +14,4 @@ class d3GtmAccountRecommlistController extends d3GtmAccountRecommlistController_

        return $return;
    }
-}
+}
--- a/Modules/Application/Controller/d3GtmAccountWishlistController.php
+++ b/Modules/Application/Controller/d3GtmAccountWishlistController.php
@ -2,11 +2,9 @@

 namespace D3\GoogleAnalytics4\Modules\Application\Controller;

-use D3\GoogleAnalytics4\Application\Model\Constants;
-
 class d3GtmAccountWishlistController extends d3GtmAccountWishlistController_parent
 {
-    protected $_sThisTemplate = '@' . Constants::OXID_MODULE_ID . '/page/account/d3gtmwishlist.tpl';
+    protected $_sThisTemplate = 'page/account/d3gtmwishlist.tpl';

    public function render()
    {
@ -16,4 +14,4 @@ class d3GtmAccountWishlistController extends d3GtmAccountWishlistController_pare

        return $return;
    }
-}
+}
--- a/Modules/Application/Controller/d3GtmManufacturerListController.php
+++ b/Modules/Application/Controller/d3GtmManufacturerListController.php
@ -4,6 +4,7 @@ declare(strict_types=1);

 namespace D3\GoogleAnalytics4\Modules\Application\Controller;

+
 class d3GtmManufacturerListController extends d3GtmManufacturerListController_parent
 {
    public function render()
@ -14,4 +15,4 @@ class d3GtmManufacturerListController extends d3GtmManufacturerListController_pa

        return $return;
    }
-}
+}
--- a/Modules/Application/Controller/d3GtmSearchController.php
+++ b/Modules/Application/Controller/d3GtmSearchController.php
@ -4,6 +4,7 @@ declare(strict_types=1);

 namespace D3\GoogleAnalytics4\Modules\Application\Controller;

+
 class d3GtmSearchController extends d3GtmSearchController_parent
 {
    /**
@ -13,10 +14,10 @@ class d3GtmSearchController extends d3GtmSearchController_parent
    {
        $return = parent::render();

-        if (false === in_array('oxcmp_basket', $this->getComponents())) {
+        if (false === in_array('oxcmp_basket', $this->getComponents())){
            $this->addTplParam('d3CmpBasket', $this->getComponent('oxcmp_basket'));
        }

        return $return;
    }
-}
+}
--- a/Modules/Application/Controller/d3GtmStartController.php
+++ b/Modules/Application/Controller/d3GtmStartController.php
@ -10,10 +10,10 @@ class d3GtmStartController extends d3GtmStartController_parent
    {
        $return = parent::render();

-        if (false === in_array('oxcmp_basket', $this->getComponents())) {
+        if (false === in_array('oxcmp_basket', $this->getComponents())){
            $this->addTplParam('d3CmpBasket', $this->getComponent('oxcmp_basket'));
        }

        return $return;
    }
-}
+}
--- a/Modules/Application/Model/Basket.php
+++ b/Modules/Application/Model/Basket.php
@ -9,15 +9,15 @@ class Basket extends Basket_parent
    /**
     * @return string
     */
-    public function getPaymentOnPaymentId(): string
+    public function getPaymentOnPaymentId() :string
    {
-        if ($this->getPaymentId()) {
+        if ($this->getPaymentId()){
            $oPayment = oxNew(Payment::class);
-            if ($oPayment->load($this->getPaymentId())) {
+            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
@ -5,4 +5,4 @@ namespace D3\GoogleAnalytics4\Modules\Application\Model;
 class Category extends Category_parent
 {
    use articleTreeStructure;
-}
+}
--- a/Modules/Application/Model/Manufacturer.php
+++ b/Modules/Application/Model/Manufacturer.php
@ -5,4 +5,4 @@ namespace D3\GoogleAnalytics4\Modules\Application\Model;
 class Manufacturer extends Manufacturer_parent
 {
    use articleTreeStructure;
-}
+}
--- a/Modules/Application/Model/Vendor.php
+++ b/Modules/Application/Model/Vendor.php
@ -4,7 +4,8 @@ declare(strict_types=1);

 namespace D3\GoogleAnalytics4\Modules\Application\Model;

+
 class Vendor extends \OxidEsales\Eshop\Application\Model\Vendor
 {
    use articleTreeStructure;
-}
+}
--- a/Modules/Application/Model/articleTreeStructure.php
+++ b/Modules/Application/Model/articleTreeStructure.php
@ -8,9 +8,9 @@ trait articleTreeStructure
     * @param int $indexOfArray
     * @return string
     */
-    public function getSplitCategoryArray(int $indexOfArray = -1, bool $bShallTakeStd = false): string
+    public function getSplitCategoryArray(int $indexOfArray = -1, bool $bShallTakeStd = false) :string
    {
-        if ($bShallTakeStd) {
+        if ($bShallTakeStd){
            $splitCatArray =
                array_values(
                    array_filter(
@ -26,9 +26,9 @@ trait articleTreeStructure
                    )
                );

-            if (($indexOfArray >= 0) and (false === empty($splitCatArray[$indexOfArray]))) {
+            if (($indexOfArray >= 0) and (false === empty($splitCatArray[$indexOfArray]))){
                return $splitCatArray[$indexOfArray];
-            } else {
+            }else{
                return "";
            }
        }
@ -41,4 +41,4 @@ trait articleTreeStructure
                )
            );
    }
-}
+}
--- a/Modules/Application/Model/gtmPayment.php
+++ b/Modules/Application/Model/gtmPayment.php
@ -1,19 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace D3\GoogleAnalytics4\Modules\Application\Model;
-
-use OxidEsales\Eshop\Application\Model\Payment;
-use OxidEsales\Eshop\Core\Registry;
-
-class gtmPayment extends gtmPayment_parent
-{
-    /**
-     * @return string
-     */
-    public function gtmGetSelectedPaymentName(): string
-    {
-        return $this->getFieldData('oxpayments__oxdesc') ?: 'No payment name available';
-    }
-}
--- a/Modules/Core/ViewConfig.php
+++ b/Modules/Core/ViewConfig.php
@ -1,5 +1,4 @@
 <?php
-
 /**
 * For the full copyright and license information, please view the LICENSE
 * file that was distributed with this source code.
@ -19,16 +18,15 @@ 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\Application\Model\User;
-use OxidEsales\Eshop\Core\Registry;
+use OxidEsales\Eshop\Application\Model\User;use OxidEsales\Eshop\Core\Registry;
 use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Exception\ModuleConfigurationNotFoundException;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\Setup\Bridge\ModuleActivationBridgeInterface;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ModuleSettingBridgeInterface;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;

 class ViewConfig extends ViewConfig_parent
 {
+
    // Google Tag Manager Container ID
    private $sContainerId = null;

@ -40,7 +38,8 @@ class ViewConfig extends ViewConfig_parent

    public function getGtmContainerId()
    {
-        if ($this->sContainerId === null) {
+        if ($this->sContainerId === null)
+        {
            $this->sContainerId = $this->d3GetModuleConfigParam("_sContainerID");
        }
        return $this->sContainerId;
@ -49,9 +48,10 @@ class ViewConfig extends ViewConfig_parent
    /**
     * @return void
     */
-    public function defineCookieManagerType(): void
+    public function defineCookieManagerType() :void
    {
-        if ($this->sCookieManagerType === null) {
+        if ($this->sCookieManagerType === null)
+        {
            /** @var ManagerHandler $oManagerHandler */
            $oManagerHandler = oxNew(ManagerHandler::class);
            $this->sCookieManagerType = $oManagerHandler->getCurrManager();
@ -61,7 +61,7 @@ class ViewConfig extends ViewConfig_parent
    /**
     * @return bool
     */
-    public function shallUseOwnCookieManager(): bool
+    public function shallUseOwnCookieManager() :bool
    {
        return (bool) $this->d3GetModuleConfigParam('_blEnableOwnCookieManager');
    }
@ -74,7 +74,7 @@ class ViewConfig extends ViewConfig_parent
        /** @var Config $oConfig */
        $oConfig = Registry::getConfig();

-        if (false === $this->isGA4enabled()) {
+        if (false === $this->isGA4enabled()){
            return false;
        }

@ -88,7 +88,7 @@ class ViewConfig extends ViewConfig_parent
        $sCookieID = trim($this->d3GetModuleConfigParam('_sControlParameter'));

        // Netensio Cookie Manager
-        if ($this->sCookieManagerType === ManagerTypes::INTERNAL_NET_COOKIE_MANAGER) {
+        if ($this->sCookieManagerType === ManagerTypes::NET_COOKIE_MANAGER) {
            $oSession = Registry::getSession();
            $aCookies = $oSession->getVariable("aCookieSel");

@ -96,18 +96,22 @@ class ViewConfig extends ViewConfig_parent
        }

        // Aggrosoft Cookie Consent
-        if ($this->sCookieManagerType === ManagerTypes::INTERNAL_AGCOOKIECOMPLIANCE) {
+        if ($this->sCookieManagerType === ManagerTypes::AGCOOKIECOMPLIANCE) {
            if (method_exists($this, "isCookieCategoryEnabled")) {
                return $this->isCookieCategoryEnabled($sCookieID);
            }
        }

+        // UserCentrics or consentmanager
        if (
-            in_array(
-                $this->sCookieManagerType,
-                (oxNew(ManagerTypes::class)->scriptTagDeliveredByDefaultArray())
-            )
-        ) {
+            $this->sCookieManagerType       === Usercentrics::sModuleIncludationInternalName
+            or $this->sCookieManagerType    === Usercentrics::sExternalIncludationInternalName
+            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;
        }
@ -121,30 +125,32 @@ class ViewConfig extends ViewConfig_parent
     * This is especially important for UserCentrics.
     * @return string
     */
-    public function getGtmScriptAttributes(): string
+    public function getGtmScriptAttributes() :string
    {
        $sControlParameter = trim($this->d3GetModuleConfigParam('_sControlParameter'));

-        if (false === $this->shallUseOwnCookieManager() or ($sControlParameter === '')) {
+        if (false === $this->shallUseOwnCookieManager() or ($sControlParameter === '')){
            return "";
        }

        if (
            $this->sCookieManagerType === Usercentrics::sModuleIncludationInternalName
            or $this->sCookieManagerType === Usercentrics::sExternalIncludationInternalName
-        ) {
+        )
+        {
            return 'data-usercentrics="' . $sControlParameter . '" type="text/plain" async=""';
        }

-        if ($this->sCookieManagerType === ManagerTypes::INTERNAL_CONSENTMANAGER) {
+        if ($this->sCookieManagerType === ManagerTypes::CONSENTMANAGER)
+        {
            return 'type="text/plain" class="cmplazyload" data-cmp-vendor="'.$sControlParameter.'"';
        }

-        if ($this->sCookieManagerType === ManagerTypes::INTERNAL_COOKIEFIRST) {
+        if ($this->sCookieManagerType === ManagerTypes::COOKIEFIRST){
            return 'type="text/plain" data-cookiefirst-category="' . $sControlParameter .'"';
        }

-        if ($this->sCookieManagerType === ManagerTypes::INTERNAL_COOKIEBOT) {
+        if ($this->sCookieManagerType === ManagerTypes::COOKIEBOT){
            return 'type="text/plain" data-cookieconsent="' . $sControlParameter .'"';
        }

@ -157,23 +163,22 @@ class ViewConfig extends ViewConfig_parent
     */
    public function isGA4enabled()
    {
-        if ($this->blGA4enabled === null) {
+        if ($this->blGA4enabled === null)
+        {
            $this->blGA4enabled = $this->d3GetModuleConfigParam("_blEnableGA4");
        }

        return $this->blGA4enabled;
    }

-    public function isGtmConsentModeSetActivated(): bool
+    public function isGtmConsentModeSetActivated() :bool
    {
-        return $this->d3GetModuleConfigParam("_blEnableConsentMode") ?: false;
+        return $this->d3GetModuleConfigParam("_blEnableConsentMode")?: false;
    }

    public function getGtmDataLayer()
    {
-        if (!$this->getGtmContainerId()) {
-            return "[]";
-        }
+        if (!$this->getGtmContainerId()) return "[]";

        $oConfig = Registry::getConfig();
        $oView   = $oConfig->getTopActiveView();
@ -208,9 +213,9 @@ class ViewConfig extends ViewConfig_parent
        return json_encode([$dataLayer], JSON_PRETTY_PRINT);
    }

-    public function isDebugModeOn(): bool
+    public function isDebugModeOn() :bool
    {
-        return $this->d3GetModuleConfigParam("_blEnableDebug") ?: false;
+        return $this->d3GetModuleConfigParam("_blEnableDebug")?: false;
    }

    /**
@ -218,9 +223,9 @@ class ViewConfig extends ViewConfig_parent
     * @throws ContainerExceptionInterface
     * @throws NotFoundExceptionInterface
     */
-    public function getServerSidetaggingJsDomain(): string
+    public function getServerSidetaggingJsDomain() :string
    {
-        return $this->d3GetModuleConfigParam("_sServersidetagging_js") ?: "";
+        return $this->d3GetModuleConfigParam("_sServersidetagging_js")?: "";
    }

    /**
@ -228,9 +233,9 @@ class ViewConfig extends ViewConfig_parent
     * @throws ContainerExceptionInterface
     * @throws NotFoundExceptionInterface
     */
-    public function getServerSidetaggingNoJsDomain(): string
+    public function getServerSidetaggingNoJsDomain() :string
    {
-        return $this->d3GetModuleConfigParam('_sServersidetagging_nojs') ?: "";
+        return $this->d3GetModuleConfigParam('_sServersidetagging_nojs')?: "";
    }

    /**
@ -245,7 +250,7 @@ class ViewConfig extends ViewConfig_parent
    /**
     * @return bool
     */
-    public function d3IsUsercentricsCMPChosen(): bool
+    public function d3IsUsercentricsCMPChosen() :bool
    {
        $sCMPPubName    = $this->d3GetModuleConfigParam('_HAS_STD_MANAGER');
        $aPossibleCMP   = (oxNew(ManagerTypes::class))->getManagerList();
@ -253,26 +258,4 @@ class ViewConfig extends ViewConfig_parent
        return (bool) ($sCMPPubName === Usercentrics::sExternalIncludationInternalName
            or $sCMPPubName === Usercentrics::sModuleIncludationInternalName);
    }
-
-    /**
-     * @return bool
-     */
-    public function d3IsModuleActive(string $sModuleId): bool
-    {
-        /** @var ModuleActivationBridgeInterface $moduleActivationBridge */
-        $moduleActivationBridge = $this
-            ->getContainer()
-            ->get(ModuleActivationBridgeInterface::class);
-
-        try {
-            $isActiveBool = $moduleActivationBridge->isActive(
-                $sModuleId,
-                Registry::getConfig()->getShopId()
-            );
-        } catch (\Exception|ModuleConfigurationNotFoundException $e) {
-            return false;
-        }
-
-        return (bool) $isActiveBool;
-    }
-}
+}
--- a/Modules/Core/WidgetControl.php
+++ b/Modules/Core/WidgetControl.php
@ -1,42 +0,0 @@
-<?php
-
-namespace D3\GoogleAnalytics4\Modules\Core;
-
-use OxidEsales\EshopCommunity\Core\Registry;
-
-class WidgetControl extends WidgetControl_parent
-{
-    protected function getFrontendStartControllerKey() // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
-    {
-        /*
-         * array (
-          'force_sid' => '2pistlaubiq58qtg3moudei0la',
-          'lang' => '0',
-          'actcontrol' => 'details',
-          'anid' => '064471',
-          'cl' => 'oxwarticledetails',
-          'cnid' => '159dd0f2fb2bd6e24ace53a0f1913797',
-          'listtype' => 'list',
-          'nocookie' => '1',
-          'oxwparent' => 'details',
-          'sid' => '2pistlaubiq58qtg3moudei0la',
-          'stoken' => 'A22D0F9E',
-          'varselid' =>
-          array (
-            0 => 'b842982bf522aa839bd88221f562fce8',
-          ),
-        )
-         */
-        $sScriptName = $_SERVER['SCRIPT_NAME'];
-        if ($sScriptName !== '/widget.php') {
-            return parent::getFrontendStartControllerKey();
-        }
-
-        $aParameter = $_GET;
-        if (is_null($aParameter['actcontrol']) and is_null($aParameter['oxwparent'])) {
-            return 'D3\GoogleAnalytics4\Application\Component\Widget\d3GtmStartWidget';
-        }
-
-        return parent::getFrontendStartControllerKey();
-    }
-}
--- a/README.md
+++ b/README.md
@ -23,21 +23,11 @@ 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:^3
+php composer require d3/google-analytics4:^2
 ```

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

-```bash
-./vendor/bin/oe-console oe:module:deactivate d3googleanalytics4
-./vendor/bin/oe-console oe:module:install ./vendor/d3/google-analytics4/
-./vendor/bin/oe-console oe:module:activate d3googleanalytics4
-
-./vendor/bin/oe-eshop-db_views_generate
-```
-
-Leeren Sie anschließend den Temp Ordner des Shops.
-
 Aktivieren Sie das Modul im Shopadmin unter "Erweiterungen -> Module".

 ### Wichtig!
--- a/Setup/Actions.php
+++ b/Setup/Actions.php
@ -4,6 +4,7 @@ declare(strict_types=1);

 namespace D3\GoogleAnalytics4\Setup;

+
 use D3\GoogleAnalytics4\Application\Model\Constants;
 use OxidEsales\Eshop\Core\Registry;
 use OxidEsales\Eshop\Core\ViewConfig;
@ -16,11 +17,10 @@ class Actions
     * @param string $sSettingValue
     * @return void
     */
-    public function d3SaveDefaultSettings(string $sVarType, string $sSettingName, string $sSettingValue)
-    {
+    public function d3SaveDefaultSettings(string $sVarType, string $sSettingName, string $sSettingValue){
        $oConfig = Registry::getConfig();

-        if ($this->d3GetModuleConfigParam($sSettingName) and (trim($this->d3GetModuleConfigParam($sSettingName)) !== trim($sSettingValue))) {
+        if (trim($this->d3GetModuleConfigParam($sSettingName)) !== trim($sSettingValue)){
            $sSettingValue = trim($this->d3GetModuleConfigParam($sSettingName));
        }

@ -39,6 +39,6 @@ class Actions
     */
    public function d3GetModuleConfigParam(string $configParamName)
    {
-        return Registry::getConfig()->getShopConfVar(Constants::OXID_MODULE_ID.$configParamName, null, Constants::OXID_MODULE_ID);
+        return Registry::get(ViewConfig::class)->d3GetModuleConfigParam($configParamName);
    }
-}
+}
--- a/Setup/Events.php
+++ b/Setup/Events.php
@ -4,6 +4,7 @@ declare(strict_types=1);

 namespace D3\GoogleAnalytics4\Setup;

+
 class Events
 {
    /**
@ -32,7 +33,5 @@ class Events
    /**
     * @return void
     */
-    public static function onDeactivate()
-    {
-    }
-}
+    public static function onDeactivate(){}
+}
--- a/composer.json
+++ b/composer.json
@ -28,25 +28,28 @@
      "homepage": "https://www.d3data.de"
    }
  ],
-  "supports": {
+  "support": {
    "email": "support@shopmodule.com"
  },
-  "require": {
-    "php": "^8.0",
-    "oxid-esales/oxideshop-ce": "7.0 - 7.1",
-    "google/apiclient":" ^2.0",
-    "phpstan/phpstan": "^1.10"
-  },
-  "require-dev": {
-    "friendsofphp/php-cs-fixer": "^3.9"
-  },
-  "autoload": {
-    "psr-4": {
-      "D3\\GoogleAnalytics4\\": ""
+  "extra": {
+    "oxideshop": {
+      "blacklist-filter": [
+        "*.md",
+        "composer.json",
+        ".php-cs-fixer.php",
+        "*.neon"
+      ],
+      "target-directory": "d3/googleanalytics4"
    }
  },
-  "scripts": {
-    "php-cs-fixer_audit": "./vendor/bin/php-cs-fixer list-files --config=./vendor/d3/google-analytics4/.php-cs-fixer.php",
-    "php-cs-fixer_fix": "./vendor/bin/php-cs-fixer fix --config=./vendor/d3/google-analytics4/.php-cs-fixer.php"
+  "require": {
+    "php": ">=7.1",
+    "oxid-esales/oxideshop-ce": "^6.5",
+    "google/apiclient":" ^2.0",
+    "phpstan/phpstan": "^1.10"  },
+  "autoload": {
+    "psr-4": {
+      "D3\\GoogleAnalytics4\\": "../../../source/modules/d3/googleanalytics4"
+    }
  }
 }
--- a/metadata.php
+++ b/metadata.php
@ -16,7 +16,6 @@ use D3\GoogleAnalytics4\Modules\Application\Controller\d3GtmStartController;
 use D3\GoogleAnalytics4\Modules\Application\Controller\ThankYouController;
 use D3\GoogleAnalytics4\Modules\Application\Model\Basket as Basket;
 use D3\GoogleAnalytics4\Modules\Application\Model\Category as Category;
-use D3\GoogleAnalytics4\Modules\Application\Model\gtmPayment as gtmPayment;
 use D3\GoogleAnalytics4\Modules\Application\Model\Manufacturer as Manufacturer;
 use D3\GoogleAnalytics4\Modules\Core\ViewConfig;
 use OxidEsales\Eshop\Application\Component\BasketComponent as OEBasketComponent;
@ -34,13 +33,12 @@ use OxidEsales\Eshop\Application\Controller\ThankYouController as OEThankYouCont
 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\Application\Model\Payment as OEPayment;
 use OxidEsales\Eshop\Core\ViewConfig as OEViewConfig;

 $sMetadataVersion = '2.1';
-$aModule = [
-    'id' => Constants::OXID_MODULE_ID,
-    'title' => 'Google Analytics 4',
+$aModule          = [
+    'id'          => Constants::OXID_MODULE_ID,
+    'title'       => 'Google Analytics 4',
    'description' => "Dieses Modul bietet die Möglichkeit in Ihrem OXID eShop (6.x) die neue 'Property' 
                      Google Analytics 4 (GA4) von Google zu integrieren.<br>
                      Hierfür stehen Ihnen verschiedene 'templates' zur verfügung, 
@ -51,159 +49,135 @@ $aModule = [
                      <hr>
                      Die Entwicklung basiert auf einem Fork von Marat Bedoev - <a href='https://github.com/vanilla-thunder/oxid-module-gtm'>Github-Link</a>
                      ",
-    'thumbnail' => 'thumbnail.png',
-    'version' => '3.0.0.0',
-    'author' => 'Data Development (Inh.: Thomas Dartsch)',
-    'email' => 'support@shopmodule.com',
-    'url' => 'https://www.oxidmodule.com/',
+    'thumbnail'   => 'thumbnail.png',
+    'version'     => '2.18.2',
+    'author'      => 'Data Development (Inh.: Thomas Dartsch)',
+    'email'       => 'support@shopmodule.com',
+    'url'         => 'https://www.oxidmodule.com/',
    'controllers' => [
-        'd3googleanalytics4_main' => GA4AdminUserInterfaceMainController::class,
+        'd3googleanalytics4_main' => GA4AdminUserInterfaceMainController::class
    ],
-    'extend' => [
+    'extend'      => [
        // Core
        OEViewConfig::class                     => ViewConfig::class,
-        \OxidEsales\Eshop\Core\WidgetControl::class                     => \D3\GoogleAnalytics4\Modules\Core\WidgetControl::class,

        // Model
-        OECategory::class => Category::class,
-        OEBasket::class => Basket::class,
-        OEManufacturer::class => Manufacturer::class,
-        OEPayment::class => gtmPayment::class,
+        OECategory::class                       => Category::class,
+        OEBasket::class                         => Basket::class,
+        OEManufacturer::class                   => Manufacturer::class,

        // Controller
-        OEBasketController::class => BasketController::class,
-        OEThankYouController::class => ThankYouController::class,
-        OEArticleListController::class => ArticleListController_AddToCartHelpMethods::class,
-        OEArticleDetailsController::class => ArticleDetailsController::class,
-        OEAccountNoticeListController::class => d3GtmAccountNoticeListController::class,
-        OEAccountRecommlistController::class => d3GtmAccountRecommlistController::class,
-        OEAccountWishlistController::class => d3GtmAccountWishlistController::class,
-        OEStartController::class => d3GtmStartController::class,
-        OESearchController::class => d3GtmSearchController::class,
-        OEManufacturerListController::class => d3GtmManufacturerListController::class,
+        OEBasketController::class               => BasketController::class,
+        OEThankYouController::class             => ThankYouController::class,
+        OEArticleListController::class          => ArticleListController_AddToCartHelpMethods::class,
+        OEArticleDetailsController::class       => ArticleDetailsController::class,
+        OEAccountNoticeListController::class    => d3GtmAccountNoticeListController::class,
+        OEAccountRecommlistController::class    => d3GtmAccountRecommlistController::class,
+        OEAccountWishlistController::class      => d3GtmAccountWishlistController::class,
+        OEStartController::class                => d3GtmStartController::class,
+        OESearchController::class               => d3GtmSearchController::class,
+        OEManufacturerListController::class     => d3GtmManufacturerListController::class,

        // Component
-        OEArticleDetails::class => d3GtmWidgetArticleDetails::class,
-        OEBasketComponent::class => d3GtmBasketComponentExtension::class,
+        OEArticleDetails::class                 => d3GtmWidgetArticleDetails::class,
+        OEBasketComponent::class                => d3GtmBasketComponentExtension::class,
    ],
-    'templates' => [
+    'templates'   => [
        // Event files that store the GA4 Event-Information
-        '@' . Constants::OXID_MODULE_ID . '/event/add_to_cart.tpl' => 'views/smarty/event/add_to_cart.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/event/view_item.tpl' => 'views/smarty/event/view_item.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/event/view_cart.tpl' => 'views/smarty/event/view_cart.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/event/begin_checkout.tpl' => 'views/smarty/event/begin_checkout.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/event/add_payment_info.tpl' => 'views/smarty/event/add_payment_info.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/event/purchase.tpl' => 'views/smarty/event/purchase.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/event/view_item_list.tpl' => 'views/smarty/event/view_item_list.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/event/view_search_result.tpl' => 'views/smarty/event/view_search_result.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/event/remove_from_cart.tpl' => 'views/smarty/event/remove_from_cart.tpl',
+        'event/add_to_cart.tpl'                     => 'd3/googleanalytics4/Application/views/event/add_to_cart.tpl',
+        'event/view_item.tpl'                       => 'd3/googleanalytics4/Application/views/event/view_item.tpl',
+        'event/view_cart.tpl'                       => 'd3/googleanalytics4/Application/views/event/view_cart.tpl',
+        'event/purchase.tpl'                        => 'd3/googleanalytics4/Application/views/event/purchase.tpl',
+        'event/view_item_list.tpl'                  => 'd3/googleanalytics4/Application/views/event/view_item_list.tpl',
+        'event/view_search_result.tpl'              => 'd3/googleanalytics4/Application/views/event/view_search_result.tpl',
+        'event/remove_from_cart.tpl'                => 'd3/googleanalytics4/Application/views/event/remove_from_cart.tpl',

        // complete overwritten file of OXID-Originals
        // the path of the template-name is the original path to the file in OXID-context from tpl/->
-        '@' . Constants::OXID_MODULE_ID . '/page/account/d3gtmnoticelist.tpl' => 'views/smarty/page/account/d3gtmnoticelist.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/page/account/d3gtmrecommendationlist.tpl' => 'views/smarty/page/account/d3gtmrecommendationlist.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/page/account/d3gtmwishlist.tpl' => 'views/smarty/page/account/d3gtmwishlist.tpl',
+        'page/account/d3gtmnoticelist.tpl'          => 'd3/googleanalytics4/Application/views/tpl/page/account/d3gtmnoticelist.tpl',
+        'page/account/d3gtmrecommendationlist.tpl'  => 'd3/googleanalytics4/Application/views/tpl/page/account/d3gtmrecommendationlist.tpl',
+        'page/account/d3gtmwishlist.tpl'            => 'd3/googleanalytics4/Application/views/tpl/page/account/d3gtmwishlist.tpl',

        // Admin Templates
-        '@' . Constants::OXID_MODULE_ID . '/admin/d3ga4uimain.tpl' => 'views/smarty/admin/d3googleanalytics4_main.tpl',
-        '@' . Constants::OXID_MODULE_ID . '/admin/d3ga4uiheaditem.tpl' => 'views/smarty/admin/d3googleanalytics4_headitem.tpl',
+        'ga4/admin/d3ga4uimain.tpl'                 => 'd3/googleanalytics4/Application/views/admin/tpl/d3googleanalytics4_main.tpl',
+        'ga4/admin/d3ga4uiheaditem.tpl'             => 'd3/googleanalytics4/Application/views/admin/tpl/d3googleanalytics4_headitem.tpl',
    ],
-    'blocks' => [
+    'blocks'      => [
        // tag manager js
        [
            'template' => 'layout/base.tpl',
-            'block' => 'head_meta_robots',
-            'file' => 'views/smarty/blocks/_gtm_js.tpl',
-            'position' => 150,
+            'block'    => 'head_meta_robots',
+            'file'     => '/Application/views/blocks/_gtm_js.tpl',
+            'position' => 150
        ],
        // tag manager nojs
        [
            'template' => 'layout/base.tpl',
-            'block' => 'theme_svg_icons',
-            'file' => 'views/smarty/blocks/_gtm_nojs.tpl',
-			'position' => 150,
+            'block'    => 'theme_svg_icons',
+            'file'     => '/Application/views/blocks/_gtm_nojs.tpl'
        ],
        // details
        [
            'template' => 'page/details/inc/productmain.tpl',
-            'block' => 'details_productmain_title',
-            'file' => 'views/smarty/blocks/view_item.tpl',
-            'position' => 150,
+            'block'    => 'details_productmain_title',
+            'file'     => '/Application/views/blocks/view_item.tpl',
+            'position' => 150
        ],
-        // View Cart
+        // checkout
        [
            'template' => 'page/checkout/basket.tpl',
-            'block' => 'checkout_basket_main',
-            'file' => 'views/smarty/blocks/view_cart.tpl',
-            'position' => 150,
-        ],
-        // add_to_cart
-        [
-            'template' => 'page/details/inc/productmain.tpl',
-            'block' => 'details_productmain_tobasket',
-            'file' => 'views/smarty/blocks/details_productmain_tobasket.tpl',
-            'position' => 150,
-        ],
-        // remove_from_cart
-        [
-            'template' => 'page/checkout/basket.tpl',
-            'block' => 'checkout_basket_main',
-            'file' => 'views/smarty/blocks/remove_from_cart.tpl',
-            'position' => 150,
+            'block'    => 'checkout_basket_main',
+            'file'     => '/Application/views/blocks/view_cart.tpl'
        ],
        [
            'template' => 'page/checkout/thankyou.tpl',
-            'block' => 'checkout_thankyou_main',
-            'file' => 'views/smarty/blocks/purchase.tpl',
-			'position' => 150,
+            'block'    => 'checkout_thankyou_main',
+            'file'     => '/Application/views/blocks/purchase.tpl'
        ],
        // Lists
        // view_item_list
        [
            'template' => 'page/list/list.tpl',
-            'block' => 'page_list_productlist',
-            'file' => 'views/smarty/blocks/view_item_list.tpl',
-            'position' => 150,
+            'block'    => 'page_list_productlist',
+            'file'     => '/Application/views/blocks/view_item_list.tpl',
+            'position' => 150
        ],
        // view_search_result
        [
            'template' => 'page/search/search.tpl',
-            'block' => 'search_results',
-            'file' => 'views/smarty/blocks/view_search_result.tpl',
-            'position' => 150,
+            'block'    => 'search_results',
+            'file'     => '/Application/views/blocks/view_search_result.tpl',
+            'position' => 150
+        ],
+        // add_to_cart
+        [
+            'template' => 'page/details/inc/productmain.tpl',
+            'block'    => 'details_productmain_tobasket',
+            'file'     => '/Application/views/blocks/details_productmain_tobasket.tpl',
+            'position' => 150
        ],
        [
            'template' => 'page/list/list.tpl',
-            'block' => 'page_list_listbody',
-            'file' => 'views/smarty/blocks/page_list_listbody.tpl',
-            'position' => 150,
+            'block'    => 'page_list_listbody',
+            'file'     => '/Application/views/blocks/page_list_listbody.tpl',
+            'position' => 150
        ],
        [
            'template' => 'page/shop/start.tpl',
-            'block' => 'start_welcome_text',
-            'file' => 'views/smarty/blocks/start_welcome_text.tpl',
-            'position' => 150,
+            'block'    => 'start_welcome_text',
+            'file'     => '/Application/views/blocks/start_welcome_text.tpl',
+            'position' => 150
        ],
-        // Checkout process
-        // Begin CHeckout
+        // remove_from_cart
        [
-            'template' => 'page/checkout/user.tpl',
-            'block' => 'checkout_user_main',
-            'file' => 'views/smarty/blocks/begin_checkout.tpl',
-            'position' => 150,
-        ],
-        // Add payment info
-        // We add it into checkout_order_main ( checkout/order.tpl ) to make sure a payment is actually added;
-        // we'll also do it like that in the future for add_shipping_info ( not planed yet )
-        [
-            'template' => 'page/checkout/order.tpl',
-            'block' => 'checkout_order_main',
-            'file' => 'views/smarty/blocks/add_payment_info.tpl',
-            'position' => 150,
-        ],
+            'template' => 'page/checkout/basket.tpl',
+            'block'    => 'checkout_basket_main',
+            'file'     => '/Application/views/blocks/remove_from_cart.tpl',
+            'position' => 150
+        ]
    ],
-    'events' => [
-        'onActivate' => '\D3\GoogleAnalytics4\Setup\Events::onActivate',
-        'onDeactivate' => '\D3\GoogleAnalytics4\Setup\Events::onDeactivate',
+    'events'      => [
+        'onActivate'    => '\D3\GoogleAnalytics4\Setup\Events::onActivate',
+        'onDeactivate'  => '\D3\GoogleAnalytics4\Setup\Events::onDeactivate',
    ],
-];
+];
--- a/assets/thumbnail.png
+++ b/assets/thumbnail.png
--- a/views/smarty/blocks/add_payment_info.tpl
+++ b/views/smarty/blocks/add_payment_info.tpl
@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="@d3googleanalytics4/event/add_payment_info.tpl"}]
--- a/views/smarty/blocks/begin_checkout.tpl
+++ b/views/smarty/blocks/begin_checkout.tpl
@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="@d3googleanalytics4/event/begin_checkout.tpl"}]
--- a/views/smarty/blocks/details_productmain_tobasket.tpl
+++ b/views/smarty/blocks/details_productmain_tobasket.tpl
@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file='@d3googleanalytics4/event/add_to_cart.tpl' htmlIdAmountOfArticles='#amountToBasket'}]
--- a/views/smarty/blocks/page_list_listbody.tpl
+++ b/views/smarty/blocks/page_list_listbody.tpl
@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file='@d3googleanalytics4/event/add_to_cart.tpl' htmlIdAmountOfArticles='#amountToBasket'}]
--- a/views/smarty/blocks/purchase.tpl
+++ b/views/smarty/blocks/purchase.tpl
@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="@d3googleanalytics4/event/purchase.tpl"}]
--- a/views/smarty/blocks/remove_from_cart.tpl
+++ b/views/smarty/blocks/remove_from_cart.tpl
@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="@d3googleanalytics4/event/remove_from_cart.tpl"}]
--- a/views/smarty/blocks/start_welcome_text.tpl
+++ b/views/smarty/blocks/start_welcome_text.tpl
@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file='@d3googleanalytics4/event/add_to_cart.tpl' htmlIdAmountOfArticles='#amountToBasket'}]
--- a/views/smarty/blocks/view_cart.tpl
+++ b/views/smarty/blocks/view_cart.tpl
@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="@d3googleanalytics4/event/view_cart.tpl"}]
--- a/views/smarty/blocks/view_item.tpl
+++ b/views/smarty/blocks/view_item.tpl
@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="@d3googleanalytics4/event/view_item.tpl"}]
--- a/views/smarty/blocks/view_item_list.tpl
+++ b/views/smarty/blocks/view_item_list.tpl
@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="@d3googleanalytics4/event/view_item_list.tpl"}]
--- a/views/smarty/blocks/view_search_result.tpl
+++ b/views/smarty/blocks/view_search_result.tpl
@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="@d3googleanalytics4/event/view_search_result.tpl"}]
--- a/views/smarty/event/add_payment_info.tpl
+++ b/views/smarty/event/add_payment_info.tpl
@ -1,53 +0,0 @@
-[{*$oxcmp_basket|get_class_methods|dumpvar*}]
-
-[{assign var="gtmBasketPrice" value=$oxcmp_basket->getPrice()}]
-[{assign var="gtmBasketObject" value=$oxcmp_basket}]
-[{assign var='gtmCartArticles' value=$gtmBasketObject->getBasketArticles()}]
-[{assign var="gtmPaymentObject" value=$oView->getPayment()}]
-
-[{block name="gtm_ga4_add_payment_info_block"}]
-    [{capture name="gtm_ga4_add_payment_info"}]
-        [{strip}]
-            dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-            dataLayer.push({
-            'event': 'add_payment_info',
-            'eventLabel':'Checkout - Payment info',
-            'payment_type':'[{$gtmPaymentObject->gtmGetSelectedPaymentName()}]',
-            'ecommerce':
-            {
-                'actionField': "Payment-Info",
-                'currency': "[{$currency->name}]",
-                'value': [{$gtmBasketPrice->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="gtmItemPriceObject" value=$basketitem->getPrice()}]
-                    [{assign var="gtmBasketItem" value=$basketitem->getArticle()}]
-                    [{assign var="gtmBasketItemCategory" value=$gtmBasketItem->getCategory()}]
-                    {
-                    'item_id':          '[{$gtmCartArticles[$basketindex]->getFieldData('oxartnum')}]',
-                    'item_name':        '[{$gtmCartArticles[$basketindex]->getFieldData('oxtitle')}]',
-                    'item_variant':     '[{$gtmCartArticles[$basketindex]->getFieldData('oxvarselect')}]',
-                    [{if $gtmBasketItemCategory}]
-                    'item_category':    '[{$gtmBasketItemCategory->getSplitCategoryArray(0, true)}]',
-                    'item_category_2':  '[{$gtmBasketItemCategory->getSplitCategoryArray(1, true)}]',
-                    'item_category_3':  '[{$gtmBasketItemCategory->getSplitCategoryArray(2, true)}]',
-                    'item_category_4':  '[{$gtmBasketItemCategory->getSplitCategoryArray(3, true)}]',
-                    'item_list_name':   '[{$gtmBasketItemCategory->getSplitCategoryArray()}]',
-                    [{/if}]
-                    'price':            [{$gtmItemPriceObject->getPrice()}],
-                    'coupon':           '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
-                    'quantity':         [{$basketitem->getAmount()}],
-                    'position':         [{$smarty.foreach.gtmCartContents.index}]
-                    }[{if !$smarty.foreach.gtmCartContents.last}],[{/if}]
-                [{/foreach}]
-                ]
-            }[{if $oViewConf->isDebugModeOn()}],
-            'debug_mode': 'true'
-            [{/if}]
-            });
-        [{/strip}]
-    [{/capture}]
-    [{oxscript add=$smarty.capture.gtm_ga4_add_payment_info}]
-    [{/block}]
--- a/views/smarty/event/begin_checkout.tpl
+++ b/views/smarty/event/begin_checkout.tpl
@ -1,52 +0,0 @@
-[{*$oxcmp_basket|get_class_methods|dumpvar*}]
-
-[{assign var="d3BasketPrice" value=$oxcmp_basket->getPrice()}]
-[{assign var="d3BasketObject" value=$oxcmp_basket}]
-[{assign var='gtmCartArticles' value=$d3BasketObject->getBasketArticles()}]
-[{assign var="gtmCurrency"      value=$oView->getActCurrency()}]
-
-[{block name="d3_ga4_begin_checkout_block"}]
-    [{capture name="d3_ga4_begin_checkout"}]
-        [{strip}]
-            dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-            dataLayer.push({
-            'event': 'begin_checkout',
-            'eventLabel':'Begin of checkout',
-            'ecommerce':
-            {
-            'actionField': "Begin",
-            'currency': "[{$gtmCurrency->name}]",
-            'value': [{$d3BasketPrice->getPrice()}],
-            'coupon':         '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
-            'items':
-            [
-            [{foreach from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents  key=basketindex}]
-            [{assign var="d3oItemPrice" value=$basketitem->getPrice()}]
-            [{assign var="gtmBasketItem" value=$basketitem->getArticle()}]
-            [{assign var="gtmBasketItemCategory" value=$gtmBasketItem->getCategory()}]
-            {
-            'item_id':          '[{$gtmCartArticles[$basketindex]->getFieldData('oxartnum')}]',
-            'item_name':        '[{$gtmCartArticles[$basketindex]->getFieldData('oxtitle')}]',
-            'item_variant':     '[{$gtmCartArticles[$basketindex]->getFieldData('oxvarselect')}]',
-            [{if $gtmBasketItemCategory}]
-            'item_category':    '[{$gtmBasketItemCategory->getSplitCategoryArray(0, true)}]',
-            'item_category_2':  '[{$gtmBasketItemCategory->getSplitCategoryArray(1, true)}]',
-            'item_category_3':  '[{$gtmBasketItemCategory->getSplitCategoryArray(2, true)}]',
-            'item_category_4':  '[{$gtmBasketItemCategory->getSplitCategoryArray(3, true)}]',
-            'item_list_name':   '[{$gtmBasketItemCategory->getSplitCategoryArray()}]',
-            [{/if}]
-            'price':            [{$d3oItemPrice->getPrice()}],
-            'coupon':           '[{foreach from=$oxcmp_basket->getVouchers() item=sVoucher key=key name=Voucher}][{$sVoucher->sVoucherNr}][{if !$smarty.foreach.Voucher.last}], [{/if}][{/foreach}]',
-            'quantity':         [{$basketitem->getAmount()}],
-            'position':         [{$smarty.foreach.gtmCartContents.index}]
-            }[{if !$smarty.foreach.gtmCartContents.last}],[{/if}]
-            [{/foreach}]
-            ]
-            }[{if $oViewConf->isDebugModeOn()}],
-            'debug_mode': 'true'
-            [{/if}]
-            });
-        [{/strip}]
-    [{/capture}]
-    [{oxscript add=$smarty.capture.d3_ga4_begin_checkout}]
-[{/block}]
Auteur	SHA1	Message	Date
MaxBUhe	17a77bbf4c	[Unknown-State] first base for it came formerly from an OS-Ticket but ticket got canceled from the customer	2024-07-30 14:54:03 +02:00
MaxBUhe	44d89a667b	Merge remote-tracking branch 'remotes/origin/rel_2.x' into dev_2.x_remove_from_cart_integration	2024-07-30 14:51:51 +02:00
MaxBUhe	9e79835bc4	[Removed] xml from composer-blacklist_filter	2024-05-30 09:15:03 +02:00
MaxBUhe	96033e1e03	[Added] missing admin-mod tab translation	2024-05-30 09:14:31 +02:00
MaxBUhe	a48356bc30	[Removed] dead files	2024-05-30 08:42:27 +02:00