kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 16:57:09 +00:00
Code Issues Projects Releases Wiki Activity

Various code cleanup.

Browse Source
This commit is contained in:
James Cole
2021-09-18 10:20:19 +02:00
parent 481a6bdd5f
commit 3589c9f60f
137 changed files with 369 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Support/Export/ExportDataGenerator.php
View File

@@ -160,7 +160,7 @@ class ExportDataGenerator
$account->iban,
$account->account_number,
$account->active,
$currency ? $currency->code : null,
$currency?->code,
$repository->getMetaValue($account, 'account_role'),
$repository->getMetaValue($account, 'cc_type'),
$repository->getMetaValue($account, 'cc_monthly_payment_date'),
@@ -391,11 +391,11 @@ class ExportDataGenerator
$piggy->account->name,
$piggy->account->accountType->type,
$piggy->name,
$currency ? $currency->code : null,
$currency?->code,
$piggy->targetamount,
$repetition ? $repetition->currentamount : null,
$piggy->startdate ? $piggy->startdate->format('Y-m-d') : null,
$piggy->targetdate ? $piggy->targetdate->format('Y-m-d') : null,
$repetition?->currentamount,
$piggy->startdate?->format('Y-m-d'),
$piggy->targetdate?->format('Y-m-d'),
$piggy->order,
$piggy->active,
];
@@ -457,9 +457,9 @@ class ExportDataGenerator
$recurrence->transactionType->type,
$recurrence->title,
$recurrence->description,
null !== $recurrence->first_date ? $recurrence->first_date->format('Y-m-d') : null,
$recurrence->repeat_until ? $recurrence->repeat_until->format('Y-m-d') : null,
$recurrence->latest_date ? $recurrence->latest_date->format('Y-m-d') : null,
$recurrence->first_date?->format('Y-m-d'),
$recurrence->repeat_until?->format('Y-m-d'),
$recurrence->latest_date?->format('Y-m-d'),
$recurrence->repetitions,
$recurrence->apply_rules,
$recurrence->active,
@@ -492,7 +492,7 @@ class ExportDataGenerator
null, null, null, null,
// transaction:
$transaction->transactionCurrency->code, $transaction->foreignCurrency ? $transaction->foreignCurrency->code : null,
$transaction->transactionCurrency->code, $transaction->foreignCurrency?->code,
$transaction->sourceAccount->name, $transaction->sourceAccount->accountType->type, $transaction->destinationAccount->name,
$transaction->destinationAccount->accountType->type, $transaction->amount, $transaction->foreign_amount,
$categoryName, $budgetId, $piggyBankId, implode(',', $tags),
@@ -608,7 +608,7 @@ class ExportDataGenerator
$tag->created_at->toAtomString(),
$tag->updated_at->toAtomString(),
$tag->tag,
$tag->date ? $tag->date->format('Y-m-d') : null,
$tag->date?->format('Y-m-d'),
$tag->description,
$tag->latitude,
$tag->longitude,