projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[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
9880571
..
15f266a
100644
(file)
--- a/
httemplate/misc/xmlhttp-address_standardize.html
+++ b/
httemplate/misc/xmlhttp-address_standardize.html
@@
-16,12
+16,10
@@
my %old = %{ decode_json($cgi->param('arg')) }
my %new;
my %new;
-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_');
}
my $all_same = 1;
@prefixes = ('bill_', 'ship_');
}
my $all_same = 1;
@@
-44,6
+42,8
@@
foreach my $pre ( @prefixes ) {
$all_same = 0 if ( $new{$pre.$_} ne $old{$pre.$_} );
last if !$all_same;
}
$all_same = 0 if ( $new{$pre.$_} ne $old{$pre.$_} );
last if !$all_same;
}
+
+ $all_same = 0 if $new{$pre.'error'};
}
my $return = { old => \%old, new => \%new, all_same => $all_same };
}
my $return = { old => \%old, new => \%new, all_same => $all_same };