CRM-20546: Multiple issues with creation of membership activities

[jitendrapurohit]

Also expands #10323 with additional fixes related to renewal activities creation.

• CRM-20546: Purchasing a Membership online results in 5 Activities, 2 x Contribution ones, plus Renewal and Signup and Status change

[petednz]

@Stoob any chance you can also review since this issue has been a bit of pinball!

[eileenmcnaughton]

@monishdeb aren't you working on this too?

[jitendrapurohit]

@eileenmcnaughton No, actually the fix for CRM-20546 conflicted with already opened PR of Monish, so had a conversation with him yesterday and extended his PR #9468 to fix the extra comments mentioned by Pete #9468 (comment)

[joannechester]

Tested and comments are at; https://issues.civicrm.org/jira/browse/CRM-20546

[monishdeb]

Thanks @jitendrapurohit for making additional fixes and extending desired unit tests. And thanks @joannechester for your review

[eileenmcnaughton]

Merging - I agree with @monishdeb this seems to have been confirmed as an improvement by @joannechester and there is test coverage. I was going to say the code seems to be improved but we seem to have one long function extracted (good) but another long chunk of code added in another function. Perhaps that could have been extracted for readability. Anyway, I'm happy this has been reviewed & tested