search

compucorp / uk.co.compucorp.membershipextras

Membership Extras for CiviCRM
Other
5 stars 8 forks source link

IO-122: Merge work stream branch with master branch #342

Closed erawat closed 3 years ago

erawat commented 3 years ago

Overview

This PR is for merging master branch into membership extras version 5 work stream branch.

Since the merging master branch into the works stream branch is not straight forward due to conflicts on following files.

The PR is also adding additional commits to fix the failing tests are on CRM_MembershpExtras_Hook_Pre_MembershipPaymentPlanProcessorTest as the tests that were merged from master branch tested against the code in the master branch which has already been updated in version 5

The reason that the merge has been used rather than rebase as in this case, we would like to preserve the history of commits.