Merge pull request #11495 from yashodha/CRM-21637

CRM-21637 - Search Criteria for Card Type ID and Card Number not resp…

diff --git a/CRM/Batch/BAO/Batch.php b/CRM/Batch/BAO/Batch.php
index ceae07312299e8fd686be54309fe480c168c49a8..ee73a515f07c069c825ed794d57b65c7b64d1c56 100644 (file)
--- a/CRM/Batch/BAO/Batch.php
+++ b/CRM/Batch/BAO/Batch.php
@@ -719,6 +719,8 @@ LEFT JOIN civicrm_contribution_soft ON civicrm_contribution_soft.contribution_id
       'contribution_date_low',
       'contribution_check_number',
       'contribution_status_id',
+      'financial_trxn_card_type_id',
+      'financial_trxn_pan_truncation',
     );
     $values = array();
     foreach ($searchFields as $field) {

diff --git a/CRM/Financial/Page/AJAX.php b/CRM/Financial/Page/AJAX.php
index 6c6bae83050023be5e0521164660efd0d359726d..fe43978b0382d107ef477c1d9141b3d9f1434381 100644 (file)
--- a/CRM/Financial/Page/AJAX.php
+++ b/CRM/Financial/Page/AJAX.php
@@ -293,6 +293,8 @@ class CRM_Financial_Page_AJAX {
       'civicrm_financial_trxn.currency as currency',
       'civicrm_financial_trxn.status_id as status',
       'civicrm_financial_trxn.check_number as check_number',
+      'civicrm_financial_trxn.card_type_id',
+      'civicrm_financial_trxn.pan_truncation',
     );
 
     $columnHeader = array(