From 1589f202a970963f9012df18b6eb4d0ba665600b Mon Sep 17 00:00:00 2001
From: MaxBUhe <mb@shopmodule.com>
Date: Wed, 1 Feb 2023 15:32:28 +0100
Subject: [PATCH 1/2] add own cookie-check method; rm unnecessary help-text

---
 Application/views/admin/de/module_options.php |  7 -------
 Application/views/blocks/_gtm_js.tpl          |  2 +-
 Modules/Core/ViewConfig.php                   | 16 ++++++++++++++++
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/Application/views/admin/de/module_options.php b/Application/views/admin/de/module_options.php
index 9c20ccd..b3befa1 100755
--- a/Application/views/admin/de/module_options.php
+++ b/Application/views/admin/de/module_options.php
@@ -32,12 +32,5 @@ $aLang = [
     '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',
 ];
diff --git a/Application/views/blocks/_gtm_js.tpl b/Application/views/blocks/_gtm_js.tpl
index cb6081c..e070806 100755
--- a/Application/views/blocks/_gtm_js.tpl
+++ b/Application/views/blocks/_gtm_js.tpl
@@ -1,6 +1,6 @@
 [{assign var="d3VtConfigObject" value=$oViewConf->getConfig()}]
 [{if $d3VtConfigObject->getConfigParam('d3_gtm_settings_hasOwnCookieManager')}]
-    [{if $oViewConf->blAcceptedCookie($d3VtConfigObject->getConfigParam('d3_gtm_settings_cookieName'))}]
+    [{if $oViewConf->D3blAcceptedCookie($d3VtConfigObject->getConfigParam('d3_gtm_settings_cookieName'))}]
 
         [{if $oViewConf->getGtmContainerId()}][{strip}]
         <!-- Google Tag Manager -->
diff --git a/Modules/Core/ViewConfig.php b/Modules/Core/ViewConfig.php
index 42fe285..7073646 100644
--- a/Modules/Core/ViewConfig.php
+++ b/Modules/Core/ViewConfig.php
@@ -35,6 +35,22 @@ class ViewConfig extends ViewConfig_parent
         return $this->sContainerId;
     }
 
+    /**
+     * @param $sCookieID
+     * @return bool
+     */
+    public function D3blAcceptedCookie($sCookieID)
+    {
+        $oSession = Registry::getSession();
+        $aCookies = $oSession->getVariable("aCookieSel");
+
+        if (!is_null($aCookies) && is_array($aCookies) && array_key_exists($sCookieID, $aCookies) && $aCookies[$sCookieID] == "1") {
+            return true;
+        }
+
+        return false;
+    }
+
     private $blGA4enabled = null;
 
     public function isGA4enabled()

From 1c45a16356fdbbb000b620f7c8398f86ce18b380 Mon Sep 17 00:00:00 2001
From: MaxBuhe01 <mb@shopmodule.com>
Date: Tue, 21 Feb 2023 12:27:52 +0100
Subject: [PATCH 2/2] bump version

---
 CHANGELOG.md | 4 ++++
 metadata.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c1c3cdf..e570d22 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ 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).
 
+## [2.2.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.1.1...2.2.1) - 2023-02-21
+### Added
+- cookie handling
+
 ## [2.1.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.1...2.1.1) - 2023-01-27
 ### Fixed
 - add missing class import
diff --git a/metadata.php b/metadata.php
index 89ed73a..447b9aa 100755
--- a/metadata.php
+++ b/metadata.php
@@ -17,7 +17,7 @@ $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'     => '2.1.1',
+    'version'     => '2.2.1',
     'author'      => 'Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'https://www.oxidmodule.com/',