X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fconfirm-address_standardize.html;fp=httemplate%2Fmisc%2Fconfirm-address_standardize.html;h=2eae011c497bf752e49c945c4ca3666d2e09385a;hb=d86f30add230405cb3ff689846ecce7e639e461b;hp=33d22195b79efad54d74b144ca026ff77b22a47a;hpb=7f2616837fec94c8d3e2bc255e05a3bb51dc773a;p=freeside.git
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'} ) {
Entered <%$name%> address
- Standardized <%$name%> address
-
% if ( $old{$pre.'company'} ) {
<% $old{$pre.'company'} %>
- <% $new{$pre.'company'} %>
% }
<% $old{$pre.'address1'} %>
- <% $new{$pre.'address1'} %>
+ <% $new{$pre.'error'} %>
<% $old{$pre.'address2'} %>
- <% $new{$pre.'address2'} %>
<% $old{$pre.'city'} %>, <% $old{$pre.'state'} %> <% $old{$pre.'zip'} %>
- <% $new{$pre.'city'} %>, <% $new{$pre.'state'} %> <% $new{$pre.'zip'} %>
-
-% } # if addr_clean
-% elsif ( $new{$pre.'error'} ) {
+% } else { # not an error
Entered <%$name%> address
+ Standardized <%$name%> address
+
+% if ( !$new{$pre.'addr_clean'} ) {
+
+
+ (unverified)
+% }
+
% if ( $old{$pre.'company'} ) {
<% $old{$pre.'company'} %>
+ <% $new{$pre.'company'} %>
% }
<% $old{$pre.'address1'} %>
- <% $new{$pre.'error'} %>
+ <% $new{$pre.'address1'} %>
<% $old{$pre.'address2'} %>
+ <% $new{$pre.'address2'} %>
<% $old{$pre.'city'} %>, <% $old{$pre.'state'} %> <% $old{$pre.'zip'} %>
+ <% $new{$pre.'city'} %>, <% $new{$pre.'state'} %> <% $new{$pre.'zip'} %>
-% } #if error
+
+% } # if error
% } # for $pre
%# only do this part if address standardization provided a censustract
@@ -88,7 +93,7 @@ Confirm address standardization
% } #if censustract
-% if ( $new{bill_error} or $new{ship_error} ) {
+% if ( grep {$new{$_.'error'}} @prefixes ) {
@@ -99,8 +104,7 @@ Confirm address standardization
Cancel submission
-% }
-% else {
+% } else {