dev/core#1255 - fix display of email address on pay later contribution

civicrm · Sep 16, 2019 · 40cef32 · 40cef32
1 parent 04d8165
commit 40cef32
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/CRM/Contribute/Form/ContributionBase.php b/CRM/Contribute/Form/ContributionBase.php
@@ -574,9 +574,16 @@ public function assignToTemplate() {
     }
     $this->assignPaymentFields();
 
-    $this->assign('email',
-      $this->controller->exportValue('Main', "email-{$this->_bltID}")
-    );
+    if ($this->_emailExists && empty($this->_params["email-{$this->_bltID}"])) {
+      foreach ($this->_params as $key => $val) {
+        if (substr($key, 0, 6) == 'email-') {
+          $this->assign('email', $this->_params[$key]);
+        }
+      }
+    }
+    else {
+      $this->assign('email', $this->_params["email-{$this->_bltID}"]);
+    }
 
     // also assign the receipt_text
     if (isset($this->_values['receipt_text'])) {