From c3b8206041b35f2f864342ac1e0545fec90137a2 Mon Sep 17 00:00:00 2001 From: "Matthew Wire (MJW Consulting)" Date: Sat, 5 Oct 2019 12:36:34 +0200 Subject: [PATCH] Explicitly specify params so we can find problems with comparing translated labels --- CRM/Contribute/BAO/Contribution.php | 4 ++-- CRM/Contribute/BAO/ContributionRecur.php | 2 +- CRM/Contribute/Form/Task/Status.php | 2 +- CRM/Contribute/Page/UserDashboard.php | 2 +- CRM/Core/BAO/UFGroup.php | 2 +- CRM/Logging/Differ.php | 2 +- CRM/Member/Form/MembershipRenewal.php | 4 ++-- CRM/Member/Page/RecurringContributions.php | 2 +- CRM/Pledge/BAO/Pledge.php | 2 +- CRM/Report/Form/Contribute/Bookkeeping.php | 6 +++--- CRM/Report/Form/Contribute/Detail.php | 4 ++-- CRM/Report/Form/Contribute/History.php | 2 +- CRM/Report/Form/Contribute/HouseholdSummary.php | 2 +- CRM/Report/Form/Contribute/Lybunt.php | 2 +- CRM/Report/Form/Contribute/OrganizationSummary.php | 2 +- CRM/Report/Form/Contribute/Recur.php | 4 ++-- CRM/Report/Form/Contribute/Repeat.php | 2 +- CRM/Report/Form/Contribute/SoftCredit.php | 2 +- CRM/Report/Form/Contribute/Summary.php | 6 +++--- CRM/Report/Form/Contribute/Sybunt.php | 2 +- CRM/Report/Form/Contribute/TopDonor.php | 2 +- CRM/Report/Form/Event/ParticipantListing.php | 4 ++-- CRM/Report/Form/Member/ContributionDetail.php | 4 ++-- CRM/Report/Form/Member/Detail.php | 4 ++-- CRM/Report/Form/Member/Summary.php | 2 +- 25 files changed, 36 insertions(+), 36 deletions(-) diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php index f2995582e1..1f6047f9a3 100644 --- a/CRM/Contribute/BAO/Contribution.php +++ b/CRM/Contribute/BAO/Contribution.php @@ -664,7 +664,7 @@ class CRM_Contribute_BAO_Contribution extends CRM_Contribute_DAO_Contribution { public static function resolveDefaults(&$defaults, $reverse = FALSE) { self::lookupValue($defaults, 'financial_type', CRM_Contribute_PseudoConstant::financialType(), $reverse); self::lookupValue($defaults, 'payment_instrument', CRM_Contribute_PseudoConstant::paymentInstrument(), $reverse); - self::lookupValue($defaults, 'contribution_status', CRM_Contribute_PseudoConstant::contributionStatus(), $reverse); + self::lookupValue($defaults, 'contribution_status', CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), $reverse); self::lookupValue($defaults, 'pcp', CRM_Contribute_PseudoConstant::pcPage(), $reverse); } @@ -4089,7 +4089,7 @@ INNER JOIN civicrm_activity ON civicrm_activity_contact.activity_id = civicrm_ac 2 => [$feeFinancialAccount, 'Integer'], ]; $resultDAO = CRM_Core_DAO::executeQuery($sql, $queryParams); - $statuses = CRM_Contribute_PseudoConstant::contributionStatus(); + $statuses = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'); while ($resultDAO->fetch()) { $paidByLabel = CRM_Core_PseudoConstant::getLabel('CRM_Core_BAO_FinancialTrxn', 'payment_instrument_id', $resultDAO->payment_instrument_id); diff --git a/CRM/Contribute/BAO/ContributionRecur.php b/CRM/Contribute/BAO/ContributionRecur.php index 233377eb15..dc0b467ff8 100644 --- a/CRM/Contribute/BAO/ContributionRecur.php +++ b/CRM/Contribute/BAO/ContributionRecur.php @@ -757,7 +757,7 @@ INNER JOIN civicrm_contribution con ON ( con.id = mp.contribution_id ) // Add field for contribution status $form->addSelect('contribution_recur_contribution_status_id', - ['entity' => 'contribution', 'multiple' => 'multiple', 'context' => 'search', 'options' => CRM_Contribute_PseudoConstant::contributionStatus()] + ['entity' => 'contribution', 'multiple' => 'multiple', 'context' => 'search', 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label')] ); $form->addElement('text', 'contribution_recur_processor_id', ts('Processor ID'), CRM_Core_DAO::getAttribute('CRM_Contribute_DAO_ContributionRecur', 'processor_id')); diff --git a/CRM/Contribute/Form/Task/Status.php b/CRM/Contribute/Form/Task/Status.php index 388362b05c..b310d416dc 100644 --- a/CRM/Contribute/Form/Task/Status.php +++ b/CRM/Contribute/Form/Task/Status.php @@ -84,7 +84,7 @@ AND {$this->_componentClause}"; * Build the form object. */ public function buildQuickForm() { - $status = CRM_Contribute_PseudoConstant::contributionStatus(); + $status = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'); unset($status[2]); unset($status[5]); unset($status[6]); diff --git a/CRM/Contribute/Page/UserDashboard.php b/CRM/Contribute/Page/UserDashboard.php index 289051836a..c0a635ad4d 100644 --- a/CRM/Contribute/Page/UserDashboard.php +++ b/CRM/Contribute/Page/UserDashboard.php @@ -96,7 +96,7 @@ class CRM_Contribute_Page_UserDashboard extends CRM_Contact_Page_View_UserDashBo $recur->is_test = 0; $recur->find(); - $recurStatus = CRM_Contribute_PseudoConstant::contributionStatus(); + $recurStatus = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'); $recurRow = []; $recurIDs = []; diff --git a/CRM/Core/BAO/UFGroup.php b/CRM/Core/BAO/UFGroup.php index c3974fbdd7..5c5ab2a478 100644 --- a/CRM/Core/BAO/UFGroup.php +++ b/CRM/Core/BAO/UFGroup.php @@ -2123,7 +2123,7 @@ AND ( entity_id IS NULL OR entity_id <= 0 ) ); } elseif ($fieldName === 'contribution_status_id') { - $contributionStatuses = CRM_Contribute_PseudoConstant::contributionStatus(); + $contributionStatuses = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'); $statusName = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'name'); foreach (['In Progress', 'Overdue', 'Refunded'] as $suppress) { unset($contributionStatuses[CRM_Utils_Array::key($suppress, $statusName)]); diff --git a/CRM/Logging/Differ.php b/CRM/Logging/Differ.php index 59e1330c37..2330f1194b 100644 --- a/CRM/Logging/Differ.php +++ b/CRM/Logging/Differ.php @@ -290,7 +290,7 @@ WHERE lt.log_conn_id = %1 // FIXME: Use *_BAO:buildOptions() method rather than pseudoconstants & fetch programmatically $values[$table] = [ 'contribution_page_id' => CRM_Contribute_PseudoConstant::contributionPage(), - 'contribution_status_id' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'contribution_status_id' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), 'financial_type_id' => CRM_Contribute_PseudoConstant::financialType(), 'country_id' => CRM_Core_PseudoConstant::country(), 'gender_id' => CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'gender_id'), diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php index 2553d1f1fb..7ff71dc844 100644 --- a/CRM/Member/Form/MembershipRenewal.php +++ b/CRM/Member/Form/MembershipRenewal.php @@ -576,7 +576,7 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form { //if contribution status is pending then set pay later $this->_params['is_pay_later'] = FALSE; - if ($this->_params['contribution_status_id'] == array_search('Pending', CRM_Contribute_PseudoConstant::contributionStatus())) { + if ($this->_params['contribution_status_id'] == array_search('Pending', CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'))) { $this->_params['is_pay_later'] = 1; } @@ -588,7 +588,7 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form { } // @todo Move this into CRM_Member_BAO_Membership::processMembership - $pending = ($this->_params['contribution_status_id'] == array_search('Pending', CRM_Contribute_PseudoConstant::contributionStatus())) ? TRUE : FALSE; + $pending = ($this->_params['contribution_status_id'] == array_search('Pending', CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'))) ? TRUE : FALSE; list($membership) = CRM_Member_BAO_Membership::processMembership( $this->_contactID, $this->_params['membership_type_id'][1], $isTestMembership, $renewalDate, NULL, $customFieldsFormatted, $numRenewTerms, $this->_membershipId, diff --git a/CRM/Member/Page/RecurringContributions.php b/CRM/Member/Page/RecurringContributions.php index 07661c9fb7..546350457f 100644 --- a/CRM/Member/Page/RecurringContributions.php +++ b/CRM/Member/Page/RecurringContributions.php @@ -76,7 +76,7 @@ class CRM_Member_Page_RecurringContributions extends CRM_Core_Page { 'membership_id' => $membershipID, ]); $recurringContributions = []; - $contributionStatuses = CRM_Contribute_PseudoConstant::contributionStatus(); + $contributionStatuses = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'); foreach ($result['values'] as $payment) { $recurringContributionID = $payment['contribution_id.contribution_recur_id.id']; diff --git a/CRM/Pledge/BAO/Pledge.php b/CRM/Pledge/BAO/Pledge.php index 0026d4a9ff..e5feb625b5 100644 --- a/CRM/Pledge/BAO/Pledge.php +++ b/CRM/Pledge/BAO/Pledge.php @@ -1106,7 +1106,7 @@ SELECT pledge.contact_id as contact_id, * Array of int (civicrm_pledge_payment.id) */ public static function findCancelablePayments($pledgeID) { - $statuses = array_flip(CRM_Contribute_PseudoConstant::contributionStatus()); + $statuses = array_flip(CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label')); $paymentDAO = new CRM_Pledge_DAO_PledgePayment(); $paymentDAO->pledge_id = $pledgeID; diff --git a/CRM/Report/Form/Contribute/Bookkeeping.php b/CRM/Report/Form/Contribute/Bookkeeping.php index 021f92d234..014225adf8 100644 --- a/CRM/Report/Form/Contribute/Bookkeeping.php +++ b/CRM/Report/Form/Contribute/Bookkeeping.php @@ -326,7 +326,7 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form { 'contribution_status_id' => [ 'title' => ts('Contribution Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), 'default' => [1], ], ], @@ -386,7 +386,7 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form { 'status_id' => [ 'title' => ts('Financial Transaction Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), 'default' => [1], ], 'card_type_id' => [ @@ -655,7 +655,7 @@ class CRM_Report_Form_Contribute_Bookkeeping extends CRM_Report_Form { public function alterDisplay(&$rows) { $contributionTypes = CRM_Contribute_PseudoConstant::financialType(); $paymentInstruments = CRM_Contribute_PseudoConstant::paymentInstrument(); - $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(); + $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'); $creditCardTypes = CRM_Financial_DAO_FinancialTrxn::buildOptions('card_type_id'); foreach ($rows as $rowNum => $row) { // convert display name to links diff --git a/CRM/Report/Form/Contribute/Detail.php b/CRM/Report/Form/Contribute/Detail.php index bea5471f54..a6117b3808 100644 --- a/CRM/Report/Form/Contribute/Detail.php +++ b/CRM/Report/Form/Contribute/Detail.php @@ -236,7 +236,7 @@ class CRM_Report_Form_Contribute_Detail extends CRM_Report_Form { 'contribution_status_id' => [ 'title' => ts('Contribution Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), 'default' => [1], 'type' => CRM_Utils_Type::T_INT, ], @@ -633,7 +633,7 @@ UNION ALL $entryFound = FALSE; $display_flag = $prev_cid = $cid = 0; $contributionTypes = CRM_Contribute_PseudoConstant::financialType(); - $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(); + $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'); $paymentInstruments = CRM_Contribute_PseudoConstant::paymentInstrument(); $contributionPages = CRM_Contribute_PseudoConstant::contributionPage(); $batches = CRM_Batch_BAO_Batch::getBatches(); diff --git a/CRM/Report/Form/Contribute/History.php b/CRM/Report/Form/Contribute/History.php index a46611a554..2f8b2e74b1 100644 --- a/CRM/Report/Form/Contribute/History.php +++ b/CRM/Report/Form/Contribute/History.php @@ -248,7 +248,7 @@ class CRM_Report_Form_Contribute_History extends CRM_Report_Form { 'contribution_status_id' => [ 'title' => ts('Contribution Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), 'default' => [1], ], 'financial_type_id' => [ diff --git a/CRM/Report/Form/Contribute/HouseholdSummary.php b/CRM/Report/Form/Contribute/HouseholdSummary.php index e840921139..bed14f6bb6 100644 --- a/CRM/Report/Form/Contribute/HouseholdSummary.php +++ b/CRM/Report/Form/Contribute/HouseholdSummary.php @@ -149,7 +149,7 @@ class CRM_Report_Form_Contribute_HouseholdSummary extends CRM_Report_Form { 'contribution_status_id' => [ 'title' => ts('Contribution Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), 'default' => [1], ], 'financial_type_id' => [ diff --git a/CRM/Report/Form/Contribute/Lybunt.php b/CRM/Report/Form/Contribute/Lybunt.php index f3972d42f5..9c6704058a 100644 --- a/CRM/Report/Form/Contribute/Lybunt.php +++ b/CRM/Report/Form/Contribute/Lybunt.php @@ -226,7 +226,7 @@ class CRM_Report_Form_Contribute_Lybunt extends CRM_Report_Form { 'contribution_status_id' => [ 'title' => ts('Contribution Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), 'default' => ['1'], ], ], diff --git a/CRM/Report/Form/Contribute/OrganizationSummary.php b/CRM/Report/Form/Contribute/OrganizationSummary.php index 9e4926a9ad..6a670fad5f 100644 --- a/CRM/Report/Form/Contribute/OrganizationSummary.php +++ b/CRM/Report/Form/Contribute/OrganizationSummary.php @@ -159,7 +159,7 @@ class CRM_Report_Form_Contribute_OrganizationSummary extends CRM_Report_Form { 'contribution_status_id' => [ 'title' => ts('Contribution Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), 'default' => [1], ], ], diff --git a/CRM/Report/Form/Contribute/Recur.php b/CRM/Report/Form/Contribute/Recur.php index 240ad47e72..805c7f5a2b 100644 --- a/CRM/Report/Form/Contribute/Recur.php +++ b/CRM/Report/Form/Contribute/Recur.php @@ -187,7 +187,7 @@ class CRM_Report_Form_Contribute_Recur extends CRM_Report_Form { 'contribution_status_id' => [ 'title' => ts('Contribution Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), 'default' => [5], 'type' => CRM_Utils_Type::T_INT, ], @@ -372,7 +372,7 @@ class CRM_Report_Form_Contribute_Recur extends CRM_Report_Form { * Rows generated by SQL, with an array for each row. */ public function alterDisplay(&$rows) { - $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(); + $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'); foreach ($rows as $rowNum => $row) { // convert display name to links if (array_key_exists('civicrm_contact_sort_name', $row) && diff --git a/CRM/Report/Form/Contribute/Repeat.php b/CRM/Report/Form/Contribute/Repeat.php index 177c6a7a0c..e9540eb103 100644 --- a/CRM/Report/Form/Contribute/Repeat.php +++ b/CRM/Report/Form/Contribute/Repeat.php @@ -242,7 +242,7 @@ class CRM_Report_Form_Contribute_Repeat extends CRM_Report_Form { 'contribution_status_id' => array( 'title' => ts('Contribution Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), 'default' => array('1'), ), ), diff --git a/CRM/Report/Form/Contribute/SoftCredit.php b/CRM/Report/Form/Contribute/SoftCredit.php index 3f8fdd54f0..24b1c5a730 100644 --- a/CRM/Report/Form/Contribute/SoftCredit.php +++ b/CRM/Report/Form/Contribute/SoftCredit.php @@ -252,7 +252,7 @@ class CRM_Report_Form_Contribute_SoftCredit extends CRM_Report_Form { 'contribution_status_id' => [ 'title' => ts('Contribution Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), 'default' => [1], ], ], diff --git a/CRM/Report/Form/Contribute/Summary.php b/CRM/Report/Form/Contribute/Summary.php index e193637490..bffb359186 100644 --- a/CRM/Report/Form/Contribute/Summary.php +++ b/CRM/Report/Form/Contribute/Summary.php @@ -156,7 +156,7 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form { 'contribution_status_id' => array( 'title' => ts('Contribution Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), 'default' => array(1), 'type' => CRM_Utils_Type::T_INT, ), @@ -220,7 +220,7 @@ class CRM_Report_Form_Contribute_Summary extends CRM_Report_Form { 'contribution_status_id' => array( 'title' => ts('Contribution Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), 'default' => array(1), 'type' => CRM_Utils_Type::T_INT, ), @@ -866,7 +866,7 @@ ROUND(AVG({$this->_aliases['civicrm_contribution_soft']}.amount), 2) as civicrm_ */ public function alterDisplay(&$rows) { $entryFound = FALSE; - $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(); + $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'); $contributionPages = CRM_Contribute_PseudoConstant::contributionPage(); foreach ($rows as $rowNum => $row) { diff --git a/CRM/Report/Form/Contribute/Sybunt.php b/CRM/Report/Form/Contribute/Sybunt.php index 3a2cb5f47f..56c3d45e31 100644 --- a/CRM/Report/Form/Contribute/Sybunt.php +++ b/CRM/Report/Form/Contribute/Sybunt.php @@ -231,7 +231,7 @@ class CRM_Report_Form_Contribute_Sybunt extends CRM_Report_Form { 'contribution_status_id' => [ 'title' => ts('Contribution Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), 'default' => ['1'], ], ], diff --git a/CRM/Report/Form/Contribute/TopDonor.php b/CRM/Report/Form/Contribute/TopDonor.php index b6479c14aa..093491fdc2 100644 --- a/CRM/Report/Form/Contribute/TopDonor.php +++ b/CRM/Report/Form/Contribute/TopDonor.php @@ -156,7 +156,7 @@ class CRM_Report_Form_Contribute_TopDonor extends CRM_Report_Form { 'contribution_status_id' => [ 'title' => ts('Contribution Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), 'default' => [1], ], ], diff --git a/CRM/Report/Form/Event/ParticipantListing.php b/CRM/Report/Form/Event/ParticipantListing.php index 949a6ff8e7..a3106d0b7d 100644 --- a/CRM/Report/Form/Event/ParticipantListing.php +++ b/CRM/Report/Form/Event/ParticipantListing.php @@ -353,7 +353,7 @@ class CRM_Report_Form_Event_ParticipantListing extends CRM_Report_Form { 'contribution_status_id' => array( 'title' => ts('Contribution Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), 'default' => NULL, ), ), @@ -651,7 +651,7 @@ ORDER BY cv.label $entryFound = FALSE; $eventType = CRM_Core_OptionGroup::values('event_type'); $financialTypes = CRM_Contribute_PseudoConstant::financialType(); - $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(); + $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'); $paymentInstruments = CRM_Contribute_PseudoConstant::paymentInstrument(); foreach ($rows as $rowNum => $row) { diff --git a/CRM/Report/Form/Member/ContributionDetail.php b/CRM/Report/Form/Member/ContributionDetail.php index a1c5d33850..ae361ba20c 100644 --- a/CRM/Report/Form/Member/ContributionDetail.php +++ b/CRM/Report/Form/Member/ContributionDetail.php @@ -221,7 +221,7 @@ class CRM_Report_Form_Member_ContributionDetail extends CRM_Report_Form { 'contribution_status_id' => [ 'title' => ts('Contribution Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), 'default' => [1], ], 'total_amount' => ['title' => ts('Contribution Amount')], @@ -646,7 +646,7 @@ class CRM_Report_Form_Member_ContributionDetail extends CRM_Report_Form { $entryFound = FALSE; $contributionTypes = CRM_Contribute_PseudoConstant::financialType(); - $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(); + $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'); $paymentInstruments = CRM_Contribute_PseudoConstant::paymentInstrument(); $batches = CRM_Batch_BAO_Batch::getBatches(); diff --git a/CRM/Report/Form/Member/Detail.php b/CRM/Report/Form/Member/Detail.php index 92cd8f40e9..c9d1effe5d 100644 --- a/CRM/Report/Form/Member/Detail.php +++ b/CRM/Report/Form/Member/Detail.php @@ -225,7 +225,7 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form { 'contribution_status_id' => [ 'title' => ts('Contribution Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), 'type' => CRM_Utils_Type::T_INT, ], 'total_amount' => ['title' => ts('Contribution Amount')], @@ -317,7 +317,7 @@ class CRM_Report_Form_Member_Detail extends CRM_Report_Form { $checkList = []; $contributionTypes = CRM_Contribute_PseudoConstant::financialType(); - $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(); + $contributionStatus = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'); $paymentInstruments = CRM_Contribute_PseudoConstant::paymentInstrument(); $repeatFound = FALSE; diff --git a/CRM/Report/Form/Member/Summary.php b/CRM/Report/Form/Member/Summary.php index ab7dcab267..78084e4ab7 100644 --- a/CRM/Report/Form/Member/Summary.php +++ b/CRM/Report/Form/Member/Summary.php @@ -165,7 +165,7 @@ class CRM_Report_Form_Member_Summary extends CRM_Report_Form { 'contribution_status_id' => [ 'title' => ts('Contribution Status'), 'operatorType' => CRM_Report_Form::OP_MULTISELECT, - 'options' => CRM_Contribute_PseudoConstant::contributionStatus(), + 'options' => CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label'), ], ], 'grouping' => 'member-fields', -- 2.25.1