'table' => 'cust_main_county',
'hashref' => $hashref,
'order_by' =>
- 'ORDER BY country, state, county, city, taxclass',
+ 'ORDER BY country, state, county, city, '.
+ 'district, taxclass, '.
+ "COALESCE(taxname, '')",
},
'count_query' => $count_query,
'header' => \@header,
$cell_style = '';
-my @header = ( 'Country', 'State/Province', 'County', 'City' );
-my @header2 = ( '', '', '', '', );
-my @links = ( '', '', '', '', );
-my @link_onclicks = ( '', '', '', '', );
-my $align = 'llll';
+my @header = ( 'Country', 'State/Province', 'County', 'City', '' );
+# last column is 'district', but usually unused
+my @header2 = ( '', '', '', '', '' );
+my @links = ( '', '', '', '', '' );
+my @link_onclicks = ( '', '', '', '', '' );
+my $align = 'lllll';
my %seen_country = ();
my %seen_state = ();
my @fields = (
sub { my $country = shift->country;
return '' if $seen_country{$country}++;
- code2country($country). " ($country)";
+ FS::geocode_Mixin->code2country($country). " ($country)";
},
#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',
- label=> 'remove all counties',
+ label=> 'remove all counties',
row => $_[0],
cgi => $cgi,
)
? ''
: ' '. expand_link( desc => 'Add States',
row => $_[0],
- label => 'add states',
+ label => 'add states',
cgi => $cgi,
)
);
? ' '. add_link(
desc => 'Add more cities',
col => 'county',
- label=> 'add more cities',
+ label=> 'add more cities',
row => $_[0],
cgi => $cgi,
).
' '. collapse_link(
col => 'county',
- label=> 'remove all cities',
+ label=> 'remove all cities',
row => $_[0],
cgi => $cgi,
)
: ' '. remove_link( col => 'county',
- label=> 'remove county',
+ label=> 'remove county',
row => $_[0],
cgi => $cgi,
);
: '(all) '.
expand_link( desc => 'Add Counties',
row => $_[0],
- label => 'add counties',
+ label => 'add counties',
cgi => $cgi,
);
},
my $r = shift;
if ( $r->city ) {
- if ( $r->taxclass ) { #but if it has a taxclass, can't remove
+ if ( $r->taxclass #but if it has a taxclass, can't remove
+ or $r->district ) { # or a district
$r->city;
} else {
$r->city. ' '.
remove_link( col => 'city',
- label=> 'remove city',
+ label=> 'remove city',
row => $r,
cgi => $cgi,
);
'(all) '.
expand_link( desc => 'Add Cities',
row => $r,
- label => 'add cities',
+ label => 'add cities',
cgi => $cgi,
);
}
},
+
+ #district
+ sub {
+ my $r = shift;
+ if ( $r->district ) {
+ $r->district . ' '.
+ remove_link( col => 'district',
+ label=> 'remove district',
+ row => $r,
+ cgi => $cgi,
+ );
+ }
+ # manually editing districts is not exactly intended
+ },
+
);
my @color = (
my $cust_main_county = shift;
if ( $cb_oldrow ) {
- if ( $cb_oldrow->city ne $cust_main_county->city
+ if ( $cb_oldrow->district ne $cust_main_county->district
+ || $cb_oldrow->city ne $cust_main_county->city
|| $cb_oldrow->county ne $cust_main_county->county
|| $cb_oldrow->state ne $cust_main_county->state
|| $cb_oldrow->country ne $cust_main_county->country