diff --git a/agc_2-X/trunk/UPGRADE b/agc_2-X/trunk/UPGRADE
index 812064f9..30491339 100644
--- a/agc_2-X/trunk/UPGRADE
+++ b/agc_2-X/trunk/UPGRADE
@@ -189,8 +189,11 @@ NOTE: Upgrading from 1.1.12-3 to 2.0.1 is at the bottom
41. New Slovak translation for the agent screen, as well as new German agent
screen translation and new German buttons for the agent screen
-42. New Welcome demo screen with links to all translations of agent and admin
- screens
+42. New Welcome demo and languages screens with links to all translations of
+ agent and admin screens
+
+43. Added INBOUND_MAN dial method to allow for inbound call handling by agents
+ that are also placing manual dial list calls through their campaign lists
diff --git a/agc_2-X/trunk/docs/LOAD_BALANCING.txt b/agc_2-X/trunk/docs/LOAD_BALANCING.txt
index 383e14b1..8c0f4086 100644
--- a/agc_2-X/trunk/docs/LOAD_BALANCING.txt
+++ b/agc_2-X/trunk/docs/LOAD_BALANCING.txt
@@ -172,6 +172,14 @@ If you have any questions or problems please post to the astguiclient-users list
exten => 8168,3,Hangup
This should help to prevent overwriting of prompts that are copied over from the one server that is used to do prompt creation.
+9. On all servers but one you should consider redirecting voicemail direct calls to a single server:
+ Change this:
+ exten => _85026666666666.,1,Wait(1)
+ exten => _85026666666666.,2,Voicemail(${EXTEN:14}|u)
+ exten => _85026666666666.,3,Hangup
+ To something like this:
+ exten => _85026666666666.,1,Dial(${TRUNKIAX2}/${EXTEN},55,o)
+
diff --git a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql
index 115d97be..d0c1f2e9 100644
--- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql
+++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql
@@ -541,7 +541,7 @@ closer_campaigns TEXT default '',
use_internal_dnc ENUM('Y','N') default 'N',
allcalls_delay SMALLINT(3) UNSIGNED default '0',
omit_phone_code ENUM('Y','N') default 'N',
-dial_method ENUM('MANUAL','RATIO','ADAPT_HARD_LIMIT','ADAPT_TAPERED','ADAPT_AVERAGE') default 'MANUAL',
+dial_method ENUM('MANUAL','RATIO','ADAPT_HARD_LIMIT','ADAPT_TAPERED','ADAPT_AVERAGE','INBOUND_MAN') default 'MANUAL',
available_only_ratio_tally ENUM('Y','N') default 'N',
adaptive_dropped_percentage SMALLINT(3) default '3',
adaptive_maximum_level VARCHAR(6) default '3.0',
@@ -1324,7 +1324,7 @@ INSERT INTO vicidial_phone_codes (country_code, country, areacode, state, GMT_of
UPDATE system_settings SET qc_last_pull_time=NOW();
-UPDATE system_settings SET db_schema_version='1109';
+UPDATE system_settings SET db_schema_version='1110';
GRANT RELOAD ON *.* TO cron@'%';
GRANT RELOAD ON *.* TO cron@localhost;
diff --git a/agc_2-X/trunk/extras/upgrade_2.0.5.sql b/agc_2-X/trunk/extras/upgrade_2.0.5.sql
index 4fd7a578..3a013ca5 100644
--- a/agc_2-X/trunk/extras/upgrade_2.0.5.sql
+++ b/agc_2-X/trunk/extras/upgrade_2.0.5.sql
@@ -481,3 +481,7 @@ INSERT INTO vicidial_statuses values('QVMAIL','Queue Abandon Voicemail Left','N'
ALTER TABLE vicidial_inbound_groups MODIFY hold_time_option ENUM('NONE','EXTENSION','VOICEMAIL','IN_GROUP','CALLERID_CALLBACK','DROP_ACTION','PRESS_VMAIL') default 'NONE';
UPDATE system_settings SET db_schema_version='1109';
+
+ALTER TABLE vicidial_campaigns MODIFY dial_method ENUM('MANUAL','RATIO','ADAPT_HARD_LIMIT','ADAPT_TAPERED','ADAPT_AVERAGE','INBOUND_MAN') default 'MANUAL';
+
+UPDATE system_settings SET db_schema_version='1110';
diff --git a/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.5.txt b/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.5.txt
index a48a34c6..8b951c74 100644
--- a/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.5.txt
+++ b/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.0.5.txt
@@ -332,6 +332,7 @@ Modify DIDs: ||
To disable the On Hold Prompt, set the interval to 0||
3-Way Call Outbound CallerID -<\/B> This defines what is sent out as the outbound callerID number from 3-way calls placed by the agent, CAMPAIGN uses the custom campaign callerID, CUSTOMER uses the number of the customer that is active on the agents screen and AGENT_PHONE uses the callerID for the phone that the agent is logged into||
3-Way Call Outbound CallerID:||
+INBOUND_MAN allows the agent to place manual dial calls from a campaign list while being able to take inbound calls between manual dial calls||
############################################################ CLIENT
diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php
index 20999d44..f3d74022 100644
--- a/agc_2-X/trunk/www/agc/vicidial.php
+++ b/agc_2-X/trunk/www/agc/vicidial.php
@@ -194,10 +194,11 @@
# 81007-0945 - Added three_way_call_cid option for outbound 3way calls
# 81010-1047 - Fixed conf calling prefix to use settings, other 3way improvements
# 81011-1403 - Fixed bugs in leave3way when transferring a manual dial call
+# 81012-1729 - Added INBOUND_MAN dial method to allow manual list dialing and inbound calls
#
-$version = '2.0.5-172';
-$build = '81011-1403';
+$version = '2.0.5-173';
+$build = '81012-1729';
require("dbconnect.php");
@@ -797,7 +798,7 @@ $VDloginDISPLAY=0;
$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 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 FROM vicidial_campaigns where campaign_id = '$VD_campaign';";
$rslt=mysql_query($stmt, $link);
if ($DB) {echo "$stmt\n";}
$row=mysql_fetch_row($rslt);
@@ -840,6 +841,7 @@ $VDloginDISPLAY=0;
$CopY_tO_ClipboarD = $row[36];
$use_campaign_dnc = $row[37];
$three_way_call_cid = $row[38];
+ $dial_method = $row[39];
if ( (!ereg('DISABLED',$VU_vicidial_recording_override)) and ($VU_vicidial_recording > 0) )
{
@@ -861,6 +863,8 @@ $VDloginDISPLAY=0;
}
if ($display_queue_count=='N')
{$callholdstatus='0';}
+ if ($dial_method == 'INBOUND_MAN')
+ {$VU_closer_default_blended=0;}
$closer_campaigns = preg_replace("/^ | -$/","",$closer_campaigns);
$closer_campaigns = preg_replace("/ /","','",$closer_campaigns);
@@ -2012,6 +2016,7 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
var agentphonelive = 0;
var conf_dialed = 0;
var leaving_threeway = 0;
+ var dial_method = ' echo $dial_method ?>';
var DiaLControl_auto_HTML = "
";
var DiaLControl_auto_HTML_ready = "
";
var DiaLControl_auto_HTML_OFF = "
";
@@ -3601,7 +3606,18 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
inOUT = 'OUT';
all_record = 'NO';
all_record_count=0;
- document.getElementById("DiaLControl").innerHTML = "
";
+ if (dial_method == "INBOUND_MAN")
+ {
+ auto_dial_level=0;
+
+ AutoDial_ReSume_PauSe('VDADpause');
+
+ document.getElementById("DiaLControl").innerHTML = "

";
+ }
+ else
+ {
+ document.getElementById("DiaLControl").innerHTML = "
";
+ }
if (document.vicidial_form.LeadPreview.checked==true)
{
reselect_preview_dial = 1;
@@ -3678,8 +3694,17 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
}
else
{
+ if (dial_method == "INBOUND_MAN")
+ {
+ auto_dial_level=starting_dial_level;
+
+ document.getElementById("DiaLControl").innerHTML = "

";
+ }
+ else
+ {
+ document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML;
+ }
document.getElementById("MainStatuSSpan").style.background = panel_bgcolor;
- document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML;
reselect_alt_dial = 0;
}
}
@@ -3883,7 +3908,16 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
}
else
{
- document.getElementById("DiaLControl").innerHTML = "
";
+ if (dial_method == "INBOUND_MAN")
+ {
+ auto_dial_level=starting_dial_level;
+
+ document.getElementById("DiaLControl").innerHTML = "

";
+ }
+ else
+ {
+ document.getElementById("DiaLControl").innerHTML = "
";
+ }
var xmlhttp=false;
/*@cc_on @*/
@@ -3965,7 +3999,14 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
document.getElementById("MainStatuSSpan").innerHTML = " Lead skipped, go on to next lead";
- document.getElementById("DiaLControl").innerHTML = "
";
+ if (dial_method == "INBOUND_MAN")
+ {
+ document.getElementById("DiaLControl").innerHTML = "

";
+ }
+ else
+ {
+ document.getElementById("DiaLControl").innerHTML = "
";
+ }
}
}
}
@@ -4138,14 +4179,32 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
}
AutoDialReady = 1;
AutoDialWaiting = 1;
- document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML_ready;
+ if (dial_method == "INBOUND_MAN")
+ {
+ auto_dial_level=starting_dial_level;
+
+ document.getElementById("DiaLControl").innerHTML = "

";
+ }
+ else
+ {
+ document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML_ready;
+ }
}
else
{
var VDRP_stage = 'PAUSED';
AutoDialReady = 0;
AutoDialWaiting = 0;
- document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML;
+ if (dial_method == "INBOUND_MAN")
+ {
+ auto_dial_level=starting_dial_level;
+
+ document.getElementById("DiaLControl").innerHTML = "

";
+ }
+ else
+ {
+ document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML;
+ }
}
var xmlhttp=false;
@@ -4524,7 +4583,14 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
document.getElementById("VolumeDownSpan").innerHTML = "
";
}
- document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML_OFF;
+ if (dial_method == "INBOUND_MAN")
+ {
+ document.getElementById("DiaLControl").innerHTML = "

";
+ }
+ else
+ {
+ document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML_OFF;
+ }
if (VDCL_group_id.length > 1)
{var group = VDCL_group_id;}
@@ -4982,7 +5048,14 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
{
document.getElementById("MainStatuSSpan").style.background = panel_bgcolor;
document.getElementById("MainStatuSSpan").innerHTML = '';
- document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML_OFF;
+ if (dial_method == "INBOUND_MAN")
+ {
+ document.getElementById("DiaLControl").innerHTML = "

";
+ }
+ else
+ {
+ document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML_OFF;
+ }
reselect_alt_dial = 0;
}
}
@@ -4991,7 +5064,14 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
else
{
document.getElementById("MainStatuSSpan").style.background = panel_bgcolor;
- document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML_OFF;
+ if (dial_method == "INBOUND_MAN")
+ {
+ document.getElementById("DiaLControl").innerHTML = "

";
+ }
+ else
+ {
+ document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML_OFF;
+ }
reselect_alt_dial = 0;
}
}
@@ -5701,6 +5781,8 @@ if ($enable_fast_refresh < 1) {echo "\tvar refresh_interval = 1000;\n";}
// Update vicidial_live_agents record with closer in group choices
function CloserSelect_submit()
{
+ if (dial_method == "INBOUND_MAN")
+ {document.vicidial_form.CloserSelectBlended.checked=false;}
if (document.vicidial_form.CloserSelectBlended.checked==true)
{VICIDiaL_closer_blended = 1;}
else
@@ -6461,7 +6543,7 @@ else
{hideDiv('AgentStatusCalls');}
if (agentcallsstatus != '1')
{hideDiv('AgentStatusSpan');}
- if ( (auto_dial_level != 0) || (manual_dial_preview != 1) )
+ if ( ( (auto_dial_level > 0) && (dial_method != "INBOUND_MAN") ) || (manual_dial_preview < 1) )
{clearDiv('DiaLLeaDPrevieW');}
if (alt_phone_dialing != 1)
{clearDiv('DiaLDiaLAltPhonE');}
@@ -6498,6 +6580,13 @@ else
hideDiv('CloserSelectBox');
MainPanelToFront();
var CloserSelecting = 0;
+ if (dial_method == "INBOUND_MAN")
+ {
+ dial_method = "MANUAL";
+ auto_dial_level=0;
+ starting_dial_level=0;
+ document.getElementById("DiaLControl").innerHTML = DiaLControl_manual_HTML;
+ }
}
VICIDiaL_closer_login_checked = 1;
}
@@ -7047,8 +7136,17 @@ else
}
else
{
- document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML;
- clearDiv('DiaLLeaDPrevieW');
+ if (dial_method == "INBOUND_MAN")
+ {
+ document.getElementById("DiaLControl").innerHTML = "

";
+ if (manual_dial_preview == 1)
+ {buildDiv('DiaLLeaDPrevieW');}
+ }
+ else
+ {
+ document.getElementById("DiaLControl").innerHTML = DiaLControl_auto_HTML;
+ clearDiv('DiaLLeaDPrevieW');
+ }
}
}
panel_bgcolor='#E0C2D6';
diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php
index 0043c73d..4662f3b0 100644
--- a/agc_2-X/trunk/www/vicidial/admin.php
+++ b/agc_2-X/trunk/www/vicidial/admin.php
@@ -1458,11 +1458,12 @@ $survey_camp_record_dir = ereg_replace(";","",$survey_camp_record_dir);
# 80909-0553 - Added campaign-specific DNC list option and add
# 81002-1101 - Added more in-group options and new DID section and user options
# 81007-0936 - Added three_way_call_cid option to campaigns
+# 81012-1725 - Added INBOUND_MAN dial method allowing for manual list dialing with inbound calls
#
# make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time
-$admin_version = '2.0.5-144';
-$build = '81007-0936';
+$admin_version = '2.0.5-145';
+$build = '81012-1725';
$STARTtime = date("U");
$SQLdate = date("Y-m-d H:i:s");
@@ -2665,7 +2666,7 @@ echo "