From 6249d5f4cfc4d83ba987c25a755ef56f8858040f Mon Sep 17 00:00:00 2001
From: Eileen McNaughton <eileen@fuzion.co.nz>
Date: Fri, 29 May 2015 00:04:27 +1200
Subject: [PATCH] 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

---
 templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl  | 2 +-
 templates/CRM/Contribute/Form/AdditionalInfo/DirectDebit.tpl | 2 +-
 templates/CRM/Contribute/Form/UpdateBilling.tpl              | 2 +-
 templates/CRM/Event/Cart/Form/Checkout/Payment.tpl           | 2 +-
 templates/CRM/Event/Form/EventFees.tpl                       | 2 +-
 templates/CRM/Member/Form/MembershipCommon.tpl               | 3 ++-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl b/templates/CRM/Contribute/Form/AdditionalInfo/CreditCard.tpl
index 678173b0db..be1ed5994f 100644
--- 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 380fbf8f3a..e32959f064 100644
--- 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 5737a66161..ed6ac62913 100644
--- 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 c7962ee963..b35aefd81f 100644
--- 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 19ec0b1d7b..a430b98567 100644
--- 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 39af164a1d..ecbcf6512c 100644
--- 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}
-- 
2.25.1