Simplify billingblock in Contribution/Form/Main template

[mattwire]

Overview

Simplify billingblock in Contribution/Form/Main template

Before

Contribution page includes CRM/Financial/Form/Payment.tpl which includes CRM/Core/BillingBlock.tpl which adds another `

ending up with one nested inside the other. snippet=4 parameter in the template has no effect, it's an URL param to specify a JSON response, but we are not loading via AJAX...

After

We use the CRM/Core/BillingBlockWrapper.tpl like everywhere else that displays a payment screen.

Technical Details

Comments

@eileenmcnaughton @monishdeb @pradpnayak Are one of you able to test this? There should be no difference - I've tested using webform_civicrm, a contribution page with single/multiple payment processors and via a backend credit card contribution form.

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

[colemanw]

I'm happy to merge this based on code review. I see no functional difference between before/after but agree this is cleaner.