add ability to search on ranges of charged, owed to adv. invoice report, RT#6407

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

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index a3609a2..7ddb3f0 100755 (executable)
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -23,20 +23,8 @@ sub format_time {
 sub timelast {
   my( $svc_acct, $last, $permonth ) = @_;
 
-  #some false laziness w/search/rt_transaction.html
-
-  my $transactiontime = "
-    CASE transactions.type when 'Set'
-      THEN (  to_number(newvalue, '999999')
-            - to_number(oldvalue, '999999')
-           ) * 60
-      ELSE timetaken*60
-    END
-  ";
-
-  #Transactions
   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 = ? 
@@ -51,7 +39,8 @@ sub timelast {
 
   my $seconds = $sth->fetchrow_arrayref->[0];
 
-  my $return = (($seconds < 0) ? '-' : '') . concise(duration($seconds));
+  #my $return = (($seconds < 0) ? '-' : '') . concise(duration($seconds));
+  my $return = (($seconds < 0) ? '-' : '') . format_time($seconds);
 
   $return .= sprintf(' (%.2fx)', $seconds / $permonth ) if $permonth;
 
@@ -95,6 +84,9 @@ if ( $cgi->param('domain') ) {
     push @extra_sql, 'domsvc = '. $svc_domain->svcnum;
   }
 }
+if ( $cgi->param('domsvc') =~ /^(\d+)$/ ) { 
+  push @extra_sql, "domsvc = $1";
+}
 
 my $timepermonth = '';
 
@@ -132,16 +124,22 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
           my $seconds = $svc_acct->seconds;
           my $cust_pkg = $svc_acct->cust_svc->cust_pkg;
           my $part_pkg = $cust_pkg->part_pkg;
+
           #my $timepermonth = $part_pkg->option('seconds');
           $timepermonth = $part_pkg->option('seconds');
           $timepermonth = $timepermonth / $part_pkg->freq
             if $part_pkg->freq =~ /^\d+$/ && $part_pkg->freq != 0;
-          return format_time($seconds) unless $timepermonth;
+
           #my $recur = $part_pkg->calc_recur($cust_pkg);
           my $recur = $part_pkg->base_recur($cust_pkg);
+
+          return format_time($seconds) unless $timepermonth && $recur;
+
           my $balance = $cust_pkg->cust_main->balance;
-          my $months_unpaid = $balance / $recur;
-          my $time_unpaid = $months_unpaid * $timepermonth;
+          my $periods_unpaid = $balance / $recur;
+          my $time_unpaid = $periods_unpaid * $timepermonth;
+          $time_unpaid *= $part_pkg->freq
+            if $part_pkg->freq =~ /^\d+$/ && $part_pkg->freq != 0;
           format_time($seconds-$time_unpaid).
             sprintf(' (%.2fx monthly)', ( $seconds-$time_unpaid ) / $timepermonth );
         },
@@ -167,6 +165,42 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
     $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)";
@@ -218,10 +252,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();