X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fmisc%2Fxmlhttp-address_standardize.html;h=9880571632c752ff06719247c0728cf25dcab20e;hb=5ad226c0ff7759184ea26d66292ccebd2ec00af7;hp=e28c06f3a8228d5fa217d96d4cbf67e86631c5ac;hpb=84fa358b56b89205fff99927080d5c28c01d57ff;p=freeside.git diff --git a/httemplate/misc/xmlhttp-address_standardize.html b/httemplate/misc/xmlhttp-address_standardize.html index e28c06f3a..988057163 100644 --- a/httemplate/misc/xmlhttp-address_standardize.html +++ b/httemplate/misc/xmlhttp-address_standardize.html @@ -20,10 +20,11 @@ my @prefixes; if ($old{onlyship}) { @prefixes = ('ship_'); } elsif ( $old{same} ) { - @prefixes = (''); + @prefixes = ('bill_'); } else { - @prefixes = ('', 'ship_'); + @prefixes = ('bill_', 'ship_'); } +my $all_same = 1; foreach my $pre ( @prefixes ) { my $location = { @@ -38,8 +39,13 @@ foreach my $pre ( @prefixes ) { foreach ( keys(%$cache) ) { $new{$pre.$_} = $cache->get($_); } + + foreach ( qw(address1 address2 city state zip country) ) { + $all_same = 0 if ( $new{$pre.$_} ne $old{$pre.$_} ); + last if !$all_same; + } } -my $return = { old => \%old, new => \%new }; +my $return = { old => \%old, new => \%new, all_same => $all_same }; warn "result:\n".encode_json($return) if $DEBUG;