summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Prykop <jonathan@freeside.biz>2016-01-12 15:27:29 -0600
committerJonathan Prykop <jonathan@freeside.biz>2016-01-12 15:40:40 -0600
commit04d3728e07d43ab698f208a061e0ca97b2f73b5e (patch)
tree4fbc88a380d9fb55266f7e241bdb181955c5295b
parentba71de5d6420a13a8fd11288584a3194cc153bad (diff)
RT#38983: OBL - searching in Fibernetics Freeside [removed enable_fuzzy_on_exact]
-rw-r--r--FS/FS/Conf.pm7
-rw-r--r--httemplate/misc/xmlhttp-cust_main-search.cgi4
-rw-r--r--httemplate/pref/pref-process.html1
-rw-r--r--httemplate/pref/pref.html15
-rwxr-xr-xhttemplate/search/cust_main.cgi3
5 files changed, 1 insertions, 29 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm
index 7dbc2ebf2..4b72be1bd 100644
--- a/FS/FS/Conf.pm
+++ b/FS/FS/Conf.pm
@@ -3970,13 +3970,6 @@ and customer address. Include units.',
'type' => 'text',
},
- {
- 'key' => 'enable_fuzzy_on_exact',
- 'section' => 'UI',
- 'description' => 'Enable approximate customer searching even when an exact match is found.',
- 'type' => 'checkbox',
- },
-
{ 'key' => 'pkg_referral',
'section' => '',
'description' => 'Enable package-specific advertising sources.',
diff --git a/httemplate/misc/xmlhttp-cust_main-search.cgi b/httemplate/misc/xmlhttp-cust_main-search.cgi
index f40df5623..40697f134 100644
--- a/httemplate/misc/xmlhttp-cust_main-search.cgi
+++ b/httemplate/misc/xmlhttp-cust_main-search.cgi
@@ -9,9 +9,7 @@
% } elsif ( $sub eq 'smart_search' ) {
%
% my $string = $cgi->param('arg');
-% my @cust_main = smart_search( 'search' => $string,
-% 'no_fuzzy_on_exact' => ! $FS::CurrentUser::CurrentUser->option('enable_fuzzy_on_exact'),
-% );
+% my @cust_main = smart_search( 'search' => $string );
% my $return = [ map [ $_->custnum,
% $_->name,
% $_->balance,
diff --git a/httemplate/pref/pref-process.html b/httemplate/pref/pref-process.html
index 665bb81c2..f03a8dfa3 100644
--- a/httemplate/pref/pref-process.html
+++ b/httemplate/pref/pref-process.html
@@ -52,7 +52,6 @@ unless ( $error ) { # if ($access_user) {
my @paramlist = qw( locale menu_position default_customer_view
history_order
spreadsheet_format mobile_menu
- enable_fuzzy_on_exact
disable_html_editor disable_enter_submit_onetimecharge
enable_mask_clipboard_hack dashboard_customers
customer_view_emails
diff --git a/httemplate/pref/pref.html b/httemplate/pref/pref.html
index 46291066c..50d6e8d23 100644
--- a/httemplate/pref/pref.html
+++ b/httemplate/pref/pref.html
@@ -108,21 +108,6 @@ Interface
</TD>
</TR>
-% if ( FS::Conf->new->exists('enable_fuzzy_on_exact') ) {
-
- <INPUT TYPE="hidden" NAME="enable_fuzzy_on_exact" VALUE="<% $curuser->option('enable_fuzzy_on_exact') ? 1 : 0 %>">
-
-% } else {
-
- <TR>
- <TH ALIGN="right" COLSPAN=1>Enable approximate customer searching <BR>even when an exact match is found: </TH>
- <TD ALIGN="left" COLSPAN=2>
- <INPUT TYPE="checkbox" NAME="enable_fuzzy_on_exact" VALUE="1" <% $curuser->option('enable_fuzzy_on_exact') ? 'CHECKED' : '' %>>
- </TD>
- </TR>
-
-% }
-
<TR>
<TH ALIGN="right" COLSPAN=1>Disable HTML editor for customer notes: </TH>
<TD ALIGN="left" COLSPAN=2>
diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index 5a574bcea..481140793 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -476,9 +476,6 @@ if ( $cgi->param('browse')
$orderby = "ORDER BY LOWER(company || ' ' || last || ' ' || first )";
push @cust_main, smart_search(
'search' => scalar($cgi->param('search_cust')),
- 'no_fuzzy_on_exact' => ! ( $curuser->option('enable_fuzzy_on_exact')
- || $conf->exists('enable_fuzzy_on_exact')
- ),
);
}