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

Fix airport field row being inserted and check against airport ID

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-03-23 12:27:28 -05:00
parent c6f423087d
commit 1161106d9c
3 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Models/Flight.php
+3
View File
@@ -20,6 +20,9 @@ use PhpUnitsOfMeasure\Exception\NonStringUnitName;
* @property Collection fares * @property Collection fares
* @property Collection subfleets * @property Collection subfleets
* @property integer days * @property integer days
* @property string dpt_airport_id
* @property string arr_airport_id
* @property string alt_airport_id
*/ */
class Flight extends Model class Flight extends Model
{ {
app/Services/ImportExport/FlightExporter.php
+6
View File
@@ -40,6 +40,12 @@ class FlightExporter extends ImportExport
$ret['airline'] = $ret['airline']->icao; $ret['airline'] = $ret['airline']->icao;
$ret['distance'] = $ret['distance']->toNumber(); $ret['distance'] = $ret['distance']->toNumber();
$ret['dpt_airport'] = $flight->dpt_airport_id;
$ret['arr_airport'] = $flight->arr_airport_id;
if($flight->alt_airport) {
$ret['alt_airport'] = $flight->alt_airport_id;
}
$ret['days'] = $this->getDays($flight); $ret['days'] = $this->getDays($flight);
$ret['flight_type'] = FlightType::convertToCode($ret['flight_type']); $ret['flight_type'] = FlightType::convertToCode($ret['flight_type']);
app/Services/ImportExport/FlightImporter.php
+2 -2
View File
@@ -169,8 +169,8 @@ class FlightImporter extends ImportExport
protected function processAirport($airport) protected function processAirport($airport)
{ {
return Airport::firstOrCreate([ return Airport::firstOrCreate([
'icao' => $airport, 'id' => $airport,
], ['name' => $airport]); ], ['icao' => $airport, 'name' => $airport]);
} }
/** /**