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

Fixed exporting expenses (#877)

Browse Source
This commit is contained in:
Yash Govekar 2020-10-20 00:52:06 +05:30 committed by GitHub
parent 5803487d51
commit c0514b381b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Repositories/ExpenseRepository.php
View File

@ -21,10 +21,10 @@ class ExpenseRepository extends Repository implements CacheableInterface
* Get all of the expenses for a given type, and also * Get all of the expenses for a given type, and also
* include expenses for a given airline ID * include expenses for a given airline ID
* *
* @param $type * @param $type
* @param int $airline_id * @param null $airline_id
* @param string $ref_model * @param null $ref_model
* @param mixed $ref_model_id * @param mixed $ref_model_id
* *
* @return Collection * @return Collection
*/ */

6
app/Services/ImportExport/ExpenseExporter.php
View File

@ -44,6 +44,10 @@ class ExpenseExporter extends ImportExport
$ret['airline'] = $expense->airline->icao; $ret['airline'] = $expense->airline->icao;
} }
if ($ret['flight_type']) {
$ret['flight_type'] = $ret['flight_type'][0];
}
// For the different expense types, instead of exporting // For the different expense types, instead of exporting
// the ID, export a specific column // the ID, export a specific column
if ($expense->ref_model === Expense::class) { if ($expense->ref_model === Expense::class) {
@ -67,6 +71,6 @@ class ExpenseExporter extends ImportExport
// And convert the ref_model into the shorter name // And convert the ref_model into the shorter name
$ret['ref_model'] = str_replace('App\Models\\', '', $ret['ref_model']); $ret['ref_model'] = str_replace('App\Models\\', '', $ret['ref_model']);
return $ret; return array_values($ret);
} }
} }