From b6be9e6ade5df3d084b6fbc00da21a2d11e5448d Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 1 Jul 2017 10:39:59 +0200
Subject: [PATCH] Fix for #682

---
 resources/views/list/bills.twig | 44 ++++++++++++++-------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

diff --git a/resources/views/list/bills.twig b/resources/views/list/bills.twig
index 4780d7bf1f..5af2807f66 100644
--- a/resources/views/list/bills.twig
+++ b/resources/views/list/bills.twig
@@ -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">
                     ~