FS::payby->can_payby($self->table, $self->payby)
or return "Illegal payby: ". $self->payby;
- my $conf = new FS::Conf;
-
if ( $self->payby eq 'CARD' && ! $self->is_encrypted($self->payinfo) ) {
- my $payinfo = $self->payinfo;
- my $cardtype = cardtype($payinfo);
- $cardtype = 'Tokenized' if $self->tokenized;
- $self->set('paycardtype', $cardtype);
+ # see parallel checks in cust_payby::check & cust_payby::check_payinfo_cardtype
+ if ( $self->tokenized ) {
+ $self->set('is_tokenized', 'Y'); #so we don't try to do it again
+ if ( $self->paymask =~ /^\d+x/ ) {
+ $self->set('paycardtype', cardtype($self->paymask));
+ } else {
+ $self->set('paycardtype', '') unless $self->paycardtype;
+ #return "paycardtype required ".
+ # "(can't derive from a token and no paymask w/prefix provided)";
+ }
+ } else {
+ $self->set('paycardtype', cardtype($self->payinfo));
+ }
if ( $ignore_masked_payinfo and $self->mask_payinfo eq $self->payinfo ) {
# allow it
} else {
+ my $payinfo = $self->payinfo;
$payinfo =~ s/\D//g;
$self->payinfo($payinfo);
if ( $self->payinfo ) {
- $self->payinfo =~ /^(\d{13,16}|\d{8,9})$/
+ $self->payinfo =~ /^(\d{13,19}|\d{8,9})$/
or return "Illegal (mistyped?) credit card number (payinfo)";
$self->payinfo($1);
validate($self->payinfo) or return "Illegal credit card number";
- return "Unknown card type" if $cardtype eq "Unknown";
+ return "Unknown card type" if $self->paycardtype eq "Unknown";
} else {
$self->payinfo('N/A'); #??? re-masks card
}
}
+
} else {
- if ( $self->payby eq 'CARD' and $self->paymask ) {
+
+ if ( $self->payby eq 'CARD' && $self->paymask =~ /^\d+x/ ) {
# if we can't decrypt the card, at least detect the cardtype
$self->set('paycardtype', cardtype($self->paymask));
} else {
- $self->set('paycardtype', '');
+ $self->set('paycardtype', '') unless $self->paycardtype;
+ # return "paycardtype required ".
+ # "(can't derive from a token and no paymask w/prefix provided)";
}
+
if ( $self->is_encrypted($self->payinfo) ) {
#something better? all it would cause is a decryption error anyway?
my $error = $self->ut_anything('payinfo');
my $payinfo = shift || $self->payinfo;
my %hash = (
'custnum' => $self->custnum,
- 'payby' => 'CARD',
+ 'payby' => $self->payby,
);
return 1
if qsearch('cust_pay', { %hash, 'payinfo' => $payinfo } )
- || qsearch('cust_pay',
- { %hash, 'paymask' => $self->mask_payinfo('CARD', $payinfo) } )
+ || qsearch('cust_pay', { %hash, 'paymask' => $self->mask_payinfo } )
;
return 0;
my $class = shift;
my $table = $class->table or die "upgrade_set_cardtype needs a table";
- if ( ! FS::upgrade_journal->is_done("${table}__set_cardtype") ) {
+ if ( ! FS::upgrade_journal->is_done("${table}__set_cardtype2") ) {
my $job = FS::queue->new({ job => 'FS::payinfo_Mixin::process_set_cardtype' });
my $error = $job->insert($table);
die $error if $error;
- FS::upgrade_journal->set_done("${table}__set_cardtype");
+ FS::upgrade_journal->set_done("${table}__set_cardtype2");
}
}
local $ignore_masked_payinfo = 1;
my $search = FS::Cursor->new({
table => $table,
- extra_sql => q[ WHERE payby IN('CARD','DCRD') AND paycardtype IS NULL ],
+ extra_sql => q[ WHERE payby IN('CARD','DCRD') AND ( paycardtype IS NULL or paycardtype = 'Not a credit card' ) ],
});
while (my $record = $search->fetch) {
my $error = $record->replace;