fix unapplied payment report, RT#73048, fallout from #25944

[freeside.git] / httemplate / search / prepay_credit.html

diff --git a/httemplate/search/prepay_credit.html b/httemplate/search/prepay_credit.html
index dff8a3d..7566e65 100644 (file)
--- a/httemplate/search/prepay_credit.html
+++ b/httemplate/search/prepay_credit.html
@@ -1,20 +1,7 @@
-%
-%my $agent = '';
-%my $hashref = {};
-%if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
-%  $hashref->{agentnum} = $1;
-%  $agent = qsearchs('agent', { 'agentnum' => $1 } );
-%}
-%
-%my $count_query = 'SELECT COUNT(*) FROM prepay_credit';
-%$count_query .= ' WHERE agentnum = '. $agent->agentnum if $agent;
-%
-%
-<% include( 'elements/search.html',
+<& elements/search.html,
                  'title'       => 'Unused Prepaid Cards'.
                                   ($agent ? ' for '. $agent->agent : ''),
                  'menubar'     => [
-                   'Main menu'      => $p,
                    'Generate cards' => $p.'edit/prepay_credit.cgi',
                  ],
                  'name'        => 'prepaid cards',
@@ -23,11 +10,28 @@
                                   },
                  'count_query' => $count_query,
                  #'redirect'    => $link,
-                 'header'      => [ '#', qw(Amount Time Agent) ],
+                 'header'      => [ '#', qw(Amount Time Upload Download Total Agent) ],
                  'fields'      => [
                    'identifier',
                    sub { sprintf('$%.2f', shift->amount ) },
-                   sub { my $c = shift; $c ? duration_exact($c->seconds) : '' },
+                   sub { my $c = shift;
+                         $c->seconds ? duration_exact($c->seconds) : ''
+                       },
+                   sub { my $c = shift;
+                         $c->upbytes 
+                           ? FS::UI::bytecount::bytecount_unexact($c->upbytes)
+                           : ''
+                       },
+                   sub { my $c = shift;
+                         $c->downbytes
+                           ? FS::UI::bytecount::bytecount_unexact($c->downbytes)
+                           : ''
+                       },
+                   sub { my $c = shift;
+                         $c->totalbytes
+                           ? FS::UI::bytecount::bytecount_unexact($c->totalbytes)
+                           : ''
+                       },
                    sub { my $agent = shift->agent;
                          $agent ? $agent->agent : '';
                        },
@@ -36,9 +40,28 @@
                    '',
                    '',
                    '',
+                   '',
+                   '',
+                   '',
                    sub { my $agent = shift->agent;
-                         $agent ? [ "${p}view/agent.cgi?", 'agentnum' ] : '';
+                         $agent ? [ "${p}edit/agent.cgi?", 'agentnum' ] : '';
                        },
                  ],
-      )
-%>
+      
+&>
+<%init>
+
+die "access denied"
+  unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
+
+my $agent = '';
+my $hashref = {};
+if ( $cgi->param('agentnum') =~ /^(\d+)$/ ) {
+$hashref->{agentnum} = $1;
+$agent = qsearchs('agent', { 'agentnum' => $1 } );
+}
+
+my $count_query = 'SELECT COUNT(*) FROM prepay_credit';
+$count_query .= ' WHERE agentnum = '. $agent->agentnum if $agent;
+
+</%init>