From: eileen <emcnaughton@wikimedia.org>
Date: Fri, 22 Jan 2016 02:12:49 +0000 (+1300)
Subject: CRM-17837 Add communication preference fields to standard available contact info
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=ea477981161622560b95bb69adc8dd836a99c085;p=civicrm-core.git

CRM-17837 Add communication preference fields to standard available contact info

Change-Id: Ic97e906b9f2513c6e87564fc3c1a222afa25f091
---

diff --git a/CRM/Report/Form.php b/CRM/Report/Form.php
index 8e2327a780..775f41cffe 100644
--- a/CRM/Report/Form.php
+++ b/CRM/Report/Form.php
@@ -4157,6 +4157,17 @@ LEFT JOIN civicrm_contact {$field['alias']} ON {$field['alias']}.id = {$this->_a
         $entryFound = TRUE;
       }
     }
+    $yesNoFields = array(
+      'do_not_email', 'is_deceased', 'do_not_phone', 'do_not_sms', 'do_not_mail', 'is_opt_out',
+    );
+    foreach ($yesNoFields as $fieldName) {
+      if (array_key_exists('civicrm_contact_' . $fieldName, $row)) {
+        // Since these are essentially 'negative fields' it feels like it
+        // makes sense to only highlight the exceptions hence no 'No'.
+        $rows[$rowNum]['civicrm_contact_' . $fieldName] = !empty($rows[$rowNum]['civicrm_contact_' . $fieldName]) ? ts('Yes') : '';
+        $entryFound = TRUE;
+      }
+    }
     return $entryFound;
   }
 
@@ -4333,6 +4344,12 @@ LEFT JOIN civicrm_contact {$field['alias']} ON {$field['alias']}.id = {$this->_a
       'external_identifier' => array(
         'title' => ts('Contact identifier from external system'),
       ),
+      'do_not_email' => array(),
+      'do_not_phone' => array(),
+      'do_not_mail' => array(),
+      'do_not_sms' => array(),
+      'is_opt_out' => array(),
+      'is_deceased' => array(),
     );
   }