diff options
| author | Ivan Kohler <ivan@freeside.biz> | 2016-02-12 10:30:00 -0800 |
|---|---|---|
| committer | Ivan Kohler <ivan@freeside.biz> | 2016-02-12 10:30:00 -0800 |
| commit | 21ffa4e5b853d777c0956dfa9b8f4984e619a43f (patch) | |
| tree | bddd12bf756e0ba6695bf98d7405673ee73fe7df /FS | |
| parent | 1d4f9b2a53e1a352e3df0ceb1665d8a90d449aa0 (diff) | |
deal with upgrading 3.x payby events better, RT#32043
Diffstat (limited to 'FS')
| -rw-r--r-- | FS/FS/part_event_condition.pm | 15 |
1 files changed, 5 insertions, 10 deletions
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'} ) { |