IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix for #682

Browse Source
This commit is contained in:
James Cole 2017-07-01 10:39:59 +02:00
parent 04f71496e3
commit b6be9e6ade
No known key found for this signature in database
GPG Key ID: C16961E655E74B5E
1 changed files with 19 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,45 +40,33 @@
</span>
</td>
{#
Terms:
paidDates: journals linked to the bill between $start and $end.
payDates: dates in this period ($start and $end) system thinks bill should be paid.
Possible situations:
1:
paidDates = 0 (bill not paid in period)
payDates = 0 (bill not expected to be paid in this period)
bill is active.
2:
paidDates = 0 (bill not paid in period)
payDates = 0 (bill IS expected to be paid in this period)
bill is active
3:
paidDates >= payDates (bill is paid as many times or more than the amount of times expected).
4:
bill is not active
#}
<!--
Some debug data:
entry.paidDates.count(): {{ entry.paidDates.count() }}
entry.paidDates set:
entry.payDates.count(): {{ entry.payDates.count() }}
active: {% if entry.active %}true{% else %}false{% endif %}
-->
{#
paidDates = 0 (bill not paid in period)
payDates = 0 (bill not expected to be paid in this period)
bill is active.
#}
{% if entry.paidDates.count() == 0 and entry.payDates.count() == 0 and entry.active %}
<td class="text-muted" data-value="0001-00-00 00-00-00">
{{ 'not_expected_period'|_ }}
</td>
<td class=" hidden-sm hidden-xs" data-value="{{ entry.nextExpectedMatch.format('Y-m-d H-i-s') }}">
<td class="hidden-sm hidden-xs" data-value="{{ entry.nextExpectedMatch.format('Y-m-d H-i-s') }}">
{{ entry.nextExpectedMatch.formatLocalized(monthAndDayFormat) }}
</td>
{% endif %}
{#
paidDates = 0 (bill not paid in period)
payDates > 0 (bill IS expected to be paid in this period)
bill is active
#}
{% if entry.paidDates.count() == 0 and entry.payDates.count() > 0 and entry.active %}
<td class="text-danger" data-value="0002-00-00 00-00-00">
{{ 'not_or_not_yet'|_ }}
@ -87,7 +75,12 @@
{{ entry.nextExpectedMatch.formatLocalized(monthAndDayFormat) }}
</td>
{% endif %}
{% if entry.paidDates.count() >= entry.payDates.count() and entry.payDates.count() > 0 and entry.active %}
{#
paidDates >= 0 (bill is paid X times).
Don't care about payDates.
#}
{% if entry.paidDates.count() > 0 and entry.active %}
<td class="text-success" data-value="{{ entry.paidDates.first.format('Y-m-d H-i-s') }}">
{% for date in entry.paidDates %}
{{ date.formatLocalized(monthAndDayFormat) }}<br/>
@ -97,6 +90,7 @@
{{ entry.nextExpectedMatch.formatLocalized(monthAndDayFormat) }}
</td>
{% endif %}
{# bill is not active #}
{% if not entry.active %}
<td class="text-muted" data-value="0000-00-00 00-00-00">
~