Code cleanup on Membership form when freezing fields in a recurring exists situation

[eileenmcnaughton]

Overview

Minor code extraction & tidy up

Before

an array of $elements is built as fields are added. It takes work to figure out why

After

Elements to be frozen are frozen as they are added.

Technical Details

I actually was trying to extract out the handling of the date fields to the addEntityFieldsToTemplate() function & convert them to datepicker but I wound up feeling I had to unravel this first

Comments

[civibot]

(Standard links)

• If this is your first pull-request for CiviCRM, please browse CONTRIBUTING.md for information about the development and testing processes.
• If you are reviewing this pull-request, you may wish to consult the test sites and the Review Standards (long template, short template).

[mattwire]

Is this function coming out of some existing code? I think it makes sense but I need to be sure it's not a change in behaviour? - ie. this is assuming that a cancelled membership cannot be renewed and that may not previously have been the case (even if it's the right thing to do)

[seamuslee001]

@mattwire check old lines 666 - 671

[mattwire]

@eileenmcnaughton Could do with a bit of context here - is this a step towards merging Membership and MembershipRenewal forms? Is the freezing elements new for the Membership form, but existing on the MembershipRenewal forms?

[eileenmcnaughton]

@mattwire yeah - a very preliminary step IMHO. When I looked at Membership form the 2 steps I thought should be first were

1. replacing the jcalendar fields
2. setting the status message 'as we go' rather than building $createdMemberships & passing to $this->setStatusMessage($membership, $endDate, $receiptSent, $membershipTypes, $createdMemberships, $isRecur, $calcDates, $mailSend); - This latter is because in order to rationalise post process code it is necessary to reduct / sanitise what variables are needed in later parts of the code.

When I went to do 1 I added the entityFieldsTrait & defined the 3 fields in the setEntityFields & changed the tpl - I got it close to working but realised the setEntityFields needed to be able to specify whether end_date if freezable.

[mattwire]

• (r-explain) Pass
• (r-test) Pass
• (r-code) Pass
• (r-doc) Pass
• (r-maint) Pass
• (r-run) Pass
• (r-user) Pass
• (r-tech) Pass

Good to merge @eileenmcnaughton @seamuslee001

[seamuslee001]

Merging as per @mattwire's review

[eileenmcnaughton]

thanks @mattwire