Fixed exporting expenses (#877)

2020-10-20 00:52:06 +05:30
parent 5803487d51
commit c0514b381b
2 changed files with 9 additions and 5 deletions
--- 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);
    }
 }