IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Order budgets by name

Browse Source
This commit is contained in:
James Cole 2015-02-27 11:58:49 +01:00
parent c69ef34ac9
commit 9a7ea06d66
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Helpers/Report/ReportQuery.php
View File

@ -110,7 +110,7 @@ class ReportQuery implements ReportQueryInterface
*/ */
public function getAllAccounts(Carbon $start, Carbon $end) public function getAllAccounts(Carbon $start, Carbon $end)
{ {
$set = Auth::user()->accounts()->orderBy('accounts.name','ASC') $set = Auth::user()->accounts()->orderBy('accounts.name', 'ASC')
->accountTypeIn(['Default account', 'Asset account', 'Cash account']) ->accountTypeIn(['Default account', 'Asset account', 'Cash account'])
->leftJoin( ->leftJoin(
'account_meta', function (JoinClause $join) { 'account_meta', function (JoinClause $join) {
@ -162,7 +162,7 @@ class ReportQuery implements ReportQueryInterface
->where('transaction_journals.user_id', Auth::user()->id) ->where('transaction_journals.user_id', Auth::user()->id)
->where('transaction_types.type', 'Withdrawal') ->where('transaction_types.type', 'Withdrawal')
->groupBy('budgets.id') ->groupBy('budgets.id')
->orderBy('budgets.id') ->orderBy('budgets.name', 'ASC')
->get(['budgets.id', 'budgets.name', DB::Raw('SUM(`transactions`.`amount`) as `amount`')]); ->get(['budgets.id', 'budgets.name', DB::Raw('SUM(`transactions`.`amount`) as `amount`')]);
return $set; return $set;