projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix misfire of USPS address correction on non-new locations, RT#12183
[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
3bba683
..
97f3cad
100644
(file)
--- a/
httemplate/elements/tr-select-taxclass.html
+++ b/
httemplate/elements/tr-select-taxclass.html
@@
-2,29
+2,34
@@
% || scalar(@{ $opt{'taxclasses'} }) == 0
% ) {
% || 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>
<TD>
% } else {
<TR>
<TD ALIGN="right"><% $opt{'label'} || 'Tax class: ' %></TD>
<TD>
- <% include( '/elements/select-taxclass.html', $taxclass, %opt ) %>
+ <% include( '/elements/select-taxclass.html',
+ 'curr_value' => $selected_taxclass,
+ %opt
+ )
+ %>
</TD>
</TR>
% }
<%init>
</TD>
</TR>
% }
<%init>
-my(
$taxclass,
%opt ) = @_;
+my( %opt ) = @_;
my $conf = new FS::Conf;
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')
unless ( $opt{'taxclasses'} ) {
#my $sth = dbh->prepare('SELECT DISTINCT taxclass FROM cust_main_county')
- my $sth = dbh->prepare(
'SELECT taxclass FROM part_pkg_taxclass'
)
+ my $sth = dbh->prepare(
"SELECT taxclass FROM part_pkg_taxclass WHERE disabled IS NULL OR disabled = '' OR taxclass = ?"
)
or die dbh->errstr;
or die dbh->errstr;
- $sth->execute or die $sth->errstr;
+ $sth->execute
($selected_taxclass)
or die $sth->errstr;
my %taxclasses = map { $_->[0] => 1 } @{$sth->fetchall_arrayref};
@{ $opt{'taxclasses'} } = grep $_, keys %taxclasses;
my %taxclasses = map { $_->[0] => 1 } @{$sth->fetchall_arrayref};
@{ $opt{'taxclasses'} } = grep $_, keys %taxclasses;