From b6ffdf224e9dc944de72b872a1c2de91ec31a445 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Tue, 2 Jun 2015 21:34:24 +1200 Subject: [PATCH] CRM-16605 remove hard-coded payment processor ref --- CRM/Member/Form/MembershipBlock.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/CRM/Member/Form/MembershipBlock.php b/CRM/Member/Form/MembershipBlock.php index 4e8492462f..af6a018766 100644 --- a/CRM/Member/Form/MembershipBlock.php +++ b/CRM/Member/Form/MembershipBlock.php @@ -243,19 +243,13 @@ class CRM_Member_Form_MembershipBlock extends CRM_Contribute_Form_ContributionPa $paymentProcessorId = explode(CRM_Core_DAO::VALUE_SEPARATOR, $paymentProcessorIds); if (!empty($paymentProcessorId)) { - $paymentProcessorType = CRM_Core_PseudoConstant::paymentProcessorType(FALSE, NULL, 'name'); foreach ($paymentProcessorId as $pid) { if ($pid) { - $paymentProcessorTypeId = CRM_Core_DAO::getFieldValue('CRM_Financial_DAO_PaymentProcessor', - $pid, 'payment_processor_type_id' - ); - } - if (!($paymentProcessorTypeId == CRM_Utils_Array::key('PayPal', $paymentProcessorType) || - ($paymentProcessorTypeId == CRM_Utils_Array::key('AuthNet', $paymentProcessorType))) - ) { - $errors['member_price_set_id'] = ts('The membership price set associated with this online contribution allows a user to select BOTH an auto-renew AND a non-auto-renew membership. This requires submitting multiple processor transactions, and is not supported for one or more of the payment processors enabled under the Amounts tab.'); + $processor = Civi\Payment\System::singleton()->getById($pid); + if (!$processor->supports('MultipleConcurrentPayments')) { + $errors['member_price_set_id'] = ts('The membership price set associated with this online contribution allows a user to select BOTH an auto-renew AND a non-auto-renew membership. This requires submitting multiple processor transactions, and is not supported for one or more of the payment processors enabled under the Amounts tab.'); + } } - } } } -- 2.25.1