FGFS-4.1/phpvms
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix PIREP field and non-existant airport errors when editing PIREPs

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-07-12 21:20:10 -05:00
parent 85615300e0
commit 9cc640b866
18 changed files with 138 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/Admin/PirepController.php
View File

@@ -298,7 +298,8 @@ class PirepController extends Controller
# set the custom fields
foreach ($pirep->fields as $field) {
$pirep->{$field->slug} = $field->value;
$field_name = 'field_'.$field->slug;
$pirep->{$field_name} = $field->value;
}
# set the fares

3
app/Http/Controllers/Api/PirepController.php
View File

@@ -20,6 +20,7 @@ use App\Http\Resources\PirepFieldCollection;
use App\Interfaces\Controller;
use App\Models\Acars;
use App\Models\Enums\AcarsType;
use App\Models\Enums\PirepFieldSource;
use App\Models\Enums\PirepSource;
use App\Models\Enums\PirepState;
use App\Models\Enums\PirepStatus;
@@ -122,7 +123,7 @@ class PirepController extends Controller
$pirep_fields[] = [
'name' => $field_name,
'value' => $field_value,
'source' => $pirep->source,
'source' => PirepFieldSource::ACARS,
];
}

6
app/Http/Controllers/Frontend/PirepController.php
View File

@@ -332,6 +332,9 @@ class PirepController extends Controller
return redirect(route('frontend.pireps.index'));
}
# Eager load the subfleet and fares under it
$pirep->aircraft->load('subfleet.fares');
$time = new Time($pirep->flight_time);
$pirep->hours = $time->hours;
$pirep->minutes = $time->minutes;
@@ -342,7 +345,8 @@ class PirepController extends Controller
$field->slug = str_slug($field->name);
}
$pirep->{$field->slug} = $field->value;
$field_name = 'field_'.$field->slug;
$pirep->{$field_name} = $field->value;
}
# set the fares