From dbf605ab7e3a6c9a09b6a0468258760456f3805d Mon Sep 17 00:00:00 2001
From: Pradeep Nayak <pradpnayak@gmail.com>
Date: Mon, 31 Jul 2017 08:29:34 +0530
Subject: [PATCH] CRM-20987, added batch transaction column

----------------------------------------
* CRM-20987: Add transaction date field to listings of transactions
  https://issues.civicrm.org/jira/browse/CRM-20987
---
 CRM/Financial/Page/AJAX.php                       | 9 ++++++++-
 templates/CRM/Financial/Form/BatchTransaction.tpl | 3 +++
 templates/CRM/Financial/Page/BatchTransaction.tpl | 5 +++--
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/CRM/Financial/Page/AJAX.php b/CRM/Financial/Page/AJAX.php
index b9fd85e18b..b6b11449f7 100644
--- a/CRM/Financial/Page/AJAX.php
+++ b/CRM/Financial/Page/AJAX.php
@@ -255,6 +255,7 @@ class CRM_Financial_Page_AJAX {
       3 => 'amount',
       4 => 'trxn_id',
       5 => 'transaction_date',
+      5 => 'receive_date',
       6 => 'payment_method',
       7 => 'status',
       8 => 'name',
@@ -287,6 +288,7 @@ class CRM_Financial_Page_AJAX {
       'contact_a.contact_type',
       'contact_a.contact_sub_type',
       'civicrm_financial_trxn.trxn_date as transaction_date',
+      'civicrm_contribution.receive_date as receive_date',
       'civicrm_financial_type.name',
       'civicrm_financial_trxn.currency as currency',
       'civicrm_financial_trxn.status_id as status',
@@ -298,7 +300,8 @@ class CRM_Financial_Page_AJAX {
       'sort_name' => ts('Contact Name'),
       'amount' => ts('Amount'),
       'trxn_id' => ts('Trxn ID'),
-      'transaction_date' => ts('Received'),
+      'transaction_date' => ts('Transaction Date'),
+      'receive_date' => ts('Received'),
       'payment_method' => ts('Payment Method'),
       'status' => ts('Status'),
       'name' => ts('Type'),
@@ -374,6 +377,9 @@ class CRM_Financial_Page_AJAX {
         elseif ($columnKey == 'transaction_date' && $financialItem->$columnKey) {
           $row[$financialItem->id][$columnKey] = CRM_Utils_Date::customFormat($financialItem->$columnKey);
         }
+        elseif ($columnKey == 'receive_date' && $financialItem->$columnKey) {
+          $row[$financialItem->id][$columnKey] = CRM_Utils_Date::customFormat($financialItem->$columnKey);
+        }
         elseif ($columnKey == 'status' && $financialItem->$columnKey) {
           $row[$financialItem->id][$columnKey] = CRM_Core_PseudoConstant::getLabel('CRM_Contribute_BAO_Contribution', 'contribution_status_id', $financialItem->$columnKey);
         }
@@ -450,6 +456,7 @@ class CRM_Financial_Page_AJAX {
       'amount',
       'trxn_id',
       'transaction_date',
+      'receive_date',
       'payment_method',
       'status',
       'name',
diff --git a/templates/CRM/Financial/Form/BatchTransaction.tpl b/templates/CRM/Financial/Form/BatchTransaction.tpl
index 9f3ce91594..b453ed9e03 100644
--- a/templates/CRM/Financial/Form/BatchTransaction.tpl
+++ b/templates/CRM/Financial/Form/BatchTransaction.tpl
@@ -75,6 +75,7 @@
         <th class="crm-contact-name">{ts}Name{/ts}</th>
         <th class="crm-amount">{ts}Amount{/ts}</th>
         <th class="crm-trxnID">{ts}Trxn ID{/ts}</th>
+        <th class="crm-trxn_date">{ts}Transaction Date{/ts}</th>
         <th class="crm-received">{ts}Received{/ts}</th>
         <th class="crm-payment-method">{ts}Pay Method{/ts}</th>
         <th class="crm-status">{ts}Status{/ts}</th>
@@ -196,6 +197,7 @@ function buildTransactionSelectorAssign(filterSearch) {
     {sClass:'crm-contact-name'},
     {sClass:'crm-amount'},
     {sClass:'crm-trxnID'},
+    {sClass:'crm-trxn_date'},
     {sClass:'crm-received'},
     {sClass:'crm-payment-method'},
     {sClass:'crm-status'},
@@ -270,6 +272,7 @@ function buildTransactionSelectorRemove( ) {
     {sClass:'crm-contact-name'},
     {sClass:'crm-amount'},
     {sClass:'crm-trxnID'},
+    {sClass:'crm-trxn_date'},
     {sClass:'crm-received'},
     {sClass:'crm-payment-method'},
     {sClass:'crm-status'},
diff --git a/templates/CRM/Financial/Page/BatchTransaction.tpl b/templates/CRM/Financial/Page/BatchTransaction.tpl
index 2cf771184f..6047115d84 100644
--- a/templates/CRM/Financial/Page/BatchTransaction.tpl
+++ b/templates/CRM/Financial/Page/BatchTransaction.tpl
@@ -59,10 +59,11 @@
           <th class="crm-contact-type"></th>
           <th class="crm-contact-name">{ts}Name{/ts}</th>
           <th class="crm-amount">{ts}Amount{/ts}</th>
-    <th class="crm-trxnID">{ts}Trxn ID{/ts}</th>
+          <th class="crm-trxnID">{ts}Trxn ID{/ts}</th>
+          <th class="crm-trxn_date">{ts}Transaction Date{/ts}</th>
           <th class="crm-received">{ts}Received{/ts}</th>
           <th class="crm-payment-method">{ts}Pay Method{/ts}</th>
-    <th class="crm-status">{ts}Status{/ts}</th>
+          <th class="crm-status">{ts}Status{/ts}</th>
           <th class="crm-type">{ts}Type{/ts}</th>
           <th class="crm-transaction-links"></th>
         </tr>
-- 
2.25.1