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

Add "not expected this period" message, fix https://github.com/firefly-iii/firefly-iii/issues/9084

Browse Source
This commit is contained in:
James Cole
2024-07-26 12:53:13 +02:00
parent 077f3e095b
commit de3dcc3fc2
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -98,6 +98,7 @@
<!-- {{ trans('firefly.bill_expected_date', {date: entry.next_expected_match_diff }) }} --> <!-- {{ trans('firefly.bill_expected_date', {date: entry.next_expected_match_diff }) }} -->
</td> </td>
<td class="expected_in_period hidden-sm hidden-xs"> <td class="expected_in_period hidden-sm hidden-xs">
{% for date in entry.pay_dates %} {% for date in entry.pay_dates %}
{{ formatDate(date, monthAndDayFormat) }}<br> {{ formatDate(date, monthAndDayFormat) }}<br>
{% endfor %} {% endfor %}
@@ -111,6 +112,7 @@
#} #}
{% if entry.paid_dates|length > 0 and entry.active %} {% if entry.paid_dates|length > 0 and entry.active %}
<td class="paid_in_period text-success"> <td class="paid_in_period text-success">
{% for currentPaid in entry.paid_dates %} {% for currentPaid in entry.paid_dates %}
<a href="{{ route('transactions.show',currentPaid.transaction_group_id) }}"> <a href="{{ route('transactions.show',currentPaid.transaction_group_id) }}">
{{ formatDate(currentPaid.date, monthAndDayFormat) }} {{ formatDate(currentPaid.date, monthAndDayFormat) }}
@@ -121,6 +123,8 @@
<td class="expected_in_period hidden-sm hidden-xs"> <td class="expected_in_period hidden-sm hidden-xs">
{% if entry.next_expected_match %} {% if entry.next_expected_match %}
{{ formatDate(entry.next_expected_match, monthAndDayFormat) }} {{ formatDate(entry.next_expected_match, monthAndDayFormat) }}
{% else %}
<span class="text-muted">{{ entry.next_expected_match_diff }}</span>
{% endif %} {% endif %}
</td> </td>
{% endif %} {% endif %}