kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-29 18:20:01 +00:00
Code Issues Projects Releases Wiki Activity

Reinstate sorting.

Browse Source
This commit is contained in:
James Cole
2016-05-11 08:10:05 +02:00
parent 934656c954
commit 9f8faf15f1
6 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -180,6 +180,7 @@ class AccountRepository implements AccountRepositoryInterface
$ids = $accounts->pluck('id')->toArray();
$journals = $this->user->transactionjournals()
->expanded()
->sortCorrectly()
->before($end)
->where('destination_account.id', $account->id)
->whereIn('source_account.id', $ids)
@@ -239,7 +240,7 @@ class AccountRepository implements AccountRepositoryInterface
->sortCorrectly()
->before($end)
->after($start)
->take(10);
->take(10);
// expand query:
$query->leftJoin(
@@ -269,6 +270,7 @@ class AccountRepository implements AccountRepositoryInterface
$ids = $accounts->pluck('id')->toArray();
$journals = $this->user->transactionjournals()
->expanded()
->sortCorrectly()
->before($end)
->where('source_account.id', $account->id)
->whereIn('destination_account.id', $ids)
@@ -290,6 +292,7 @@ class AccountRepository implements AccountRepositoryInterface
$offset = ($page - 1) * $pageSize;
$query = $this->user
->transactionJournals()
->sortCorrectly()
->expanded();
// expand query:
@@ -321,6 +324,7 @@ class AccountRepository implements AccountRepositoryInterface
$query = $this->user
->transactionJournals()
->expanded()
->sortCorrectly()
->where(
function (Builder $q) use ($account) {
$q->where('destination_account.id', $account->id);