4.x style one-time charge

[freeside.git] / httemplate / elements / tr-select-taxclass.html

diff --git a/httemplate/elements/tr-select-taxclass.html b/httemplate/elements/tr-select-taxclass.html
index a20dd17..22c560e 100644 (file)
--- a/httemplate/elements/tr-select-taxclass.html
+++ b/httemplate/elements/tr-select-taxclass.html
@@ -2,28 +2,34 @@
 %      || scalar(@{ $opt{'taxclasses'} }) == 0
 % ) { 
 
-  <INPUT TYPE="hidden" NAME=""<% $opt{'element_name'} || $opt{'field'} || 'taxclass' %>" VALUE="<% $taxclass %>">
+  <INPUT TYPE="hidden" NAME="<% $opt{'element_name'} || $opt{'field'} || 'taxclass' %>" VALUE="<% $selected_taxclass %>">
 
 % } else { 
 
   <TR>
-    <TD ALIGN="right"><% $opt{'label'} || 'Tax class: ' %></TD>
+    <TH ALIGN="right"><% $opt{'label'} || 'Tax class: ' %></TH>
     <TD>
-      <% include( '/elements/select-taxclass.html', $taxclass, %opt ) %>
+      <% include( '/elements/select-taxclass.html',
+                    'curr_value' => $selected_taxclass,
+                    %opt
+                )
+      %>
     </TD>
   </TR>
 
 % } 
 <%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;