diff options
Diffstat (limited to 'httemplate/elements/location.html')
| -rw-r--r-- | httemplate/elements/location.html | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html index 90f20265a..b5f0a963c 100644 --- a/httemplate/elements/location.html +++ b/httemplate/elements/location.html @@ -169,15 +169,14 @@ Example: <TR> -% if ($conf->exists('city_not_required')) { -<input type="hidden" name="<% ($select_hash{'prefix'}) ? $select_hash{'prefix'} : '' %>city" value=" "/> -%} else { - <<%$th%> ALIGN="right"><%$r%><% mt('City') |h %></<%$th%>> + <<%$th%> ALIGN="right"> +% unless ($conf->exists('cust_main-no_city_in_address')) { + <% $r %><% mt('City') |h %> +% } + </<%$th%>> <TD WIDTH="1"><% include('/elements/city.html', %select_hash, 'text_style' => \@style ) %></TD> - <<%$th%> ALIGN="right" WIDTH="1" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County</<%$th%>> <TD WIDTH="1"><% include('/elements/select-county.html', %select_hash ) %></TD> -% } <<%$th%> ALIGN="right" WIDTH="1"><%$r%><% mt('State') |h %></<%$th%>> <TD WIDTH="1"> <% include('/elements/select-state.html', %select_hash ) %> @@ -291,7 +290,7 @@ Example: var clear_coords_on_change = [ '<%$pre%>address1', '<%$pre%>address2', - '<%$pre%>city', + <% $conf->exists('cust_main-no_city_in_address') ? '' : qq('${pre}city',) %> '<%$pre%>state', '<%$pre%>zip', '<%$pre%>country' |