additional fixes

diff --git a/CRM/Pledge/Form/Pledge.php b/CRM/Pledge/Form/Pledge.php
index 555c4b0a4fb258c5e821d21f2ed9d6a2d0a091cc..599281f083a86a6eb984bb18f2d0f76453deb6c4 100644 (file)
--- a/CRM/Pledge/Form/Pledge.php
+++ b/CRM/Pledge/Form/Pledge.php
@@ -352,11 +352,14 @@ class CRM_Pledge_Form_Pledge extends CRM_Core_Form {
       $this->addDate('start_date', ts('Payments Start'), TRUE);
     }
 
+    if (!empty($this->_values['currency'])) {
+      $this->assign('currency', $this->_values['currency']);
+    }
+
     if ($this->_id &&
       !$this->_isPending
     ) {
       $eachPaymentAmount = $this->_values['original_installment_amount'];
-      $this->assign('currency', $this->_values['currency']);
       $this->assign('eachPaymentAmount', $eachPaymentAmount);
       $this->assign('hideCalender', TRUE);
     }

diff --git a/templates/CRM/Pledge/Form/Pledge.tpl b/templates/CRM/Pledge/Form/Pledge.tpl
index 4a292be3e62dbf7d4ebc1282de12ddc32029f93f..12489b494e7fa5a7a6d1d1a3bf996b12883d9378 100644 (file)
--- a/templates/CRM/Pledge/Form/Pledge.tpl
+++ b/templates/CRM/Pledge/Form/Pledge.tpl
@@ -71,11 +71,13 @@
         <tr class="crm-pledge-form-block-installments">
       <td class="label">{$form.installments.label}</td>
       <td>{$form.installments.html} {ts}installments of{/ts}
-        {if $action eq 1 or $isPending}
-         <span class="currency-symbol">{$form.eachPaymentAmount.html|crmMoney:$currency}</span>
-        {elseif $action eq 2 and !$isPending}
-          <span class="currency-symbol">{$eachPaymentAmount|crmMoney:$currency} </span>
-        {/if}&nbsp;{ts}every{/ts}&nbsp;{$form.frequency_interval.html}&nbsp;{$form.frequency_unit.html}</td></tr>
+        <span class='currency-symbol'>
+          {if $action eq 1 or $isPending}
+            {$form.eachPaymentAmount.html|crmMoney:$currency}
+          {elseif $action eq 2 and !$isPending}
+            {$eachPaymentAmount|crmMoney:$currency}
+          {/if}
+        </span>&nbsp;{ts}every{/ts}&nbsp;{$form.frequency_interval.html}&nbsp;{$form.frequency_unit.html}</td></tr>
         <tr class="crm-pledge-form-block-frequency_day">
       <td class="label nowrap">{$form.frequency_day.label}</td>
       <td>{$form.frequency_day.html} {ts}day of the period{/ts}<br />
@@ -149,28 +151,26 @@
 // bind first click of accordion header to load crm-accordion-body with snippet
 // everything else taken care of by cj().crm-accordions()
 cj(document).ready( function() {
-  var eachPaymentAmout = cj('#eachPaymentAmount');
-  var symbol = cj('#currency option:selected').text();
-  if( symbol.indexOf('(') > 0) {
-    symbol = symbol.substring(symbol.lastIndexOf("(")+1,symbol.lastIndexOf(")"));
-  }
-  cj('.currency-symbol').text(symbol).append("&nbsp;").append(eachPaymentAmout);
-  // if there are more than one currency enabled.
-  cj('#currency').change(function() {
-    symbol = cj(this).find(':selected').text();
-    if( symbol.indexOf('(') > 0) {
-      symbol = symbol.substring(symbol.lastIndexOf("(")+1,symbol.lastIndexOf(")"));
-    }
-    cj('.currency-symbol').text(symbol).append("&nbsp;").append(eachPaymentAmout);
-  });
-
     cj('.crm-ajax-accordion .crm-accordion-header').one('click', function() {
       loadPanes(cj(this).attr('id'));
     });
+    cj('#currency').on('change', function() {
+      replaceCurrency(cj(this).children(':selected').text());
+    });
     cj('.crm-ajax-accordion:not(.collapsed) .crm-accordion-header').each(function(index) {
       loadPanes(cj(this).attr('id'));
-      });
+    });
 });
+
+function replaceCurrency(val) {
+  var eachPaymentAmout = cj('#eachPaymentAmount');
+  var pos = val.indexOf("(") + 1;
+  if (pos) {
+    val = val.slice(pos, val.lastIndexOf(")"));
+  }
+  cj('.currency-symbol').text(val).append("&nbsp;").append(eachPaymentAmout);
+}
+
 // load panes function calls for snippet based on id of crm-accordion-header
 function loadPanes( id ) {
     var url = "{/literal}{crmURL p='civicrm/contact/view/pledge' q='snippet=4&formType=' h=0}{literal}" + id;