X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pkg.cgi;h=45420f4c4ca6a60979e42b51450804330b7d8017;hp=1d54a53f655fd712cc2828641349f9fdf240cbee;hb=ecf4288cc6d98a4916128c5e45d515e0fbea09fd;hpb=de38e11cb5a40c78ef5543f59f6ce968e7fd613b

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 1d54a53f6..45420f4c4 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -29,12 +29,18 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
   }
   if ( $cgi->param('ending')
             && $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
-    my $ending = str2time($1) + 86400;
+    my $ending = str2time($1) + 86399;
     $range .= ( $range ? ' AND ' : ' WHERE ' ). " bill <= $ending ";
   }
 
   $range .= ( $range ? 'AND ' : ' WHERE ' ). '( cancel IS NULL OR cancel = 0 )';
 
+  if ( $cgi->param('agentnum') =~ /^(\d+)$/ and $1 ) {
+    $range .= ( $range ? 'AND ' : ' WHERE ' ). 
+              "$1 = ( SELECT agentnum FROM cust_main".
+                    " WHERE cust_main.custnum = cust_pkg.custnum )";
+  }
+
   #false laziness with below
   my $statement = "SELECT COUNT(*) FROM cust_pkg $range";
   warn $statement;
@@ -56,10 +62,10 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
       $qual = 'WHERE ( susp IS NULL OR susp = 0 )'.
               ' AND ( cancel IS NULL OR cancel = 0)';
     } elsif ( $cgi->param('magic') eq 'suspended' ) {
-      $qual = 'WHERE susp IS NOT NULL AND susp > 0'.
+      $qual = 'WHERE susp IS NOT NULL AND susp != 0'.
               ' AND ( cancel IS NULL OR cancel = 0)';
     } elsif ( $cgi->param('magic') eq 'canceled' ) {
-      $qual = 'WHERE cancel IS NOT NULL AND cancel > 0';
+      $qual = 'WHERE cancel IS NOT NULL AND cancel != 0';
     } else {
       die "guru meditation #420";
     }
@@ -74,12 +80,6 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
 
     $sortby=\*pkgnum_sort;
 
-  } elsif ( $query eq 'SUSP_pkgnum' ) {
-
-    $sortby=\*pkgnum_sort;
-
-    $qual = 'WHERE susp IS NOT NULL AND susp != 0';
-
   } elsif ( $query eq 'APKG_pkgnum' ) {
   
     $sortby=\*pkgnum_sort;