From 557284070a353e0b003368773ac151739bdd2d06 Mon Sep 17 00:00:00 2001 From: markjcrane Date: Thu, 8 Jun 2023 12:44:19 -0600 Subject: [PATCH] Times the delay by 1000 instead of 500. When using enterprise use originate timeout --- .../resources/scripts/app/ring_groups/index.lua | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/app/scripts/resources/scripts/app/ring_groups/index.lua b/app/scripts/resources/scripts/app/ring_groups/index.lua index 7398c6b6b7..545377773e 100644 --- a/app/scripts/resources/scripts/app/ring_groups/index.lua +++ b/app/scripts/resources/scripts/app/ring_groups/index.lua @@ -1,5 +1,5 @@ -- Part of FusionPBX --- Copyright (C) 2010-2022 Mark J Crane +-- Copyright (C) 2010-2023 Mark J Crane -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without @@ -477,7 +477,7 @@ sql = [[ SELECT r.ring_group_strategy, r.ring_group_timeout_app, r.ring_group_distinctive_ring, - d.destination_number, d.destination_delay * 500 as destination_delay, d.destination_timeout, d.destination_prompt, + d.destination_number, d.destination_delay * 1000 as destination_delay, d.destination_timeout, d.destination_prompt, 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_timeout_data, r.ring_group_ringback @@ -743,12 +743,13 @@ delimiter = ":_:"; end - --leg delay settings + --leg delay and timeout settings if (ring_group_strategy == "enterprise") then delay_name = "originate_delay_start"; - --destination_delay = destination_delay * 500; + timeout_name = "originate_timeout"; else delay_name = "leg_delay_start"; + timeout_name = "leg_timeout"; end --export the ringback @@ -822,11 +823,11 @@ end --send to user - local dial_string_to_user = "[sip_invite_domain="..domain_name..",domain_name="..domain_name..",call_direction="..call_direction..","..group_confirm.."leg_timeout="..destination_timeout..","..delay_name.."="..destination_delay..",dialed_extension=" .. row.destination_number .. ",extension_uuid=".. extension_uuid .. row.record_session .. hold_music .."]user/" .. row.destination_number .. "@" .. domain_name; + local dial_string_to_user = "[sip_invite_domain="..domain_name..",domain_name="..domain_name..",call_direction="..call_direction..","..group_confirm..""..timeout_name.."="..destination_timeout..","..delay_name.."="..destination_delay..",dialed_extension=" .. row.destination_number .. ",extension_uuid=".. extension_uuid .. row.record_session .. hold_music .."]user/" .. row.destination_number .. "@" .. domain_name; dial_string = dial_string_to_user; elseif (tonumber(destination_number) == nil) then --sip uri - dial_string = "[sip_invite_domain="..domain_name..",domain_name="..domain_name..",call_direction="..call_direction..","..group_confirm.."leg_timeout="..destination_timeout..","..delay_name.."="..destination_delay.."]" .. row.destination_number; + dial_string = "[sip_invite_domain="..domain_name..",domain_name="..domain_name..",call_direction="..call_direction..","..group_confirm..""..timeout_name.."="..destination_timeout..","..delay_name.."="..destination_delay.."]" .. row.destination_number; else --external number -- have to double destination_delay here due a FS bug requiring a 50% delay value for internal externsions, but not external calls. @@ -866,7 +867,7 @@ end --set the destination dial string - dial_string = "[toll_allow=".. toll_allow ..",".. caller_id ..",sip_invite_domain="..domain_name..",domain_name="..domain_name..",domain_uuid="..domain_uuid..",call_direction="..call_direction..","..group_confirm.."leg_timeout="..destination_timeout..","..delay_name.."="..destination_delay.."]"..route_bridge + dial_string = "[toll_allow=".. toll_allow ..",".. caller_id ..",sip_invite_domain="..domain_name..",domain_name="..domain_name..",domain_uuid="..domain_uuid..",call_direction="..call_direction..","..group_confirm..""..timeout_name.."="..destination_timeout..","..delay_name.."="..destination_delay.."]"..route_bridge end --add a delimiter between destinations