projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'patch-19' of https://github.com/gjones2/Freeside
[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
..
420e8ea
100644
(file)
--- a/
httemplate/misc/confirm-address_standardize.html
+++ b/
httemplate/misc/confirm-address_standardize.html
@@
-11,16
+11,14
@@
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
';
+% my $name = $pre eq '
bill_' ? 'billing' : 'service
';
% if ( $new{$pre.'addr_clean'} ) {
<TR>
<TH>Entered <%$name%> address</TH>
% if ( $new{$pre.'addr_clean'} ) {
<TR>
<TH>Entered <%$name%> address</TH>
@@
-128,6
+126,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>