From: Eileen McNaughton <emcnaughton@wikimedia.org>
Date: Mon, 11 Dec 2023 19:57:53 +0000 (+1300)
Subject: Clarify handling of is_email_receipt
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=88101b7bfabba6e0a56dedbefb5f4106639bf0c2;p=civicrm-core.git

Clarify handling of is_email_receipt

This makes it clear the value is coming from getSubmittedValue() & clears up some
conditional silliness
---

diff --git a/CRM/Contribute/Form/AdditionalPayment.php b/CRM/Contribute/Form/AdditionalPayment.php
index 6292703094..974dab2ff9 100644
--- a/CRM/Contribute/Form/AdditionalPayment.php
+++ b/CRM/Contribute/Form/AdditionalPayment.php
@@ -352,7 +352,7 @@ class CRM_Contribute_Form_AdditionalPayment extends CRM_Contribute_Form_Abstract
 
     $statusMsg = ts('The payment record has been processed.');
     // send email
-    if (!empty($paymentID) && !empty($this->_params['is_email_receipt'])) {
+    if (!empty($paymentID) && $this->getSubmittedValue('is_email_receipt')) {
       $sendResult = civicrm_api3('Payment', 'sendconfirmation', ['id' => $paymentID, 'from' => $submittedValues['from_email_address']])['values'][$paymentID];
       if ($sendResult['is_sent']) {
         $statusMsg .= ' ' . ts('A receipt has been emailed to the contributor.');
@@ -364,7 +364,7 @@ class CRM_Contribute_Form_AdditionalPayment extends CRM_Contribute_Form_Abstract
 
   public function processCreditCard(): ?array {
     // we need to retrieve email address
-    if ($this->_context === 'standalone' && !empty($this->_params['is_email_receipt'])) {
+    if ($this->_context === 'standalone' && $this->getSubmittedValue('is_email_receipt')) {
       [$displayName] = CRM_Contact_BAO_Contact_Location::getEmailDetails($this->_contactId);
       $this->assign('displayName', $displayName);
     }
@@ -381,13 +381,8 @@ class CRM_Contribute_Form_AdditionalPayment extends CRM_Contribute_Form_Abstract
     CRM_Core_Payment_Form::mapParams($this->_bltID, $this->getSubmittedValues(), $paymentParams, TRUE);
 
     $paymentParams['contributionPageID'] = NULL;
-    if (!empty($this->_params['is_email_receipt'])) {
-      $paymentParams['email'] = $this->_contributorEmail;
-      $paymentParams['is_email_receipt'] = TRUE;
-    }
-    else {
-      $paymentParams['is_email_receipt'] = $this->_params['is_email_receipt'] = FALSE;
-    }
+    $paymentParams['email'] = $this->_contributorEmail;
+    $paymentParams['is_email_receipt'] = (bool) $this->getSubmittedValue('is_email_receipt');
 
     $result = NULL;