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.

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
Changes from all commits
Commits
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
Explicitly specify params so we can find problems with comparing tran…
…slated labels
mattwire committed Oct 5, 2019
commit c3b8206041b35f2f864342ac1e0545fec90137a2
4 changes: 2 additions & 2 deletions CRM/Contribute/BAO/Contribution.php
Original file line number Diff line number Diff line change
@@ -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);
}

@@ -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);
2 changes: 1 addition & 1 deletion CRM/Contribute/BAO/ContributionRecur.php
Original file line number Diff line number Diff line change
@@ -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'));
2 changes: 1 addition & 1 deletion CRM/Contribute/Form/Task/Status.php
Original file line number Diff line number Diff line change
@@ -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]);
2 changes: 1 addition & 1 deletion CRM/Contribute/Page/UserDashboard.php
Original file line number Diff line number Diff line change
@@ -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 = [];
2 changes: 1 addition & 1 deletion CRM/Core/BAO/UFGroup.php
Original file line number Diff line number Diff line change
@@ -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)]);
2 changes: 1 addition & 1 deletion CRM/Logging/Differ.php
Original file line number Diff line number Diff line change
@@ -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'),
4 changes: 2 additions & 2 deletions CRM/Member/Form/MembershipRenewal.php
Original file line number Diff line number Diff line change
@@ -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;
}

@@ -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,
2 changes: 1 addition & 1 deletion CRM/Member/Page/RecurringContributions.php
Original file line number Diff line number Diff line change
@@ -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'];
2 changes: 1 addition & 1 deletion CRM/Pledge/BAO/Pledge.php
Original file line number Diff line number Diff line change
@@ -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;
6 changes: 3 additions & 3 deletions CRM/Report/Form/Contribute/Bookkeeping.php
Original file line number Diff line number Diff line change
@@ -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],
],
],
@@ -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' => [
@@ -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
4 changes: 2 additions & 2 deletions CRM/Report/Form/Contribute/Detail.php
Original file line number Diff line number Diff line change
@@ -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,
],
@@ -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();
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/History.php
Original file line number Diff line number Diff line change
@@ -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' => [
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/HouseholdSummary.php
Original file line number Diff line number Diff line change
@@ -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' => [
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/Lybunt.php
Original file line number Diff line number Diff line change
@@ -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'],
],
],
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/OrganizationSummary.php
Original file line number Diff line number Diff line change
@@ -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],
],
],
4 changes: 2 additions & 2 deletions CRM/Report/Form/Contribute/Recur.php
Original file line number Diff line number Diff line change
@@ -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,
],
@@ -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) &&
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/Repeat.php
Original file line number Diff line number Diff line change
@@ -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'),
),
),
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/SoftCredit.php
Original file line number Diff line number Diff line change
@@ -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],
],
],
6 changes: 3 additions & 3 deletions CRM/Report/Form/Contribute/Summary.php
Original file line number Diff line number Diff line change
@@ -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,
),
@@ -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,
),
@@ -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) {
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/Sybunt.php
Original file line number Diff line number Diff line change
@@ -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'],
],
],
2 changes: 1 addition & 1 deletion CRM/Report/Form/Contribute/TopDonor.php
Original file line number Diff line number Diff line change
@@ -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],
],
],
4 changes: 2 additions & 2 deletions CRM/Report/Form/Event/ParticipantListing.php
Original file line number Diff line number Diff line change
@@ -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,
),
),
@@ -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) {
4 changes: 2 additions & 2 deletions CRM/Report/Form/Member/ContributionDetail.php
Original file line number Diff line number Diff line change
@@ -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')],
@@ -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();

4 changes: 2 additions & 2 deletions CRM/Report/Form/Member/Detail.php
Original file line number Diff line number Diff line change
@@ -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')],
@@ -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;
2 changes: 1 addition & 1 deletion CRM/Report/Form/Member/Summary.php
Original file line number Diff line number Diff line change
@@ -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',