From 2da087401ec56aee77d0cf3debe69368e804f86a Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 10 Sep 2016 18:37:16 +0200
Subject: [PATCH] Extend audit report

Signed-off-by: James Cole <thegrumpydictator@gmail.com>
---
 app/Http/Controllers/ReportController.php     | 11 ++-
 .../reports/partials/journals-audit.twig      | 71 +++++++++++++++----
 2 files changed, 66 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php
index 037d3c2ab1..f56e787c9e 100644
--- a/app/Http/Controllers/ReportController.php
+++ b/app/Http/Controllers/ReportController.php
@@ -215,8 +215,15 @@ class ReportController extends Controller
         $reportType = 'audit';
         $accountIds = join(',', $accounts->pluck('id')->toArray());
 
-        $hideable    = ['buttons', 'icon', 'description', 'balance_before', 'amount', 'balance_after', 'date', 'book_date', 'process_date', 'interest_date',
-                        'from', 'to', 'budget', 'category', 'bill', 'create_date', 'update_date',
+        $hideable    = ['buttons', 'icon', 'description', 'balance_before', 'amount', 'balance_after', 'date',
+                         'interest_date','book_date', 'process_date',
+                        // three new optional fields.
+                        'due_date', 'payment_date', 'invoice_date',
+                        'from', 'to', 'budget', 'category', 'bill',
+                        // more new optional fields
+                        'internal_reference', 'notes',
+
+                        'create_date', 'update_date',
         ];
         $defaultShow = ['icon', 'description', 'balance_before', 'amount', 'balance_after', 'date', 'to'];
 
diff --git a/resources/views/reports/partials/journals-audit.twig b/resources/views/reports/partials/journals-audit.twig
index b5af50a880..117d16bfbb 100644
--- a/resources/views/reports/partials/journals-audit.twig
+++ b/resources/views/reports/partials/journals-audit.twig
@@ -16,6 +16,11 @@
         <th class="hide-process_date">{{ trans('list.process_date') }}</th>
         <th class="hide-interest_date">{{ trans('list.interest_date') }}</th>
 
+        <!-- new optional fields (3x) -->
+        <th class="hide-interest_date">{{ trans('list.due_date') }}</th>
+        <th class="hide-payment_date">{{ trans('list.payment_date') }}</th>
+        <th class="hide-invoice_date">{{ trans('list.invoice_date') }}</th>
+
         <th class="hide-from">{{ trans('list.from') }}</th>
         <th class="hide-to">{{ trans('list.to') }}</th>
 
@@ -23,6 +28,10 @@
         <th class="hide-category"><i class="fa fa-bar-chart fa-fw" title="{{ trans('list.category') }}"></i></th>
         <th class="hide-bill">{{ trans('list.bill') }}</th>
 
+        <!-- more optional fields (2x) -->
+        <th class="hide-internal_reference">{{ trans('list.internal_reference') }}</th>
+        <th class="hide-notes">{{ trans('list.notes') }}</th>
+
         <th class="hide-create_date">{{ trans('list.create_date') }}</th>
         <th class="hide-update_date">{{ trans('list.update_date') }}</th>
 
@@ -45,24 +54,46 @@
             <td class="hide-balance_after">{{ journal.after|formatAmount }}</td>
 
             <td class="hide-date">{{ journal.date.formatLocalized(monthAndDayFormat) }}</td>
-            <td class="hide-book_date">{{ journal.book_date.formatLocalized(monthAndDayFormat) }}</td>
-            <td class="hide-process_date">{{ journal.process_date.formatLocalized(monthAndDayFormat) }}</td>
-            <td class="hide-interest_date">{{ journal.interest_date.formatLocalized(monthAndDayFormat) }}</td>
-
-            <td class="hide-from">
-                {% if journal.source_account_type == 'Cash account' %}
-                    <span class="text-success">(cash)</span>
-                {% else %}
-                    <a href="{{ route('accounts.show',journal.source_account_id) }}">{{ journal.source_account_name }}</a>
+            <td class="hide-book_date">
+                {% if journal.hasMeta('book_date') %}
+                    {{ journal.getMeta('book_date').formatLocalized(monthAndDayFormat) }}
                 {% endif %}
             </td>
-            <td class="hide-to">
-                {% if journal.destination_account_type == 'Cash account' %}
-                    <span class="text-success">(cash)</span>
-                {% else %}
-                    <a href="{{ route('accounts.show',journal.destination_account_id) }}">{{ journal.destination_account_name }}</a>
+            <td class="hide-process_date">
+                {% if journal.hasMeta('process_date') %}
+                    {{ journal.getMeta('process_date').formatLocalized(monthAndDayFormat) }}
                 {% endif %}
             </td>
+            <td class="hide-interest_date">
+                {% if journal.hasMeta('interest_date') %}
+                    {{ journal.getMeta('interest_date').formatLocalized(monthAndDayFormat) }}
+                {% endif %}
+            </td>
+
+            <!-- new optional fields (3x) -->
+            <td class="hide-due_date">
+                {% if journal.hasMeta('due_date') %}
+                    {{ journal.getMeta('due_date').formatLocalized(monthAndDayFormat) }}
+                {% endif %}
+            </td>
+            <td class="hide-payment_date">
+                {% if journal.hasMeta('payment_date') %}
+                    {{ journal.getMeta('payment_date').formatLocalized(monthAndDayFormat) }}
+                {% endif %}
+            </td>
+            <td class="hide-invoice_date">
+                {% if journal.hasMeta('invoice_date') %}
+                    {{ journal.getMeta('invoice_date').formatLocalized(monthAndDayFormat) }}
+                {% endif %}
+            </td>
+
+
+            <td class="hide-from">
+                {{ sourceAccount(journal)|raw }}
+            </td>
+            <td class="hide-to">
+                {{ destinationAccount(journal)|raw }}
+            </td>
 
             <td class="hide-budget">
                 {{ journalBudgets(journal)|raw }}
@@ -77,6 +108,18 @@
                 <td class="hide-bill">&nbsp;</td>
             {% endif %}
 
+            <!-- new optional fields (2x) -->
+            <td class="hide-internal_reference">
+                {% if journal.hasMeta('internal_reference') %}
+                    {{ journal.getMeta('internal_reference') }}
+                {% endif %}
+            </td>
+            <td class="hide-notes">
+                {% if journal.hasMeta('notes') %}
+                    {{ journal.getMeta('notes')|nl2br }}
+                {% endif %}
+            </td>
+
             <td class="hide-create_date">
                 {{ journal.created_at.formatLocalized(dateTimeFormat) }}
             </td>