X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fview%2Fcust_main%2Fpackages.html;h=811ac3c986c0169d4e27498911c0769e7fa87203;hb=2bbfc3379be19a01094d55ac6ba53a1360f1797f;hp=9b1d5b317a064beb8e146e4b996f274c6b60968b;hpb=3b5ccffae54e59c012eb1ebb348207510ca1d5ce;p=freeside.git

diff --git a/httemplate/view/cust_main/packages.html b/httemplate/view/cust_main/packages.html
index 9b1d5b317..811ac3c98 100755
--- a/httemplate/view/cust_main/packages.html
+++ b/httemplate/view/cust_main/packages.html
@@ -1,18 +1,7 @@
-<A NAME="cust_pkg"><FONT SIZE="+2">Packages</FONT></A><BR>
-
 % my $s = 0;
 % if ( $curuser->access_right('Order customer package') ) { 
   <% $s++ ? ' | ' : '' %>
-  <% include( '/elements/popup_link-cust_main.html',
-                'action'      => $p. 'misc/order_pkg.html',
-                'label'       => 'Order&nbsp;new&nbsp;package',
-                'actionlabel' => 'Order new package',
-                'color'       => '#333399',
-                'cust_main'   => $cust_main,
-                'closetext'   => 'Close',
-                'width'       => 763,
-            )
-  %>
+  <% include('order_pkg_link.html', $cust_main) %>
 % } 
 
 % if ( $curuser->access_right('One-time charge')
@@ -27,8 +16,12 @@
   <A HREF="<% $p %>edit/cust_pkg.cgi?<% $cust_main->custnum %>">Bulk order and cancel packages</A> (preserves services)
 % } 
 
-
 <BR><BR>
+
+<TABLE>
+  <TR>
+    <TD ALIGN="left">
+
 % if ( @$packages ) {
 
 Current packages
@@ -40,15 +33,14 @@ Current packages
 %             )
 %        )
 %     {
+%       my $prev = $cgi->param('showcancelledpackages');
 %       $cgi->param('showcancelledpackages', 1);
-%
-
   ( <a href="<% $cgi->self_url %>">show
+%       $cgi->param('showcancelledpackages', $prev);
 %   } else {
 %       $cgi->param('showcancelledpackages', 0);
-%
-
   ( <a href="<% $cgi->self_url %>">hide
+%       $cgi->param('showcancelledpackages', 1);
 %   } 
 
  cancelled packages</a> )
@@ -60,6 +52,18 @@ Current packages
 %   $cgi->param('showoldpackages', 0);
     ( <a href="<% $cgi->self_url %>">hide old packages</a> )
 % }
+
+    </TD>
+    <TD ALIGN="right">
+      <A HREF="<%$p%>search/report_cust_pkg.html?custnum=<% $cust_main->custnum %>">Package reports</A><BR>
+      Service reports:
+        <A HREF="<%$p%>search/report_svc_acct.html?custnum=<% $cust_main->custnum %>">accounts</A>
+    </TD>
+  </TR>
+
+  <TR>
+    <TD COLSPAN=2>
+
 % if ( @$packages ) { 
 
 <% include('/elements/table-grid.html') %>
@@ -76,7 +80,7 @@ Current packages
   <TH CLASS="grid" BGCOLOR="#cccccc">Services</TH>
 </TR>
 
-% my %part_pkg = ();
+% #$FS::cust_pkg::DEBUG = 2;
 % foreach my $cust_pkg (@$packages) {
 %
 %   if ( $bgcolor eq $bgcolor1 ) {
@@ -85,18 +89,13 @@ Current packages
 %     $bgcolor = $bgcolor1;
 %   }
 %
-%   $part_pkg{$cust_pkg->pkgpart} ||= $cust_pkg->part_pkg;
-%   $cust_pkg->{'_pkgpart'} ||= $part_pkg{$cust_pkg->pkgpart}; #XXX cache kludge
-%
 %   my %iopt = (
 %     'bgcolor'  => $bgcolor,
 %     'cust_pkg' => $cust_pkg,
-%     'part_pkg' => $part_pkg{$cust_pkg->pkgpart},
+%     'part_pkg' => $cust_pkg->part_pkg,
 %     %conf_opt,
 %   );
 %
-%   my $oldDEBUG = $FS::cust_pkg::DEBUG;
-%   $FS::cust_pkg::DEBUG = 2;
 
     <!--pkgnum: <% $cust_pkg->pkgnum %>-->
     <TR>
@@ -108,8 +107,6 @@ Current packages
       <% include('packages/services.html', %iopt) %>
     </TR>
 
-%   $FS::cust_pkg::DEBUG = $oldDEBUG;
-
 % }
 
 </TABLE>
@@ -118,6 +115,10 @@ Current packages
 <BR>
 % } 
 
+    </TD>
+  </TR>
+</TABLE>
+
 % if ( $cgi->param('fragment') =~ /^cust_pkg(\d+)$/ ) {
   <SCRIPT>
     // IE-specific hack.  other browsers listen to #fragments
@@ -147,6 +148,9 @@ my %conf_opt = (
 
   #for status.html
   'cust_pkg-show_autosuspend' => $conf->exists('cust_pkg-show_autosuspend'),
+  #for status.html pkg-balances
+  'pkg-balances'              => $conf->exists('pkg-balances'),
+  'money_char'                => ( $conf->config('money_char') || '$' ),
 
   #for location.html
   'countrydefault'            => $countrydefault,
@@ -155,6 +159,8 @@ my %conf_opt = (
   #for services.html
   'svc_external-skip_manual'  => $conf->exists('svc_external-skip_manual'),
   'legacy_link'               => $conf->exists('legacy_link'),
+  'svc_broadband-manage_link' => scalar($conf->config('svc_broadband-manage_link')),
+  'maestro-status_test'       => $conf->exists('maestro-status_test'),
 );
 
 #subroutines
@@ -174,20 +180,44 @@ sub get_packages {
     $method = 'all_pkgs';
   }
 
-  my @packages = $cust_main->$method();
+  my $cust_pkg_fields =
+    join(', ', map { "cust_pkg.$_ AS $_"          } fields('cust_pkg') );
+
+  my $part_pkg_fields =
+    join(', ', map { "part_pkg.$_ AS part_pkg_$_" } fields('part_pkg') );
+
+  my $group_by =
+    join(', ', map "cust_pkg.$_", fields('cust_pkg') ). ', '.
+    join(', ', map "part_pkg.$_", fields('part_pkg') );
+
+  my $num_svcs = '( SELECT COUNT(*) FROM cust_svc '.
+                 '    WHERE cust_svc.pkgnum = cust_pkg.pkgnum ) AS num_svcs';
+
+  my @packages = $cust_main->$method( {
+    'select'    => "$cust_pkg_fields, $part_pkg_fields, $num_svcs",
+    'addl_from' => 'LEFT JOIN part_pkg USING ( pkgpart )',
+  } );
   my $num_old_packages = scalar(@packages);
 
+  foreach my $cust_pkg ( @packages ) {
+    my %hash = $cust_pkg->hash;
+    my %part_pkg = map  { /^part_pkg_(.+)$/ or die; ( $1 => $hash{$_} ); }
+                   grep { /^part_pkg_/ } keys %hash;
+    $cust_pkg->{'_pkgpart'} = new FS::part_pkg \%part_pkg;
+  }
+
   unless ( $cgi->param('showoldpackages') ) {
     my $years = $conf->config('cust_main-packages-years') || 2;
-    my $seconds = 31556926; #60*60*24*365.2422 is close enough
-    my $then = time - $seconds;
+    my $then = time - $years * 31556926; #60*60*24*365.2422 is close enough
 
     my %hide = ( 'cancelled'       => 'cancel',
                  'one-time charge' => 'setup',
                );
   
     @packages =
-      grep { !exists($hide{$_->status}) or $_->get($hide{$_->status}) > $then }
+      grep { !exists($hide{$_->status}) or $_->get($hide{$_->status}) > $then
+             or $_->num_svcs #don't hide packages w/services
+           }
            @packages;
   }