From 8d979c53d66d00636b4a70456c62cb2c4adf8f58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=BCneyt=20=C5=9Eent=C3=BCrk?= Date: Tue, 20 Dec 2022 15:15:23 +0300 Subject: [PATCH] moduleIsEnabled function enhancement for roles.. --- app/Traits/Modules.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/app/Traits/Modules.php b/app/Traits/Modules.php index e11a4112f..090b2618d 100644 --- a/app/Traits/Modules.php +++ b/app/Traits/Modules.php @@ -3,6 +3,7 @@ namespace App\Traits; use App\Models\Module\Module; +use App\Traits\Cloud; use App\Traits\SiteApi; use App\Utilities\Date; use App\Utilities\Info; @@ -10,7 +11,7 @@ use Illuminate\Support\Facades\Cache; trait Modules { - use SiteApi; + use Cloud, SiteApi; public function checkToken($apiKey) { @@ -439,6 +440,15 @@ trait Modules return false; } + // Check if module is installed in cloud + if ($this->isCloud()) { + $modules = Cache::get('cloud.companies.' . company_id() . '.modules.installed', []); + + if (in_array($alias, $modules)) { + return true; + } + } + if (module($alias)->disabled()) { return false; }