[Fixed] bash-hints readme; [Added] changelog entries

php cs fixer

.php-cs-fixer.php

@@ -6,8 +6,10 @@ $finder = PhpCsFixer\Finder::create()
 	
 	$config = new PhpCsFixer\Config();
 	return $config->setRules([
-        '@PHP73Migration' => true,
-        '@PSR12' => true
+		'@PHP81Migration' => true,
+		'@PSR12' => true,
+		'php_unit_test_class_requires_covers' => true,
+		'doctrine_annotation_indentation' => true,
 	])
 		->setFinder($finder)
 		;

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 = 'ga4/admin/d3ga4uimain.tpl';
+    protected $_sThisTemplate = '@' . Constants::OXID_MODULE_ID . '/admin/d3ga4uimain';
 
     public function render()
     {

Application/Model/CMP/ConsentManagementPlatformBaseModel.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace D3\GoogleAnalytics4\Application\Model\CMP;
 
-
 abstract class ConsentManagementPlatformBaseModel extends \OxidEsales\Eshop\Core\Model\BaseModel implements ConsentManagementPlatformInterface
 {
     public string $sCMPName;

Application/Model/CMP/Usercentrics.php

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

Application/Model/Constants.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace D3\GoogleAnalytics4\Application\Model;
 
-
 class Constants
 {
     public const OXID_MODULE_ID = 'd3googleanalytics4';

Application/Model/ManagerHandler.php

@@ -17,7 +17,7 @@ class ManagerHandler
         /** @var ManagerTypes $oManagerTypes */
         $oManagerTypes = oxNew(ManagerTypes::class);
 
-        /** @var ViewConfig $oViewConfig */
+        /** @var ViewConfig|\D3\GoogleAnalytics4\Modules\Core\ViewConfig $oViewConfig */
         $oViewConfig = oxNew(ViewConfig::class);
 
         $aManagerList =  $oManagerTypes->getManagerList();
@@ -27,7 +27,7 @@ class ManagerHandler
         }
 
         foreach ($aManagerList as $shopModuleId => $publicCMPName) {
-           if ($oViewConfig->isModuleActive($shopModuleId)){
+            if ($oViewConfig->d3IsModuleActive($shopModuleId)) {
                 $this->d3SaveShopConfVar($shopModuleId);
                 return $shopModuleId;
             }
@@ -40,7 +40,8 @@ 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",

Application/Model/ManagerTypes.php

@@ -6,20 +6,26 @@ use D3\GoogleAnalytics4\Application\Model\CMP\Usercentrics;
 
 class ManagerTypes
 {
-    const EXTERNAL_SERVICE          = "eigener Service";
-    const NET_COOKIE_MANAGER        = "Netensio Cookie Manager";
+    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";
 
     /**
      * Further information's:
      * https://github.com/aggrosoft/oxid-cookie-compliance
      */
-    const AGCOOKIECOMPLIANCE        = "Aggrosoft Cookie Compliance";
+    public const AGCOOKIECOMPLIANCE        = "Aggrosoft Cookie Compliance";
+    public const INTERNAL_AGCOOKIECOMPLIANCE        = "agcookiecompliance";
 
-    const CONSENTMANAGER            = "Consentmanager";
+    public const CONSENTMANAGER            = "Consentmanager";
+    public const INTERNAL_CONSENTMANAGER            = "cmconsentmanager";
 
-    const COOKIEFIRST               = "Cookiefirst";
+    public const COOKIEFIRST               = "Cookiefirst";
+    public const INTERNAL_COOKIEFIRST               = "cookiefirst";
 
-    const COOKIEBOT                 = "Cookiebot";
+    public const COOKIEBOT                 = "Cookiebot";
+    public 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,
+        ];
+    }
 }

Application/views/admin_smarty/de/d3googleanalytics4_lang.php

@@ -1,9 +1,10 @@
 <?php
+
 $sLangName = "Deutsch";
 // -------------------------------
 // RESOURCE IDENTITFIER = STRING
 // -------------------------------
-$aLang = array(
+$aLang = [
     'charset'                   => 'UTF-8',
 
     'd3mxgoogleanalytics4'      => 'Google Analytics 4',
@@ -120,4 +121,4 @@ Nachher:
 src="{Domain}?id={Container-ID}"
 </code>
                                                                         </pre>',
-);
+];

Application/views/admin_smarty/de/module_options.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.

Application/views/blocks/add_payment_info.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/add_payment_info.tpl"}]

Application/views/blocks/begin_checkout.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/begin_checkout.tpl"}]

Application/views/blocks/details_productmain_tobasket.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]

Application/views/blocks/page_list_listbody.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]

Application/views/blocks/purchase.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/purchase.tpl"}]

Application/views/blocks/remove_from_cart.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/remove_from_cart.tpl"}]

Application/views/blocks/start_welcome_text.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]

Application/views/blocks/view_cart.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/view_cart.tpl"}]

Application/views/blocks/view_item.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/view_item.tpl"}]

Application/views/blocks/view_item_list.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/view_item_list.tpl"}]

Application/views/blocks/view_search_result.tpl

@@ -1,3 +0,0 @@
-[{$smarty.block.parent}]
-
-[{include file="event/view_search_result.tpl"}]

Application/views/ga4/remove_from_cart.tpl

@@ -1,48 +0,0 @@
-[{$smarty.block.parent}]
-
-[{block name="d3_ga4_remove_from_cart_block"}]
-    [{if $hasBeenReloaded}]
-        [{assign var="d3BasketPrice" value=$oxcmp_basket->getPrice()}]
-        [{capture assign=d3_ga4_remove_from_cart}]
-            [{strip}]
-                dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-                dataLayer.push({
-                    'isRemoveFromCart': true,
-                    'event': 'remove_from_cart',
-                    'eventLabel':'remove_from_cart',
-                    'ecommerce': {
-                        'actionField': "step: 1",
-                        'currency': "[{$currency->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=$toRemoveArticles->getArray() name=gtmRemovedItems item=rmItem  key=rmItemindex}]
-                            [{assign var="d3oItemPrice" value=$rmItem->getPrice()}]
-                            [{assign var="gtmBasketItemCategory" value=$rmItem->getCategory()}]
-                            {
-                            'item_id':          '[{$rmItem->getFieldData('oxartnum')}]',
-                            'item_name':        '[{$rmItem->getFieldData('oxtitle')}]',
-                            'item_variant':     '[{$rmItem->getFieldData('oxvarselect')}]',
-                            [{if $gtmBasketItemCategory}]
-                            'item_category':    '[{$gtmBasketItemCategory->getSplitCategoryArray(0)}]',
-                            'item_category_2':  '[{$gtmBasketItemCategory->getSplitCategoryArray(1)}]',
-                            'item_category_3':  '[{$gtmBasketItemCategory->getSplitCategoryArray(2)}]',
-                            'item_category_4':  '[{$gtmBasketItemCategory->getSplitCategoryArray(3)}]',
-                            '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':         '[{$rmItem->getFieldData('d3AmountThatGotRemoved')}]',
-                            'position':         [{$smarty.foreach.gtmRemovedItems.index}]
-                            }[{if !$smarty.foreach.gtmRemovedItems.last}],[{/if}]
-                            [{/foreach}]
-                        ]
-                    }[{if $oViewConf->isDebugModeOn()}],
-                    'debug_mode': 'true'
-                    [{/if}]
-                });
-            [{/strip}]
-        [{/capture}]
-        [{oxscript add=$d3_ga4_remove_from_cart}]
-    [{/if}]
-[{/block}]

Application/views/ga4/view_search_result.tpl

@@ -1,44 +0,0 @@
-[{$smarty.block.parent}]
-
-[{assign var="gtmProducts" value=$oView->getArticleList()}]
-
-[{block name="d3_ga4_view_search_result_block"}]
-  [{if $gtmProducts}]
-    [{capture assign=d3_ga4_view_search_result}]
-      [{strip}]
-        dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
-        dataLayer.push({
-          'event': 'view_search_result',
-          'eventLabel':'view_search_result[{if $oViewConf->isDebugModeOn()}]_test[{/if}]',
-          'ecommerce': {
-            'search_term': '[{$searchparamforhtml}]',
-            'items': [
-              [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
-              [{assign var="d3PriceObject" value=$gtmProduct->getPrice()}]
-              [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
-              [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
-              {
-                'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
-                'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
-                'price': [{$d3PriceObject->getPrice()}],
-                'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
-                [{if $gtmCategory}]
-                'item_category':  '[{$gtmCategory->getSplitCategoryArray(0)}]',
-                'item_category_2':'[{$gtmCategory->getSplitCategoryArray(1)}]',
-                'item_category_3':'[{$gtmCategory->getSplitCategoryArray(2)}]',
-                'item_category_4':'[{$gtmCategory->getSplitCategoryArray(3)}]',
-                'item_list_name':'[{$gtmCategory->getSplitCategoryArray()}]',
-                [{/if}]
-                'quantity': 1
-              }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
-              [{/foreach}]
-            ]
-          }[{if $oViewConf->isDebugModeOn()}],
-          'debug_mode': 'true'
-          [{/if}]
-        });
-      [{/strip}]
-    [{/capture}]
-    [{oxscript add=$d3_ga4_view_search_result}]
-  [{/if}]
-[{/block}]

CHANGELOG.md

@@ -6,6 +6,17 @@ 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

IntelliSenseHelper.php

@@ -14,18 +14,28 @@
  */
 
 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 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 gtmPayment_parent extends Payment
+    {
+    }
 }
 
 namespace D3\GoogleAnalytics4\Modules\Application\Controller{
@@ -38,36 +48,60 @@ 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
+    {
+    }
 }

Modules/Application/Component/Widget/d3GtmWidgetArticleDetails.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace D3\GoogleAnalytics4\Modules\Application\Component\Widget;
 
-
 class d3GtmWidgetArticleDetails extends d3GtmWidgetArticleDetails_parent
 {
     public function render()

Modules/Application/Controller/BasketController.php

@@ -52,7 +52,7 @@ class BasketController extends BasketController_parent
                 'am'           => $dAmount,
                 'sel'          => $aSel,
                 'persparam'    => $aPersParam,
-                'basketitemid' => $sBasketItemId
+                'basketitemid' => $sBasketItemId,
             ];
         }
 

Modules/Application/Controller/ThankYouController.php

@@ -16,7 +16,7 @@ class ThankYouController extends ThankYouController_parent
         $oOrder = $this->getOrder();
         $sCountryId = $oOrder->getFieldData('oxbillcountryid');
 
-        /** @var Country $oCountry */
+        /** @var Country::class $oCountry */
         $oCountry = oxNew(Country::class);
         $oCountry->load($sCountryId);
 

Modules/Application/Controller/d3GtmAccountNoticeListController.php

@@ -2,9 +2,11 @@
 
 namespace D3\GoogleAnalytics4\Modules\Application\Controller;
 
+use D3\GoogleAnalytics4\Application\Model\Constants;
+
 class d3GtmAccountNoticeListController extends d3GtmAccountNoticeListController_parent
 {
-    protected $_sThisTemplate = 'page/account/d3gtmnoticelist.tpl';
+    protected $_sThisTemplate = '@' . Constants::OXID_MODULE_ID . '/page/account/d3gtmnoticelist.tpl';
 
     public function render()
     {

Modules/Application/Controller/d3GtmAccountRecommlistController.php

@@ -2,9 +2,11 @@
 
 namespace D3\GoogleAnalytics4\Modules\Application\Controller;
 
+use D3\GoogleAnalytics4\Application\Model\Constants;
+
 class d3GtmAccountRecommlistController extends d3GtmAccountRecommlistController_parent
 {
-    protected $_sThisTemplate = 'page/account/d3gtmrecommendationlist.tpl';
+    protected $_sThisTemplate = '@' . Constants::OXID_MODULE_ID . '/page/account/d3gtmrecommendationlist.tpl';
 
     public function render()
     {

Modules/Application/Controller/d3GtmAccountWishlistController.php

@@ -2,9 +2,11 @@
 
 namespace D3\GoogleAnalytics4\Modules\Application\Controller;
 
+use D3\GoogleAnalytics4\Application\Model\Constants;
+
 class d3GtmAccountWishlistController extends d3GtmAccountWishlistController_parent
 {
-    protected $_sThisTemplate = 'page/account/d3gtmwishlist.tpl';
+    protected $_sThisTemplate = '@' . Constants::OXID_MODULE_ID . '/page/account/d3gtmwishlist.tpl';
 
     public function render()
     {

Modules/Application/Controller/d3GtmManufacturerListController.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace D3\GoogleAnalytics4\Modules\Application\Controller;
 
-
 class d3GtmManufacturerListController extends d3GtmManufacturerListController_parent
 {
     public function render()

Modules/Application/Controller/d3GtmSearchController.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace D3\GoogleAnalytics4\Modules\Application\Controller;
 
-
 class d3GtmSearchController extends d3GtmSearchController_parent
 {
     /**

Modules/Application/Model/Vendor.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace D3\GoogleAnalytics4\Modules\Application\Model;
 
-
 class Vendor extends \OxidEsales\Eshop\Application\Model\Vendor
 {
     use articleTreeStructure;

Modules/Application/Model/gtmPayment.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace D3\GoogleAnalytics4\Modules\Application\Model;
 
-
 use OxidEsales\Eshop\Application\Model\Payment;
 use OxidEsales\Eshop\Core\Registry;
 

Modules/Core/ViewConfig.php

@@ -1,4 +1,5 @@
 <?php
+
 /**
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -18,15 +19,16 @@ 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\Bridge\ModuleSettingBridgeInterface;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Exception\ModuleConfigurationNotFoundException;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\Setup\Bridge\ModuleActivationBridgeInterface;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\NotFoundExceptionInterface;
 
 class ViewConfig extends ViewConfig_parent
 {
-
     // Google Tag Manager Container ID
     private $sContainerId = null;
 
@@ -38,8 +40,7 @@ class ViewConfig extends ViewConfig_parent
 
     public function getGtmContainerId()
     {
-        if ($this->sContainerId === null)
-        {
+        if ($this->sContainerId === null) {
             $this->sContainerId = $this->d3GetModuleConfigParam("_sContainerID");
         }
         return $this->sContainerId;
@@ -50,8 +51,7 @@ class ViewConfig extends ViewConfig_parent
      */
     public function defineCookieManagerType(): void
     {
-        if ($this->sCookieManagerType === null)
-        {
+        if ($this->sCookieManagerType === null) {
             /** @var ManagerHandler $oManagerHandler */
             $oManagerHandler = oxNew(ManagerHandler::class);
             $this->sCookieManagerType = $oManagerHandler->getCurrManager();
@@ -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,22 +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.
             return true;
         }
@@ -136,21 +132,19 @@ class ViewConfig extends ViewConfig_parent
         if (
             $this->sCookieManagerType === Usercentrics::sModuleIncludationInternalName
             or $this->sCookieManagerType === Usercentrics::sExternalIncludationInternalName
-        )
-        {
+        ) {
             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 .'"';
         }
 
@@ -163,8 +157,7 @@ class ViewConfig extends ViewConfig_parent
      */
     public function isGA4enabled()
     {
-        if ($this->blGA4enabled === null)
-        {
+        if ($this->blGA4enabled === null) {
             $this->blGA4enabled = $this->d3GetModuleConfigParam("_blEnableGA4");
         }
 
@@ -178,7 +171,9 @@ class ViewConfig extends ViewConfig_parent
 
     public function getGtmDataLayer()
     {
-        if (!$this->getGtmContainerId()) return "[]";
+        if (!$this->getGtmContainerId()) {
+            return "[]";
+        }
 
         $oConfig = Registry::getConfig();
         $oView   = $oConfig->getTopActiveView();
@@ -258,4 +253,26 @@ 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;
+    }
 }

Modules/Core/WidgetControl.php

@@ -4,7 +4,8 @@ namespace D3\GoogleAnalytics4\Modules\Core;
 
 use OxidEsales\EshopCommunity\Core\Registry;
 
-class WidgetControl extends WidgetControl_parent{
+class WidgetControl extends WidgetControl_parent
+{
     protected function getFrontendStartControllerKey() // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
     {
         /*
@@ -27,14 +28,12 @@ class WidgetControl extends WidgetControl_parent{
         )
          */
         $sScriptName = $_SERVER['SCRIPT_NAME'];
-        if($sScriptName !== '/widget.php')
-        {
+        if ($sScriptName !== '/widget.php') {
             return parent::getFrontendStartControllerKey();
         }
 
         $aParameter = $_GET;
-        if(is_null($aParameter['actcontrol']) and is_null($aParameter['oxwparent']))
-        {
+        if (is_null($aParameter['actcontrol']) and is_null($aParameter['oxwparent'])) {
             return 'D3\GoogleAnalytics4\Application\Component\Widget\d3GtmStartWidget';
         }
 

README.md

@@ -23,11 +23,21 @@ 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:^3
 ```
 
 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!

Setup/Actions.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace D3\GoogleAnalytics4\Setup;
 
-
 use D3\GoogleAnalytics4\Application\Model\Constants;
 use OxidEsales\Eshop\Core\Registry;
 use OxidEsales\Eshop\Core\ViewConfig;
@@ -17,7 +16,8 @@ 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))) {

Setup/Events.php

@@ -4,7 +4,6 @@ declare(strict_types=1);
 
 namespace D3\GoogleAnalytics4\Setup;
 
-
 class Events
 {
     /**
@@ -33,5 +32,7 @@ class Events
     /**
      * @return void
      */
-    public static function onDeactivate(){}
+    public static function onDeactivate()
+    {
+    }
 }

composer.json

@@ -28,29 +28,25 @@
       "homepage": "https://www.d3data.de"
     }
   ],
-  "support": {
+  "supports": {
     "email": "support@shopmodule.com"
   },
-  "extra": {
-    "oxideshop": {
-      "blacklist-filter": [
-        "*.md",
-        "composer.json",
-        ".php-cs-fixer.php",
-        "*.neon"
-      ],
-      "target-directory": "d3/googleanalytics4"
-    }
-  },
   "require": {
-    "php": "7.1 - 8.2",
-    "oxid-esales/oxideshop-ce": "^6.5.3",
+    "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\\": "../../../source/modules/d3/googleanalytics4"
-    }
+      "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"
   }
 }

metadata.php

@@ -52,12 +52,12 @@ $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.21.0',
+    'version' => '3.0.0.0',
     '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' => [
         // Core
@@ -88,106 +88,109 @@ $aModule = [
     ],
     '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_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',
+        '@' . 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',
 
         // 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',
+        '@' . 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',
 
         // 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',
+        '@' . 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',
     ],
     'blocks' => [
         // tag manager js
         [
             'template' => 'layout/base.tpl',
             'block' => 'head_meta_robots',
-            'file' => '/Application/views/blocks/_gtm_js.tpl',
-            'position' => 150
+            'file' => 'views/smarty/blocks/_gtm_js.tpl',
+            'position' => 150,
         ],
         // tag manager nojs
         [
             'template' => 'layout/base.tpl',
             'block' => 'theme_svg_icons',
-            'file' => '/Application/views/blocks/_gtm_nojs.tpl'
+            'file' => 'views/smarty/blocks/_gtm_nojs.tpl',
+			'position' => 150,
         ],
         // details
         [
             'template' => 'page/details/inc/productmain.tpl',
             'block' => 'details_productmain_title',
-            'file' => '/Application/views/blocks/view_item.tpl',
-            'position' => 150
+            'file' => 'views/smarty/blocks/view_item.tpl',
+            'position' => 150,
         ],
         // View Cart
         [
             'template' => 'page/checkout/basket.tpl',
             'block' => 'checkout_basket_main',
-            'file' => '/Application/views/blocks/view_cart.tpl'
+            'file' => 'views/smarty/blocks/view_cart.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
+            'file' => 'views/smarty/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',
-            'position' => 150
+            'file' => 'views/smarty/blocks/remove_from_cart.tpl',
+            'position' => 150,
         ],
         [
             'template' => 'page/checkout/thankyou.tpl',
             'block' => 'checkout_thankyou_main',
-            'file' => '/Application/views/blocks/purchase.tpl'
+            'file' => 'views/smarty/blocks/purchase.tpl',
+			'position' => 150,
         ],
         // Lists
         // view_item_list
         [
             'template' => 'page/list/list.tpl',
             'block' => 'page_list_productlist',
-            'file' => '/Application/views/blocks/view_item_list.tpl',
-            'position' => 150
+            'file' => 'views/smarty/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
+            'file' => 'views/smarty/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
+            'file' => 'views/smarty/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
+            'file' => 'views/smarty/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
+            '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;
@@ -195,8 +198,8 @@ $aModule = [
         [
             'template' => 'page/checkout/order.tpl',
             'block' => 'checkout_order_main',
-            'file' => '/Application/views/blocks/add_payment_info.tpl',
-            'position' => 150
+            'file' => 'views/smarty/blocks/add_payment_info.tpl',
+            'position' => 150,
         ],
     ],
     'events' => [

views/smarty/admin/d3googleanalytics4_main.tpl

@@ -1,4 +1,4 @@
-[{include file="ga4/admin/d3ga4uiheaditem.tpl" title="GENERAL_ADMIN_TITLE"|oxmultilangassign}]
+[{include file="@d3googleanalytics4/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,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}]

views/smarty/blocks/add_payment_info.tpl

@@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="@d3googleanalytics4/event/add_payment_info.tpl"}]

views/smarty/blocks/begin_checkout.tpl

@@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="@d3googleanalytics4/event/begin_checkout.tpl"}]

views/smarty/blocks/details_productmain_tobasket.tpl

@@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file='@d3googleanalytics4/event/add_to_cart.tpl' htmlIdAmountOfArticles='#amountToBasket'}]

views/smarty/blocks/page_list_listbody.tpl

@@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file='@d3googleanalytics4/event/add_to_cart.tpl' htmlIdAmountOfArticles='#amountToBasket'}]

views/smarty/blocks/purchase.tpl

@@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="@d3googleanalytics4/event/purchase.tpl"}]

views/smarty/blocks/remove_from_cart.tpl

@@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="@d3googleanalytics4/event/remove_from_cart.tpl"}]

views/smarty/blocks/start_welcome_text.tpl

@@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file='@d3googleanalytics4/event/add_to_cart.tpl' htmlIdAmountOfArticles='#amountToBasket'}]

views/smarty/blocks/view_cart.tpl

@@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="@d3googleanalytics4/event/view_cart.tpl"}]

views/smarty/blocks/view_item.tpl

@@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="@d3googleanalytics4/event/view_item.tpl"}]

views/smarty/blocks/view_item_list.tpl

@@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="@d3googleanalytics4/event/view_item_list.tpl"}]

views/smarty/blocks/view_search_result.tpl

@@ -0,0 +1,3 @@
+[{$smarty.block.parent}]
+
+[{include file="@d3googleanalytics4/event/view_search_result.tpl"}]

views/smarty/event/view_search_result.tpl

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

views/smarty/page/account/d3gtmnoticelist.tpl

@@ -8,7 +8,7 @@
     <p class="alert alert-info">[{oxmultilang ident="WISH_LIST_EMPTY"}]</p>
     [{/if}]
 
-    [{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]
+    [{include file='@d3googleanalytics4/event/add_to_cart.tpl' htmlIdAmountOfArticles='#amountToBasket'}]
 
     [{insert name="oxid_tracker" title=$template_title}]
     [{/capture}]

views/smarty/page/account/d3gtmrecommendationlist.tpl

@@ -21,7 +21,7 @@
         [{/if}]
     [{/block}]
 
-    [{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]
+    [{include file='@d3googleanalytics4/event/add_to_cart.tpl' htmlIdAmountOfArticles='#amountToBasket'}]
 
     [{insert name="oxid_tracker" title=$template_title}]
 [{/capture}]

views/smarty/page/account/d3gtmwishlist.tpl

@@ -34,7 +34,7 @@
         </p>
     [{/if}]
 
-    [{include file="event/add_to_cart.tpl" htmlIdAmountOfArticles='#amountToBasket'}]
+    [{include file='@d3googleanalytics4/event/add_to_cart.tpl' htmlIdAmountOfArticles='#amountToBasket'}]
 
     [{insert name="oxid_tracker" title=$template_title}]
 [{/capture}]