diff --git a/UPGRADE b/UPGRADE index f4e6d024..b97f377a 100644 --- a/UPGRADE +++ b/UPGRADE @@ -126,6 +126,9 @@ OTHER CHANGES: single button named "You are paused" or "You are active" depending on your status. Issue #814 +25. Added new LOCK options to Manual Dial Search Checkbox to prevent the agent + from checking or unchecking the search checkbox. + diff --git a/extras/MySQL_AST_CREATE_tables.sql b/extras/MySQL_AST_CREATE_tables.sql index d6380bee..415734dc 100644 --- a/extras/MySQL_AST_CREATE_tables.sql +++ b/extras/MySQL_AST_CREATE_tables.sql @@ -906,7 +906,7 @@ dispo_max SMALLINT(5) UNSIGNED default '0', dispo_max_dispo VARCHAR(6) default 'DISMX', pause_max SMALLINT(5) UNSIGNED default '0', max_inbound_calls SMALLINT(5) UNSIGNED default '0', -manual_dial_search_checkbox ENUM('SELECTED','SELECTED_RESET','UNSELECTED','UNSELECTED_RESET') default 'SELECTED', +manual_dial_search_checkbox ENUM('SELECTED','SELECTED_RESET','UNSELECTED','UNSELECTED_RESET','SELECTED_LOCK','UNSELECTED_LOCK') default 'SELECTED', hide_call_log_info ENUM('Y','N') default 'N', timer_alt_seconds SMALLINT(5) default '0', wrapup_bypass ENUM('DISABLED','ENABLED') default 'ENABLED', @@ -3365,4 +3365,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='1400',db_schema_update_date=NOW(),reload_timestamp=NOW(); +UPDATE system_settings SET db_schema_version='1401',db_schema_update_date=NOW(),reload_timestamp=NOW(); diff --git a/extras/upgrade_2.10.sql b/extras/upgrade_2.10.sql index 4c538857..e936e02d 100644 --- a/extras/upgrade_2.10.sql +++ b/extras/upgrade_2.10.sql @@ -170,3 +170,7 @@ ALTER TABLE vicidial_lists ADD local_call_time VARCHAR(10) NOT NULL DEFAULT 'cam ALTER TABLE vicidial_campaigns ADD manual_dial_search_filter VARCHAR(50) default 'NONE'; UPDATE system_settings SET db_schema_version='1400',db_schema_update_date=NOW() where db_schema_version < 1400; + +ALTER TABLE vicidial_campaigns MODIFY manual_dial_search_checkbox ENUM('SELECTED','SELECTED_RESET','UNSELECTED','UNSELECTED_RESET','SELECTED_LOCK','UNSELECTED_LOCK') default 'SELECTED'; + +UPDATE system_settings SET db_schema_version='1401',db_schema_update_date=NOW() where db_schema_version < 1401; diff --git a/www/agc/images/loading_se.gif b/www/agc/images/loading_se.gif new file mode 100644 index 00000000..6f9f1d26 Binary files /dev/null and b/www/agc/images/loading_se.gif differ diff --git a/www/agc/images/vdc_LB_customxfer_OFF_se.gif b/www/agc/images/vdc_LB_customxfer_OFF_se.gif new file mode 100644 index 00000000..6e252ce0 Binary files /dev/null and b/www/agc/images/vdc_LB_customxfer_OFF_se.gif differ diff --git a/www/agc/images/vdc_LB_customxfer_se.gif b/www/agc/images/vdc_LB_customxfer_se.gif new file mode 100644 index 00000000..0deb4876 Binary files /dev/null and b/www/agc/images/vdc_LB_customxfer_se.gif differ diff --git a/www/agc/images/vdc_LB_grabivrparkcall_OFF_se.gif b/www/agc/images/vdc_LB_grabivrparkcall_OFF_se.gif new file mode 100644 index 00000000..cdac3df1 Binary files /dev/null and b/www/agc/images/vdc_LB_grabivrparkcall_OFF_se.gif differ diff --git a/www/agc/images/vdc_LB_grabivrparkcall_se.gif b/www/agc/images/vdc_LB_grabivrparkcall_se.gif new file mode 100644 index 00000000..5c024de6 Binary files /dev/null and b/www/agc/images/vdc_LB_grabivrparkcall_se.gif differ diff --git a/www/agc/images/vdc_LB_grabparkedcall_OFF_se.gif b/www/agc/images/vdc_LB_grabparkedcall_OFF_se.gif new file mode 100644 index 00000000..d50fdd67 Binary files /dev/null and b/www/agc/images/vdc_LB_grabparkedcall_OFF_se.gif differ diff --git a/www/agc/images/vdc_LB_ivrparkcall_OFF_se.gif b/www/agc/images/vdc_LB_ivrparkcall_OFF_se.gif new file mode 100644 index 00000000..f38323af Binary files /dev/null and b/www/agc/images/vdc_LB_ivrparkcall_OFF_se.gif differ diff --git a/www/agc/images/vdc_LB_ivrparkcall_se.gif b/www/agc/images/vdc_LB_ivrparkcall_se.gif new file mode 100644 index 00000000..5619b489 Binary files /dev/null and b/www/agc/images/vdc_LB_ivrparkcall_se.gif differ diff --git a/www/agc/images/vdc_LB_quickxfer_OFF_se.gif b/www/agc/images/vdc_LB_quickxfer_OFF_se.gif new file mode 100644 index 00000000..be8f8fed Binary files /dev/null and b/www/agc/images/vdc_LB_quickxfer_OFF_se.gif differ diff --git a/www/agc/images/vdc_LB_quickxfer_se.gif b/www/agc/images/vdc_LB_quickxfer_se.gif new file mode 100644 index 00000000..34729f71 Binary files /dev/null and b/www/agc/images/vdc_LB_quickxfer_se.gif differ diff --git a/www/agc/images/vdc_LB_requeue_call_OFF_se.gif b/www/agc/images/vdc_LB_requeue_call_OFF_se.gif new file mode 100644 index 00000000..1108a219 Binary files /dev/null and b/www/agc/images/vdc_LB_requeue_call_OFF_se.gif differ diff --git a/www/agc/images/vdc_LB_requeue_call_se.gif b/www/agc/images/vdc_LB_requeue_call_se.gif new file mode 100644 index 00000000..3d5f8a60 Binary files /dev/null and b/www/agc/images/vdc_LB_requeue_call_se.gif differ diff --git a/www/agc/images/vdc_LB_stoprecording_OFF_se.gif b/www/agc/images/vdc_LB_stoprecording_OFF_se.gif new file mode 100644 index 00000000..067b2a37 Binary files /dev/null and b/www/agc/images/vdc_LB_stoprecording_OFF_se.gif differ diff --git a/www/agc/images/vdc_XB_contactsbutton_se.gif b/www/agc/images/vdc_XB_contactsbutton_se.gif new file mode 100644 index 00000000..c8ecc069 Binary files /dev/null and b/www/agc/images/vdc_XB_contactsbutton_se.gif differ diff --git a/www/agc/images/vdc_tab_email_se.gif b/www/agc/images/vdc_tab_email_se.gif new file mode 100644 index 00000000..142e7af8 Binary files /dev/null and b/www/agc/images/vdc_tab_email_se.gif differ diff --git a/www/agc/timeclock.php b/www/agc/timeclock.php index f1d7cc2f..7d87bd9a 100644 --- a/www/agc/timeclock.php +++ b/www/agc/timeclock.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2015 Matt Florell LICENSE: AGPLv2 # # CHANGELOG # 80523-0134 - First Build @@ -18,6 +18,7 @@ # 140810-2138 - Changed to use QXZ function for echoing text # 141118-1239 - Formatting changes for QXZ output # 141216-2122 - Added language settings lookups and user/pass variable standardization +# 150210-1307 - Fixed QXZ tags and formatting(issue #827) # $version = '2.10-14'; @@ -281,7 +282,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) echo "\n"; echo ""._QXZ("User Password:")." "; echo "\n"; - echo "   \n"; + echo "   \n"; echo "
"._QXZ("VERSION:")." $version       "._QXZ("BUILD:")." $build\n"; echo "\n"; echo "\n\n"; @@ -401,14 +402,14 @@ if ( ($stage == 'login') or ($stage == 'logout') ) { $VDdisplayMESSAGE = _QXZ("Time since you were last logged-in:")." $totTIME_HMS"; $log_action = 'login'; - $button_name = 'LOGIN'; + $button_name = _QXZ("LOGIN");; $LOGtimeMESSAGE = _QXZ("You last logged-out at:")." $last_action_date

"._QXZ("Click LOGIN below to log-in"); } if ($status=='LOGIN') { $VDdisplayMESSAGE = _QXZ("Amount of time you have been logged-in:")." $totTIME_HMS"; $log_action = 'logout'; - $button_name = 'LOGOUT'; + $button_name = _QXZ("LOGOUT"); $LOGtimeMESSAGE = _QXZ("You logged-in at:")." $last_action_date
"._QXZ("Amount of time you have been logged-in:")." $totTIME_HMS

"._QXZ("Click LOGOUT below to log-out"); } @@ -435,7 +436,7 @@ if ( ($stage == 'login') or ($stage == 'logout') ) echo "\n"; echo "   \n"; echo " $LOGtimeMESSAGE
 
\n"; - echo "   \n"; + echo "   \n"; echo "
"._QXZ("VERSION:")." $version       "._QXZ("BUILD:")." $build\n"; echo "\n"; echo "\n\n"; diff --git a/www/agc/vicidial.php b/www/agc/vicidial.php index daa2dcea..eb3d476c 100644 --- a/www/agc/vicidial.php +++ b/www/agc/vicidial.php @@ -476,10 +476,11 @@ # 150202-0829 - Reconfigured hotkeys and auto-manual-dial for less delay # 150203-1331 - Small changes to improve manual dial hotkey use # 150204-1911 - Changed Manual hotkey auto-manual-dial to a variable delay depending on dispo processing time +# 150210-1225 - Added LOCK options for manual_dial_search_checkbox, fixed missing QXZ tags(issue #827) # -$version = '2.10-447c'; -$build = '150204-1911'; +$version = '2.10-448c'; +$build = '150210-1225'; $mel=1; # Mysql Error Log enabled = 1 $mysql_log_count=85; $one_mysql_log=0; @@ -6323,7 +6324,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) var CBcounT = CBcounTtotal_array[0]; if (scheduled_callbacks_count=='LIVE') {CBcounT = CBcounTtotal_array[1];} - if (CBcounT == 0) {var CBprint = "NO";} + if (CBcounT == 0) {var CBprint = "";} else { var CBprint = CBcounT; @@ -7068,7 +7069,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) var MDDiaLOverridEform = document.vicidial_form.MDDiaLOverridE.value; var MDVendorLeadCode = document.vicidial_form.vendor_lead_code.value; var MDLookuPLeaD = 'new'; - if (document.vicidial_form.LeadLookuP.checked==true) + if ( (document.vicidial_form.LeadLookuP.checked==true) || (manual_dial_search_checkbox == 'SELECTED_LOCK') ) {MDLookuPLeaD = 'lookup';} if (MDPhonENumbeRform == 'XXXXXXXXXX') @@ -7155,7 +7156,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) else { var MDLookuPLeaD = 'new'; - if (document.vicidial_form.LeadLookuP.checked==true) + if ( (document.vicidial_form.LeadLookuP.checked==true) || (manual_dial_search_checkbox == 'SELECTED_LOCK') ) {MDLookuPLeaD = 'lookup';} agent_dialed_number=1; @@ -11191,9 +11192,9 @@ function set_length(SLnumber,SLlength_goal,SLdirection) dial_next_failed=0; xfer_agent_selected=0; - if (manual_dial_search_checkbox == 'SELECTED_RESET') + if ( (manual_dial_search_checkbox == 'SELECTED_RESET') || (manual_dial_search_checkbox == 'SELECTED_LOCK') ) {document.vicidial_form.LeadLookuP.checked=true;} - if (manual_dial_search_checkbox == 'UNSELECTED_RESET') + if ( (manual_dial_search_checkbox == 'UNSELECTED_RESET') || (manual_dial_search_checkbox == 'UNSELECTED_LOCK') ) {document.vicidial_form.LeadLookuP.checked=false;} if (post_phone_time_diff_alert_message.length > 10) @@ -14324,7 +14325,7 @@ function phone_number_format(formatphone) { if (qc_enabled < 1) {document.getElementById("viewcommentsdisplay").innerHTML = "";} - if ( (manual_dial_search_checkbox == 'SELECTED') || (manual_dial_search_checkbox == 'SELECTED_RESET') ) + if ( (manual_dial_search_checkbox == 'SELECTED') || (manual_dial_search_checkbox == 'SELECTED_RESET') || (manual_dial_search_checkbox == 'SELECTED_LOCK') ) {document.vicidial_form.LeadLookuP.checked=true;} else {document.vicidial_form.LeadLookuP.checked=false;} @@ -16334,7 +16335,7 @@ if ($agent_display_dialable_leads > 0)  
MY CALLBACK ONLY
";} + {echo " "._QXZ("MY CALLBACK ONLY")."
";} if ($comments_callback_screen != 'REPLACE_CB_NOTES') {echo _QXZ("CB Comments:")."

\n";} @@ -16429,11 +16430,17 @@ if ($agent_display_dialable_leads > 0) { echo "\n"; } + + $LeadLookuPXtra=''; + if ($manual_dial_search_checkbox == 'SELECTED_LOCK') + {$LeadLookuPXtra = 'CHECKED DISABLED ';} + if ($manual_dial_search_checkbox == 'UNSELECTED_LOCK') + {$LeadLookuPXtra = 'DISABLED ';} ?> -   + />  diff --git a/www/vicidial/admin.php b/www/vicidial/admin.php index 8bc4cbed..af7f57c5 100644 --- a/www/vicidial/admin.php +++ b/www/vicidial/admin.php @@ -3432,12 +3432,13 @@ else # 150117-1454 - Added NAME as status dialplay option # 150119-0920 - Added more list local calltime safety, issue #812 # 150120-0749 - Prevent modification of user_group ID, Hide non-functional agent_extended_alt_dial campaign feature, Export Calls Report Carrier added +# 150210-0657 - Added LOCK options for manual_dial_search_checkbox campaign setting # # 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.10-472a'; -$build = '150120-0749'; +$admin_version = '2.10-473a'; +$build = '150210-0657'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -19474,7 +19475,7 @@ if ($ADD==31) echo ""._QXZ("Manual Preview Dial").": $NWB#campaigns-manual_preview_dial$NWE\n"; - echo ""._QXZ("Manual Dial Search Checkbox").": $NWB#campaigns-manual_dial_search_checkbox$NWE\n"; + echo ""._QXZ("Manual Dial Search Checkbox").": $NWB#campaigns-manual_dial_search_checkbox$NWE\n"; echo ""._QXZ("Manual Dial Search Filter").": $NWB#campaigns-manual_dial_search_filter$NWE\n"; diff --git a/www/vicidial/help.php b/www/vicidial/help.php index 031e99ba..f0609eda 100644 --- a/www/vicidial/help.php +++ b/www/vicidial/help.php @@ -37,6 +37,7 @@ # 150117-1439 - Added NAME option to campaigns-status_display_fields # 150120-0636 - Hide non-functional agent_extended_alt_dial campaign feature # 150204-1246 - Small fixes, issue #826 +# 150210-0659 - Added LOCK options for manual_dial_search_checkbox # require("dbconnect_mysqli.php"); @@ -1555,7 +1556,7 @@ if ($SSoutbound_autodial_active > 0)

- - + -