X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Flocation.html;h=214a7d5f2a2319114f784ed59c1475122a963bbc;hb=a4da08852e2b5f30bbb8926ddd4310ce1f128449;hp=68552331414f0b97937070309a8b53f82cccc51c;hpb=05a8005cb5435fbdb3552af855a77934b58eac91;p=freeside.git
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index 685523314..214a7d5f2 100644
--- a/httemplate/elements/location.html
+++ b/httemplate/elements/location.html
@@ -41,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%>>
@@ -75,10 +97,7 @@ Example:
% } else { # alternate format
-
+<& hidden.html, field => $pre.'address2', value => $object->get('address2') &>
|
<<%$th%> ALIGN="right">Unit type and #<%$th%>>
@@ -200,27 +219,27 @@ Example:
% } 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 ( $conf->config('tax_district_method') ) {
-% if ( $opt{enable_district} ) {
+% if ( $opt{enable_district} and $conf->config('tax_district_method') ) {
Tax district |
@@ -231,9 +250,8 @@ Example:
<% '(automatic)' %>
|
-% } else {
-
-% }
+% } else {
+ <& hidden.html, field => $pre.'district', value => $object->get('district') &>
% }
%# For address standardization:
@@ -241,11 +259,68 @@ Example:
%# to re-standardize
% foreach (qw(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>
my %opt = @_;
@@ -255,13 +330,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,