X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_bill.cgi;h=d6492fe49e3cb2923931e3c03567267fe44bbd80;hb=d83a273f3ac71431f5b007bb83fb55d7c83eae5c;hp=dbe7e7dcdc455fd98aa6ba5bdcef6092ac0f52d6;hpb=73233cfa60984978f1593bf86c248c0bab3620a5;p=freeside.git
diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index dbe7e7dcd..d6492fe49 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -66,26 +66,38 @@ if ( $cgi->keywords ) {
} else {
die "unknown query string $query";
}
+
+ my $extra_sql = "
+ left outer join cust_bill_pay using ( invnum )
+ left outer join cust_credit_bill using ( invnum )
+ $where
+ group by ". join(', ', map "cust_bill.$_", fields('cust_bill') ). ' '.
+ $having;
+
+ my $statement = "SELECT COUNT(*) FROM cust_bill $extra_sql";
+ my $sth = dbh->prepare($statement) or die dbh->errstr. " doing $statement";
+ $sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
+
+ $total = $sth->fetchrow_arrayref->[0];
+
@cust_bill = qsearch(
'cust_bill',
{},
'cust_bill.*,
charged - coalesce(sum(cust_bill_pay.amount),0)
- coalesce(sum(cust_credit_bill.amount),0) as owed',
- "left outer join cust_bill_pay using ( invnum )
- left outer join cust_credit_bill using ( invnum )
- $where
- group by ". join(', ', map "cust_bill.$_", fields('cust_bill') ). ' '.
- $having
+ "$extra_sql $orderby $limit"
);
} else {
$cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
my $invnum = $2;
@cust_bill = qsearchs('cust_bill', { 'invnum' => $invnum } );
$sortby = \*invnum_sort;
+ $total = scalar(@cust_bill);
}
-if ( scalar(@cust_bill) == 1 ) {
+#if ( scalar(@cust_bill) == 1 ) {
+if ( $total == 1 ) {
my $invnum = $cust_bill[0]->invnum;
print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum"); #redirect
} elsif ( scalar(@cust_bill) == 0 ) {
@@ -97,10 +109,38 @@ if ( scalar(@cust_bill) == 1 ) {
%>
<%
- $total = scalar(@cust_bill);
+ #$total = scalar(@cust_bill);
+
+ #begin pager
+ my $pager = '';
+ if ( $total != scalar(@cust_bill) && $maxrecords ) {
+ unless ( $offset == 0 ) {
+ $cgi->param('offset', $offset - $maxrecords);
+ $pager .= 'Previous ';
+ }
+ my $poff;
+ my $page;
+ for ( $poff = 0; $poff < $total; $poff += $maxrecords ) {
+ $page++;
+ if ( $offset == $poff ) {
+ $pager .= qq!$page !;
+ } else {
+ $cgi->param('offset', $poff);
+ $pager .= qq!$page !;
+ }
+ }
+ unless ( $offset + $maxrecords > $total ) {
+ $cgi->param('offset', $offset + $maxrecords);
+ $pager .= 'Next ';
+ }
+ }
+ #end pager
+
print header("Invoice Search Results", menubar(
'Main Menu', popurl(2)
- )), "$total matching invoices found
", &table(), <
$pager", &table(), <
|
Balance |
@@ -112,7 +152,7 @@ if ( scalar(@cust_bill) == 1 ) {
END
my(%saw, $cust_bill);
- my($tot_balance, $tot_amount) = (0, 0);
+ my($tot_balance, $tot_amount) = (0, 0); #BOGUS
foreach $cust_bill (
sort $sortby grep(!$saw{$_->invnum}++, @cust_bill)
) {
@@ -162,7 +202,7 @@ END
print < | Total | Total |
| \$$tot_balance | \$$tot_amount |
-
+ $pager