diff --git a/app/ring_groups/app_config.php b/app/ring_groups/app_config.php index c4b5b6c92d..b54bf3c2c3 100644 --- a/app/ring_groups/app_config.php +++ b/app/ring_groups/app_config.php @@ -96,6 +96,10 @@ $apps[$x]['permissions'][$y]['name'] = "ring_group_missed_call"; $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; $apps[$x]['permissions'][$y]['groups'][] = "admin"; + $y++; + $apps[$x]['permissions'][$y]['name'] = "ring_group_forward_toll_allow"; + $apps[$x]['permissions'][$y]['groups'][] = "superadmin"; + $apps[$x]['permissions'][$y]['groups'][] = "admin"; //default settings $y=0; @@ -208,6 +212,10 @@ $apps[$x]['db'][$y]['fields'][$z]['key']['type'] = "foreign"; $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = ""; $z++; + $apps[$x]['db'][$y]['fields'][$z]['name'] = "ring_group_forward_toll_allow"; + $apps[$x]['db'][$y]['fields'][$z]['type'] = "text"; + $apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Toll Allow for Ring Group Forward."; + $z++; $y++; $apps[$x]['db'][$y]['table']['name'] = "v_ring_group_destinations"; diff --git a/app/ring_groups/app_languages.php b/app/ring_groups/app_languages.php index 99175040d2..86294322f0 100644 --- a/app/ring_groups/app_languages.php +++ b/app/ring_groups/app_languages.php @@ -333,6 +333,20 @@ $text['label-forwarding']['ro'] = "expediere"; $text['label-forwarding']['fa'] = ""; $text['label-forwarding']['ar-eg'] = "إعادة توجيه"; +$text['label-ring_group_forward_toll_allow']['en-us'] = "Forwarding Toll Allow"; +$text['label-ring_group_forward_toll_allow']['es-cl'] = "reenvío Toll Allow"; +$text['label-ring_group_forward_toll_allow']['pt-pt'] = "encaminhando Toll Allow"; +$text['label-ring_group_forward_toll_allow']['fr-fr'] = "Expéditeur Toll Allow"; +$text['label-ring_group_forward_toll_allow']['pt-br'] = "encaminhando Toll Allow"; +$text['label-ring_group_forward_toll_allow']['pl'] = "Przekierowanie Toll Allow"; +$text['label-ring_group_forward_toll_allow']['he'] = "שילוח"; +$text['label-ring_group_forward_toll_allow']['uk'] = "експедиція"; +$text['label-ring_group_forward_toll_allow']['sv-se'] = "Spedition Toll Allow"; +$text['label-ring_group_forward_toll_allow']['de-at'] = "Weiterleiten Toll Allow"; +$text['label-ring_group_forward_toll_allow']['ro'] = "expediere"; +$text['label-ring_group_forward_toll_allow']['fa'] = "Toll Allow"; +$text['label-ring_group_forward_toll_allow']['ar-eg'] = "Toll Allow إعادة ت وجيه"; + $text['label-forward_destination']['en-us'] = "Number"; $text['label-forward_destination']['es-cl'] = "Número"; $text['label-forward_destination']['fr-fr'] = "Numéro"; @@ -738,6 +752,17 @@ $text['description']['uk'] = "Редагування інформації обл $text['description']['de-at'] = "Rufgruppen sind gruppierte Ziele, welche über eine vordefinierte Rufstrategie angerufen werden."; $text['description']['he'] = "ערוך את פרטי החשבון"; +$text['description-ring_group_forward_toll_allow']['en-us'] = "Ring group forwarding toll allow."; +$text['description-ring_group_forward_toll_allow']['es-cl'] = "Ring group forwarding toll allow."; +$text['description-ring_group_forward_toll_allow']['fr-fr'] = "Ring group forwarding toll allow."; +$text['description-ring_group_forward_toll_allow']['pt-pt'] = "Ring group forwarding toll allow."; +$text['description-ring_group_forward_toll_allow']['pt-br'] = "Ring group forwarding toll allow."; +$text['description-ring_group_forward_toll_allow']['pl'] = "Ring group forwarding toll allow."; +$text['description-ring_group_forward_toll_allow']['sv-se'] = "Ring group forwarding toll allow."; +$text['description-ring_group_forward_toll_allow']['uk'] = "Ring group forwarding toll allow."; +$text['description-ring_group_forward_toll_allow']['de-at'] = "Ring group forwarding toll allow."; +$text['description-ring_group_forward_toll_allow']['he'] = ""; + $text['button-view_all']['en-us'] = "View All"; $text['button-view_all']['es-cl'] = "Mostrar Todos"; $text['button-view_all']['pt-pt'] = "Mostrar Todos"; diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php index a8e8db4daf..612108dcf5 100644 --- a/app/ring_groups/ring_group_edit.php +++ b/app/ring_groups/ring_group_edit.php @@ -108,6 +108,7 @@ $ring_group_missed_call_data = check_str($_POST["ring_group_missed_call_data"]); $ring_group_forward_enabled = check_str($_POST["ring_group_forward_enabled"]); $ring_group_forward_destination = check_str($_POST["ring_group_forward_destination"]); + $ring_group_forward_toll_allow = check_str($_POST["ring_group_forward_toll_allow"]); $ring_group_enabled = check_str($_POST["ring_group_enabled"]); $ring_group_description = check_str($_POST["ring_group_description"]); $dialplan_uuid = check_str($_POST["dialplan_uuid"]); @@ -375,6 +376,7 @@ $ring_group_missed_call_data = $row["ring_group_missed_call_data"]; $ring_group_forward_enabled = $row["ring_group_forward_enabled"]; $ring_group_forward_destination = $row["ring_group_forward_destination"]; + $ring_group_forward_toll_allow = $row["ring_group_forward_toll_allow"]; $ring_group_enabled = $row["ring_group_enabled"]; $ring_group_description = $row["ring_group_description"]; $dialplan_uuid = $row["dialplan_uuid"]; @@ -712,6 +714,19 @@ echo "\n"; echo "\n"; + if (permission_exists('ring_group_forward_toll_allow')) { + echo "\n"; + echo "\n"; + echo " ".$text['label-ring_group_forward_toll_allow']."\n"; + echo "\n"; + echo "\n"; + echo " \n"; + echo "
\n"; + echo $text['description-ring_group_forward_toll_allow']."\n"; + echo "\n"; + echo "\n"; + } + if (if_group("superadmin")) { echo "\n"; echo "\n"; diff --git a/resources/install/scripts/app/ring_groups/index.lua b/resources/install/scripts/app/ring_groups/index.lua index 760c1da47f..1a6baf16e2 100644 --- a/resources/install/scripts/app/ring_groups/index.lua +++ b/resources/install/scripts/app/ring_groups/index.lua @@ -123,6 +123,7 @@ local log = require "resources.functions.log".ring_group ring_group_extension = row["ring_group_extension"]; ring_group_forward_enabled = row["ring_group_forward_enabled"]; ring_group_forward_destination = row["ring_group_forward_destination"]; + ring_group_forward_toll_allow = row["ring_group_forward_toll_allow"]; ring_group_cid_name_prefix = row["ring_group_cid_name_prefix"]; ring_group_cid_number_prefix = row["ring_group_cid_number_prefix"]; missed_call_app = row["ring_group_missed_call_app"]; @@ -211,6 +212,7 @@ local log = require "resources.functions.log".ring_group --process the ring group if (ring_group_forward_enabled == "true" and string.len(ring_group_forward_destination) > 0) then --forward the ring group + session:setVariable("toll_allow",ring_group_forward_toll_allow); session:execute("transfer", ring_group_forward_destination.." XML "..context); else --get the strategy of the ring group, if random, we use random() to order the destinations