Merge pull request #115 from ivan-cc/master

Fix pivot tables #2

src/Traits/HasRoleAndPermission.php

@@ -193,6 +193,7 @@ public function level()
     public function rolePermissions()
     {
         $permissionModel = app(config('roles.models.permission'));
+        $roleTable = config('roles.rolesTable');
 
         if (!$permissionModel instanceof Model) {
             throw new InvalidArgumentException('[roles.models.permission] must be an instance of \Illuminate\Database\Eloquent\Model');
@@ -201,9 +202,9 @@ public function rolePermissions()
         return $permissionModel
             ::select(['permissions.*', 'permission_role.created_at as pivot_created_at', 'permission_role.updated_at as pivot_updated_at'])
             ->join('permission_role', 'permission_role.permission_id', '=', 'permissions.id')
-            ->join('roles', 'roles.id', '=', 'permission_role.role_id')
-            ->whereIn('roles.id', $this->getRoles()->pluck('id')->toArray())
-            ->orWhere('roles.level', '<', $this->level())
+            ->join($roleTable, $roleTable . '.id', '=', 'permission_role.role_id')
+            ->whereIn($roleTable . '.id', $this->getRoles()->pluck('id')->toArray())
+            ->orWhere($roleTable . '.level', '<', $this->level())
             ->groupBy(['permissions.id', 'permissions.name', 'permissions.slug', 'permissions.description', 'permissions.model', 'permissions.created_at', 'permissions.updated_at', 'permissions.deleted_at', 'pivot_created_at', 'pivot_updated_at']);
     }