From b7f280a30d59e726f988eee2afedd3e3020c20db Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Mon, 24 May 2021 15:57:29 +1200 Subject: [PATCH] [REF] Minor simplification --- CRM/Contribute/BAO/Contribution.php | 7 +------ tests/phpunit/api/v3/ContributionPageTest.php | 10 +++++----- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index db701afc1d..aab9377b31 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -171,12 +171,7 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution { // Get Line Items if we don't have them already. if (empty($params['line_item'])) { - if (isset($params['id'])) { - CRM_Price_BAO_LineItem::getLineItemArray($params, [$params['id']]); - } - else { - CRM_Price_BAO_LineItem::getLineItemArray($params); - } + CRM_Price_BAO_LineItem::getLineItemArray($params, $contributionID ? [$contributionID] : NULL); } if (!isset($params['tax_amount']) && $setPrevContribution && (isset($params['total_amount']) || diff --git a/tests/phpunit/api/v3/ContributionPageTest.php b/tests/phpunit/api/v3/ContributionPageTest.php index 3217464543..e81d57d157 100644 --- a/tests/phpunit/api/v3/ContributionPageTest.php +++ b/tests/phpunit/api/v3/ContributionPageTest.php @@ -1824,7 +1824,7 @@ class api_v3_ContributionPageTest extends CiviUnitTestCase { * * @throws \CRM_Core_Exception */ - public function testSubmitPledgePayment() { + public function testSubmitPledgePayment(): void { // Need to work on valid financials on this test. $this->isValidateFinancialsOnPostAssert = FALSE; $this->testSubmitPledgePaymentPaymentProcessorRecurFuturePayment(); @@ -1852,7 +1852,7 @@ class api_v3_ContributionPageTest extends CiviUnitTestCase { 'pledge_block_id' => $this->_ids['pledge_block_id'], ]; $pledgePayment = $this->callAPISuccess('pledge_payment', 'get', $params); - $this->assertEquals($pledgePayment['values'][2]['status_id'], 2); + $this->assertEquals(2, $pledgePayment['values'][2]['status_id']); $this->callAPIAndDocument('contribution_page', 'submit', $submitParams, __FUNCTION__, __FILE__, 'submit contribution page', NULL); @@ -1865,9 +1865,9 @@ class api_v3_ContributionPageTest extends CiviUnitTestCase { ]); $this->assertEquals(100.00, $contribution['total_amount']); - $pledgePayment = $this->callAPISuccess('pledge_payment', 'get', $params); - $this->assertEquals($pledgePayment['values'][2]['status_id'], 1, 'This pledge payment should have been completed'); - $this->assertEquals($pledgePayment['values'][2]['contribution_id'], $contribution['id']); + $pledgePayment = $this->callAPISuccess('pledge_payment', 'get', $params)['values']; + $this->assertEquals(1, $pledgePayment[2]['status_id'], 'This pledge payment should have been completed'); + $this->assertEquals($contribution['id'], $pledgePayment[2]['contribution_id']); } /** -- 2.25.1