IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-01-03 12:47:17 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed sort commands [skip ci]

Browse Source
This commit is contained in:
James Cole 2015-06-17 06:11:35 +02:00
parent 1bb0508ddf
commit 92d8dde90d
8 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Helpers/Collection/Bill.php
View File

@ -40,7 +40,7 @@ class Bill
*/
public function getBills()
{
$this->bills->sortBy(
$set = $this->bills->sortBy(
function (BillLine $bill) {
$active = intval($bill->getBill()->active) == 0 ? 1 : 0;
$name = $bill->getBill()->name;
@ -50,7 +50,7 @@ class Bill
);
return $this->bills;
return $set;
}
}

4
app/Helpers/Collection/Category.php
View File

@ -54,14 +54,14 @@ class Category
*/
public function getCategories()
{
$this->categories->sortByDesc(
$set = $this->categories->sortByDesc(
function (CategoryModel $category) {
return $category->spent;
}
);
return $this->categories;
return $set;
}
/**

4
app/Helpers/Collection/Expense.php
View File

@ -66,13 +66,13 @@ class Expense
*/
public function getExpenses()
{
$this->expenses->sortByDesc(
$set = $this->expenses->sortByDesc(
function (stdClass $object) {
return $object->amount;
}
);
return $this->expenses;
return $set;
}
/**

4
app/Helpers/Collection/Income.php
View File

@ -67,13 +67,13 @@ class Income
*/
public function getIncomes()
{
$this->incomes->sortByDesc(
$set = $this->incomes->sortByDesc(
function (stdClass $object) {
return $object->amount;
}
);
return $this->incomes;
return $set;
}
/**

2
app/Repositories/Account/AccountRepository.php
View File

@ -68,7 +68,7 @@ class AccountRepository implements AccountRepositoryInterface
['accountmeta' => function (HasMany $query) {
$query->where('name', 'accountRole');
}]
)->accountTypeIn($types)->orderBy('accounts.name', 'ASC')->get(['accounts.*'])->sortBy('name');
)->accountTypeIn($types)->orderBy('accounts.name', 'ASC')->get(['accounts.*']);
return $result;
}

2
app/Repositories/Bill/BillRepository.php
View File

@ -91,7 +91,7 @@ class BillRepository implements BillRepositoryInterface
public function getBills()
{
/** @var Collection $set */
$set = Auth::user()->bills()->orderBy('name', 'ASC')->get()->sortBy('name');
$set = Auth::user()->bills()->orderBy('name', 'ASC')->get();
return $set;
}

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

@ -63,7 +63,6 @@ class BudgetRepository extends ComponentRepository implements BudgetRepositoryIn
public function getActiveBudgets()
{
$budgets = Auth::user()->budgets()->where('active', 1)->get();
$budgets->sortBy('name');
return $budgets;
}

3
app/Support/Search/Search.php
View File

@ -127,8 +127,7 @@ class Search implements SearchInterface
}
);
$filtered = $set->merge($decrypted);
$filtered->sortBy(
$filtered = $filtered->sortBy(
function (TransactionJournal $journal) {
return intval($journal->date->format('U'));
}