X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pkg.cgi;h=6d26317e0b39c434939efdb69903933845ca9029;hb=d5f33566675ef84accc14877733e243eec95ff01;hp=78a5bb3bb1b9daf97c1da5e5b3178e81df64e1db;hpb=61e25db54f2da624a79ecedb6bf3d678c7fdefc5;p=freeside.git

diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 78a5bb3bb..6d26317e0 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -19,6 +19,8 @@ my @cust_pkg;
 
 if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
   $sortby=\*bill_sort;
+
+  #false laziness with cust_pay.cgi
   my $range = '';
   if ( $cgi->param('beginning')
        && $cgi->param('beginning') =~ /^([ 0-9\-\/]{0,10})$/ ) {
@@ -27,10 +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;
@@ -44,14 +54,31 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
 } else {
 
   my $qual = '';
-  if ( $query eq 'pkgnum' ) {
-    $sortby=\*pkgnum_sort;
+  if ( $cgi->param('magic') &&
+       $cgi->param('magic') =~ /^(active|suspended|canceled)$/
+  ) {
 
-  } elsif ( $query eq 'SUSP_pkgnum' ) {
+    if ( $cgi->param('magic') eq 'active' ) {
+      $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'.
+              ' AND ( cancel IS NULL OR cancel = 0)';
+    } elsif ( $cgi->param('magic') eq 'canceled' ) {
+      $qual = 'WHERE cancel IS NOT NULL AND cancel != 0';
+    } else {
+      die "guru meditation #420";
+    }
 
-    $sortby=\*pkgnum_sort;
+    $sortby = \*pkgnum_sort;
+
+    if ( $cgi->param('pkgpart') =~ /^(\d+)$/ ) {
+      $qual .= " AND pkgpart = $1";
+    }
+
+  } elsif ( $query eq 'pkgnum' ) {
 
-    $qual = 'WHERE susp IS NOT NULL AND susp != 0';
+    $sortby=\*pkgnum_sort;
 
   } elsif ( $query eq 'APKG_pkgnum' ) {
   
@@ -93,7 +120,7 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
                       AND cust_svc.svcpart = pkg_svc.svcpart
                       AND cust_pkg.pkgpart = pkg_svc.pkgpart
                       GROUP BY cust_svc.pkgnum,cust_svc.svcpart";
-      $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
+      my $sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
          
       $sth->execute or die "Error executing \"$query\": ". $sth->errstr;
   
@@ -148,8 +175,8 @@ if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
 }
 
 if ( scalar(@cust_pkg) == 1 ) {
-  my($pkgnum)=$cust_pkg[0]->pkgnum;
-  print $cgi->redirect(popurl(2). "view/cust_pkg.cgi?$pkgnum");
+  print $cgi->redirect("${p}view/cust_main.cgi?". $cust_pkg[0]->custnum.
+                       "#cust_pkg". $cust_pkg[0]->pkgnum );
   #exit;
 } elsif ( scalar(@cust_pkg) == 0 ) { #error
 %>
@@ -194,6 +221,12 @@ if ( scalar(@cust_pkg) == 1 ) {
       <TR>
         <TH>Package</TH>
         <TH><FONT SIZE=-1>Setup</FONT></TH>
+END
+
+  print '<TH><FONT SIZE=-1>Last<BR>bill</FONT></TH>'
+    if defined dbdef->table('cust_pkg')->column('last_bill');
+
+  print <<END;
         <TH><FONT SIZE=-1>Next<BR>bill</FONT></TH>
         <TH><FONT SIZE=-1>Susp.</FONT></TH>
         <TH><FONT SIZE=-1>Expire</FONT></TH>
@@ -203,17 +236,10 @@ if ( scalar(@cust_pkg) == 1 ) {
         <TH>company</TH>
 END
 
-if ( defined dbdef->table('cust_main')->column('ship_last') ) {
-  print <<END;
-      <TH>(service) name</TH>
-      <TH>company</TH>
-END
-}
+  print '<TH>(service) name</TH><TH>company</TH>'
+    if defined dbdef->table('cust_main')->column('ship_last');
 
-print <<END;
-        <TH COLSPAN=2>Services</TH>
-      </TR>
-END
+  print '<TH COLSPAN=2>Services</TH></TR>';
 
   my $n1 = '<TR>';
   my(%saw,$cust_pkg);
@@ -244,6 +270,12 @@ END
       $cust_main ? $cust_main->first : '',
       $cust_main ? $cust_main->company : '',
     );
+
+    my $last_bill = $cust_pkg->getfield('last_bill')
+                      ? time2str("%D", $cust_pkg->getfield('last_bill') )
+                      : ''
+      if defined dbdef->table('cust_pkg')->column('last_bill');
+
     my($ship_last, $ship_first, $ship_company);
     if ( defined dbdef->table('cust_main')->column('ship_last') ) {
       ($ship_last, $ship_first, $ship_company) = (
@@ -268,8 +300,14 @@ END
     my $rowspan = scalar(@cust_svc) || 1;
     my $p = popurl(2);
     print $n1, <<END;
-      <TD ROWSPAN=$rowspan><A HREF="${p}view/cust_pkg.cgi?$pkgnum"><FONT SIZE=-1>$pkgnum - $pkg</FONT></A></TD>
+      <TD ROWSPAN=$rowspan><A HREF="${p}view/cust_main.cgi?$custnum#cust_pkg$pkgnum"><FONT SIZE=-1>$pkgnum - $pkg</FONT></A></TD>
       <TD ROWSPAN=$rowspan>$setup</TD>
+END
+
+    print "<TD ROWSPAN=$rowspan>$last_bill</TD>"
+      if defined dbdef->table('cust_pkg')->column('last_bill');
+
+    print <<END;
       <TD ROWSPAN=$rowspan>$bill</TD>
       <TD ROWSPAN=$rowspan>$susp</TD>
       <TD ROWSPAN=$rowspan>$expire</TD>