Included bills in month report. [skip ci]

resources/lang/en/firefly.php

@@ -111,7 +111,8 @@ return [
     'leftInBudget'               => 'Left in budget',
 
     'sumOfSums'                  => 'Sum of sums',
-
+    'notCharged'                 => 'Not charged (yet)',
+    'inactive' => 'Inactive',
 
     'difference'                 => 'Difference',
     'in'                         => 'In',

resources/lang/en/form.php

@@ -36,6 +36,7 @@ return [
     'remind_me'                   => 'Remind me',
     'tag'                         => 'Tag',
     'reminder'                    => 'Remind me every',
+    'under'                       => 'Under',
 
     'store_new_withdrawal'        => 'Store new withdrawal',
     'store_new_deposit'           => 'Store new deposit',

resources/lang/nl/firefly.php

@@ -112,6 +112,8 @@ return [
     'leftInBudget'               => 'Over van budget',
 
     'sumOfSums'                  => 'Alles bij elkaar',
+    'notCharged'                 => '(Nog) niet betaald',
+    'inactive'                   => 'Niet actief',
 
     'difference'                 => 'Verschil',
     'in'                         => 'In',

resources/lang/nl/form.php

@@ -36,6 +36,7 @@ return [
     'remind_me'                   => 'Help me herinneren',
     'tag'                         => 'Tag',
     'reminder'                    => 'Herinner me elke',
+    'under'                       => 'Onder',
 
     'store_new_withdrawal'        => 'Nieuwe uitgave opslaan',
     'store_new_deposit'           => 'Nieuwe inkomsten opslaan',

resources/twig/partials/reports/bills.twig

@@ -0,0 +1,51 @@
+<div class="panel panel-default">
+    <div class="panel-heading">
+        <i class="fa fa-calendar-o fa-fw"></i>
+        {{ 'bills'|_ }}
+    </div>
+    <table class="table table-bordered table-striped sortable">
+        <thead>
+            <tr>
+                <th>{{ trans('form.name') }}</th>
+                <th>{{ trans('form.amount_min') }}</th>
+                <th>{{ trans('form.amount_max') }}</th>
+                <th>{{ trans('form.amount') }}</th>
+                <th>{{ trans('form.under') }}</th>
+            </tr>
+        </thead>
+        <tbody>
+        {% for line in bills.getBills %}
+            {% if not line.isActive %}
+                <tr class="text-muted">
+            {% else %}
+                <tr>
+            {% endif %}
+                <td data-value="{{ line.getBill.name }}">
+                    <a href="{{ route('bills.show',line.getBill.id) }}">{{ line.getBill.name }}</a>
+                    {% if not line.isActive %}
+                        ({{ 'inactive'|_|lower }})
+                    {% endif %}
+                </td>
+                <td data-value="{{ line.getMin }}">{{ line.getMin|formatAmount }}</td>
+                <td data-value="{{ line.getMax }}">{{ line.getMax|formatAmount }}</td>
+                {% if line.isHit %}
+                    <td data-value="{{ line.getAmount }}">{{ line.getAmount|formatAmount }}</td>
+                {% endif %}
+                {% if not line.isHit and line.isActive %}
+                    <td data-value="0" class="bg-success">{{ 'notCharged'|_ }}</td>
+                {% endif %}
+                {% if not line.isActive %}
+                    <td data-value="-1">&nbsp;</td>
+                    {% endif %}
+                <td data-value="{{ (line.getMax - line.getAmount) }}">
+                    {% if line.isActive %}
+                    {{ (line.getMax - line.getAmount)|formatAmount }}
+                    {% endif %}
+                </td>
+
+            </tr>
+
+        {% endfor %}
+        </tbody>
+    </table>
+</div>

resources/twig/reports/month.twig

@@ -52,13 +52,8 @@
 </div>
 <div class="row">
     <div class="col-lg-12 col-md-12 col-sm-12">
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <i class="fa fa-calendar-o fa-fw"></i>
-                {{ 'bills'|_ }}
-            </div>
-            <div class="panel-body">Body</div>
-        </div>
+        {% include 'partials/reports/bills.twig' %}
+
     </div>
 </div>
 <div class="row">