From d44db0967189c9d8b1970d31b88f7849913cc8d8 Mon Sep 17 00:00:00 2001 From: Karthikeyan Date: Wed, 27 Dec 2017 15:34:38 +0530 Subject: [PATCH 1/4] 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 6734e5a71650..5d3100286b2f 100644 --- a/CRM/Member/Form/MembershipRenewal.php +++ b/CRM/Member/Form/MembershipRenewal.php @@ -230,7 +230,8 @@ public function buildQuickForm() { 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 @@ public function buildQuickForm() { //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 @@ public function buildQuickForm() { //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; } From cea225e854127967799a1e00a131c1ecc3034546 Mon Sep 17 00:00:00 2001 From: Karthikeyan Date: Thu, 28 Dec 2017 14:45:17 +0530 Subject: [PATCH 2/4] Added code as suggested by @jitendrapurohit --- CRM/Member/Form/MembershipRenewal.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php index 5d3100286b2f..c47c3ee183aa 100644 --- a/CRM/Member/Form/MembershipRenewal.php +++ b/CRM/Member/Form/MembershipRenewal.php @@ -243,6 +243,10 @@ public function buildQuickForm() { $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]; + } + $invoiceSettings = Civi::settings()->get('contribution_invoice_settings'); // auto renew options if enabled for the membership From a7274c81563762c370739e964ecfec0438c4752e Mon Sep 17 00:00:00 2001 From: Karthikeyan Date: Thu, 28 Dec 2017 20:46:46 +0530 Subject: [PATCH 3/4] 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 c47c3ee183aa..abb1eb5211d3 100644 --- a/CRM/Member/Form/MembershipRenewal.php +++ b/CRM/Member/Form/MembershipRenewal.php @@ -230,8 +230,7 @@ public function buildQuickForm() { 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 @@ public function buildQuickForm() { $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 @@ public function buildQuickForm() { //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 @@ public function buildQuickForm() { } } + $this->assign('allMembershipInfo', json_encode($allMembershipInfo)); if ($this->_memType) { From 65ef73f539f6d8969b1ea5e0e06524154fd6b9c8 Mon Sep 17 00:00:00 2001 From: Karthikeyan Date: Thu, 4 Jan 2018 18:06:32 +0530 Subject: [PATCH 4/4] Blank line removed --- CRM/Member/Form/MembershipRenewal.php | 1 - 1 file changed, 1 deletion(-) diff --git a/CRM/Member/Form/MembershipRenewal.php b/CRM/Member/Form/MembershipRenewal.php index abb1eb5211d3..e355262a5a81 100644 --- a/CRM/Member/Form/MembershipRenewal.php +++ b/CRM/Member/Form/MembershipRenewal.php @@ -295,7 +295,6 @@ public function buildQuickForm() { } } - $this->assign('allMembershipInfo', json_encode($allMembershipInfo)); if ($this->_memType) {