Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-10-14-11-24-52

[civicrm-core.git] / templates / CRM / Contribute / Form / Contribution / Main.tpl

diff --git a/templates/CRM/Contribute/Form/Contribution/Main.tpl b/templates/CRM/Contribute/Form/Contribution/Main.tpl
index 4fe19ea10eaf1e536fc9ed51efd7e1561d82c85b..4a64c72409368facb2a4cd1b364391f75a87a54d 100644 (file)
--- a/templates/CRM/Contribute/Form/Contribution/Main.tpl
+++ b/templates/CRM/Contribute/Form/Contribution/Main.tpl
@@ -279,7 +279,7 @@
 
   <div id="billing-payment-block">
     {* If we have a payment processor, load it - otherwise it happens via ajax *}
-    {if $ppType}
+    {if $ppType or $isBillingAddressRequiredForPayLater}
       {include file="CRM/Contribute/Form/Contribution/Main.tpl" snippet=4}
     {/if}
   </div>
@@ -463,10 +463,12 @@
       var total_amount_tmp =  $(this).data('raw-total'); 
       // Hide billing questions if this is free
       if (total_amount_tmp == 0){
-        cj("#billing-payment-block").hide(); 
+        cj("#billing-payment-block").hide();
+        cj(".payment_options-group").hide();  
       } 
       else {
-        cj("#billing-payment-block").show(); 
+        cj("#billing-payment-block").show();
+        cj(".payment_options-group").show(); 
       }
     }