diff --git a/app/Http/Controllers/BillController.php b/app/Http/Controllers/BillController.php index 1aeeb7b8bb..0ce8312fcd 100644 --- a/app/Http/Controllers/BillController.php +++ b/app/Http/Controllers/BillController.php @@ -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(); diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig index 0d37fddde7..128476957b 100644 --- a/resources/views/list/bills.twig +++ b/resources/views/list/bills.twig @@ -7,11 +7,9 @@