Add grouping options for contribution thank you letters

diff --git a/CRM/Contribute/Form/Task/PDFLetter.php b/CRM/Contribute/Form/Task/PDFLetter.php
index 8ac20f3616b3b83eaf29eae8eb8fcbae5d4c1b47..49c52dbc1e21bbf3f07c8dd444a3f689f6747ac2 100644 (file)
--- a/CRM/Contribute/Form/Task/PDFLetter.php
+++ b/CRM/Contribute/Form/Task/PDFLetter.php
@@ -124,7 +124,7 @@ class CRM_Contribute_Form_Task_PDFLetter extends CRM_Contribute_Form_Task {
     );
     $this->addElement('select', 'group_by', ts('Group contributions by'), $options, array(), "<br/>", FALSE);
     // this was going to be free-text but I opted for radio options in case there was a script injection risk
-        $separatorOptions = array('comma' => 'Comma', 'td' => 'Horizontal Table Cell', 'tr' => 'Vertical Table Cell', 'br' => 'Line Break');
+    $separatorOptions = array('comma' => 'Comma', 'td' => 'Horizontal Table Cell', 'tr' => 'Vertical Table Cell', 'br' => 'Line Break');
 
     $this->addElement('select', 'group_by_separator', ts('Separator (grouped contributions)'), $separatorOptions);
     $emailOptions = array(

diff --git a/CRM/Contribute/Form/Task/PDFLetterCommon.php b/CRM/Contribute/Form/Task/PDFLetterCommon.php
index 5f2876bc93ed86e467bd598361f042453e7e2fc6..bf289554bf3c2d0e4cb43163544dc0b6ba6ec6c9 100644 (file)
--- a/CRM/Contribute/Form/Task/PDFLetterCommon.php
+++ b/CRM/Contribute/Form/Task/PDFLetterCommon.php
@@ -40,13 +40,13 @@ class CRM_Contribute_Form_Task_PDFLetterCommon extends CRM_Contact_Form_Task_PDF
       if ($formValues['group_by_separator'] == 'td') {
         $realSeparator = "</td><td>";
       }
-               elseif ($formValues['group_by_separator'] == 'tr') {
-                 $realSeparator = "</td></tr><tr><td>";
-               }
-               elseif ($formValues['group_by_separator'] == 'br') {
-                 $realSeparator = "<br />";
-               }
-        }
+      elseif ($formValues['group_by_separator'] == 'tr') {
+        $realSeparator = "</td></tr><tr><td>";
+      }
+      elseif ($formValues['group_by_separator'] == 'br') {
+        $realSeparator = "<br />";
+      }
+    }
     $separator = '****~~~~';// a placeholder in case the separator is common in the string - e.g ', '
     $validated = FALSE;