From 846ada63bb9f1fb7167a5ba7ea63be7fb7d1a8fe Mon Sep 17 00:00:00 2001 From: mattf Date: Sat, 12 Sep 2020 20:57:34 +0000 Subject: [PATCH] Added more get_call_launch PREVIEW_ options git-svn-id: svn://192.168.202.10@3292 3d104415-ff17-0410-8863-d5cf3c621b8a --- extras/MySQL_AST_CREATE_tables.sql | 4 ++-- extras/upgrade_2.12.sql | 2 +- extras/upgrade_2.14.sql | 8 ++++++-- www/agc/vicidial.php | 29 +++++++++++++++++++++++++--- www/vicidial/admin.php | 11 ++++++----- www/vicidial/vicidial_stylesheet.php | 7 +++++++ 6 files changed, 48 insertions(+), 13 deletions(-) diff --git a/extras/MySQL_AST_CREATE_tables.sql b/extras/MySQL_AST_CREATE_tables.sql index 37d4aa5e..ca1130f8 100644 --- a/extras/MySQL_AST_CREATE_tables.sql +++ b/extras/MySQL_AST_CREATE_tables.sql @@ -774,7 +774,7 @@ campaign_rec_exten VARCHAR(20) default '8309', campaign_recording ENUM('NEVER','ONDEMAND','ALLCALLS','ALLFORCE') default 'ONDEMAND', campaign_rec_filename VARCHAR(50) default 'FULLDATE_CUSTPHONE', campaign_script VARCHAR(20), -get_call_launch ENUM('NONE','SCRIPT','SCRIPTTWO','WEBFORM','WEBFORMTWO','WEBFORMTHREE','FORM','PREVIEW_WEBFORM','PREVIEW_WEBFORMTWO','PREVIEW_WEBFORMTHREE') default 'NONE', +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', am_message_exten VARCHAR(100) default 'vm-goodbye', amd_send_to_vmx ENUM('Y','N') default 'N', xferconf_a_dtmf VARCHAR(50), @@ -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='1604',db_schema_update_date=NOW(),reload_timestamp=NOW(); +UPDATE system_settings SET db_schema_version='1605',db_schema_update_date=NOW(),reload_timestamp=NOW(); diff --git a/extras/upgrade_2.12.sql b/extras/upgrade_2.12.sql index 543a4329..86c2062e 100644 --- a/extras/upgrade_2.12.sql +++ b/extras/upgrade_2.12.sql @@ -20,7 +20,7 @@ ALTER TABLE vicidial_campaigns ADD web_form_address_three TEXT; ALTER TABLE vicidial_lists ADD web_form_address_three TEXT; ALTER TABLE vicidial_inbound_groups ADD web_form_address_three TEXT; -ALTER TABLE vicidial_campaigns MODIFY get_call_launch ENUM('NONE','SCRIPT','SCRIPTTWO','WEBFORM','WEBFORMTWO','WEBFORMTHREE','FORM','PREVIEW_WEBFORM','PREVIEW_WEBFORMTWO','PREVIEW_WEBFORMTHREE') default 'NONE'; +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'; ALTER TABLE vicidial_inbound_groups MODIFY get_call_launch ENUM('NONE','SCRIPT','SCRIPTTWO','WEBFORM','WEBFORMTWO','WEBFORMTHREE','FORM') default 'NONE'; UPDATE system_settings SET db_schema_version='1408',db_schema_update_date=NOW() where db_schema_version < 1408; diff --git a/extras/upgrade_2.14.sql b/extras/upgrade_2.14.sql index dc259ad0..5c8351f4 100644 --- a/extras/upgrade_2.14.sql +++ b/extras/upgrade_2.14.sql @@ -446,7 +446,7 @@ ALTER TABLE vicidial_campaigns ADD agent_screen_time_display VARCHAR(40) default UPDATE system_settings SET db_schema_version='1527',db_schema_update_date=NOW() where db_schema_version < 1527; -ALTER TABLE vicidial_campaigns MODIFY get_call_launch ENUM('NONE','SCRIPT','SCRIPTTWO','WEBFORM','WEBFORMTWO','WEBFORMTHREE','FORM','PREVIEW_WEBFORM','PREVIEW_WEBFORMTWO','PREVIEW_WEBFORMTHREE') default 'NONE'; +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='1528',db_schema_update_date=NOW() where db_schema_version < 1528; @@ -1076,7 +1076,7 @@ ALTER TABLE vicidial_inbound_groups ADD ingroup_script_two VARCHAR(20) default ' ALTER TABLE vicidial_inbound_groups MODIFY get_call_launch ENUM('NONE','SCRIPT','SCRIPTTWO','WEBFORM','WEBFORMTWO','WEBFORMTHREE','FORM','EMAIL') default 'NONE'; ALTER TABLE vicidial_campaigns ADD campaign_script_two VARCHAR(20) default ''; -ALTER TABLE vicidial_campaigns MODIFY get_call_launch ENUM('NONE','SCRIPT','SCRIPTTWO','WEBFORM','WEBFORMTWO','WEBFORMTHREE','FORM','PREVIEW_WEBFORM','PREVIEW_WEBFORMTWO','PREVIEW_WEBFORMTHREE') default 'NONE'; +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'; ALTER TABLE vicidial_campaigns ADD leave_vm_no_dispo ENUM('ENABLED','DISABLED') default 'DISABLED'; ALTER TABLE vicidial_campaigns ADD leave_vm_message_group_id VARCHAR(40) default '---NONE---'; @@ -1307,3 +1307,7 @@ UPDATE system_settings SET db_schema_version='1603',db_schema_update_date=NOW() ALTER TABLE vicidial_users MODIFY modify_leads ENUM('0','1','2','3','4','5','6') default '0'; UPDATE system_settings SET db_schema_version='1604',db_schema_update_date=NOW() where db_schema_version < 1604; + +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; diff --git a/www/agc/vicidial.php b/www/agc/vicidial.php index 42a9359b..15be872e 100644 --- a/www/agc/vicidial.php +++ b/www/agc/vicidial.php @@ -642,6 +642,7 @@ # 200524-1021 - Fix for agentchannel not populating while volumecontrol_active disabled # 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 # $version = '2.14-611c'; @@ -10275,7 +10276,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) { CustomerChatContentsLoad(); } - if (get_call_launch == 'SCRIPT') + if ( (get_call_launch == 'SCRIPT') || (get_call_launch == 'PREVIEW_SCRIPT') ) { if (delayed_script_load == 'YES') { @@ -10283,7 +10284,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) } ScriptPanelToFront(); } - if ( (get_call_launch == 'SCRIPTTWO') && (SSenable_second_script > 0) ) + if ( ( (get_call_launch == 'SCRIPTTWO') || (get_call_launch == 'PREVIEW_SCRIPTTWO') ) && (SSenable_second_script > 0) ) { if (delayed_script_load == 'YES') { @@ -10292,7 +10293,7 @@ function set_length(SLnumber,SLlength_goal,SLdirection) ScriptPanel2ToFront(); } - if (get_call_launch == 'FORM') + if ( (get_call_launch == 'FORM') || (get_call_launch == 'PREVIEW_FORM') ) { FormPanelToFront(); } @@ -10346,6 +10347,28 @@ function set_length(SLnumber,SLlength_goal,SLdirection) } reselect_preview_dial = 1; + if (get_call_launch == 'PREVIEW_SCRIPT') + { + if (delayed_script_load == 'YES') + { + load_script_contents('ScriptContents',''); + } + ScriptPanelToFront(); + } + if ( (get_call_launch == 'PREVIEW_SCRIPTTWO') && (SSenable_second_script > 0) ) + { + if (delayed_script_load == 'YES') + { + load_script_contents('Script2Contents',''); + } + ScriptPanel2ToFront(); + } + + if (get_call_launch == 'PREVIEW_FORM') + { + FormPanelToFront(); + } + if (get_call_launch == 'PREVIEW_WEBFORM') { window.open(TEMP_VDIC_web_form_address, web_form_target, 'toolbar=1,scrollbars=1,location=1,statusbar=1,menubar=1,resizable=1,width=640,height=450'); diff --git a/www/vicidial/admin.php b/www/vicidial/admin.php index 56603e37..8686d945 100644 --- a/www/vicidial/admin.php +++ b/www/vicidial/admin.php @@ -4706,12 +4706,13 @@ else # 200814-2249 - Added International DNC scrub options # 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 # # 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-766a'; -$build = '200816-0912'; +$admin_version = '2.14-767a'; +$build = '200912-1649'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -24427,18 +24428,18 @@ if ($ADD==31) $eswHTML=''; $cfwHTML=''; if ($SSenable_second_script > 0) - {$eswHTML .= "";} + {$eswHTML .= "";} if ($SSenable_second_webform > 0) {$eswHTML .= '';} if ($SSenable_third_webform > 0) {$eswHTML .= "";} if ($SScustom_fields_enabled > 0) - {$cfwHTML .= '';} + {$cfwHTML .= '';} if ($SSallow_emails > 0) {$aemHTML .= "";} if ($SSallow_chats > 0) {$achHTML .= '';} - echo ""._QXZ("Get Call Launch").": $NWB#campaigns-get_call_launch$NWE\n"; + echo ""._QXZ("Get Call Launch").": $NWB#campaigns-get_call_launch$NWE\n"; if ($SSbrowser_call_alerts > 0) { diff --git a/www/vicidial/vicidial_stylesheet.php b/www/vicidial/vicidial_stylesheet.php index 44bab306..0c5e4ea1 100644 --- a/www/vicidial/vicidial_stylesheet.php +++ b/www/vicidial/vicidial_stylesheet.php @@ -65,6 +65,13 @@ redalert {font-size: 18px; font-weight:bold; font-family: Arial, Sans-Serif; col .green {color: black; background-color: #99FF99} .red {color: black; background-color: #FF9999} .orange {color: black; background-color: #FFCC99} +.white_text {color: #FFF;} + +/* Basic fonts */ +.small_standard { font-family: Arial, Helvetica, sans-serif; font-size: 8pt} +.small_standard_bold { font-family: Arial, Helvetica, sans-serif; font-size: 8pt; font-weight: bold} +.standard { font-family: Arial, Helvetica, sans-serif; font-size: 10pt} +.standard_bold { font-family: Arial, Helvetica, sans-serif; font-size: 10pt; font-weight: bold} .std_row1 {background-color: } .std_row2 {background-color: }