From 7e1003aef0ebb28807e4ca4d157759896b2fc42a Mon Sep 17 00:00:00 2001 From: "John.R" Date: Fri, 1 Dec 2023 10:53:42 +0100 Subject: [PATCH] fix: bug with presenter --- ps_eventbus.php | 4 ++-- src/Controller/Admin/PsEventbusResolverController.php | 2 +- src/Helper/ModuleHelper.php | 6 +++--- src/Service/PresenterService.php | 11 +++++++++++ 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/ps_eventbus.php b/ps_eventbus.php index 4f46e245..8f95cee9 100644 --- a/ps_eventbus.php +++ b/ps_eventbus.php @@ -41,7 +41,7 @@ class Ps_eventbus extends Module /** * @var string */ - const VERSION = '0.0.0'; + const VERSION = '2.3.2'; /** * @var array @@ -144,7 +144,7 @@ public function __construct() $this->author = 'PrestaShop'; $this->need_instance = 0; $this->bootstrap = true; - $this->version = '0.0.0'; + $this->version = '2.3.2'; $this->module_key = '7d76e08a13331c6c393755886ec8d5ce'; parent::__construct(); diff --git a/src/Controller/Admin/PsEventbusResolverController.php b/src/Controller/Admin/PsEventbusResolverController.php index 5701d3ea..14ca5de3 100644 --- a/src/Controller/Admin/PsEventbusResolverController.php +++ b/src/Controller/Admin/PsEventbusResolverController.php @@ -29,7 +29,7 @@ use Prestashop\ModuleLibMboInstaller\Installer as MBOInstaller; use Symfony\Component\HttpFoundation\JsonResponse; -class MetricsResolverController extends FrameworkBundleAdminController +class PsEventbusResolverController extends FrameworkBundleAdminController { /** @var Ps_eventbus */ private $module; diff --git a/src/Helper/ModuleHelper.php b/src/Helper/ModuleHelper.php index 029888b7..e7f8f515 100644 --- a/src/Helper/ModuleHelper.php +++ b/src/Helper/ModuleHelper.php @@ -58,7 +58,7 @@ public function getInstallLink(string $moduleName) return ''; } /** @var Router $router * */ - $router = $this->module->getService('router'); + $router = $this->module->get('router'); if ($moduleName === 'ps_mbo') { return substr(\Tools::getShopDomainSsl(true) . __PS_BASE_URI__, 0, -1) . @@ -88,7 +88,7 @@ public function getEnableLink(string $moduleName) } /** @var Router $router * */ - $router = $this->module->getService('router'); + $router = $this->module->get('router'); return substr(\Tools::getShopDomainSsl(true) . __PS_BASE_URI__, 0, -1) . $router->generate('admin_module_manage_action', [ @@ -107,7 +107,7 @@ public function getEnableLink(string $moduleName) public function getUpdateLink(string $moduleName) { /** @var Router $router * */ - $router = $this->module->getService('router'); + $router = $this->module->get('router'); return substr(\Tools::getShopDomainSsl(true) . __PS_BASE_URI__, 0, -1) . $router->generate('admin_module_manage_action', [ diff --git a/src/Service/PresenterService.php b/src/Service/PresenterService.php index a7cb3bf6..52d301dc 100644 --- a/src/Service/PresenterService.php +++ b/src/Service/PresenterService.php @@ -96,6 +96,17 @@ public function expose(\ModuleCore $module, $requiredConsents = [], $optionalCon throw new \PrestaShopException('No language context'); } + $moduleInformations = [ + 'ps_eventbus' => $moduleHelper->buildModuleInformations( + 'ps_eventbus' + ), + 'ps_mbo' => $moduleHelper->buildModuleInformations( + 'ps_mbo' + ), + ]; + dump($moduleInformations); + die; + return [ 'jwt' => $this->psAccountsService->getOrRefreshToken(), 'requiredConsents' => $requiredConsents,