X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Flocation.html;h=7fc49f8601164636342d99f669c06f06d46eb211;hb=1d2db1a7412b886a6120ebd527d6632bff27551d;hp=a820bf2a6a9c006bff52083af34e9fdd6efcfc16;hpb=bf64a7f6f008be6cd9f5b7eda28039b4ae331e44;p=freeside.git
diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html
index a820bf2a6..7fc49f860 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%>>
@@ -150,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 ) %> |
@@ -200,20 +223,21 @@ 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)' %>
|
@@ -221,17 +245,17 @@ Example:
% }
% if ( $opt{enable_district} and $conf->config('tax_district_method') ) {
- Tax district |
+ Tax district |
- <% '(automatic)' %>
+ <% '(automatic)' %>
|
% } else {
-
+ <& hidden.html, field => $pre.'district', value => $object->get('district') &>
% }
%# For address standardization:
@@ -239,18 +263,19 @@ 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 => '' &>
@@ -289,13 +334,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,