Will things ever be the same again?

[freeside.git] / httemplate / edit / cust_main / select-country.html

diff --git a/httemplate/edit/cust_main/select-country.html b/httemplate/edit/cust_main/select-country.html
index 44f4f0a..5467f26 100644 (file)
--- a/httemplate/edit/cust_main/select-country.html
+++ b/httemplate/edit/cust_main/select-country.html
@@ -1,17 +1,22 @@
-<%
-
-  my %opt = @_;
-  foreach my $opt (qw( county state country prefix onchange disabled )) {
-    $opt{$_} = '' unless exists($opt{$_}) && defined($opt{$_});
-  }
-
-  my $conf = new FS::Conf;
-  my $countrydefault = $conf->config('countrydefault') || 'US';
-
+%
+%
+%  my %opt = @_;
+%  foreach my $opt (qw( county state country prefix onchange disabled )) {
+%    $opt{$_} = '' unless exists($opt{$_}) && defined($opt{$_});
+%  }
+%
+%  my $conf = new FS::Conf;
+%  my $countrydefault = $conf->config('countrydefault') || 'US';
+%
+%
+
+
+<% include('/elements/xmlhttp.html',
+              'url'  => $p.'misc/states.cgi',
+              'subs' => [ $opt{'prefix'}. 'get_states' ],
+           )
 %>
 
-<%= include('/elements/xmlhttp.html', $p.'misc/states.cgi', $opt{'prefix'}. 'get_states') %>
-
 <SCRIPT TYPE="text/javascript">
 
   function opt(what,value,text) {
@@ -20,23 +25,23 @@
     what.options[length] = optionName;
   }
 
-  function <%= $opt{'prefix'} %>country_changed(what, callback) {
+  function <% $opt{'prefix'} %>country_changed(what, callback) {
 
-    country = what.options[what.selectedIndex].text;
+    country = what.options[what.selectedIndex].value;
 
-    function <%= $opt{'prefix'} %>update_states(states) {
+    function <% $opt{'prefix'} %>update_states(states) {
 
       // blank the current state list
-      for ( var i = what.form.<%= $opt{'prefix'} %>state.length; i >= 0; i-- )
-          what.form.<%= $opt{'prefix'} %>state.options[i] = null;
+      for ( var i = what.form.<% $opt{'prefix'} %>state.length; i >= 0; i-- )
+          what.form.<% $opt{'prefix'} %>state.options[i] = null;
 
       // add the new states
       var statesArray = eval('(' + states + ')' );
-      for ( var s = 0; s < statesArray.length; s++ ) {
-          var stateLabel = statesArray[s];
+      for ( var s = 0; s < statesArray.length; s=s+2 ) {
+          var stateLabel = statesArray[s+1];
           if ( stateLabel == "" )
               stateLabel = '(n/a)';
-          opt(what.form.<%= $opt{'prefix'} %>state, statesArray[s], stateLabel);
+          opt(what.form.<% $opt{'prefix'} %>state, statesArray[s], stateLabel);
       }
 
       //run the callback
@@ -45,24 +50,25 @@
     }
 
     // go get the new states
-    <%= $opt{'prefix'} %>get_states( country, <%= $opt{'prefix'} %>update_states );
+    <% $opt{'prefix'} %>get_states( country, <% $opt{'prefix'} %>update_states );
 
   }
 
 </SCRIPT>
 
-<SELECT NAME="<%= $opt{'prefix'} %>country" onChange="<%= $opt{'prefix'} %>country_changed(this); <%= $opt{'onchange'} %>" <%= $opt{'disabled'} %>>
+<SELECT NAME="<% $opt{'prefix'} %>country" onChange="<% $opt{'prefix'} %>country_changed(this); <% $opt{'onchange'} %>" <% $opt{'disabled'} %>>
+% foreach my $country (
+%     sort {    ($b eq $countrydefault) <=> ($a eq $countrydefault)
+%            or code2country($a) cmp code2country($b) }
+%     map { $_->country }
+%     qsearch( 'cust_main_county',{}, 'DISTINCT ON ( country ) *', )
+%   ) {
+%
 
-<% foreach my $country (
-     sort { ($b eq $countrydefault) <=> ($a eq $countrydefault) or $a cmp $b }
-     map { $_->country }
-     qsearch( 'cust_main_county',{}, 'DISTINCT ON ( country ) *', )
-   ) {
-%>
 
-  <OPTION VALUE="<%= $country %>"<%= $country eq $opt{'country'} ? ' SELECTED' : '' %>><%= $country %>
+  <OPTION VALUE="<% $country %>"<% $country eq $opt{'country'} ? ' SELECTED' : '' %>><% code2country($country). " ($country)" %>
+% } 
 
-<% } %>
 
 </SELECT>