From a7274c81563762c370739e964ecfec0438c4752e Mon Sep 17 00:00:00 2001
From: Karthikeyan <jkarthionline@gmail.com>
Date: Thu, 28 Dec 2017 20:46:46 +0530
Subject: [PATCH] Removed changes of First commit

---
 CRM/Member/Form/MembershipRenewal.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php
index c47c3ee183..abb1eb5211 100644
--- a/CRM/Member/Form/MembershipRenewal.php
+++ b/CRM/Member/Form/MembershipRenewal.php
@@ -230,8 +230,7 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form {
 
     parent::buildQuickForm();
 
-    //CRM-21485
-    $defaults = self::setDefaultValues();
+    $defaults = parent::setDefaultValues();
     $this->assign('customDataType', 'Membership');
     $this->assign('customDataSubType', $this->_memType);
     $this->assign('entityID', $this->_id);
@@ -239,14 +238,14 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form {
 
     $allMembershipInfo = array();
 
-    //CRM-16950
-    $taxRates = CRM_Core_PseudoConstant::getTaxRates();
-    $taxRate = CRM_Utils_Array::value($defaults['financial_type_id'], $taxRates);//CRM-21485
-
     if (is_array($defaults['membership_type_id'])) { //CRM-21485
       $defaults['membership_type_id'] = $defaults['membership_type_id'][1];
     }
 
+    //CRM-16950
+    $taxRates = CRM_Core_PseudoConstant::getTaxRates();
+    $taxRate = CRM_Utils_Array::value($this->allMembershipTypeDetails[$defaults['membership_type_id']]['financial_type_id'], $taxRates);
+
     $invoiceSettings = Civi::settings()->get('contribution_invoice_settings');
 
     // auto renew options if enabled for the membership
@@ -276,7 +275,7 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form {
         //CRM-16950
         $taxAmount = NULL;
         $totalAmount = CRM_Utils_Array::value('minimum_fee', $values);
-        if (CRM_Utils_Array::value($defaults['financial_type_id'], $taxRates)) { //CRM-21485
+        if (CRM_Utils_Array::value($values['financial_type_id'], $taxRates)) {
           $taxAmount = ($taxRate / 100) * CRM_Utils_Array::value('minimum_fee', $values);
           $totalAmount = $totalAmount + $taxAmount;
         }
@@ -296,6 +295,7 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form {
       }
     }
 
+
     $this->assign('allMembershipInfo', json_encode($allMembershipInfo));
 
     if ($this->_memType) {
-- 
2.25.1