From 85d0dbbdb844857f17192c5f0740f63c9681b9e6 Mon Sep 17 00:00:00 2001 From: Mark Wells Date: Wed, 30 Nov 2016 22:40:30 -0800 Subject: rework Billsoft interface for new Avalara data format, fix many things, #73063 --- httemplate/misc/taxproduct.cgi | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'httemplate') diff --git a/httemplate/misc/taxproduct.cgi b/httemplate/misc/taxproduct.cgi index b22849343..1533e8810 100644 --- a/httemplate/misc/taxproduct.cgi +++ b/httemplate/misc/taxproduct.cgi @@ -5,13 +5,16 @@ my $vendor = $conf->config('tax_data_vendor'); <%init> my $term = $cgi->param('term'); warn "taxproduct.cgi?$term"; # XXX debug -my $search = { table => 'part_pkg_taxproduct' }; +my $search = { + table => 'part_pkg_taxproduct', + hashref => { 'data_vendor' => $vendor } +}; if ( $term =~ /^\d+$/ ) { - $search->{extra_sql} = " WHERE taxproduct LIKE '$term%'"; + $search->{extra_sql} = " AND taxproduct LIKE '$term%'"; $search->{order_by} = " ORDER BY taxproduct ASC"; } elsif ( length($term) ) { $term = dbh->quote( lc($term) ); # protect against bad strings - $search->{extra_sql} = " WHERE POSITION($term IN LOWER(description)) > 0"; + $search->{extra_sql} = " AND POSITION($term IN LOWER(description)) > 0"; # and sort by how close to the beginning of the string it is $search->{order_by} = " ORDER BY POSITION($term IN LOWER(description)) ASC, LOWER(description) ASC, taxproduct ASC"; } -- cgit v1.2.1