diff --git a/agc_2-X/branches/agc_2.0.5/www/vicidial/admin.php b/agc_2-X/branches/agc_2.0.5/www/vicidial/admin.php
index 82476d2e..1a33773e 100644
--- a/agc_2-X/branches/agc_2.0.5/www/vicidial/admin.php
+++ b/agc_2-X/branches/agc_2.0.5/www/vicidial/admin.php
@@ -18785,7 +18785,7 @@ if ($ADD==1300)
$rslt=mysql_query($stmt, $link);
$dids_to_print = mysql_num_rows($rslt);
- echo "
INBOUND GROUP LISTINGS:\n";
+ echo "
INBOUND DID LISTINGS:\n";
echo "
| # | "; 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 1f5e3ec6..d88c8b4d 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -476,25 +476,26 @@ modify_servers ENUM('0','1') default '0', view_reports ENUM('0','1') default '0', vicidial_recording_override ENUM('DISABLED','NEVER','ONDEMAND','ALLCALLS','ALLFORCE') default 'DISABLED', alter_custdata_override ENUM('NOT_ACTIVE','ALLOW_ALTER') default 'NOT_ACTIVE', -qc_enabled ENUM('1','0') default '0', +qc_enabled ENUM('0','1') default '0', qc_user_level INT(2) default '1', -qc_pass ENUM('1','0') default '0', -qc_finish ENUM('1','0') default '0', -qc_commit ENUM('1','0') default '0', -add_timeclock_log ENUM('1','0') default '0', -modify_timeclock_log ENUM('1','0') default '0', -delete_timeclock_log ENUM('1','0') default '0', +qc_pass ENUM('0','1') default '0', +qc_finish ENUM('0','1') default '0', +qc_commit ENUM('0','1') default '0', +add_timeclock_log ENUM('0','1') default '0', +modify_timeclock_log ENUM('0','1') default '0', +delete_timeclock_log ENUM('0','1') default '0', alter_custphone_override ENUM('NOT_ACTIVE','ALLOW_ALTER') default 'NOT_ACTIVE', vdc_agent_api_access ENUM('0','1') default '0', -modify_inbound_dids ENUM('1','0') default '0', -delete_inbound_dids ENUM('1','0') default '0', +modify_inbound_dids ENUM('0','1') default '0', +delete_inbound_dids ENUM('0','1') default '0', active ENUM('Y','N') default 'Y', -alert_enabled ENUM('1','0') default '0', -download_lists ENUM('1','0') default '0', +alert_enabled ENUM('0','1') default '0', +download_lists ENUM('0','1') default '0', agent_shift_enforcement_override ENUM('DISABLED','OFF','START','ALL') default 'DISABLED', manager_shift_enforcement_override ENUM('0','1') default '0', shift_override_flag ENUM('0','1') default '0', -export_reports ENUM('1','0') default '0' +export_reports ENUM('0','1') default '0', +delete_from_dnc ENUM('0','1') default '0' ); @@ -623,12 +624,14 @@ three_way_call_cid ENUM('CAMPAIGN','CUSTOMER','AGENT_PHONE','AGENT_CHOOSE') defa three_way_dial_prefix VARCHAR(20) default '', web_form_target VARCHAR(100) NOT NULL default 'vdcwebform', vtiger_search_category VARCHAR(100) default 'LEAD', -vtiger_create_call_record ENUM('Y','N') default 'Y', +vtiger_create_call_record ENUM('Y','N','DISPO') default 'Y', vtiger_create_lead_record ENUM('Y','N') default 'Y', -vtiger_screen_login ENUM('Y','N') default 'Y', +vtiger_screen_login ENUM('Y','N','NEW_WINDOW') default 'Y', cpd_amd_action ENUM('DISABLED','DISPO','MESSAGE') default 'DISABLED', agent_allow_group_alias ENUM('Y','N') default 'N', -default_group_alias VARCHAR(30) default '' +default_group_alias VARCHAR(30) default '', +vtiger_search_dead ENUM('DISABLED','ASK','RESURRECT') default 'ASK', +vtiger_status_call ENUM('Y','N') default 'N' ); CREATE TABLE vicidial_lists ( @@ -646,7 +649,12 @@ status VARCHAR(6) PRIMARY KEY NOT NULL, status_name VARCHAR(30), selectable ENUM('Y','N'), human_answered ENUM('Y','N') default 'N', -category VARCHAR(20) default 'UNDEFINED' +category VARCHAR(20) default 'UNDEFINED', +sale ENUM('Y','N') default 'N', +dnc ENUM('Y','N') default 'N', +customer_contact ENUM('Y','N') default 'N', +not_interested ENUM('Y','N') default 'N', +unworkable ENUM('Y','N') default 'N' ); CREATE TABLE vicidial_campaign_statuses ( @@ -656,6 +664,11 @@ selectable ENUM('Y','N'), campaign_id VARCHAR(8), human_answered ENUM('Y','N') default 'N', category VARCHAR(20) default 'UNDEFINED', +sale ENUM('Y','N') default 'N', +dnc ENUM('Y','N') default 'N', +customer_contact ENUM('Y','N') default 'N', +not_interested ENUM('Y','N') default 'N', +unworkable ENUM('Y','N') default 'N', index (campaign_id) ); @@ -1535,7 +1548,7 @@ CREATE INDEX phone_number on vicidial_closer_log (phone_number); CREATE INDEX date_user on vicidial_closer_log (call_date,user); CREATE INDEX comment_a on live_inbound_log (comment_a); -UPDATE system_settings SET db_schema_version='1136'; +UPDATE system_settings SET db_schema_version='1137'; GRANT RELOAD ON *.* TO cron@'%'; GRANT RELOAD ON *.* TO cron@localhost; diff --git a/agc_2-X/trunk/extras/first_server_install.sql b/agc_2-X/trunk/extras/first_server_install.sql index 47606ace..3f2f1b6a 100644 --- a/agc_2-X/trunk/extras/first_server_install.sql +++ b/agc_2-X/trunk/extras/first_server_install.sql @@ -315,34 +315,35 @@ INSERT INTO vicidial_list(status,list_id,phone_code,phone_number,first_name,last INSERT INTO vicidial_list(status,list_id,phone_code,phone_number,first_name,last_name,address1,city,state,postal_code,country_code,gender,email) values('NEW','101','1','7275551212','Matt','lead06','1234 Fake St.','Clearwater','FL','33760','USA','M','test@test.com'); INSERT INTO vicidial_list(status,list_id,phone_code,phone_number,first_name,last_name,address1,city,state,postal_code,country_code,gender,email) values('NEW','101','1','7275551212','Matt','lead07','1234 Fake St.','Clearwater','FL','33760','USA','M','test@test.com'); -INSERT INTO vicidial_statuses values('NEW','New Lead','N','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('QUEUE','Lead To Be Called','N','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('INCALL','Lead Being Called','N','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('DROP','Agent Not Available','N','Y','UNDEFINED'); -INSERT INTO vicidial_statuses values('XDROP','Agent Not Available IN','N','Y','UNDEFINED'); -INSERT INTO vicidial_statuses values('NA','No Answer AutoDial','N','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('CALLBK','Call Back','Y','Y','UNDEFINED'); -INSERT INTO vicidial_statuses values('CBHOLD','Call Back Hold','N','Y','UNDEFINED'); -INSERT INTO vicidial_statuses values('A','Answering Machine','Y','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('AA','Answering Machine Auto','N','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('AM','Answering Machine Sent to Mesg','N','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('AL','Answering Machine Msg Played','N','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('AFAX','Fax Machine Auto','N','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('B','Busy','Y','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('DC','Disconnected Number','Y','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('DEC','Declined Sale','Y','Y','UNDEFINED'); -INSERT INTO vicidial_statuses values('DNC','DO NOT CALL','Y','Y','UNDEFINED'); -INSERT INTO vicidial_statuses values('DNCL','DO NOT CALL Hopper Match','N','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('SALE','Sale Made','Y','Y','UNDEFINED'); -INSERT INTO vicidial_statuses values('N','No Answer','Y','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('NI','Not Interested','Y','Y','UNDEFINED'); -INSERT INTO vicidial_statuses values('NP','No Pitch No Price','Y','Y','UNDEFINED'); -INSERT INTO vicidial_statuses values('PU','Call Picked Up','N','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('PM','Played Message','N','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('XFER','Call Transferred','Y','Y','UNDEFINED'); -INSERT INTO vicidial_statuses values('ERI','Agent Error','N','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('SVYEXT','Survey sent to Extension','N','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('SVYVM','Survey sent to Voicemail','N','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('SVYHU','Survey Hungup','N','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('SVYREC','Survey sent to Record','N','N','UNDEFINED'); -INSERT INTO vicidial_statuses values('QVMAIL','Queue Abandon Voicemail Left','N','N','UNDEFINED'); +INSERT INTO vicidial_statuses values('NEW','New Lead','N','N','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('QUEUE','Lead To Be Called','N','N','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('INCALL','Lead Being Called','N','N','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('DROP','Agent Not Available','N','Y','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('XDROP','Agent Not Available IN','N','Y','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('NA','No Answer AutoDial','N','N','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('CALLBK','Call Back','Y','Y','UNDEFINED','N','N','Y','N','N'); +INSERT INTO vicidial_statuses values('CBHOLD','Call Back Hold','N','Y','UNDEFINED','N','N','Y','N','N'); +INSERT INTO vicidial_statuses values('A','Answering Machine','Y','N','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('AA','Answering Machine Auto','N','N','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('AM','Answering Machine Sent to Mesg','N','N','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('AL','Answering Machine Msg Played','N','N','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('AFAX','Fax Machine Auto','N','N','UNDEFINED','N','N','N','N','Y'); +INSERT INTO vicidial_statuses values('B','Busy','Y','N','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('DC','Disconnected Number','Y','N','UNDEFINED','N','N','N','N','Y'); +INSERT INTO vicidial_statuses values('DEC','Declined Sale','Y','Y','UNDEFINED','N','N','Y','N','N'); +INSERT INTO vicidial_statuses values('DNC','DO NOT CALL','Y','Y','UNDEFINED','N','Y','N','N','N'); +INSERT INTO vicidial_statuses values('DNCL','DO NOT CALL Hopper Match','N','N','UNDEFINED','N','Y','N','N','N'); +INSERT INTO vicidial_statuses values('DNCC','DO NOT CALL Camp Match','N','N','UNDEFINED','N','Y','N','N','N'); +INSERT INTO vicidial_statuses values('SALE','Sale Made','Y','Y','UNDEFINED','Y','N','N','N','N'); +INSERT INTO vicidial_statuses values('N','No Answer','Y','N','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('NI','Not Interested','Y','Y','UNDEFINED','N','N','Y','Y','N'); +INSERT INTO vicidial_statuses values('NP','No Pitch No Price','Y','Y','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('PU','Call Picked Up','N','N','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('PM','Played Message','N','N','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('XFER','Call Transferred','Y','Y','UNDEFINED','N','N','Y','N','N'); +INSERT INTO vicidial_statuses values('ERI','Agent Error','N','N','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('SVYEXT','Survey sent to Extension','N','N','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('SVYVM','Survey sent to Voicemail','N','N','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('SVYHU','Survey Hungup','N','N','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('SVYREC','Survey sent to Record','N','N','UNDEFINED','N','N','N','N','N'); +INSERT INTO vicidial_statuses values('QVMAIL','Queue Abandon Voicemail Left','N','N','UNDEFINED','N','N','N','N','N'); diff --git a/agc_2-X/trunk/extras/upgrade_2.2.0.sql b/agc_2-X/trunk/extras/upgrade_2.2.0.sql index f0b133e8..afa9f206 100644 --- a/agc_2-X/trunk/extras/upgrade_2.2.0.sql +++ b/agc_2-X/trunk/extras/upgrade_2.2.0.sql @@ -4,3 +4,23 @@ ALTER TABLE vicidial_nanpa_prefix_codes ADD postal_code VARCHAR(10) default ''; ALTER TABLE vicidial_nanpa_prefix_codes ADD country VARCHAR(2) default ''; UPDATE system_settings SET db_schema_version='1136', version='2.2.0b0.5'; + +ALTER TABLE vicidial_users ADD delete_from_dnc ENUM('0','1') default '0'; + +ALTER TABLE vicidial_campaigns ADD vtiger_search_dead ENUM('DISABLED','ASK','RESURRECT') default 'ASK'; +ALTER TABLE vicidial_campaigns ADD vtiger_status_call ENUM('Y','N') default 'N'; +ALTER TABLE vicidial_campaigns MODIFY vtiger_screen_login ENUM('Y','N','NEW_WINDOW') default 'Y'; +ALTER TABLE vicidial_campaigns MODIFY vtiger_create_call_record ENUM('Y','N','DISPO') default 'Y'; + +ALTER TABLE vicidial_statuses ADD sale ENUM('Y','N') default 'N'; +ALTER TABLE vicidial_statuses ADD dnc ENUM('Y','N') default 'N'; +ALTER TABLE vicidial_statuses ADD customer_contact ENUM('Y','N') default 'N'; +ALTER TABLE vicidial_statuses ADD not_interested ENUM('Y','N') default 'N'; +ALTER TABLE vicidial_statuses ADD unworkable ENUM('Y','N') default 'N'; +ALTER TABLE vicidial_campaign_statuses ADD sale ENUM('Y','N') default 'N'; +ALTER TABLE vicidial_campaign_statuses ADD dnc ENUM('Y','N') default 'N'; +ALTER TABLE vicidial_campaign_statuses ADD customer_contact ENUM('Y','N') default 'N'; +ALTER TABLE vicidial_campaign_statuses ADD not_interested ENUM('Y','N') default 'N'; +ALTER TABLE vicidial_campaign_statuses ADD unworkable ENUM('Y','N') default 'N'; + +UPDATE system_settings SET db_schema_version='1137'; diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index afaf8c37..83612769 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -954,6 +954,22 @@ if (isset($_GET["manager_shift_enforcement_override"])) {$manager_shift_enfor elseif (isset($_POST["manager_shift_enforcement_override"])) {$manager_shift_enforcement_override=$_POST["manager_shift_enforcement_override"];} if (isset($_GET["export_reports"])) {$export_reports=$_GET["export_reports"];} elseif (isset($_POST["export_reports"])) {$export_reports=$_POST["export_reports"];} +if (isset($_GET["delete_from_dnc"])) {$delete_from_dnc=$_GET["delete_from_dnc"];} + elseif (isset($_POST["delete_from_dnc"])) {$delete_from_dnc=$_POST["delete_from_dnc"];} +if (isset($_GET["vtiger_search_dead"])) {$vtiger_search_dead=$_GET["vtiger_search_dead"];} + elseif (isset($_POST["vtiger_search_dead"])) {$vtiger_search_dead=$_POST["vtiger_search_dead"];} +if (isset($_GET["vtiger_status_call"])) {$vtiger_status_call=$_GET["vtiger_status_call"];} + elseif (isset($_POST["vtiger_status_call"])) {$vtiger_status_call=$_POST["vtiger_status_call"];} +if (isset($_GET["sale"])) {$sale=$_GET["sale"];} + elseif (isset($_POST["sale"])) {$sale=$_POST["sale"];} +if (isset($_GET["dnc"])) {$dnc=$_GET["dnc"];} + elseif (isset($_POST["dnc"])) {$dnc=$_POST["dnc"];} +if (isset($_GET["customer_contact"])) {$customer_contact=$_GET["customer_contact"];} + elseif (isset($_POST["customer_contact"])) {$customer_contact=$_POST["customer_contact"];} +if (isset($_GET["not_interested"])) {$not_interested=$_GET["not_interested"];} + elseif (isset($_POST["not_interested"])) {$not_interested=$_POST["not_interested"];} +if (isset($_GET["unworkable"])) {$unworkable=$_GET["unworkable"];} + elseif (isset($_POST["unworkable"])) {$unworkable=$_POST["unworkable"];} if (isset($script_id)) {$script_id= strtoupper($script_id);} @@ -1138,6 +1154,7 @@ $caller_id_number = ereg_replace("[^0-9]","",$caller_id_number); $outbound_calls_per_second = ereg_replace("[^0-9]","",$outbound_calls_per_second); $manager_shift_enforcement_override = ereg_replace("[^0-9]","",$manager_shift_enforcement_override); $export_reports = ereg_replace("[^0-9]","",$export_reports); +$delete_from_dnc = ereg_replace("[^0-9]","",$delete_from_dnc); ### DIGITS and COLONS $shift_length = ereg_replace("[^\:0-9]","",$shift_length); @@ -1190,6 +1207,12 @@ $active_asterisk_server = ereg_replace("[^NY]","",$active_asterisk_server); $generate_vicidial_conf = ereg_replace("[^NY]","",$generate_vicidial_conf); $rebuild_conf_files = ereg_replace("[^NY]","",$rebuild_conf_files); $agent_allow_group_alias = ereg_replace("[^NY]","",$agent_allow_group_alias); +$vtiger_status_call = ereg_replace("[^NY]","",$vtiger_status_call); +$sale = ereg_replace("[^NY]","",$sale); +$dnc = ereg_replace("[^NY]","",$dnc); +$customer_contact = ereg_replace("[^NY]","",$customer_contact); +$not_interested = ereg_replace("[^NY]","",$not_interested); +$unworkable = ereg_replace("[^NY]","",$unworkable); $qc_enabled = ereg_replace("[^0-9NY]","",$qc_enabled); @@ -1347,6 +1370,7 @@ $template_id = ereg_replace("[^-\_0-9a-zA-Z]","",$template_id); $carrier_id = ereg_replace("[^-\_0-9a-zA-Z]","",$carrier_id); $group_alias_id = ereg_replace("[^-\_0-9a-zA-Z]","",$group_alias_id); $default_group_alias = ereg_replace("[^-\_0-9a-zA-Z]","",$default_group_alias); +$vtiger_search_dead = ereg_replace("[^-\_0-9a-zA-Z]","",$vtiger_search_dead); ### ALPHA-NUMERIC and underscore and dash and comma $logins_list = ereg_replace("[^-\,\_0-9a-zA-Z]","",$logins_list); @@ -1646,11 +1670,13 @@ $dialplan_entry = ereg_replace(";","",$dialplan_entry); # 90310-2203 - Added export_reports option for call activity report data exports # 90315-1010 - Changed revision for new trunk 2.2.0 # 90320-0424 - Fixed several small bugs conf records group alias and permissions +# 90322-0122 - Added ability to delete from the DNC lists +# 90322-1105 - Added new status settings and vtiger options # # 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.2.0-174'; -$build = '90320-0424'; +$admin_version = '2.2.0-176'; +$build = '90322-1105'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -1755,6 +1781,7 @@ $browser = getenv("HTTP_USER_AGENT"); $LOGdelete_dids =$row[57]; $LOGmanager_shift_enforcement_override=$row[61]; $LOGexport_reports =$row[64]; + $LOGdelete_from_dnc =$row[65]; $stmt="SELECT allowed_campaigns from vicidial_user_groups where user_group='$LOGuser_group';"; $rslt=mysql_query($stmt, $link); @@ -2854,6 +2881,11 @@ if ($SSqc_features_active > 0)