nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix ring group timing for enterprise vs simultaneous

Browse Source
This commit is contained in:
FusionPBX
2023-06-16 14:01:38 -06:00
committed by GitHub
parent 094a0f4388
commit c69535413c
1 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/scripts/resources/scripts/app/ring_groups/index.lua
View File

@@ -477,7 +477,13 @@
sql = [[ sql = [[
SELECT SELECT
r.ring_group_strategy, r.ring_group_timeout_app, r.ring_group_distinctive_ring, r.ring_group_strategy, r.ring_group_timeout_app, r.ring_group_distinctive_ring,
d.destination_number, d.destination_delay * 1000 as destination_delay, d.destination_timeout, d.destination_prompt, d.destination_number, d.destination_timeout, d.destination_prompt,
CASE
WHEN r.ring_group_strategy = 'enterprise'
THEN d.destination_delay * 1000
WHEN r.ring_group_strategy <> 'enterprise'
THEN d.destination_delay
END as destination_delay,
r.ring_group_caller_id_name, r.ring_group_caller_id_number, r.ring_group_caller_id_name, r.ring_group_caller_id_number,
r.ring_group_cid_name_prefix, r.ring_group_cid_number_prefix, r.ring_group_cid_name_prefix, r.ring_group_cid_number_prefix,
r.ring_group_timeout_data, r.ring_group_ringback r.ring_group_timeout_data, r.ring_group_ringback
@@ -585,7 +591,12 @@
--get the follow me destinations --get the follow me destinations
if (follow_me_uuid ~= nil and row.is_follow_me_destination ~= "true") then if (follow_me_uuid ~= nil and row.is_follow_me_destination ~= "true") then
sql = "select d.domain_uuid, d.domain_name, f.follow_me_destination as destination_number, "; sql = "select d.domain_uuid, d.domain_name, f.follow_me_destination as destination_number, ";
sql = sql .. "f.follow_me_delay * 500 as destination_delay, f.follow_me_timeout as destination_timeout, "; if (row.ring_group_strategy == 'enterprise') then
sql = sql .. "f.follow_me_delay * 1000 as destination_delay, ";
else
sql = sql .. "f.follow_me_delay as destination_delay, ";
end
sql = sql .. "f.follow_me_timeout as destination_timeout, ";
sql = sql .. "f.follow_me_prompt as destination_prompt "; sql = sql .. "f.follow_me_prompt as destination_prompt ";
sql = sql .. "from v_follow_me_destinations as f, v_domains as d "; sql = sql .. "from v_follow_me_destinations as f, v_domains as d ";
sql = sql .. "where f.follow_me_uuid = :follow_me_uuid "; sql = sql .. "where f.follow_me_uuid = :follow_me_uuid ";