Towards dev/financial/#16 Paypal unreliable getting payment processor type #12174
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@mattwire this is also waiting for re-review from you |
mattwire
requested changes
May 27, 2018
There was a problem hiding this comment.
@eileenmcnaughton Ok, reviewed and tested this. It's effectively no functional change as we're just replacing string checks with const checks which should be more reliable. If you could just add the @deprecated tag to _processorName then it's ok to merge.
| /** | ||
| * Processor type label. | ||
| * | ||
| * (Deprecated parameter but used in some messages). |
There was a problem hiding this comment.
* @deprecated (Deprecated parameter but used in some messages).
| @@ -110,7 +110,7 @@ public function isPayPalType($typeName) { | |||
| * @throws \Civi\Payment\Exception\PaymentProcessorException | |||
| */ | |||
| protected function supportsBackOffice() { | |||
| if ($this->_processorName == ts('PayPal Pro')) { | |||
| if ($this->isPayPalType($this::PAYPAL_PRO)) { | |||
| @@ -129,7 +129,7 @@ protected function supportsBackOffice() { | |||
| * @throws \Civi\Payment\Exception\PaymentProcessorException | |||
| */ | |||
| protected function supportsPreApproval() { | |||
| if ($this->_processorName == ts('PayPal Express') || $this->_processorName == ts('PayPal Pro')) { | |||
| if ($this->isPayPalType($this::PAYPAL_EXPRESS) || $this->isPayPalType($this::PAYPAL_PRO)) { | |||
| @@ -147,13 +147,13 @@ protected function supportsPreApproval() { | |||
| public function buildForm(&$form) { | |||
| if ($this->supportsPreApproval()) { | |||
| $this->addPaypalExpressCode($form); | |||
| if ($this->_processorName == ts('PayPal Express')) { | |||
| if ($this->isPayPalType($this::PAYPAL_EXPRESS)) { | |||
| CRM_Core_Region::instance('billing-block-post')->add(array( | ||
| 'template' => 'CRM/Financial/Form/PaypalExpress.tpl', | ||
| 'name' => 'paypal_express', | ||
| )); | ||
| } | ||
| if ($this->_processorName == ts('PayPal Pro')) { | ||
| if ($this->isPayPalType($this::PAYPAL_PRO)) { |
| */ | ||
| public function cancelSubscription(&$message = '', $params = array()) { | ||
| if ($this->_paymentProcessor['payment_processor_type'] == 'PayPal') { | ||
| if ($this->isPayPalType($this::PAYPAL_PRO)) { |
| @@ -787,7 +790,7 @@ static public function handlePaymentNotification() { | |||
| * @throws \Civi\Payment\Exception\PaymentProcessorException | |||
| */ | |||
| public function updateSubscriptionBillingInfo(&$message = '', $params = array()) { | |||
| if ($this->_paymentProcessor['payment_processor_type'] == 'PayPal') { | |||
| if ($this->isPayPalType($this::PAYPAL_PRO)) { | |||
| */ | ||
| public function changeSubscriptionAmount(&$message = '', $params = array()) { | ||
| if ($this->_paymentProcessor['payment_processor_type'] == 'PayPal') { | ||
| if ($this->isPayPalType($this::PAYPAL_PRO)) { |
| */ | ||
| public function getPaymentFormFields() { | ||
| if ($this->_processorName == ts('PayPal Pro')) { | ||
| if ($this->isPayPalType($this::PAYPAL_PRO)) { |
| @@ -1177,7 +1181,7 @@ protected function mapPaypalParamsToCivicrmParams($fieldMap, $paypalParams) { | |||
| * @throws \Civi\Payment\Exception\PaymentProcessorException | |||
| */ | |||
| protected function isPaypalExpress($params) { | |||
| if ($this->_processorName == ts('PayPal Express')) { | |||
| if ($this->isPayPalType($this::PAYPAL_EXPRESS)) { | |||
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Overview
Second reviewer's commit of #12007 - code standardisation in paypal class to prevent e-notices & missing details in messages
Before
PHP notice on some payment submissions (eg. via webform_civicrm) and use of "non-standard" param.
After
No PHP notice and uses standard parameter so it works with all payment submissions that use standard methods to populate the payment processor array ($this->_paymentProcessor).
Related: #12091
Technical Details
Comments
@mattwire if you can confirm this still seems good to you I will merge it. I basically went through your commit & re-did it - removing the problematic line in isSupported & fixing this incorrect change
https://github.com/civicrm/civicrm-core/pull/12091/files#diff-96a0ea19e8ac102ef100c35b3b3d1c31R506
I feel OK about this now (as a reviewer's commit)