From a1e457ff8ecf8ce9d8f6180c96e0376dc12d316e Mon Sep 17 00:00:00 2001
From: pratikshad <pratiksha.dubey@webaccess.co.in>
Date: Tue, 1 Jul 2014 15:20:25 +0530
Subject: [PATCH] Modified assign of taxRates variable into one line code into
 Contribution.php and removed calculateTaxAmount jquery function into
 Contribution.tpl

---
 CRM/Contribute/Form/Contribution.php          |  4 +---
 .../CRM/Contribute/Form/Contribution.tpl      | 19 ++++++-------------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/CRM/Contribute/Form/Contribution.php b/CRM/Contribute/Form/Contribution.php
index fca7b2c736..36497c9e0f 100644
--- a/CRM/Contribute/Form/Contribution.php
+++ b/CRM/Contribute/Form/Contribution.php
@@ -502,9 +502,7 @@ class CRM_Contribute_Form_Contribution extends CRM_Contribute_Form_AbstractEditP
     }
     $allPanes = array();
     //tax rate from financialType
-    $taxRates = CRM_Core_PseudoConstant::getTaxRates();
-    $taxRates = json_encode($taxRates);
-    $this->assign('taxRates', $taxRates);
+    $this->assign('taxRates', json_encode(CRM_Core_PseudoConstant::getTaxRates()));
 
     // build price set form.
     $buildPriceSet = FALSE;
diff --git a/templates/CRM/Contribute/Form/Contribution.tpl b/templates/CRM/Contribute/Form/Contribution.tpl
index 71fd1ba840..7b5a87b91b 100644
--- a/templates/CRM/Contribute/Form/Contribution.tpl
+++ b/templates/CRM/Contribute/Form/Contribution.tpl
@@ -634,23 +634,16 @@ if(event.handled !== true) {
     var taxRates = JSON.parse(taxRates);
     var taxRate = taxRates[financialType];   
     var totalAmount = cj('#total_amount').val();
-    var taxAmount = calculateTaxAmount(totalAmount,taxRate);
-    var totalTaxAmount = Number(taxAmount)+Number(totalAmount);
+    if (taxRate) { 
+       var totalTaxAmount = Number((taxRate/100)*totalAmount)+Number(totalAmount);
+    }
+    else {
+    	 totalTaxAmount = totalAmount ;
+    }
     cj( "#totalTaxAmount" ).html('Total Amount : '+totalTaxAmount);
     event.handled = true;
     }
      return false;
 });
-
-function calculateTaxAmount(totalAmount,taxRate) {
-    var taxAmount = (taxRate/100)*totalAmount;
-    if(!taxAmount){
-	cj('#totalTaxAmount').html('Total Amount : '+totalAmount);
-    	return false;
-    }
-    else{
-	return taxAmount;
-    }
-}
 </script>
 {/literal}
-- 
2.25.1