D3Public/GoogleAnalytics4
8
0
Fork 0
Code Pull Requests Packages Projects Releases Activity

Erweiterung verschieben

Browse Source
This commit is contained in:
Markus Gärtner 2024-08-08 14:16:25 +02:00
parent 2a1f8f5794
commit bc1dafbbfa
2 changed files with 11 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Modules/Core/ShopControl.php → Modules/Core/WidgetControl.php
View File

@ -4,7 +4,7 @@ namespace D3\GoogleAnalytics4\Modules\Core;
use OxidEsales\EshopCommunity\Core\Registry; use OxidEsales\EshopCommunity\Core\Registry;
class ShopControl extends ShopControl_parent{ class WidgetControl extends WidgetControl_parent{
protected function _getStartController() // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore protected function _getStartController() // phpcs:ignore PSR2.Methods.MethodDeclaration.Underscore
{ {
/* /*
@ -27,33 +27,20 @@ class ShopControl extends ShopControl_parent{
) )
*/ */
$sScriptName = $_SERVER['SCRIPT_NAME'];
if($sScriptName != '/widget.php')
{
return parent::getFrontendStartControllerKey();
}
$aParameter = $_GET; $aParameter = $_GET;
if( is_null($aParameter['actcontrol']) if(is_null($aParameter['actcontrol'])
&& is_null($aParameter['actcontrol'])
&& is_null($aParameter['actcontrol']) && is_null($aParameter['actcontrol'])
&& is_null($aParameter['oxwparent'])
) )
{ {
return 'D3\GoogleAnalytics4\Application\Component\Widget\d3GtmStartWidget'; return 'D3\GoogleAnalytics4\Application\Component\Widget\d3GtmStartWidget';
} }
return parent::getFrontendStartControllerKey();
return $this->getStartControllerKey();
}
protected function getStartControllerKey()
{
$controllerKey = Registry::getConfig()->getRequestControllerId();
// Use default route in case no controller id is given
if (!$controllerKey) {
$session = \OxidEsales\Eshop\Core\Registry::getSession();
if ($this->isAdmin()) {
$controllerKey = $session->getVariable("auth") ? 'admin_start' : 'login';
} else {
$controllerKey = $this->getFrontendStartControllerKey();
}
$session->setVariable('cl', $controllerKey);
}
return $controllerKey;
} }
} }

2
metadata.php
View File

@ -60,7 +60,7 @@ $aModule = [
'extend' => [ 'extend' => [
// Core // Core
OEViewConfig::class => ViewConfig::class, OEViewConfig::class => ViewConfig::class,
\OxidEsales\Eshop\Core\ShopControl::class => \D3\GoogleAnalytics4\Modules\Core\ShopControl::class, \OxidEsales\Eshop\Core\WidgetControl::class => \D3\GoogleAnalytics4\Modules\Core\WidgetControl::class,
// Model // Model
OECategory::class => Category::class, OECategory::class => Category::class,