X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpayinfo_Mixin.pm;h=c79729a13ccfee5bfaba66f232047a92b0943396;hb=877a4eb85cb847bd314d6a9192fedb1dc35c5d02;hp=cb9b723184061a6f0c293111f3f4cb69ed9fc3ac;hpb=57ac39c47a28bcf9dc1f689e6bd6234f0218d0ad;p=freeside.git

diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm
index cb9b72318..c79729a13 100644
--- a/FS/FS/payinfo_Mixin.pm
+++ b/FS/FS/payinfo_Mixin.pm
@@ -199,10 +199,11 @@ sub payinfo_check {
 
     # see parallel checks in cust_payby::check & cust_payby::check_payinfo_cardtype
     if ( $self->tokenized ) {
+      $self->('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', '');
+        $self->set('paycardtype', '') unless $self->paycardtype;
         #return "paycardtype required ".
         #       "(can't derive from a token and no paymask w/prefix provided)";
       }
@@ -233,7 +234,7 @@ sub payinfo_check {
       # 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)";
     }