From bce90dfc5537258dd4c1864a69e0ba003c9d0dfa Mon Sep 17 00:00:00 2001 From: Alexey Melnichuk Date: Fri, 23 Oct 2015 14:55:48 +0300 Subject: [PATCH] Change. Use `destination_caller_id_number` as call follow_me caller id. --- app/calls/call_edit.php | 14 ++++++++++++-- app/calls/resources/classes/follow_me.php | 20 +++++++++++++++----- 2 files changed, 27 insertions(+), 7 deletions(-) diff --git a/app/calls/call_edit.php b/app/calls/call_edit.php index dad61a64c3..8c92444b6e 100644 --- a/app/calls/call_edit.php +++ b/app/calls/call_edit.php @@ -611,7 +611,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if (permission_exists('follow_me_cid_set')) { echo "   "; - $sql_follow_me = "select destination_uuid, destination_number, destination_description from v_destinations where domain_uuid = '$domain_uuid' and destination_type = 'inbound' order by destination_number asc "; + $sql_follow_me = "select destination_uuid, destination_number, destination_description, destination_caller_id_number, destination_caller_id_name from v_destinations where domain_uuid = '$domain_uuid' and destination_type = 'inbound' order by destination_number asc "; $prep_statement_follow_me = $db->prepare(check_sql($sql_follow_me)); $prep_statement_follow_me->execute(); $result_follow_me = $prep_statement_follow_me->fetchAll(PDO::FETCH_ASSOC); @@ -621,7 +621,17 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " \n"; foreach ($result_follow_me as &$row_follow_me) { $selected = $row_follow_me["destination_uuid"] == $follow_me_caller_id_uuid ? "selected='selected'" : ''; - echo "\n"; + + $caller_id_number = $row_follow_me['destination_caller_id_number']; + if(strlen($caller_id_number) == 0){ + $caller_id_number = $row_follow_me['destination_number']; + } + $caller_id_name = $row_follow_me['destination_caller_id_name']; + if(strlen($caller_id_name) == 0){ + $caller_id_name = $row_follow_me['destination_description']; + } + + echo "\n"; } echo "\n"; } diff --git a/app/calls/resources/classes/follow_me.php b/app/calls/resources/classes/follow_me.php index 8aeb0f80cc..5cdf86d74e 100644 --- a/app/calls/resources/classes/follow_me.php +++ b/app/calls/resources/classes/follow_me.php @@ -299,16 +299,26 @@ include "root.php"; $dial_string_caller_id_number = "\${caller_id_number}"; if (strlen($this->follow_me_caller_id_uuid) > 0){ - $sql_caller = "select destination_number, destination_description from v_destinations where domain_uuid = '$this->domain_uuid' and destination_type = 'inbound' and destination_uuid = '$this->follow_me_caller_id_uuid'"; + $sql_caller = "select destination_number, destination_description, destination_caller_id_number, destination_caller_id_name from v_destinations where domain_uuid = '$this->domain_uuid' and destination_type = 'inbound' and destination_uuid = '$this->follow_me_caller_id_uuid'"; $prep_statement_caller = $db->prepare($sql_caller); if ($prep_statement_caller) { $prep_statement_caller->execute(); $row_caller = $prep_statement_caller->fetch(PDO::FETCH_ASSOC); - if (strlen($row_caller['destination_description']) > 0) { - $dial_string_caller_id_name = $row_caller['destination_description']; + + $caller_id_number = $row_caller['destination_caller_id_number']; + if(strlen($caller_id_number) == 0){ + $caller_id_number = $row_caller['destination_number']; } - if (strlen($row_caller['destination_number']) > 0) { - $dial_string_caller_id_number = $row_caller['destination_number']; + $caller_id_name = $row_caller['destination_caller_id_name']; + if(strlen($caller_id_name) == 0){ + $caller_id_name = $row_caller['destination_description']; + } + + if (strlen($caller_id_name) > 0) { + $dial_string_caller_id_name = $caller_id_name; + } + if (strlen($caller_id_number) > 0) { + $dial_string_caller_id_number = $caller_id_number; } } }