* Add flight level field to PIREP field closes #401

* Default value for distance 0 closes #400

* Block airline deletion if assets exist #367

* Formatting

* Move some of the base exception classes

* Fix skin references to use settings table

* Set default for theme name if setting is wrong
This commit is contained in:
Nabeel S
2019-11-19 10:06:07 -05:00
committed by GitHub
parent c643833496
commit 3ec64c989b
39 changed files with 237 additions and 117 deletions

View File

@@ -22,15 +22,13 @@ class Acars extends Response
$res = parent::toArray($request);
// Set these to the response units
if (!empty($res['distance'])) {
$distance = new Distance($res['distance'], config('phpvms.internal_units.distance'));
$res['distance'] = $distance->getResponseUnits();
}
$distance = !empty($res['distance']) ? $res['distance'] : 0;
$distance = new Distance($distance, config('phpvms.internal_units.distance'));
$res['distance'] = $distance->getResponseUnits();
if (!empty($res['fuel'])) {
$fuel = new Fuel($res['fuel'], config('phpvms.internal_units.fuel'));
$res['fuel'] = $fuel->getResponseUnits();
}
$fuel = !empty($res['fuel']) ? $res['fuel'] : 0;
$fuel = new Fuel($fuel, config('phpvms.internal_units.fuel'));
$res['fuel'] = $fuel->getResponseUnits();
return $res;
}