[freeside-commits] freeside/httemplate/elements select-state.html, 1.1, 1.2 select-country.html, NONE, 1.1 select-county.html, NONE, 1.1

Ivan,,, ivan at wavetail.420.am
Sun Dec 28 10:48:12 PST 2008 

Update of /home/cvs/cvsroot/freeside/httemplate/elements
In directory wavetail.420.am:/tmp/cvs-serv6151

Modified Files:
	select-state.html 
Added Files:
	select-country.html select-county.html 
Log Message:
fix browse results for selecting counties (resulting from separating tax classes), also add dropdowns to browse by state and county, RT#4496

--- NEW FILE: select-country.html ---
<%doc>

Example:

  include( '/elements/select-country.html',
    #recommended
    country    => $current_country,

    #optional
    prefix        => $optional_unique_prefix,
    onchange      => $javascript,
    disabled      => 0, #bool
    disable_empty => 1, #defaults to 1, disable the empty option
    empty_label   => 'all', #label for empty option
    disable_stateupdate => 0, #bool - disabled update of the select-state.html
    
  );

</%doc>
% unless ( $opt{'disable_stateupdate'} ) {

  <% include('/elements/xmlhttp.html',
                'url'  => $p.'misc/states.cgi',
                'subs' => [ $pre. 'get_states' ],
             )
  %>
  
  <SCRIPT TYPE="text/javascript">
  
    function opt(what,value,text) {
      var optionName = new Option(text, value, false, false);
      var length = what.length;
      what.options[length] = optionName;
    }
  
    function <% $pre %>country_changed(what, callback) {
  
      country = what.options[what.selectedIndex].value;
  
      function <% $pre %>update_states(states) {
  
        // blank the current state list
        for ( var i = what.form.<% $pre %>state.length; i >= 0; i-- )
            what.form.<% $pre %>state.options[i] = null;
  
        // add the new states
        var statesArray = eval('(' + states + ')' );
        for ( var s = 0; s < statesArray.length; s=s+2 ) {
            var stateLabel = statesArray[s+1];
            if ( stateLabel == "" )
                stateLabel = '(n/a)';
            opt(what.form.<% $pre %>state, statesArray[s], stateLabel);
        }
  
        //run the callback
        if ( callback != null ) 
          callback();
      }
  
      // go get the new states
      <% $pre %>get_states( country, <% $pre %>update_states );
  
    }
  
  </SCRIPT>

% }

<SELECT NAME     = "<% $pre %>country"
        ID       = "<% $pre %>country"
        onChange = "<% $onchange %>"
        <% $opt{'disabled'} %>
>

% unless ( $opt{'disable_empty'} ) {
    <OPTION VALUE=""><% $opt{'empty_label'} || '(all)' %>
% }

% foreach my $country ( @all_countries ) {

  <OPTION VALUE="<% $country |h %>"
          <% $country eq $opt{'country'} ? ' SELECTED' : '' %>
  ><% code2country($country). " ($country)" %>

% } 

</SELECT>

<%init>

my %opt = @_;
foreach my $opt (qw( country prefix onchange disabled disable_stateupdate )) {
  $opt{$opt} = '' unless exists($opt{$opt}) && defined($opt{$opt});
}

$opt{'disable_empty'} = 1 unless exists($opt{'disable_empty'});

my $pre = $opt{'prefix'};

my $onchange =
  ( $opt{'disable_stateupdate'} ? '' : $pre.'country_changed(this); ' ).
  $opt{'onchange'};

my $conf = new FS::Conf;
my $default = $conf->config('countrydefault') || 'US';

my @all_countries = ( 
                      sort {    ($b eq $default) <=> ($a eq $default)
                             or code2country($a) cmp code2country($b)
                           }
                      map  { $_->country } 
                           qsearch({
                                     'select'    => 'country',
                                     'table'     => 'cust_main_county',
                                     'hashref'   => {},
                                     'extra_sql' => 'GROUP BY country',
                                  })
                    );

</%init>

Index: select-state.html
===================================================================
RCS file: /home/cvs/cvsroot/freeside/httemplate/elements/select-state.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- select-state.html	28 Jun 2008 23:03:09 -0000	1.1
+++ select-state.html	28 Dec 2008 18:48:10 -0000	1.2
@@ -1,12 +1,35 @@
-<SELECT NAME="<% $opt{'prefix'} %>state" onChange="<% $opt{'prefix'} %>state_changed(this); <% $opt{'onchange'} %>" <% $opt{'disabled'} %>>
+<%doc>
 
-% if ($opt{empty}) {
-  <OPTION VALUE=""<% $opt{state} eq '' ? ' SELECTED' : '' %>><% $opt{empty} %>
+Example:
+
+  include( '/elements/select-state.html',
+    #recommended
+    country    => $current_country,
+    state      => $current_state,
+
+    #optional
+    prefix        => $optional_unique_prefix,
+    onchange      => $javascript,
+    disabled      => 0, #bool
+    disable_empty => 1, #defaults to 1, disable the empty option
+    empty_label   => 'all', #label for empty option
+    disable_countyupdate => 0, #bool - disabled update of the select-state.html
+  );
+
+</%doc>
+
+<SELECT NAME     = "<% $pre %>state"
+        ID       = "<% $pre %>state"
+        onChange = "<% $onchange %>"
+>
+
+% unless ( $opt{'disable_empty'} ) {
+  <OPTION VALUE=""<% $opt{state} eq '' ? ' SELECTED' : '' %>><% $opt{empty_label} %>
 % }
 
 % foreach my $state ( keys %states ) { 
 
-  <OPTION VALUE="<% $state %>"<% $state eq $opt{'state'} ? ' SELECTED' : '' %>><% $states{$state} || '(n/a)' %>
+  <OPTION VALUE="<% $state |h %>"<% $state eq $opt{'state'} ? ' SELECTED' : '' %>><% $states{$state} || '(n/a)' %>
 
 % } 
 
@@ -14,11 +37,21 @@
 </SELECT>
 
 <%init>
+
 my %opt = @_;
-foreach my $opt (qw( county state country prefix onchange disabled empty )) {
-  $opt{$_} = '' unless exists($opt{$_}) && defined($opt{$_});
+foreach my $opt (qw( state country prefix onchange disabled empty_label )) {
+  $opt{$opt} = '' unless exists($opt{$opt}) && defined($opt{$opt});
 }
 
+$opt{'disable_empty'} = 1 unless exists($opt{'disable_empty'});
+
+my $pre = $opt{'prefix'};
+
+my $onchange =
+  ( $opt{'disable_countyupdate'} ? '' : $pre.'state_changed(this); ' ).
+  $opt{'onchange'};
+
 tie my %states, 'Tie::IxHash', states_hash( $opt{'country'} ); 
+
 </%init>
 

--- NEW FILE: select-county.html ---
<%doc>

Example:

  include( '/elements/select-county.html',
    #recommended
    country    => $current_country,
    state      => $current_state,
    county     => $current_county,

    #optional
    prefix        => $optional_unique_prefix,
    onchange      => $javascript,
    disabled      => 0, #bool
    disable_empty => 1, #defaults to 1, disable the empty option
    empty_label   => 'all', #label for empty option
  );

</%doc>
% if ( $countyflag ) { 

  <% include('/elements/xmlhttp.html',
                'url'  => $p.'misc/counties.cgi',
                'subs' => [ $pre. 'get_counties' ],
             )
  %>
  
  <SCRIPT TYPE="text/javascript">
  
    function opt(what,value,text) {
      var optionName = new Option(text, value, false, false);
      var length = what.length;
      what.options[length] = optionName;
    }
  
    function <% $pre %>state_changed(what, callback) {

      state = what.options[what.selectedIndex].value;
      country = what.form.<% $pre %>country.options[what.form.<% $pre %>country.selectedIndex].value;
  
      function <% $pre %>update_counties(counties) {

        // blank the current county list
        for ( var i = what.form.<% $pre %>county.length; i >= 0; i-- )
            what.form.<% $pre %>county.options[i] = null;
  
        // add the new counties
        var countiesArray = eval('(' + counties + ')' );
        for ( var s = 0; s < countiesArray.length; s++ ) {
            var countyLabel = countiesArray[s];
            if ( countyLabel == "" )
                countyLabel = '(n/a)';
            opt(what.form.<% $pre %>county, countiesArray[s], countyLabel);
        }

        var countyFormLabel = document.getElementById('<% $pre %>countylabel');

        if ( countiesArray.length > 1 ) { 
          what.form.<% $pre %>county.style.display = '';
          countyFormLabel.style.visibility = 'visible';
        } else {
          what.form.<% $pre %>county.style.display = 'none';
          countyFormLabel.style.visibility = 'hidden';
        }

        //run the callback
        if ( callback != null ) 
          callback();
      }
  
      // go get the new counties
      <% $pre %>get_counties( state, country, <% $pre %>update_counties );
  
    }
  
  </SCRIPT>

  <SELECT NAME    = "<% $pre %>county"
          ID      = "<% $pre %>county"
          onChange= "<% $opt{'onchange'} %>"
          <% $opt{'disabled'} %>
  >

% unless ( $opt{'disable_empty'} ) {
  <OPTION VALUE="" <% $opt{county} eq '' ? 'SELECTED' : '' %>><% $opt{empty_label} %>
% }

% foreach my $county ( @counties ) {

    <OPTION VALUE="<% $county |h %>"
            <% $county eq $opt{'county'} ? 'SELECTED' : '' %>
    ><% $county eq $opt{'empty_data_value'} ? $opt{'empty_data_label'} : $county %>

% } 

  </SELECT>

% } else { 

  <SCRIPT TYPE="text/javascript">
    function <% $pre %>state_changed(what) {
    }
  </SCRIPT>

  <SELECT NAME  = "<% $pre %>county"
           ID   = "<% $pre %>county"
          STYLE = "display:none"
  >
    <OPTION SELECTED VALUE="<% $opt{'county'} |h %>">
  </SELECT>

% } 

<%init>

my %opt = @_;
foreach my $opt (qw( county state country prefix onchange disabled
                     empty_value )) {
  $opt{$opt} = '' unless exists($opt{$opt}) && defined($opt{$opt});
}

$opt{'disable_empty'} = 1 unless exists($opt{'disable_empty'});

my $pre = $opt{'prefix'};

my @counties = ();
if ( $countyflag ) {

  @counties = map { length($_) ? $_ : $opt{'empty_data_value'} }
                  counties( $opt{'state'}, $opt{'country'} );

  # this is very hacky
  unless ( scalar(@counties) > 1 ) {
    if ( $opt{'disabled'} =~ /STYLE=/i ) {
      $opt{'disabled'} =~ s/STYLE="([^"]+)"/STYLE="$1; display:none"/i;
    } else {
      $opt{'disabled'} .= ' STYLE="display:none"';
    }
  }

}

</%init>
<%once>

my $sql = "SELECT COUNT(*) FROM cust_main_county".
          " WHERE county IS NOT NULL AND county != ''";
my $sth = dbh->prepare($sql) or die dbh->errstr;
$sth->execute or die $sth->errstr;
my $countyflag = $sth->fetchrow_arrayref->[0];

</%once>

More information about the freeside-commits mailing list