X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Flocation.html;h=0d2fa38c3fcc81c72b9706c2f2a1ef52026587f4;hb=ad7f49821d40ffd099a45acc32ba91e0e211aede;hp=dbc567d4d34119edcb4a37ede79a480c150f150b;hpb=d6b6f81e383f9d876e67e9704914e887a331012e;p=freeside.git
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index dbc567d4d..0d2fa38c3 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -9,6 +9,7 @@ Example:
'disabled' => $disabled,
'same_checked' => $same_checked,
'geocode' => $geocode, #passed through
+ 'censustract' => $censustract, #passed through
'no_asterisks' => 0, #set true to disable the red asterisks next
#to required fields
'address1_label' => 'Address', #label for address
@@ -17,7 +18,7 @@ Example:
%doc>
- <%$r%><% $opt{'address1_label'} || 'Address' %> |
+ <<%$th%> ALIGN="right"><%$r%><% $opt{'address1_label'} || 'Address' %><%$th%>>
|
- <%$r%>City |
-
-
- <% $style %>
- >
- |
- ><%$r%>County |
+ <<%$th%> ALIGN="right"><%$r%>City<%$th%>>
+ <% include('/elements/city.html', %select_hash) %> |
+ <<%$th%> ALIGN="right" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County<%$th%>>
<% include('/elements/select-county.html', %select_hash ) %> |
- <%$r%>State |
+ <<%$th%> ALIGN="right" WIDTH="1"><%$r%>State<%$th%>>
<% include('/elements/select-state.html', %select_hash ) %>
|
- <%$r%>Zip |
+ <<%$th%>><%$r%>Zip<%$th%>>
|
- <%$r%>Country |
+ <<%$th%> ALIGN="right"><%$r%>Country<%$th%>>
<% include('/elements/select-country.html', %select_hash ) %> |
% if ( !$pre ) {
+% } else {
+% if ( $pre eq 'ship_' && $conf->exists('cust_main-require_censustract') ) {
+ <<%$th%> ALIGN="right">Census tract
(automatic)<%$th%>>
+
+
+ |
+
+% } else {
+
+% }
% }
<%init>
@@ -112,7 +114,7 @@ $object->set($pre.'state', $statedefault )
|| $object->get($pre.'country') ne $countrydefault;
my @style = ();
-push @style, 'background-color: #dddddd"' if $disabled;
+push @style, 'background-color: #dddddd' if $disabled;
my @address2_label_style = ();
push @address2_label_style, 'visibility:hidden'
@@ -141,6 +143,7 @@ my $county_style =
: '';
my %select_hash = (
+ 'city' => $object->get($pre.'city'),
'county' => $object->get($pre.'county'),
'state' => $object->get($pre.'state'),
'country' => $object->get($pre.'country'),
@@ -150,4 +153,6 @@ my %select_hash = (
'style' => \@style,
);
+my $th = $opt{'no_bold'} ? 'TD' : 'TH';
+
%init>