From: ivan Date: Thu, 9 May 2002 15:12:38 +0000 (+0000) Subject: don't duplicate state/county/country pulldowns even with taxrates... X-Git-Tag: freeside_1_4_0_pre12~6 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=2d3b0ecdb9b1c6f39dcfb64757ed4b9d50abaae0 don't duplicate state/county/country pulldowns even with taxrates... --- diff --git a/FS/FS/cust_main_county.pm b/FS/FS/cust_main_county.pm index 8e83b1a1d..28f69c262 100644 --- a/FS/FS/cust_main_county.pm +++ b/FS/FS/cust_main_county.pm @@ -134,7 +134,8 @@ sub regionselector { @cust_main_county = qsearch('cust_main_county', {} ); foreach my $c ( @cust_main_county ) { $countyflag=1 if $c->county; - push @{$cust_main_county{$c->country}{$c->state}}, $c->county; + #push @{$cust_main_county{$c->country}{$c->state}}, $c->county; + $cust_main_county{$c->country}{$c->state}{$c->county} = 1; } # } $countyflag=1 if $selected_county; @@ -179,7 +180,8 @@ END $script_html .= "\nif ( country == \"$country\" ) {\n"; foreach my $state ( sort keys %{$cust_main_county{$country}} ) { $script_html .= "\nif ( state == \"$state\" ) {\n"; - foreach my $county ( sort @{$cust_main_county{$country}{$state}} ) { + #foreach my $county ( sort @{$cust_main_county{$country}{$state}} ) { + foreach my $county ( sort keys %{$cust_main_county{$country}{$state}} ) { my $text = $county || '(n/a)'; $script_html .= qq!opt(what.form.${prefix}county, "$county", "$text");\n!;