MAE-483: Merging workstream branch for CiviCRM 5.35 fixes to master branch #233
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
Manual direct debit is using the core method "transitionComponentWithReturnMessage" that is in the Contribution BAO class, though this method is now removed in core (see civicrm/civicrm-core#18961 for more info), and thus it result in failure when submitting the payment batch. Here I replaced the calls for this method with "transitionComponents", given that the former is basicly calling it but just return some extra feedback messages, and that these returned feedback messages are not even used or showed back to user in this extension, so it is safe to just call "transitionComponents" instead.
PHP does not allow different method signature when override method from the parent class. As the sendEmail method in the child class requires different arguments, the method name has been changed to address the warning.
This abstract common class to decouple functions that duplicate in Contribution and Membership Email classes
The methods in parents class have been moved from the parent class to the traits. In order to use the functions in the traits which is not static, we need to change the context of method that calls the function in traits to have the same context.
Since the common code have been moved from common class to the traits in CiviCRM core, we need to refactor these classes to align with CiviCRM core.
MAE-493: Fix search button markup on manage screen
…ectdebit-notification MAE-501: Fix unable to send direct debit notifications.
When using the API v3 `getvalue` action on any entity, it will return the return value directly, but some places in direct debit importer assumed that it would return the value indexed by the `result` key. Here I am changing that so results from this API action are used directly.
MAE-494: Fix payment batch submission after CiviCRM 5.35 upgrade
erawat
approved these changes
Mar 25, 2021
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.
Merging the fixes we did for CiviCRM 5.35 which includes :
MAE-493: #232
MAE-494: #230
MAE-501: #231