From e968dceb1e3adddd4b17060daa5683c7c788bda7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Frank=20J=2E=20G=C3=B3mez?= Date: Tue, 29 Apr 2014 18:33:43 -0700 Subject: [PATCH] Fix for CRM-14375: Membership fee doubled when fixed contribution option set to "no thank you." ---------------------------------------- * CRM-14375: Membership fee doubled when fixed contribution option set to "no thank you" https://issues.civicrm.org/jira/browse/CRM-14375 --- CRM/Contribute/Form/Contribution/Confirm.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CRM/Contribute/Form/Contribution/Confirm.php b/CRM/Contribute/Form/Contribution/Confirm.php index d3ad8718ca..f98081eb59 100644 --- a/CRM/Contribute/Form/Contribution/Confirm.php +++ b/CRM/Contribute/Form/Contribution/Confirm.php @@ -172,6 +172,17 @@ class CRM_Contribute_Form_Contribution_Confirm extends CRM_Contribute_Form_Contr && CRM_Utils_Array::value("price_{$contriPriceId}", $this->_params) < 1 && empty($this->_params["price_{$priceField->id}"])) { $this->_params['amount'] = null; } + + // Fix for CRM-14375 - If we are using separate payments and "no + // thank you" is selected for the additional contribution, set + // contribution amount to be null, so that it will not show + // contribution amount same as membership amount. + if ($this->_membershipBlock['is_separate_payment'] + && $this->_values['fee'][$priceField->id]['name'] == 'contribution_amount' + && $this->_params["price_{$priceField->id}"] == '-1' + ) { + $this->_params['amount'] = null; + } } } $this->_params['currencyID'] = $config->defaultCurrency; -- 2.25.1