on accounts overview: show time applied after multipliers, not actual time worked

[freeside.git] / httemplate / search / svc_acct.cgi

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index 2c42ef0..fb9ce8a 100755 (executable)
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -35,8 +35,10 @@ sub timelast {
   ";
 
   #Transactions
+#  my $sql = "
+#    SELECT SUM($transactiontime) FROM acct_rt_transaction
   my $sql = "
-    SELECT SUM($transactiontime) FROM acct_rt_transaction
+    SELECT SUM(support) FROM acct_rt_transaction
       LEFT JOIN Transactions
         ON Transactions.Id = acct_rt_transaction.transaction_id
     WHERE svcnum = ? 
@@ -77,12 +79,12 @@ my $link_cust = sub {
 
 my @extra_sql = ();
 
-my @header = ( '#', 'Service', 'Account', 'UID' );
-my @fields = ( 'svcnum', 'svc', 'email', 'uid' );
-my @links = ( $link, $link, $link, $link );
-my $align = 'rlll';
-my @color = ( '', '', '', '' );
-my @style = ( '', '', '', '' );
+my @header = ( '#', 'Service', 'Account', 'UID', 'Last Login' );
+my @fields = ( 'svcnum', 'svc', 'email', 'uid', 'last_login_text' );
+my @links = ( $link, $link, $link, $link, $link );
+my $align = 'rlllr';
+my @color = ( '', '', '', '', '' );
+my @style = ( '', '', '', '', '' );
 
 if ( $cgi->param('domain') ) { 
   my $svc_domain =
@@ -110,7 +112,7 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
     $sortby = "LOWER($sortby)"
       if $sortby eq 'username';
     push @extra_sql, "$sortby IS NOT NULL"
-      if $sortby eq 'uid' || $sortby eq 'seconds';
+      if $sortby eq 'uid' || $sortby eq 'seconds' || $sortby eq 'last_login';
     $orderby = "ORDER BY $sortby";
   }
 
@@ -157,6 +159,52 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
 
   }
 
+} elsif ( $cgi->param('magic') =~ /^nologin$/ ) {
+
+  if ( $cgi->param('sortby') =~ /^(\w+)$/ ) {
+    my $sortby = $1;
+    $sortby = "LOWER($sortby)"
+      if $sortby eq 'username';
+    push @extra_sql, "last_login IS NULL";
+    $orderby = "ORDER BY $sortby";
+  }
+
+} elsif ( $cgi->param('magic') =~ /^advanced$/ ) {
+  $orderby = "";
+
+  if ( $cgi->param('agentnum') =~ /^(\d+)$/ and $1 ) {
+    push @extra_sql, "agentnum = $1";
+  }
+
+  my $pkgpart = join (' OR cust_pkg.pkgpart=',
+                      grep {$_} map { /^(\d+)$/; } ($cgi->param('pkgpart')));
+  push @extra_sql,  '(cust_pkg.pkgpart=' . $pkgpart . ')' if $pkgpart;
+                      
+  foreach my $field (qw( last_login last_logout )) {
+
+    my($beginning, $ending) = FS::UI::Web::parse_beginning_ending($cgi, $field);
+
+    next if $beginning == 0 && $ending == 4294967295;
+
+    if ($cgi->param($field."_invert")) {
+      push @extra_sql,
+        "(svc_acct.$field IS NULL OR ".
+        "svc_acct.$field < $beginning AND ".
+        "svc_acct.$field > $ending)";
+    } else {
+      push @extra_sql,
+        "svc_acct.$field IS NOT NULL",
+        "svc_acct.$field >= $beginning",
+        "svc_acct.$field <= $ending";
+    }
+  
+    $orderby ||= "ORDER BY svc_acct.$field" .
+      ($cgi->param($field."_invert") ? ' DESC' : '');
+
+  }
+
+  $orderby ||= "ORDER BY svcnum";
+
 } elsif ( $cgi->param('popnum') =~ /^(\d+)$/ ) {
   push @extra_sql, "popnum = $1";
   $orderby = "ORDER BY LOWER(username)";
@@ -208,10 +256,10 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
 
 }
 
-push @header, FS::UI::Web::cust_header();
+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 : '' }
-                 FS::UI::Web::cust_header();
+                 FS::UI::Web::cust_header($cgi->param('cust_fields'));
 $align .= FS::UI::Web::cust_aligns();
 push @color, FS::UI::Web::cust_colors();
 push @style, FS::UI::Web::cust_styles();