</B><BR><BR>
<TABLE WIDTH="100%">
-% my @prefixes;
-% if ( $old{onlyship} ) {
-% @prefixes = ('ship_');
-% } elsif ( $old{same} ) {
+% my @prefixes = ('');
+% if ( $old{same} ) {
% @prefixes = ('bill_');
-% } else {
+% } elsif ( $old{billship} ) {
% @prefixes = ('bill_', 'ship_');
% }
% for my $pre (@prefixes) {
-% my $name = $pre eq 'ship_' ? 'service' : 'billing';
-% if ( $new{$pre.'addr_clean'} ) {
+% my $name = $pre eq 'bill_' ? 'billing' : 'service';
+% if ( $new{$pre.'error'} ) {
<TR>
<TH>Entered <%$name%> address</TH>
- <TH>Standardized <%$name%> address</TH>
</TR>
- <TR>
% if ( $old{$pre.'company'} ) {
<TR>
<TD><% $old{$pre.'company'} %></TD>
- <TD><% $new{$pre.'company'} %></TD>
</TR>
% }
<TR>
<TD><% $old{$pre.'address1'} %></TD>
- <TD><% $new{$pre.'address1'} %></TD>
+ <TD ROWSPAN=3><FONT COLOR="#ff0000"><B><% $new{$pre.'error'} %></B></FONT></TD>
</TR>
<TR>
<TD><% $old{$pre.'address2'} %></TD>
- <TD><% $new{$pre.'address2'} %></TD>
</TR>
<TR>
<TD><% $old{$pre.'city'} %>, <% $old{$pre.'state'} %> <% $old{$pre.'zip'} %></TD>
- <TD><% $new{$pre.'city'} %>, <% $new{$pre.'state'} %> <% $new{$pre.'zip'} %></TD>
</TR>
-
-% } # if addr_clean
-% elsif ( $new{$pre.'error'} ) {
+% } else { # not an error
<TR>
<TH>Entered <%$name%> address</TH>
+ <TH>Standardized <%$name%> address</TH>
+ </TR>
+% if ( !$new{$pre.'addr_clean'} ) {
+ <TR>
+ <TD></TD>
+ <TH STYLE="font-size:smaller;color:#ff0000">(unverified)</TH>
</TR>
+% }
+ <TR>
% if ( $old{$pre.'company'} ) {
<TR>
<TD><% $old{$pre.'company'} %></TD>
+ <TD><% $new{$pre.'company'} %></TD>
</TR>
% }
<TR>
<TD><% $old{$pre.'address1'} %></TD>
- <TD ROWSPAN=3><FONT COLOR="#ff0000"><B><% $new{$pre.'error'} %></B></FONT></TD>
+ <TD><% $new{$pre.'address1'} %></TD>
</TR>
<TR>
<TD><% $old{$pre.'address2'} %></TD>
+ <TD><% $new{$pre.'address2'} %></TD>
</TR>
<TR>
<TD><% $old{$pre.'city'} %>, <% $old{$pre.'state'} %> <% $old{$pre.'zip'} %></TD>
+ <TD><% $new{$pre.'city'} %>, <% $new{$pre.'state'} %> <% $new{$pre.'zip'} %></TD>
</TR>
-% } #if error
+
+% } # if error
% } # for $pre
%# only do this part if address standardization provided a censustract
</TR>
% } #if censustract
-% if ( $new{bill_error} or $new{ship_error} ) {
+% if ( grep {$new{$_.'error'}} @prefixes ) {
<TR>
<TD ALIGN="center">
<BUTTON TYPE="button" STYLE="width:205px" onclick="confirm_manual_address();">
<IMG SRC="<%$p%>images/cross.png" ALT=""> Cancel submission
</BUTTON></TD>
</TR>
-% }
-% else {
+% } else {
<TR>
<TD ALIGN="center">
- <BUTTON TYPE="button" STYLE="width:205px" onclick="confirm_manual_address()();">
+ <BUTTON TYPE="button" STYLE="width:205px" onclick="confirm_manual_address();">
<IMG SRC="<%$p%>images/error.png" ALT=""> Use entered <%$addresses%>
</BUTTON></TD>
<TD ALIGN="center">
my %old = %{ $q->{old} };
my %new = %{ $q->{new} };
-my $addresses = $old{onlyship} ? 'address' : 'addresses';
+my $addresses = $old{billship} ? 'addresses' : 'address';
</%init>