X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fedit%2Fbulk-cust_main_county.html;h=8b123482530f5154e2115e2205ab4e36a2bff1d0;hb=e215fc213a1eb9a3365cecf5ce82f1a58f154cd6;hp=8e447e54f976096070ba913fd3a9b71a69d61c09;hpb=fb4ab1073f0d15d660c6cdc4e07afebf68ef3924;p=freeside.git
diff --git a/httemplate/edit/bulk-cust_main_county.html b/httemplate/edit/bulk-cust_main_county.html
index 8e447e54f..8b1234825 100644
--- a/httemplate/edit/bulk-cust_main_county.html
+++ b/httemplate/edit/bulk-cust_main_county.html
@@ -24,6 +24,20 @@
% }
+% if ( $cities ) {
+ <& /elements/tr-td-label.html, 'label' => 'City' &>
+
<% $cities %>
+ |
+
+% }
+
+% if ( $districts ) {
+ <& /elements/tr-td-label.html, 'label' => 'District' &>
+ <% $districts %>
+ |
+
+% }
+
% if ( $conf->exists('enable_taxclasses') && $taxclasses ) {
<% include('/elements/tr-td-label.html', 'label' => 'Tax Class' ) %>
<% $taxclasses %>
@@ -95,7 +109,7 @@ my @cust_main_county =
@taxnum;
my %seen_country = {};
-my @countries = map code2country($_)." ($_)",
+my @countries = map FS::geocode_Mixin->code2country($_)." ($_)",
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 %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);
|