X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fselect-taxclass.html;h=fb09cfdb959882c4a13949f3dae9b972d94bb7ba;hb=443150b6184876c967adffa199c20f53d5b76075;hp=495572323944625f17a7a9ba3de768d403183b43;hpb=3ce7691203a7737406bf2d4442f7fd84b81f847e;p=freeside.git

diff --git a/httemplate/elements/select-taxclass.html b/httemplate/elements/select-taxclass.html
index 495572323..fb09cfdb9 100644
--- a/httemplate/elements/select-taxclass.html
+++ b/httemplate/elements/select-taxclass.html
@@ -1,40 +1,41 @@
-%
-%  my $conf = new FS::Conf;
-%  my $selected_taxclass = scalar(@_) ? shift : '';
-%
 % if ( $conf->exists('enable_taxclasses') ) { 
 
+    <SELECT NAME="<% $opt{'name'} || 'taxclass' %>">
 
-    <SELECT NAME="taxclass">
-% if ( $conf->exists('require_taxclasses') ) { 
+%   if ( $conf->exists('require_taxclasses') ) { 
+        <OPTION VALUE="(select)">Select tax class
+%   } else { 
+        <OPTION VALUE="">
+%   } 
 
+%   foreach my $taxclass ( @{ $opt{'taxclasses'} } ) { 
+        <OPTION VALUE="<% $taxclass %>"<% $taxclass eq $selected_taxclass ? ' SELECTED' : '' %>><% $taxclass %>
+%   } 
+
+    </SELECT>
 
-        <OPTION VALUE="(select)">Select tax class
 % } else { 
 
+  <INPUT TYPE="hidden" NAME="taxclass" VALUE="<% $selected_taxclass %>">
 
-        <OPTION VALUE="">
-% } 
-%
-%        my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
-%          or die dbh->errstr;
-%        $sth->execute or die $sth->errstr;
-%        my %taxclasses = map { $_->[0] => 1 } @{$sth->fetchall_arrayref};
-%        my @taxclasses = grep $_, keys %taxclasses;
-%      
-% foreach my $taxclass ( @taxclasses ) { 
-
-  
-          <OPTION VALUE="<% $taxclass %>"<% $taxclass eq $selected_taxclass ? ' SELECTED' : '' %>><% $taxclass %>
 % } 
 
+<%init>
 
-    </SELECT>
-% } else { 
+my %opt = @_;
+my $selected_taxclass = $opt{'curr_value'}; # || $opt{'value'} necessary?
 
+my $conf = new FS::Conf;
 
-  <INPUT TYPE="hidden" NAME="taxclass" VALUE="<% $selected_taxclass %>">
-% } 
+unless ( $opt{'taxclasses'} ) {
+
+  #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;
 
-  
+}
 
+</%init>