From a72bbecf3afe928fc0bad20b0e5647899de3a4cb Mon Sep 17 00:00:00 2001 From: mattf Date: Sat, 24 Sep 2011 00:54:25 +0000 Subject: [PATCH] Added 5 custom fields to DIDs in admin.php git-svn-id: svn://192.168.202.10@1727 3d104415-ff17-0410-8863-d5cf3c621b8a --- .../trunk/extras/MySQL_AST_CREATE_tables.sql | 7 +- agc_2-X/trunk/extras/upgrade_2.4.sql | 8 +++ .../TO_BE_TRANSLATED_2.4.txt | 1 + agc_2-X/trunk/www/vicidial/admin.php | 72 ++++++++++++------- 4 files changed, 61 insertions(+), 27 deletions(-) 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 11244554..10b30ab2 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -1729,6 +1729,11 @@ filter_campaign_id VARCHAR(8), filter_phone_code VARCHAR(10) default '1', filter_menu_id VARCHAR(50) default '', filter_clean_cid_number VARCHAR(20) default '', +custom_one VARCHAR(100) default '', +custom_two VARCHAR(100) default '', +custom_three VARCHAR(100) default '', +custom_four VARCHAR(100) default '', +custom_five VARCHAR(100) default '', unique index (did_pattern), index (group_id) ); @@ -2667,7 +2672,7 @@ CREATE TABLE vicidial_log_noanswer_archive LIKE vicidial_log_noanswer; CREATE TABLE vicidial_did_agent_log_archive LIKE vicidial_did_agent_log; CREATE UNIQUE INDEX vdala on vicidial_did_agent_log_archive (uniqueid,call_date,did_route); -UPDATE system_settings SET db_schema_version='1298',db_schema_update_date=NOW(); +UPDATE system_settings SET db_schema_version='1299',db_schema_update_date=NOW(); GRANT RELOAD ON *.* TO cron@'%'; GRANT RELOAD ON *.* TO cron@localhost; diff --git a/agc_2-X/trunk/extras/upgrade_2.4.sql b/agc_2-X/trunk/extras/upgrade_2.4.sql index e9cdf121..ab4554f4 100644 --- a/agc_2-X/trunk/extras/upgrade_2.4.sql +++ b/agc_2-X/trunk/extras/upgrade_2.4.sql @@ -1067,3 +1067,11 @@ ALTER TABLE vicidial_inbound_groups ADD drop_callmenu VARCHAR(50) default ''; ALTER TABLE vicidial_inbound_groups ADD after_hours_callmenu VARCHAR(50) default ''; UPDATE system_settings SET db_schema_version='1298',db_schema_update_date=NOW() where db_schema_version < 1298; + +ALTER TABLE vicidial_inbound_dids ADD custom_one VARCHAR(100) default ''; +ALTER TABLE vicidial_inbound_dids ADD custom_two VARCHAR(100) default ''; +ALTER TABLE vicidial_inbound_dids ADD custom_three VARCHAR(100) default ''; +ALTER TABLE vicidial_inbound_dids ADD custom_four VARCHAR(100) default ''; +ALTER TABLE vicidial_inbound_dids ADD custom_five VARCHAR(100) default ''; + +UPDATE system_settings SET db_schema_version='1299',db_schema_update_date=NOW() where db_schema_version < 1299; diff --git a/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt b/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt index 99f01133..72af6a09 100644 --- a/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt +++ b/agc_2-X/trunk/translations/raw_translation_files/TO_BE_TRANSLATED_2.4.txt @@ -747,6 +747,7 @@ After Hours Call Menu|| If After Hours Action is set to CALLMENU, the call will be sent to this Call Menu if it enters the in-group outside of the call time scheme defined for the in-group|| Drop Call Menu|| If Drop Action is set to CALLMENU, the call will be sent to this call menu if it reaches Drop Call Seconds|| +Custom DID Fields - These five fields can be used for various purposes, mostly relating to custom programming and reports|| lead_report_export.php diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index a84e5aa9..86491705 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -2904,12 +2904,13 @@ else # 110920-1344 - Added pllb_grouping_limit settings # 110922-1218 - Added new User admin permissions, Added DID Remote Agent extension override section # 110923-0834 - Added option for in-group action transfer cid, and CALLMENU as drop and after-hours action options +# 110923-2043 - Added custom DID fields # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time -$admin_version = '2.4-337a'; -$build = '110923-0834'; +$admin_version = '2.4-338a'; +$build = '110923-2043'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -3437,6 +3438,7 @@ if ($ADD==10) {$hh='campaigns'; $sh='list'; echo "Campaigns";} if ($ADD==100) {$hh='lists'; echo "Lists";} if ($ADD==1000) {$hh='ingroups'; echo "In-Groups";} if ($ADD==1300) {$hh='ingroups'; echo "DIDs";} +if ($ADD==1320) {$hh='ingroups'; echo "Modify DID RA Extension Overrides";} if ($ADD==1500) {$hh='ingroups'; echo "Call Menus";} if ($ADD==1700) {$hh='ingroups'; echo "Filter Phone Groups";} if ($ADD==10000) {$hh='remoteagent'; echo "Remote Agents";} @@ -6079,6 +6081,10 @@ if ($ADD==99999)
Filter Action - If Filter Inbound Number is activated and a match is found then this is the action that is to be taken. This is the same as the Route that you select for a DID, and the settings below function just like they do for a standard routing. +
+ +
+ Custom DID Fields - These five fields can be used for various purposes, mostly relating to custom programming and reports. @@ -11693,7 +11699,7 @@ if ($ADD==2411) } else { - $stmt="INSERT INTO vicidial_inbound_dids (did_pattern,did_description,did_active,did_route,extension,exten_context,voicemail_ext,phone,server_ip,user,user_unavailable_action,user_route_settings_ingroup,group_id,call_handle_method,agent_search_method,list_id,campaign_id,phone_code,menu_id,record_call,filter_inbound_number,filter_phone_group_id,filter_url,filter_action,filter_extension,filter_exten_context,filter_voicemail_ext,filter_phone,filter_server_ip,filter_user,filter_user_unavailable_action,filter_user_route_settings_ingroup,filter_group_id,filter_call_handle_method,filter_agent_search_method,filter_list_id,filter_campaign_id,filter_phone_code,filter_menu_id,filter_clean_cid_number) SELECT \"$did_pattern\",\"$did_description\",did_active,did_route,extension,exten_context,voicemail_ext,phone,server_ip,user,user_unavailable_action,user_route_settings_ingroup,group_id,call_handle_method,agent_search_method,list_id,campaign_id,phone_code,menu_id,record_call,filter_inbound_number,filter_phone_group_id,filter_url,filter_action,filter_extension,filter_exten_context,filter_voicemail_ext,filter_phone,filter_server_ip,filter_user,filter_user_unavailable_action,filter_user_route_settings_ingroup,filter_group_id,filter_call_handle_method,filter_agent_search_method,filter_list_id,filter_campaign_id,filter_phone_code,filter_menu_id,filter_clean_cid_number from vicidial_inbound_dids where did_id=\"$source_did\";"; + $stmt="INSERT INTO vicidial_inbound_dids (did_pattern,did_description,did_active,did_route,extension,exten_context,voicemail_ext,phone,server_ip,user,user_unavailable_action,user_route_settings_ingroup,group_id,call_handle_method,agent_search_method,list_id,campaign_id,phone_code,menu_id,record_call,filter_inbound_number,filter_phone_group_id,filter_url,filter_action,filter_extension,filter_exten_context,filter_voicemail_ext,filter_phone,filter_server_ip,filter_user,filter_user_unavailable_action,filter_user_route_settings_ingroup,filter_group_id,filter_call_handle_method,filter_agent_search_method,filter_list_id,filter_campaign_id,filter_phone_code,filter_menu_id,filter_clean_cid_number,custom_one,custom_two,custom_three,custom_four,custom_five) SELECT \"$did_pattern\",\"$did_description\",did_active,did_route,extension,exten_context,voicemail_ext,phone,server_ip,user,user_unavailable_action,user_route_settings_ingroup,group_id,call_handle_method,agent_search_method,list_id,campaign_id,phone_code,menu_id,record_call,filter_inbound_number,filter_phone_group_id,filter_url,filter_action,filter_extension,filter_exten_context,filter_voicemail_ext,filter_phone,filter_server_ip,filter_user,filter_user_unavailable_action,filter_user_route_settings_ingroup,filter_group_id,filter_call_handle_method,filter_agent_search_method,filter_list_id,filter_campaign_id,filter_phone_code,filter_menu_id,filter_clean_cid_number,custom_one,custom_two,custom_three,custom_four,custom_five from vicidial_inbound_dids where did_id=\"$source_did\";"; $rslt=mysql_query($stmt, $link); $stmt="SELECT did_id from vicidial_inbound_dids where did_pattern='$did_pattern';"; @@ -15089,7 +15095,7 @@ if ($ADD==4311) { echo "
DID MODIFIED: $did_pattern\n"; - $stmt="UPDATE vicidial_inbound_dids set did_pattern='$did_pattern',did_description='$did_description',did_active='$did_active',did_route='$did_route',extension='$extension',exten_context='$exten_context',voicemail_ext='$voicemail_ext',phone='$phone',server_ip='$server_ip',user='$user',user_unavailable_action='$user_unavailable_action',user_route_settings_ingroup='$user_route_settings_ingroup',group_id='$group_id',call_handle_method='$call_handle_method',agent_search_method='$agent_search_method',list_id='$list_id',campaign_id='$campaign_id',phone_code='$phone_code',menu_id='$menu_id',record_call='$record_call',filter_inbound_number='$filter_inbound_number',filter_phone_group_id='$filter_phone_group_id',filter_url='$filter_url',filter_action='$filter_action',filter_extension='$filter_extension',filter_exten_context='$filter_exten_context',filter_voicemail_ext='$filter_voicemail_ext',filter_phone='$filter_phone',filter_server_ip='$filter_server_ip',filter_user='$filter_user',filter_user_unavailable_action='$filter_user_unavailable_action',filter_user_route_settings_ingroup='$filter_user_route_settings_ingroup',filter_group_id='$filter_group_id',filter_call_handle_method='$filter_call_handle_method',filter_agent_search_method='$filter_agent_search_method',filter_list_id='$filter_list_id',filter_campaign_id='$filter_campaign_id',filter_phone_code='$filter_phone_code',filter_menu_id='$filter_menu_id',filter_clean_cid_number='$filter_clean_cid_number' where did_id='$did_id';"; + $stmt="UPDATE vicidial_inbound_dids set did_pattern='$did_pattern',did_description='$did_description',did_active='$did_active',did_route='$did_route',extension='$extension',exten_context='$exten_context',voicemail_ext='$voicemail_ext',phone='$phone',server_ip='$server_ip',user='$user',user_unavailable_action='$user_unavailable_action',user_route_settings_ingroup='$user_route_settings_ingroup',group_id='$group_id',call_handle_method='$call_handle_method',agent_search_method='$agent_search_method',list_id='$list_id',campaign_id='$campaign_id',phone_code='$phone_code',menu_id='$menu_id',record_call='$record_call',filter_inbound_number='$filter_inbound_number',filter_phone_group_id='$filter_phone_group_id',filter_url='$filter_url',filter_action='$filter_action',filter_extension='$filter_extension',filter_exten_context='$filter_exten_context',filter_voicemail_ext='$filter_voicemail_ext',filter_phone='$filter_phone',filter_server_ip='$filter_server_ip',filter_user='$filter_user',filter_user_unavailable_action='$filter_user_unavailable_action',filter_user_route_settings_ingroup='$filter_user_route_settings_ingroup',filter_group_id='$filter_group_id',filter_call_handle_method='$filter_call_handle_method',filter_agent_search_method='$filter_agent_search_method',filter_list_id='$filter_list_id',filter_campaign_id='$filter_campaign_id',filter_phone_code='$filter_phone_code',filter_menu_id='$filter_menu_id',filter_clean_cid_number='$filter_clean_cid_number',custom_one='$custom_one',custom_two='$custom_two',custom_three='$custom_three',custom_four='$custom_four',custom_five='$custom_five' where did_id='$did_id';"; $rslt=mysql_query($stmt, $link); ### LOG INSERTION Admin Log Table ### @@ -21401,13 +21407,25 @@ if ($ADD==31) ##### CAMPAIGN PRESETS ##### if ($SUB==201) { - echo "

PRESETS FOR THIS CAMPAIGN:   $NWB#vicidial_xfer_presets$NWE
\n"; - echo "
\n"; - echo "\n"; - $stmt="SELECT preset_name,preset_number,preset_dtmf,preset_hide_number from vicidial_xfer_presets where campaign_id='$campaign_id' order by preset_name"; $rslt=mysql_query($stmt, $link); $presets_to_print = mysql_num_rows($rslt); + + echo "

$presets_to_print PRESETS FOR THIS CAMPAIGN:   $NWB#vicidial_xfer_presets$NWE
\n"; + + echo "
ADD NEW PRESET -
\n"; + echo "\n"; + echo "\n"; + echo "Preset Name: \n"; + echo " Number: \n"; + echo " DTMF: \n"; + echo "   Hide Number:  \n"; + echo "
\n"; + echo "
\n"; + + echo "
PRESET NAMENUMBERDTMFHIDEMODIFYDELETE
\n"; + echo "\n"; + $o=0; while ($presets_to_print > $o) { @@ -21419,29 +21437,20 @@ if ($ADD==31) else {$bgcolor='bgcolor="#9BB9FB"';} - echo "\n"; + echo "\n"; + echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; } echo "
# PRESET NAMENUMBERDTMFHIDEMODIFYDELETE
$rowx[0]\n"; + echo "
$o $rowx[0]\n"; echo "\n"; echo "\n"; echo "  DELETE
DELETE
\n"; - - echo "
ADD NEW PRESET
\n"; - echo "\n"; - echo "\n"; - echo "Preset Name: \n"; - echo "Preset Number:
\n"; - echo "Preset DTMF: \n"; - echo "   Hide Number: \n"; - echo "
\n"; - - echo "

\n"; } @@ -24621,7 +24630,7 @@ if ($ADD==3311) $didSQL = "did_id='$did_id'"; if ( (strlen($did_id)<1) and (strlen($did_pattern)>0) ) {$didSQL = "did_pattern='$did_pattern'";} - $stmt="SELECT did_id,did_pattern,did_description,did_active,did_route,extension,exten_context,voicemail_ext,phone,server_ip,user,user_unavailable_action,user_route_settings_ingroup,group_id,call_handle_method,agent_search_method,list_id,campaign_id,phone_code,menu_id,record_call,filter_inbound_number,filter_phone_group_id,filter_url,filter_action,filter_extension,filter_exten_context,filter_voicemail_ext,filter_phone,filter_server_ip,filter_user,filter_user_unavailable_action,filter_user_route_settings_ingroup,filter_group_id,filter_call_handle_method,filter_agent_search_method,filter_list_id,filter_campaign_id,filter_phone_code,filter_menu_id,filter_clean_cid_number from vicidial_inbound_dids where $didSQL;"; + $stmt="SELECT did_id,did_pattern,did_description,did_active,did_route,extension,exten_context,voicemail_ext,phone,server_ip,user,user_unavailable_action,user_route_settings_ingroup,group_id,call_handle_method,agent_search_method,list_id,campaign_id,phone_code,menu_id,record_call,filter_inbound_number,filter_phone_group_id,filter_url,filter_action,filter_extension,filter_exten_context,filter_voicemail_ext,filter_phone,filter_server_ip,filter_user,filter_user_unavailable_action,filter_user_route_settings_ingroup,filter_group_id,filter_call_handle_method,filter_agent_search_method,filter_list_id,filter_campaign_id,filter_phone_code,filter_menu_id,filter_clean_cid_number,custom_one,custom_two,custom_three,custom_four,custom_five from vicidial_inbound_dids where $didSQL;"; if ($DB) {echo "$stmt\n";} $rslt=mysql_query($stmt, $link); $row=mysql_fetch_row($rslt); @@ -24666,6 +24675,11 @@ if ($ADD==3311) $filter_phone_code = $row[38]; $filter_menu_id = $row[39]; $filter_clean_cid_number = $row[40]; + $custom_one = $row[41]; + $custom_two = $row[42]; + $custom_three = $row[43]; + $custom_four = $row[44]; + $custom_five = $row[45]; $stmt="SELECT campaign_id,campaign_name from vicidial_campaigns $whereLOGallowed_campaignsSQL order by campaign_id"; @@ -24855,6 +24869,12 @@ if ($ADD==3311) echo "$NWB#vicidial_inbound_dids-campaign_id$NWE\n"; echo "Filter In-Group Phone Code: $NWB#vicidial_inbound_dids-phone_code$NWE\n"; + echo "Custom 1: $NWB#vicidial_inbound_dids-custom_one$NWE\n"; + echo "Custom 2: $NWB#vicidial_inbound_dids-custom_one$NWE\n"; + echo "Custom 3: $NWB#vicidial_inbound_dids-custom_one$NWE\n"; + echo "Custom 4: $NWB#vicidial_inbound_dids-custom_one$NWE\n"; + echo "Custom 5: $NWB#vicidial_inbound_dids-custom_one$NWE\n"; + echo "\n"; echo "\n"; echo "

\n";