Further simplification

diff --git a/templates/CRM/Member/Form/Membership.tpl b/templates/CRM/Member/Form/Membership.tpl
index 820a85dec1dfddd2aba11b9d566a79fae1486583..b9b252a5e3a531713f784bbf6206bf88ac97ff46 100644 (file)
--- a/templates/CRM/Member/Form/Membership.tpl
+++ b/templates/CRM/Member/Form/Membership.tpl
@@ -299,18 +299,10 @@
         var taxTerm = {/literal}{$taxTerm|@json_encode}{literal};
         var taxRate = taxRates[membershipType['financial_type_id']];
         var currency = {/literal}{$currency_symbol|@json_encode}{literal};
-        var taxAmount = (taxRate/100)*membershipType['total_amount_numeric'];
+        var taxExclusiveAmount = membershipType['total_amount_numeric'] * term;
+        var taxAmount = (taxRate/100)*taxExclusiveAmount;
         taxAmount = isNaN (taxAmount) ? 0:taxAmount;
-        if (term) {
-          if (!taxRate) {
-            var feeTotal = membershipType['total_amount_numeric'] * term;
-          }
-          else {
-            var feeTotal = Number((taxRate/100) * (membershipType['total_amount_numeric'] * term))+Number
-           (membershipType['total_amount_numeric'] * term );
-          }
-          cj("#total_amount").val(CRM.formatMoney(feeTotal, true));
-        }
+        cj("#total_amount").val(CRM.formatMoney(taxExclusiveAmount + taxAmount, true));
 
         var taxMessage = taxRate!=undefined ? 'Includes '+taxTerm+' amount of '+currency+' '+taxAmount:'';
         cj('.totaltaxAmount').html(taxMessage);

diff --git a/templates/CRM/Member/Form/MembershipCommon.tpl b/templates/CRM/Member/Form/MembershipCommon.tpl
index ae2e4eb1d09f669cf1452e37f6f4a745f7a6a849..c47fb31712c977020ea4a0b8c406f2a2de9559c2 100644 (file)
--- a/templates/CRM/Member/Form/MembershipCommon.tpl
+++ b/templates/CRM/Member/Form/MembershipCommon.tpl
@@ -76,7 +76,8 @@
   <tr class="crm-{$formClass}-form-block-total_amount">
     <td class="label">{$form.total_amount.label}</td>
     <td>{$form.total_amount.html}<br />
-      <span class="description">{ts}Membership payment amount.{/ts}</span><div class="totaltaxAmount"></div>
+      <span class="description">{ts}Membership payment amount.{/ts}</span>
+      <div class="totaltaxAmount" data-tax_amount_raw=0></div>
     </td>
   </tr>
   <tr class="crm-membership-form-block-contribution-contact">