projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix several UI nits in FCC 477 report configuration, #24047
[freeside.git]
/
httemplate
/
misc
/
confirm-address_standardize.html
diff --git
a/httemplate/misc/confirm-address_standardize.html
b/httemplate/misc/confirm-address_standardize.html
index
57201ea
..
2eae011
100644
(file)
--- a/
httemplate/misc/confirm-address_standardize.html
+++ b/
httemplate/misc/confirm-address_standardize.html
@@
-11,62
+11,65
@@
Confirm address standardization
</B><BR><BR>
<TABLE WIDTH="100%">
</B><BR><BR>
<TABLE WIDTH="100%">
-% my @prefixes;
-% if ( $old{onlyship} ) {
-% @prefixes = ('ship_');
-% } elsif ( $old{same} ) {
+% my @prefixes = ('');
+% if ( $old{same} ) {
% @prefixes = ('bill_');
% @prefixes = ('bill_');
-% } els
e
{
+% } els
if ( $old{billship} )
{
% @prefixes = ('bill_', 'ship_');
% }
% for my $pre (@prefixes) {
% @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>
<TR>
<TH>Entered <%$name%> address</TH>
- <TH>Standardized <%$name%> address</TH>
</TR>
</TR>
- <TR>
% if ( $old{$pre.'company'} ) {
<TR>
<TD><% $old{$pre.'company'} %></TD>
% if ( $old{$pre.'company'} ) {
<TR>
<TD><% $old{$pre.'company'} %></TD>
- <TD><% $new{$pre.'company'} %></TD>
</TR>
% }
<TR>
<TD><% $old{$pre.'address1'} %></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>
</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>
</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>
</TR>
-
-% } # if addr_clean
-% elsif ( $new{$pre.'error'} ) {
+% } else { # not an error
<TR>
<TH>Entered <%$name%> address</TH>
<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>
+% }
+ <TR>
% if ( $old{$pre.'company'} ) {
<TR>
<TD><% $old{$pre.'company'} %></TD>
% if ( $old{$pre.'company'} ) {
<TR>
<TD><% $old{$pre.'company'} %></TD>
+ <TD><% $new{$pre.'company'} %></TD>
</TR>
% }
<TR>
<TD><% $old{$pre.'address1'} %></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>
</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>
</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>
</TR>
-% } #if error
+
+% } # if error
% } # for $pre
%# only do this part if address standardization provided a censustract
% } # for $pre
%# only do this part if address standardization provided a censustract
@@
-90,7
+93,7
@@
Confirm address standardization
</TR>
% } #if 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();">
<TR>
<TD ALIGN="center">
<BUTTON TYPE="button" STYLE="width:205px" onclick="confirm_manual_address();">
@@
-101,11
+104,10
@@
Confirm address standardization
<IMG SRC="<%$p%>images/cross.png" ALT=""> Cancel submission
</BUTTON></TD>
</TR>
<IMG SRC="<%$p%>images/cross.png" ALT=""> Cancel submission
</BUTTON></TD>
</TR>
-% }
-% else {
+% } else {
<TR>
<TD ALIGN="center">
<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">
<IMG SRC="<%$p%>images/error.png" ALT=""> Use entered <%$addresses%>
</BUTTON></TD>
<TD ALIGN="center">
@@
-128,6
+130,6
@@
my $q = decode_json($cgi->param('q'));
my %old = %{ $q->{old} };
my %new = %{ $q->{new} };
my %old = %{ $q->{old} };
my %new = %{ $q->{new} };
-my $addresses = $old{
onlyship} ? 'address' : 'addresse
s';
+my $addresses = $old{
billship} ? 'addresses' : 'addres
s';
</%init>
</%init>