dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Follow me set accountcode of the for external destinations

Browse Source 
Accountcode of the called extension should be set for follow me
This commit is contained in:
agree
2020-12-10 13:40:11 -05:00
committed by GitHub
parent 7fe118daed
commit 6504fbb6b0
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/scripts/resources/scripts/app/follow_me/index.lua
+13 -5
View File
@@ -81,17 +81,22 @@
toll_allow = api:executeString(cmd); toll_allow = api:executeString(cmd);
--freeswitch.consoleLog("notice", "[follow me][call forward all] " .. destination_number .. " toll_allow is ".. toll_allow .."\n"); --freeswitch.consoleLog("notice", "[follow me][call forward all] " .. destination_number .. " toll_allow is ".. toll_allow .."\n");
--get the extensions accountcode
cmd = "user_data ".. destination_number .."@" ..domain_name.." var accountcode";
accountcode = api:executeString(cmd);
--get the new destination --get the new destination
cmd = "user_data ".. destination_number .."@" ..domain_name.." var forward_all_destination"; cmd = "user_data ".. destination_number .."@" ..domain_name.." var forward_all_destination";
destination_number = api:executeString(cmd); destination_number = api:executeString(cmd);
--freeswitch.consoleLog("notice", "[follow me][call forward all] " .. count .. " " .. cmd .. " ".. destination_number .."\n"); --freeswitch.consoleLog("notice", "[follow me][call forward all] " .. count .. " " .. cmd .. " ".. destination_number .."\n");
count = count + 1; count = count + 1;
if (count < 5) then if (count < 5) then
count, destination_number = get_forward_all(count, destination_number, domain_name); count, destination_number, toll_allow, accountcode = get_forward_all(count, destination_number, domain_name);
end end
end end
end end
return count, destination_number, toll_allow; return count, destination_number, toll_allow, accountcode;
end end
--get the forward busy --get the forward busy
@@ -116,7 +121,7 @@
end end
--select data from the database --select data from the database
local sql = "select follow_me_uuid, toll_allow "; local sql = "select follow_me_uuid, toll_allow, accountcode ";
sql = sql .. "from v_extensions "; sql = sql .. "from v_extensions ";
sql = sql .. "where domain_uuid = :domain_uuid "; sql = sql .. "where domain_uuid = :domain_uuid ";
sql = sql .. "and ( "; sql = sql .. "and ( ";
@@ -130,6 +135,7 @@
status = dbh:query(sql, params, function(row) status = dbh:query(sql, params, function(row)
follow_me_uuid = row["follow_me_uuid"]; follow_me_uuid = row["follow_me_uuid"];
extension_toll_allow = row["toll_allow"]; extension_toll_allow = row["toll_allow"];
accountcode = row["accountcode"];
end); end);
--dbh:query(sql, params, function(row); --dbh:query(sql, params, function(row);
@@ -176,7 +182,7 @@
end end
--follow the forwards --follow the forwards
count, destination_number, toll_allow = get_forward_all(0, row.destination_number, domain_name); count, destination_number, toll_allow, accountcode = get_forward_all(0, row.destination_number, domain_name);
--update values --update values
row['destination_number'] = destination_number row['destination_number'] = destination_number
@@ -200,6 +206,7 @@
--set the values --set the values
external = "true"; external = "true";
row['user_exists'] = "false"; row['user_exists'] = "false";
row['accountcode'] = accountcode;
--add the row to the destinations array --add the row to the destinations array
destinations[x] = row; destinations[x] = row;
end end
@@ -262,6 +269,7 @@
group_confirm_key = row.group_confirm_key; group_confirm_key = row.group_confirm_key;
group_confirm_file = row.group_confirm_file; group_confirm_file = row.group_confirm_file;
toll_allow = row.toll_allow; toll_allow = row.toll_allow;
accountcode = row.accountcode;
user_exists = row.user_exists; user_exists = row.user_exists;
--follow the forwards --follow the forwards
@@ -387,7 +395,7 @@
--set the destination dial string --set the destination dial string
-- have to double destination_delay here due a FS bug requiring a 50% delay value for internal extensions, but not external calls. -- have to double destination_delay here due a FS bug requiring a 50% delay value for internal extensions, but not external calls.
destination_delay = destination_delay * 2; destination_delay = destination_delay * 2;
dial_string = "[ignore_early_media=true,toll_allow=".. toll_allow ..",".. caller_id ..",sip_invite_domain="..domain_name..",domain_uuid="..domain_uuid..",call_direction="..call_direction..","..group_confirm..","..timeout_name.."="..destination_timeout..","..delay_name.."="..destination_delay.."]"..route_bridge dial_string = "[ignore_early_media=true,toll_allow=".. toll_allow ..",accountcode="..accountcode..",".. caller_id ..",sip_invite_domain="..domain_name..",domain_uuid="..domain_uuid..",call_direction="..call_direction..","..group_confirm..","..timeout_name.."="..destination_timeout..","..delay_name.."="..destination_delay.."]"..route_bridge
end end
--add a delimiter between destinations --add a delimiter between destinations