diff options
| -rw-r--r-- | FS/FS/Mason.pm | 1 | ||||
| -rw-r--r-- | httemplate/misc/process/payment.cgi | 18 |
2 files changed, 14 insertions, 5 deletions
diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm index 65b282104..ff0baee1b 100644 --- a/FS/FS/Mason.pm +++ b/FS/FS/Mason.pm @@ -138,6 +138,7 @@ if ( -e $addl_handler_use_file ) { use FS::Msgcat qw(gettext geterror); use FS::Misc qw( send_email send_fax ocr_image states_hash counties cities state_label + card_types ); use FS::Misc::eps2png qw( eps2png ); use FS::Report::FCC_477; diff --git a/httemplate/misc/process/payment.cgi b/httemplate/misc/process/payment.cgi index 0b0dffd26..01f7deebc 100644 --- a/httemplate/misc/process/payment.cgi +++ b/httemplate/misc/process/payment.cgi @@ -135,14 +135,22 @@ if ( $payby eq 'CHEK' ) { $payinfo =~ s/\D//g; $payinfo =~ /^(\d{13,16}|\d{8,9})$/ - or errorpage(gettext('invalid_card')); # . ": ". $self->payinfo; + or errorpage(gettext('invalid_card')); $payinfo = $1; validate($payinfo) - or errorpage(gettext('invalid_card')); # . ": ". $self->payinfo; + or errorpage(gettext('invalid_card')); - errorpage(gettext('unknown_card_type')) - if $payinfo !~ /^99\d{14}$/ #token - && cardtype($payinfo) eq "Unknown"; + unless ( $self->payinfo =~ /^99\d{14}$/ ) { #token + + my $cardtype = cardtype($payinfo); + + errorpage(gettext('unknown_card_type')) + if $cardtype eq "Unknown"; + + my %bop_card_types = map { $_=>1 } values %{ card_types() }; + errorpage("$cardtype not accepted") unless $bop_card_types{$cardtype}; + + } if ( defined $cust_main->dbdef_table->column('paycvv') ) { #is this test necessary anymore? if ( length($cgi->param('paycvv') ) ) { |