From: kurund <kurund@civicrm.org>
Date: Tue, 9 Dec 2014 09:23:16 +0000 (+0530)
Subject: Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-09-14-48-51
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ab2e3179d57fbd8b60c0730ec38b6cb678100a28;p=civicrm-core.git

Merge remote-tracking branch 'upstream/4.5' into 4.5-master-2014-12-09-14-48-51

Conflicts:
	CRM/Core/BAO/ActionSchedule.php
	templates/CRM/Core/BillingBlock.tpl
---

ab2e3179d57fbd8b60c0730ec38b6cb678100a28
diff --cc CRM/Core/BAO/ActionSchedule.php
index 94b8e0ea66,ba2e5c3a63..a69aa57b77
mode 100644,100755..100644
--- a/CRM/Core/BAO/ActionSchedule.php
+++ b/CRM/Core/BAO/ActionSchedule.php
@@@ -896,15 -886,7 +895,15 @@@ WHERE reminder.action_schedule_id = %1 
              'activity_type_id' => $activityTypeID,
              'source_record_id' => $dao->entityID,
            );
 -          CRM_Activity_BAO_Activity::create($activityParams);
 +          $activity = CRM_Activity_BAO_Activity::create($activityParams);
++          
 +          //file reminder on case if source activity is a case activity
 +          if (!empty($dao->case_id)) {
 +            $caseActivityParams = array();
 +            $caseActivityParams['case_id'] = $dao->case_id;
 +            $caseActivityParams['activity_id'] = $activity->id;
 +            CRM_Case_BAO_Case::processCaseActivity($caseActivityParams);
 +          }
-           
          }
        }
  
diff --cc templates/CRM/Core/BillingBlock.tpl
index f172e866ba,936410cde2..7dd10711d5
--- a/templates/CRM/Core/BillingBlock.tpl
+++ b/templates/CRM/Core/BillingBlock.tpl
@@@ -24,184 -24,277 +24,184 @@@
   +--------------------------------------------------------------------+
  *}
  {crmRegion name="billing-block"}
 -{* Add 'required' marker to billing fields in this template for front-end / online contribution and event registration forms only. *}
 -{if $context EQ 'front-end'}
 -  {assign var=reqMark value=' <span class="crm-marker" title="This field is required.">*</span>'}
 -{else}
 -  {assign var=reqMark value=''}
 -{/if}
 -
 -{if $form.credit_card_number or $form.bank_account_number}
 -    <div id="payment_information">
 -        <fieldset class="billing_mode-group {if $paymentProcessor.payment_type & 2}direct_debit_info-group{else}credit_card_info-group{/if}">
 -            <legend>
 -               {if $paymentProcessor.payment_type & 2}
 -                    {ts}Direct Debit Information{/ts}
 -               {else}
 -                   {ts}Credit Card Information{/ts}
 -               {/if}
 -            </legend>
 -            {if $paymentProcessor.billing_mode & 2 and !$hidePayPalExpress }
 -            <div class="crm-section no-label paypal_button_info-section">
 -              <div class="content description">
 -              {ts}If you have a PayPal account, you can click the PayPal button to continue. Otherwise, fill in the credit card and billing information on this form and click <strong>Continue</strong> at the bottom of the page.{/ts}
 -              </div>
 +<div id="payment_information">
 +  {if $paymentFields|@count}
 +    <fieldset class="billing_mode-group {$paymentTypeName}_info-group">
 +      <legend>
 +        {$paymentTypeLabel}
 +      </legend>
 +      {if $form.$expressButtonName}
 +        {include file= "CRM/Core/paypalexpress.tpl"}
 +      {/if}
 +      <div class="crm-section billing_mode-section {$paymentTypeName}_info-section">
 +        {foreach from=$paymentFields item=paymentField}
 +          <div class="crm-section {$form.$paymentField.name}-section">
 +            <div class="label">{$form.$paymentField.label}</div>
 +            <div class="content">{$form.$paymentField.html}
 +              {if $paymentField == 'cvv2'}{* @todo move to form assignment*}
 +                <span class="cvv2-icon" title="{ts}Usually the last 3-4 digits in the signature area on the back of the card.{/ts}"> </span>
 +              {/if}
 +              {if $paymentField == 'credit_card_type'}
 +                <div class="crm-credit_card_type-icons"></div>
 +              {/if}
              </div>
 -            <div class="crm-section no-label {$form.$expressButtonName.name}-section">
 -              <div class="content description">
 -                {$form.$expressButtonName.html}
 -                <div class="description">Save time. Checkout securely. Pay without sharing your financial information. </div>
 -              </div>
 -            </div>
 -            {/if}
 -
 -            {if $paymentProcessor.billing_mode & 1}
 -                <div class="crm-section billing_mode-section {if $paymentProcessor.payment_type & 2}direct_debit_info-section{else}credit_card_info-section{/if}">
 -                    {if $paymentProcessor.payment_type & 2}
 -                        <div class="crm-section {$form.account_holder.name}-section">
 -                            <div class="label">{$form.account_holder.label}</div>
 -                            <div class="content">{$form.account_holder.html}</div>
 -                            <div class="clear"></div>
 -                        </div>
 -                        <div class="crm-section {$form.bank_account_number.name}-section">
 -                            <div class="label">{$form.bank_account_number.label}</div>
 -                            <div class="content">{$form.bank_account_number.html}</div>
 -                            <div class="clear"></div>
 -                        </div>
 -                        <div class="crm-section {$form.bank_identification_number.name}-section">
 -                            <div class="label">{$form.bank_identification_number.label}</div>
 -                            <div class="content">{$form.bank_identification_number.html}</div>
 -                            <div class="clear"></div>
 -                        </div>
 -                        <div class="crm-section {$form.bank_name.name}-section">
 -                            <div class="label">{$form.bank_name.label}</div>
 -                            <div class="content">{$form.bank_name.html}</div>
 -                            <div class="clear"></div>
 -                        </div>
 -                    {else}
 -                        <div class="crm-section {$form.credit_card_type.name}-section">
 -                             <div class="label">{$form.credit_card_type.label} {$reqMark}</div>
 -                             <div class="content">
 -                                 {$form.credit_card_type.html}
 -                                 <div class="crm-credit_card_type-icons"></div>
 -                             </div>
 -                             <div class="clear"></div>
 -                        </div>
 -                        <div class="crm-section {$form.credit_card_number.name}-section">
 -                             <div class="label">{$form.credit_card_number.label} {$reqMark}</div>
 -                             <div class="content">{$form.credit_card_number.html|crmAddClass:creditcard}</div>
 -                             <div class="clear"></div>
 -                        </div>
 -                        <div class="crm-section {$form.cvv2.name}-section">
 -                            <div class="label">{$form.cvv2.label} {$reqMark}</div>
 -                            <div class="content">
 -                                {$form.cvv2.html}
 -                                <span class="cvv2-icon" title="{ts}Usually the last 3-4 digits in the signature area on the back of the card.{/ts}"> </span>
 -                            </div>
 -                            <div class="clear"></div>
 -                        </div>
 -                        <div class="crm-section {$form.credit_card_exp_date.name}-section">
 -                            <div class="label">{$form.credit_card_exp_date.label} {$reqMark}</div>
 -                            <div class="content">{$form.credit_card_exp_date.html}</div>
 -                            <div class="clear"></div>
 -                        </div>
 -                    {/if}
 -                </div>
 -                </fieldset>
 -
 -                {if $profileAddressFields}
 -                  <input type="checkbox" id="billingcheckbox" value="0"> <label for="billingcheckbox">{ts}My billing address is the same as above{/ts}</label>
 -                {/if}
 -                <fieldset class="billing_name_address-group">
 -                  <legend>{ts}Billing Name and Address{/ts}</legend>
 -                    <div class="crm-section billing_name_address-section">
 -                        <div class="crm-section {$form.billing_first_name.name}-section">
 -                            <div class="label">{$form.billing_first_name.label} {$reqMark}</div>
 -                            <div class="content">{$form.billing_first_name.html}</div>
 -                            <div class="clear"></div>
 -                        </div>
 -                        <div class="crm-section {$form.billing_middle_name.name}-section">
 -                            <div class="label">{$form.billing_middle_name.label}</div>
 -                            <div class="content">{$form.billing_middle_name.html}</div>
 -                            <div class="clear"></div>
 -                        </div>
 -                        <div class="crm-section {$form.billing_last_name.name}-section">
 -                            <div class="label">{$form.billing_last_name.label} {$reqMark}</div>
 -                            <div class="content">{$form.billing_last_name.html}</div>
 -                            <div class="clear"></div>
 -                        </div>
 -                        {assign var=n value=billing_street_address-$bltID}
 -                        <div class="crm-section {$form.$n.name}-section">
 -                            <div class="label">{$form.$n.label} {$reqMark}</div>
 -                            <div class="content">{$form.$n.html}</div>
 -                            <div class="clear"></div>
 -                        </div>
 -                        {assign var=n value=billing_city-$bltID}
 -                        <div class="crm-section {$form.$n.name}-section">
 -                            <div class="label">{$form.$n.label} {$reqMark}</div>
 -                            <div class="content">{$form.$n.html}</div>
 -                            <div class="clear"></div>
 -                        </div>
 -                        {assign var=n value=billing_country_id-$bltID}
 -                        <div class="crm-section {$form.$n.name}-section">
 -                            <div class="label">{$form.$n.label} {$reqMark}</div>
 -                            <div class="content">{$form.$n.html|crmAddClass:big}</div>
 -                            <div class="clear"></div>
 -                        </div>
 -                        {assign var=n value=billing_state_province_id-$bltID}
 -                        <div class="crm-section {$form.$n.name}-section">
 -                            <div class="label">{$form.$n.label} {$reqMark}</div>
 -                            <div class="content">{$form.$n.html|crmAddClass:big}</div>
 -                            <div class="clear"></div>
 -                        </div>
 -                        {assign var=n value=billing_postal_code-$bltID}
 -                        <div class="crm-section {$form.$n.name}-section">
 -                            <div class="label">{$form.$n.label} {$reqMark}</div>
 -                            <div class="content">{$form.$n.html}</div>
 -                            <div class="clear"></div>
 -                        </div>
 -                    </div>
 -                </fieldset>
 +            <div class="clear"></div>
 +          </div>
 +        {/foreach}
 +      </div>
 +    </fieldset>
 +  {/if}
 +  {if $billingDetailsFields|@count}
 +    {if $profileAddressFields}
 +      <input type="checkbox" id="billingcheckbox" value="0">
 +      <label for="billingcheckbox">{ts}My billing address is the same as above{/ts}</label>
 +    {/if}
 +    <fieldset class="billing_name_address-group">
 +      <legend>{ts}Billing Name and Address{/ts}</legend>
 +      <div class="crm-section billing_name_address-section">
 +        {foreach from=$billingDetailsFields item=billingField}
 +          <div class="crm-section {$form.$billingField.name}-section">
 +            <div class="label">{$form.$billingField.label}</div>
 +            {if $form.$billingField.type == 'text'}
 +              <div class="content">{$form.$billingField.html}</div>
              {else}
 -                </fieldset>
 +              <div class="content">{$form.$billingField.html|crmAddClass:big}</div>
              {/if}
 -    </div>
 -
 -     {if $profileAddressFields}
 -     <script type="text/javascript">
 -     {literal}
 -
 -CRM.$(function($) {
 -  // build list of ids to track changes on
 -  var address_fields = {/literal}{$profileAddressFields|@json_encode}{literal};
 -  var input_ids = {};
 -  var select_ids = {};
 -  var orig_id, field, field_name;
 -
 -  // build input ids
 -  $('.billing_name_address-section input').each(function(i){
 -    orig_id = $(this).attr('id');
 -    field = orig_id.split('-');
 -    field_name = field[0].replace('billing_', '');
 -    if(field[1]) {
 -      if(address_fields[field_name]) {
 -        input_ids['#'+field_name+'-'+address_fields[field_name]] = '#'+orig_id;
 -      }
 -    }
 -  });
 -  if($('#first_name').length)
 -    input_ids['#first_name'] = '#billing_first_name';
 -  if($('#middle_name').length)
 -    input_ids['#middle_name'] = '#billing_middle_name';
 -  if($('#last_name').length)
 -    input_ids['#last_name'] = '#billing_last_name';
 -
 -  // build select ids
 -  $('.billing_name_address-section select').each(function(i){
 -    orig_id = $(this).attr('id');
 -    field = orig_id.split('-');
 -    field_name = field[0].replace('billing_', '').replace('_id', '');
 -    if(field[1]) {
 -      if(address_fields[field_name]) {
 -        select_ids['#'+field_name+'-'+address_fields[field_name]] = '#'+orig_id;
 -      }
 -    }
 -  });
 -
 -  // detect if billing checkbox should default to checked
 -  var checked = true;
 -  for(var id in input_ids) {
 -    orig_id = input_ids[id];
 -    if($(id).val() != $(orig_id).val()) {
 -      checked = false;
 -      break;
 -    }
 -  }
 -  for(var id in select_ids) {
 -    orig_id = select_ids[id];
 -    if($(id).val() != $(orig_id).val()) {
 -      checked = false;
 -      break;
 -    }
 -  }
 -  if(checked) {
 -    $('#billingcheckbox').prop('checked', true);
 -    if (!CRM.billing || CRM.billing.billingProfileIsHideable) {
 -      $('.billing_name_address-group').hide();
 -    }
 -  }
 -
 -  // onchange handlers for non-billing fields
 -  for(var id in input_ids) {
 -    orig_id = input_ids[id];
 -    $(id).change(function(){
 -      var id = '#'+$(this).attr('id');
 -      var orig_id = input_ids[id];
 -
 -      // if billing checkbox is active, copy other field into billing field
 -      if($('#billingcheckbox').prop('checked')) {
 -        $(orig_id).val( $(id).val() );
 -      }
 -    });
 -  }
 -  for(var id in select_ids) {
 -    orig_id = select_ids[id];
 -    $(id).change(function(){
 -      var id = '#'+$(this).attr('id');
 -      var orig_id = select_ids[id];
 -
 -      // if billing checkbox is active, copy other field into billing field
 -      if($('#billingcheckbox').prop('checked')) {
 -        $(orig_id+' option').prop('selected', false);
 -        $(orig_id+' option[value="'+$(id).val()+'"]').prop('selected', true);
 +            <div class="clear"></div>
 +          </div>
 +        {/foreach}
 +      </div>
 +    </fieldset>
 +  {/if}
 +</div>
 +{if $profileAddressFields}
 +  <script type="text/javascript">
 +    {literal}
 +
 +    CRM.$(function ($) {
 +      // build list of ids to track changes on
 +      var address_fields = {/literal}{$profileAddressFields|@json_encode}{literal};
 +      var input_ids = {};
 +      var select_ids = {};
 +      var orig_id, field, field_name;
 +
 +      // build input ids
 +      $('.billing_name_address-section input').each(function (i) {
 +        orig_id = $(this).attr('id');
 +        field = orig_id.split('-');
 +        field_name = field[0].replace('billing_', '');
 +        if (field[1]) {
 +          if (address_fields[field_name]) {
 +            input_ids['#' + field_name + '-' + address_fields[field_name]] = '#' + orig_id;
 +          }
 +        }
 +      });
 +      if ($('#first_name').length)
 +        input_ids['#first_name'] = '#billing_first_name';
 +      if ($('#middle_name').length)
 +        input_ids['#middle_name'] = '#billing_middle_name';
 +      if ($('#last_name').length)
 +        input_ids['#last_name'] = '#billing_last_name';
 +
 +      // build select ids
 +      $('.billing_name_address-section select').each(function (i) {
 +        orig_id = $(this).attr('id');
 +        field = orig_id.split('-');
 +        field_name = field[0].replace('billing_', '').replace('_id', '');
 +        if (field[1]) {
 +          if (address_fields[field_name]) {
 +            select_ids['#' + field_name + '-' + address_fields[field_name]] = '#' + orig_id;
 +          }
 +        }
 +      });
 +
 +      // detect if billing checkbox should default to checked
 +      var checked = true;
 +      for (var id in input_ids) {
 +        orig_id = input_ids[id];
 +        if ($(id).val() != $(orig_id).val()) {
 +          checked = false;
 +          break;
 +        }
        }
 -
 -      if(orig_id == '#billing_country_id-5') {
 -        $(orig_id).change();
 +      for (var id in select_ids) {
 +        orig_id = select_ids[id];
 +        if ($(id).val() != $(orig_id).val()) {
 +          checked = false;
 +          break;
 +        }
        }
 -    });
 -  }
 -
 -
 -  // toggle show/hide
 -  $('#billingcheckbox').click(function(){
 -    if(this.checked) {
 -      if (!CRM.billing || CRM.billing.billingProfileIsHideable) {
 -        $('.billing_name_address-group').hide(200);
 +      if (checked) {
 +        $('#billingcheckbox').prop('checked', true);
-         if (CRM.billing.billingProfileIsHideable) {
++        if (!CRM.billing || CRM.billing.billingProfileIsHideable) {
 +          $('.billing_name_address-group').hide();
 +        }
        }
  
 -      // copy all values
 -      for(var id in input_ids) {
 +      // onchange handlers for non-billing fields
 +      for (var id in input_ids) {
          orig_id = input_ids[id];
 -        $(orig_id).val( $(id).val() );
 +        $(id).change(function () {
 +          var id = '#' + $(this).attr('id');
 +          var orig_id = input_ids[id];
 +
 +          // if billing checkbox is active, copy other field into billing field
 +          if ($('#billingcheckbox').prop('checked')) {
 +            $(orig_id).val($(id).val());
 +          }
 +        });
        }
 -      for(var id in select_ids) {
 +      for (var id in select_ids) {
          orig_id = select_ids[id];
 -        $(orig_id+' option').prop('selected', false);
 -        $(orig_id+' option[value="'+$(id).val()+'"]').prop('selected', true);
 +        $(id).change(function () {
 +          var id = '#' + $(this).attr('id');
 +          var orig_id = select_ids[id];
 +
 +          // if billing checkbox is active, copy other field into billing field
 +          if ($('#billingcheckbox').prop('checked')) {
 +            $(orig_id + ' option').prop('selected', false);
 +            $(orig_id + ' option[value="' + $(id).val() + '"]').prop('selected', true);
 +          }
 +
 +          if (orig_id == '#billing_country_id-5') {
 +            $(orig_id).change();
 +          }
 +        });
        }
 -    } else {
 -      $('.billing_name_address-group').show(200);
 -    }
 -  });
  
 -  // remove spaces, dashes from credit card number
 -  $('#credit_card_number').change(function(){
 -    var cc = $('#credit_card_number').val()
 -      .replace(/ /g, '')
 -      .replace(/-/g, '');
 -    $('#credit_card_number').val(cc);
 -  });
 -});
 -{/literal}
 -</script>
 -{/if}
 +
 +      // toggle show/hide
 +      $('#billingcheckbox').click(function () {
 +        if (this.checked) {
-           if (CRM.billing.billingProfileIsHideable) {
++          if (!CRM.billing || CRM.billing.billingProfileIsHideable) {
 +            $('.billing_name_address-group').hide(200);
 +          }
 +
 +          // copy all values
 +          for (var id in input_ids) {
 +            orig_id = input_ids[id];
 +            $(orig_id).val($(id).val());
 +          }
 +          for (var id in select_ids) {
 +            orig_id = select_ids[id];
 +            $(orig_id + ' option').prop('selected', false);
 +            $(orig_id + ' option[value="' + $(id).val() + '"]').prop('selected', true);
 +          }
 +        } else {
 +          $('.billing_name_address-group').show(200);
 +        }
 +      });
 +
 +      // remove spaces, dashes from credit card number
 +      $('#credit_card_number').change(function () {
 +        var cc = $('#credit_card_number').val()
 +                .replace(/ /g, '')
 +                .replace(/-/g, '');
 +        $('#credit_card_number').val(cc);
 +      });
 +    });
 +    {/literal}
 +  </script>
  {/if}
 +
  {/crmRegion}