From f9901e7f5c8ea55f73fc65a7bcb3204da8ed4815 Mon Sep 17 00:00:00 2001 From: Kurund Jalmi Date: Wed, 24 Dec 2014 00:50:33 +0530 Subject: [PATCH] Revert "CRM-15714 CiviContribute convert validateCreditCard to validatePaymentInstrument" --- CRM/Contribute/Form/Contribution/Main.php | 2 +- CRM/Contribute/Form/UpdateBilling.php | 2 +- CRM/Core/Payment.php | 11 ----------- CRM/Core/Payment/Form.php | 11 ----------- CRM/Event/Cart/Form/Checkout/Payment.php | 2 +- CRM/Event/Form/Participant.php | 2 +- CRM/Event/Form/Registration/AdditionalParticipant.php | 2 +- CRM/Event/Form/Registration/Register.php | 2 +- CRM/Member/Form/Membership.php | 2 +- 9 files changed, 7 insertions(+), 29 deletions(-) diff --git a/CRM/Contribute/Form/Contribution/Main.php b/CRM/Contribute/Form/Contribution/Main.php index 1c4c339fd3..4daba4f89b 100644 --- a/CRM/Contribute/Form/Contribution/Main.php +++ b/CRM/Contribute/Form/Contribution/Main.php @@ -1074,7 +1074,7 @@ class CRM_Contribute_Form_Contribution_Main extends CRM_Contribute_Form_Contribu if (!empty($self->_paymentFields)) { CRM_Core_Form::validateMandatoryFields($self->_paymentFields, $fields, $errors); } - CRM_Core_Payment_Form::validatePaymentInstrument($fields, $errors, $self); + CRM_Core_Payment_Form::validateCreditCard($fields, $errors); foreach (CRM_Contact_BAO_Contact::$_greetingTypes as $greeting) { if ($greetingType = CRM_Utils_Array::value($greeting, $fields)) { diff --git a/CRM/Contribute/Form/UpdateBilling.php b/CRM/Contribute/Form/UpdateBilling.php index 638589226a..46986518c6 100644 --- a/CRM/Contribute/Form/UpdateBilling.php +++ b/CRM/Contribute/Form/UpdateBilling.php @@ -230,7 +230,7 @@ class CRM_Contribute_Form_UpdateBilling extends CRM_Core_Form { CRM_Core_Form::validateMandatoryFields($self->_fields, $fields, $errors); // make sure that credit card number and cvv are valid - CRM_Core_Payment_Form::validatePaymentInstrument($fields, $errors, $self); + CRM_Core_Payment_Form::validateCreditCard($fields, $errors); return empty($errors) ? TRUE : $errors; } diff --git a/CRM/Core/Payment.php b/CRM/Core/Payment.php index 28cb94dc67..c964ce2a9e 100644 --- a/CRM/Core/Payment.php +++ b/CRM/Core/Payment.php @@ -194,17 +194,6 @@ abstract class CRM_Core_Payment { return FALSE; } - /** - * Default payment instrument validation - * Implement the usual Luhn algorithm via a static function in the CRM_Core_Payment_Form if it's a credit card - * Not a static function, because I need to check for payment_type - */ - public function validatePaymentInstrument($values, &$errors) { - if ($this->_paymentProcessor['payment_type'] == 1) { - CRM_Core_Payment_Form::validateCreditCard($values, $errors); - } - } - /** * Setter for the payment form that wants to use the processor * diff --git a/CRM/Core/Payment/Form.php b/CRM/Core/Payment/Form.php index 5ca94e5055..72f863446a 100644 --- a/CRM/Core/Payment/Form.php +++ b/CRM/Core/Payment/Form.php @@ -312,17 +312,6 @@ class CRM_Core_Payment_Form { } } - /** - * Validate the payment instrument values before passing it to the payment processor - * We want this to be overrideable by the payment processor, and default to using - * this object's validCreditCard for credit cards (implemented as the default in the Payment class). - */ - public function validatePaymentInstrument($values, &$errors, $form) { - $paymentProcessor = CRM_Financial_BAO_PaymentProcessor::getPayment($values['payment_processor'],'live'); - $payment = CRM_Core_Payment::singleton('live', $paymentProcessor, $form); - $payment->validatePaymentInstrument($values, $errors); - } - /** * The credit card pseudo constant results only the CC label, not the key ID * So we normalize the name to use it as a CSS class. diff --git a/CRM/Event/Cart/Form/Checkout/Payment.php b/CRM/Event/Cart/Form/Checkout/Payment.php index 001bc52447..6767bce06b 100644 --- a/CRM/Event/Cart/Form/Checkout/Payment.php +++ b/CRM/Event/Cart/Form/Checkout/Payment.php @@ -400,7 +400,7 @@ class CRM_Event_Cart_Form_Checkout_Payment extends CRM_Event_Cart_Form_Cart { CRM_Core_Form::validateMandatoryFields($self->_fields, $fields, $errors); // make sure that credit card number and cvv are valid - CRM_Core_Payment_Form::validatePaymentInstrument($fields, $errors, $self); + CRM_Core_Payment_Form::validateCreditCard($fields, $errors); } return empty($errors) ? TRUE : $errors; diff --git a/CRM/Event/Form/Participant.php b/CRM/Event/Form/Participant.php index 91d23d6ac3..a57d376bea 100644 --- a/CRM/Event/Form/Participant.php +++ b/CRM/Event/Form/Participant.php @@ -821,7 +821,7 @@ class CRM_Event_Form_Participant extends CRM_Contribute_Form_AbstractEditPayment if (!empty($values['payment_processor_id'])) { // make sure that credit card number and cvv are valid - CRM_Core_Payment_Form::validatePaymentInstrument($values, $errorMsg, $self); + CRM_Core_Payment_Form::validateCreditCard($values, $errorMsg); } if (!empty($values['record_contribution'])) { diff --git a/CRM/Event/Form/Registration/AdditionalParticipant.php b/CRM/Event/Form/Registration/AdditionalParticipant.php index 35731a5b17..40eb6fd667 100644 --- a/CRM/Event/Form/Registration/AdditionalParticipant.php +++ b/CRM/Event/Form/Registration/AdditionalParticipant.php @@ -552,7 +552,7 @@ class CRM_Event_Form_Registration_AdditionalParticipant extends CRM_Event_Form_R CRM_Core_Form::validateMandatoryFields($self->_fields, $fields, $errors); // make sure that credit card number and cvv are valid - CRM_Core_Payment_Form::validatePaymentInstrument($self->_params[0], $errors, $self); + CRM_Core_Payment_Form::validateCreditCard($self->_params[0], $errors); if ($errors) { return FALSE; diff --git a/CRM/Event/Form/Registration/Register.php b/CRM/Event/Form/Registration/Register.php index 2dd0416785..aa68f9b115 100644 --- a/CRM/Event/Form/Registration/Register.php +++ b/CRM/Event/Form/Registration/Register.php @@ -931,7 +931,7 @@ class CRM_Event_Form_Registration_Register extends CRM_Event_Form_Registration { if (!empty($self->_paymentFields)) { CRM_Core_Form::validateMandatoryFields($self->_paymentFields, $fields, $errors); } - CRM_Core_Payment_Form::validatePaymentInstrument($fields, $errors, $self); + CRM_Core_Payment_Form::validateCreditCard($fields, $errors); } foreach (CRM_Contact_BAO_Contact::$_greetingTypes as $greeting) { diff --git a/CRM/Member/Form/Membership.php b/CRM/Member/Form/Membership.php index 38b3d6e432..57ea44a997 100644 --- a/CRM/Member/Form/Membership.php +++ b/CRM/Member/Form/Membership.php @@ -842,7 +842,7 @@ WHERE id IN ( ' . implode(' , ', array_keys($membershipType)) . ' )'; if (!empty($params['payment_processor_id'])) { // make sure that credit card number and cvv are valid - CRM_Core_Payment_Form::validatePaymentInstrument($params, $errors, $self); + CRM_Core_Payment_Form::validateCreditCard($params, $errors); } $joinDate = NULL; -- 2.25.1