From: Ivan Kohler <ivan@freeside.biz>
Date: Fri, 12 Feb 2016 18:30:00 +0000 (-0800)
Subject: deal with upgrading 3.x payby events better, RT#32043
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=21ffa4e5b853d777c0956dfa9b8f4984e619a43f;p=freeside.git

deal with upgrading 3.x payby events better, RT#32043
---

diff --git a/FS/FS/part_event_condition.pm b/FS/FS/part_event_condition.pm
index 200049da7..e8550718f 100644
--- a/FS/FS/part_event_condition.pm
+++ b/FS/FS/part_event_condition.pm
@@ -363,17 +363,12 @@ sub _upgrade_data { #class method
 
     my $payby = $part_event_condition->option('payby');
 
-    if ( scalar( keys %$payby ) == 1 ) {
+    if (    scalar( keys %$payby ) == 1 && ( $payby->{CARD} || $payby->{CHEK} )
+         or scalar( keys %$payby ) == 2 && ( $payby->{CARD} && $payby->{CHEK} )
+       )
+    {
 
-      if ( $payby->{'CARD'} ) {
-
-        $part_event_condition->conditionname('has_cust_payby_auto');
-
-      } elsif ( $payby->{'CHEK'} ) {
-
-        $part_event_condition->conditionname('has_cust_payby_auto');
-
-      }
+      $part_event_condition->conditionname('has_cust_payby_auto');
 
     } elsif ( $payby->{'BILL'} && ! $payby->{'CARD'} && ! $payby->{'CHEK'} ) {