1 files changed, 35 insertions, 18 deletions
diff --git a/httemplate/view/cust_main/quick-charge.html b/httemplate/view/cust_main/quick-charge.html
index 0b51586d1..9e4fb8c6e 100644
--- a/httemplate/view/cust_main/quick-charge.html
+++ b/httemplate/view/cust_main/quick-charge.html
@@ -6,26 +6,43 @@
 <FORM ACTION="<%=$p%>edit/process/quick-charge.cgi" METHOD="POST">
 <INPUT TYPE="hidden" NAME="custnum" VALUE="<%= $cust_main->custnum %>">
 Description:<INPUT TYPE="text" NAME="pkg">
-&nbsp;Amount:<INPUT TYPE="text" NAME="amount" SIZE=6>
-&nbsp;<% 
+Amount:<INPUT TYPE="text" NAME="amount" SIZE=6>
+<% #false laziness w/ edit/part_pkg.cgi %>
+<% if ( $conf->exists('enable_taxclasses') ) { %>
+
+    <SELECT NAME="taxclass">
+
+      <% if ( $conf->exists('require_taxclasses') ) { %>
+
+        <OPTION VALUE="(select)">Select tax class
+
+      <% } else { %>
+
+        <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;
+      %>
   
-  #false laziness w/ edit/part_pkg.cgi
-  if ( $conf->exists('enable_taxclasses') ) {
-    print '<SELECT NAME="taxclass">';
-    my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
-      or die dbh->errstr;
-    $sth->execute or die $sth->errstr;
-    foreach my $taxclass ( map $_->[0], @{$sth->fetchall_arrayref} ) {
-      print qq!<OPTION VALUE="$taxclass"!;
-      #print ' SELECTED' if $taxclass eq $hashref->{taxclass};
-      print qq!>$taxclass</OPTION>!;
-    }
-    print '</SELECT>';
-  } else {
-    print '<INPUT TYPE="hidden" NAME="taxclass" VALUE="">';
-  }
+      <% foreach my $taxclass ( @taxclasses ) { %>
+  
+          <OPTION VALUE="<%= $taxclass %>"<%= 0 ? ' SELECTED' : '' %>><%= $taxclass %>
+  
+      <% } %>
 
-%>
+    </SELECT>
+
+<% } else { %>
+
+  <INPUT TYPE="hidden" NAME="taxclass" VALUE="">';
+  
+<% } %>
   
 <INPUT TYPE="submit" VALUE="One-time charge">
 </FORM>