X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fsvc_acct.cgi;h=7f423d521e6a7ed0581e2979df6d48dd036807a4;hp=b9e5a7cc960aa3c1dff6b468af02bad3085e28dd;hb=4639e25a658d9a0bf295415642fae8e8cdad846a;hpb=35b1ca7d644c773f4e0aebf6d8798c93f76a7cd8

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index b9e5a7cc9..7f423d521 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -59,6 +59,8 @@ my $curuser =  $FS::CurrentUser::CurrentUser;
 
 die "access denied" unless $curuser->access_right('List services');
 
+my %cust_pkg_cache;
+
 my $link      = [ "${p}view/svc_acct.cgi?",   'svcnum'  ];
 my $link_cust = sub {
   my $svc_acct = shift;
@@ -130,6 +132,7 @@ for (qw( towernum sectornum )) {
 my $timepermonth = '';
 
 my $orderby = 'ORDER BY svcnum';
+my $addl_from = '';
 if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
 
   $search_hash{'unlinked'} = 1
@@ -148,10 +151,34 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
   if ( $sortby eq 'seconds' ) {
     my $tot_time = 0;
     push @header, emt('Time');
-    push @fields, sub { my $svc_acct = shift;
-                        $tot_time += $svc_acct->seconds;
-                        format_time($svc_acct->seconds);
-                      };
+
+    if ( $conf->exists('svc_acct-display_paid_time_remaining') ) {
+      push @fields, sub { my $svc_acct = shift;
+                          my $seconds = $svc_acct->seconds;
+                          my $cust_pkg = $svc_acct->cust_svc->cust_pkg;
+                          my $part_pkg = $cust_pkg->part_pkg;
+
+                          $tot_time += $svc_acct->seconds;
+
+                          $timepermonth = $part_pkg->option('seconds');
+                          $timepermonth = $timepermonth / $part_pkg->freq
+                            if $part_pkg->freq =~ /^\d+$/ && $part_pkg->freq != 0;
+                          my $recur = $part_pkg->base_recur($cust_pkg);
+
+                          return format_time($seconds)
+                            unless $timepermonth && $recur;
+
+                          format_time($seconds).
+                            sprintf(' (%.2fx monthly)', $seconds / $timepermonth );
+
+                        };
+    } else {
+      push @fields, sub { my $svc_acct = shift;
+                          $tot_time += $svc_acct->seconds;
+                          format_time($svc_acct->seconds);
+                        };
+    }
+
     push @links, '';
     $align .= 'r';
     push @color, '';
@@ -227,6 +254,8 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
 
   $search_hash{'pkgpart'} = [ $cgi->param('pkgpart') ];
 
+  $search_hash{'svcpart'} = [ $cgi->param('svcpart') ];
+
   foreach my $field (qw( last_login last_logout )) {
 
     my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
@@ -257,6 +286,9 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
 } elsif ( $cgi->param('svcpart') ) {
   $orderby = "ORDER BY uid";
   #$orderby = "ORDER BY svcnum";
+  if ( defined($cgi->param('cancelled')) ) {
+    $search_hash{'cancelled'} = $cgi->param('cancelled') ? 1 : 0;
+  }
 } else {
   $orderby = "ORDER BY uid";
 
@@ -323,6 +355,22 @@ foreach my $pkg_field ( @pkg_fields ) {
   
 }
 
+push @header, emt('Pkg. Status');
+push @fields, sub {
+  $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+  return '' unless $cust_pkg_cache{$_[0]->svcnum};
+  $cust_pkg_cache{$_[0]->svcnum}->ucfirst_status;
+};
+push @links, '';
+$align .= 'r';
+push @color, sub {
+  $cust_pkg_cache{$_[0]->svcnum} ||= $_[0]->cust_svc->cust_pkg;
+  return '' unless $cust_pkg_cache{$_[0]->svcnum};
+  my $c = FS::cust_pkg::statuscolors;
+  $c->{$cust_pkg_cache{$_[0]->svcnum}->status };
+};
+push @style, 'b';
+
 push @header, FS::UI::Web::cust_header($cgi->param('cust_fields'));
 push @fields, \&FS::UI::Web::cust_fields,
 push @links, map { $_ ne 'Cust. Status' ? $link_cust : '' }
@@ -333,6 +381,7 @@ push @style, FS::UI::Web::cust_styles();
 
 $search_hash{'order_by'} = $orderby;
 $search_hash{'where'} = \@extra_sql;
+$search_hash{'addl_from'} = $addl_from;
 
 my $sql_query = FS::svc_acct->search(\%search_hash);
 my $count_query = delete($sql_query->{'count_query'});