kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-12-12 09:52:20 +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

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

@@ -80,7 +80,7 @@ class BillController extends Controller
{ {
$periods = []; $periods = [];
foreach (config('firefly.bill_periods') as $current) { 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'); $subTitle = trans('firefly.create_new_bill');
@@ -186,6 +186,11 @@ class BillController extends Controller
return $transformer->transform($bill); return $transformer->transform($bill);
} }
); );
$bills = $bills->sortBy(
function (array $bill) {
return (int)!$bill['active'] . strtolower($bill['name']);
}
);
$paginator->setPath(route('bills.index')); $paginator->setPath(route('bills.index'));

34
resources/views/list/bills.twig
View File

@@ -7,11 +7,9 @@
<th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th> <th class="hidden-sm hidden-xs" data-defaultsort="disabled">&nbsp;</th>
<th>{{ trans('list.name') }}</th> <th>{{ trans('list.name') }}</th>
<th data-defaultsign="az" class="hidden-sm hidden-md hidden-xs">{{ trans('list.matchesOn') }}</th> <th data-defaultsign="az" class="hidden-sm hidden-md hidden-xs">{{ trans('list.matchesOn') }}</th>
<th data-defaultsign="_19" colspan="2">{{ trans('list.matchingAmount') }}</th> <th data-defaultsign="_19" style="text-align: right;">{{ trans('list.matchingAmount') }}</th>
<th data-defaultsign="month" class="hidden-sm hidden-xs">{{ trans('list.paid_current_period') }}</th> <th data-defaultsign="month" class="hidden-sm hidden-xs">{{ trans('list.paid_current_period') }}</th>
<th data-defaultsign="month" class="hidden-sm hidden-xs">{{ trans('list.next_expected_match') }}</th> <th data-defaultsign="month" class="hidden-sm hidden-xs">{{ trans('list.next_expected_match') }}</th>
<th class="hidden-sm hidden-xs hidden-md">{{ trans('list.active') }}</th>
<th class="hidden-sm hidden-xs hidden-md">{{ trans('list.automatch') }}</th>
<th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('list.repeat_freq') }}</th> <th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('list.repeat_freq') }}</th>
</tr> </tr>
</thead> </thead>
@@ -34,6 +32,9 @@
class="fa fa-fw fa-trash-o"></i></a></div> class="fa fa-fw fa-trash-o"></i></a></div>
</td> </td>
<td data-value="{{ entry.name }}"> <td data-value="{{ entry.name }}">
{% if not entry.active %}
<i class="fa fa-fw fa-ban"></i>
{% endif %}
<a href="{{ route('bills.show',entry.id) }}" title="{{ entry.name }}">{{ entry.name }}</a> <a href="{{ route('bills.show',entry.id) }}" title="{{ entry.name }}">{{ entry.name }}</a>
{# count attachments #} {# count attachments #}
{% if entry.attachments_count > 0 %} {% if entry.attachments_count > 0 %}
@@ -47,13 +48,8 @@
{% endfor %} {% endfor %}
</td> </td>
<td data-value="{{ entry.amount_min }}" style="text-align: right;"> <td data-value="{{ entry.amount_min }}" style="text-align: right;">
<span style="margin-right:5px;"> <span style="margin-right:5px;" title="{{ entry.amount_min|formatAmountPlain }} - {{ entry.amount_max|formatAmountPlain }}">
{{ entry.amount_min|formatAmount }} ~ {{ ((entry.amount_max+ entry.amount_min)/2)|formatAmount }}
</span>
</td>
<td data-value="{{ entry.amount_max }}" style="text-align: right;">
<span style="margin-right:5px;">
{{ entry.amount_max|formatAmount }}
</span> </span>
</td> </td>
@@ -108,22 +104,8 @@
~ ~
</td> </td>
{% endif %} {% endif %}
<td class="hidden-sm hidden-xs hidden-md" data-value="{{ entry.active }}">
{% if entry.active %}
<i class="fa fa-fw fa-check"></i>
{% else %}
<i class="fa fa-fw fa-ban"></i>
{% endif %}
</td>
<td class="hidden-sm hidden-xs hidden-md" data-value="{{ entry.automatch }}">
{% if entry.automatch %}
<i class="fa fa-fw fa-check"></i>
{% else %}
<i class="fa fa-fw fa-ban"></i>
{% endif %}
</td>
<td class="hidden-sm hidden-xs" data-value="{{ entry.repeat_freq }}{{ entry.skip }}"> <td class="hidden-sm hidden-xs" data-value="{{ entry.repeat_freq }}{{ entry.skip }}">
{{ entry.repeat_freq|_ }} {{ ('repeat_freq_'~entry.repeat_freq)|_ }}
{% if entry.skip > 0 %} {% if entry.skip > 0 %}
{{ 'skips_over'|_ }} {{ entry.skip }} {{ 'skips_over'|_ }} {{ entry.skip }}
{% endif %} {% endif %}
@@ -174,7 +156,7 @@
<td style="text-align:right;" colspan="3">{{ 'expected_total'|_ }} ({{ 'active_bills_only'|_ }})</td> <td style="text-align:right;" colspan="3">{{ 'expected_total'|_ }} ({{ 'active_bills_only'|_ }})</td>
<td style="text-align:right;" colspan="1"> <td style="text-align:right;" colspan="1">
<span style="margin-right:5px;"> <span style="margin-right:5px;">
{{ expected_total|formatAmount }} ~ {{ expected_total|formatAmount }}
</span> </span>
</td> </td>
<td colspan="6">&nbsp;</td> <td colspan="6">&nbsp;</td>