From 023313c681aeda7ee45c14dacfc584ce4a4881ff Mon Sep 17 00:00:00 2001 From: "B.Fatih KOZ" Date: Mon, 10 Jan 2022 21:29:30 +0300 Subject: [PATCH] Check settings and filter aircraft list if needed (#1377) Check settings and filter aircraft list if needed. --- app/Http/Controllers/Frontend/PirepController.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Frontend/PirepController.php b/app/Http/Controllers/Frontend/PirepController.php index 9240c70a..44874bc5 100644 --- a/app/Http/Controllers/Frontend/PirepController.php +++ b/app/Http/Controllers/Frontend/PirepController.php @@ -91,8 +91,12 @@ class PirepController extends Controller */ public function aircraftList($add_blank = false) { + $user = Auth::user(); + $user_loc = filled($user->curr_airport_id) ? $user->curr_airport_id : $user->home_airport_id; + $location_check = setting('pireps.only_aircraft_at_dpt_airport', false); + $aircraft = []; - $subfleets = $this->userSvc->getAllowableSubfleets(Auth::user()); + $subfleets = $this->userSvc->getAllowableSubfleets($user); if ($add_blank) { $aircraft[''] = ''; @@ -100,7 +104,9 @@ class PirepController extends Controller foreach ($subfleets as $subfleet) { $tmp = []; - foreach ($subfleet->aircraft as $ac) { + foreach ($subfleet->aircraft->when($location_check, function ($query) use ($user_loc) { + return $query->where('airport_id', $user_loc); + }) as $ac) { $tmp[$ac->id] = $ac['name'].' - '.$ac['registration']; }