X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=httemplate%2Felements%2Flocation.html;h=5478e1e1e94f0a51be1f4dfc0e503c5bbce01092;hb=71f6c7a310cc5482d36d1592a4500b5a3a47e90e;hp=6691bc84e9fca16c8da82360067950fa443cd82a;hpb=26119738eaf2b519d91c855c23986f873303887f;p=freeside.git

diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index 6691bc84e..5478e1e1e 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
@@ -23,7 +24,7 @@ Example:
            NAME     = "<%$pre%>address1"
            ID       = "<%$pre%>address1"
            VALUE    = "<% $object->get($pre.'address1') |h %>"
-           SIZE     = 58
+           SIZE     = 54
            onChange = "<% $onchange %>"
            <% $disabled %>
            <% $style %>
@@ -38,7 +39,7 @@ Example:
            NAME     = "<%$pre%>address2"
            ID       = "<%$pre%>address2"
            VALUE    = "<% $object->get($pre.'address2') |h %>"
-           SIZE     = 58
+           SIZE     = 54
            onChange = "<% $onchange %>"
            <% $disabled %>
            <% $style %>
@@ -48,22 +49,11 @@ Example:
 
 <TR>
   <TH ALIGN="right"><%$r%>City</TH>
-  <TD>
-    <INPUT TYPE     = "text"
-           NAME     = "<%$pre%>city"
-           ID       = "<%$pre%>city"
-           VALUE    = "<% $object->get($pre.'city') |h %>"
-           onChange = "<% $onchange %>"
-           <% $disabled %>
-           <% $style %>
-    >
- </TD>
+  <TD WIDTH="1"><% include('/elements/city.html', %select_hash) %></TD>
   <TH ALIGN="right" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County</TH>
-  <TD>
-    <% include('/elements/select-county.html', %select_hash ) %>
-  </TD>
-  <TH ALIGN="right"><%$r%>State</TH>
-  <TD>
+  <TD><% include('/elements/select-county.html', %select_hash ) %></TD>
+  <TH ALIGN="right" WIDTH="1"><%$r%>State</TH>
+  <TD WIDTH="1">
     <% include('/elements/select-state.html', %select_hash ) %>
   </TD>
   <TH><%$r%>Zip</TH>
@@ -82,11 +72,21 @@ Example:
 
 <TR>
   <TH ALIGN="right"><%$r%>Country</TH>
-  <TD COLSPAN=5><% include('/elements/select-country.html', %select_hash ) %></TD>
+  <TD COLSPAN=6><% include('/elements/select-country.html', %select_hash ) %></TD>
 </TR>
 
 % if ( !$pre ) { 
   <INPUT TYPE="hidden" NAME="geocode" VALUE="<% $opt{geocode} %>">
+% } else {
+%   if ( $pre eq 'ship_' && $conf->exists('cust_main-require_censustract') ) {
+      <TR><TH ALIGN="right">Census tract<BR>(automatic)</TH>
+        <TD>
+          <INPUT TYPE="text" NAME="censustract" VALUE="<% $opt{censustract} %>">
+        </TD>
+      </TR>
+%   } else {
+      <INPUT TYPE="hidden" NAME="censustract" VALUE="<% $opt{censustract} %>">
+%   } 
 % } 
 
 <%init>
@@ -114,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'
@@ -126,7 +126,7 @@ my @counties = counties( $object->get($pre.'state'),
                          $object->get($pre.'country'),
                        );
 my @county_style = ();
-push @county_style, 'visibility:hidden'
+push @county_style, 'display:none' # 'visibility:hidden'
   unless scalar(@counties) > 1;
 
 my $style =
@@ -143,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'),