From d7cd7a4a9321b878eede66f211a04c23ccabc486 Mon Sep 17 00:00:00 2001 From: Eileen McNaughton Date: Tue, 17 Mar 2015 15:56:04 +1300 Subject: [PATCH] CRM-16124 - is_email_receipt on complete_transaction should give precedence to Conflicts: CRM/Core/Payment/BaseIPN.php --- CRM/Core/Payment/BaseIPN.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/CRM/Core/Payment/BaseIPN.php b/CRM/Core/Payment/BaseIPN.php index f5f2aad4a9..4cfe9ab88d 100644 --- a/CRM/Core/Payment/BaseIPN.php +++ b/CRM/Core/Payment/BaseIPN.php @@ -438,6 +438,9 @@ class CRM_Core_Payment_BaseIPN { $recurContrib = &$objects['contributionRecur']; $values = array(); + if (isset($input['is_email_receipt'])) { + $values['is_email_receipt'] = $input['is_email_receipt']; + } $source = NULL; if ($input['component'] == 'contribute') { if ($contribution->contribution_page_id) { @@ -453,8 +456,10 @@ class CRM_Core_Payment_BaseIPN { $values['receipt_from_name'] = $domainValues[0]; $values['receipt_from_email'] = $domainValues[1]; } - if ($recurContrib && $recurContrib->id) { + + if ($recurContrib && $recurContrib->id && !isset($input['is_email_receipt'])) { //CRM-13273 - is_email_receipt setting on recurring contribution should take precedence over contribution page setting + // but CRM-16124 if $input['is_email_receipt'] is set then that should not be overridden. $values['is_email_receipt'] = $recurContrib->is_email_receipt; } -- 2.25.1