projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
warning if product/service code import wasn't run, RT#77163, RT#75262
[freeside.git]
/
httemplate
/
edit
/
bulk-cust_main_county.html
diff --git
a/httemplate/edit/bulk-cust_main_county.html
b/httemplate/edit/bulk-cust_main_county.html
index
8e447e5
..
8b12348
100644
(file)
--- a/
httemplate/edit/bulk-cust_main_county.html
+++ b/
httemplate/edit/bulk-cust_main_county.html
@@
-24,6
+24,20
@@
</TR>
% }
</TR>
% }
+% if ( $cities ) {
+ <& /elements/tr-td-label.html, 'label' => 'City' &>
+ <TD BGCOLOR="#dddddd"><% $cities %>
+ </TD>
+ </TR>
+% }
+
+% if ( $districts ) {
+ <& /elements/tr-td-label.html, 'label' => 'District' &>
+ <TD BGCOLOR="#dddddd"><% $districts %>
+ </TD>
+ </TR>
+% }
+
% if ( $conf->exists('enable_taxclasses') && $taxclasses ) {
<% include('/elements/tr-td-label.html', 'label' => 'Tax Class' ) %>
<TD BGCOLOR="#dddddd"><% $taxclasses %>
% if ( $conf->exists('enable_taxclasses') && $taxclasses ) {
<% include('/elements/tr-td-label.html', 'label' => 'Tax Class' ) %>
<TD BGCOLOR="#dddddd"><% $taxclasses %>
@@
-95,7
+109,7
@@
my @cust_main_county =
@taxnum;
my %seen_country = {};
@taxnum;
my %seen_country = {};
-my @countries = map code2country($_)." ($_)",
+my @countries = map
FS::geocode_Mixin->
code2country($_)." ($_)",
grep !$seen_country{$_}++,
map $_->country,
@cust_main_county;
grep !$seen_country{$_}++,
map $_->country,
@cust_main_county;
@@
-112,6
+126,13
@@
my %seen_county = {};
my @counties = grep !$seen_county{$_}++, map $_->county, @cust_main_county;
my $counties = join(', ', @counties);
my @counties = grep !$seen_county{$_}++, map $_->county, @cust_main_county;
my $counties = join(', ', @counties);
+my %seen_city = ( map { $_->city => 1 } @cust_main_county );
+my @cities = grep $_, keys %seen_city;
+my $cities = join(', ', @cities);
+
+my @districts = grep $_, map { $_->district } @cust_main_county;
+my $districts = join(', ', @districts);
+
my %seen_taxclass = {};
my @taxclasses = grep !$seen_taxclass{$_}++, map $_->taxclass, @cust_main_county;
my $taxclasses = join(', ', @taxclasses);
my %seen_taxclass = {};
my @taxclasses = grep !$seen_taxclass{$_}++, map $_->taxclass, @cust_main_county;
my $taxclasses = join(', ', @taxclasses);