Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MAE-483: Merging workstream branch for CiviCRM 5.35 fixes to master branch #233

Merged
merged 11 commits into from
Mar 25, 2021

Commits on Mar 12, 2021

  1. MAE-494: Fix payment batch submission after CiviCRM 5.35 upgrade

    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.
    omarabuhussein committed Mar 12, 2021
    Configuration menu
    Copy the full SHA
    cd67de8 View commit details
    Browse the repository at this point in the history

Commits on Mar 15, 2021

  1. MAE-501: Fix strict standards warning for method declaration

    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.
    erawat committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    0cb6c15 View commit details
    Browse the repository at this point in the history
  2. MAE-501: Add AbstractEmailCommon class

    This abstract common class to decouple functions that duplicate in Contribution and Membership Email classes
    erawat committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    1d0783c View commit details
    Browse the repository at this point in the history
  3. MAE-501: Implement methods as non-static methods

    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.
    erawat committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    fb3ff6a View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    aa28724 View commit details
    Browse the repository at this point in the history
  5. MAE-501: Fix process email when using direct debit template

    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.
    erawat committed Mar 15, 2021
    Configuration menu
    Copy the full SHA
    e93f94b View commit details
    Browse the repository at this point in the history

Commits on Mar 16, 2021

  1. Configuration menu
    Copy the full SHA
    2fca503 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #232 from compucorp/MAE-493-fix-search-button-markup

    MAE-493: Fix search button markup on manage screen
    swastikpareek authored Mar 16, 2021
    Configuration menu
    Copy the full SHA
    1b53cdd View commit details
    Browse the repository at this point in the history
  3. Merge pull request #231 from compucorp/MAE-501-fix-unable-to-send-dir…

    …ectdebit-notification
    
    MAE-501: Fix unable to send direct debit notifications.
    erawat authored Mar 16, 2021
    Configuration menu
    Copy the full SHA
    61d5b24 View commit details
    Browse the repository at this point in the history

Commits on Mar 17, 2021

  1. MAE-494: Fix PHP warnings

    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.
    omarabuhussein committed Mar 17, 2021
    Configuration menu
    Copy the full SHA
    44d902c View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2021

  1. Merge pull request #230 from compucorp/MAE-494-payment-batch-issue

    MAE-494: Fix payment batch submission after CiviCRM 5.35 upgrade
    omarabuhussein authored Mar 18, 2021
    Configuration menu
    Copy the full SHA
    fbd2a15 View commit details
    Browse the repository at this point in the history