X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fcust_payby.pm;h=136acf1b668d75e13cbb5e59a730f33c1f1eeea1;hp=e25d73ecd34ebd3bb121d62a63e58aa325386cbe;hb=54355a47c10ecdfd86c26c8f5568f5c2f87de172;hpb=5701cfb8cfe8458f2083957bc13fef15190c201c

diff --git a/FS/FS/cust_payby.pm b/FS/FS/cust_payby.pm
index e25d73ecd..136acf1b6 100644
--- a/FS/FS/cust_payby.pm
+++ b/FS/FS/cust_payby.pm
@@ -357,14 +357,14 @@ sub check {
       or return gettext('invalid_card'); # . ": ". $self->payinfo;
 
     # see parallel checks in check_payinfo_cardtype & payinfo_Mixin::payinfo_check
-    my $cardtype = '';
+    my $cardtype = $self->paycardtype;
     if ( $self->tokenized ) {
       if ( $self->paymask =~ /^\d+x/ ) {
         $cardtype = cardtype($self->paymask);
       } else {
-        $cardtype = '';
         #return "paycardtype required ".
-        #       "(can't derive from a token and no paymask w/prefix provided)";
+        #       "(can't derive from a token and no paymask w/prefix provided)"
+        #  unless $cardtype;
       }
     } else {
       $cardtype = cardtype($self->payinfo);