kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2026-01-07 06:31:22 +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

3
app/Repositories/Budget/BudgetRepository.php
View File

@@ -876,6 +876,7 @@ class BudgetRepository implements BudgetRepositoryInterface
$journalQuery = $this->user->transactionjournals()
->expanded()
->before($end)
->sortCorrectly()
->after($start)
->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->whereIn('budget_transaction_journal.budget_id', $budgets->pluck('id')->toArray());
@@ -892,6 +893,7 @@ class BudgetRepository implements BudgetRepositoryInterface
$transactionQuery = $this->user->transactionjournals()
->expanded()
->before($end)
->sortCorrectly()
->after($start)
->leftJoin('transactions as related', 'related.transaction_journal_id', '=', 'transaction_journals.id')
->leftJoin('budget_transaction', 'budget_transaction.transaction_id', '=', 'related.id')
@@ -923,6 +925,7 @@ class BudgetRepository implements BudgetRepositoryInterface
$set = $this->user
->transactionjournals()
->expanded()
->sortCorrectly()
->transactionTypes([TransactionType::WITHDRAWAL])
->leftJoin('budget_transaction_journal', 'budget_transaction_journal.transaction_journal_id', '=', 'transaction_journals.id')
->whereNull('budget_transaction_journal.id')