bump version

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">
@@ -35,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',
 ];

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 -->

Application/views/blocks/checkout_s1.tpl

@@ -4,6 +4,8 @@
 
 [{assign var='gtmCartArticles' value=$oView->getBasketArticles()}]
 [{strip}][{capture assign=d3_ga4_view_cart}]
+    let iPrice = "[{oxprice price=$oxcmp_basket->getPrice()}]";
+
     dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
     dataLayer.push({
         'event': 'view_cart',
@@ -11,7 +13,7 @@
         'ecommerce': {
             'actionField': "step: 1",
             'currency': "[{$currency->name}]",
-            'value': [{oxprice price=$oxcmp_basket->getPrice()}],
+            'value': iPrice.replace("€", ""),
             'items': [
                 [{foreach from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents  key=basketindex}]
                 [{assign var='_price' value=$basketitem->getUnitPrice()}]

CHANGELOG.md

@@ -4,6 +4,15 @@ 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.2](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.2.1...2.2.2) - 2023-02-22
+### Fixed
+- price formatting in view_cart
+
+## [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
@@ -17,11 +26,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - using of ContainerFactory in ViewConfig
 
+## [1.2.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.2...1.2.1) - 2023-02-22
+### Fixed
+- price formatting view_cart
+
+## [1.2](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.1...1.2) - 2023-02-01
+### Added
+- own cookie-check-handler
+
 ## [1.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.0...1.1) - 2023-01-27
 ### Added
 - block section for add_to_basket js
 - template block order positions
 
+### Changed
+- switched price formatting
+
+
 ## [1.0](https://git.d3data.de/D3Public/GoogleAnalytics4/releases/tag/1.0) - 2023-01-20
 ### Added
 - publication of app features

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()

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.2',
     'author'      => 'Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'https://www.oxidmodule.com/',