diff --git a/Application/Controller/Admin/GA4AdminUserInterface_main.php b/Application/Controller/Admin/GA4AdminUserInterface_main.php index b9e504d..d55e9f1 100644 --- a/Application/Controller/Admin/GA4AdminUserInterface_main.php +++ b/Application/Controller/Admin/GA4AdminUserInterface_main.php @@ -21,12 +21,7 @@ class GA4AdminUserInterface_main extends \OxidEsales\Eshop\Application\Controlle $this->addTplParam('d3ViewObject', $this); $this->addTplParam('d3ViewConfObject', Registry::get(ViewConfig::class)); $this->addTplParam('d3ManagerTypeArray', oxNew(ManagerTypes::class)->getManagerList()); - - $sActManager = oxNew(ManagerHandler::class)->getCurrManager(); - $this->addTplParam('d3CurrentCMP', $sActManager); - - //Todo: hier ein Test, ist es denn nötig IMMER, meinen Wert zu speichern? Eigentlich doch nur, wenn ich im Admin auf speichern klicke! - //oxNew(ManagerHandler::class)->d3SaveShopConfVar($sActManager); + $this->addTplParam('d3CurrentCMP', oxNew(ManagerHandler::class)->getActManager()); return $return; } diff --git a/Application/Model/ManagerHandler.php b/Application/Model/ManagerHandler.php index d95a333..6e3d02d 100644 --- a/Application/Model/ManagerHandler.php +++ b/Application/Model/ManagerHandler.php @@ -7,32 +7,6 @@ use OxidEsales\Eshop\Core\ViewConfig; class ManagerHandler { - /** - * Gets current chosen Manager - * - * @return string - */ - public function getCurrManager() :string - { - if ($this->getModuleSettingExplicitManagerSelectValue()){ - return $this->getExplicitManager(); - } - - /** @var ManagerTypes $oManagerTypes */ - $oManagerTypes = oxNew(ManagerTypes::class); - /** @var ViewConfig $oViewConfig */ - $oViewConfig = oxNew(ViewConfig::class); - $aManagerList = $oManagerTypes->getManagerList(); - - foreach ($aManagerList as $shopModuleId => $publicCMPName){ - if ($oViewConfig->isModuleActive($shopModuleId)){ - return $shopModuleId; - } - } - - return ""; - } - /** * @param string $sParam * @return void @@ -50,24 +24,8 @@ class ManagerHandler /** * @return string */ - public function getModuleSettingExplicitManagerSelectValue() :string + public function getActManager() :string { - return Registry::get(ViewConfig::class)->d3GetModuleConfigParam('_HAS_STD_MANAGER')?:""; - } - - /** - * @return string - */ - public function getExplicitManager() :string - { - $sPotentialManagerName = $this->getModuleSettingExplicitManagerSelectValue(); - - /** @var ManagerTypes $oManagerTypes */ - $oManagerTypes = oxNew(ManagerTypes::class); - $sCMPName = $oManagerTypes->isManagerInList($sPotentialManagerName) - ? $sPotentialManagerName - : "NONE"; - - return $sCMPName; + return Registry::get(ViewConfig::class)->d3GetModuleConfigParam('_HAS_STD_MANAGER')?:""; } } \ No newline at end of file diff --git a/Modules/Core/ViewConfig.php b/Modules/Core/ViewConfig.php index 7268380..45bc6b4 100644 --- a/Modules/Core/ViewConfig.php +++ b/Modules/Core/ViewConfig.php @@ -54,7 +54,7 @@ class ViewConfig extends ViewConfig_parent { /** @var ManagerHandler $oManagerHandler */ $oManagerHandler = oxNew(ManagerHandler::class); - $this->sCookieManagerType = $oManagerHandler->getCurrManager(); + $this->sCookieManagerType = $oManagerHandler->getActManager(); } }