ViciDial/agc_2-X
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added campaign setting for manual_dial_timeout

Browse Source 
git-svn-id: svn://192.168.202.10@2448 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2015-12-30 04:33:24 +00:00
parent f4f4030d33
commit 882c1b5359
7 changed files with 51 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UPGRADE
+3
View File
@@ -215,6 +215,9 @@ OTHER CHANGES:
53. Added utility to gather and display Asterisk debug information. Includes
a server setting and Admin Utilities report.
54. Added campaign setting for manual_dial_timeout for manual dial agent screen
calls only.
extras/MySQL_AST_CREATE_tables.sql
+3 -2
View File
@@ -944,7 +944,8 @@ manual_dial_override_field ENUM('ENABLED','DISABLED') default 'ENABLED',
status_display_ingroup ENUM('ENABLED','DISABLED') default 'ENABLED',
customer_gone_seconds SMALLINT(5) UNSIGNED default '30',
agent_display_fields VARCHAR(50) default '',
am_message_wildcards ENUM('Y','N') default 'N'
am_message_wildcards ENUM('Y','N') default 'N',
manual_dial_timeout VARCHAR(3) default ''
) ENGINE=MyISAM;
CREATE TABLE vicidial_lists (
@@ -3671,4 +3672,4 @@ UPDATE vicidial_configuration set value='1766' where name='qc_database_version';
UPDATE system_settings set vdc_agent_api_active='1';
UPDATE system_settings SET db_schema_version='1443',db_schema_update_date=NOW(),reload_timestamp=NOW();
UPDATE system_settings SET db_schema_version='1444',db_schema_update_date=NOW(),reload_timestamp=NOW();
extras/upgrade_2.12.sql
+4
View File
@@ -436,3 +436,7 @@ unique index(server_ip)
ALTER TABLE servers ADD gather_asterisk_output ENUM('Y','N') default 'N';
UPDATE system_settings SET db_schema_version='1443',db_schema_update_date=NOW() where db_schema_version < 1443;
ALTER TABLE vicidial_campaigns ADD manual_dial_timeout VARCHAR(3) default '';
UPDATE system_settings SET db_schema_version='1444',db_schema_update_date=NOW() where db_schema_version < 1444;
www/agc/vdc_db_query.php
+9 -4
View File
@@ -396,10 +396,11 @@
# 151209-1615 - Fixed issue with possible data loss using callback or dispo comments
# 151212-0916 - Added chat-related functions for the agent interface
# 151220-1109 - Improved logging of chats, emails, inbound calls
# 151229-2316 - Added manual_dial_timeout campaign setting
#
$version = '2.12-291';
$build = '151220-1109';
$version = '2.12-292';
$build = '151229-2316';
$php_script = 'vdc_db_query.php';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=649;
@@ -1675,8 +1676,8 @@ if ($ACTION == 'update_settings')
$wrapup_seconds_override = trim("$row[0]");
##### grab the data from vicidial_users for the user
$stmt="SELECT wrapup_seconds,dead_max,dispo_max,pause_max,dead_max_dispo,dispo_max_dispo,dial_timeout,wrapup_bypass,wrapup_message,wrapup_after_hotkey FROM vicidial_campaigns where campaign_id='$campaign' LIMIT 1;";
##### grab the data from vicidial_campaigns for the campaign
$stmt="SELECT wrapup_seconds,dead_max,dispo_max,pause_max,dead_max_dispo,dispo_max_dispo,dial_timeout,wrapup_bypass,wrapup_message,wrapup_after_hotkey,manual_dial_timeout FROM vicidial_campaigns where campaign_id='$campaign' LIMIT 1;";
$rslt=mysql_to_mysqli($stmt, $link);
if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00594',$user,$server_ip,$session_name,$one_mysql_log);}
if ($DB) {echo "$stmt\n";}
@@ -1694,8 +1695,11 @@ if ($ACTION == 'update_settings')
$wrapup_bypass = trim("$row[7]");
$wrapup_message = trim("$row[8]");
$wrapup_after_hotkey = trim("$row[9]");
$manual_dial_timeout = trim("$row[10]");
}
if ( ($manual_dial_timeout < 1) or (strlen($manual_dial_timeout) < 1) )
{$manual_dial_timeout = $dial_timeout;}
if ($wrapup_seconds_override >= 0)
{$wrapup_seconds = $wrapup_seconds_override;}
if ( ($pause_max < 10) or (strlen($pause_max)<2) )
@@ -1714,6 +1718,7 @@ if ($ACTION == 'update_settings')
$SettingS_InfO .= "wrapup_bypass: " . $wrapup_bypass . "\n";
$SettingS_InfO .= "wrapup_message: " . $wrapup_message . "\n";
$SettingS_InfO .= "wrapup_after_hotkey: " . $wrapup_after_hotkey . "\n";
$SettingS_InfO .= "manual_dial_timeout: " . $manual_dial_timeout . "\n";
$SettingS_InfO .= "\n";
}
echo $SettingS_InfO;
www/agc/vicidial.php
+14 -6
View File
@@ -511,10 +511,11 @@
# 151212-0922 - Added all chat functionality
# 151218-1200 - Fixes for chat security and language translation
# 151229-2240 - Fixed issue #907, script reload after canceling manual 3way call
# 151229-2331 - Added campaign setting for manual_dial_timeout, Issue #903
#
$version = '2.12-480c';
$build = '151229-2240';
$version = '2.12-481c';
$build = '151229-2331';
$mel=1; # Mysql Error Log enabled = 1
$mysql_log_count=85;
$one_mysql_log=0;
@@ -1652,7 +1653,7 @@ else
$HKstatusnames = substr("$HKstatusnames", 0, -1);
##### grab the campaign settings
$stmt="SELECT park_ext,park_file_name,web_form_address,allow_closers,auto_dial_level,dial_timeout,dial_prefix,campaign_cid,campaign_vdad_exten,campaign_rec_exten,campaign_recording,campaign_rec_filename,campaign_script,get_call_launch,am_message_exten,xferconf_a_dtmf,xferconf_a_number,xferconf_b_dtmf,xferconf_b_number,alt_number_dialing,scheduled_callbacks,wrapup_seconds,wrapup_message,closer_campaigns,use_internal_dnc,allcalls_delay,omit_phone_code,agent_pause_codes_active,no_hopper_leads_logins,campaign_allow_inbound,manual_dial_list_id,default_xfer_group,xfer_groups,disable_alter_custphone,display_queue_count,manual_dial_filter,agent_clipboard_copy,use_campaign_dnc,three_way_call_cid,dial_method,three_way_dial_prefix,web_form_target,vtiger_screen_login,agent_allow_group_alias,default_group_alias,quick_transfer_button,prepopulate_transfer_preset,view_calls_in_queue,view_calls_in_queue_launch,call_requeue_button,pause_after_each_call,no_hopper_dialing,agent_dial_owner_only,agent_display_dialable_leads,web_form_address_two,agent_select_territories,crm_popup_login,crm_login_address,timer_action,timer_action_message,timer_action_seconds,start_call_url,dispo_call_url,xferconf_c_number,xferconf_d_number,xferconf_e_number,use_custom_cid,scheduled_callbacks_alert,scheduled_callbacks_count,manual_dial_override,blind_monitor_warning,blind_monitor_message,blind_monitor_filename,timer_action_destination,enable_xfer_presets,hide_xfer_number_to_dial,manual_dial_prefix,customer_3way_hangup_logging,customer_3way_hangup_seconds,customer_3way_hangup_action,ivr_park_call,manual_preview_dial,api_manual_dial,manual_dial_call_time_check,my_callback_option,per_call_notes,agent_lead_search,agent_lead_search_method,queuemetrics_phone_environment,auto_pause_precall,auto_pause_precall_code,auto_resume_precall,manual_dial_cid,custom_3way_button_transfer,callback_days_limit,disable_dispo_screen,disable_dispo_status,screen_labels,status_display_fields,pllb_grouping,pllb_grouping_limit,in_group_dial,in_group_dial_select,pause_after_next_call,owner_populate,manual_dial_lead_id,dead_max,dispo_max,pause_max,dead_max_dispo,dispo_max_dispo,max_inbound_calls,manual_dial_search_checkbox,hide_call_log_info,timer_alt_seconds,wrapup_bypass,wrapup_after_hotkey,callback_active_limit,callback_active_limit_override,comments_all_tabs,comments_dispo_screen,comments_callback_screen,qc_comment_history,show_previous_callback,clear_script,manual_dial_search_filter,web_form_address_three,manual_dial_override_field,status_display_ingroup,customer_gone_seconds,agent_display_fields FROM vicidial_campaigns where campaign_id = '$VD_campaign';";
$stmt="SELECT park_ext,park_file_name,web_form_address,allow_closers,auto_dial_level,dial_timeout,dial_prefix,campaign_cid,campaign_vdad_exten,campaign_rec_exten,campaign_recording,campaign_rec_filename,campaign_script,get_call_launch,am_message_exten,xferconf_a_dtmf,xferconf_a_number,xferconf_b_dtmf,xferconf_b_number,alt_number_dialing,scheduled_callbacks,wrapup_seconds,wrapup_message,closer_campaigns,use_internal_dnc,allcalls_delay,omit_phone_code,agent_pause_codes_active,no_hopper_leads_logins,campaign_allow_inbound,manual_dial_list_id,default_xfer_group,xfer_groups,disable_alter_custphone,display_queue_count,manual_dial_filter,agent_clipboard_copy,use_campaign_dnc,three_way_call_cid,dial_method,three_way_dial_prefix,web_form_target,vtiger_screen_login,agent_allow_group_alias,default_group_alias,quick_transfer_button,prepopulate_transfer_preset,view_calls_in_queue,view_calls_in_queue_launch,call_requeue_button,pause_after_each_call,no_hopper_dialing,agent_dial_owner_only,agent_display_dialable_leads,web_form_address_two,agent_select_territories,crm_popup_login,crm_login_address,timer_action,timer_action_message,timer_action_seconds,start_call_url,dispo_call_url,xferconf_c_number,xferconf_d_number,xferconf_e_number,use_custom_cid,scheduled_callbacks_alert,scheduled_callbacks_count,manual_dial_override,blind_monitor_warning,blind_monitor_message,blind_monitor_filename,timer_action_destination,enable_xfer_presets,hide_xfer_number_to_dial,manual_dial_prefix,customer_3way_hangup_logging,customer_3way_hangup_seconds,customer_3way_hangup_action,ivr_park_call,manual_preview_dial,api_manual_dial,manual_dial_call_time_check,my_callback_option,per_call_notes,agent_lead_search,agent_lead_search_method,queuemetrics_phone_environment,auto_pause_precall,auto_pause_precall_code,auto_resume_precall,manual_dial_cid,custom_3way_button_transfer,callback_days_limit,disable_dispo_screen,disable_dispo_status,screen_labels,status_display_fields,pllb_grouping,pllb_grouping_limit,in_group_dial,in_group_dial_select,pause_after_next_call,owner_populate,manual_dial_lead_id,dead_max,dispo_max,pause_max,dead_max_dispo,dispo_max_dispo,max_inbound_calls,manual_dial_search_checkbox,hide_call_log_info,timer_alt_seconds,wrapup_bypass,wrapup_after_hotkey,callback_active_limit,callback_active_limit_override,comments_all_tabs,comments_dispo_screen,comments_callback_screen,qc_comment_history,show_previous_callback,clear_script,manual_dial_search_filter,web_form_address_three,manual_dial_override_field,status_display_ingroup,customer_gone_seconds,agent_display_fields,manual_dial_timeout FROM vicidial_campaigns where campaign_id = '$VD_campaign';";
$rslt=mysql_to_mysqli($stmt, $link);
if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'01013',$VD_login,$server_ip,$session_name,$one_mysql_log);}
if ($DB) {echo "$stmt\n";}
@@ -1788,6 +1789,10 @@ else
$status_display_ingroup = $row[128];
$customer_gone_seconds = $row[129];
$agent_display_fields = $row[130];
$manual_dial_timeout = $row[131];
if ( ($manual_dial_timeout < 1) or (strlen($manual_dial_timeout) < 1) )
{$manual_dial_timeout = $dial_timeout;}
if ( (strlen($customer_gone_seconds) < 1) or ($customer_gone_seconds < 1) )
{$customer_gone_seconds=30;}
@@ -3919,6 +3924,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
var auto_dial_level = '<?php echo $auto_dial_level ?>';
var starting_dial_level = '<?php echo $auto_dial_level ?>';
var dial_timeout = '<?php echo $dial_timeout ?>';
var manual_dial_timeout = '<?php echo $manual_dial_timeout ?>';
var dial_prefix = '<?php echo $dial_prefix ?>';
var manual_dial_prefix = '<?php echo $manual_dial_prefix ?>';
var three_way_dial_prefix = '<?php echo $three_way_dial_prefix ?>';
@@ -8046,7 +8052,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection)
delete xmlhttp;
}
if ( (MD_ring_secondS > 49) && (MD_ring_secondS > dial_timeout) )
if ( (MD_ring_secondS > 49) && (MD_ring_secondS > manual_dial_timeout) )
{
MD_channel_look=0;
MD_ring_secondS=0;
@@ -8423,7 +8429,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection)
else
{var call_prefix = manual_dial_prefix;}
manDiaLnext_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLnextCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&campaign=" + campaign + "&ext_context=" + ext_context + "&dial_timeout=" + dial_timeout + "&dial_prefix=" + call_prefix + "&campaign_cid=" + call_cid + "&preview=" + man_preview + "&agent_log_id=" + agent_log_id + "&callback_id=" + mdnCBid + "&lead_id=" + mdnBDleadid + "&phone_code=" + mdnDiaLCodE + "&phone_number=" + mdnPhonENumbeR + "&list_id=" + mdnLisT_id + "&stage=" + mdnStagE + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&omit_phone_code=" + omit_phone_code + "&manual_dial_filter=" + manual_dial_filter + "&manual_dial_search_filter=" + manual_dial_search_filter + "&vendor_lead_code=" + mdVendorid + "&usegroupalias=" + mdgroupalias + "&account=" + active_group_alias + "&agent_dialed_number=" + agent_dialed_number + "&agent_dialed_type=" + agent_dialed_type + "&vtiger_callback_id=" + vtiger_callback_id + "&dial_method=" + dial_method + "&manual_dial_call_time_check=" + manual_dial_call_time_check + "&qm_extension=" + qm_extension + "&dial_ingroup=" + active_ingroup_dial + "&nocall_dial_flag=" + nocall_dial_flag + "&cid_lock=" + cid_lock;
manDiaLnext_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLnextCaLL&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&campaign=" + campaign + "&ext_context=" + ext_context + "&dial_timeout=" + manual_dial_timeout + "&dial_prefix=" + call_prefix + "&campaign_cid=" + call_cid + "&preview=" + man_preview + "&agent_log_id=" + agent_log_id + "&callback_id=" + mdnCBid + "&lead_id=" + mdnBDleadid + "&phone_code=" + mdnDiaLCodE + "&phone_number=" + mdnPhonENumbeR + "&list_id=" + mdnLisT_id + "&stage=" + mdnStagE + "&use_internal_dnc=" + use_internal_dnc + "&use_campaign_dnc=" + use_campaign_dnc + "&omit_phone_code=" + omit_phone_code + "&manual_dial_filter=" + manual_dial_filter + "&manual_dial_search_filter=" + manual_dial_search_filter + "&vendor_lead_code=" + mdVendorid + "&usegroupalias=" + mdgroupalias + "&account=" + active_group_alias + "&agent_dialed_number=" + agent_dialed_number + "&agent_dialed_type=" + agent_dialed_type + "&vtiger_callback_id=" + vtiger_callback_id + "&dial_method=" + dial_method + "&manual_dial_call_time_check=" + manual_dial_call_time_check + "&qm_extension=" + qm_extension + "&dial_ingroup=" + active_ingroup_dial + "&nocall_dial_flag=" + nocall_dial_flag + "&cid_lock=" + cid_lock;
// alert(manual_dial_filter + "\n" +manDiaLnext_query);
xmlhttp.open('POST', 'vdc_db_query.php');
xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8');
@@ -9203,7 +9209,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection)
else
{var call_prefix = manual_dial_prefix;}
manDiaLonly_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLonly&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&lead_id=" + document.vicidial_form.lead_id.value + "&phone_number=" + manDiaLonly_num + "&phone_code=" + document.vicidial_form.phone_code.value + "&campaign=" + campaign + "&ext_context=" + ext_context + "&dial_timeout=" + dial_timeout + "&dial_prefix=" + call_prefix + "&campaign_cid=" + call_cid + "&omit_phone_code=" + omit_phone_code + "&usegroupalias=" + usegroupalias + "&account=" + active_group_alias + "&agent_dialed_number=" + dialed_number + "&agent_dialed_type=" + dialed_label + "&dial_method=" + dial_method + "&agent_log_id=" + agent_log_id + "&security=" + document.vicidial_form.security_phrase.value + "&qm_extension=" + qm_extension + "&old_CID=" + LastCallCID + "&cid_lock=" + cid_lock;
manDiaLonly_query = "server_ip=" + server_ip + "&session_name=" + session_name + "&ACTION=manDiaLonly&conf_exten=" + session_id + "&user=" + user + "&pass=" + pass + "&lead_id=" + document.vicidial_form.lead_id.value + "&phone_number=" + manDiaLonly_num + "&phone_code=" + document.vicidial_form.phone_code.value + "&campaign=" + campaign + "&ext_context=" + ext_context + "&dial_timeout=" + manual_dial_timeout + "&dial_prefix=" + call_prefix + "&campaign_cid=" + call_cid + "&omit_phone_code=" + omit_phone_code + "&usegroupalias=" + usegroupalias + "&account=" + active_group_alias + "&agent_dialed_number=" + dialed_number + "&agent_dialed_type=" + dialed_label + "&dial_method=" + dial_method + "&agent_log_id=" + agent_log_id + "&security=" + document.vicidial_form.security_phrase.value + "&qm_extension=" + qm_extension + "&old_CID=" + LastCallCID + "&cid_lock=" + cid_lock;
xmlhttp.open('POST', 'vdc_db_query.php');
xmlhttp.setRequestHeader('Content-Type','application/x-www-form-urlencoded; charset=UTF-8');
xmlhttp.send(manDiaLonly_query);
@@ -12810,6 +12816,8 @@ function set_length(SLnumber,SLlength_goal,SLdirection)
wrapup_message=wrapup_message_array[1];
var wrapup_after_hotkey_array=settings_array[11].split("wrapup_after_hotkey: ");
wrapup_after_hotkey=wrapup_after_hotkey_array[1];
var manual_dial_timeout_array=settings_array[12].split("manual_dial_timeout: ");
manual_dial_timeout=manual_dial_timeout_array[1];
if (wrapup_seconds > 0)
{
www/vicidial/admin.php
+12 -5
View File
File diff suppressed because one or more lines are too long
www/vicidial/help.php
+6
View File
@@ -72,6 +72,7 @@
# 151220-1553 - Added more phones nva options
# 151221-0751 - Changed in-group download link to customer chat links
# 151229-1659 - Added servers-gather_asterisk_output entry
# 151229-2302 - Added campaigns-manual_dial_timeout entry
#
@@ -1695,6 +1696,11 @@ if ($SSoutbound_autodial_active > 0)
<BR>
<B><?php echo _QXZ("Manual Dial CID"); ?> -</B><?php echo _QXZ("This defines whether an agent making manual dial calls will have the campaign callerID settings used, or their agent phone callerID settings used. Default is CAMPAIGN. If the Use Custom CID campaign option is enabled or the list Campaign CID Override setting is used, this setting will be ignored."); ?>
<BR>
<A NAME="campaigns-manual_dial_timeout">
<BR>
<B><?php echo _QXZ("Manual Dial Timeout"); ?> -</B><?php echo _QXZ("This is an override field that, if populated, will override the campaign dial timeout setting for manual dialed calls. Default is blank for disabled."); ?>
<BR>
<A NAME="campaigns-post_phone_time_diff_alert">
<BR>