[REF] Cleanup validation in PaypalProIPN single function #20360
Merged
+6
−16
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
This fixes interaction with the contribution object to instead use the function and switches the standardised error handling (throw an exception & let it be caught). The contribution object used to be passed to completeOrder but no longer so there is no reason to set total_amount & invoice_id on it (they will be used from input)
|
(Standard links)
|
|
@seamuslee001 are you OK to merge this - it's actually pretty straight forward |
| } | ||
| } | ||
| else { | ||
| $contribution->invoice_id = md5(uniqid(rand(), TRUE)); |
There was a problem hiding this comment.
@eileenmcnaughton do we not need to do this for subsequent recurring contributions?
There was a problem hiding this comment.
@seamuslee001 no - I did try to explain in the message template - that contribution doesn't actually 'go anywhere' from here - or at least nowhere that accesses this property
| Civi::log()->debug('PayPalProIPN: Invoice values dont match between database and IPN request.'); | ||
| echo "Failure: Invoice values dont match between database and IPN request<p>contribution is" . $contribution->invoice_id . " and input is " . $input['invoice']; | ||
| return; | ||
| if ($this->getContributionObject()->invoice_id !== $input['invoice']) { |
There was a problem hiding this comment.
This simplification is fine to me
| Civi::log()->debug('PayPalProIPN: Amount values dont match between database and IPN request.'); | ||
| echo "Failure: Amount values dont match between database and IPN request<p>"; | ||
| return; | ||
| if ($this->getContributionObject()->total_amount != $input['amount']) { |
There was a problem hiding this comment.
This simplification is fine to me
| } | ||
| } | ||
| else { |
There was a problem hiding this comment.
This works for me as well
| @@ -402,7 +392,7 @@ public function single($input, $contribution, $recur = FALSE, $first = FALSE) { | |||
| Contribution::update(FALSE)->setValues([ | |||
| 'cancel_date' => 'now', | |||
| 'contribution_status_id:name' => 'Cancelled', | |||
| ])->addWhere('id', '=', $contribution->id)->execute(); | |||
| ])->addWhere('id', '=', $this->getContributionID())->execute(); | |||
| @@ -419,7 +409,7 @@ public function single($input, $contribution, $recur = FALSE, $first = FALSE) { | |||
| return; | |||
| } | |||
|
|
|||
| CRM_Contribute_BAO_Contribution::completeOrder($input, $this->getContributionRecurID(), $contribution->id ?? NULL); | |||
| CRM_Contribute_BAO_Contribution::completeOrder($input, $this->getContributionRecurID(), $this->getContributionID()); | |||
There was a problem hiding this comment.
See how repeat other never gets the contribution - so that invoice_id is set but discarded
|
All seems fine to me now |
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
[REF] Cleanup validation in PaypalProIPN single function
Before
Passed in object used for validation. Properties set on the passed-in-object only to be discarded
After
Simplified validation, unused variables not set
Technical Details
This fixes interaction with the contribution object to instead use the function
and switches the standardised error handling (throw an exception & let
it be caught).
The contribution object used to be passed to completeOrder but no longer
so there is no reason to set total_amount & invoice_id on it
(they will be used from input)
Comments