|
@@ -33,7 +33,7 @@ discard block |
|
|
block discarded – undo |
|
33
|
33
|
$qb_receipts->add_constraint('orgOpenpsaObtype', '=', org_openpsa_directmarketing_campaign_messagereceipt_dba::SENT); |
|
34
|
34
|
$qb_receipts->add_order('metadata.created'); |
|
35
|
35
|
$receipts = $qb_receipts->execute_unchecked(); |
|
36
|
|
- $receipt_data =& $this->_request_data['report']['receipt_data']; |
|
|
36
|
+ $receipt_data = & $this->_request_data['report']['receipt_data']; |
|
37
|
37
|
$receipt_data['first_send'] = $receipts[0]->metadata->created ?? 0; |
|
38
|
38
|
$receipt_data['last_send'] = end($receipts)->metadata->created ?? 0; |
|
39
|
39
|
$receipt_data['sent'] = count($receipts); |
|
@@ -60,7 +60,7 @@ discard block |
|
|
block discarded – undo |
|
60
|
60
|
|
|
61
|
61
|
private function _get_campaign_data(int $first_send) |
|
62
|
62
|
{ |
|
63
|
|
- $campaign_data =& $this->_request_data['report']['campaign_data']; |
|
|
63
|
+ $campaign_data = & $this->_request_data['report']['campaign_data']; |
|
64
|
64
|
$qb_unsub = org_openpsa_directmarketing_campaign_member_dba::new_query_builder(); |
|
65
|
65
|
$qb_unsub->add_constraint('campaign', '=', $this->_message->campaign); |
|
66
|
66
|
$qb_unsub->add_constraint('orgOpenpsaObtype', '=', org_openpsa_directmarketing_campaign_member_dba::UNSUBSCRIBED); |
|
@@ -84,7 +84,7 @@ discard block |
|
|
block discarded – undo |
|
84
|
84
|
private function _get_link_data($segmentation_param) |
|
85
|
85
|
{ |
|
86
|
86
|
$this->_request_data['report']['link_data'] = []; |
|
87
|
|
- $link_data =& $this->_request_data['report']['link_data']; |
|
|
87
|
+ $link_data = & $this->_request_data['report']['link_data']; |
|
88
|
88
|
|
|
89
|
89
|
$link_data['counts'] = []; |
|
90
|
90
|
$link_data['percentages'] = ['of_links' => [], 'of_recipients' => []]; |
|
@@ -110,7 +110,7 @@ discard block |
|
|
block discarded – undo |
|
110
|
110
|
foreach ($links as $link) { |
|
111
|
111
|
$segment = ''; |
|
112
|
112
|
$segment_notfound = false; |
|
113
|
|
- if ( $segmentation_param |
|
|
113
|
+ if ($segmentation_param |
|
114
|
114
|
&& !empty($link->person)) { |
|
115
|
115
|
try { |
|
116
|
116
|
$person = org_openpsa_contacts_person_dba::get_cached($link->person); |
|
@@ -122,7 +122,7 @@ discard block |
|
|
block discarded – undo |
|
122
|
122
|
$segment_notfound = true; |
|
123
|
123
|
} |
|
124
|
124
|
$link_data['segments'][$segment] ??= $segment_prototype; |
|
125
|
|
- $segment_data =& $link_data['segments'][$segment]; |
|
|
125
|
+ $segment_data = & $link_data['segments'][$segment]; |
|
126
|
126
|
} else { |
|
127
|
127
|
$segment_data = $segment_prototype; |
|
128
|
128
|
} |
|
@@ -230,15 +230,15 @@ discard block |
|
|
block discarded – undo |
|
230
|
230
|
$this->_initialize_field($array['percentages']['of_links'], $link); |
|
231
|
231
|
$this->_initialize_field($array['percentages']['of_recipients'], $link); |
|
232
|
232
|
|
|
233
|
|
- $link_data =& $this->_request_data['report']['link_data']; |
|
234
|
|
- $array['percentages']['of_links'][$link->target]['total'] = ($array['counts'][$link->target]['total']/$link_data['total'])*100; |
|
235
|
|
- $array['percentages']['of_links'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token]/$link_data['total'])*100; |
|
|
233
|
+ $link_data = & $this->_request_data['report']['link_data']; |
|
|
234
|
+ $array['percentages']['of_links'][$link->target]['total'] = ($array['counts'][$link->target]['total'] / $link_data['total']) * 100; |
|
|
235
|
+ $array['percentages']['of_links'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token] / $link_data['total']) * 100; |
|
236
|
236
|
|
|
237
|
|
- $receipt_data =& $this->_request_data['report']['receipt_data']; |
|
238
|
|
- $array['percentages']['of_recipients'][$link->target]['total'] = ((count($array['counts'][$link->target])-1)/($receipt_data['sent']-$receipt_data['bounced']))*100; |
|
239
|
|
- $array['percentages']['of_recipients'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token]/($receipt_data['sent']-$receipt_data['bounced']))*100; |
|
|
237
|
+ $receipt_data = & $this->_request_data['report']['receipt_data']; |
|
|
238
|
+ $array['percentages']['of_recipients'][$link->target]['total'] = ((count($array['counts'][$link->target]) - 1) / ($receipt_data['sent'] - $receipt_data['bounced'])) * 100; |
|
|
239
|
+ $array['percentages']['of_recipients'][$link->target][$link->token] = ($array['counts'][$link->target][$link->token] / ($receipt_data['sent'] - $receipt_data['bounced'])) * 100; |
|
240
|
240
|
|
|
241
|
|
- if ( !isset($array['percentages']['of_recipients']['total']) |
|
|
241
|
+ if (!isset($array['percentages']['of_recipients']['total']) |
|
242
|
242
|
|| $array['percentages']['of_recipients'][$link->target]['total'] > $array['percentages']['of_recipients']['total']) { |
|
243
|
243
|
$array['percentages']['of_recipients']['total'] = $array['percentages']['of_recipients'][$link->target]['total']; |
|
244
|
244
|
} |
flack /
openpsa
