shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:akaunting/akaunting

Browse Source
This commit is contained in:
cuneytsenturk 2018-11-12 17:10:35 +03:00
commit c120d47d38
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Reports/ExpenseSummary.php
View File

@ -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) {

4
app/Http/Controllers/Reports/IncomeExpenseSummary.php
View File

@ -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++) {

2
app/Http/Controllers/Reports/IncomeSummary.php
View File

@ -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) {

4
app/Http/Controllers/Reports/ProfitLoss.php
View File

@ -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++) {