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 ca1130f8..9d101ccd 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -781,7 +781,7 @@ xferconf_a_dtmf VARCHAR(50), xferconf_a_number VARCHAR(50), xferconf_b_dtmf VARCHAR(50), xferconf_b_number VARCHAR(50), -alt_number_dialing ENUM('N','Y','SELECTED','SELECTED_TIMER_ALT','SELECTED_TIMER_ADDR3') default 'N', +alt_number_dialing ENUM('N','Y','SELECTED','SELECTED_TIMER_ALT','SELECTED_TIMER_ADDR3','UNSELECTED','UNSELECTED_TIMER_ALT','UNSELECTED_TIMER_ADDR3') default 'N', scheduled_callbacks ENUM('Y','N') default 'N', lead_filter_id VARCHAR(20) default 'NONE', drop_call_seconds TINYINT(3) default '5', @@ -4666,4 +4666,4 @@ INSERT INTO vicidial_settings_containers VALUES ('INTERNATIONAL_DNC_IMPORT','Pro UPDATE system_settings set vdc_agent_api_active='1'; -UPDATE system_settings SET db_schema_version='1605',db_schema_update_date=NOW(),reload_timestamp=NOW(); +UPDATE system_settings SET db_schema_version='1606',db_schema_update_date=NOW(),reload_timestamp=NOW(); diff --git a/agc_2-X/trunk/extras/upgrade_2.14.sql b/agc_2-X/trunk/extras/upgrade_2.14.sql index 5c8351f4..23f2ea5f 100644 --- a/agc_2-X/trunk/extras/upgrade_2.14.sql +++ b/agc_2-X/trunk/extras/upgrade_2.14.sql @@ -1311,3 +1311,7 @@ UPDATE system_settings SET db_schema_version='1604',db_schema_update_date=NOW() ALTER TABLE vicidial_campaigns MODIFY get_call_launch ENUM('NONE','SCRIPT','SCRIPTTWO','WEBFORM','WEBFORMTWO','WEBFORMTHREE','FORM','PREVIEW_WEBFORM','PREVIEW_WEBFORMTWO','PREVIEW_WEBFORMTHREE','PREVIEW_SCRIPT','PREVIEW_SCRIPTTWO','PREVIEW_FORM') default 'NONE'; UPDATE system_settings SET db_schema_version='1605',db_schema_update_date=NOW() where db_schema_version < 1605; + +ALTER TABLE vicidial_campaigns MODIFY alt_number_dialing ENUM('N','Y','SELECTED','SELECTED_TIMER_ALT','SELECTED_TIMER_ADDR3','UNSELECTED','UNSELECTED_TIMER_ALT','UNSELECTED_TIMER_ADDR3') default 'N'; + +UPDATE system_settings SET db_schema_version='1606',db_schema_update_date=NOW() where db_schema_version < 1605; diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php index 15be872e..5beb5876 100644 --- a/agc_2-X/trunk/www/agc/vicidial.php +++ b/agc_2-X/trunk/www/agc/vicidial.php @@ -643,10 +643,11 @@ # 200528-2239 - Added three_way_record_stop_exception campaign setting # 200909-0952 - Fix for script_top_dispo issue #1228 # 200912-1426 - Added more get_call_launch PREVIEW_ options +# 200913-0817 - Added UNSELECTED options for campaign alt_number_dialing # -$version = '2.14-611c'; -$build = '200909-0952'; +$version = '2.14-612c'; +$build = '200913-0817'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=92; $one_mysql_log=0; @@ -2533,7 +2534,7 @@ else {$manual_dial_prefix = $dial_prefix;} if (strlen($three_way_dial_prefix) < 1) {$three_way_dial_prefix = $dial_prefix;} - if ( ($alt_number_dialing=='Y') or ($alt_number_dialing=='SELECTED') or ($alt_number_dialing=='SELECTED_TIMER_ALT') or ($alt_number_dialing=='SELECTED_TIMER_ADDR3') ) + if ( ($alt_number_dialing=='Y') or ($alt_number_dialing=='SELECTED') or ($alt_number_dialing=='SELECTED_TIMER_ALT') or ($alt_number_dialing=='SELECTED_TIMER_ADDR3') or ($alt_number_dialing=='UNSELECTED') or ($alt_number_dialing=='UNSELECTED_TIMER_ALT') or ($alt_number_dialing=='UNSELECTED_TIMER_ADDR3') ) {$alt_phone_dialing='1';} else { @@ -7555,7 +7556,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) reselect_alt_dial = 1; alt_dial_active = 1; alt_dial_status_display = 1; - if ( ( (alt_number_dialing == 'SELECTED_TIMER_ALT') || (alt_number_dialing == 'SELECTED_TIMER_ADDR3') ) && ( (last_mdtype != 'ALT') && (last_mdtype != 'ADDR3') ) ) + if ( ( (alt_number_dialing == 'SELECTED_TIMER_ALT') || (alt_number_dialing == 'SELECTED_TIMER_ADDR3') || (alt_number_dialing == 'UNSELECTED_TIMER_ALT') || (alt_number_dialing == 'UNSELECTED_TIMER_ADDR3') ) && ( (last_mdtype != 'ALT') && (last_mdtype != 'ADDR3') ) ) { timer_alt_count=timer_alt_seconds; timer_alt_trigger=1; @@ -14886,6 +14887,10 @@ function set_length(SLnumber,SLlength_goal,SLdirection) { document.vicidial_form.DiaLAltPhonE.checked=true; } + if ( (alt_number_dialing == 'UNSELECTED') || (alt_number_dialing == 'UNSELECTED_TIMER_ALT') || (alt_number_dialing == 'UNSELECTED_TIMER_ADDR3') ) + { + document.vicidial_form.DiaLAltPhonE.checked=false; + } if ( (shift_logout_flag < 1) && (api_logout_flag < 1) ) { if (wrapup_waiting == 0) @@ -18736,6 +18741,8 @@ function phone_number_format(formatphone) { {hideDiv('VolumeControlSpan');} if ( (DefaulTAlTDiaL == '1') || (alt_number_dialing == 'SELECTED') || (alt_number_dialing == 'SELECTED_TIMER_ALT') || (alt_number_dialing == 'SELECTED_TIMER_ADDR3') ) {document.vicidial_form.DiaLAltPhonE.checked=true;} + if ( (alt_number_dialing == 'UNSELECTED') || (alt_number_dialing == 'UNSELECTED_TIMER_ALT') || (alt_number_dialing == 'UNSELECTED_TIMER_ADDR3') ) + {document.vicidial_form.DiaLAltPhonE.checked=false;} if (agent_status_view != '1') {document.getElementById("AgentViewLink").innerHTML = "";} if (dispo_check_all_pause == '1') @@ -19070,9 +19077,9 @@ function phone_number_format(formatphone) { timer_alt_trigger=0; timer_alt_count=timer_alt_seconds; document.getElementById("timer_alt_display").innerHTML = ''; - if (alt_number_dialing == 'SELECTED_TIMER_ALT') + if ( (alt_number_dialing == 'SELECTED_TIMER_ALT') || (alt_number_dialing == 'SELECTED_TIMER_ALT') ) {ManualDialOnly('ALTPhonE','NO','0');} - if (alt_number_dialing == 'SELECTED_TIMER_ADDR3') + if ( (alt_number_dialing == 'SELECTED_TIMER_ADDR3') || (alt_number_dialing == 'UNSELECTED_TIMER_ADDR3') ) {ManualDialOnly('AddresS3','NO','0');} } else @@ -19745,6 +19752,8 @@ function phone_number_format(formatphone) { {document.vicidial_form.DiaLAltPhonE.checked=true} if ( (DefaulTAlTDiaL == '1') || (alt_number_dialing == 'SELECTED') || (alt_number_dialing == 'SELECTED_TIMER_ALT') || (alt_number_dialing == 'SELECTED_TIMER_ADDR3') ) {document.vicidial_form.DiaLAltPhonE.checked=true;} + if ( (alt_number_dialing == 'UNSELECTED') || (alt_number_dialing == 'UNSELECTED_TIMER_ALT') || (alt_number_dialing == 'UNSELECTED_TIMER_ADDR3') ) + {document.vicidial_form.DiaLAltPhonE.checked=false;} } } } @@ -19955,6 +19964,10 @@ function phone_number_format(formatphone) { { document.vicidial_form.DiaLAltPhonE.checked=true; } + if ( (alt_number_dialing == 'UNSELECTED') || (alt_number_dialing == 'UNSELECTED_TIMER_ALT') || (alt_number_dialing == 'UNSELECTED_TIMER_ADDR3') ) + { + document.vicidial_form.DiaLAltPhonE.checked=false; + } } else {clearDiv('DiaLDiaLAltPhonE');} diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index 8686d945..11a8b24e 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -4707,12 +4707,13 @@ else # 200815-0015 - Added another modify_leads option for users # 200816-0912 - Removed the ability to delete the 'default' DID entry # 200912-1649 - Added more get_call_launch PREVIEW_ options +# 200913-0820 - Added UNSELECTED options for campaign alt_number_dialing # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 9 to access this page the first time -$admin_version = '2.14-767a'; -$build = '200912-1649'; +$admin_version = '2.14-768a'; +$build = '200913-0820'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -24940,7 +24941,7 @@ if ($ADD==31) if ($SSoutbound_autodial_active > 0) { - echo "