bump version

Application/views/admin/de/module_options.php

@@ -1,13 +1,16 @@
 <?php
+
 /**
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * https://www.d3data.de
+ * This Software is the property of Data Development and is protected
+ * by copyright law - it is NOT Freeware.
+ * Any unauthorized use of this software without a valid license
+ * is a violation of the license agreement and will be prosecuted by
+ * civil and criminal law.
+ * http://www.shopmodule.com
  *
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Daniel Seifert <info@shopmodule.com>
- * @link      https://www.oxidmodule.com
+ * @author        D3 Data Development - Daniel Seifert <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
 $style = '<style type="text/css">
@@ -30,7 +33,6 @@ $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>',
+    'SHOP_MODULE_d3_gtm_settings_hasOwnCookieManager'   => 'Eigenen Cookie Manager nutzen?',
     'SHOP_MODULE_d3_gtm_settings_cookieName'            => 'Cookie-Name',
 ];

Application/views/blocks/_impression.tpl

@@ -0,0 +1,66 @@
+[{$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}]
+*}]

Application/views/blocks/add_to_cart.tpl

@@ -0,0 +1,5 @@
+[{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}]

Application/views/blocks/checkout_s2.tpl

@@ -0,0 +1,18 @@
+[{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}]

Application/views/blocks/checkout_s3.tpl

@@ -0,0 +1,9 @@
+<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}]

Application/views/blocks/checkout_s4.tpl

@@ -0,0 +1,9 @@
+<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}]

Application/views/blocks/detail.tpl

@@ -0,0 +1,25 @@
+[{$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>

Application/views/blocks/widget_product_list.tpl

@@ -0,0 +1,35 @@
+[{$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')}]
+-->

Application/views/ga4/purchase.tpl

@@ -0,0 +1,36 @@
+[{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}]

CHANGELOG.md

@@ -4,34 +4,9 @@ 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.3](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.2.2...2.2.3) - 2023-03-10
-### Removed
-- unnecessary files to prevent confusion
-
-## [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
-
-## [2.1](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/2.0...2.1) - 2023-01-27
-### Added
-- block section for add_to_basket js
-- template block order positions
-
-## [2.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.1...2.0) - 2023-01-20
-### 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
+- price formatting in view_cart
 
 ## [1.2](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.1...1.2) - 2023-02-01
 ### Added
@@ -45,7 +20,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - switched price formatting
 
-
-## [1.0](https://git.d3data.de/D3Public/GoogleAnalytics4/releases/tag/1.0) - 2023-01-20
+## [1.0](https://git.d3data.de/D3Public/GoogleAnalytics4/compare/1.0...1.0) - 2023-01-20
 ### Added
 - publication of app features

Modules/Core/ViewConfig.php

@@ -1,21 +1,20 @@
 <?php
 /**
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- *
- * https://www.d3data.de
- *
+ * This Software is the property of Data Development and is protected
+ * by copyright law - it is NOT Freeware.
+ * Any unauthorized use of this software without a valid license
+ * is a violation of the license agreement and will be prosecuted by
+ * civil and criminal law.
+ * http://www.shopmodule.com
  * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
- * @author    D3 Data Development - Daniel Seifert <info@shopmodule.com>
- * @link      https://www.oxidmodule.com
+ * @author        D3 Data Development - Daniel Seifert <support@shopmodule.com>
+ * @link          http://www.oxidmodule.com
  */
 
 namespace D3\GoogleAnalytics4\Modules\Core;
 
 use OxidEsales\Eshop\Application\Controller\FrontendController;
 use OxidEsales\Eshop\Core\Registry;
-use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
-use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ModuleSettingBridgeInterface;
 
 class ViewConfig extends ViewConfig_parent
 {
@@ -27,10 +26,8 @@ class ViewConfig extends ViewConfig_parent
     {
         if ($this->sContainerId === null)
         {
-            $this->sContainerId = ContainerFactory::getInstance()
-                                                  ->getContainer()
-                                                  ->get(ModuleSettingBridgeInterface::class)
-                                                  ->get('d3_gtm_sContainerID', 'd3googleanalytics4');
+
+            $this->sContainerId = $this->getConfig()->getConfigParam('d3_gtm_sContainerID');
         }
         return $this->sContainerId;
     }
@@ -57,10 +54,7 @@ class ViewConfig extends ViewConfig_parent
     {
         if ($this->blGA4enabled === null)
         {
-            $this->sContainerId = ContainerFactory::getInstance()
-                                                  ->getContainer()
-                                                  ->get(ModuleSettingBridgeInterface::class)
-                                                  ->get('d3_gtm_blEnableGA4', 'd3googleanalytics4');
+            $this->sContainerId = $this->getConfig()->getConfigParam('d3_gtm_blEnableGA4');
         }
 
         return $this->blGA4enabled;
@@ -73,6 +67,7 @@ class ViewConfig extends ViewConfig_parent
         $oConfig = Registry::getConfig();
         $oView   = $oConfig->getTopActiveView();
         /** @var FrontendController $oShop */
+
         $oUser = $oConfig->getUser();
 
         $cl         = $this->getTopActionClassName();

README.md

@@ -23,7 +23,7 @@ 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:^2
+php composer require d3/google-analytics4:^1
 ```
 
 Sofern nötig, bestätigen Sie bitte, dass Sie `package-name` erlauben, Code auszuführen.

composer.json

@@ -45,7 +45,7 @@
   },
   "require": {
     "php": ">=7.1",
-    "oxid-esales/oxideshop-ce": "^6.5",
+    "oxid-esales/oxideshop-ce": "v6.0 - 6.3",
     "google/apiclient":" ^2.0"
   },
   "autoload": {

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.2.3',
+    'version'     => '1.2.1',
     'author'      => 'Data Development (Inh.: Thomas Dartsch)',
     'email'       => 'support@shopmodule.com',
     'url'         => 'https://www.oxidmodule.com/',
@@ -26,11 +26,23 @@ $aModule          = [
     ],
     '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',
-        // article-details // view_item
+        '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',
     ],
     'blocks'      => [
         // tag manager js
@@ -45,26 +57,55 @@ $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',
+            'position' => 150
+        ],
         // checkout
-        // view_cart
         [
             'template' => 'page/checkout/basket.tpl',
             'block'    => 'checkout_basket_main',
             'file'     => '/Application/views/blocks/checkout_s1.tpl'
         ],
-        // purchase
+        [
+            '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'
+        ],
         [
             'template' => 'page/checkout/thankyou.tpl',
             'block'    => 'checkout_thankyou_main',
             'file'     => '/Application/views/blocks/checkout_s5.tpl'
         ],
-        // add_to_cart
-        [
-            'template' => 'page/details/inc/productmain.tpl',
-            'block'    => 'details_productmain_tobasket',
-            'file'     => '/Application/views/ga4/add_to_cart.tpl',
-            'position' => 150
-        ],
         // Lists
         // view_item_list
         [
@@ -79,6 +120,13 @@ $aModule          = [
             'block'    => 'search_results',
             'file'     => '/Application/views/ga4/search.tpl',
             'position' => 150
+        ],
+        // add_to_cart
+        [
+            'template' => 'page/details/inc/productmain.tpl',
+            'block'    => 'details_productmain_tobasket',
+            'file'     => '/Application/views/ga4/add_to_cart.tpl',
+            'position' => 150
         ]
     ],
     'settings'    => [