X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Felements%2Flocation.html;h=214a7d5f2a2319114f784ed59c1475122a963bbc;hb=b79d815338e1895fce025aef5dcb5f9f42028562;hp=41a67a0cbb9f852e507f7f2590b20bd0cbded0b0;hpb=b8144cab2a804b964d1a97164780e2ddc6ae60ec;p=freeside.git diff --git a/httemplate/elements/location.html b/httemplate/elements/location.html index 41a67a0cb..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') %>> @@ -75,10 +97,7 @@ Example: % } else { # alternate format - +<& hidden.html, field => $pre.'address2', value => $object->get('address2') &> <<%$th%> ALIGN="right">Unit type and #> @@ -200,20 +219,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)' %> @@ -231,7 +251,7 @@ Example: % } else { - + <& hidden.html, field => $pre.'district', value => $object->get('district') &> % } %# For address standardization: @@ -239,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 = @_; @@ -253,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,