Merge branch 'master' of git.freeside.biz:/home/git/freeside

[freeside.git] / FS / FS / part_event / Condition / has_pkgpart.pm

diff --git a/FS/FS/part_event/Condition/has_pkgpart.pm b/FS/FS/part_event/Condition/has_pkgpart.pm
index c54b7e2..deeb1b7 100644 (file)
--- a/FS/FS/part_event/Condition/has_pkgpart.pm
+++ b/FS/FS/part_event/Condition/has_pkgpart.pm
@@ -1,10 +1,9 @@
 package FS::part_event::Condition::has_pkgpart;
+use base qw( FS::part_event::Condition );
 
 use strict;
 
-use base qw( FS::part_event::Condition );
-
-sub description { 'Customer has uncancelled package of specified definitions'; }
+sub description { 'Customer has uncancelled specific package(s)'; }
 
 sub eventtable_hashref {
     { 'cust_main' => 1,
@@ -27,15 +26,24 @@ sub condition {
 
   my $cust_main = $self->cust_main($object);
 
-  #XXX test
   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;