summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--fs_selfservice/FS-SelfService/SelfService.pm12
-rwxr-xr-xfs_selfservice/FS-SelfService/cgi/signup.html7
2 files changed, 16 insertions, 3 deletions
diff --git a/fs_selfservice/FS-SelfService/SelfService.pm b/fs_selfservice/FS-SelfService/SelfService.pm
index 7e6821b60..a0e632c1b 100644
--- a/fs_selfservice/FS-SelfService/SelfService.pm
+++ b/fs_selfservice/FS-SelfService/SelfService.pm
@@ -1393,6 +1393,18 @@ END
my $county_html = $script_html;
if ( $countyflag ) {
$county_html .= qq!<SELECT NAME="${prefix}county" onChange="$param->{'onchange'}">!;
+ foreach my $county (
+ sort keys %{ $cust_main_county{$param->{'selected_country'}}{$param->{'selected_state'}} }
+ ) {
+ my $text = $county || '(n/a)';
+ $county_html .= qq!<OPTION VALUE="$county"!.
+ ($county eq $param->{'selected_county'} ?
+ ' SELECTED>' :
+ '>'
+ ).
+ $text.
+ '</OPTION>';
+ }
$county_html .= '</SELECT>';
} else {
$county_html .=
diff --git a/fs_selfservice/FS-SelfService/cgi/signup.html b/fs_selfservice/FS-SelfService/cgi/signup.html
index 375137b3c..7a56a31a1 100755
--- a/fs_selfservice/FS-SelfService/cgi/signup.html
+++ b/fs_selfservice/FS-SelfService/cgi/signup.html
@@ -74,8 +74,6 @@ Contact Information
<TR>
<TH ALIGN="right"><font color="#ff0000">*</font>City</TH>
<TD><INPUT TYPE="text" NAME="city" VALUE="<%= $city %>"></TD>
- <TH ALIGN="right"><font color="#ff0000">*</font>State/Country</TH>
- <TD>
<%=
($county_html, $state_html, $country_html) =
regionselector( {
@@ -87,8 +85,11 @@ Contact Information
locales => \@cust_main_county,
} );
- "$county_html $state_html";
%>
+ <TH ALIGN="right"><font color="#ff0000">*</font>
+ <%= ($county_html =~ /SELECT/) ? 'County/State' : 'State' %></TH>
+ <TD>
+ <%= "$county_html $state_html"; %>
</TD>
<TH><font color="#ff0000">*</font>Zip</TH>
<TD><INPUT TYPE="text" NAME="zip" SIZE=10 VALUE="<%= $zip %>"></TD>