first shot at invoice browsing and some other cleanups

diff --git a/htdocs/index.html b/htdocs/index.html
index 052aed3..9537b34 100755 (executable)
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -36,21 +36,31 @@
         </ul>
       <li><A NAME="browse">Browse</A>
         <ul>
         </ul>
       <li><A NAME="browse">Browse</A>
         <ul>

-          <LI><A HREF="search/cust_main.cgi?custnum">customers (by customer number)</A>
-          <LI><A HREF="search/cust_main.cgi?last">customers (by last name)</A>
-          <LI><A HREF="search/cust_main.cgi?company">customers (by company)</A>
-          <LI><A HREF="search/cust_pkg.cgi?pkgnum">packages (by package number)</A>
-          <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
-        <LI><A HREF="search/svc_acct.cgi?svcnum">accounts (by service number)</A>
-          <LI><A HREF="search/svc_acct.cgi?username">accounts (by username)</A>
-          <LI><A HREF="search/svc_acct.cgi?uid">accounts (by uid)</A>
-          <LI><A HREF="search/svc_acct.cgi?UN_svcnum">unlinked accounts (by service number)</A>
-          <LI><A HREF="search/svc_acct.cgi?UN_username">unlinked accounts (by username)</A>
-          <LI><A HREF="search/svc_acct.cgi?UN_uid">unlinked accounts (by uid)</A>
-          <LI><A HREF="search/svc_domain.cgi?svcnum">domains (by service number)</A>
-          <LI><A HREF="search/svc_domain.cgi?domain">domains (by domain)</A>
-          <LI><A HREF="search/svc_domain.cgi?UN_svcnum">unlinked domains (by service number)</A>
-          <LI><A HREF="search/svc_domain.cgi?UN_domain">unlinked domains (by domain)</A>
+          <LI>customers (<A HREF="search/cust_main.cgi?custnum">by customer number</A>) (<A HREF="search/cust_main.cgi?last">by last name</A>) (<A HREF="search/cust_main.cgi?company">by company</A>)
+          <LI>invoices
+            <UL>
+              <LI>open invoices (<A HREF="search/cust_bill.cgi?OPEN_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN_custnum">by customer number</A>)
+              <LI>30 day open invoices (<A HREF="search/cust_bill.cgi?OPEN30_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN30_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN30_custnum">by customer number</A>)
+              <LI>60 day open invoices (<A HREF="search/cust_bill.cgi?OPEN60_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN60_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN60_custnum">by customer number</A>)
+              <LI>90 day open invoices (<A HREF="search/cust_bill.cgi?OPEN90_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN90_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN90_custnum">by customer number</A>)
+              <LI>120 day open invoices (<A HREF="search/cust_bill.cgi?OPEN120_invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?OPEN120_date">by date</A>) (<A HREF="search/cust_bill.cgi?OPEN120_custnum">by customer number</A>)
+              <LI>all invoices (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>) (<A HREF="search/cust_bill.cgi?invnum">by invoice number</A>)
+            </UL>
+          <LI>packages
+            <UL>
+              <LI><A HREF="search/cust_pkg.cgi?pkgnum">packages (by package number)</A>
+              <LI><A HREF="search/cust_pkg.cgi?APKG_pkgnum">packages with unconfigured services (by package number)</A>
+            </UL>
+          <LI>services
+            <UL>
+              <LI>accounts (<A HREF="search/svc_acct.cgi?svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?username">by username</A>) (<A HREF="search/svc_acct.cgi?uid">by uid</A>)
+              <LI>domains (<A HREF="search/svc_domain.cgi?svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?domain">by domain</A>)
+            </UL>
+          <LI>unlinked services
+            <UL>
+              <LI>unlinked accounts (<A HREF="search/svc_acct.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_acct.cgi?UN_username">by username</A>) (<A HREF="search/svc_acct.cgi?UN_uid">by uid</A>)
+              <LI>unlinked domains (<A HREF="search/svc_domain.cgi?UN_svcnum">by service number</A>) (<A HREF="search/svc_domain.cgi?UN_domain">by domain</A>)
+            </UL>

         </ul>
       <li><A NAME="admin">Administration</a>
         <ul>
         </ul>
       <li><A NAME="admin">Administration</a>
         <ul>

diff --git a/htdocs/search/cust_bill.cgi b/htdocs/search/cust_bill.cgi
index c849341..9534703 100755 (executable)
--- a/htdocs/search/cust_bill.cgi
+++ b/htdocs/search/cust_bill.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
 #!/usr/bin/perl -Tw
 #

-# $Id: cust_bill.cgi,v 1.4 1999-02-28 00:03:54 ivan Exp $
+# $Id: cust_bill.cgi,v 1.5 2000-07-17 16:45:41 ivan Exp $

 #
 # Usage: post form to:
 #        http://server.name/path/cust_bill.cgi
 #
 # Usage: post form to:
 #        http://server.name/path/cust_bill.cgi


@@ -11,7 +11,10 @@
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_bill.cgi,v $
 #       bmccane@maxbaud.net     98-apr-3
 #
 # $Log: cust_bill.cgi,v $

-# Revision 1.4  1999-02-28 00:03:54  ivan
+# 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
 # removed misleading comments
 #
 # Revision 1.3  1999/01/19 05:14:11  ivan


@@ -23,22 +26,145 @@
 #
 
 use strict;
 #
 
 use strict;

-use vars qw ( $cgi $invnum );
+use vars qw ( $cgi $invnum $query $sortby @cust_bill );

 use CGI;
 use CGI::Carp qw(fatalsToBrowser);
 use CGI;
 use CGI::Carp qw(fatalsToBrowser);

+use Date::Format;

 use FS::UID qw(cgisuidsetup);
 use FS::UID qw(cgisuidsetup);

-use FS::CGI qw(popurl idiot);
-use FS::Record qw(qsearchs);
+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);
 
 
 $cgi = new CGI;
 cgisuidsetup($cgi);
 

-$cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
-$invnum = $2;
+if ( $cgi->keywords ) {
+  my($query) = $cgi->keywords;
+  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', {} );
+  } elsif ( $query eq 'OPEN_date' ) {
+    $sortby = \*date_sort;
+    @cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+  } elsif ( $query eq 'OPEN_custnum' ) {
+    $sortby = \*custnum_sort;
+    @cust_bill = grep $_->owed != 0, qsearch('cust_bill', {} );
+  } elsif ( $query =~ /^OPEN(\d+)_invnum$/ ) {
+    my $open = $1 * 86400;
+    $sortby = \*invnum_sort;
+    @cust_bill =
+      grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+  } elsif ( $query =~ /^OPEN(\d+)_date$/ ) {
+    my $open = $1 * 86400;
+    $sortby = \*date_sort;
+    @cust_bill =
+      grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+  } elsif ( $query =~ /^OPEN(\d+)_custnum$/ ) {
+    my $open = $1 * 86400;
+    $sortby = \*custnum_sort;
+    @cust_bill =
+      grep $_->owed != 0 && $_->_date < time - $open, qsearch('cust_bill', {} );
+  } else {
+    die "unknown query string $query";
+  }
+} else {
+  $cgi->param('invnum') =~ /^\s*(FS-)?(\d+)\s*$/;
+  $invnum = $2;
+  @cust_bill = qsearchs('cust_bill', { 'invnum' => $invnum } );
+  $sortby = \*invnum_sort;
+}

 
 

-if ( qsearchs('cust_bill',{'invnum'=>$invnum}) ) {
+if ( scalar(@cust_bill) == 1 ) {

   print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect
   print $cgi->redirect(popurl(2). "view/cust_bill.cgi?$invnum");  #redirect

-} else { #error
-  idiot("Invoice not found.");
+} elsif ( scalar(@cust_bill) == 0 ) {
+  eidiot("Invoice not found.");
+} else {
+  my $total = scalar(@cust_bill);
+  print $cgi->header( '-expires' => 'now' ),
+        &header("Invoice Search Results", menubar(
+          'Main Menu', popurl(2)
+        )), "$total matching invoices found<BR>", &table(), <<END;
+      <TR>
+        <TH></TH>
+        <TH>Balance</TH>
+        <TH>Amount</TH>
+        <TH>Date</TH>
+        <TH>Contact name</TH>
+        <TH>Company</TH>
+      </TR>
+END
+
+  my(%saw, $cust_bill);
+  foreach $cust_bill (
+    sort $sortby grep(!$saw{$_->invnum}++, @cust_bill)
+  ) {
+    my($invnum, $owed, $charged, $date ) = (
+      $cust_bill->invnum,
+      $cust_bill->owed,
+      $cust_bill->charged,
+      $cust_bill->_date,
+    );
+    my $pdate = time2str("%b %d %Y", $date);
+
+    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><A HREF="$view"><FONT SIZE=-1>$pdate</FONT></A></TD>
+END
+    my $custnum = $cust_bill->custnum;
+    my $cust_main = qsearchs('cust_main', { 'custnum' => $custnum } );
+    if ( $cust_main ) {
+      my $cview = popurl(2). "view/cust_main.cgi?". $cust_main->custnum;
+      my ( $name, $company ) = (
+        $cust_main->last. ', '. $cust_main->first,
+        $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>
+END
+    } else {
+      print <<END
+        <TD ROWSPAN=$rowspan COLSPAN=2>WARNING: couldn't find cust_main.custnum $custnum (cust_bill.invnum $invnum)</TD>
+END
+    }
+
+    print "</TR>";
+  }
+
+  print <<END;
+    </TABLE>
+  </BODY>
+</HTML>
+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;
+}

diff --git a/htdocs/search/cust_main.cgi b/htdocs/search/cust_main.cgi
index ef076f9..8b3092e 100755 (executable)
--- a/htdocs/search/cust_main.cgi
+++ b/htdocs/search/cust_main.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
 #!/usr/bin/perl -Tw
 #

-# $Id: cust_main.cgi,v 1.14 1999-08-12 04:45:21 ivan Exp $
+# $Id: cust_main.cgi,v 1.15 2000-07-17 16:45:41 ivan Exp $

 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi
 #
 # Usage: post form to:
 #        http://server.name/path/cust_main.cgi


@@ -17,7 +17,10 @@
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $
 # display total, use FS::CGI ivan@sisd.com 98-jul-17
 #
 # $Log: cust_main.cgi,v $

-# Revision 1.14  1999-08-12 04:45:21  ivan
+# Revision 1.15  2000-07-17 16:45:41  ivan
+# first shot at invoice browsing and some other cleanups
+#
+# Revision 1.14  1999/08/12 04:45:21  ivan

 # typo - missed a paren
 #
 # Revision 1.13  1999/08/12 04:32:21  ivan
 # typo - missed a paren
 #
 # Revision 1.13  1999/08/12 04:32:21  ivan


@@ -92,6 +95,8 @@ if ( $cgi->keywords ) {
   } elsif ( $query eq 'company' ) {
     $sortby=\*company_sort;
     @cust_main=qsearch('cust_main',{});
   } elsif ( $query eq 'company' ) {
     $sortby=\*company_sort;
     @cust_main=qsearch('cust_main',{});

+  } else {
+    die "unknown query string $query";

   }
 } else {
   @cust_main=();
   }
 } else {
   @cust_main=();

diff --git a/htdocs/search/cust_pkg.cgi b/htdocs/search/cust_pkg.cgi
index c645ad6..b6439d6 100755 (executable)
--- a/htdocs/search/cust_pkg.cgi
+++ b/htdocs/search/cust_pkg.cgi
@@ -1,11 +1,14 @@
 #!/usr/bin/perl -Tw
 #
 #!/usr/bin/perl -Tw
 #

-# $Id: cust_pkg.cgi,v 1.10 2000-07-17 12:49:29 ivan Exp $
+# $Id: cust_pkg.cgi,v 1.11 2000-07-17 16:45:41 ivan Exp $

 #
 # based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
 #
 # $Log: cust_pkg.cgi,v $
 #
 # based on search/svc_acct.cgi ivan@sisd.com 98-jul-17
 #
 # $Log: cust_pkg.cgi,v $

-# Revision 1.10  2000-07-17 12:49:29  ivan
+# Revision 1.11  2000-07-17 16:45:41  ivan
+# first shot at invoice browsing and some other cleanups
+#
+# Revision 1.10  2000/07/17 12:49:29  ivan

 # better error message if a package isn't linked to a customer (that shouldn't happen)
 #
 # Revision 1.9  1999/07/17 10:38:52  ivan
 # better error message if a package isn't linked to a customer (that shouldn't happen)
 #
 # Revision 1.9  1999/07/17 10:38:52  ivan


@@ -127,7 +130,7 @@ END
 END
     } else {
       print <<END;
 END
     } else {
       print <<END;

-      <TD COLSPAN=3><FONT SIZE=-1>WARNING: couldn't find cust_main.custnum $custnum (cust_pkg.pkgnum $pkgnum)</TD>
+      <TD COLSPAN=3>WARNING: couldn't find cust_main.custnum $custnum (cust_pkg.pkgnum $pkgnum)</TD>

     </TR>
 END
     }
     </TR>
 END
     }