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

Fix #2467

Browse Source
This commit is contained in:
James Cole
2019-08-23 06:40:48 +02:00
parent 3d444eb833
commit a1f57a0949
6 changed files with 140 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
resources/views/v1/list/bills.twig
View File

@@ -9,7 +9,7 @@
<th data-defaultsort="disabled" class="hidden-sm hidden-md hidden-xs">{{ trans('list.linked_to_rules') }}</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.next_expected_match') }}</th>
<th data-defaultsign="month" data-dateformat="{{ madMomentJS }}" class="hidden-sm hidden-xs">{{ trans('list.next_expected_match') }}</th>
<th data-defaultsign="az" class="hidden-sm hidden-xs">{{ trans('list.repeat_freq') }}</th>
</tr>
</thead>
@@ -26,7 +26,7 @@
{% set sum_max = sum_max + entry.amount_max %}
{% set expected_total = expected_total + ((entry.amount_min + entry.amount_max) / 2) %}
{% endif %}
<tr>
<tr{% if not entry.active %} data-disablesort="true"{% endif %}>
<td class="hidden-sm hidden-xs">
<div class="btn-group btn-group-xs edit_tr_buttons"><a href="{{ route('bills.edit',entry.id) }}" class="btn btn-default btn-xs"><i
class="fa fa-fw fa-pencil"></i></a><a href="{{ route('bills.delete',entry.id) }}" class="btn btn-danger btn-xs"><i
@@ -69,11 +69,11 @@
bill is active.
#}
{% if entry.paid_dates|length == 0 and entry.pay_dates|length == 0 and entry.active %}
<td class="paid_in_period text-muted" data-value="0001-00-00 00-00-00">
<td class="paid_in_period text-muted" data-value="0001-01-01">
{{ trans('components.not_expected_period') }}
</td>
<td class="expected_in_period hidden-sm hidden-xs" data-value="{{ entry.next_expected_match }}">
{{ formatDate(entry.next_expected_match, monthAndDayFormat) }}
{{ formatDate(entry.next_expected_match, monthAndDayFormat) }}
</td>
{% endif %}
@@ -83,11 +83,11 @@
bill is active
#}
{% if entry.paid_dates|length == 0 and entry.pay_dates|length > 0 and entry.active %}
<td class="paid_in_period text-danger" data-value="0002-00-00 00-00-00">
<td class="paid_in_period text-danger" data-value="0002-00-00">
{{ trans('components.not_or_not_yet') }}
</td>
<td class="expected_in_period hidden-sm hidden-xs" data-value="{{ entry.next_expected_match }}">
{{ formatDate(entry.next_expected_match, monthAndDayFormat) }}
{{ formatDate(entry.next_expected_match, monthAndDayFormat) }}
</td>
{% endif %}
@@ -105,17 +105,15 @@
{% endfor %}
</td>
<td class="expected_in_period hidden-sm hidden-xs" data-value="{{ entry.next_expected_match }}">
{{ formatDate(entry.next_expected_match, monthAndDayFormat) }}
{{ formatDate(entry.next_expected_match, monthAndDayFormat) }}
</td>
{% endif %}
{# bill is not active #}
{% if not entry.active %}
<td class="paid_in_period text-muted" data-value="0000-00-00 00-00-00">
~
</td>
<td class="expected_in_period text-muted hidden-sm hidden-xs" data-value="0">
<td class="paid_in_period text-muted" data-value="3000-01-01">
~
</td>
<td class="expected_in_period text-muted hidden-sm hidden-xs" data-value="3001-01-01">~</td>
{% endif %}
<td class="hidden-sm hidden-xs" data-value="{{ entry.repeat_freq }}{{ entry.skip }}">
{{ ('repeat_freq_'~entry.repeat_freq)|_ }}