X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpart_event%2FCondition%2Fhasnt_pkgpart.pm;h=79104eb87643ac37790d66971fb2823705e3b38e;hp=421d0232c4c09064bd55e156958df2b8345ca59c;hb=0549def83bcba56e53482ea0f33472e18b215649;hpb=ed33058882b17e252dba3bd27051daeb0773f02b

diff --git a/FS/FS/part_event/Condition/hasnt_pkgpart.pm b/FS/FS/part_event/Condition/hasnt_pkgpart.pm
index 421d0232c..79104eb87 100644
--- a/FS/FS/part_event/Condition/hasnt_pkgpart.pm
+++ b/FS/FS/part_event/Condition/hasnt_pkgpart.pm
@@ -22,19 +22,30 @@ sub option_fields {
   );
 }
 
+#false laziness w/has_pkgpart.pm
+
 sub condition {
   my( $self, $object ) = @_;
 
   my $cust_main = $self->cust_main($object);
 
-  #XXX test
   my $unless_pkgpart = $self->option('unless_pkgpart') || {};
   ! grep $unless_pkgpart->{ $_->pkgpart }, $cust_main->ncancelled_pkgs;
 }
 
-#XXX
-#sub condition_sql {
-#
-#}
+sub condition_sql {
+  my( $self, $table ) = @_;
+
+  'NOT '.
+  'ARRAY'. $self->condition_sql_option_option_integer('unless_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;