fixed #97

akaunting · Dec 2, 2017 · 1cdbf0a · 1cdbf0a
1 parent 4f61d1c
commit 1cdbf0a
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/app/Http/Controllers/Auth/Users.php b/app/Http/Controllers/Auth/Users.php
@@ -34,7 +34,9 @@ public function index()
      */
     public function create()
     {
-        $roles = Role::all();
+        $roles = Role::all()->reject(function($r) {
+            return $r->hasPermission('read-customer-panel');
+        });
 
         $companies = Auth::user()->companies()->get()->sortBy('name');
         foreach ($companies as $company) {
@@ -84,7 +86,17 @@ public function store(Request $request)
      */
     public function edit(User $user)
     {
-        $roles = Role::all();
+        if ($user->customer) {
+            // Show only roles with customer permission
+            $roles = Role::all()->reject(function($r) {
+                return !$r->hasPermission('read-customer-panel');
+            });
+        } else {
+            // Don't show roles with customer permission
+            $roles = Role::all()->reject(function($r) {
+                return $r->hasPermission('read-customer-panel');
+            });
+        }
 
         $companies = Auth::user()->companies()->get()->sortBy('name');
         foreach ($companies as $company) {