X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_bill.cgi;h=6e5d20100d14b64ffd0fdf13916f500a1ba6a560;hp=6d00593bdea1a6ba14dc3c1ed0fced4024ef4c2e;hb=cec3bd39647288b37e32d63ff17c54917ebfe72f;hpb=012523fcc0f3bc9994a429eb96b32eab6b3c04ce

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 6d00593bd..6e5d20100 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -21,49 +21,64 @@ if ( $cgi->keywords ) {
                       - ( select coalesce(sum(amount),0) from cust_credit_bill
                           where cust_credit_bill.invnum = cust_bill.invnum )";
   my @where;
-  if ( $query eq 'invnum' ) {
-    $sortby = \*invnum_sort;
-    #@cust_bill = qsearch('cust_bill', {} );
-  } elsif ( $query eq 'date' ) {
-    $sortby = \*date_sort;
-    #@cust_bill = qsearch('cust_bill', {} );
-  } elsif ( $query eq 'custnum' ) {
-    $sortby = \*custnum_sort;
-    #@cust_bill = qsearch('cust_bill', {} );
-  } elsif ( $query eq 'OPEN_invnum' ) {
-    $sortby = \*invnum_sort;
-    #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
-    push @where, "0 != $owed";
-  } elsif ( $query eq 'OPEN_date' ) {
-    $sortby = \*date_sort;
-    #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
-    push @where, "0 != $owed";
-  } elsif ( $query eq 'OPEN_custnum' ) {
-    $sortby = \*custnum_sort;
-    #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
-    push @where, "0 != $owed";
-  } elsif ( $query =~ /^OPEN(\d+)_invnum$/ ) {
-    my $open = $1 * 86400;
-    $sortby = \*invnum_sort;
-    #@cust_bill =
-    #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
-    push @where, "0 != $owed".
-                 "cust_bill._date < ". (time-$open);
-  } elsif ( $query =~ /^OPEN(\d+)_date$/ ) {
-    my $open = $1 * 86400;
-    $sortby = \*date_sort;
-    #@cust_bill =
-    #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
-    push @where, "0 != $owed".
-                 "cust_bill._date < ". (time-$open);
-
-  } elsif ( $query =~ /^OPEN(\d+)_custnum$/ ) {
-    my $open = $1 * 86400;
-    $sortby = \*custnum_sort;
-    #@cust_bill =
-    #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
-    push @where, "0 != $owed".
-                 "cust_bill._date < ". (time-$open);
+  if ( $query =~ /^(OPEN(\d*)_)?(invnum|date|custnum)$/ ) {
+    my($open, $days, $field) = ($1, $2, $3);
+    $field = "_date" if $field eq 'date';
+    $orderby = "ORDER BY cust_bill.$field";
+    push @where, "0 != $owed" if $open;
+    push @where, "cust_bill._date < ". (time-86400*days) if $days;
+#  if ( $query eq 'invnum' ) {
+#    $sortby = \*invnum_sort;
+#    $orderby = "ORDER BY cust_bill.invnum";
+#    #@cust_bill = qsearch('cust_bill', {} );
+#  } elsif ( $query eq 'date' ) {
+#    $sortby = \*date_sort;
+#    $orderby = "ORDER BY cust_bill._date";
+#    #@cust_bill = qsearch('cust_bill', {} );
+#  } elsif ( $query eq 'custnum' ) {
+#    $sortby = \*custnum_sort;
+#    $orderby = "ORDER BY cust_bill.custnum";
+#    #@cust_bill = qsearch('cust_bill', {} );
+#  } elsif ( $query eq 'OPEN_invnum' ) {
+#    $sortby = \*invnum_sort;
+#    $orderby = "ORDER BY cust_bill.invnum";
+#    #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+#    push @where, "0 != $owed";
+#  } elsif ( $query eq 'OPEN_date' ) {
+#    $sortby = \*date_sort;
+#    $orderby = "ORDER BY cust_bill._date";
+#    #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+#    push @where, "0 != $owed";
+#  } elsif ( $query eq 'OPEN_custnum' ) {
+#    $sortby = \*custnum_sort;
+#    $orderby = "ORDER BY cust_bill.custnum";
+#    #@cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+#    push @where, "0 != $owed";
+#  } elsif ( $query =~ /^OPEN(\d+)_invnum$/ ) {
+#    my $open = $1 * 86400;
+#    $sortby = \*invnum_sort;
+#    $orderby = "ORDER BY cust_bill.invnum";
+#    #@cust_bill =
+#    #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+#    push @where, "0 != $owed",
+#                 "cust_bill._date < ". (time-$open);
+#  } elsif ( $query =~ /^OPEN(\d+)_date$/ ) {
+#    my $open = $1 * 86400;
+#    $sortby = \*date_sort;
+#    $orderby = "ORDER BY cust_bill._date";
+#    #@cust_bill =
+#    #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+#    push @where, "0 != $owed",
+#                 "cust_bill._date < ". (time-$open);
+#
+#  } elsif ( $query =~ /^OPEN(\d+)_custnum$/ ) {
+#    my $open = $1 * 86400;
+#    $sortby = \*custnum_sort;
+#    $orderby = "ORDER BY cust_bill.custnum";
+#    #@cust_bill =
+#    #  grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+#    push @where, "0 != $owed",
+#                 "cust_bill._date < ". (time-$open);
   } else {
     die "unknown query string $query";
   }
@@ -136,7 +151,11 @@ if ( $total == 1 ) {
 
   print header("Invoice Search Results", menubar(
           'Main Menu', popurl(2)
-        )), "$total matching invoices found<BR><BR>$pager", &table(), <<END;
+        )).
+        "$total matching invoices found<BR>".
+        "\$$tot_balance total balance<BR>".
+        "\$$tot_amount total amount<BR>".
+        "<BR>$pager". table(). <<END;
       <TR>
         <TH></TH>
         <TH>Balance</TH>
@@ -148,7 +167,6 @@ if ( $total == 1 ) {
 END
 
   my(%saw, $cust_bill);
-#  my($tot_balance, $tot_amount) = (0, 0); #BOGUS
   foreach $cust_bill (
     sort $sortby grep(!$saw{$_->invnum}++, @cust_bill)
   ) {
@@ -160,9 +178,6 @@ END
     );
     my $pdate = time2str("%b %d %Y", $date);
 
-    #$tot_balance += $owed;
-    #$tot_amount += $charged;
-
     my $rowspan = 1;
 
     my $view = popurl(2). "view/cust_bill.cgi?$invnum";
@@ -195,10 +210,10 @@ END
   }
   $tot_balance = sprintf("%.2f", $tot_balance);
   $tot_amount = sprintf("%.2f", $tot_amount);
-  print <<END;
-      <TR><TD></TD><TH><FONT SIZE=-1>Total</FONT></TH><TH><FONT SIZE=-1>Total</FONT></TH></TR>
+  print "</TABLE>$pager<BR>". table(). <<END;
+      <TR><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TH><FONT SIZE=-1>Total<BR>Balance</FONT></TH><TH><FONT SIZE=-1>Total<BR>Amount</FONT></TH></TR>
       <TR><TD></TD><TD ALIGN="right"><FONT SIZE=-1>\$$tot_balance</FONT></TD><TD ALIGN="right"><FONT SIZE=-1>\$$tot_amount</FONT></TD></TD></TR>
-    </TABLE>$pager
+    </TABLE>
   </BODY>
 </HTML>
 END