From b4486604780caed3470c4c8a48a051731539e284 Mon Sep 17 00:00:00 2001 From: scardinius Date: Mon, 27 Jul 2015 15:43:00 +0200 Subject: [PATCH] CiviMail: distinct events in API Mailing stats --- ang/crmMailing/services.js | 2 +- api/v3/Mailing.php | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ang/crmMailing/services.js b/ang/crmMailing/services.js index 6a155c93b0..b51e0e852c 100644 --- a/ang/crmMailing/services.js +++ b/ang/crmMailing/services.js @@ -483,7 +483,7 @@ getStats: function(mailingIds) { var params = {}; angular.forEach(mailingIds, function(mailingId, name) { - params[name] = ['Mailing', 'stats', {mailing_id: mailingId}]; + params[name] = ['Mailing', 'stats', {mailing_id: mailingId, is_distinct: 0}]; }); return crmApi(params).then(function(result) { var stats = {}; diff --git a/api/v3/Mailing.php b/api/v3/Mailing.php index 46c97b86d8..caa7ffb103 100755 --- a/api/v3/Mailing.php +++ b/api/v3/Mailing.php @@ -693,31 +693,31 @@ function civicrm_api3_mailing_stats($params) { switch ($detail) { case 'Delivered': $stats[$params['mailing_id']] += array( - $detail => CRM_Mailing_Event_BAO_Delivered::getTotalCount($params['mailing_id'], $params['job_id'], FALSE, $params['date']), + $detail => CRM_Mailing_Event_BAO_Delivered::getTotalCount($params['mailing_id'], $params['job_id'], (bool)$params['is_distinct'], $params['date']), ); break; case 'Bounces': $stats[$params['mailing_id']] += array( - $detail => CRM_Mailing_Event_BAO_Bounce::getTotalCount($params['mailing_id'], $params['job_id'], FALSE, $params['date']), + $detail => CRM_Mailing_Event_BAO_Bounce::getTotalCount($params['mailing_id'], $params['job_id'], (bool)$params['is_distinct'], $params['date']), ); break; case 'Unsubscribers': $stats[$params['mailing_id']] += array( - $detail => CRM_Mailing_Event_BAO_Unsubscribe::getTotalCount($params['mailing_id'], $params['job_id'], FALSE, NULL, $params['date']), + $detail => CRM_Mailing_Event_BAO_Unsubscribe::getTotalCount($params['mailing_id'], $params['job_id'], (bool)$params['is_distinct'], NULL, $params['date']), ); break; case 'Unique Clicks': $stats[$params['mailing_id']] += array( - $detail => CRM_Mailing_Event_BAO_TrackableURLOpen::getTotalCount($params['mailing_id'], $params['job_id'], FALSE, NULL, $params['date']), + $detail => CRM_Mailing_Event_BAO_TrackableURLOpen::getTotalCount($params['mailing_id'], $params['job_id'], (bool)$params['is_distinct'], NULL, $params['date']), ); break; case 'Opened': $stats[$params['mailing_id']] += array( - $detail => CRM_Mailing_Event_BAO_Opened::getTotalCount($params['mailing_id'], $params['job_id'], FALSE, $params['date']), + $detail => CRM_Mailing_Event_BAO_Opened::getTotalCount($params['mailing_id'], $params['job_id'], (bool)$params['is_distinct'], $params['date']), ); break; } -- 2.25.1