From 99ad38dfc5103ac34c4ca4aa5404b921c1caf470 Mon Sep 17 00:00:00 2001 From: Matthew Wire Date: Thu, 7 Dec 2017 17:21:53 +0700 Subject: [PATCH] Further fix for email address missing on contribution thank-you letters --- CRM/Contribute/Form/Task/PDF.php | 4 +++- CRM/Contribute/Form/Task/PDFLetter.php | 4 ++-- CRM/Contribute/Form/Task/PDFLetterCommon.php | 3 +++ 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/CRM/Contribute/Form/Task/PDF.php b/CRM/Contribute/Form/Task/PDF.php index d3572b21ef..69ef1665f2 100644 --- a/CRM/Contribute/Form/Task/PDF.php +++ b/CRM/Contribute/Form/Task/PDF.php @@ -109,7 +109,9 @@ AND {$this->_componentClause}"; document.getElementById('selectEmailFrom').style.display = 'block';") ); $this->addElement('radio', 'output', NULL, ts('PDF Receipts'), 'pdf_receipt', - array('onClick' => "document.getElementById('selectPdfFormat').style.display = 'block';") + array( + 'onClick' => "document.getElementById('selectPdfFormat').style.display = 'block'; + document.getElementById('selectEmailFrom').style.display = 'none';") ); $this->addRule('output', ts('Selection required'), 'required'); diff --git a/CRM/Contribute/Form/Task/PDFLetter.php b/CRM/Contribute/Form/Task/PDFLetter.php index e6b6677d2a..4daa0c6e2c 100644 --- a/CRM/Contribute/Form/Task/PDFLetter.php +++ b/CRM/Contribute/Form/Task/PDFLetter.php @@ -108,8 +108,8 @@ class CRM_Contribute_Form_Task_PDFLetter extends CRM_Contribute_Form_Task { //enable form element $this->assign('suppressForm', FALSE); - // use contact form as a base - CRM_Contact_Form_Task_PDFLetterCommon::buildQuickForm($this); + // Build common form elements + CRM_Contribute_Form_Task_PDFLetterCommon::buildQuickForm($this); // specific need for contributions $this->add('static', 'more_options_header', NULL, ts('Thank-you Letter Options')); diff --git a/CRM/Contribute/Form/Task/PDFLetterCommon.php b/CRM/Contribute/Form/Task/PDFLetterCommon.php index 7a3477fca0..98cba059ed 100644 --- a/CRM/Contribute/Form/Task/PDFLetterCommon.php +++ b/CRM/Contribute/Form/Task/PDFLetterCommon.php @@ -12,6 +12,9 @@ class CRM_Contribute_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDF * @var CRM_Core_Form $form */ public static function buildQuickForm(&$form) { + // use contact form as a base + CRM_Contact_Form_Task_PDFLetterCommon::buildQuickForm($form); + // Contribute PDF tasks allow you to email as well, so we need to add email address to those forms $form->add('select', 'from_email_address', ts('From Email Address'), $form->_fromEmails, TRUE); parent::buildQuickForm($form); -- 2.25.1