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

Fix airline mapping for aircraft #628 (#633)

Browse Source
This commit is contained in:
Nabeel S
2020-03-09 15:06:36 -04:00
committed by GitHub
parent 412919fe21
commit 2a03d53b3f
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Models/Observers/AircraftObserver.php
View File

@@ -5,9 +5,6 @@ namespace App\Models\Observers;
use App\Models\Aircraft; use App\Models\Aircraft;
use App\Support\ICAO; use App\Support\ICAO;
/**
* Class AircraftObserver
*/
class AircraftObserver class AircraftObserver
{ {
/** /**
@@ -17,6 +14,10 @@ class AircraftObserver
*/ */
public function creating(Aircraft $aircraft): void public function creating(Aircraft $aircraft): void
{ {
if (!empty($aircraft->airport_id)) {
$aircraft->airport_id = strtoupper($aircraft->airport_id);
}
if (empty($aircraft->hex_code)) { if (empty($aircraft->hex_code)) {
$aircraft->hex_code = ICAO::createHexCode(); $aircraft->hex_code = ICAO::createHexCode();
} }

2
modules/Importer/Services/Importers/AircraftImporter.php
View File

@@ -39,7 +39,7 @@ class AircraftImporter extends BaseImporter
foreach ($rows as $row) { foreach ($rows as $row) {
$airline_id = null; $airline_id = null;
if (!empty($row->airline)) { if (!empty($row->airline)) {
$airline_id = $this->idMapper->getMapping('airlines', $row->airline_id); $airline_id = $this->idMapper->getMapping('airlines', $row->airline);
} }
$subfleet = $this->getSubfleet($row->icao, $airline_id); $subfleet = $this->getSubfleet($row->icao, $airline_id);