From d44db0967189c9d8b1970d31b88f7849913cc8d8 Mon Sep 17 00:00:00 2001 From: Karthikeyan Date: Wed, 27 Dec 2017 15:34:38 +0530 Subject: [PATCH] Fix for CRM-21485 - Tax not added when renewing membership in backend --- CRM/Member/Form/MembershipRenewal.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php index 6734e5a716..5d3100286b 100644 --- a/CRM/Member/Form/MembershipRenewal.php +++ b/CRM/Member/Form/MembershipRenewal.php @@ -230,7 +230,8 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form { parent::buildQuickForm(); - $defaults = parent::setDefaultValues(); + //CRM-21485 + $defaults = self::setDefaultValues(); $this->assign('customDataType', 'Membership'); $this->assign('customDataSubType', $this->_memType); $this->assign('entityID', $this->_id); @@ -240,7 +241,7 @@ class CRM_Member_Form_MembershipRenewal extends CRM_Member_Form { //CRM-16950 $taxRates = CRM_Core_PseudoConstant::getTaxRates(); - $taxRate = CRM_Utils_Array::value($this->allMembershipTypeDetails[$defaults['membership_type_id']]['financial_type_id'], $taxRates); + $taxRate = CRM_Utils_Array::value($defaults['financial_type_id'], $taxRates);//CRM-21485 $invoiceSettings = Civi::settings()->get('contribution_invoice_settings'); @@ -271,7 +272,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($values['financial_type_id'], $taxRates)) { + if (CRM_Utils_Array::value($defaults['financial_type_id'], $taxRates)) { //CRM-21485 $taxAmount = ($taxRate / 100) * CRM_Utils_Array::value('minimum_fee', $values); $totalAmount = $totalAmount + $taxAmount; } -- 2.25.1