From a3dcb04d158133dbc91bcc584f505307f80a2b75 Mon Sep 17 00:00:00 2001 From: mattf Date: Sat, 17 Feb 2018 15:26:43 +0000 Subject: [PATCH] Added NO_READY option for no_agent_no_queue in-group feature, issue #1046 git-svn-id: svn://192.168.202.10@2923 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/UPGRADE | 2 ++ agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi | 8 ++++++-- agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql | 4 ++-- agc_2-X/trunk/extras/upgrade_2.14.sql | 4 ++++ agc_2-X/trunk/www/vicidial/admin.php | 7 ++++--- agc_2-X/trunk/www/vicidial/help.php | 2 +- 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/agc_2-X/trunk/UPGRADE b/agc_2-X/trunk/UPGRADE index 62a3d79b..fe87af7a 100644 --- a/agc_2-X/trunk/UPGRADE +++ b/agc_2-X/trunk/UPGRADE @@ -276,6 +276,8 @@ OTHER CHANGES: or areacode, and allowing a single CID Group to be set across multiple campaigns. +74. Added NO_READY option for no_agent_no_queue in-group feature. + diff --git a/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi b/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi index f50de1ea..925fb20d 100644 --- a/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi +++ b/agc_2-X/trunk/agi/agi-VDAD_ALL_inbound.agi @@ -221,6 +221,7 @@ # 171124-1159 - Added max_inbound_calls_outcome options # 180204-0120 - Added PRESS_CALLBACK_QUEUE feature, and Closing-Time feature, and add-lead-timezone-lookup feature # 180209-1716 - Big fix for recent feature +# 180217-1018 - Added NO_READY option for no_agent_no_queue in-group feature, issue #1046 # $script = 'agi-VDAD_ALL_inbound.agi'; @@ -1773,15 +1774,18 @@ if ( ( ( ( ($hm < $ct_default_start) || ($hm > $ct_default_stop) ) && ($hm >= $c ##### BEGIN NO AGENT NO QUEUE CHECK ##### -if ( ( ($no_agent_no_queue =~ /Y|NO_PAUSED/) || ($MCnanque_override > 0) ) && ($dial_ingroup_flag < 1) ) +if ( ( ($no_agent_no_queue =~ /Y|NO_PAUSED|NO_READY/) || ($MCnanque_override > 0) ) && ($dial_ingroup_flag < 1) ) { $NPsql=''; $ADsql=''; + $NCsql=''; if ($no_agent_no_queue =~ /NO_PAUSED/) {$NPsql = "and status NOT IN('PAUSED')";} + if ($no_agent_no_queue =~ /NO_READY/) + {$NCsql = "and status IN('READY','CLOSER')";} if ( ( ($channel_group =~ /AGENTDIRECT/i) || ($dial_ingroup_flag > 0) ) && (length($agent_only) > 1) ) {$ADsql = "and user='$agent_only'";} - $stmtA = "SELECT count(*) FROM vicidial_live_agents where closer_campaigns LIKE \"% $channel_group %\" $NPsql $ADsql;"; + $stmtA = "SELECT count(*) FROM vicidial_live_agents where closer_campaigns LIKE \"% $channel_group %\" $NPsql $ADsql $NCsql;"; $sthA = $dbhA->prepare($stmtA) or die "preparing: ",$dbhA->errstr; $sthA->execute or die "executing: $stmtA ", $dbhA->errstr; $sthArows=$sthA->rows; 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 da01bf2a..427d95b7 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -1159,7 +1159,7 @@ play_welcome_message ENUM('ALWAYS','NEVER','IF_WAIT_ONLY','YES_UNLESS_NODELAY') answer_sec_pct_rt_stat_one SMALLINT(5) UNSIGNED default '20', answer_sec_pct_rt_stat_two SMALLINT(5) UNSIGNED default '30', default_group_alias VARCHAR(30) default '', -no_agent_no_queue ENUM('N','Y','NO_PAUSED') default 'N', +no_agent_no_queue ENUM('N','Y','NO_PAUSED','NO_READY') default 'N', no_agent_action ENUM('CALLMENU','INGROUP','DID','MESSAGE','EXTENSION','VOICEMAIL','VMAIL_NO_INST') default 'MESSAGE', no_agent_action_value VARCHAR(255) default 'nbdy-avail-to-take-call|vm-goodbye', web_form_address_two TEXT, @@ -4186,4 +4186,4 @@ INSERT INTO vicidial_settings_containers(container_id,container_notes,container_ UPDATE system_settings set vdc_agent_api_active='1'; -UPDATE system_settings SET db_schema_version='1537',db_schema_update_date=NOW(),reload_timestamp=NOW(); +UPDATE system_settings SET db_schema_version='1538',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 42914e12..28a12971 100644 --- a/agc_2-X/trunk/extras/upgrade_2.14.sql +++ b/agc_2-X/trunk/extras/upgrade_2.14.sql @@ -573,3 +573,7 @@ UPDATE system_settings SET db_schema_version='1536',db_schema_update_date=NOW() ALTER TABLE vicidial_campaigns ADD pause_max_dispo VARCHAR(6) default 'PAUSMX'; UPDATE system_settings SET db_schema_version='1537',db_schema_update_date=NOW() where db_schema_version < 1537; + +ALTER TABLE vicidial_inbound_groups MODIFY no_agent_no_queue ENUM('N','Y','NO_PAUSED','NO_READY') default 'N'; + +UPDATE system_settings SET db_schema_version='1538',db_schema_update_date=NOW() where db_schema_version < 1538; diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index 78dbd17f..f5916862 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -4313,12 +4313,13 @@ else # 180215-1318 - Added CID Groups admin screens # 180216-1332 - Fix for system summary screen, issue #1068 # 180216-1743 - Many translation strings and permissions fixes, issue #1065 +# 180217-0934 - Added NO_READY option for no_agent_no_queue in-group feature, issue #1046 # # 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-658a'; -$build = '180216-1743'; +$admin_version = '2.14-659a'; +$build = '180217-0934'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -27835,7 +27836,7 @@ if ($ADD==3111) echo ""._QXZ("After Hours Call Menu").":$NWB#inbound_groups-after_hours_callmenu$NWE\n"; - echo ""._QXZ("No Agents No Queueing").": $NWB#inbound_groups-no_agent_no_queue$NWE\n"; + echo ""._QXZ("No Agents No Queueing").": $NWB#inbound_groups-no_agent_no_queue$NWE\n"; echo ""._QXZ("No Agent No Queue Action").": $NWB#inbound_groups-no_agent_no_queue$NWE\n"; diff --git a/agc_2-X/trunk/www/vicidial/help.php b/agc_2-X/trunk/www/vicidial/help.php index a39853b6..da1770b6 100644 --- a/agc_2-X/trunk/www/vicidial/help.php +++ b/agc_2-X/trunk/www/vicidial/help.php @@ -2709,7 +2709,7 @@ if ($SSqc_features_active > 0)

- - + -