Merge pull request civicrm#16458 from twomice/1573_extra_columns_cont…

…ribution_detail_report

Fix for #1573: Extra columns for Contribution Detail report.

CRM/Report/Form.php

@@ -2548,6 +2548,23 @@ protected function alterContactID($value, &$row, $fieldname) {
     return $value;
   }
 
+  /**
+   * @param $value
+   * @param $row
+   * @param $fieldname
+   *
+   * @return mixed
+   */
+  protected function alterCommunicationtMethod($value, &$row, $fieldname) {
+    $communicationMethods = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'preferred_communication_method');
+
+    // Explode padded values.
+    $values = CRM_utils_array::explodePadded($value);
+    // Flip values, compute intersection with $communicationMethods, and implode with commas.
+    $value = implode(', ', array_intersect_key($communicationMethods, array_flip($values)));
+    return $value;
+  }
+
   /**
    * @param $value
    *
@@ -5463,6 +5480,15 @@ protected function getContactColumns($options = []) {
         'is_group_bys' => TRUE,
         'is_order_bys' => TRUE,
       ],
+      $options['prefix'] . 'preferred_communication_method' => [
+        'title' => $options['prefix_label'] . ts('Preferred Communication Method'),
+        'alter_display' => 'alterCommunicationtMethod',
+        'name' => 'preferred_communication_method',
+        'is_fields' => TRUE,
+        'is_filters' => FALSE,
+        'is_group_bys' => FALSE,
+        'is_order_bys' => FALSE,
+      ],
     ];
     foreach ([
       'postal_greeting_display' => 'Postal Greeting',
@@ -5697,7 +5723,7 @@ protected function getAddressColumns($options = []) {
       $options['prefix'] . 'postal_code' => [
         'title' => $options['prefix_label'] . ts('Postal Code'),
         'name' => 'postal_code',
-        'type' => 1,
+        'type' => 2,
         'is_fields' => TRUE,
         'is_filters' => TRUE,
         'is_group_bys' => TRUE,
@@ -5706,7 +5732,7 @@ protected function getAddressColumns($options = []) {
       $options['prefix'] . 'postal_code_suffix' => [
         'title' => $options['prefix_label'] . ts('Postal Code Suffix'),
         'name' => 'postal_code_suffix',
-        'type' => 1,
+        'type' => 2,
         'is_fields' => TRUE,
         'is_filters' => TRUE,
         'is_group_bys' => TRUE,