From 87ea4eafd83d18c887dd398d88ef1811b76347c2 Mon Sep 17 00:00:00 2001 From: mattf Date: Wed, 8 May 2019 04:17:59 +0000 Subject: [PATCH] Added enable_status_mismatch_leadloader_option to the web lead loader git-svn-id: svn://192.168.202.10@3095 3d104415-ff17-0410-8863-d5cf3c621b8a --- .../trunk/extras/MySQL_AST_CREATE_tables.sql | 1 + .../vicidial/admin_listloader_fourth_gen.php | 802 +++++++++++++++--- .../trunk/www/vicidial/help_documentation.txt | 3 +- .../trunk/www/vicidial/options-example.php | 4 + 4 files changed, 673 insertions(+), 137 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 af26c1c5..0582622e 100644 --- a/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql +++ b/agc_2-X/trunk/extras/MySQL_AST_CREATE_tables.sql @@ -4333,6 +4333,7 @@ INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,cate INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,category,sale,dnc,customer_contact,not_interested,unworkable,scheduled_callback,completed,answering_machine) values('QCFAIL','QC_FAIL_CALLBK','N','Y','QC','N','N','Y','N','N','Y','N','N'); INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,category,sale,dnc,customer_contact,not_interested,unworkable,scheduled_callback,completed,answering_machine) values('ADCT','Disconnected Number Temporary','N','N','UNDEFINED','N','N','N','N','N','N','N','N'); INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,category,sale,dnc,customer_contact,not_interested,unworkable,scheduled_callback,completed,answering_machine) values('LSMERG','Agent lead search old lead mrg','N','N','UNDEFINED','N','N','N','N','N','N','N','N'); +INSERT INTO vicidial_statuses (status,status_name,selectable,human_answered,category,sale,dnc,customer_contact,not_interested,unworkable,scheduled_callback,completed,answering_machine) values('DAIR','Dead Air','Y','N','UNDEFINED','N','N','N','N','N','N','N','N'); INSERT INTO vicidial_qc_codes (code,code_name,qc_result_type) VALUES ('QCPASS','PASS','PASS'); INSERT INTO vicidial_qc_codes (code,code_name,qc_result_type) VALUES ('QCFAIL','FAIL','FAIL'); diff --git a/agc_2-X/trunk/www/vicidial/admin_listloader_fourth_gen.php b/agc_2-X/trunk/www/vicidial/admin_listloader_fourth_gen.php index a5298d41..ee0e9b00 100644 --- a/agc_2-X/trunk/www/vicidial/admin_listloader_fourth_gen.php +++ b/agc_2-X/trunk/www/vicidial/admin_listloader_fourth_gen.php @@ -2,7 +2,7 @@ # admin_listloader_fourth_gen.php - version 2.14 # (based upon - new_listloader_superL.php script) # -# Copyright (C) 2018 Matt Florell,Joe Johnson LICENSE: AGPLv2 +# Copyright (C) 2019 Matt Florell,Joe Johnson LICENSE: AGPLv2 # # ViciDial web-based lead loader from formatted file # @@ -75,14 +75,19 @@ # 180324-0943 - Enforce User Group campaign permissions for templates based on list_id # 180502-2215 - Added new help display # 180927-0702 - Fixed translation-related issue #1114 +# 190503-1547 - Added enable_status_mismatch_leadloader_option # -$version = '2.14-73'; -$build = '180927-0702'; +$version = '2.14-74'; +$build = '190503-1547'; require("dbconnect_mysqli.php"); require("functions.php"); +$enable_status_mismatch_leadloader_option=0; + +require("options.php"); + $US='_'; $MT[0]=''; @@ -168,6 +173,8 @@ if (isset($_GET["dedupe_statuses"])) {$dedupe_statuses=$_GET["dedupe_statuses elseif (isset($_POST["dedupe_statuses"])) {$dedupe_statuses=$_POST["dedupe_statuses"];} if (isset($_GET["dedupe_statuses_override"])) {$dedupe_statuses_override=$_GET["dedupe_statuses_override"];} elseif (isset($_POST["dedupe_statuses_override"])) {$dedupe_statuses_override=$_POST["dedupe_statuses_override"];} +if (isset($_GET["status_mismatch_action"])) {$status_mismatch_action=$_GET["status_mismatch_action"];} + elseif (isset($_POST["status_mismatch_action"])) {$status_mismatch_action=$_POST["status_mismatch_action"];} if (isset($_GET["postalgmt"])) {$postalgmt=$_GET["postalgmt"];} elseif (isset($_POST["postalgmt"])) {$postalgmt=$_POST["postalgmt"];} if (isset($_GET["phone_code_override"])) {$phone_code_override=$_GET["phone_code_override"];} @@ -511,10 +518,10 @@ function openNewWindow(url) { window.open (url,"",'width=700,height=300,scrollbars=yes,menubar=yes,address=yes'); } -function ShowProgress(good, bad, total, dup, inv, post) +function ShowProgress(good, bad, total, dup, inv, post, moved) { parent.lead_count.document.open(); - parent.lead_count.document.write('
:
:'+good+'
:'+bad+'
:'+total+'
   
:'+dup+'
:'+inv+'
:'+post+'
'); + parent.lead_count.document.write('
:
:'+good+'
:'+bad+'
:'+total+'
   
:'+dup+'
:'+moved+'
:'+inv+'
:'+post+'
'); parent.lead_count.document.close(); } function ParseFileName() @@ -726,6 +733,22 @@ if ( (!$OK_to_process) or ( ($leadfile) and ($file_layout!="standard" && $file_l +0) { ?> + + : + + + + + + + : \r\n"; + print " \r\n"; print " \r\n"; print " \r\n"; print " \r\n"; diff --git a/agc_2-X/trunk/www/vicidial/help_documentation.txt b/agc_2-X/trunk/www/vicidial/help_documentation.txt index 5bf988c3..8564c688 100644 --- a/agc_2-X/trunk/www/vicidial/help_documentation.txt +++ b/agc_2-X/trunk/www/vicidial/help_documentation.txt @@ -1,4 +1,4 @@ -# version: 20190414093801 +# version: 20190503154401 users-user User ID This field is where you put the users ID number, can be up to 8 digits in length, Must be at least 2 characters in length. users-pass Password This field is where you put the users password. Must be at least 2 characters in length. A medium strength user password will be at least 10 characters in length, and a strong user password will be at least 20 characters in length and have letters as well as at least one number. It is recommended that you use a longer password if possible, stringing together several unrelated words with no spaces, and a number somewhere in the string. The maximum size of a password is 100 characters. users-force_change_password Force Change Password If this option is set to Y then the user will be prompted to change their password the next time they log in to the administration webpage. Default is N. @@ -767,6 +767,7 @@ list_loader Admin lead loader The basic web-based lead loader is designed admin_phones_bulk_insert-servers Servers This is a list of the server IP addresses of existing servers in the system that you want the phone entries to be populated across. These must be valid IP addresses, they must be active in the system and you must put one per line in this text area input box. admin_phones_bulk_insert-phones Phones This is a list of the phone extensions that you want to be created on all of the servers listed above. The phone extensions should be letters and numbers only, with no special characters and you must put one per line in this text area box. list_loader-duplicate_check Duplicate Checking The duplicate options allow you to check for duplicate entries as you load the leads into the system. You can select to check for duplicates within only the same list, only the same campaign lists or within the entire system. If you have chosen a duplicate check method, you can also optionally select the only specific statuses that you want to duplicate check against. +list_loader-status_mismatch_action Status Mismatch Action Using this feature, if a lead being loaded into the dialer dupes out by phone number ,or title and alt_phone, depending on the form settings, but does NOT dupe out against selected statuses from the -Status Duplicate Check- option, the user can opt to have the not-quite-duplicated leads already in the database moved to the current list being loaded into. The user can opt to only move the most recent occurence of a duplicated-by-phone lead or ALL occurrences found, and also whether to only use the -Lead Duplicate Check- setting when searching for duplicates or the entire system, meaning the scope of the status mismatch action can be different from the scope of the -Lead Duplicate Check- setting. This feature is ignored if you are deduping against all statuses. Use caution when utilizing this feature since it involves potential migration of large numbers of leads. list_loader-file_layout File layout The layout of the file you are loading. Standard Format uses the pre-defined standard file format. Custom layout allows the user to define the layout of the file themselves. Custom template is a hybrid of the previous two options, which allows the user to use a custom format they have defined previously and saved using the Custom Template Maker. list_loader-template_id Template ID If the user has selected Custom layout from the File layout options, then this the template the lead loader will use. It will also override the selected list ID with the list ID that was assigned to the selected template when it was created. list_loader-state_conversion State Abbreviation Lookup If your lead file has state names spelled out and you would like to load them into the state field as their two-character abbreviations, this feature will look up the abbreviation from the internal database. Default is DISABLED. diff --git a/agc_2-X/trunk/www/vicidial/options-example.php b/agc_2-X/trunk/www/vicidial/options-example.php index 87d7a736..9ff434e9 100644 --- a/agc_2-X/trunk/www/vicidial/options-example.php +++ b/agc_2-X/trunk/www/vicidial/options-example.php @@ -23,6 +23,7 @@ # 160715-0752 - Added graph_canvas_size option for HTML reports # 190414-1121 - Added RS_logoutLINK # 190420-1722 - Added RS_ListenBarge +# 190503-1544 - Added enable_status_mismatch_leadloader_option # # used by the realtime_report.php script @@ -105,4 +106,7 @@ $disable_user_group_bulk_change=0; # canvas size in pixels for Chartjs-style graphs (width and height) $graph_canvas_size=600; +# enable the leadloader's duplicate-with-status-mismatch setting +$enable_status_mismatch_leadloader_option=0; + ?>