From 7fd210042f587ba3dae0ff59ee545ca1e5c20c3d Mon Sep 17 00:00:00 2001 From: monishdeb Date: Tue, 29 Sep 2015 01:54:41 +0530 Subject: [PATCH] CRM-17287 Test fix for contribution note ---------------------------------------- * CRM-17287: Broken Unit Tests on master https://issues.civicrm.org/jira/browse/CRM-17287 --- CRM/Contribute/Form/Contribution.php | 6 +++++- tests/phpunit/CRM/Financial/Page/AjaxTest.php | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php index 4fab02ad79..caa9e9a22b 100644 --- a/CRM/Contribute/Form/Contribution.php +++ b/CRM/Contribute/Form/Contribution.php @@ -1626,6 +1626,10 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP } $params['non_deductible_amount'] = $this->calculateNonDeductibleAmount($params, $formValues); + // we are already handling note below, so to avoid duplicate notes against $contribution + if (!empty($params['note']) && !empty($submittedValues['note'])) { + unset($params['note']); + } $contribution = CRM_Contribute_BAO_Contribution::create($params, $ids); // process associated membership / participant, CRM-4395 @@ -1667,7 +1671,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP ); } - if ($contribution->id && isset($submittedValues['note'])) { + if ($contribution->id && !empty($submittedValues['note'])) { CRM_Contribute_Form_AdditionalInfo::processNote($submittedValues, $this->_contactID, $contribution->id, $this->_noteID); } diff --git a/tests/phpunit/CRM/Financial/Page/AjaxTest.php b/tests/phpunit/CRM/Financial/Page/AjaxTest.php index d7b64e92b4..6871423864 100644 --- a/tests/phpunit/CRM/Financial/Page/AjaxTest.php +++ b/tests/phpunit/CRM/Financial/Page/AjaxTest.php @@ -38,7 +38,7 @@ class CRM_Financial_Page_AjaxTest extends CiviUnitTestCase { */ public function testGetFinancialTransactionsList() { $individualID = $this->individualCreate(); - $this->contributionCreate($individualID); + $this->contributionCreate(array('contact_id' => $individualID)); $batch = $this->callAPISuccess('Batch', 'create', array('title' => 'test', 'status_id' => 'Open')); CRM_Core_DAO::executeQuery(" INSERT INTO civicrm_entity_batch (entity_table, entity_id, batch_id) -- 2.25.1