From a246714d1410ad42d7518cb2140d3e2aa76c6774 Mon Sep 17 00:00:00 2001 From: Pradeep Nayak Date: Wed, 16 Dec 2015 17:06:58 +0530 Subject: [PATCH] --CRM-16259, set is_payment flag for non pending statuses payments --- CRM/Contribute/BAO/Contribution.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index 7e261629b8..0bd626ac61 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -2999,6 +2999,11 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac $balanceTrxnParams['status_id'] = $statusId; $balanceTrxnParams['payment_instrument_id'] = $params['contribution']->payment_instrument_id; $balanceTrxnParams['check_number'] = CRM_Utils_Array::value('check_number', $params); + if (!empty($balanceTrxnParams['from_financial_account_id']) && + ($statusId == array_search('Completed', $contributionStatuses) || $statusId == array_search('Partially paid', $contributionStatuses)) + ) { + $balanceTrxnParams['is_payment'] = 1; + } if (!empty($params['payment_processor'])) { $balanceTrxnParams['payment_processor_id'] = $params['payment_processor']; } @@ -3057,7 +3062,10 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac if ($contributionStatus == 'Refunded') { $trxnParams['trxn_date'] = !empty($params['contribution']->cancel_date) ? $params['contribution']->cancel_date : date('YmdHis'); } - + //CRM-16259, set is_payment flag for non pending status + if (!in_array(CRM_Utils_Array::value('contribution_status_id', $params), $pendingStatus)) { + $trxnParams['is_payment'] = 1; + } if (!empty($params['payment_processor'])) { $trxnParams['payment_processor_id'] = $params['payment_processor']; } -- 2.25.1