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()) {
-            $path = Route::current()->uri();
-
-            if ($path) {
-                $suggestions = $this->getSuggestions($path);
-
-                if ($suggestions) {
-                    $suggestion_modules = $suggestions->modules;
-
-                    foreach ($suggestion_modules as $key => $module) {
-                        $installed = Module::where('company_id', session('company_id'))->where('alias', $module->alias)->first();
-
-                        if ($installed) {
-                            continue;
-                        }
-
-                        $modules[] = $module;
-                    }
-                }
-            }
+        if ((!$user = user()) || $user->cannot('read-modules-home')) {
+            return;
         }
 
-        $view->with(['suggestion_modules' => $modules]);
+        if (!$path = Route::current()->uri()) {
+            return;
+        }
+
+        if (!$suggestions = $this->getSuggestions($path)) {
+            return;
+        }
+
+        $modules = [];
+
+        foreach ($suggestions->modules as $s_module) {
+            if ($this->moduleIsEnabled($s_module->alias)) {
+                continue;
+            }
+
+            $modules[] = $s_module;
+        }
+
+        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;
@@ -674,10 +674,10 @@ trait Modules
 
         if (isset($data['query'])){
             foreach($data['query'] as $key => $value) {
-                $result .= '.' . $key . '.' . $value; 
+                $result .= '.' . $key . '.' . $value;
             }
         }
 
         return $result;
-    } 
+    }
 }