projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 77504 - Fixed error display issue, and javascript to prevent error.
[freeside.git]
/
httemplate
/
browse
/
cust_main_county.cgi
diff --git
a/httemplate/browse/cust_main_county.cgi
b/httemplate/browse/cust_main_county.cgi
index
dfbe119
..
26a3e21
100755
(executable)
--- a/
httemplate/browse/cust_main_county.cgi
+++ b/
httemplate/browse/cust_main_county.cgi
@@
-10,7
+10,9
@@
'table' => 'cust_main_county',
'hashref' => $hashref,
'order_by' =>
'table' => 'cust_main_county',
'hashref' => $hashref,
'order_by' =>
- 'ORDER BY country, state, county, city, district, taxclass',
+ 'ORDER BY country, state, county, city, '.
+ 'district, taxclass, '.
+ "COALESCE(taxname, '')",
},
'count_query' => $count_query,
'header' => \@header,
},
'count_query' => $count_query,
'header' => \@header,
@@
-454,7
+456,7
@@
my %seen_county = ();
my @fields = (
sub { my $country = shift->country;
return '' if $seen_country{$country}++;
my @fields = (
sub { my $country = shift->country;
return '' if $seen_country{$country}++;
- code2country($country). " ($country)";
+
FS::geocode_Mixin->
code2country($country). " ($country)";
},
#state
},
#state
@@
-465,13
+467,13
@@
my @fields = (
? ' '. add_link(
desc => 'Add more counties',
col => 'state',
? ' '. add_link(
desc => 'Add more counties',
col => 'state',
- label=> 'add
more
counties',
+ label=> 'add
more
counties',
row => $_[0],
cgi => $cgi,
).
' '. collapse_link(
col => 'state',
row => $_[0],
cgi => $cgi,
).
' '. collapse_link(
col => 'state',
- label=> 'remove
all
counties',
+ label=> 'remove
all
counties',
row => $_[0],
cgi => $cgi,
)
row => $_[0],
cgi => $cgi,
)
@@
-482,7
+484,7
@@
my @fields = (
? ''
: ' '. expand_link( desc => 'Add States',
row => $_[0],
? ''
: ' '. expand_link( desc => 'Add States',
row => $_[0],
- label => 'add
states',
+ label => 'add
states',
cgi => $cgi,
)
);
cgi => $cgi,
)
);
@@
-501,18
+503,18
@@
my @fields = (
? ' '. add_link(
desc => 'Add more cities',
col => 'county',
? ' '. add_link(
desc => 'Add more cities',
col => 'county',
- label=> 'add
more
cities',
+ label=> 'add
more
cities',
row => $_[0],
cgi => $cgi,
).
' '. collapse_link(
col => 'county',
row => $_[0],
cgi => $cgi,
).
' '. collapse_link(
col => 'county',
- label=> 'remove
all
cities',
+ label=> 'remove
all
cities',
row => $_[0],
cgi => $cgi,
)
: ' '. remove_link( col => 'county',
row => $_[0],
cgi => $cgi,
)
: ' '. remove_link( col => 'county',
- label=> 'remove
county',
+ label=> 'remove
county',
row => $_[0],
cgi => $cgi,
);
row => $_[0],
cgi => $cgi,
);
@@
-523,7
+525,7
@@
my @fields = (
: '(all) '.
expand_link( desc => 'Add Counties',
row => $_[0],
: '(all) '.
expand_link( desc => 'Add Counties',
row => $_[0],
- label => 'add
counties',
+ label => 'add
counties',
cgi => $cgi,
);
},
cgi => $cgi,
);
},
@@
-539,7
+541,7
@@
my @fields = (
} else {
$r->city. ' '.
remove_link( col => 'city',
} else {
$r->city. ' '.
remove_link( col => 'city',
- label=> 'remove
city',
+ label=> 'remove
city',
row => $r,
cgi => $cgi,
);
row => $r,
cgi => $cgi,
);
@@
-548,7
+550,7
@@
my @fields = (
'(all) '.
expand_link( desc => 'Add Cities',
row => $r,
'(all) '.
expand_link( desc => 'Add Cities',
row => $r,
- label => 'add
cities',
+ label => 'add
cities',
cgi => $cgi,
);
}
cgi => $cgi,
);
}
@@
-560,7
+562,7
@@
my @fields = (
if ( $r->district ) {
$r->district . ' '.
remove_link( col => 'district',
if ( $r->district ) {
$r->district . ' '.
remove_link( col => 'district',
- label=> 'remove
district',
+ label=> 'remove
district',
row => $r,
cgi => $cgi,
);
row => $r,
cgi => $cgi,
);