diff --git a/CRM/Contribute/BAO/ContributionRecur.php b/CRM/Contribute/BAO/ContributionRecur.php index 980782b6a071..3ce962e062f9 100644 --- a/CRM/Contribute/BAO/ContributionRecur.php +++ b/CRM/Contribute/BAO/ContributionRecur.php @@ -1037,8 +1037,8 @@ public static function buildOptions($fieldName, $context = NULL, $props = []) { $params = []; switch ($fieldName) { case 'payment_processor_id': - if (isset(\Civi::$statics[__CLASS__]['buildoptions_payment_processor_id'])) { - return \Civi::$statics[__CLASS__]['buildoptions_payment_processor_id']; + if (isset(\Civi::$statics[__CLASS__]['buildoptions_payment_processor_id'][$context])) { + return \Civi::$statics[__CLASS__]['buildoptions_payment_processor_id'][$context]; } $baoName = 'CRM_Contribute_BAO_ContributionRecur'; $params['condition']['test'] = "is_test = 0"; @@ -1057,7 +1057,7 @@ public static function buildOptions($fieldName, $context = NULL, $props = []) { } $allProcessors = $liveProcessors + $testProcessors; ksort($allProcessors); - \Civi::$statics[__CLASS__]['buildoptions_payment_processor_id'] = $allProcessors; + \Civi::$statics[__CLASS__]['buildoptions_payment_processor_id'][$context] = $allProcessors; return $allProcessors; } return CRM_Core_PseudoConstant::get(__CLASS__, $fieldName, $params, $context); diff --git a/CRM/Contribute/DAO/ContributionRecur.php b/CRM/Contribute/DAO/ContributionRecur.php index 9a2a9418eca1..830712e5f3e1 100644 --- a/CRM/Contribute/DAO/ContributionRecur.php +++ b/CRM/Contribute/DAO/ContributionRecur.php @@ -6,7 +6,7 @@ * * Generated from xml/schema/CRM/Contribute/ContributionRecur.xml * DO NOT EDIT. Generated by CRM_Core_CodeGen - * (GenCodeChecksum:fd697cd9f74b697ebc373d3a62526be0) + * (GenCodeChecksum:6d77881ddf63ce2b56752b87c0d37ee8) */ /** @@ -782,7 +782,7 @@ public static function &fields() { 'pseudoconstant' => [ 'table' => 'civicrm_payment_processor', 'keyColumn' => 'id', - 'labelColumn' => 'name', + 'labelColumn' => 'title', ], 'add' => '3.3', ], diff --git a/tests/phpunit/CRM/Utils/TokenConsistencyTest.php b/tests/phpunit/CRM/Utils/TokenConsistencyTest.php index 495f27b96e8b..0f625f4dd799 100644 --- a/tests/phpunit/CRM/Utils/TokenConsistencyTest.php +++ b/tests/phpunit/CRM/Utils/TokenConsistencyTest.php @@ -458,7 +458,7 @@ protected function getExpectedContributionRecurTokenOutPut(): string { contribution_recur.contribution_status_id:label :Pending Label** contribution_recur.contribution_status_id:name :Pending contribution_recur.payment_processor_id:label :Dummy (test) -contribution_recur.payment_processor_id:name :Dummy (test) +contribution_recur.payment_processor_id:name :Dummy_test contribution_recur.financial_type_id:label :Member Dues contribution_recur.financial_type_id:name :Member Dues contribution_recur.payment_instrument_id:label :Check diff --git a/tests/phpunit/CiviTest/CiviUnitTestCase.php b/tests/phpunit/CiviTest/CiviUnitTestCase.php index bf0ca8949bb2..b680aac7adeb 100644 --- a/tests/phpunit/CiviTest/CiviUnitTestCase.php +++ b/tests/phpunit/CiviTest/CiviUnitTestCase.php @@ -891,6 +891,7 @@ public function processorCreate($params = []) { $processorParams = [ 'domain_id' => 1, 'name' => 'Dummy', + 'title' => 'Dummy', 'payment_processor_type_id' => 'Dummy', 'financial_account_id' => 12, 'is_test' => TRUE, diff --git a/xml/schema/Contribute/ContributionRecur.xml b/xml/schema/Contribute/ContributionRecur.xml index 10ccc535920a..b19292e66a13 100644 --- a/xml/schema/Contribute/ContributionRecur.xml +++ b/xml/schema/Contribute/ContributionRecur.xml @@ -359,7 +359,7 @@ civicrm_payment_processor
id - name + title
Select