diff --git a/app/Repositories/ExpenseRepository.php b/app/Repositories/ExpenseRepository.php index 62fef43f..c0f0ba16 100644 --- a/app/Repositories/ExpenseRepository.php +++ b/app/Repositories/ExpenseRepository.php @@ -21,10 +21,10 @@ class ExpenseRepository extends Repository implements CacheableInterface * Get all of the expenses for a given type, and also * include expenses for a given airline ID * - * @param $type - * @param int $airline_id - * @param string $ref_model - * @param mixed $ref_model_id + * @param $type + * @param null $airline_id + * @param null $ref_model + * @param mixed $ref_model_id * * @return Collection */ diff --git a/app/Services/ImportExport/ExpenseExporter.php b/app/Services/ImportExport/ExpenseExporter.php index bdb85046..241d33c1 100644 --- a/app/Services/ImportExport/ExpenseExporter.php +++ b/app/Services/ImportExport/ExpenseExporter.php @@ -44,6 +44,10 @@ class ExpenseExporter extends ImportExport $ret['airline'] = $expense->airline->icao; } + if ($ret['flight_type']) { + $ret['flight_type'] = $ret['flight_type'][0]; + } + // For the different expense types, instead of exporting // the ID, export a specific column if ($expense->ref_model === Expense::class) { @@ -67,6 +71,6 @@ class ExpenseExporter extends ImportExport // And convert the ref_model into the shorter name $ret['ref_model'] = str_replace('App\Models\\', '', $ret['ref_model']); - return $ret; + return array_values($ret); } }