dev/core#927 Update ContributionCancelActions to also handle 'failed' #19015
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
|
(Standard links)
|
ee11162 to
9bcf8ca
Compare
9bcf8ca to
54a1fd3
Compare
mattwire
reviewed
Nov 23, 2020
| 'cancel_date' => 'now', | ||
| 'contribution_status_id:name' => 'Cancelled', | ||
| ])->addWhere('id', '=', $contributionID)->execute(); | ||
| Civi::log()->debug("Setting contribution status to Failed"); |
There was a problem hiding this comment.
@eileenmcnaughton The comment is not correct anymore - we are actually setting it to "Cancelled", unless that's the typo?
mattwire
reviewed
Nov 23, 2020
| 'cancel_date' => 'now', | ||
| 'contribution_status_id:name' => 'Cancelled', | ||
| ])->addWhere('id', '=', $contribution->id)->execute(); | ||
| Civi::log()->debug("Setting contribution status to Failed"); |
The failed action has no discernable difference from the no-longer-used cancel action. The cancel action had some minor refactoring done to work through the conclusion that the call to addRecurLineItems was never reached in a meaningful way but I think we can skip all that & see that fail is not functionally different to cancel & just deprecate the function. At this point we are very close to simply removing the last core handling for failed & cance & making the extension visible. The only thing I can see that still needs checking in the 2 functions still to be removed is the handling of is_override & override_date is tested - which I will do as a follow up
It is no longer possible to enter a contribution with a cancelled or failed status via the membership form so this test is not valid. Only pending or completed are permitted
0eb64d5 to
7af3d21
Compare
|
Thanks @mattwire definitely a copy & paste fail (should that be cancel) - fixed now |
|
This seems to be fine to me merging |
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
This extends the contributioncancelactions extension to also work for Failed contributions
Before
Failed contributions still handled in the IPN
After
Failed contributions handled via the hook
Technical Details
The failed action has no discernable difference from the no-longer-used cancel action. The cancel action had some minor refactoring
done to work through the conclusion that the call to addRecurLineItems was never reached in a meaningful way
but I think we can skip all that & see that fail is not functionally different to cancel & just deprecate the function.
At this point we are very close to simply removing the last core handling for failed & cance & making the extension visible.
The only thing I can see that still needs checking in the 2 functions still to be removed is the handling of
is_override & override_date is tested - which I will do as a follow up
I removed the test CRM_Member_Form_MembershipTest::testFormWithFailedContribution as this is no longer possible in the UI & hence not valid. The test coverred adding / editing a membership and recording a failed contribution in the process. However the only exposed statuses are Pending & Completed
Comments
https://lab.civicrm.org/dev/core/-/issues/927