X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Fcity.html;h=4e9a6094013a669067b1e651c106cf4c3e5a827c;hb=2c112f32561f23f9c538ace00db46659ce16da32;hp=6a2142f29f1426df1768b83fb34f147eb740d1ca;hpb=a6fe07e49e3fc12169e801b1ed6874c3a5bd8500;p=freeside.git
diff --git a/httemplate/elements/city.html b/httemplate/elements/city.html
index 6a2142f29..4e9a60940 100644
--- a/httemplate/elements/city.html
+++ b/httemplate/elements/city.html
@@ -2,22 +2,24 @@
Example:
- include( '/elements/city.html',
- #recommended
- country => $current_country,
- state => $current_state,
- county => $current_county,
- city => $current_city,
-
- #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_select => 1, # disable the selector (just show a text input)
- style => [ 'attribute:value', 'another:value' ],
- );
+ <& /elements/city.html,
+ #recommended
+ country => $current_country,
+ state => $current_state,
+ county => $current_county,
+ city => $current_city,
+
+ #optional
+ prefix => $optional_unique_prefix,
+ onchange => $javascript,
+ disabled => 0, #bool
+ style => [ 'attribute:value', 'another:value' ],
+ disable_empty => 1, #defaults to 1, set to 0 to disable the empty option
+ empty_label => 'all', #label for empty option
+ disable_text => 1, # disable the text input (just show the select)
+ #doesn't work as an option yet, set when conf tax_district_method
+ #disable_select => 1, # disable the selector (just show a text input)
+ &>
%doc>
@@ -47,16 +49,22 @@ function <% $pre %>county_changed(what, callback) {}
function <% $pre %>county_changed(what, callback) {
+ what.form.<% $pre %>city_select.disabled = 'disabled';
+
county = what.options[what.selectedIndex].value;
state = what.form.<% $pre %>state.options[what.form.<% $pre %>state.selectedIndex].value;
country = what.form.<% $pre %>country.options[what.form.<% $pre %>country.selectedIndex].value;
function <% $pre %>update_cities(cities) {
-
+
// blank the current city list
for ( var i = what.form.<% $pre %>city_select.length; i >= 0; i-- )
what.form.<% $pre %>city_select.options[i] = null;
+% unless ( $opt{disable_empty} ) {
+ opt( what.form.<% $pre %>city_select, '', <% $opt{empty_label} |js_string %> );
+% }
+
// add the new cities
var citiesArray = eval('(' + cities + ')' );
@@ -67,7 +75,7 @@ function <% $pre %>county_changed(what, callback) {}
opt(what.form.<% $pre %>city_select, citiesArray[s], cityLabel);
}
- if ( citiesArray.length > 1 || citiesArray[0].length ) {
+ if ( citiesArray.length > 1 || (citiesArray[0] && citiesArray[0].length) ){
// turn off the text city, turn on the select
saved_<%$pre%>city = what.form.<%$ pre %>city.value;
<%$pre%>city_select_changed(what.form.<% $pre %>city_select);
@@ -80,6 +88,8 @@ function <% $pre %>county_changed(what, callback) {}
what.form.<% $pre %>city_select.style.display = 'none';
}
+ what.form.<% $pre %>city_select.disabled = '';
+
//run the callback
if ( callback != null )
callback();
@@ -98,39 +108,44 @@ function <% $pre %>county_changed(what, callback) {}
% } #!disable_select
-
<% $text_style %>
+% }
>
% if ( $disable_select ) {
%# avoid JS errors
-
-% }
-% else {
+
+% } else {
-
% }
-%# VALUE = "<% $curr_value |h %>"
+
<%init>
my %opt = @_;
@@ -142,6 +157,13 @@ my $conf = new FS::Conf;
# tax district table.
my $disable_select = 1 if $conf->config('tax_district_method');
+$opt{'disable_empty'} = 1 unless exists($opt{'disable_empty'});
+
+if ($conf->exists('cust_main-no_city_in_address')) {
+ $opt{'disable_text'} = 1;
+ $disable_select = 1;
+}
+
my $text_style = $opt{'style'} ? [ @{ $opt{'style'} } ] : [];
my $select_style = $opt{'style'} ? [ @{ $opt{'style'} } ] : [];