X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fsvc_acct.cgi;h=58764f8818dcd9f3ab0e56369f5bd8a041caae76;hb=c0c5709fb022b83a482d0b35f7094505766d5868;hp=c3ddd660bf9c202545af238878fb43f39fa64afb;hpb=b5c4237a34aef94976bc343c8d9e138664fc3984;p=freeside.git

diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi
index c3ddd660b..58764f881 100755
--- a/httemplate/search/svc_acct.cgi
+++ b/httemplate/search/svc_acct.cgi
@@ -1,6 +1,6 @@
-<% include( 'elements/search.html',
-                 'title'       => 'Account Search Results',
-                 'name'        => 'accounts',
+<& elements/svc_Common.html,
+                 'title'       => emt('Account Search Results'),
+                 'name'        => emt('accounts'),
                  'query'       => $sql_query,
                  'count_query' => $count_query,
                  'redirect'    => $link,
@@ -11,8 +11,11 @@
                  'color'       => \@color,
                  'style'       => \@style,
                  'footer'      => \@footer,
-             )
-%>
+                 'html_init'   => include('/elements/email-link.html',
+                                    'search_hash' => \%search_hash,
+                                    'table'       => 'svc_acct'
+                                  ),
+&>
 <%once>
 
 #false laziness w/ClientAPI/MyAccount.pm
@@ -83,7 +86,7 @@ if ( $conf->exists('report-showpasswords') #its a terrible idea
      && $curuser->access_right('List service passwords') #but if you insist...
    )
 {
-  push @header, 'Password';
+  push @header, emt('Password');
   push @fields, 'get_cleartext_password';
   push @links, $link;
   $align .= 'l';
@@ -91,7 +94,7 @@ if ( $conf->exists('report-showpasswords') #its a terrible idea
   push @style, '';
 }
 
-push @header, 'Real Name';
+push @header, emt('Real Name');
 push @fields, 'finger';
 push @links, $link;
 $align .= 'l';
@@ -100,7 +103,7 @@ push @style, '';
 
 #hide the UID, its much less useful these days
 if ( $cgi->param('show_uid') ) { #XXX add a checkbox
-  push @header, 'UID';
+  push @header, emt('UID');
   push @fields, 'uid';
   push @links, $link;
   $align .= 'l';
@@ -108,7 +111,7 @@ if ( $cgi->param('show_uid') ) { #XXX add a checkbox
   push @style, '';
 }
 
-push @header, 'Last Login';
+push @header, emt('Last Login');
 push @fields, 'last_login_text';
 push @links, $link;
 $align .= 'r';
@@ -120,6 +123,10 @@ for (qw( domain domsvc agentnum custnum popnum svcpart cust_fields )) {
   $search_hash{$_} = $cgi->param($_) if length($cgi->param($_));
 }
 
+for (qw( towernum sectornum )) {
+  $search_hash{$_} = [ $cgi->param($_) ] if $cgi->param($_);
+}
+
 my $timepermonth = '';
 
 my $orderby = 'ORDER BY svcnum';
@@ -140,12 +147,35 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
 
   if ( $sortby eq 'seconds' ) {
     my $tot_time = 0;
-    #push @header, 'Time remaining';
-    push @header, 'Time';
-    push @fields, sub { my $svc_acct = shift;
-                        $tot_time += $svc_acct->seconds;
-                        format_time($svc_acct->seconds);
-                      };
+    push @header, emt('Time');
+
+    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, '';
@@ -158,7 +188,7 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) {
     if ( $conf->exists('svc_acct-display_paid_time_remaining') ) {
       my $tot_paid_time = 0;
       my %tot = ( '30'=>0, '60'=>0, '90'=>0 );
-      push @header, 'Paid time', 'Last 30', 'Last 60', 'Last 90';
+      push @header, emt('Paid time'), emt('Last 30'), emt('Last 60'), emt('Last 90');
       push @fields,
         sub {
           my $svc_acct = shift;