Simplify billingName logic on xml/templates/message_templates/members…

[eileenmcnaughton]

Overview

This continues the patterns set by #15532 and #15646

Before

Complex logic used to include BillingName and also credit card details

After

Less complex logic

@seamuslee001 per my comments on #15651 I think we need to reverse the IF order for this one as the $email is present in both cases so putting it in the elseif works I think

[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).

[seamuslee001]

@eileenmcnaughton try that on the contribution_online_receipt and you will have some fun times that is the one that is causing the test failures

[eileenmcnaughton]

@seamuslee001 I know - there is a plan for that one - it involves some tweaks to actually ensure we do assign the variables to the tpl in the completeOrder process - if they have been collected they will be saved as an address linked by the contribution id - so we can get it. In the meantime I figured change all the others except that one & then do that one last.

We could legitimately alter the test - but I suspect the above approach is betttter

[seamuslee001]

ok that makes sense merging