X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fsvc_acct.cgi;h=e2abf5625fb348c37a8ba0db27771f51bdf9bd58;hb=40a7b3dc653e099f7bd0bd762b649b04c4432db2;hp=c2b3d8fa071e8dbf2b5f1787b57d2623d6d5f568;hpb=5e05724a635a22776f1b973f5d7e77989da4e048;p=freeside.git

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index c2b3d8fa0..e2abf5625 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -39,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;
 
@@ -63,6 +64,7 @@ my $link_cust = sub {
   }
 };
 
+my %search_hash = ();
 my @extra_sql = ();
 
 my @header = ( '#', 'Service', 'Account', 'UID', 'Last Login' );
@@ -72,16 +74,8 @@ my $align = 'rlllr';
 my @color = ( '', '', '', '', '' );
 my @style = ( '', '', '', '', '' );
 
-if ( $cgi->param('domain') ) { 
-  my $svc_domain =
-    qsearchs('svc_domain', { 'domain' => $cgi->param('domain') } );
-  unless ( $svc_domain ) {
-    #it would be nice if this looked more like the other "not found"
-    #errors, but this will do for now.
-    errorpage("Domain ". $cgi->param('domain'). " not found at all");
-  } else {
-    push @extra_sql, 'domsvc = '. $svc_domain->svcnum;
-  }
+for (qw( domain domsvc agentnum custnum popnum svcpart cust_fields )) {
+  $search_hash{$_} = $cgi->param($_) if length($cgi->param($_));
 }
 
 my $timepermonth = '';
@@ -89,7 +83,7 @@ my $timepermonth = '';
 my $orderby = 'ORDER BY svcnum';
 if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
 
-  push @extra_sql, 'pkgnum IS NULL'
+  $search_hash{'unlinked'} = 1
     if $cgi->param('magic') eq 'unlinked';
 
   my $sortby = '';
@@ -97,7 +91,7 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
     $sortby = $1;
     $sortby = "LOWER($sortby)"
       if $sortby eq 'username';
-    push @extra_sql, "$sortby IS NOT NULL"
+    push @extra_sql, "$sortby IS NOT NULL" #XXX search_hash
       if $sortby eq 'uid' || $sortby eq 'seconds' || $sortby eq 'last_login';
     $orderby = "ORDER BY $sortby";
   }
@@ -120,16 +114,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 );
         },
@@ -156,16 +156,11 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
   }
 
 } elsif ( $cgi->param('magic') =~ /^advanced$/ ) {
+
   $orderby = "";
 
-  if ( $cgi->param('agentnum') =~ /^(\d+)$/ and $1 ) {
-    push @extra_sql, "agentnum = $1";
-  }
+  $search_hash{'pkgpart'} = [ $cgi->param('pkgpart') ];
 
-  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);
@@ -191,11 +186,9 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
 
   $orderby ||= "ORDER BY svcnum";
 
-} elsif ( $cgi->param('popnum') =~ /^(\d+)$/ ) {
-  push @extra_sql, "popnum = $1";
+} elsif ( $cgi->param('popnum') ) {
   $orderby = "ORDER BY LOWER(username)";
-} elsif ( $cgi->param('svcpart') =~ /^(\d+)$/ ) {
-  push @extra_sql, "svcpart = $1";
+} elsif ( $cgi->param('svcpart') ) {
   $orderby = "ORDER BY uid";
   #$orderby = "ORDER BY svcnum";
 } else {
@@ -250,40 +243,10 @@ $align .= FS::UI::Web::cust_aligns();
 push @color, FS::UI::Web::cust_colors();
 push @style, FS::UI::Web::cust_styles();
 
-my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
-                ' LEFT JOIN part_svc  USING ( svcpart ) '.
-                ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
-                ' LEFT JOIN cust_main USING ( custnum ) ';
-
-#here is the agent virtualization
-push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql( 
-                   'null_right' => 'View/link unlinked services'
-                 );
-
-my $extra_sql = 
-  scalar(@extra_sql)
-    ? ' WHERE '. join(' AND ', @extra_sql )
-    : '';
-
-my $count_query = "SELECT COUNT(*) FROM svc_acct $addl_from $extra_sql";
-#if ( keys %svc_acct ) {
-#  $count_query .= ' WHERE '.
-#                    join(' AND ', map "$_ = ". dbh->quote($svc_acct{$_}),
-#                                      keys %svc_acct
-#                        );
-#}
-
-my $sql_query = {
-  'table' => 'svc_acct',
-  'hashref'   => {}, # \%svc_acct,
-  'select'    => join(', ',
-                    'svc_acct.*',
-                    'part_svc.svc',
-                    'cust_main.custnum',
-                    FS::UI::Web::cust_sql_fields(),
-                  ),
-  'extra_sql' => "$extra_sql $orderby",
-  'addl_from' => $addl_from,
-};
+$search_hash{'order_by'} = $orderby;
+$search_hash{'where'} = \@extra_sql;
+
+my $sql_query = FS::svc_acct->search(\%search_hash);
+my $count_query = delete($sql_query->{'count_query'});
 
 </%init>