X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_bill.cgi;h=5b0538ca3bdb06dd945082efdc1aaa2049a554f7;hp=89c91f576f7e8da3a1203c5927db84a5fe5795b9;hb=6e0b2d0a94827df55364a45fe1d1ba8928c5d659;hpb=e96628dfc2204658ed879e2858d4f49bd6b1d0f2

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 89c91f576..5b0538ca3 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -11,9 +11,9 @@ $limit .= "LIMIT $maxrecords" if $maxrecords;
 my $offset = $cgi->param('offset') || 0;
 $limit .= " OFFSET $offset" if $offset;
 
-my $total;
+my($total, $tot_amount, $tot_balance);
 
-my(@cust_bill, $sortby);
+my(@cust_bill);
 if ( $cgi->keywords ) {
   my($query) = $cgi->keywords;
   my $owed = "charged - ( select coalesce(sum(amount),0) from cust_bill_pay
@@ -27,58 +27,6 @@ if ( $cgi->keywords ) {
     $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";
   }
@@ -90,7 +38,6 @@ if ( $cgi->keywords ) {
   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];
   ( $total, $tot_amount, $tot_balance ) = @{$sth->fetchrow_arrayref};
 
   @cust_bill = qsearch(
@@ -103,7 +50,6 @@ if ( $cgi->keywords ) {
   $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
   my $invnum = $2;
   @cust_bill = qsearchs('cust_bill', { 'invnum' => $invnum } );
-#  $sortby = \*invnum_sort;
   $total = scalar(@cust_bill);
 }
 
@@ -120,7 +66,6 @@ if ( $total == 1 ) {
 %>
 <!-- mason kludge -->
 <%
-  #$total = scalar(@cust_bill);
 
   #begin pager
   my $pager = '';
@@ -166,10 +111,6 @@ if ( $total == 1 ) {
       </TR>
 END
 
-#  my(%saw, $cust_bill);
-#  foreach $cust_bill (
-#    sort $sortby grep(!$saw{$_->invnum}++, @cust_bill)
-#  ) {
   foreach my $cust_bill ( @cust_bill ) {
     my($invnum, $owed, $charged, $date ) = (
       $cust_bill->invnum,
@@ -184,10 +125,10 @@ END
     my $view = popurl(2). "view/cust_bill.cgi?$invnum";
     print <<END;
       <TR>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$invnum</FONT></A></TD>
-        <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view"><FONT SIZE=-1>\$$owed</FONT></A></TD>
-        <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view"><FONT SIZE=-1>\$$charged</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$pdate</FONT></A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$view">$invnum</A></TD>
+        <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view">\$$owed</A></TD>
+        <TD ROWSPAN=$rowspan ALIGN="right"><A HREF="$view">\$$charged</A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$view">$pdate</A></TD>
 END
     my $custnum = $cust_bill->custnum;
     my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
@@ -198,8 +139,8 @@ END
         $cust_main->company,
       );
       print <<END;
-        <TD ROWSPAN=$rowspan><A HREF="$cview"><FONT SIZE=-1>$name</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$cview"><FONT SIZE=-1>$company</FONT></A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$cview">$name</A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="$cview">$company</A></TD>
 END
     } else {
       print <<END
@@ -212,8 +153,8 @@ END
   $tot_balance = sprintf("%.2f", $tot_balance);
   $tot_amount = sprintf("%.2f", $tot_amount);
   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>
+      <TR><TD>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD><TH>Total<BR>Balance</TH><TH>Total<BR>Amount</TH></TR>
+      <TR><TD></TD><TD ALIGN="right">\$$tot_balance</TD><TD ALIGN="right">\$$tot_amount</TD></TD></TR>
     </TABLE>
   </BODY>
 </HTML>
@@ -221,17 +162,4 @@ END
 
 }
 
-#
-
-sub invnum_sort {
-  $a->invnum <=> $b->invnum;
-}
-
-sub custnum_sort {
-  $a->custnum <=> $b->custnum || $a->invnum <=> $b->invnum;
-}
-
-sub date_sort {
-  $a->_date <=> $b->_date || $a->invnum <=> $b->invnum;
-}
 %>