projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add handling for texas tax exemption and warning that report might not make sense...
[freeside.git]
/
httemplate
/
search
/
cust_pkg.cgi
diff --git
a/httemplate/search/cust_pkg.cgi
b/httemplate/search/cust_pkg.cgi
index
1d54a53
..
6d26317
100755
(executable)
--- 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})$/ ) {
}
if ( $cgi->param('ending')
&& $cgi->param('ending') =~ /^([ 0-9\-\/]{0,10})$/ ) {
- my $ending = str2time($1) + 86
400
;
+ my $ending = str2time($1) + 86
399
;
$range .= ( $range ? ' AND ' : ' WHERE ' ). " bill <= $ending ";
}
$range .= ( $range ? 'AND ' : ' WHERE ' ). '( cancel IS NULL OR cancel = 0 )';
$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;
#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 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' ) {
' 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";
}
} else {
die "guru meditation #420";
}
@@
-74,12
+80,6
@@
if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
$sortby=\*pkgnum_sort;
$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;
} elsif ( $query eq 'APKG_pkgnum' ) {
$sortby=\*pkgnum_sort;
@@
-175,8
+175,8
@@
if ( $cgi->param('magic') && $cgi->param('magic') eq 'bill' ) {
}
if ( scalar(@cust_pkg) == 1 ) {
}
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
%>
#exit;
} elsif ( scalar(@cust_pkg) == 0 ) { #error
%>
@@
-300,7
+300,7
@@
END
my $rowspan = scalar(@cust_svc) || 1;
my $p = popurl(2);
print $n1, <<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
<TD ROWSPAN=$rowspan>$setup</TD>
END