refactored suggestions

app/Http/ViewComposers/Suggestions.php

@@ -3,13 +3,12 @@
 namespace App\Http\ViewComposers;
 
 use Illuminate\View\View;
-use App\Traits\Modules as RemoteModules;
+use App\Traits\Modules;
 use Route;
-use App\Models\Module\Module;
 
 class Suggestions
 {
-    use RemoteModules;
+    use Modules;
 
     /**
      * Bind data to the view.
@@ -24,30 +23,32 @@ class Suggestions
             return;
         }
 
-        $modules = false;
+        if ((!$user = user()) || $user->cannot('read-modules-home')) {
+            return;
+        }
 
-        if (user()) {
-            $path = Route::current()->uri();
+        if (!$path = Route::current()->uri()) {
+            return;
+        }
 
-            if ($path) {
-                $suggestions = $this->getSuggestions($path);
+        if (!$suggestions = $this->getSuggestions($path)) {
+            return;
+        }
 
-                if ($suggestions) {
-                    $suggestion_modules = $suggestions->modules;
+        $modules = [];
 
-                    foreach ($suggestion_modules as $key => $module) {
-                        $installed = Module::where('company_id', session('company_id'))->where('alias', $module->alias)->first();
-
-                        if ($installed) {
+        foreach ($suggestions->modules as $s_module) {
+            if ($this->moduleIsEnabled($s_module->alias)) {
                 continue;
             }
 
-                        $modules[] = $module;
-                    }
-                }
-            }
+            $modules[] = $s_module;
         }
 
-        $view->with(['suggestion_modules' => $modules]);
+        if (empty($modules)) {
+            return;
+        }
+
+        $view->getFactory()->startPush('header_button_end', view('partials.admin.suggestions', compact('modules')));
     }
 }

app/Traits/Modules.php

@@ -558,7 +558,7 @@ trait Modules
         return true;
     }
 
-    public function moduleEnabled($alias)
+    public function moduleIsEnabled($alias)
     {
         if (!$this->moduleExists($alias)) {
             return false;

resources/views/partials/admin/header.blade.php

@@ -1,4 +1,5 @@
 @stack('header_start')
+
 <div id="header" class="header pb-6">
     <div class="container-fluid content-layout">
         <div class="header-body">
@@ -10,23 +11,16 @@
 
                 <div class="col-xs-12 col-sm-8 col-md-7">
                     <div class="text-right">
+                        @stack('header_button_start')
+
                         @yield('new_button')
 
-                            @permission('read-modules-home')
-                                @if (!empty($suggestion_modules))
-                                    @foreach($suggestion_modules as $s_module)
-                                        <span>
-                                            <a href="{{ url($s_module->action_url) . '?' . http_build_query((array) $s_module->action_parameters) }}" class="btn btn-white btn-sm header-button-bottom" target="{{ $s_module->action_target }}"><span class="fa fa-rocket"></span> &nbsp;{{ $s_module->name }}</a>
-                                        </span>
-                                    @endforeach
-                                @endif
-                            @endpermission
+                        @stack('header_button_end')
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
 
-                            @stack('header_button')
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
 @stack('header_end')

resources/views/partials/admin/suggestions.blade.php

@@ -0,0 +1,6 @@
+
+@foreach($modules as $module)
+    <span>
+        <a href="{{ url($module->action_url) . '?' . http_build_query((array) $module->action_parameters) }}" class="btn btn-white btn-sm header-button-bottom" target="{{ $module->action_target }}"><span class="fa fa-rocket"></span> &nbsp;{{ $module->name }}</a>
+    </span>
+@endforeach