X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Flocation.html;h=99d91e5146e56d8e21cc936675e5e11097992e8d;hb=b7cf1606a66cca95e3540f803ffa66d223f23a40;hp=db67d45b98e955259e77d9b21f57927c4a92e7b4;hpb=b286638fd4cb875178b0247a04b2706a44cadf6f;p=freeside.git
diff --git a/httemplate/view/cust_main/packages/location.html b/httemplate/view/cust_main/packages/location.html
index db67d45b9..99d91e514 100644
--- a/httemplate/view/cust_main/packages/location.html
+++ b/httemplate/view/cust_main/packages/location.html
@@ -3,7 +3,7 @@
% {
% # don't show the location
% } else {
-% if ( !$conf->exists('cust_pkg-group_by_location') ) {
+% if ( !$opt{'cust_pkg-group_by_location'} ) {
% if ( $default ) {
% }
@@ -12,6 +12,7 @@
'double_space' => ' ',
'escape_function' => \&encode_entities,
'countrydefault' => $countrydefault,
+ 'cust_main' => $opt{'cust_main'},
)
%>
@@ -19,24 +20,28 @@
<% $loc->latitude %>, <% $loc->longitude %>
- <& /elements/coord-links.html,
- $loc->latitude,
- $loc->longitude,
- $opt{'cust_main'}->name_short. ': '. $opt{'part_pkg'}->pkg,
- $opt{'cust_main'}->agentnum,
+ <& /elements/coord-links.html, {
+ 'latitude' => $loc->latitude,
+ 'longitude' => $loc->longitude,
+ 'name' => $opt{'cust_main'}->name_short.
+ ': '. $opt{'part_pkg'}->pkg,
+ 'company_address' => $opt{'company_address'},
+ }
&>
% }
-% if ( $loc->censustract ) {
-
-
- <% $loc->censustract %> (<% $loc->censusyear %> census)
-
-% } elsif ( $conf->exists('cust_main-require_censustract') ) {
-
-
- <% emt('Census tract unknown') %>
-
+% if ( $loc->country eq 'US' ) {
+% if ( $loc->censustract ) {
+
+
+ <% $loc->censustract %> (<% $loc->censusyear %> census)
+
+% } elsif ( $opt{'cust_main-require_censustract'} ) {
+
+
+ <% emt('Census tract unknown') %>
+
+% }
% }
% if ( $default ) {
@@ -64,7 +69,6 @@
% # preceding package.
<%init>
-my $conf = new FS::Conf;
my %opt = @_;
my $cust_pkg = $opt{'cust_pkg'};
@@ -72,7 +76,7 @@ my $countrydefault = $opt{'countrydefault'} || 'US';
my $statedefault = $opt{'statedefault'}
|| ($countrydefault eq 'US' ? 'CA' : '');
-my $loc = $cust_pkg->cust_location_or_main;
+my $loc = $cust_pkg->cust_location_or_main('_cache'=>$opt{cust_location_cache});
# dubious--they should all have a location now
my $default = $cust_pkg->locationnum == $opt{'cust_main'}->ship_locationnum;