X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpart_event%2FCondition%2Fhas_cust_payby_auto.pm;h=f13b639aba470ea46a7c66be54cd0dd875fffd58;hb=65b639012a5dc547eccb01fd0e55efd4aa728039;hp=9f914292fce8a493f68a43695ccdf1a84f3824f6;hpb=4665b13550c626aeae16f3d1892f4454195cfc53;p=freeside.git

diff --git a/FS/FS/part_event/Condition/has_cust_payby_auto.pm b/FS/FS/part_event/Condition/has_cust_payby_auto.pm
index 9f914292f..f13b639ab 100644
--- a/FS/FS/part_event/Condition/has_cust_payby_auto.pm
+++ b/FS/FS/part_event/Condition/has_cust_payby_auto.pm
@@ -4,7 +4,7 @@ use base qw( FS::part_event::Condition );
 use strict;
 use Tie::IxHash;
 use FS::payby;
-use FS::Record qw(qsearch);
+use FS::Record qw( qsearch dbh );
 
 sub description {
   'Customer has automatic payment information';
@@ -30,11 +30,24 @@ sub condition {
 
   my $cust_main = $self->cust_main($object);
 
+  #handle multiple (HASH) type options migrated from a v3 payby.pm condition
+  # (and maybe we should be a select-multiple or checkbox-multiple too?)
+  my @payby = ();
+  my $payby = $self->option('payby');
+  if ( ref($payby) ) {
+    @payby = keys %$payby;
+  } elsif ( $payby ) {
+    @payby = ( $payby );
+  }
+
   scalar( qsearch({ 
     'table'     => 'cust_payby',
     'hashref'   => { 'custnum' => $cust_main->custnum,
-                     'payby'   => $self->option('payby')
+                     #'payby'   => $self->option('payby')
                    },
+    'extra_sql' => 'AND payby IN ( '.
+                     join(',', map dbh->quote($_), @payby).
+                   ' ) ',
     'order_by'  => 'LIMIT 1',
   }) );