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

Code for #207

Browse Source
This commit is contained in:
James Cole
2016-03-29 15:55:14 +02:00
parent ef97c3b42d
commit f200086d01
4 changed files with 82 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@
<th>{{ trans('list.name') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.matchesOn') }}</th>
<th colspan="2">{{ trans('list.matchingAmount') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.lastMatch') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.paid_current_period') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.expectedMatch') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.active') }}</th>
<th class="hidden-sm hidden-xs">{{ trans('list.automatch') }}</th>
@@ -36,8 +36,19 @@
{{ entry.amount_max|formatAmount }}
</td>
{% if not entry.lastFoundMatch.isFuture %}
<td class="hidden-sm hidden-xs" data-value="{{ entry.lastFoundMatch.format('U') }}">
<td class="hidden-sm hidden-xs
{% if entry.active %}
{% if entry.paidInPeriod %}
bg-success
{% else %}
bg-danger
{% endif %}
{% endif %}
" data-value="{{ entry.lastFoundMatch.format('U') }}">
{{ entry.lastFoundMatch.formatLocalized(monthAndDayFormat) }}
{% if entry.active and entry.paidInPeriod %}
({{ entry.lastPaidAmount|formatAmountPlain }})
{% endif %}
</td>
{% else %}
<td class="hidden-sm hidden-xs" data-value="0">
@@ -51,7 +62,7 @@
</td>
{% else %}
<td class="hidden-sm hidden-xs" data-value="{{ entry.nextExpectedMatch.format('U') }}">
{{ entry.nextExpectedMatch.formatLocalized(monthAndDayFormat) }}
~ {{ entry.nextExpectedMatch.formatLocalized(monthAndDayFormat) }}
</td>
{% endif %}