dev/core#411 - Default currency shown on View participant and contribution page if...

diff --git a/CRM/Contribute/BAO/Contribution.php b/CRM/Contribute/BAO/Contribution.php
index ceb09eb5d97f6f04932ba48bcc700025c2ff8232..6fda2f758fe5f7963168bef46074990b8fafc38c 100644 (file)
--- a/CRM/Contribute/BAO/Contribution.php
+++ b/CRM/Contribute/BAO/Contribution.php
@@ -4115,10 +4115,11 @@ WHERE eft.financial_trxn_id IN ({$trxnId}, {$baseTrxnId['financialTrxnId']})
     }
 
     $paymentBalance = CRM_Core_BAO_FinancialTrxn::getPartialPaymentWithType($id, $entity, FALSE, $total);
-    $contribution = civicrm_api3('Contribution', 'getsingle', array('id' => $contributionId, 'return' => array('is_pay_later', 'contribution_status_id', 'financial_type_id')));
+    $contribution = civicrm_api3('Contribution', 'getsingle', array('id' => $contributionId, 'return' => array('currency', 'is_pay_later', 'contribution_status_id', 'financial_type_id')));
 
     $info['payLater'] = $contribution['is_pay_later'];
     $info['contribution_status'] = $contribution['contribution_status'];
+    $info['currency'] = $contribution['currency'];
 
     $financialTypeId = $contribution['financial_type_id'];
     $feeFinancialAccount = CRM_Contribute_PseudoConstant::getRelationalFinancialAccount($financialTypeId, 'Expense Account is');

diff --git a/templates/CRM/Contribute/Page/PaymentInfo.tpl b/templates/CRM/Contribute/Page/PaymentInfo.tpl
index 4c9d8cc1f4fcc0d74ba303fae9c6c9ecdfe577dd..482c22a366e07af42a5b877ae7e2943b8d1c117a 100644 (file)
--- a/templates/CRM/Contribute/Page/PaymentInfo.tpl
+++ b/templates/CRM/Contribute/Page/PaymentInfo.tpl
@@ -61,10 +61,10 @@ CRM.$(function($) {
     <th class="right">{ts}Balance{/ts}</th>
   </tr>
   <tr>
-    <td>{$paymentInfo.total|crmMoney}</td>
+    <td>{$paymentInfo.total|crmMoney:$paymentInfo.currency}</td>
     <td class='right'>
       {if $paymentInfo.paid > 0}
-        {$paymentInfo.paid|crmMoney}
+        {$paymentInfo.paid|crmMoney:$paymentInfo.currency}
         {if !$hideButtonLinks}
           <br/>
           <a class="crm-hover-button action-item crm-popup medium-popup" href='{crmURL p="civicrm/payment" q="view=transaction&cid=`$cid`&id=`$paymentInfo.id`&component=`$paymentInfo.component`&action=browse"}'>
@@ -74,7 +74,7 @@ CRM.$(function($) {
         {/if}
       {/if}
     </td>
-    <td class="right" id="payment-info-balance" data-balance="{$paymentInfo.balance}">{$paymentInfo.balance|crmMoney}</td>
+    <td class="right" id="payment-info-balance" data-balance="{$paymentInfo.balance}">{$paymentInfo.balance|crmMoney:$paymentInfo.currency}</td>
   </tr>
 </table>
 {if $paymentInfo.balance and !$paymentInfo.payLater && !$hideButtonLinks}

diff --git a/templates/CRM/Price/Page/LineItem.tpl b/templates/CRM/Price/Page/LineItem.tpl
index 8fe2f888ad7467ce692ef74a51d2279016b22e90..59d9c0ba1e0c39943b78fa9df5071a95207afc92 100644 (file)
--- a/templates/CRM/Price/Page/LineItem.tpl
+++ b/templates/CRM/Price/Page/LineItem.tpl
@@ -25,6 +25,10 @@
 *}
 
 {* Displays contribution/event fees when price set is used. *}
+{if !$currency && $fee_currency}
+  {assign var=currency value="$fee_currency"}
+{/if}
+
 {foreach from=$lineItem item=value key=priceset}
   {if $value neq 'skip'}
     {if $lineItem|@count GT 1} {* Header for multi participant registration cases. *}
@@ -68,23 +72,23 @@
           {/if}
           {if $context NEQ "Membership"}
             <td class="right">{$line.qty}</td>
-            <td class="right">{$line.unit_price|crmMoney}</td>
+            <td class="right">{$line.unit_price|crmMoney:$currency}</td>
     {else}
-            <td class="right">{$line.line_total|crmMoney}</td>
+            <td class="right">{$line.line_total|crmMoney:$currency}</td>
           {/if}
     {if !$getTaxDetails && $context NEQ "Membership"}
-      <td class="right">{$line.line_total|crmMoney}</td>
+      <td class="right">{$line.line_total|crmMoney:$currency}</td>
     {/if}
     {if $getTaxDetails}
-      <td class="right">{$line.line_total|crmMoney}</td>
+      <td class="right">{$line.line_total|crmMoney:$currency}</td>
       {if $line.tax_rate != "" || $line.tax_amount != ""}
         <td class="right">{$taxTerm} ({$line.tax_rate}%)</td>
-        <td class="right">{$line.tax_amount|crmMoney}</td>
+        <td class="right">{$line.tax_amount|crmMoney:$currency}</td>
       {else}
         <td></td>
         <td></td>
       {/if}
-      <td class="right">{$line.line_total+$line.tax_amount|crmMoney}</td>
+      <td class="right">{$line.line_total+$line.tax_amount|crmMoney:$currency}</td>
     {/if}
           {if $pricesetFieldsCount}
             <td class="right">{$line.participant_count}</td>
@@ -98,13 +102,13 @@
 <div class="crm-section no-label total_amount-section">
   <div class="content bold">
     {if $getTaxDetails && $totalTaxAmount}
-      {ts 1=$taxTerm}Total %1 Amount{/ts}: {$totalTaxAmount|crmMoney}<br />
+      {ts 1=$taxTerm}Total %1 Amount{/ts}: {$totalTaxAmount|crmMoney:$currency}<br />
     {/if}
     {if $context EQ "Contribution"}
       {ts}Contribution Total{/ts}:
     {elseif $context EQ "Event"}
       {if $totalTaxAmount}
-        {ts}Event SubTotal: {$totalAmount-$totalTaxAmount|crmMoney}{/ts}<br />
+        {ts}Event SubTotal: {$totalAmount-$totalTaxAmount|crmMoney:$currency}{/ts}<br />
       {/if}
       {ts}Event Total{/ts}:
     {elseif $context EQ "Membership"}
@@ -112,7 +116,7 @@
     {else}
       {ts}Total Amount{/ts}:
     {/if}
-    {$totalAmount|crmMoney}
+    {$totalAmount|crmMoney:$currency}
   </div>
   <div class="clear"></div>
   <div class="content bold">