projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 83122 Update method to merge dupe tax records
[freeside.git]
/
httemplate
/
misc
/
xmlhttp-address_standardize.html
diff --git
a/httemplate/misc/xmlhttp-address_standardize.html
b/httemplate/misc/xmlhttp-address_standardize.html
index
6182653
..
be58618
100644
(file)
--- a/
httemplate/misc/xmlhttp-address_standardize.html
+++ b/
httemplate/misc/xmlhttp-address_standardize.html
@@
-23,6
+23,7
@@
if ( $old{same} ) {
@prefixes = ('bill_', 'ship_');
}
my $all_same = 1;
@prefixes = ('bill_', 'ship_');
}
my $all_same = 1;
+my $all_clean = 1;
foreach my $pre ( @prefixes ) {
my $location = {
foreach my $pre ( @prefixes ) {
my $location = {
@@
-43,9
+44,18
@@
foreach my $pre ( @prefixes ) {
last if !$all_same;
}
last if !$all_same;
}
+ $all_same = 0 if ( length( $old{$pre.'censustract'} ) > 0 &&
+ length( $new{$pre.'censustract'} ) > 0 &&
+ $old{$pre.'censustract'} ne $new{$pre.'censustract'} );
+
$all_same = 0 if $new{$pre.'error'};
$all_same = 0 if $new{$pre.'error'};
+
+ $all_clean = 0 if !$new{$pre.'addr_clean'};
}
}
-my $return = { old => \%old, new => \%new, all_same => $all_same };
+my $return = { old => \%old,
+ new => \%new,
+ all_same => $all_same,
+ all_clean => $all_clean };
warn "result:\n".encode_json($return) if $DEBUG;
</%init>
warn "result:\n".encode_json($return) if $DEBUG;
</%init>