From 7b1ea4bd6c00e67159fb0304bad1bd90d316c6f6 Mon Sep 17 00:00:00 2001
From: dpradeep <pradeep.dorugade@webaccess.co.in>
Date: Wed, 13 Aug 2014 20:26:56 +0530
Subject: [PATCH] fixes clean money for tax amount

---
 CRM/Contribute/BAO/Contribution/Utils.php      |  2 +-
 templates/CRM/Contribute/Form/Contribution.tpl | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CRM/Contribute/BAO/Contribution/Utils.php b/CRM/Contribute/BAO/Contribution/Utils.php
index f4b958f98d..eb54d0e607 100644
--- a/CRM/Contribute/BAO/Contribution/Utils.php
+++ b/CRM/Contribute/BAO/Contribution/Utils.php
@@ -875,7 +875,7 @@ LIMIT 1
    */
   public static function calculateTaxAmount($amount, $taxRate) {
     $taxAmount = array();
-    $taxAmount['tax_amount'] = ($taxRate/100) * $amount;
+    $taxAmount['tax_amount'] = ($taxRate/100) * CRM_Utils_Rule::cleanMoney($amount);
 
     return $taxAmount;
   }
diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index 96db70630d..48caae26b1 100644
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -653,7 +653,16 @@ CRM.$(function($) {
         taxRate = 0;
       }  
       var totalAmount = $('#total_amount').val();
-      var totalTaxAmount = parseFloat(Number((taxRate/100)*totalAmount)+Number(totalAmount)).toFixed(2);
+      var totalTaxAmount = '{/literal}{$totalTaxAmount}{literal}';
+      var taxAmount = (taxRate/100)*totalAmount.replace(/,/g,'');
+      taxAmount = isNaN (taxAmount) ? 0:taxAmount;
+      if (totalTaxAmount) {
+        var totalTaxAmount = (parseFloat(Number(totalTaxAmount) + Number(totalAmount.replace(/,/g,''))).toFixed(2)).replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1,");
+      }
+      else {
+      	var totalTaxAmount = (parseFloat(taxAmount + Number(totalAmount.replace(/,/g,''))).toFixed(2)).replace(/(\d)(?=(\d{3})+(?!\d))/g, "$1,");
+      }
+
       $("#totalTaxAmount" ).html('Amount with tax : <span id="currencySymbolShow">' + currencySymbol + '</span> '+ totalTaxAmount);
       event.handled = true;
     }
-- 
2.25.1