From 470d8b986bf8222fe48ece28bc1c82dcf13ed5c6 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Mon, 30 Jan 2023 17:41:16 +1300 Subject: [PATCH] dev/core#4063 fix lack of count info on soft credit listing https://lab.civicrm.org/dev/core/-/issues/4063 --- CRM/Contribute/BAO/ContributionSoft.php | 2 +- .../tests/phpunit/Civi/Financialacls/ContributionSoftTest.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CRM/Contribute/BAO/ContributionSoft.php b/CRM/Contribute/BAO/ContributionSoft.php index a38c720204..2e0115bec9 100644 --- a/CRM/Contribute/BAO/ContributionSoft.php +++ b/CRM/Contribute/BAO/ContributionSoft.php @@ -409,7 +409,7 @@ class CRM_Contribute_BAO_ContributionSoft extends CRM_Contribute_DAO_Contributio ]; $contributionSofts = ContributionSoft::get() - ->addSelect('*', 'contribution_id.receive_date', 'contribution_id.contact_id', 'contribution_id.contact_id.display_name', 'soft_credit_type_id:label', 'contribution_id.contribution_status_id:label', 'contribution_id.financial_type_id:label', 'pcp_id.title') + ->addSelect('*', 'contribution_id.receive_date', 'contribution_id.contact_id', 'contribution_id.contact_id.display_name', 'soft_credit_type_id:label', 'contribution_id.contribution_status_id:label', 'contribution_id.financial_type_id:label', 'pcp_id.title', 'row_count') ->addWhere('contact_id', '=', $contact_id) ->addWhere('contribution_id.is_test', '=', $isTest); diff --git a/ext/financialacls/tests/phpunit/Civi/Financialacls/ContributionSoftTest.php b/ext/financialacls/tests/phpunit/Civi/Financialacls/ContributionSoftTest.php index 1438c21a0c..b635d70281 100644 --- a/ext/financialacls/tests/phpunit/Civi/Financialacls/ContributionSoftTest.php +++ b/ext/financialacls/tests/phpunit/Civi/Financialacls/ContributionSoftTest.php @@ -73,7 +73,9 @@ class ContributionSoftTest extends BaseTestClass { 'sct_label' => NULL, ], ]; - $list = CRM_Contribute_BAO_ContributionSoft::getSoftContributionList($this->ids['Contact']['credited']); + $dataTableParameters = []; + $list = CRM_Contribute_BAO_ContributionSoft::getSoftContributionList($this->ids['Contact']['credited'], NULL, 0, $dataTableParameters); + $this->assertEquals(2, $dataTableParameters['total']); foreach ($expectedCredits[1] as $key => $value) { $this->assertEquals($value, $list[1][$key], $key); } -- 2.25.1