From a3a70377d28384b0eb184178cba8ad79ae2d384e Mon Sep 17 00:00:00 2001 From: Pradeep Nayak Date: Tue, 20 Sep 2016 16:29:20 +0530 Subject: [PATCH] CRM-16189, fixed style and removed white space ---------------------------------------- * CRM-16189: https://issues.civicrm.org/jira/browse/CRM-16189 Conflicts: CRM/Contribute/Form/AdditionalPayment.php --- CRM/Contribute/Form/AdditionalPayment.php | 8 ++++++++ CRM/Core/BAO/FinancialTrxn.php | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CRM/Contribute/Form/AdditionalPayment.php b/CRM/Contribute/Form/AdditionalPayment.php index da4c596c92..1a19e6c3e3 100644 --- a/CRM/Contribute/Form/AdditionalPayment.php +++ b/CRM/Contribute/Form/AdditionalPayment.php @@ -423,6 +423,14 @@ class CRM_Contribute_Form_AdditionalPayment extends CRM_Contribute_Form_Abstract if (!empty($submittedValues['is_email_receipt']) && $sendReceipt) { $statusMsg .= ' ' . ts('A receipt has been emailed to the contributor.'); } + // email sending + if (!empty($result) && !empty($submittedValues['is_email_receipt'])) { + $submittedValues['contact_id'] = $this->_contactId; + $submittedValues['contribution_id'] = $this->_contributionId; + // to get 'from email id' for send receipt + $this->fromEmailId = $submittedValues['from_email_address']; + $sendReceipt = $this->emailReceipt($submittedValues); + } CRM_Core_Session::setStatus($statusMsg, ts('Saved'), 'success'); diff --git a/CRM/Core/BAO/FinancialTrxn.php b/CRM/Core/BAO/FinancialTrxn.php index dc9c835916..c723056ed3 100644 --- a/CRM/Core/BAO/FinancialTrxn.php +++ b/CRM/Core/BAO/FinancialTrxn.php @@ -507,7 +507,7 @@ WHERE ft.to_financial_account_id != {$toFinancialAccount} AND ft.to_financial_ac } elseif ($paymentVal > 0) { $value['amount_owed'] = $paymentVal; - } + } elseif ($lineItemTotal == $ftTotalAmt) { $value['full_paid'] = $ftTotalAmt; } -- 2.25.1