projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
when expiring multiple packages, remove services in cancel weight order, #37177
[freeside.git]
/
FS
/
FS
/
svc_Common.pm
diff --git
a/FS/FS/svc_Common.pm
b/FS/FS/svc_Common.pm
index
748bcae
..
1dd9ffb
100644
(file)
--- a/
FS/FS/svc_Common.pm
+++ b/
FS/FS/svc_Common.pm
@@
-1387,11
+1387,17
@@
Parameters:
=item order_by
=item order_by
+=item cancelled - if true, only returns svcs attached to cancelled pkgs;
+if defined and false, only returns svcs not attached to cancelled packages
+
=back
=cut
=back
=cut
-# svc_broadband::search should eventually use this instead
+### Don't call the 'cancelled' option 'Service Status'
+### There is no such thing
+### See cautionary note in httemplate/browse/part_svc.cgi
+
sub search {
my ($class, $params) = @_;
sub search {
my ($class, $params) = @_;
@@
-1495,6
+1501,14
@@
sub search {
push @where, "exportnum = $1";
}
push @where, "exportnum = $1";
}
+ if ( defined($params->{'cancelled'}) ) {
+ if ($params->{'cancelled'}) {
+ push @where, "cust_pkg.cancel IS NOT NULL";
+ } else {
+ push @where, "cust_pkg.cancel IS NULL";
+ }
+ }
+
# # sector and tower
# my @where_sector = $class->tower_sector_sql($params);
# if ( @where_sector ) {
# # sector and tower
# my @where_sector = $class->tower_sector_sql($params);
# if ( @where_sector ) {