nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 00:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update xml_cdr.php

Browse Source 
Fix the order by number alias addition by grouping it with ( and ).
This commit is contained in:
FusionPBX
2016-06-15 11:48:53 -06:00
committed by GitHub
parent 97d6bd24d8
commit 5f1d64bd61
1 changed files with 54 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
app/xml_cdr/resources/classes/xml_cdr.php
View File

@@ -645,9 +645,12 @@ if (!class_exists('xml_cdr')) {
$sql .= "(\n";
$sql .= "select count(*) from v_xml_cdr \n";
$sql .= "where (caller_id_number = e.extension or destination_number = e.extension) \n";
$sql .= "or (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias)) \n";
$sql .= "and domain_uuid = e.domain_uuid \n";
$sql .= "where domain_uuid = e.domain_uuid\n";
$sql .= "and (\n";
$sql .= " (caller_id_number = e.extension or destination_number = e.extension)\n";
$sql .= " or \n";
$sql .= " (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias))\n";
$sql .= ")\n";
$sql .= "and (answer_stamp is not null and bridge_uuid is not null) \n";
if ($this->include_internal) {
$sql .= " and (direction = 'inbound' or direction = 'local') \n";
@@ -660,9 +663,12 @@ if (!class_exists('xml_cdr')) {
$sql .= "(\n";
$sql .= "select count(*) from v_xml_cdr \n";
$sql .= "where (caller_id_number = e.extension or destination_number = e.extension) \n";
$sql .= "or (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias)) \n";
$sql .= "and domain_uuid = e.domain_uuid \n";
$sql .= "where domain_uuid = e.domain_uuid\n";
$sql .= "and (\n";
$sql .= " (caller_id_number = e.extension or destination_number = e.extension)\n";
$sql .= " or \n";
$sql .= " (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias))\n";
$sql .= ")\n";
$sql .= "and (answer_stamp is not null and bridge_uuid is null) \n";
$sql .= "and direction = 'inbound' \n";
if (!$this->include_internal) {
@@ -673,9 +679,12 @@ if (!class_exists('xml_cdr')) {
$sql .= "(\n";
$sql .= "select count(*) from v_xml_cdr \n";
$sql .= "where (caller_id_number = e.extension or destination_number = e.extension) \n";
$sql .= "or (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias)) \n";
$sql .= "and domain_uuid = e.domain_uuid \n";
$sql .= "where domain_uuid = e.domain_uuid\n";
$sql .= "and (\n";
$sql .= " (caller_id_number = e.extension or destination_number = e.extension)\n";
$sql .= " or \n";
$sql .= " (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias))\n";
$sql .= ")\n";
$sql .= "and hangup_cause = 'NO_ANSWER' \n";
if ($this->include_internal) {
$sql .= " and (direction = 'inbound' or direction = 'local') \n";
@@ -688,9 +697,12 @@ if (!class_exists('xml_cdr')) {
$sql .= "(\n";
$sql .= "select count(*) from v_xml_cdr \n";
$sql .= "where (caller_id_number = e.extension or destination_number = e.extension) \n";
$sql .= "or (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias)) \n";
$sql .= "and domain_uuid = e.domain_uuid \n";
$sql .= "where domain_uuid = e.domain_uuid\n";
$sql .= "and (\n";
$sql .= " (caller_id_number = e.extension or destination_number = e.extension)\n";
$sql .= " or \n";
$sql .= " (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias))\n";
$sql .= ")\n";
$sql .= "and hangup_cause = 'USER_BUSY' \n";
if ($this->include_internal) {
$sql .= " and (direction = 'inbound' or direction = 'local') \n";
@@ -703,9 +715,12 @@ if (!class_exists('xml_cdr')) {
$sql .= "(\n";
$sql .= "select SUM(billsec) / count(*) from v_xml_cdr \n";
$sql .= "where (caller_id_number = e.extension or destination_number = e.extension) \n";
$sql .= "or (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias)) \n";
$sql .= "and domain_uuid = e.domain_uuid \n";
$sql .= "where domain_uuid = e.domain_uuid\n";
$sql .= "and (\n";
$sql .= " (caller_id_number = e.extension or destination_number = e.extension)\n";
$sql .= " or \n";
$sql .= " (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias))\n";
$sql .= ")\n";
if (!$this->include_internal) {
$sql .= " and (direction = 'inbound' or direction = 'outbound') \n";
}
@@ -714,9 +729,12 @@ if (!class_exists('xml_cdr')) {
$sql .= "(\n";
$sql .= "select count(*) from v_xml_cdr \n";
$sql .= "where (caller_id_number = e.extension or destination_number = e.extension) \n";
$sql .= "or (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias)) \n";
$sql .= "and domain_uuid = e.domain_uuid \n";
$sql .= "where domain_uuid = e.domain_uuid\n";
$sql .= "and (\n";
$sql .= " (caller_id_number = e.extension or destination_number = e.extension)\n";
$sql .= " or \n";
$sql .= " (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias))\n";
$sql .= ")\n";
if ($this->include_internal) {
$sql .= " and (direction = 'inbound' or direction = 'local') \n";
}
@@ -728,9 +746,12 @@ if (!class_exists('xml_cdr')) {
$sql .= "(\n";
$sql .= "select SUM(billsec) from v_xml_cdr \n";
$sql .= "where (caller_id_number = e.extension or destination_number = e.extension) \n";
$sql .= "or (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias)) \n";
$sql .= "and domain_uuid = e.domain_uuid \n";
$sql .= "where domain_uuid = e.domain_uuid\n";
$sql .= "and (\n";
$sql .= " (caller_id_number = e.extension or destination_number = e.extension)\n";
$sql .= " or \n";
$sql .= " (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias))\n";
$sql .= ")\n";
if ($this->include_internal) {
$sql .= " and (direction = 'inbound' or direction = 'local') \n";
}
@@ -742,18 +763,24 @@ if (!class_exists('xml_cdr')) {
$sql .= "(\n";
$sql .= "select count(*) from v_xml_cdr \n";
$sql .= "where (caller_id_number = e.extension or destination_number = e.extension) \n";
$sql .= "or (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias)) \n";
$sql .= "and domain_uuid = e.domain_uuid \n";
$sql .= "where domain_uuid = e.domain_uuid\n";
$sql .= "and (\n";
$sql .= " (caller_id_number = e.extension or destination_number = e.extension)\n";
$sql .= " or \n";
$sql .= " (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias))\n";
$sql .= ")\n";
$sql .= "and direction = 'outbound' \n";
$sql .= $sql_date_range;
$sql .= ") as outbound_calls, \n";
$sql .= "(";
$sql .= "select SUM(billsec) from v_xml_cdr \n";
$sql .= "where (caller_id_number = e.extension or destination_number = e.extension) \n";
$sql .= "or (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias)) \n";
$sql .= "and domain_uuid = e.domain_uuid \n";
$sql .= "where domain_uuid = e.domain_uuid\n";
$sql .= "and (\n";
$sql .= " (caller_id_number = e.extension or destination_number = e.extension)\n";
$sql .= " or \n";
$sql .= " (e.number_alias is not null and (caller_id_number = e.number_alias or destination_number = e.number_alias))\n";
$sql .= ")\n";
$sql .= "and direction = 'outbound' \n";
$sql .= $sql_date_range;
$sql .= ") as outbound_duration, \n";