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

Refactor all of the unit conversion code

Browse Source
This commit is contained in:
Nabeel Shahzad
2018-04-07 20:52:12 -05:00
parent eae5989845
commit c102a0d858
25 changed files with 365 additions and 362 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Resources/Flight.php
View File

@@ -27,7 +27,7 @@ class Flight extends Resource
// Return multiple measures so the client can pick what they want
if ($this->distance instanceof Distance) {
$flight['distance'] = $this->distance->toObject();
$flight['distance'] = $this->distance->units;
}
$flight['airline'] = new Airline($this->airline);

1
app/Http/Resources/JournalTransaction.php
View File

@@ -9,7 +9,6 @@ class JournalTransaction extends Resource
public function toArray($request)
{
$transaction = parent::toArray($request);
return $transaction;
}
}

6
app/Http/Resources/Pirep.php
View File

@@ -19,15 +19,15 @@ class Pirep extends Resource
$pirep = parent::toArray($request);
if ($this->distance instanceof Distance) {
$pirep['distance'] = $this->distance->toObject();
$pirep['distance'] = $this->distance->units;
}
if ($this->fuel_used instanceof Fuel) {
$pirep['fuel_used'] = $this->fuel_used->toObject();
$pirep['fuel_used'] = $this->fuel_used->units;
}
if ($this->planned_distance instanceof Distance) {
$pirep['planned_distance'] = $this->planned_distance->toObject();
$pirep['planned_distance'] = $this->planned_distance->units;
}
/*