X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Ftr-select-taxclass.html;h=22c560ea77896d56e8c352dcf297c1a269430c20;hb=9a8399783bb9d87ef662b4371bebe983d2781dce;hp=a20dd17b505dfa24c3c3b16701d77984260f24c6;hpb=9509e5bfb7f9331303153cac24d7bfecbe2ea9f1;p=freeside.git
diff --git a/httemplate/elements/tr-select-taxclass.html b/httemplate/elements/tr-select-taxclass.html
index a20dd17b5..22c560ea7 100644
--- a/httemplate/elements/tr-select-taxclass.html
+++ b/httemplate/elements/tr-select-taxclass.html
@@ -2,28 +2,34 @@
% || scalar(@{ $opt{'taxclasses'} }) == 0
% ) {
- " VALUE="<% $taxclass %>">
+
% } else {
- <% $opt{'label'} || 'Tax class: ' %> |
+ <% $opt{'label'} || 'Tax class: ' %> |
- <% include( '/elements/select-taxclass.html', $taxclass, %opt ) %>
+ <% include( '/elements/select-taxclass.html',
+ 'curr_value' => $selected_taxclass,
+ %opt
+ )
+ %>
|
% }
<%init>
-my( $taxclass, %opt ) = @_;
+my( %opt ) = @_;
my $conf = new FS::Conf;
+my $selected_taxclass = $opt{'curr_value'}; # || $opt{'value'} necessary?
unless ( $opt{'taxclasses'} ) {
- my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
- or die dbh->errstr;
- $sth->execute or die $sth->errstr;
+ #my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
+ my $sth = dbh->prepare("SELECT taxclass FROM part_pkg_taxclass WHERE disabled IS NULL OR disabled = '' OR taxclass = ?")
+ or die dbh->errstr;
+ $sth->execute($selected_taxclass) or die $sth->errstr;
my %taxclasses = map { $_->[0] => 1 } @{$sth->fetchall_arrayref};
@{ $opt{'taxclasses'} } = grep $_, keys %taxclasses;