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

Clean up method relying on old transaction journal code.

Browse Source
This commit is contained in:
James Cole
2016-03-02 20:11:28 +01:00
parent 5b949d6e00
commit 7234f011ec
19 changed files with 156 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Export/Entry.php
View File

@@ -80,7 +80,7 @@ class Entry
$entry = new self;
$entry->setDescription($journal->description);
$entry->setDate($journal->date->format('Y-m-d'));
$entry->setAmount($journal->amount); // TODO TransactionJournal cannot deliver "amount".
$entry->setAmount(TransactionJournal::amount($journal));
/** @var Budget $budget */
$budget = $journal->budgets->first();
@@ -102,14 +102,14 @@ class Entry
}
/** @var Account $sourceAccount */
$sourceAccount = $journal->source_account; // TODO TransactionJournal cannot deliver "source_account"
$sourceAccount = TransactionJournal::sourceAccount($journal);
$entry->setFromAccountId($sourceAccount->id);
$entry->setFromAccountName($sourceAccount->name);
$entry->setFromAccountIban($sourceAccount->iban);
$entry->setFromAccountType($sourceAccount->accountType->type);
/** @var Account $destination */
$destination = $journal->destination_account; // TODO TransactionJournal cannot deliver "destination_account"
$destination = TransactionJournal::destinationAccount($journal);
$entry->setToAccountId($destination->id);
$entry->setToAccountName($destination->name);
$entry->setToAccountIban($destination->iban);