CRM-16555 include BillingBlockWrapper as part of refactoring forms to have same behaviour

The wrapper has an extra div which is crucial for switching so where it isn't present, add the wrapper version
Also, note the wrapper may get the extra script added rather than billingBlock as part of the refactor (scri

diff --git a/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl b/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl
index 678173b0db85763731a997e50f8fc30938178037..be1ed5994fedcd730015ce0a46170f3933715e10 100644 (file)
--- a/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl
+++ b/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl
@@ -25,7 +25,7 @@
 *}
 {* this template is used for adding Credit Cart and billing details *}
 <div id="id-creditCard" class="section-shown">
-    {include file='CRM/Core/BillingBlock.tpl'}
+    {include file='CRM/Core/BillingBlockWrapper.tpl'}
 </div>
 
 {include file="CRM/Contribute/Form/AdditionalInfo/Payment.tpl"}

diff --git a/templates/CRM/Contribute/Form/AdditionalInfo/DirectDebit.tpl b/templates/CRM/Contribute/Form/AdditionalInfo/DirectDebit.tpl
index 380fbf8f3aa250c7f3a7bfb3d1c2fafffce46bed..e32959f064351032e3beb4661f88bdfbf0df6eac 100644 (file)
--- a/templates/CRM/Contribute/Form/AdditionalInfo/DirectDebit.tpl
+++ b/templates/CRM/Contribute/Form/AdditionalInfo/DirectDebit.tpl
@@ -25,6 +25,6 @@
 *}
 {* this template is used for adding Credit Cart and billing details *}
 <div id="id-directDebit" class="section-shown">
-  {include file='CRM/Core/BillingBlock.tpl'}
+  {include file='CRM/Core/BillingBlockWrapper.tpl'}
 </div>
 {include file="CRM/Contribute/Form/AdditionalInfo/Payment.tpl"}

diff --git a/templates/CRM/Contribute/Form/UpdateBilling.tpl b/templates/CRM/Contribute/Form/UpdateBilling.tpl
index 5737a66161152b193c6ba747a2b7a8f9dab9f54c..ed6ac62913e16819d5bc99da4a822c60acd1246e 100644 (file)
--- a/templates/CRM/Contribute/Form/UpdateBilling.tpl
+++ b/templates/CRM/Contribute/Form/UpdateBilling.tpl
@@ -36,6 +36,6 @@
   {/if}
 </div>
 
-{include file="CRM/Core/BillingBlock.tpl"}
+{include file="CRM/Core/BillingBlockWrapper.tpl"}
 
 <div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>

diff --git a/templates/CRM/Event/Cart/Form/Checkout/Payment.tpl b/templates/CRM/Event/Cart/Form/Checkout/Payment.tpl
index c7962ee9633583111579b66a2bb82040cc257460..b35aefd81f674fe56cabf6ff036fe91fa2522837 100644 (file)
--- a/templates/CRM/Event/Cart/Form/Checkout/Payment.tpl
+++ b/templates/CRM/Event/Cart/Form/Checkout/Payment.tpl
@@ -102,7 +102,7 @@
 <div class="pay-later-instructions" style="display:none">
   {$pay_later_instructions}
 </div>
-{include file='CRM/Core/BillingBlock.tpl'}
+{include file='CRM/Core/BillingBlockWrapper.tpl'}
 {/if}
 {if $collect_billing_email == true}
 <div class="crm-section {$form.billing_contact_email.name}-section">

diff --git a/templates/CRM/Event/Form/EventFees.tpl b/templates/CRM/Event/Form/EventFees.tpl
index 19ec0b1d7bda384b13dd3fff18d4a3d691c5e3d6..a430b98567cca5d602fc966e8f4a2b8fdb2519ea 100644 (file)
--- a/templates/CRM/Event/Form/EventFees.tpl
+++ b/templates/CRM/Event/Form/EventFees.tpl
@@ -115,7 +115,7 @@
 {* credit card block when it is live or test mode*}
 {if $participantMode and $paid}
   <div class="spacer"></div>
-  {include file='CRM/Core/BillingBlock.tpl'}
+  {include file='CRM/Core/BillingBlockWrapper.tpl'}
 {/if}
 {if ($email OR $batchEmail) and $outBound_option != 2}
     <fieldset id="send_confirmation_receipt"><legend>{if $paid}{ts}Registration Confirmation and Receipt{/ts}{else}{ts}Registration Confirmation{/ts}{/if}</legend>

diff --git a/templates/CRM/Member/Form/MembershipCommon.tpl b/templates/CRM/Member/Form/MembershipCommon.tpl
index 39af164a1d69ffadfa3743ca5331652beea1fa83..ecbcf6512c3d378281690e88343a504d4bff7a81 100644 (file)
--- a/templates/CRM/Member/Form/MembershipCommon.tpl
+++ b/templates/CRM/Member/Form/MembershipCommon.tpl
@@ -99,8 +99,9 @@
   </tr>
   <tr class="crm-membership-form-block-billing">
     <td colspan="2">
-      {include file='CRM/Core/BillingBlock.tpl'}
+      {include file='CRM/Core/BillingBlockWrapper.tpl'}
     </td>
   </tr>
+
   <div class="spacer"></div>
 {/if}