exclude date improvements

[civicrm-core.git] / templates / CRM / common / paymentBlock.tpl

diff --git a/templates/CRM/common/paymentBlock.tpl b/templates/CRM/common/paymentBlock.tpl
index b8cc72de89ae546e7a697ca1bccbca4657aab942..c1a5b8b8056fde8db98ba55f4216b6c019a55093 100644 (file)
--- a/templates/CRM/common/paymentBlock.tpl
+++ b/templates/CRM/common/paymentBlock.tpl
@@ -27,12 +27,14 @@
 <script type="text/javascript">
 
 function buildPaymentBlock( type ) {
-    if ( type == 0 ) {
-     if (cj("#billing-payment-block").length) {
-           cj("#billing-payment-block").html('');
-   }
-        return;
+  {/literal}{if !$isBillingAddressRequiredForPayLater}{literal}
+  if (type == 0) {
+    if (cj("#billing-payment-block").length) {
+      cj("#billing-payment-block").html('');
     }
+    return;
+  }
+  {/literal}{/if}{literal}
 
   var dataUrl = {/literal}"{crmURL p=$urlPath h=0 q='snippet=4&type='}"{literal} + type;
 
@@ -58,11 +60,11 @@ function buildPaymentBlock( type ) {
   cj('#billing-payment-block').html(response).trigger('crmLoad').trigger('crmFormLoad');
 }
 
-cj( function() {
-    cj('.crm-group.payment_options-group').show();
+CRM.$(function($) {
+    $('.crm-group.payment_options-group').show();
 
-    cj('input[name="payment_processor"]').change( function() {
-        buildPaymentBlock( cj(this).val() );
+    $('input[name="payment_processor"]').change( function() {
+        buildPaymentBlock( $(this).val() );
     });
 });