X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Flocation.html;h=3c8e973ed021b13af9d91621554a1c23b270bf07;hb=d2485c6fa278d7a4a1c940605816013f41d1f7e0;hp=767231856483e992bc14ca2a7d8ec1af34820efe;hpb=a6fe07e49e3fc12169e801b1ed6874c3a5bd8500;p=freeside.git
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index 767231856..3c8e973ed 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -11,8 +11,10 @@ Example:
'no_asterisks' => 0, #set true to disable the red asterisks next
#to required fields
'address1_label' => 'Address', #label for address
+ 'enable_coords' => 1, #show latitude/longitude fields
'enable_district' => 1, #show tax district field
'enable_censustract' => 1, #show censustract field
+
)
%doc>
@@ -31,7 +33,7 @@ Example:
'options' => \@location_kind_options,
'labels' => $location_kind_labels,
'curr_value' => scalar($cgi->param('location_kind'))
- || $object->get($pre.'location_kind'),
+ || $object->get('location_kind'),
)
%>
@@ -39,6 +41,28 @@ Example:
% }
+% if ( $label_prefix eq '_location' ) {
+
+
+ <% $opt{'locationname_label'} || emt('Location ID') %>
+ |
+
+ <% $style %>
+ >
+ |
+
+
+% } else {
+ <& hidden.html, field => $pre.'locationname', value => $object->get('locationname') &>
+
+% }
+
<<%$th%> STYLE="width:16ex" ALIGN="right"><%$r%><% $opt{'address1_label'} || emt('Address') %><%$th%>>
@@ -57,7 +81,7 @@ Example:
% if ( ! $opt{'alt_format'} ) { #regular format
|
- >* >Unit # |
+ >* >Unit #
|
+<& hidden.html, field => $pre.'address2', value => $object->get('address2') &>
|
<<%$th%> ALIGN="right">Unit type and #<%$th%>>
@@ -148,7 +169,11 @@ Example:
- <<%$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%>>
<% include('/elements/city.html', %select_hash, 'text_style' => \@style ) %> |
<<%$th%> ALIGN="right" WIDTH="1" ID="<%$pre%>countylabel" <%$county_style%>><%$r%>County<%$th%>>
<% include('/elements/select-county.html', %select_hash ) %> |
@@ -162,7 +187,7 @@ Example:
NAME = "<%$pre%>zip"
ID = "<%$pre%>zip"
VALUE = "<% $object->get('zip') |h %>"
- SIZE = 10
+ SIZE = 11
onChange = "<% $onchange %>"
<% $disabled %>
<% $style %>
@@ -175,8 +200,9 @@ Example:
<% include('/elements/select-country.html', %select_hash ) %> |
+% if ( $opt{enable_coords} ) {
- <% mt('Latitude') |h %>
+ | <% mt('Latitude') |h %>
|
<% $style %>
>
- <% mt('Longitude') |h %>
+ <% mt('Longitude') |h %>
|
-
-
-
-
-
+% } else {
+% foreach (qw(latitude longitude)) {
+<& hidden.html, field => $pre.$_, value => $object->get($_) &>
+% }
+% }
+%
+% foreach (qw(coord_auto geocode censustract censusyear)) {
+ <& hidden.html, field => $pre.$_, value => $object->get($_) &>
+% }
+%
% if ( $opt{enable_censustract} ) {
- Census tract |
+
+ Census tract
|
- <% '(automatic)' %>
+ ID="<% $pre %>enter_censustract"
+ NAME="<% $pre %>enter_censustract"
+ VALUE="<% $object->censustract |h %>">
+ <% '(automatic)' %>
|
-% } else {
-
-% }
-% if ( $conf->config('tax_district_method') ) {
+% }
+% if ( $opt{enable_district} and $conf->config('tax_district_method') ) {
-% if ( $opt{enable_district} ) {
- Tax district |
+ Tax district |
- <% '(automatic)' %>
+ ID="<%$pre%>district"
+ VALUE="<% $object->district |h %>">
+ <% '(automatic)' %>
|
-% } else {
-
-% }
+% } else {
+ <& hidden.html, field => $pre.'district', value => $object->get('district') &>
+% }
+
+%# For address standardization:
+%# keep a clean copy of the address so we know if we need
+%# to re-standardize
+% foreach (qw(locationname address1 city state country zip latitude
+% longitude censustract district addr_clean
+% ) ) {
+<& hidden.html, field => 'old_'.$pre.$_, value => $object->get($_) &>
% }
+%# Placeholders
+<& hidden.html, field => $pre.'cachenum', value => '' &>
+<& hidden.html, field => $pre.'addr_clean', value => '' &>
+
+
<%init>
@@ -237,13 +335,14 @@ my $object = $opt{'object'};
my $onchange = $opt{'onchange'};
my $disabled = $opt{'disabled'};
-my $conf = new FS::Conf;
-
my $r = $opt{'no_asterisks'} ? '' : qq!* !;
+my $conf = new FS::Conf;
my $countrydefault = $conf->config('countrydefault') || 'US';
-my $statedefault = $conf->config('statedefault')
- || ($countrydefault eq 'US' ? 'CA' : '');
+my $statedefault = $conf->config('statedefault')
+ || ($countrydefault eq 'US' ? 'CA' : '');
+my $label_prefix = $conf->config('cust_location-label_prefix');
+
$object ||= FS::cust_location->new({
'country' => $countrydefault,
'state' => $statedefault,