diff options
| author | Mark Wells <mark@freeside.biz> | 2013-11-06 12:14:42 -0800 |
|---|---|---|
| committer | Mark Wells <mark@freeside.biz> | 2013-11-06 12:14:42 -0800 |
| commit | d86f30add230405cb3ff689846ecce7e639e461b (patch) | |
| tree | 72327c7c3f492e28098bf11bd3794458547cbc58 /httemplate | |
| parent | 7f2616837fec94c8d3e2bc255e05a3bb51dc773a (diff) | |
TomTom: return a definite error on incomplete matches, #25261
Diffstat (limited to 'httemplate')
| -rw-r--r-- | httemplate/misc/confirm-address_standardize.html | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/httemplate/misc/confirm-address_standardize.html b/httemplate/misc/confirm-address_standardize.html index 33d22195b..2eae011c4 100644 --- a/httemplate/misc/confirm-address_standardize.html +++ b/httemplate/misc/confirm-address_standardize.html @@ -19,52 +19,57 @@ Confirm address standardization % } % for my $pre (@prefixes) { % my $name = $pre eq 'bill_' ? 'billing' : 'service'; -% if ( $new{$pre.'addr_clean'} ) { +% 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 @@ -88,7 +93,7 @@ Confirm address standardization </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();"> @@ -99,8 +104,7 @@ Confirm address standardization <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();"> |