From 5cd28219d16fdbd473529880bf83a57aaaa59360 Mon Sep 17 00:00:00 2001 From: eileen Date: Thu, 16 May 2013 02:02:41 +1200 Subject: [PATCH] CRM-11320 this makes the api stable from 4.2 to 4.3 Conflicts: api/v3/Contribution.php --- api/v3/examples/Contribution/ContributionCreateWithNote.php | 1 + .../examples/Contribution/ContributionCreateWithSoftCredit.php | 3 ++- api/v3/examples/ContributionCreate.php | 1 + api/v3/examples/ContributionGet.php | 1 + api/v3/utils.php | 3 +++ tests/phpunit/api/v3/ContributionTest.php | 3 +++ tests/phpunit/api/v3/EventTest.php | 1 + 7 files changed, 12 insertions(+), 1 deletion(-) diff --git a/api/v3/examples/Contribution/ContributionCreateWithNote.php b/api/v3/examples/Contribution/ContributionCreateWithNote.php index a3c8ba0aa3..7c21314c06 100644 --- a/api/v3/examples/Contribution/ContributionCreateWithNote.php +++ b/api/v3/examples/Contribution/ContributionCreateWithNote.php @@ -66,6 +66,7 @@ function contribution_create_expectedresult(){ 'address_id' => '', 'check_number' => 'null', 'campaign_id' => '', + 'contribution_type_id' => '1', ), ), ); diff --git a/api/v3/examples/Contribution/ContributionCreateWithSoftCredit.php b/api/v3/examples/Contribution/ContributionCreateWithSoftCredit.php index 0c7bfc5145..8270f673f9 100644 --- a/api/v3/examples/Contribution/ContributionCreateWithSoftCredit.php +++ b/api/v3/examples/Contribution/ContributionCreateWithSoftCredit.php @@ -5,7 +5,7 @@ */ function contribution_create_example(){ $params = array( - 'contact_id' => 1, + 'contact_id' => 3, 'receive_date' => '20120511', 'total_amount' => '100', 'financial_type_id' => 1, @@ -63,6 +63,7 @@ function contribution_create_expectedresult(){ 'address_id' => '', 'check_number' => '', 'campaign_id' => '', + 'contribution_type_id' => '1', ), ), ); diff --git a/api/v3/examples/ContributionCreate.php b/api/v3/examples/ContributionCreate.php index 550b1e4b2d..ffee561079 100644 --- a/api/v3/examples/ContributionCreate.php +++ b/api/v3/examples/ContributionCreate.php @@ -62,6 +62,7 @@ function contribution_create_expectedresult(){ 'address_id' => '', 'check_number' => '', 'campaign_id' => '', + 'contribution_type_id' => '1', ), ), ); diff --git a/api/v3/examples/ContributionGet.php b/api/v3/examples/ContributionGet.php index 7b3e165ec0..bdccc15aef 100644 --- a/api/v3/examples/ContributionGet.php +++ b/api/v3/examples/ContributionGet.php @@ -72,6 +72,7 @@ function contribution_get_expectedresult(){ 'contribution_payment_instrument' => '', 'contribution_check_number' => '', 'id' => '1', + 'contribution_type_id' => '1', ), ), ); diff --git a/api/v3/utils.php b/api/v3/utils.php index e1d468d714..bc50e3cc28 100644 --- a/api/v3/utils.php +++ b/api/v3/utils.php @@ -182,6 +182,9 @@ function civicrm_api3_create_success($values = 1, $params = array( if (empty($item['id']) && !empty($item[$entity . "_id"])) { $values[$key]['id'] = $item[$entity . "_id"]; } + if(!empty($item['financial_type_id'])){ + $values[$key]['contribution_type_id'] = $item['financial_type_id']; + } } } //if ( array_key_exists ('debug',$params) && is_object ($dao)) { diff --git a/tests/phpunit/api/v3/ContributionTest.php b/tests/phpunit/api/v3/ContributionTest.php index 18893ba050..12c30c5749 100644 --- a/tests/phpunit/api/v3/ContributionTest.php +++ b/tests/phpunit/api/v3/ContributionTest.php @@ -253,6 +253,7 @@ class api_v3_ContributionTest extends CiviUnitTestCase { $this->documentMe($params, $contribution, __FUNCTION__, __FILE__); $this->assertEquals($contribution['values'][$contribution['id']]['contact_id'], $this->_individualId, 'In line ' . __LINE__); $this->assertEquals($contribution['values'][$contribution['id']]['financial_type_id'], $this->_contributionTypeId); + $this->assertEquals($contribution['values'][$contribution['id']]['contribution_type_id'], $this->_contributionTypeId); $this->assertEquals($contribution['values'][$contribution['id']]['total_amount'], 100.00, 'In line ' . __LINE__); $this->assertEquals($contribution['values'][$contribution['id']]['non_deductible_amount'], 10.00, 'In line ' . __LINE__); $this->assertEquals($contribution['values'][$contribution['id']]['fee_amount'], 5.00, 'In line ' . __LINE__); @@ -722,12 +723,14 @@ class api_v3_ContributionTest extends CiviUnitTestCase { ); $contribution = civicrm_api('contribution', 'create', $params); + $this->assertAPISuccess($contribution); $this->documentMe($params, $contribution, __FUNCTION__, __FILE__, $description, $subfile); // $result = civicrm_api('contribution','get', array('version' => 3,'return'=> 'soft_credit_to', 'sequential' => 1)); // $this->assertAPISuccess($result); // $this->assertEquals($contact2['id'], $result['values'][$result['id']]['soft_credit_to']) ; // well - the above doesn't work yet so lets do SQL $query = "SELECT count(*) FROM civicrm_contribution_soft WHERE contact_id = " . $contact2['id']; + $count = CRM_Core_DAO::singleValueQuery($query); $this->assertEquals(1, $count); diff --git a/tests/phpunit/api/v3/EventTest.php b/tests/phpunit/api/v3/EventTest.php index 275d9aca51..0b1b4067c1 100644 --- a/tests/phpunit/api/v3/EventTest.php +++ b/tests/phpunit/api/v3/EventTest.php @@ -313,6 +313,7 @@ class api_v3_EventTest extends CiviUnitTestCase { $this->assertAPISuccess($result, ' Event Creation Failedon line ' . __LINE__); $getresult = civicrm_api('event', 'get', array('version' => 3,) + $contributionTypeArray); $this->assertAPISuccess($result, ' Event Creation on line ' . __LINE__); + $this->assertEquals($result['values'][$result['id']]['contribution_type_id'], 3); $this->assertEquals($result['id'], $getresult['id']); civicrm_api('event', 'delete', array('version' => 3, 'id' => $result['id'])); } -- 2.25.1