kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-19 02:45:58 +00:00
Code Issues Projects Releases Wiki Activity

Fix #2633

Browse Source
This commit is contained in:
James Cole
2019-09-21 07:15:32 +02:00
parent 5fb6a6ef5f
commit 750b2360c3
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -220,7 +220,8 @@ class BudgetRepository implements BudgetRepositoryInterface
public function getInactiveBudgets(): Collection public function getInactiveBudgets(): Collection
{ {
/** @var Collection $set */ /** @var Collection $set */
$set = $this->user->budgets()->orderBy('order', 'DESC') $set = $this->user->budgets()
->orderBy('order', 'DESC')
->orderBy('name', 'ASC')->where('active', 0)->get(); ->orderBy('name', 'ASC')->where('active', 0)->get();
return $set; return $set;
@@ -238,6 +239,8 @@ class BudgetRepository implements BudgetRepositoryInterface
if ('' !== $query) { if ('' !== $query) {
$search->where('name', 'LIKE', sprintf('%%%s%%', $query)); $search->where('name', 'LIKE', sprintf('%%%s%%', $query));
} }
$search->orderBy('order', 'DESC')
->orderBy('name', 'ASC')->where('active', 1);
return $search->get(); return $search->get();
} }