projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT# 39340 - removed min_selfservice dir and merged into ng_selfservice
[freeside.git]
/
FS
/
FS
/
part_event_condition.pm
diff --git
a/FS/FS/part_event_condition.pm
b/FS/FS/part_event_condition.pm
index
200049d
..
e855071
100644
(file)
--- 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');
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'} ) {
} elsif ( $payby->{'BILL'} && ! $payby->{'CARD'} && ! $payby->{'CHEK'} ) {