} else {
- my $unconf = '';
+ my $qual = '';
if ( $query eq 'pkgnum' ) {
$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;
WHERE cust_pkg.pkgnum = cust_svc.pkgnum
AND cust_svc.svcpart = pkg_svc.svcpart
AND cust_pkg.pkgpart = pkg_svc.pkgpart
- GROUP BY cust_svc.pkgnum,cust_svc.svcnum";
+ GROUP BY cust_svc.pkgnum,cust_svc.svcpart";
$sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
$sth->execute or die "Error executing \"$query\": ". $sth->errstr;
AND pkg_svc.quantity != 0;";
$sth = dbh->prepare($query) or die dbh->errstr. " preparing $query";
$sth->execute or die "Error executing \"$query\": ". $sth->errstr;
- $unconf = " LEFT JOIN temp2_$$ ON cust_pkg.pkgnum = temp2_$$.pkgnum
- WHERE temp2_$$.pkgnum IS NOT NULL";
+ $qual = " LEFT JOIN temp2_$$ ON cust_pkg.pkgnum = temp2_$$.pkgnum
+ WHERE temp2_$$.pkgnum IS NOT NULL";
} else {
- $unconf = "
+ $qual = "
WHERE 0 <
( SELECT count(*) FROM pkg_svc
WHERE pkg_svc.pkgpart = cust_pkg.pkgpart
}
} else {
- die "Empty QUERY_STRING!";
+ die "Empty or unknown QUERY_STRING!";
}
- my $statement = "SELECT COUNT(*) FROM cust_pkg $unconf";
+ my $statement = "SELECT COUNT(*) FROM cust_pkg $qual";
my $sth = dbh->prepare($statement) or die dbh->errstr." preparing $statement";
$sth->execute or die "Error executing \"$statement\": ". $sth->errstr;
$total = $sth->fetchrow_arrayref->[0];
- #if ( driver_name eq 'mysql' ) { #remove ORDER BY for mysql? hua?
- # @cust_pkg = qsearch('cust_pkg',{}, '', "$unconf $limit" );
- #} else {
- # @cust_pkg = qsearch('cust_pkg',{}, '', "$unconf ORDER BY pkgnum $limit" );
- #}
- @cust_pkg = qsearch('cust_pkg',{}, '', "$unconf ORDER BY pkgnum $limit" );
+ my $tblname = driver_name eq 'mysql' ? 'cust_pkg.' : '';
+ @cust_pkg =
+ qsearch('cust_pkg',{}, '', "$qual ORDER BY ${tblname}pkgnum $limit" );
if ( driver_name eq 'mysql' ) {
$query = "DROP TABLE temp1_$$,temp2_$$;";
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>$setup</TD>
- <TD>$bill</TD>
- <TD>$susp</TD>
- <TD>$expire</TD>
- <TD>$cancel</TD>
+ <TD ROWSPAN=$rowspan>$setup</TD>
+ <TD ROWSPAN=$rowspan>$bill</TD>
+ <TD ROWSPAN=$rowspan>$susp</TD>
+ <TD ROWSPAN=$rowspan>$expire</TD>
+ <TD ROWSPAN=$rowspan>$cancel</TD>
END
if ( $cust_main ) {
print <<END;