revised notification for new approval system
This commit is contained in:
+11
-1
@@ -9,6 +9,7 @@ use Illuminate\Notifications\Notifiable;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
use Spatie\Permission\Traits\HasRoles;
|
||||
use Spatie\Permission\Models\Role;
|
||||
use App\Models\UserHasCabang;
|
||||
|
||||
class Admin extends Authenticatable
|
||||
{
|
||||
@@ -167,12 +168,21 @@ class Admin extends Authenticatable
|
||||
$role = Role::where('name', $roleName)->first();
|
||||
|
||||
if ($role) {
|
||||
return $role->users()->with('cabang')->get();
|
||||
return $role->users()->with('cabang.cabang')->get();
|
||||
}
|
||||
|
||||
return [];
|
||||
}
|
||||
|
||||
public static function getUserByRoleNameAndCabang($roleName, $cabang_id)
|
||||
{
|
||||
$users = self::getUserByRoleName($roleName);
|
||||
|
||||
return $users->filter(function ($user) use ($cabang_id) {
|
||||
return $user->cabang ? $user->cabang->id == $cabang_id : false;
|
||||
});
|
||||
}
|
||||
|
||||
public static function getUserWhereRoleIsNot($roleName)
|
||||
{
|
||||
return self::whereDoesntHave('roles', function ($query) use ($roleName) {
|
||||
|
||||
Reference in New Issue
Block a user