kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-15 08:35:00 +00:00
Code Issues Projects Releases Wiki Activity

Clean overview for bills.

Browse Source
This commit is contained in:
James Cole
2018-04-07 05:58:59 +02:00
parent 6583d0f69b
commit b1ad0668cc
2 changed files with 15 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Http/Controllers/BillController.php
View File

@@ -80,7 +80,7 @@ class BillController extends Controller
{
$periods = [];
foreach (config('firefly.bill_periods') as $current) {
$periods[$current] = trans('firefly.' . $current);
$periods[$current] = strtolower((string)trans('firefly.repeat_freq_' . $current));
}
$subTitle = trans('firefly.create_new_bill');
@@ -186,6 +186,11 @@ class BillController extends Controller
return $transformer->transform($bill);
}
);
$bills = $bills->sortBy(
function (array $bill) {
return (int)!$bill['active'] . strtolower($bill['name']);
}
);
$paginator->setPath(route('bills.index'));
@@ -238,7 +243,7 @@ class BillController extends Controller
$overallAverage = $repository->getOverallAverage($bill);
$manager = new Manager();
$manager->setSerializer(new DataArraySerializer());
$manager->parseIncludes(['attachments','notes']);
$manager->parseIncludes(['attachments', 'notes']);
// Make a resource out of the data and
$parameters = new ParameterBag();