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

Better formatting for split transactions.

Browse Source
This commit is contained in:
James Cole
2016-05-13 19:40:13 +02:00
parent 5166171e5d
commit 5a6967cefd
6 changed files with 77 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/Repositories/Account/AccountRepository.php
View File

@@ -368,13 +368,10 @@ class AccountRepository implements AccountRepositoryInterface
->sortCorrectly()
->first(['transaction_journals.*']);
if (is_null($journal)) {
$date = new Carbon;
$date->addYear(); // in the future.
} else {
$date = $journal->date;
return new Carbon('1900-01-01');
}
return $date;
return $journal->date;
}
/**
@@ -390,16 +387,15 @@ class AccountRepository implements AccountRepositoryInterface
$journal = TransactionJournal::
leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->where('transactions.account_id', $account->id)
->orderBy('transaction_journals.date', 'DESC')
->orderBy('transaction_journals.date', 'ASC')
->orderBy('transaction_journals.order', 'DESC')
->orderBy('transaction_journals.id', 'ÅSC')
->first(['transaction_journals.*']);
if (is_null($journal)) {
$date = new Carbon;
$date->addYear(); // in the future.
} else {
$date = $journal->date;
return new Carbon('1900-01-01');
}
return $date;
return $journal->date;
}
/**