diff options
| -rw-r--r-- | FS/FS/Conf.pm | 7 | ||||
| -rw-r--r-- | FS/FS/TaxEngine/suretax.pm | 6 | ||||
| -rwxr-xr-x | httemplate/edit/process/part_pkg.cgi | 3 |
3 files changed, 11 insertions, 5 deletions
diff --git a/FS/FS/Conf.pm b/FS/FS/Conf.pm index 17a7c23ec..8cd8e272e 100644 --- a/FS/FS/Conf.pm +++ b/FS/FS/Conf.pm @@ -2500,6 +2500,13 @@ and customer address. Include units.', }, { + 'key' => 'suretax-hostname', + 'section' => 'taxation', + 'description' => 'SureTax server name; defaults to the test server.', + 'type' => 'text', + }, + + { 'key' => 'suretax-client_number', 'section' => 'taxation', 'description' => 'SureTax tax service client ID.', diff --git a/FS/FS/TaxEngine/suretax.pm b/FS/FS/TaxEngine/suretax.pm index 327a72843..8139b1dff 100644 --- a/FS/FS/TaxEngine/suretax.pm +++ b/FS/FS/TaxEngine/suretax.pm @@ -20,9 +20,6 @@ our %taxproduct_cache; our $conf; -our $host = 'testapi.taxrating.net'; -# production: 'api.taxrating.net' - FS::UID->install_callback( sub { $conf = FS::Conf->new; # should we enable conf caching here? @@ -314,6 +311,9 @@ sub make_taxlines { my $request_json = $json->encode($request); warn $request_json if $DEBUG > 1; + my $host = $conf->config('suretax-hostname'); + $host ||= 'testapi.taxrating.net'; + # We are targeting the "V05" interface: # - accepts both telecom and general sales transactions # - produces results broken down by "invoice" (Freeside line item) diff --git a/httemplate/edit/process/part_pkg.cgi b/httemplate/edit/process/part_pkg.cgi index f3ee06157..61a6337e3 100755 --- a/httemplate/edit/process/part_pkg.cgi +++ b/httemplate/edit/process/part_pkg.cgi @@ -97,8 +97,7 @@ my $args_callback = sub { @options; foreach my $class ( '', split(',', $cgi->param('taxproductnums') ) ) { - my $param = 'taxproductnum'; - $param .= "_$class" if length($class); # gah, "_$class"? + my $param = "taxproductnum_$class"; my $value = $cgi->param($param); if ( $value == -1 ) { |