X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpayinfo_Mixin.pm;h=84759cc11812530ef67439907be2182775bca0df;hp=7401eb9c8eced76c54604f87c10db785585a6726;hb=54355a47c10ecdfd86c26c8f5568f5c2f87de172;hpb=edd6a339eb7ea156272264ffd164711fc8af792e

diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm
index 7401eb9c8..84759cc11 100644
--- a/FS/FS/payinfo_Mixin.pm
+++ b/FS/FS/payinfo_Mixin.pm
@@ -197,20 +197,17 @@ sub payinfo_check {
 
   if ( $self->payby eq 'CARD' && ! $self->is_encrypted($self->payinfo) ) {
 
-    unless ( $self->paycardtype ) {
-
-      if ( $self->tokenized ) {
-        if ( $self->paymask =~ /^\d+x/ ) {
-          $self->set('paycardtype', cardtype($self->paymask));
-        } else {
-          $self->set('paycardtype', '');
-         # return "paycardtype required ".
-         #        "(can't derive from a token and no paymask w/prefix provided)";
-        }
+    # see parallel checks in cust_payby::check & cust_payby::check_payinfo_cardtype
+    if ( $self->tokenized ) {
+      if ( $self->paymask =~ /^\d+x/ ) {
+        $self->set('paycardtype', cardtype($self->paymask));
       } else {
-        $self->set('paycardtype', cardtype($self->payinfo));
+        $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 ) {
@@ -232,17 +229,13 @@ sub payinfo_check {
 
   } else {
 
-    unless ( $self->paycardtype ) {
-
-      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', '');
-        # return "paycardtype required ".
-        #        "(can't derive from a token and no paymask w/prefix provided)";
-      }
-
+    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', '') unless $self->paycardtype;
+      # return "paycardtype required ".
+      #        "(can't derive from a token and no paymask w/prefix provided)";
     }
 
     if ( $self->is_encrypted($self->payinfo) ) {