summaryrefslogtreecommitdiff
path: root/httemplate/elements
diff options
context:
space:
mode:
authorIvan Kohler <ivan@freeside.biz>2015-02-10 01:43:57 -0800
committerIvan Kohler <ivan@freeside.biz>2015-02-10 01:43:57 -0800
commit92c9e14aa28f017837fb94e4da1d9862e30b02f8 (patch)
tree5cbb6138550d5135d731567ed4a63b01f6d56736 /httemplate/elements
parenta4d4d3df88b33a6db30b565921f6d62efb252351 (diff)
parentec7e8155fce544f19f2b6734476ed6db8c200aa9 (diff)
Merge branch 'master' of git.freeside.biz:/home/git/freeside
Diffstat (limited to 'httemplate/elements')
-rw-r--r--httemplate/elements/location.html5
1 files changed, 5 insertions, 0 deletions
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index 214a7d5f2..357a91db7 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -169,10 +169,15 @@ 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%>>
<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 ) %>