[Changed] condition to trigger event-firing

[Bump] Metadata && Changelog
[Changed] add "internal_names" to constant
2024-10-25 20:06:29 +02:00 · 2024-09-21 16:23:06 +02:00 · 2024-09-21 16:20:48 +02:00 · 2024-09-21 16:08:08 +02:00 · 2024-09-21 16:06:32 +02:00 · 2024-09-19 16:20:19 +02:00
--- a/Application/Component/Widget/d3GtmStartWidget.php
+++ b/Application/Component/Widget/d3GtmStartWidget.php
@ -0,0 +1,15 @@
+<?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/Model/ManagerTypes.php
+++ b/Application/Model/ManagerTypes.php
@ -7,19 +7,25 @@ use D3\GoogleAnalytics4\Application\Model\CMP\Usercentrics;
 class ManagerTypes
 {
    const EXTERNAL_SERVICE          = "eigener Service";
+    const INTERNAL_EXTERNAL_SERVICE          = "externalService";
    const NET_COOKIE_MANAGER        = "Netensio Cookie Manager";
+    const INTERNAL_NET_COOKIE_MANAGER        = "net_cookie_manager";

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

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

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

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

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

@ -46,4 +52,21 @@ class ManagerTypes
    {
        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/tpl/d3googleanalytics4_main.tpl
+++ b/Application/views/admin/tpl/d3googleanalytics4_main.tpl
@ -80,7 +80,6 @@
                                            [{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/add_payment_info.tpl
+++ b/Application/views/blocks/add_payment_info.tpl
@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="event/add_payment_info.tpl"}]
--- a/Application/views/blocks/begin_checkout.tpl
+++ b/Application/views/blocks/begin_checkout.tpl
@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="event/begin_checkout.tpl"}]
--- a/Application/views/event/add_payment_info.tpl
+++ b/Application/views/event/add_payment_info.tpl
@ -0,0 +1,53 @@
+[{*$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/Application/views/event/add_to_cart.tpl
+++ b/Application/views/event/add_to_cart.tpl
@ -1,5 +1,5 @@

-[{if $d3CmpBasket && $d3CmpBasket->getAddToBasketDecision() && $d3CmpBasket->d3GtmRequestedArticleLoadedByAnid() !== null}]
+[{if $d3CmpBasket && $d3CmpBasket->d3GtmRequestedArticleLoadedByAnid() !== null}]
  [{assign var="oGtmProduct"              value=$d3CmpBasket->d3GtmRequestedArticleLoadedByAnid()}]
  [{assign var="oGtmAmountArticlesAdded"  value=$d3CmpBasket->getD3GtmAddToCartAmountArticles()}]
  [{*$smarty.block.parent*}]
@ -12,50 +12,50 @@
  [{block name="d3_ga4_add_to_cart_list_block"}]
    [{capture name="d3_ga4_add_to_cart_listtpl"}]
      [{strip}]
-      dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */

-      [{*** Debug cases ***}]
-      [{*event.preventDefault();*}]
+      $(document).ready(function() {
+        $('#toBasket').on('click', function() {
+          dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */

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

-      if(!iArtQuantity && (iArtQuantityAdded === 1)){
-        iArtQuantity = 1;
-      }else{
-        iArtQuantity = iArtQuantityAdded;
-      }
+          let iArtQuantity = $("[{$htmlIdAmountOfArticles}]").val();
+          let iPriceValue = [{$d3PriceObject->getPrice()}];
+          let iSumPrice = iArtQuantity*iPriceValue;

-      dataLayer.push({
-        'isAddToBasket': true,
-        'event':'add_to_cart',
-        'eventLabel': 'add_to_cart',
-        'ecommerce': {
-          'currency':   "[{$currency->name}]",
-          'value':      iArtQuantity*[{$d3PriceObject->getPrice()}],
-          'items':      [
-            {
-              'item_id':        '[{$oGtmProduct->getFieldData('oxartnum')}]',
-              'item_name':      '[{$oGtmProduct->getFieldData('oxtitle')}]',
-              'price':          [{$d3PriceObject->getPrice()}],
-              'item_brand':     '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-              'item_variant':   '[{if $oGtmProduct->getFieldData('oxvarselect')}][{$oGtmProduct->getFieldData('oxvarselect')}][{/if}]',
-              [{if $gtmCategory}]
-              'item_category':  '[{$gtmCategory->getSplitCategoryArray(0, true)}]',
-              'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1, true)}]',
-              'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2, true)}]',
-              'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3, true)}]',
-              'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
-              [{/if}]
-              'quantity': iArtQuantity
-            }
-          ]
-        }[{if $oViewConf->isDebugModeOn()}],
-        'debug_mode': 'true'
-        [{/if}]
+          dataLayer.push({
+            'isAddToBasket': true,
+            'event':'add_to_cart',
+            'eventLabel': 'add_to_cart',
+            'ecommerce': {
+            'currency':   "[{$currency->name}]",
+            'value':      parseInt(iSumPrice.toFixed(2)),
+            'items':      [
+              {
+                'item_id':        '[{$oGtmProduct->getFieldData('oxartnum')}]',
+                'item_name':      '[{$oGtmProduct->getFieldData('oxtitle')}]',
+                'price':          [{$d3PriceObject->getPrice()}],
+                'item_brand':     '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+                'item_variant':   '[{if $oGtmProduct->getFieldData('oxvarselect')}][{$oGtmProduct->getFieldData('oxvarselect')}][{/if}]',
+                [{if $gtmCategory}]
+                'item_category':  '[{$gtmCategory->getSplitCategoryArray(0, true)}]',
+                'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1, true)}]',
+                'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2, true)}]',
+                'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3, true)}]',
+                'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
+                [{/if}]
+                'quantity': iArtQuantity
+              }
+            ]
+            }[{if $oViewConf->isDebugModeOn()}],
+            'debug_mode': 'true'
+            [{/if}]
+          });
+        });
      });
      [{/strip}]
    [{/capture}]
-    [{oxscript add=$smarty.capture.d3_ga4_add_to_cart_listtpl}]
-  [{/block}]
-[{/if}]
+      [{oxscript add=$smarty.capture.d3_ga4_add_to_cart_listtpl}]
+    [{/block}]
+  [{/if}]
--- a/Application/views/event/begin_checkout.tpl
+++ b/Application/views/event/begin_checkout.tpl
@ -0,0 +1,52 @@
+[{*$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}]
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,6 +6,24 @@ 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

+## [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
--- a/IntelliSenseHelper.php
+++ b/IntelliSenseHelper.php
@ -18,9 +18,14 @@ namespace D3\GoogleAnalytics4\Modules\Core{
 }

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

 namespace D3\GoogleAnalytics4\Modules\Application\Controller{
--- a/Modules/Application/Model/gtmPayment.php
+++ b/Modules/Application/Model/gtmPayment.php
@ -0,0 +1,20 @@
+<?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
@ -88,7 +88,7 @@ class ViewConfig extends ViewConfig_parent
        $sCookieID = trim($this->d3GetModuleConfigParam('_sControlParameter'));

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

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

        // Aggrosoft Cookie Consent
-        if ($this->sCookieManagerType === ManagerTypes::AGCOOKIECOMPLIANCE) {
+        if ($this->sCookieManagerType === ManagerTypes::INTERNAL_AGCOOKIECOMPLIANCE) {
            if (method_exists($this, "isCookieCategoryEnabled")) {
                return $this->isCookieCategoryEnabled($sCookieID);
            }
        }
-
-        // UserCentrics or consentmanager
+		
        if (
-            $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
+	        in_array
+	        (
+				$this->sCookieManagerType,
+				(oxNew(ManagerTypes::class)->scriptTagDeliveredByDefaultArray())
+	        )
        )
        {
            // Always needs the script-tags delivered to the DOM.
@ -141,16 +139,16 @@ class ViewConfig extends ViewConfig_parent
            return 'data-usercentrics="' . $sControlParameter . '" type="text/plain" async=""';
        }

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

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

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

--- a/Modules/Core/WidgetControl.php
+++ b/Modules/Core/WidgetControl.php
@ -0,0 +1,43 @@
+<?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/metadata.php
+++ b/metadata.php
@ -16,6 +16,7 @@ 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;
@ -33,12 +34,13 @@ 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, 
@ -49,135 +51,156 @@ $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'     => '2.19.0',
-    'author'      => 'Data Development (Inh.: Thomas Dartsch)',
-    'email'       => 'support@shopmodule.com',
-    'url'         => 'https://www.oxidmodule.com/',
+    'thumbnail' => 'thumbnail.png',
+    'version' => '2.22.0',
+    'author' => 'Data Development (Inh.: Thomas Dartsch)',
+    'email' => 'support@shopmodule.com',
+    'url' => 'https://www.oxidmodule.com/',
    'controllers' => [
        '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,
+        OECategory::class => Category::class,
+        OEBasket::class => Basket::class,
+        OEManufacturer::class => Manufacturer::class,
+        OEPayment::class => gtmPayment::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
-        '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',
+        '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_item.tpl' => 'd3/googleanalytics4/Application/views/event/view_item.tpl',
+        'event/begin_checkout.tpl' => 'd3/googleanalytics4/Application/views/event/begin_checkout.tpl',
+        'event/add_payment_info.tpl' => 'd3/googleanalytics4/Application/views/event/add_payment_info.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/->
-        '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',
+        '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
-        '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',
+        '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'     => '/Application/views/blocks/_gtm_js.tpl',
+            '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'     => '/Application/views/blocks/_gtm_nojs.tpl'
+            'block' => 'theme_svg_icons',
+            'file' => '/Application/views/blocks/_gtm_nojs.tpl'
        ],
        // details
        [
            'template' => 'page/details/inc/productmain.tpl',
-            'block'    => 'details_productmain_title',
-            'file'     => '/Application/views/blocks/view_item.tpl',
+            'block' => 'details_productmain_title',
+            'file' => '/Application/views/blocks/view_item.tpl',
            'position' => 150
        ],
-        // checkout
+        // View Cart
        [
            'template' => 'page/checkout/basket.tpl',
-            'block'    => 'checkout_basket_main',
-            'file'     => '/Application/views/blocks/view_cart.tpl'
-        ],
-        [
-            'template' => 'page/checkout/thankyou.tpl',
-            'block'    => 'checkout_thankyou_main',
-            'file'     => '/Application/views/blocks/purchase.tpl'
-        ],
-        // Lists
-        // view_item_list
-        [
-            'template' => 'page/list/list.tpl',
-            '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'     => '/Application/views/blocks/view_search_result.tpl',
-            'position' => 150
+            'block' => 'checkout_basket_main',
+            'file' => '/Application/views/blocks/view_cart.tpl'
        ],
        // 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'     => '/Application/views/blocks/page_list_listbody.tpl',
-            'position' => 150
-        ],
-        [
-            'template' => 'page/shop/start.tpl',
-            'block'    => 'start_welcome_text',
-            'file'     => '/Application/views/blocks/start_welcome_text.tpl',
+            'block' => 'details_productmain_tobasket',
+            'file' => '/Application/views/blocks/details_productmain_tobasket.tpl',
            'position' => 150
        ],
        // remove_from_cart
        [
            'template' => 'page/checkout/basket.tpl',
-            'block'    => 'checkout_basket_main',
-            'file'     => '/Application/views/blocks/remove_from_cart.tpl',
+            'block' => 'checkout_basket_main',
+            'file' => '/Application/views/blocks/remove_from_cart.tpl',
            'position' => 150
-        ]
+        ],
+        [
+            'template' => 'page/checkout/thankyou.tpl',
+            'block' => 'checkout_thankyou_main',
+            'file' => '/Application/views/blocks/purchase.tpl'
+        ],
+        // Lists
+        // view_item_list
+        [
+            'template' => 'page/list/list.tpl',
+            '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' => '/Application/views/blocks/view_search_result.tpl',
+            'position' => 150
+        ],
+        [
+            'template' => 'page/list/list.tpl',
+            'block' => 'page_list_listbody',
+            'file' => '/Application/views/blocks/page_list_listbody.tpl',
+            'position' => 150
+        ],
+        [
+            'template' => 'page/shop/start.tpl',
+            'block' => 'start_welcome_text',
+            'file' => '/Application/views/blocks/start_welcome_text.tpl',
+            'position' => 150
+        ],
+        // Checkout process
+        // Begin CHeckout
+        [
+            'template' => 'page/checkout/user.tpl',
+            'block' => 'checkout_user_main',
+            'file' => '/Application/views/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' => '/Application/views/blocks/add_payment_info.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',
    ],
 ];
Auteur	SHA1	Bericht	Datum
MaxBuhe01	a18bcd35c4	[Changed] condition to trigger event-firing	2024-10-25 20:06:29 +02:00
MaxBuhe01	2ec373c95f	[Bump] Metadata && Changelog	2024-09-21 16:23:06 +02:00
MaxBuhe01	6fcb9f8b84	[Changed] add "internal_names" to constant	2024-09-21 16:20:48 +02:00
MaxBuhe01	53b3c878ce	[Fixed] Consentmanager doesn't get delivered false value given for important decision-making. Since the value was false, we got "false" as return for D3blShowGtmScript() which made consentmanager not send the data to GTM	2024-09-21 16:08:08 +02:00
MaxBuhe01	65b618e25c	[Removed] unnecessary "none" entry for CMP-choosability	2024-09-21 16:06:32 +02:00
MaxBuhe01	4b2c978035	[Bump] Metadata && Changelog	2024-09-19 16:20:19 +02:00
MaxBuhe01	2a27b25c5a	Merge remote-tracking branch 'remotes/origin/dev_2.x_d3GtmStartController' into rel_2.x	2024-09-19 15:33:02 +02:00
MaxBuhe01	a8ca33b10d	Bump metadata && changelog	2024-09-11 17:26:58 +02:00
MaxBuhe01	31bafa621b	[Fixed] currency in begin_checkout	2024-09-11 17:23:04 +02:00
MarkusGaertner	48e2dc58ad	Methode umbenannt	2024-08-27 14:25:55 +02:00
MaxBuhe01	f27040e7dd	[Bump] Metadata	2024-08-20 20:14:56 +02:00
MaxBuhe01	79994eae69	[Added] new Event "add_payment_info" - add Payment-Model extension for own small method - new block extension - new template for the event-data for GA - metadata adjustments for it	2024-08-20 19:58:02 +02:00
MaxBuhe01	6bdf788ebf	[Added] new Event "begin_checkout" - new block extension - new template for the event-data for GA - metadata adjustments for it - new version ( 2.20.0 )	2024-08-20 18:59:14 +02:00
MaxBuhe01	98ddc51a4d	[Changed] clean code	2024-08-18 16:40:49 +02:00
MarkusGaertner	48a598da51	render() ergänzen	2024-08-08 15:03:48 +02:00
MarkusGaertner	bc1dafbbfa	Erweiterung verschieben	2024-08-08 14:16:25 +02:00
MarkusGaertner	2a1f8f5794	Erweiterung verschieben	2024-08-08 10:36:55 +02:00
MarkusGaertner	7bc73893c3	Prevent "OXID Logger.ERROR: D3\GoogleAnalytics4\Modules\Application\Controller\d3GtmStartController is not an instance of OxidEsales\Eshop\Application\Component\Widget\WidgetController"	2024-08-08 10:21:22 +02:00