Laravel 9 Update (#1413)

Update to Laravel 9 and PHP 8+

Co-authored-by: B.Fatih KOZ <fatih.koz@gmail.com>
This commit is contained in:
Nabeel S
2022-03-14 11:45:18 -04:00
committed by GitHub
parent 00bf18c225
commit 12848091a2
340 changed files with 6130 additions and 4502 deletions

View File

@@ -35,17 +35,13 @@ class ExpenseExporter extends ImportExport
$ret = [];
foreach (self::$columns as $col) {
$ret[$col] = $expense->{$col};
}
// Special fields
if ($ret['airline']) {
$ret['airline'] = $expense->airline->icao;
}
if ($ret['flight_type']) {
$ret['flight_type'] = $ret['flight_type'][0];
if ($col === 'airline') {
$ret['airline'] = optional($expense->airline)->icao;
} elseif ($col === 'flight_type') {
$ret['flight_type'] = implode(',', $expense->flight_type);
} else {
$ret[$col] = $expense->{$col};
}
}
// For the different expense types, instead of exporting