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 some lists [skip ci]

Browse Source
This commit is contained in:
James Cole
2015-07-10 07:39:59 +02:00
parent b6960fb0e5
commit 308da6dc6e
6 changed files with 100 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,7 +68,7 @@ class AccountRepository implements AccountRepositoryInterface
['accountmeta' => function (HasMany $query) {
$query->where('name', 'accountRole');
}]
)->accountTypeIn($types)->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
)->accountTypeIn($types)->get(['accounts.*']);
$result = $result->sortBy(
function (Account $account) {
@@ -210,9 +210,9 @@ class AccountRepository implements AccountRepositoryInterface
{
$lastTransaction = $account->transactions()->leftJoin(
'transaction_journals', 'transactions.transaction_journal_id', '=', 'transaction_journals.id'
)->orderBy('transaction_journals.date', 'DESC')->first(['transactions.*', 'transaction_journals.date']);
)->orderBy('transaction_journals.date', 'DESC')->first(['transactions.account_id', 'transaction_journals.date']);
if ($lastTransaction) {
return $lastTransaction->transactionjournal->date;
return $lastTransaction->date;
}
return null;