X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Flocation.html;h=b855e6a741cd0417ce6f65330878c08cb7a293aa;hb=11bbf29de447fe39e9d7155fe280a0df70fa8c3c;hp=0f58b36fc0bb5dcaf96b767fa1048fa2c1ed5190;hpb=20bddf47a41b6d064b3cfa4c41e55c157cf0c3de;p=freeside.git
diff --git a/httemplate/view/cust_main/packages/location.html b/httemplate/view/cust_main/packages/location.html
index 0f58b36fc..b855e6a74 100644
--- a/httemplate/view/cust_main/packages/location.html
+++ b/httemplate/view/cust_main/packages/location.html
@@ -1,35 +1,69 @@
-
+% if ( $cust_pkg->change_from_pkg
+% and $cust_pkg->change_from_pkg->locationnum == $cust_pkg->locationnum)
+% {
+% # don't show the location
+% } else {
+% if ( !$opt{'cust_pkg-group_by_location'} ) {
+% if ( $default ) {
+
+% }
-% unless ( $cust_pkg->locationnum ) {
- (default service address)
-% }
+ <% $loc->location_label( 'join_string' => ' ',
+ 'double_space' => ' ',
+ 'escape_function' => \&encode_entities,
+ 'countrydefault' => $countrydefault,
+ 'cust_main' => $opt{'cust_main'},
+ )
+ %>
- <% $loc->address1 |h %>
+% if ( $loc->latitude && $loc->longitude ) {
+
+
+
+ <& /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->country eq 'US' ) {
+% if ( $loc->censustract ) {
+
+
+ <% $loc->censustract %> (<% $loc->censusyear %> census)
+
+% } elsif ( $opt{'cust_main-require_censustract'} ) {
+
+
+ <% emt('Census tract unknown') %>
+
+% }
+% }
-% if ( $loc->address2 !~ /^\s*$/ ) {
- <% $loc->address2 |h %>
-% }
+% if ( $default ) {
+
+% }
+% } # all of this is hidden if packages are grouped by location, because
+% # it's in the top banner
- <% $loc->city |h %><% $loc->county ? ' ('.$loc->county.' county)' : '' |h %>,
- <% $loc->state |h %> <% $loc->zip |h %>
-
-% if ( $loc->country ne $countrydefault ) {
- <% code2country( $loc->country ) %>
-% }
-
-
-
- |
+% } # if the package is a scheduled future package change without location
+% # change, then don't show any of this at all. It's all implied by the
+% # preceding package.
<%init>
my %opt = @_;
-my $bgcolor = $opt{'bgcolor'};
my $cust_pkg = $opt{'cust_pkg'};
-my $part_pkg = $opt{'part_pkg'};
-my $conf = new FS::Conf;
-my $countrydefault = $conf->config('countrydefault') || 'US';
+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;
%init>