X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fpayinfo_Mixin.pm;h=01b222634130d6b6ee2fe15a83be00fd07b30f5f;hp=ac92623113adbc8c96077347efbfdf2e2c06b51c;hb=dc83512c36dc6bea2585abada4f88d714c600e55;hpb=e00bf149d4f7335832b0316854ccc94e171af134

diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm
index ac9262311..01b222634 100644
--- a/FS/FS/payinfo_Mixin.pm
+++ b/FS/FS/payinfo_Mixin.pm
@@ -197,8 +197,16 @@ sub payinfo_check {
 
   if ( $self->payby eq 'CARD' && ! $self->is_encrypted($self->payinfo) ) {
 
-    if ( $self->tokenized && ! $self->paycardtype ) {
-      return "paycardtype required (cannot be derived from a token)";
+    # 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));
     }
@@ -210,7 +218,7 @@ sub payinfo_check {
       $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";
@@ -219,13 +227,18 @@ sub payinfo_check {
         $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');