projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f4daf7e
)
add condition_sql optimization to "Customer has uncancelled specific package(s)"...
author
Ivan Kohler
<ivan@freeside.biz>
Wed, 1 Feb 2017 02:05:02 +0000
(18:05 -0800)
committer
Ivan Kohler
<ivan@freeside.biz>
Wed, 1 Feb 2017 02:05:02 +0000
(18:05 -0800)
FS/FS/part_event/Condition/has_pkgpart.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_event/Condition/has_pkgpart.pm
b/FS/FS/part_event/Condition/has_pkgpart.pm
index
5505a99
..
deeb1b7
100644
(file)
--- a/
FS/FS/part_event/Condition/has_pkgpart.pm
+++ b/
FS/FS/part_event/Condition/has_pkgpart.pm
@@
-27,13
+27,23
@@
sub condition {
my $cust_main = $self->cust_main($object);
my $if_pkgpart = $self->option('if_pkgpart') || {};
my $cust_main = $self->cust_main($object);
my $if_pkgpart = $self->option('if_pkgpart') || {};
- grep $if_pkgpart->{ $_->pkgpart }, $cust_main->ncancelled_pkgs;
+ grep $if_pkgpart->{ $_->pkgpart },
+ $cust_main->ncancelled_pkgs( 'skip_label_sort'=>1 );
}
}
-#XXX
-#sub condition_sql {
-#
-#}
+sub condition_sql {
+ my( $self, $table ) = @_;
+
+ 'ARRAY'. $self->condition_sql_option_option_integer('if_pkgpart').
+ ' && '. #overlap (have elements in common)
+ 'ARRAY( SELECT pkgpart FROM cust_pkg AS has_pkgpart_cust_pkg
+ WHERE has_pkgpart_cust_pkg.custnum = cust_main.custnum
+ AND ( has_pkgpart_cust_pkg.cancel IS NULL
+ OR has_pkgpart_cust_pkg.cancel = 0
+ )
+ )
+ ';
+}
1;
1;