feat: enable ps_eventbus if not

PrestaShopCorp · Sep 5, 2024 · faa43b4 · faa43b4
1 parent 364c572
commit faa43b4
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/src/Controller/Admin/ModuleCatalogController.php b/src/Controller/Admin/ModuleCatalogController.php
@@ -69,7 +69,7 @@ public function indexAction(): Response
         try {
             $accountsFacade = $this->get('mbo.ps_accounts.facade');
             $accountsService = $accountsFacade->getPsAccountsService();
-            if ($this->ensurePsAccountIsEnabled()) $this->get('mbo.ps_eventbus.installer')->install();  
+            if ($this->ensurePsAccountIsEnabled()) $this->ensurePsEventbusEnabled();
         } catch (\PrestaShop\PsAccountsInstaller\Installer\Exception\InstallerException $e) {
             $accountsInstaller = $this->get('mbo.ps_accounts.installer');
             // Seems the module is not here, try to install it
@@ -143,4 +143,12 @@ private function ensurePsAccountIsEnabled(): bool
         $moduleManager = $this->get('prestashop.module.manager');
         return $moduleManager->enable($accountsInstaller->getModuleName());
     }
+
+    private function ensurePsEventbusEnabled()
+    {
+        $installer = $this->get('mbo.ps_eventbus.installer');
+        if ($installer->install()) {
+            $installer->enable();
+        }
+    }
 }
diff --git a/src/Service/ModuleInstaller.php b/src/Service/ModuleInstaller.php
@@ -59,6 +59,18 @@ public function install() {
         return $this->moduleManager->install($this->moduleName);
     }
 
+    /**
+     * @return bool
+     */
+    public function enable()
+    {
+        if (!$this->moduleManager->isEnabled($this->moduleName)) {
+            return $this->moduleManager->enable($this->moduleName);
+        }
+
+        return true;
+    }
+
     /**
      * @return bool
      */

diff --git a/src/Traits/Hooks/UseDashboardZoneOne.php b/src/Traits/Hooks/UseDashboardZoneOne.php
@@ -93,7 +93,7 @@ protected function loadPsAccounts(): string
         try {
             $accountsFacade = $this->get('mbo.ps_accounts.facade');
             $accountsService = $accountsFacade->getPsAccountsService();
-            if ($this->ensurePsAccountIsEnabled()) $this->get('mbo.ps_eventbus.installer')->install();
+            if ($this->ensurePsAccountIsEnabled()) $this->ensurePsEventbusEnabled();
         } catch (\PrestaShop\PsAccountsInstaller\Installer\Exception\InstallerException $e) {
             $accountsInstaller = $this->get('mbo.ps_accounts.installer');
             // Seems the module is not here, try to install it
@@ -141,4 +141,11 @@ private function ensurePsAccountIsEnabled(): bool {
         return $moduleManager->enable($accountsInstaller->getModuleName());
     }
 
+    private function ensurePsEventbusEnabled()
+    {
+        $installer = $this->get('mbo.ps_eventbus.installer');
+        if ($installer->install()) {
+            $installer->enable();
+        }
+    }
 }