X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_bill.cgi;h=d83851804eaa49fa4994a6b9fe20d00fe67f1013;hb=12fca9ac80c2b0444a7916506f6e2a8fa98bc24d;hp=5550b5513b898e29c4ee4127d145b38d3ead5de1;hpb=51984ac3d3da3006809c6866fdecd4ad83610731;p=freeside.git

diff --git a/httemplate/search/cust_bill.cgi b/httemplate/search/cust_bill.cgi
index 5550b5513..d83851804 100755
--- a/httemplate/search/cust_bill.cgi
+++ b/httemplate/search/cust_bill.cgi
@@ -1,52 +1,6 @@
 <%
-#
-# $Id: cust_bill.cgi,v 1.1 2001-07-30 07:36:04 ivan Exp $
-#
-# Usage: post form to:
-#        http://server.name/path/cust_bill.cgi
-#
-# ivan@voicenet.com 97-apr-4
-#
-# Changes to allow page to work at a relative position in server
-#       bmccane@maxbaud.net     98-apr-3
-#
-# $Log: cust_bill.cgi,v $
-# Revision 1.1  2001-07-30 07:36:04  ivan
-# templates!!!
-#
-# Revision 1.6  2001/04/22 01:38:39  ivan
-# svc_domain needs to import dbh sub from Record
-# view/cust_main.cgi needs to use ->owed method, not check (depriciated) owed field
-# search/cust_bill.cgi redirect error when there's only one invoice
-#
-# Revision 1.5  2000/07/17 16:45:41  ivan
-# first shot at invoice browsing and some other cleanups
-#
-# Revision 1.4  1999/02/28 00:03:54  ivan
-# removed misleading comments
-#
-# Revision 1.3  1999/01/19 05:14:11  ivan
-# for mod_perl: no more top-level my() variables; use vars instead
-# also the last s/create/new/;
-#
-# Revision 1.2  1998/12/17 09:41:07  ivan
-# s/CGI::(Base|Request)/CGI.pm/;
-#
-
-use strict;
-use vars qw ( $cgi $invnum $query $sortby @cust_bill );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use Date::Format;
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl header menubar eidiot table );
-use FS::Record qw(qsearch qsearchs);
-use FS::cust_bill;
-use FS::cust_main;
-
-$cgi = new CGI;
-cgisuidsetup($cgi);
 
+my(@cust_bill, $sortby);
 if ( $cgi->keywords ) {
   my($query) = $cgi->keywords;
   if ( $query eq 'invnum' ) {
@@ -87,7 +41,7 @@ if ( $cgi->keywords ) {
   }
 } else {
   $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
-  $invnum = $2;
+  my $invnum = $2;
   @cust_bill = qsearchs('cust_bill', { 'invnum' => $invnum } );
   $sortby = \*invnum_sort;
 }
@@ -96,11 +50,16 @@ if ( scalar(@cust_bill) == 1 ) {
   my $invnum = $cust_bill[0]->invnum;
   print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
 } elsif ( scalar(@cust_bill) == 0 ) {
+%>
+<!-- mason kludge -->
+<%
   eidiot("Invoice not found.");
 } else {
+%>
+<!-- mason kludge -->
+<%
   my $total = scalar(@cust_bill);
-  print $cgi->header( '-expires' => 'now' ),
-        &header("Invoice Search Results", menubar(
+  print header("Invoice Search Results", menubar(
           'Main Menu', popurl(2)
         )), "$total matching invoices found<BR>", &table(), <<END;
       <TR>
@@ -114,25 +73,29 @@ if ( scalar(@cust_bill) == 1 ) {
 END
 
   my(%saw, $cust_bill);
+  my($tot_balance, $tot_amount) = (0, 0);
   foreach $cust_bill (
     sort $sortby grep(!$saw{$_->invnum}++, @cust_bill)
   ) {
     my($invnum, $owed, $charged, $date ) = (
       $cust_bill->invnum,
-      $cust_bill->owed,
-      $cust_bill->charged,
+      sprintf("%.2f", $cust_bill->owed),
+      sprintf("%.2f", $cust_bill->charged),
       $cust_bill->_date,
     );
     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";
     print <<END;
       <TR>
         <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>$invnum</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>\$$owed</FONT></A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$view"><FONT SIZE=-1>\$$charged</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>
 END
     my $custnum = $cust_bill->custnum;
@@ -155,8 +118,11 @@ END
 
     print "</TR>";
   }
-
+  $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>
+      <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>
   </BODY>
 </HTML>