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

[Changed] configParamGetter

Browse Source
This commit is contained in:
MaxBUhe 2024-05-29 11:59:38 +02:00
parent 91e0c5c0c9
commit 7ab62493e4
3 changed files with 21 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Application/Controller/Admin/GA4AdminUserInterface_main.php
View File

@ -7,6 +7,7 @@ namespace D3\GoogleAnalytics4\Application\Controller\Admin;
use D3\GoogleAnalytics4\Application\Model\Constants; use D3\GoogleAnalytics4\Application\Model\Constants;
use D3\GoogleAnalytics4\Application\Model\ManagerTypes; use D3\GoogleAnalytics4\Application\Model\ManagerTypes;
use OxidEsales\Eshop\Core\Registry; use OxidEsales\Eshop\Core\Registry;
use OxidEsales\Eshop\Core\ViewConfig;
class GA4AdminUserInterface_main extends \OxidEsales\Eshop\Application\Controller\Admin\AdminDetailsController class GA4AdminUserInterface_main extends \OxidEsales\Eshop\Application\Controller\Admin\AdminDetailsController
{ {
@ -92,6 +93,6 @@ class GA4AdminUserInterface_main extends \OxidEsales\Eshop\Application\Controlle
*/ */
public function d3GetModuleConfigParam(string $configParamName) public function d3GetModuleConfigParam(string $configParamName)
{ {
return Registry::getConfig()->getShopConfVar(Constants::OXID_MODULE_ID.$configParamName, null, Constants::OXID_MODULE_ID); return Registry::get(ViewConfig::class)->d3GetModuleConfigParam($configParamName);
} }
} }

2
Application/Model/ManagerHandler.php
View File

@ -34,7 +34,7 @@ class ManagerHandler
*/ */
public function getModuleSettingExplicitManagerSelectValue() :string public function getModuleSettingExplicitManagerSelectValue() :string
{ {
return Registry::getConfig()->getConfigParam('d3_gtm_settings_HAS_STD_MANAGER'); return Registry::get(ViewConfig::class)->d3GetModuleConfigParam('_HAS_STD_MANAGER');
} }
/** /**

42
Modules/Core/ViewConfig.php
View File

@ -34,10 +34,7 @@ class ViewConfig extends ViewConfig_parent
{ {
if ($this->sContainerId === null) if ($this->sContainerId === null)
{ {
$this->sContainerId = ContainerFactory::getInstance() $this->sContainerId = $this->d3GetModuleConfigParam("_sContainerID");
->getContainer()
->get(ModuleSettingBridgeInterface::class)
->get('d3_gtm_sContainerID', Constants::OXID_MODULE_ID);
} }
return $this->sContainerId; return $this->sContainerId;
} }
@ -60,7 +57,7 @@ class ViewConfig extends ViewConfig_parent
*/ */
public function shallUseOwnCookieManager() :bool public function shallUseOwnCookieManager() :bool
{ {
return (bool) Registry::getConfig()->getConfigParam('d3_gtm_settings_hasOwnCookieManager'); return (bool) $this->d3GetModuleConfigParam('_blEnableOwnCookieManager');
} }
/** /**
@ -78,7 +75,7 @@ class ViewConfig extends ViewConfig_parent
$this->defineCookieManagerType(); $this->defineCookieManagerType();
$sCookieID = trim($oConfig->getConfigParam('d3_gtm_settings_controlParameter')); $sCookieID = trim($this->d3GetModuleConfigParam('_sControlParameter'));
// Netensio Cookie Manager // Netensio Cookie Manager
if ($this->sCookieManagerType === ManagerTypes::NET_COOKIE_MANAGER) { if ($this->sCookieManagerType === ManagerTypes::NET_COOKIE_MANAGER) {
@ -120,7 +117,7 @@ class ViewConfig extends ViewConfig_parent
*/ */
public function getGtmScriptAttributes() :string public function getGtmScriptAttributes() :string
{ {
$sControlParameter = trim(Registry::getConfig()->getConfigParam('d3_gtm_settings_controlParameter')); $sControlParameter = trim($this->d3GetModuleConfigParam('_sControlParameter'));
if (false === $this->shallUseOwnCookieManager() or ($sControlParameter === '')){ if (false === $this->shallUseOwnCookieManager() or ($sControlParameter === '')){
return ""; return "";
@ -160,10 +157,7 @@ class ViewConfig extends ViewConfig_parent
{ {
if ($this->blGA4enabled === null) if ($this->blGA4enabled === null)
{ {
$this->sContainerId = ContainerFactory::getInstance() $this->sContainerId = $this->d3GetModuleConfigParam("d3_gtm_blEnableGA4");
->getContainer()
->get(ModuleSettingBridgeInterface::class)
->get('d3_gtm_blEnableGA4', Constants::OXID_MODULE_ID);
} }
return $this->blGA4enabled; return $this->blGA4enabled;
@ -171,10 +165,7 @@ class ViewConfig extends ViewConfig_parent
public function isGtmConsentModeSetActivated() :bool public function isGtmConsentModeSetActivated() :bool
{ {
return $this->sContainerId = ContainerFactory::getInstance() return $this->sContainerId = $this->d3GetModuleConfigParam("_blEnableConsentMode");
->getContainer()
->get(ModuleSettingBridgeInterface::class)
->get('d3_gtm_blActivateConsentMode', Constants::OXID_MODULE_ID);
} }
public function getGtmDataLayer() public function getGtmDataLayer()
@ -216,7 +207,7 @@ class ViewConfig extends ViewConfig_parent
public function isDebugModeOn() :bool public function isDebugModeOn() :bool
{ {
return Registry::getConfig()->getConfigParam('d3_gtm_blEnableDebug'); return $this->d3GetModuleConfigParam("_blEnableDebug");
} }
public function isPromotionList($listId) public function isPromotionList($listId)
@ -232,10 +223,7 @@ class ViewConfig extends ViewConfig_parent
*/ */
public function getServerSidetaggingJsDomain() :string public function getServerSidetaggingJsDomain() :string
{ {
return ContainerFactory::getInstance() return $this->d3GetModuleConfigParam("_sServersidetagging_js");
->getContainer()
->get(ModuleSettingBridgeInterface::class)
->get('d3_gtm_settings_serversidetagging_js', Constants::OXID_MODULE_ID);
} }
/** /**
@ -245,9 +233,15 @@ class ViewConfig extends ViewConfig_parent
*/ */
public function getServerSidetaggingNoJsDomain() :string public function getServerSidetaggingNoJsDomain() :string
{ {
return ContainerFactory::getInstance() return $this->d3GetModuleConfigParam('_sServersidetagging_nojs');
->getContainer() }
->get(ModuleSettingBridgeInterface::class)
->get('d3_gtm_settings_serversidetagging_nojs', Constants::OXID_MODULE_ID); /**
* @param string $configParamName
* @return mixed
*/
public function d3GetModuleConfigParam(string $configParamName)
{
return Registry::getConfig()->getShopConfVar(Constants::OXID_MODULE_ID.$configParamName, null, Constants::OXID_MODULE_ID);
} }
} }