have the UI use full country names, and state names outside the US...

[freeside.git] / httemplate / edit / cust_main / contact.html

diff --git a/httemplate/edit/cust_main/contact.html b/httemplate/edit/cust_main/contact.html
index d3b7b16..6e4f089 100644 (file)
--- a/httemplate/edit/cust_main/contact.html
+++ b/httemplate/edit/cust_main/contact.html
@@ -14,14 +14,23 @@ $cust_main->set($pre.'state', $statedefault )
   unless $cust_main->get($pre.'state')
          || $cust_main->get($pre.'country') ne $countrydefault;
 
-my($county_html, $state_html, $country_html) =
-  FS::cust_main_county::regionselector( $cust_main->get($pre.'county'),
-                                        $cust_main->get($pre.'state'),
-                                        $cust_main->get($pre.'country'),
-                                        $pre,
-                                        $onchange,
-                                        $disabled,
-                                      );
+#my($county_html, $state_html, $country_html) =
+#  FS::cust_main_county::regionselector( $cust_main->get($pre.'county'),
+#                                        $cust_main->get($pre.'state'),
+#                                        $cust_main->get($pre.'country'),
+#                                        $pre,
+#                                        $onchange,
+#                                        $disabled,
+#                                      );
+
+my %select_hash = (
+  'county'   => $cust_main->get($pre.'county'),
+  'state'    => $cust_main->get($pre.'state'),
+  'country'  => $cust_main->get($pre.'country'),
+  'prefix'   => $pre,
+  'onchange' => $onchange,
+  'disabled' => $disabled,
+);
 
 my $daytime_label = FS::Msgcat::_gettext('daytime') || 'Day Phone';
 my $night_label = FS::Msgcat::_gettext('night') || 'Night Phone';
@@ -75,7 +84,10 @@ my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
     <INPUT TYPE="text" NAME="<%=$pre%>city" VALUE="<%= $cust_main->get($pre.'city') %>" onChange="<%= $onchange %>" <%=$disabled%>>
   </TD>
   <TH ALIGN="right"><%=$r%>State</TH>
-  <TD><%= $county_html. $state_html %></TD>
+  <TD>
+    <%= include('select-county.html', %select_hash ) %>
+    <%= include('select-state.html', %select_hash ) %>
+  </TD>
   <TH><%=$r%>Zip</TH>
   <TD>
     <INPUT TYPE="text" NAME="<%=$pre%>zip" VALUE="<%= $cust_main->get($pre.'zip') %>" SIZE=10 onChange="<%= $onchange %>" <%=$disabled%>>
@@ -84,7 +96,7 @@ my $r = qq!<font color="#ff0000">*</font>&nbsp;!;
 
 <TR>
   <TH ALIGN="right"><%=$r%>Country</TH>
-  <TD><%= $country_html %></TD>
+  <TD COLSPAN=5><%= include('select-country.html', %select_hash ) %></TD>
 </TR>
 
 <TR>