Skip to content

Commit

Permalink
additional fix
Browse files Browse the repository at this point in the history
  • Loading branch information
monishdeb committed May 26, 2017
1 parent 22d79c8 commit a789061
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
18 changes: 9 additions & 9 deletions CRM/Report/Form/Mailing/Clicks.php
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ public function __construct() {
'grouping' => 'mailing-fields',
);

$this->_columns['civicrm_event_trackable_url_open'] = array(
$this->_columns['civicrm_mailing_event_trackable_url_open'] = array(
'dao' => 'CRM_Mailing_Event_DAO_TrackableURLOpen',
'fields' => array(
'time_stamp' => array(
Expand Down Expand Up @@ -279,19 +279,19 @@ public function from() {
FROM civicrm_contact {$this->_aliases['civicrm_contact']} {$this->_aclFrom}";

$this->_from .= "
INNER JOIN civicrm_mailing_event_queue {$this->_aliases['civicrm_mailing_event_queue']}
ON {$this->_aliases['civicrm_mailing_event_queue']}.contact_id = {$this->_aliases['civicrm_contact']}.id
INNER JOIN civicrm_mailing_event_queue
ON civicrm_mailing_event_queue.contact_id = {$this->_aliases['civicrm_contact']}.id
LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
ON {$this->_aliases['civicrm_mailing_event_queue']}.email_id = {$this->_aliases['civicrm_email']}.id
ON civicrm_mailing_event_queue.email_id = {$this->_aliases['civicrm_email']}.id
INNER JOIN civicrm_mailing_event_trackable_url_open {$this->_aliases['civicrm_mailing_event_trackable_url_open']}
ON {$this->_aliases['civicrm_mailing_event_trackable_url_open']}.event_queue_id = {$this->_aliases['civicrm_mailing_event_queue']}.id
ON {$this->_aliases['civicrm_mailing_event_trackable_url_open']}.event_queue_id = civicrm_mailing_event_queue.id
INNER JOIN civicrm_mailing_trackable_url {$this->_aliases['civicrm_mailing_trackable_url']}
ON {$this->_aliases['civicrm_mailing_event_trackable_url_open']}.trackable_url_id = {$this->_aliases['civicrm_mailing_trackable_url']}.id
INNER JOIN civicrm_mailing_job {$this->_aliases['civicrm_mailing_job']}
ON {$this->_aliases['civicrm_mailing_event_queue']}.job_id = {$this->_aliases['civicrm_mailing_job']}.id
INNER JOIN civicrm_mailing_job
ON civicrm_mailing_event_queue.job_id = civicrm_mailing_job.id
INNER JOIN civicrm_mailing {$this->_aliases['civicrm_mailing']}
ON {$this->_aliases['civicrm_mailing_job']}.mailing_id = {$this->_aliases['civicrm_mailing']}.id
AND {$this->_aliases['civicrm_mailing_job']}.is_test = 0
ON civicrm_mailing_job.mailing_id = {$this->_aliases['civicrm_mailing']}.id
AND civicrm_mailing_job.is_test = 0
";

if ($this->_phoneField) {
Expand Down
20 changes: 10 additions & 10 deletions CRM/Report/Form/Mailing/Opened.php
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ public function __construct() {
'grouping' => 'contact-fields',
);

$this->_columns['civicrm_event_opened'] = array(
$this->_columns['civicrm_mailing_event_opened'] = array(
'dao' => 'CRM_Mailing_Event_DAO_Opened',
'fields' => array(
'id' => array(
Expand Down Expand Up @@ -261,17 +261,17 @@ public function from() {
FROM civicrm_contact {$this->_aliases['civicrm_contact']} {$this->_aclFrom}";

$this->_from .= "
INNER JOIN civicrm_mailing_event_queue {$this->_aliases['civicrm_mailing_event_queue']}
ON {$this->_aliases['civicrm_mailing_event_queue']}.contact_id = {$this->_aliases['civicrm_contact']}.id
INNER JOIN civicrm_mailing_event_queue
ON civicrm_mailing_event_queue.contact_id = {$this->_aliases['civicrm_contact']}.id
LEFT JOIN civicrm_email {$this->_aliases['civicrm_email']}
ON {$this->_aliases['civicrm_mailing_event_queue']}.email_id = {$this->_aliases['civicrm_email']}.id
INNER JOIN civicrm_mailing_event_opened {$this->_aliases['civicrm_event_opened']}
ON {$this->_aliases['civicrm_event_opened']}.event_queue_id = {$this->_aliases['civicrm_mailing_event_queue']}.id
INNER JOIN civicrm_mailing_job {$this->_aliases['civicrm_mailing_job']}
ON {$this->_aliases['civicrm_mailing_event_queue']}.job_id = {$this->_aliases['civicrm_mailing_job']}.id
ON civicrm_mailing_event_queue.email_id = {$this->_aliases['civicrm_email']}.id
INNER JOIN civicrm_mailing_event_opened {$this->_aliases['civicrm_mailing_event_opened']}
ON {$this->_aliases['civicrm_mailing_event_opened']}.event_queue_id = civicrm_mailing_event_queue.id
INNER JOIN civicrm_mailing_job
ON civicrm_mailing_event_queue.job_id = civicrm_mailing_job.id
INNER JOIN civicrm_mailing {$this->_aliases['civicrm_mailing']}
ON {$this->_aliases['civicrm_mailing_job']}.mailing_id = {$this->_aliases['civicrm_mailing']}.id
AND {$this->_aliases['civicrm_mailing_job']}.is_test = 0
ON civicrm_mailing_job.mailing_id = {$this->_aliases['civicrm_mailing']}.id
AND civicrm_mailing_job.is_test = 0
";

if ($this->_phoneField) {
Expand Down

0 comments on commit a789061

Please sign in to comment.