From fd9dcfc05db6ca92a51aa45556b4240b817c95df Mon Sep 17 00:00:00 2001
From: drkthunder02 <mancuso.christopher@gmail.com>
Date: Wed, 5 Dec 2018 14:46:44 -0600
Subject: [PATCH] user model

---
 app/User.php | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/app/User.php b/app/User.php
index 9e541df90..6d1b67dae 100644
--- a/app/User.php
+++ b/app/User.php
@@ -64,7 +64,9 @@ class User extends Authenticatable
     }
 
     public function hasPermission($permission) {
-        if(UserPermission::where(['character_id' => $this->character_id, 'permission' => $permission])->get(['permission'])) {
+        $found == DB::table('user_permissions')->where(['character_id' => $this->character_id, 'permission' => $permission])->get(['permission']);
+        dd($found);
+        if(UserPermission::where(['character_id' => $this->character_id, 'permission' => $permission])->get()) {
             return true;
         } else {
             return false;
@@ -78,19 +80,9 @@ class User extends Authenticatable
         }
 
         if(UserRole::where(['character_id' => $this->character_id, 'role' => $role])->get()) {
-            //Check for inverse permissions
-            if($permission === true) {
-                return true;
-            } else {
-                return false;
-            }
+            return true;
         } else {
-            //Check for inverse permissions
-            if($permission === true) {
-                return true;
-            } else {
-                return false;
-            }
+            return false;
         }
     }