diff --git a/app/Http/ViewComposers/Suggestions.php b/app/Http/ViewComposers/Suggestions.php index 6060d25f0..e1f29ba3a 100644 --- a/app/Http/ViewComposers/Suggestions.php +++ b/app/Http/ViewComposers/Suggestions.php @@ -5,7 +5,7 @@ namespace App\Http\ViewComposers; use Illuminate\View\View; use App\Traits\Modules; use Route; -use Module; +use App\Models\Module\Module; class Suggestions { @@ -30,7 +30,9 @@ class Suggestions $suggestion_modules = $suggestions->modules; foreach ($suggestion_modules as $key => $module) { - if (Module::findByAlias($module->alias)) { + $installed = Module::where('company_id', '=', session('company_id'))->where('alias', '=', $module->alias)->first(); + + if ($installed) { unset($suggestion_modules[$key]); } } diff --git a/resources/views/partials/admin/content.blade.php b/resources/views/partials/admin/content.blade.php index 83ca278c4..88fe06632 100644 --- a/resources/views/partials/admin/content.blade.php +++ b/resources/views/partials/admin/content.blade.php @@ -5,6 +5,11 @@

@yield('title') @yield('new_button') + @if ($suggestion_modules) + @foreach($suggestion_modules as $suggestion_module) +  {{ $suggestion_module->name }} + @endforeach + @endif