added team name into search results

This commit is contained in:
StudioTem committed 2023-04-12 08:49:44 +02:00
1 parent 66e6b84bd9
commit ba5a6a2bd8
1 file changed
+2 -3
+2 -3
View File
@@ -110,11 +110,10 @@ Route::middleware(['auth:sanctum', 'abilities:full-access'])->group(function ()
$projectIDs = Project::where('name', 'like', '%' . $search . '%')->orWhere('code', 'like', '%' . $search . '%')->get()->pluck('id'); $projectIDs = Project::where('name', 'like', '%' . $search . '%')->orWhere('code', 'like', '%' . $search . '%')->get()->pluck('id');
$userIDs = User::where('firstname', 'like', '%' . $search . '%')->orWhere('lastname', 'like', '%' . $search . '%')->get()->pluck('id'); $userIDs = User::where('firstname', 'like', '%' . $search . '%')->orWhere('lastname', 'like', '%' . $search . '%')->get()->pluck('id');
$teams = Team::whereHas('users', function($q) use($userIDs) { $teams = Team::whereHas('users', function($q) use($userIDs) {
$q->whereIn('user_id', $userIDs); $q->whereIn('user_id', $userIDs);
})->get(); })->orWhere('name', 'like', '%' . $search . '%' )->get();
$mastertasks = MasterTask::with('subtasks')->where('title', 'like', '%' . $search . '%')->orWhereIn('project_id', $projectIDs)->orWhereIn('team_id', $teams->pluck('id'))->get(); $mastertasks = MasterTask::with('subtasks')->where('title', 'like', '%' . $search . '%')->orWhereIn('project_id', $projectIDs)->orWhereIn('team_id', $teams->pluck('id'))->get();