diff --git a/app/Http/Controllers/Budget/IndexController.php b/app/Http/Controllers/Budget/IndexController.php index 2a51d1588b..2e2cd96ef5 100644 --- a/app/Http/Controllers/Budget/IndexController.php +++ b/app/Http/Controllers/Budget/IndexController.php @@ -86,7 +86,6 @@ class IndexController extends Controller } /** - * TODO the "budgeted" progress bar doesn't update. * Show all budgets. * * @param Request $request @@ -106,7 +105,6 @@ class IndexController extends Controller $budgeted = '0'; $spent = '0'; - // new period stuff: $periodTitle = app('navigation')->periodShow($start, $range); $prevLoop = $this->getPreviousPeriods($start, $range); diff --git a/app/Repositories/Budget/BudgetRepository.php b/app/Repositories/Budget/BudgetRepository.php index 36ba46b896..d8f8a070d3 100644 --- a/app/Repositories/Budget/BudgetRepository.php +++ b/app/Repositories/Budget/BudgetRepository.php @@ -35,6 +35,7 @@ use FireflyIII\Models\RuleTrigger; use FireflyIII\Repositories\Currency\CurrencyRepositoryInterface; use FireflyIII\Services\Internal\Destroy\BudgetDestroyService; use FireflyIII\User; +use http\Exception\RuntimeException; use Illuminate\Database\QueryException; use Illuminate\Support\Collection; use Log; @@ -187,12 +188,12 @@ class BudgetRepository implements BudgetRepositoryInterface */ public function getActiveBudgets(): Collection { + //throw new \RuntimeException; /** @var Collection $set */ $set = $this->user->budgets()->where('active', 1) - ->orderBy('order', 'DESC') + ->orderBy('order', 'ASC') ->orderBy('name', 'ASC') ->get(); - return $set; } @@ -202,7 +203,7 @@ class BudgetRepository implements BudgetRepositoryInterface public function getBudgets(): Collection { /** @var Collection $set */ - $set = $this->user->budgets()->orderBy('order', 'DESC') + $set = $this->user->budgets()->orderBy('order', 'ASC') ->orderBy('name', 'ASC')->get(); return $set; @@ -227,7 +228,7 @@ class BudgetRepository implements BudgetRepositoryInterface { /** @var Collection $set */ $set = $this->user->budgets() - ->orderBy('order', 'DESC') + ->orderBy('order', 'ASC') ->orderBy('name', 'ASC')->where('active', 0)->get(); return $set;