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

diff --git a/httemplate/view/cust_main/packages/location.html b/httemplate/view/cust_main/packages/location.html
index db67d45b9..b855e6a74 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 ) {
         <DIV STYLE="font-style: italic; font-size: small">
 %     }
@@ -12,31 +12,36 @@
                                'double_space'    => ' &nbsp; ',
                                'escape_function' => \&encode_entities,
                                'countrydefault'  => $countrydefault,
+                               'cust_main'       => $opt{'cust_main'},
                              )
       %>
 
 %     if ( $loc->latitude && $loc->longitude ) {
           <BR>
           <FONT SIZE=-1>
-          <% $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,
+          <!-- <% $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->censustract ) {
-         <BR>
-         <FONT SIZE=-1>
-         <% $loc->censustract %> (<% $loc->censusyear %> census)
-         </FONT>
-%     } elsif ( $conf->exists('cust_main-require_censustract') ) {
-          <BR>
-          <FONT SIZE=-1 COLOR="#ee3300">
-          <% emt('Census tract unknown') %>
-          </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 ( $default ) {
@@ -45,26 +50,11 @@
 %   } # all of this is hidden if packages are grouped by location, because
 %     # it's in the top banner
 
-%   if ( ! $cust_pkg->get('cancel')
-%      && $FS::CurrentUser::CurrentUser->access_right('Change customer package')
-%     )
-%   {
-  <BR>
-  <FONT SIZE=-1>
-%     unless ( $opt{no_links} or $opt{'change_from'} ) {
-      (&nbsp;<%pkg_change_location_link($cust_pkg)%>&nbsp;)
-%     }
-%     if ( $cust_pkg->locationnum && ! $opt{no_links} ) {
-        (&nbsp;<%pkg_edit_location_link($cust_pkg->locationnum)%>&nbsp;)
-%     }
-  </FONT>
-%   } 
 % } # 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 $cust_pkg       = $opt{'cust_pkg'};
@@ -72,34 +62,8 @@ 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;
 
-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'       => emt('Change location'),
-    'actionlabel' => emt('Change'),
-    'cust_pkg'    => $cust_pkg,
-    'width'       => 960,
-    'height'      => 490,
-  );
-}
-
-sub pkg_edit_location_link {
-  my $locationnum = shift;
-  include( '/elements/popup_link.html',
-    'action'      => $p. "edit/cust_location.cgi?locationnum=$locationnum",
-    'label'       => emt('Edit location'),
-    'actionlabel' => emt('Edit'),
-    'width'       => 700,
-    'height'      => 355,
-   );
-}
-
 </%init>