From 062b424ee205c6e48b0c11523243d50aa0f409c4 Mon Sep 17 00:00:00 2001 From: mattf Date: Sun, 14 May 2023 00:55:00 +0000 Subject: [PATCH] Fix for manual dial call error handling in agent screen git-svn-id: svn://192.168.202.10@3722 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/www/agc/vdc_db_query.php | 20 +++++++++++++++++--- agc_2-X/trunk/www/agc/vicidial.php | 14 +++++++++++--- 2 files changed, 28 insertions(+), 6 deletions(-) diff --git a/agc_2-X/trunk/www/agc/vdc_db_query.php b/agc_2-X/trunk/www/agc/vdc_db_query.php index 55bed83d..95b080e3 100644 --- a/agc_2-X/trunk/www/agc/vdc_db_query.php +++ b/agc_2-X/trunk/www/agc/vdc_db_query.php @@ -533,10 +533,11 @@ # 230309-1005 - Added abandon_check_queue feature # 230418-0852 - Changed LogiNCamPaigns to require user auth for campaign list # 230418-1354 - Added vicidial_user_dial_log logging +# 230513-2043 - Fix for manual dial errors # -$version = '2.14-426'; -$build = '230418-1354'; +$version = '2.14-427'; +$build = '230513-2043'; $php_script = 'vdc_db_query.php'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=911; @@ -2279,7 +2280,7 @@ if ($ACTION == 'manDiaLnextCaLL') { ##### grab number of calls today in this campaign and increment $eac_phone=''; - $stmt="SELECT calls_today,extension,external_dial,status FROM vicidial_live_agents WHERE user='$user' and campaign_id='$campaign';"; + $stmt="SELECT calls_today,extension,external_dial,status,callerid,lead_id FROM vicidial_live_agents WHERE user='$user';"; if ($non_latin > 0) {$rslt=mysql_to_mysqli("SET NAMES 'UTF8'", $link);} $rslt=mysql_to_mysqli($stmt, $link); if ($mel > 0) {mysql_error_logging($NOW_TIME,$link,$mel,$stmt,'00015',$user,$server_ip,$session_name,$one_mysql_log);} @@ -2292,11 +2293,24 @@ if ($ACTION == 'manDiaLnextCaLL') $eac_phone = $row[1]; $ed_vla = $row[2]; $vla_status = $row[3]; + $vla_callerid = $row[4]; + $vla_lead_id = $row[5]; } else {$calls_today ='0';} $calls_today++; + # check if agent is INCALL, and if so, send error and exit + if ($vla_status == 'INCALL') + { + $channel_live=0; + echo "ERROR: ALREADY INCALL\n"; + echo _QXZ("Agent is already in call %1s for lead %2s",0,'',$vla_callerid,$vla_lead_id)."\n"; + $stage.=" ERROR $vla_status $vla_callerid $vla_lead_id"; + if ($SSagent_debug_logging > 0) {vicidial_ajax_log($NOW_TIME,$startMS,$link,$ACTION,$php_script,$user,$stage,$lead_id,$session_name,$stmt);} + exit; + } + if (preg_match("/^MANUALNEXT/",$ed_vla)) { $stmt = "UPDATE vicidial_live_agents set external_dial='' where user='$user';"; diff --git a/agc_2-X/trunk/www/agc/vicidial.php b/agc_2-X/trunk/www/agc/vicidial.php index 994fa68d..369237c0 100644 --- a/agc_2-X/trunk/www/agc/vicidial.php +++ b/agc_2-X/trunk/www/agc/vicidial.php @@ -719,10 +719,11 @@ # 230418-1425 - Added vicidial_user_dial_log logging # 230420-2015 - Added latency calculation and logging, Issue #1457 # 230424-1754 - Changed phone login to readonly when password is forced to change +# 230513-2010 - Fix for manual dial call error handling # -$version = '2.14-686c'; -$build = '230420-2015'; +$version = '2.14-687c'; +$build = '230513-2010'; $php_script = 'vicidial.php'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=102; @@ -11241,7 +11242,8 @@ function set_length(SLnumber,SLlength_goal,SLdirection) var regMDFvarCB = new RegExp("CALLBACK","ig"); var regMDFvarTIME = new RegExp("OUTSIDE","ig"); var regMDFvarTFH = new RegExp("24-HOUR CALL LIMIT","ig"); - if ( (MDnextCID.match(regMNCvar)) || (MDnextCID.match(regMDFvarDNC)) || (MDnextCID.match(regMDFvarDCCL)) || (MDnextCID.match(regMDFvarCAMP)) || (MDnextCID.match(regMDFvarSYS)) ||(MDnextCID.match(regMDFvarCB)) || (MDnextCID.match(regMDFvarTIME)) || (MDnextCID.match(regMDFvarTFH)) ) + var regMDFvarERR = new RegExp("ERROR","ig"); + if ( (MDnextCID.match(regMNCvar)) || (MDnextCID.match(regMDFvarDNC)) || (MDnextCID.match(regMDFvarDCCL)) || (MDnextCID.match(regMDFvarCAMP)) || (MDnextCID.match(regMDFvarSYS)) ||(MDnextCID.match(regMDFvarCB)) || (MDnextCID.match(regMDFvarTIME)) || (MDnextCID.match(regMDFvarTFH)) || (MDnextCID.match(regMDFvarERR)) ) { button_click_log = button_click_log + "" + SQLdate + "-----DialNextFailed---" + MDnextCID + " " + "|"; @@ -11302,6 +11304,12 @@ function set_length(SLnumber,SLlength_goal,SLdirection) alert_displayed=1; in_lead_preview_state=0; } + if (MDnextCID.match(regMDFvarERR)) + { + alert_box(":\n" + MDnextCID); + alert_displayed=1; + in_lead_preview_state=0; + } if (MDnextCID.match(regMNHDNCvar)) {