X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages%2Flocation.html;h=b855e6a741cd0417ce6f65330878c08cb7a293aa;hb=7118f8f027744b31c87444da0a47de3b1daa5da2;hp=40a7de59f5f7d76c60d154bb633bd3c08e1f25e9;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c;p=freeside.git

diff --git a/httemplate/view/cust_main/packages/location.html b/httemplate/view/cust_main/packages/location.html
index 40a7de59f..b855e6a74 100644
--- a/httemplate/view/cust_main/packages/location.html
+++ b/httemplate/view/cust_main/packages/location.html
@@ -1,66 +1,69 @@
-<TD CLASS="inv" BGCOLOR="<% $bgcolor %>">
-
-% unless ( $cust_pkg->locationnum ) {
-  <I><FONT SIZE=-1>(default service address)</FONT><BR>
-% }
+% 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 ) {
+        <DIV STYLE="font-style: italic; font-size: small">
+%     }
 
-  <% $loc->location_label( 'join_string'     => '<BR>',
-                           'double_space'    => ' &nbsp; ',
-                           'escape_function' => \&encode_entities,
-                           'countrydefault'  => $countrydefault,
-                         )
-  %>
+      <% $loc->location_label( 'join_string'     => '<BR>',
+                               'double_space'    => ' &nbsp; ',
+                               'escape_function' => \&encode_entities,
+                               'countrydefault'  => $countrydefault,
+                               'cust_main'       => $opt{'cust_main'},
+                             )
+      %>
 
-% unless ( $cust_pkg->locationnum ) {
-  </I>
-% }
+%     if ( $loc->latitude && $loc->longitude ) {
+          <BR>
+          <FONT SIZE=-1>
+          <!-- <% $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'},
+             }
+          &>
+          </FONT>
+%     }
+%     if ( $loc->country eq 'US' ) {
+%       if ( $loc->censustract ) {
+           <BR>
+           <FONT SIZE=-1>
+           <% $loc->censustract %> (<% $loc->censusyear %> census)
+           </FONT>
+%       } elsif ( $opt{'cust_main-require_censustract'} ) {
+            <BR>
+            <FONT SIZE=-1 COLOR="#ee3300">
+            <% emt('Census tract unknown') %>
+            </FONT>
+%       }
+%     }
 
-% if ( ! $cust_pkg->get('cancel')
-%      && $FS::CurrentUser::CurrentUser->access_right('Change customer package')
-%    )
-% {
-  <FONT SIZE=-1>
-    (&nbsp;<%pkg_change_location_link($cust_pkg)%>&nbsp;)
-%   if ( $cust_pkg->locationnum ) {
-&nbsp;(&nbsp;<%edit_location_link($cust_pkg->locationnum)%>&nbsp;)
-%   }
-  </FONT>
-% } 
+%     if ( $default ) {
+      </DIV>
+%     }
+%   } # all of this is hidden if packages are grouped by location, because
+%     # it's in the top banner
 
-</TD>
+% } # 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 $conf = new FS::Conf;
 my %opt = @_;
 
-my $bgcolor        = $opt{'bgcolor'};
 my $cust_pkg       = $opt{'cust_pkg'};
 my $countrydefault = $opt{'countrydefault'} || 'US';
 my $statedefault   = $opt{'statedefault'}
                      || ($countrydefault eq 'US' ? 'CA' : '');
 
-my $loc = $cust_pkg->cust_location_or_main;
-
-sub pkg_change_location_link {
-  my $cust_pkg = shift;
-  my $pkgpart = $cust_pkg->pkgpart;
-  include( '/elements/popup_link-cust_pkg.html',
-    'action'      => $p. "misc/change_pkg.cgi?locationnum=-1;pkgpart=$pkgpart;".
-                     "address1=;address2=;city=;county=;state=$statedefault;".
-                     "zip=;country=$countrydefault",
-    'label'       => 'Change&nbsp;location',
-    'actionlabel' => 'Change',
-    'cust_pkg'    => $cust_pkg,
-  );
-}
-
-sub edit_location_link {
-  my $locationnum = shift;
-  include( '/elements/popup_link.html',
-    'action'      => $p. "edit/cust_location.cgi?locationnum=$locationnum",
-    'label'       => 'Edit&nbsp;location',
-    'actionlabel' => 'Edit',
-  );
-}
+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>