fix top subtotals on refund reports

[freeside.git] / httemplate / search / elements / grouped-search / html

diff --git a/httemplate/search/elements/grouped-search/html b/httemplate/search/elements/grouped-search/html
index df1471a..cb9c96c 100644 (file)
--- a/httemplate/search/elements/grouped-search/html
+++ b/httemplate/search/elements/grouped-search/html
@@ -5,14 +5,16 @@ my $conf = FS::Conf->new;
 my %opt = @_;
 $opt{'name'} ||= PL($opt{'name_singular'});
 
+my $amount_field = $opt{amount_field};
+
 my $group_info = $m->comp('core', %opt);
 
 my $redirect;
 
 if ( $group_info->{num} == 0 ) {
   $redirect = $opt{'redirect_empty'};
+  $redirect = &$redirect($cgi) if $redirect && ref($redirect) eq 'CODE';
   if ($redirect) {
-    $redirect = &$redirect($cgi) if ref($redirect) eq 'CODE';
     redirect( $redirect );
   } else { # just print this stuff and exit
     $m->comp('/elements/header.html', $opt{'title'});
@@ -34,7 +36,7 @@ my $footer = $group_info->{group_footers}[$curr_group];
 my $total_footer =  $group_info->{total_footer} || [];
 # pagination
 my ($limit, $offset);
-my $maxrecords = $conf->config('maxsearchrecordsperpage') || 50;
+my $maxrecords = $conf->config('maxsearchrecordsperpage') || 100;
 if ( $cgi->param('maxrecords') =~ /^(\d+)$/ ) {
   $maxrecords = $1;
 }
@@ -67,8 +69,10 @@ if ( $group->num_rows > scalar(@rows) ) {
 
 # set up tab bar
 my @menubar;
-for (my $i = 0; $i < $group_info->{num}; $i++) {
-  push @menubar, $group_info->{group_labels}[$i], ";group=$i";
+if ($group_info->{num} > 1) {
+  for (my $i = 0; $i < $group_info->{num}; $i++) {
+    push @menubar, $group_info->{group_labels}[$i], ";group=$i";
+  }
 }
 
 # not enabled yet; if we need this at some point, enable it on a per-report
@@ -88,6 +92,8 @@ for (my $i = 0; $i < $group_info->{num}; $i++) {
 #  }
 #}
 
+my $conf = FS::Conf->new;
+my $money = $conf->config('money_char') || '$';
 </%init>
 
 <& /elements/header.html, $opt{title} &>
@@ -104,14 +110,22 @@ for (my $i = 0; $i < $group_info->{num}; $i++) {
 &>
 
 <DIV CLASS="fstabcontainer">
+% if ( $group->num_rows > 0 ) {
+<P><% emt('[quant,_1,_2]', $group->num_rows, $opt{name_singular}) %> for <% emt($money.$group->$amount_field()) %>
+</P>
 %# download links
-<P><% emt('Download full results') %><BR>
+<P><% emt('Download results:') %>
 % $cgi->param('type', 'xls');
-<A HREF="<% $cgi->self_url %>"><% emt('as Excel spreadsheet') %></A><BR>
+<A HREF="<% $cgi->self_url %>"><% emt('Spreadsheet') %></A> | 
 % $cgi->param('type', 'html-print');
-<A HREF="<% $cgi->self_url %>"><% emt('as printable copy') %></A><BR>
+<A HREF="<% $cgi->self_url %>"><% emt('webpage') %></A>
+% if ( ref($query) && $query->{table} eq 'cust_pay' ) {
+%   $cgi->param('type', 'deposit_slip');
+    | <A HREF="<% $cgi->self_url %>"><% emt('deposit slip') %></A>
+% }
 % $cgi->delete('type');
 </P>
+% }
 
 <% $pager %>