X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Flocation.html;h=3c8e973ed021b13af9d91621554a1c23b270bf07;hb=c6d8896d882b684b1f3c7a2538a90358b27aaf89;hp=c5509c1a92d3851cad12cd10d2dfdbdd3b7e8c6a;hpb=8cbe016ac2c28cd209c48f053f361573368e7988;p=freeside.git
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index c5509c1a9..3c8e973ed 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -3,16 +3,18 @@
Example:
include( '/elements/location.html',
- 'object' => $cust_main, # or $cust_location
- 'prefix' => $pre, #only for cust_main objects
+ 'object' => $cust_location
+ 'prefix' => $pre, # prefixed to form field names
'onchange' => $javascript,
- '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
+ '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,13 +41,35 @@ Example:
% }
+% if ( $label_prefix eq '_location' ) {
+
+
+ <% $opt{'locationname_label'} || emt('Location ID') %>
+ |
+
+ <% $style %>
+ >
+ |
+
+
+% } else {
+ <& hidden.html, field => $pre.'locationname', value => $object->get('locationname') &>
+
+% }
+
- <<%$th%> ALIGN="right"><%$r%><% $opt{'address1_label'} || emt('Address') %><%$th%>>
+ <<%$th%> STYLE="width:16ex" ALIGN="right"><%$r%><% $opt{'address1_label'} || emt('Address') %><%$th%>>
@@ -57,12 +81,12 @@ Example:
% if ( ! $opt{'alt_format'} ) { #regular format
|
- >* >Unit # |
+ >* >Unit #
|
@@ -73,17 +97,14 @@ Example:
% } else { # alternate format
-
+<& hidden.html, field => $pre.'address2', value => $object->get('address2') &>
|
<<%$th%> ALIGN="right">Unit type and #<%$th%>>
% my $location_type = scalar($cgi->param('location_type'))
-% || $object->get($pre.'location_type');
+% || $object->get('location_type');
% #my $location_number = scalar($cgi->param('location_number'))
% # || $object->get($pre.'location_number');
%
@@ -130,7 +151,7 @@ Example:
<% $style %>
@@ -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 ) %> |
@@ -161,8 +186,8 @@ Example:
<% $style %>
@@ -175,41 +200,131 @@ 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 %>
<% $style %>
>
|
-
-
-% if ( !$pre ) {
-
% } else {
-% if ( $pre eq 'ship_' && $conf->exists('cust_main-require_censustract') ) {
- <<%$th%> ALIGN="right">Census tract
(automatic)<%$th%>>
-
-
- |
-
-% } 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
+ |
+
+ <% '(automatic)' %>
+ |
+
+% }
+% if ( $opt{enable_district} and $conf->config('tax_district_method') ) {
+
+ Tax district |
+
+
+ <% '(automatic)' %>
+ |
+
+% } 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>
@@ -220,20 +335,18 @@ my $object = $opt{'object'};
my $onchange = $opt{'onchange'};
my $disabled = $opt{'disabled'};
-my $conf = new FS::Conf;
-
my $r = $opt{'no_asterisks'} ? '' : qq!* !;
-#false laziness with ship state
+my $conf = new FS::Conf;
my $countrydefault = $conf->config('countrydefault') || 'US';
-$object->set($pre.'country', $countrydefault )
- unless $object->get($pre.'country');
+my $statedefault = $conf->config('statedefault')
+ || ($countrydefault eq 'US' ? 'CA' : '');
+my $label_prefix = $conf->config('cust_location-label_prefix');
-my $statedefault = $conf->config('statedefault')
- || ($countrydefault eq 'US' ? 'CA' : '');
-$object->set($pre.'state', $statedefault )
- unless $object->get($pre.'state')
- || $object->get($pre.'country') ne $countrydefault;
+$object ||= FS::cust_location->new({
+ 'country' => $countrydefault,
+ 'state' => $statedefault,
+});
my $alt_err = ($opt{'alt_format'} && !$disabled) ? $object->alternize : '';
@@ -246,8 +359,8 @@ push @address2_label_style, 'visibility:hidden'
|| ! $conf->exists('cust_main-require_address2')
|| ( !$pre && !$opt{'same_checked'} );
-my @counties = counties( $object->get($pre.'state'),
- $object->get($pre.'country'),
+my @counties = counties( $object->get('state'),
+ $object->get('country'),
);
my @county_style = ();
push @county_style, 'display:none' # 'visibility:hidden'
@@ -267,10 +380,10 @@ 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'),
+ 'city' => $object->get('city'),
+ 'county' => $object->get('county'),
+ 'state' => $object->get('state'),
+ 'country' => $object->get('country'),
'prefix' => $pre,
'onchange' => $onchange,
'disabled' => $disabled,