projects / civicrm-core.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 07f3638 fe681d8)
Merge pull request #11495 from yashodha/CRM-21637
authorMonish Deb <monish.deb@jmaconsulting.biz>
Fri, 15 Jun 2018 03:09:38 +0000 (08:39 +0530)
committerGitHub <noreply@github.com>
Fri, 15 Jun 2018 03:09:38 +0000 (08:39 +0530)
CRM-21637 - Search Criteria for Card Type ID and Card Number not resp…

1  2 
CRM/Batch/BAO/Batch.php patch | diff1 | diff2 | blob | history
CRM/Financial/Page/AJAX.php patch | diff1 | diff2 | blob | history

diff --combined CRM/Batch/BAO/Batch.php
index ceae07312299e8fd686be54309fe480c168c49a8,ad88c1eb97d3f05288ec2a8673de3fd638e6e33b..ee73a515f07c069c825ed794d57b65c7b64d1c56
--- 1/CRM/Batch/BAO/Batch.php
--- 2/CRM/Batch/BAO/Batch.php
+++ b/CRM/Batch/BAO/Batch.php
@@@ -1,9 -1,9 +1,9 @@@
  <?php
  /*
   +--------------------------------------------------------------------+
 - | CiviCRM version 4.7                                                |
 + | CiviCRM version 5                                                  |
   +--------------------------------------------------------------------+
 - | Copyright CiviCRM LLC (c) 2004-2017                                |
 + | Copyright CiviCRM LLC (c) 2004-2018                                |
   +--------------------------------------------------------------------+
   | This file is a part of CiviCRM.                                    |
   |                                                                    |
@@@ -28,7 -28,7 +28,7 @@@
  /**
   *
   * @package CRM
 - * @copyright CiviCRM LLC (c) 2004-2017
 + * @copyright CiviCRM LLC (c) 2004-2018
   */
  
  /**
@@@ -719,6 -719,8 +719,8 @@@ LEFT JOIN civicrm_contribution_soft ON 
        '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 --combined CRM/Financial/Page/AJAX.php
index 6c6bae83050023be5e0521164660efd0d359726d,ad82eea92bd49ba27dbfa9038eec59afee3a0fec..fe43978b0382d107ef477c1d9141b3d9f1434381
--- 1/CRM/Financial/Page/AJAX.php
--- 2/CRM/Financial/Page/AJAX.php
+++ b/CRM/Financial/Page/AJAX.php
@@@ -1,9 -1,9 +1,9 @@@
  <?php
  /*
   +--------------------------------------------------------------------+
 - | CiviCRM version 4.7                                                |
 + | CiviCRM version 5                                                  |
   +--------------------------------------------------------------------+
 - | Copyright CiviCRM LLC (c) 2004-2017                                |
 + | Copyright CiviCRM LLC (c) 2004-2018                                |
   +--------------------------------------------------------------------+
   | This file is a part of CiviCRM.                                    |
   |                                                                    |
@@@ -28,7 -28,7 +28,7 @@@
  /**
   *
   * @package CRM
 - * @copyright CiviCRM LLC (c) 2004-2017
 + * @copyright CiviCRM LLC (c) 2004-2018
   */
  
  /**
@@@ -293,6 -293,8 +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(