From 3959fe2f6124bbe81e9eb95cbfd8a9923b51b8ba Mon Sep 17 00:00:00 2001 From: denisdulici Date: Mon, 12 Nov 2018 15:09:46 +0300 Subject: [PATCH] fixed #621 --- app/Http/Controllers/Reports/ExpenseSummary.php | 2 +- app/Http/Controllers/Reports/IncomeExpenseSummary.php | 4 ++-- app/Http/Controllers/Reports/IncomeSummary.php | 2 +- app/Http/Controllers/Reports/ProfitLoss.php | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/Reports/ExpenseSummary.php b/app/Http/Controllers/Reports/ExpenseSummary.php index 726daaccf..5d2a00c8c 100644 --- a/app/Http/Controllers/Reports/ExpenseSummary.php +++ b/app/Http/Controllers/Reports/ExpenseSummary.php @@ -27,7 +27,7 @@ class ExpenseSummary extends Controller $status = request('status'); $year = request('year', Date::now()->year); - $categories = Category::enabled()->type('expense')->pluck('name', 'id')->toArray(); + $categories = Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id')->toArray(); if ($categories_filter = request('categories')) { $cats = collect($categories)->filter(function ($value, $key) use ($categories_filter) { diff --git a/app/Http/Controllers/Reports/IncomeExpenseSummary.php b/app/Http/Controllers/Reports/IncomeExpenseSummary.php index 2a9083b40..f843b9cf2 100644 --- a/app/Http/Controllers/Reports/IncomeExpenseSummary.php +++ b/app/Http/Controllers/Reports/IncomeExpenseSummary.php @@ -34,11 +34,11 @@ class IncomeExpenseSummary extends Controller $income_categories = Category::enabled()->type('income')->when($categories_filter, function ($query) use ($categories_filter) { return $query->whereIn('id', $categories_filter); - })->pluck('name', 'id')->toArray(); + })->orderBy('name')->pluck('name', 'id')->toArray(); $expense_categories = Category::enabled()->type('expense')->when($categories_filter, function ($query) use ($categories_filter) { return $query->whereIn('id', $categories_filter); - })->pluck('name', 'id')->toArray(); + })->orderBy('name')->pluck('name', 'id')->toArray(); // Dates for ($j = 1; $j <= 12; $j++) { diff --git a/app/Http/Controllers/Reports/IncomeSummary.php b/app/Http/Controllers/Reports/IncomeSummary.php index 7caddad55..003442665 100644 --- a/app/Http/Controllers/Reports/IncomeSummary.php +++ b/app/Http/Controllers/Reports/IncomeSummary.php @@ -27,7 +27,7 @@ class IncomeSummary extends Controller $status = request('status'); $year = request('year', Date::now()->year); - $categories = Category::enabled()->type('income')->pluck('name', 'id')->toArray(); + $categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id')->toArray(); if ($categories_filter = request('categories')) { $cats = collect($categories)->filter(function ($value, $key) use ($categories_filter) { diff --git a/app/Http/Controllers/Reports/ProfitLoss.php b/app/Http/Controllers/Reports/ProfitLoss.php index 6b07dff0c..9b4d6e62b 100644 --- a/app/Http/Controllers/Reports/ProfitLoss.php +++ b/app/Http/Controllers/Reports/ProfitLoss.php @@ -27,9 +27,9 @@ class ProfitLoss extends Controller $status = request('status'); $year = request('year', Date::now()->year); - $income_categories = Category::enabled()->type('income')->pluck('name', 'id')->toArray(); + $income_categories = Category::enabled()->type('income')->orderBy('name')->pluck('name', 'id')->toArray(); - $expense_categories = Category::enabled()->type('expense')->pluck('name', 'id')->toArray(); + $expense_categories = Category::enabled()->type('expense')->orderBy('name')->pluck('name', 'id')->toArray(); // Dates for ($j = 1; $j <= 12; $j++) {