projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git.freeside.biz:/home/git/freeside
[freeside.git]
/
FS
/
FS
/
cust_pkg
/
Search.pm
diff --git
a/FS/FS/cust_pkg/Search.pm
b/FS/FS/cust_pkg/Search.pm
index
47efd31
..
543ef1a
100644
(file)
--- a/
FS/FS/cust_pkg/Search.pm
+++ b/
FS/FS/cust_pkg/Search.pm
@@
-19,11
+19,11
@@
Valid parameters are
=item magic
=item magic
-
active, inactive
, suspended, cancel (or cancelled)
+
on hold, active, inactive (or one-time charge)
, suspended, cancel (or cancelled)
=item status
=item status
-
active, inactive, suspended, one-time charge, inactive
, cancel (or cancelled)
+
on hold, active, inactive (or one-time charge), suspended
, cancel (or cancelled)
=item custom
=item custom
@@
-191,6
+191,12
@@
sub search {
push @where, FS::cust_pkg->inactive_sql();
push @where, FS::cust_pkg->inactive_sql();
+ } elsif ( $params->{'magic'} =~ /^on[ _]hold$/
+ || $params->{'status'} =~ /^on[ _]hold$/ ) {
+
+ push @where, FS::cust_pkg->on_hold_sql();
+
+
} elsif ( $params->{'magic'} eq 'suspended'
|| $params->{'status'} eq 'suspended' ) {
} elsif ( $params->{'magic'} eq 'suspended'
|| $params->{'status'} eq 'suspended' ) {