Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

REF Explicitly specify params so we can find problems with comparing translated labels #15397

Merged
merged 1 commit into from
Oct 6, 2019
Merged

REF Explicitly specify params so we can find problems with comparing translated labels #15397

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CRM/Contribute/BAO/Contribution.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -664,7 +664,7 @@ public static function create(&$params, $ids = []) {
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);
}

Expand Down Expand Up @@ -4089,7 +4089,7 @@ public static function getPaymentInfo($id, $component = 'contribution', $getTrxn
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);
Expand Down
2 changes: 1 addition & 1 deletion CRM/Contribute/BAO/ContributionRecur.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ public static function recurringContribution(&$form) {

// 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'));
Expand Down
2 changes: 1 addition & 1 deletion CRM/Contribute/Form/Task/Status.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ public function preProcess() {
* 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]);
Expand Down
2 changes: 1 addition & 1 deletion CRM/Contribute/Page/UserDashboard.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ public function listContribution() {
$recur->is_test = 0;
$recur->find();

$recurStatus = CRM_Contribute_PseudoConstant::contributionStatus();
$recurStatus = CRM_Contribute_PseudoConstant::contributionStatus(NULL, 'label');

$recurRow = [];
$recurIDs = [];
Expand Down
2 changes: 1 addition & 1 deletion CRM/Core/BAO/UFGroup.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2123,7 +2123,7 @@ public static function buildProfile(
);
}
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)]);
Expand Down
2 changes: 1 addition & 1 deletion CRM/Logging/Differ.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,7 @@ public function titlesAndValuesForTable($table, $referenceDate) {
// 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'),
Expand Down
4 changes: 2 additions & 2 deletions CRM/Member/Form/MembershipRenewal.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,7 +576,7 @@ protected function submit() {

//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;
}

Expand All @@ -588,7 +588,7 @@ protected function submit() {
}

// @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,
Expand Down
2 changes: 1 addition & 1 deletion CRM/Member/Page/RecurringContributions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private function getRecurContributions($membershipID) {
'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'];
Expand Down
2 changes: 1 addition & 1 deletion CRM/Pledge/BAO/Pledge.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1106,7 +1106,7 @@ public static function cancel($pledgeID) {
* 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;
Expand Down
6 changes: 3 additions & 3 deletions CRM/Report/Form/Contribute/Bookkeeping.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ public function __construct() {
'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],
],
],
Expand Down Expand Up @@ -386,7 +386,7 @@ public function __construct() {
'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' => [
Expand Down Expand Up @@ -655,7 +655,7 @@ public function statistics(&$rows) {
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
Expand Down
4 changes: 2 additions & 2 deletions CRM/Report/Form/Contribute/Detail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ public function __construct() {
'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,
],
Expand Down Expand Up @@ -633,7 +633,7 @@ public function alterDisplay(&$rows) {
$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();
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/History.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ public function __construct() {
'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' => [
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/HouseholdSummary.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ public function __construct() {
'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' => [
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/Lybunt.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public function __construct() {
'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'],
],
],
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/OrganizationSummary.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public function __construct() {
'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],
],
],
Expand Down
4 changes: 2 additions & 2 deletions CRM/Report/Form/Contribute/Recur.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ public function __construct() {
'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,
],
Expand Down Expand Up @@ -372,7 +372,7 @@ public function where() {
* 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) &&
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/Repeat.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ public function __construct() {
'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'),
),
),
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/SoftCredit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ public function __construct() {
'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],
],
],
Expand Down
6 changes: 3 additions & 3 deletions CRM/Report/Form/Contribute/Summary.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public function __construct() {
'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,
),
Expand Down Expand Up @@ -220,7 +220,7 @@ public function __construct() {
'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,
),
Expand Down Expand Up @@ -866,7 +866,7 @@ public function buildChart(&$rows) {
*/
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) {
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/Sybunt.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ public function __construct() {
'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'],
],
],
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/TopDonor.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ public function __construct() {
'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],
],
],
Expand Down
4 changes: 2 additions & 2 deletions CRM/Report/Form/Event/ParticipantListing.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ public function __construct() {
'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,
),
),
Expand Down Expand Up @@ -651,7 +651,7 @@ public function alterDisplay(&$rows) {
$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) {
Expand Down
4 changes: 2 additions & 2 deletions CRM/Report/Form/Member/ContributionDetail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public function __construct() {
'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')],
Expand Down Expand Up @@ -646,7 +646,7 @@ public function alterDisplay(&$rows) {

$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();

Expand Down
4 changes: 2 additions & 2 deletions CRM/Report/Form/Member/Detail.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public function __construct() {
'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')],
Expand Down Expand Up @@ -317,7 +317,7 @@ public function alterDisplay(&$rows) {
$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;
Expand Down
2 changes: 1 addition & 1 deletion CRM/Report/Form/Member/Summary.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ public function __construct() {
'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',
Expand Down