X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpayinfo_Mixin.pm;h=e944099fbc42a4d45945396bc79649fd76f12d4d;hb=c13b6c8f4b9876aa8f91e1c14d3c208ac0d189e9;hp=a0a2cbcc945fcbf1c3c76bee068efa718f06a0b7;hpb=f2b43a877c70aa367595fe2fc4fcffd82f62d001;p=freeside.git

diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm
index a0a2cbcc9..e944099fb 100644
--- a/FS/FS/payinfo_Mixin.pm
+++ b/FS/FS/payinfo_Mixin.pm
@@ -8,7 +8,8 @@ use FS::UID qw(driver_name);
 use FS::Cursor;
 use Time::Local qw(timelocal);
 
-use vars qw($ignore_masked_payinfo);
+# allow_closed_replace only relevant to cust_pay/cust_refund, for upgrade tokenizing
+use vars qw( $ignore_masked_payinfo $allow_closed_replace );
 
 =head1 NAME
 
@@ -67,7 +68,7 @@ sub payinfo {
   my($self,$payinfo) = @_;
 
   if ( defined($payinfo) ) {
-    $self->paymask($self->mask_payinfo) unless $self->tokenized; #make sure old mask is set
+    $self->paymask($self->mask_payinfo) unless $self->getfield('paymask') || $self->tokenized; #make sure old mask is set
     $self->setfield('payinfo', $payinfo);
     $self->paymask($self->mask_payinfo) unless $self->tokenized($payinfo); #remask unless tokenizing
   } else {
@@ -196,33 +197,48 @@ sub payinfo_check {
 
   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'); #???
+        $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');
@@ -306,13 +322,12 @@ sub payinfo_used {
   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;
@@ -430,11 +445,11 @@ sub upgrade_set_cardtype {
   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");
   }
 }
 
@@ -446,7 +461,7 @@ sub process_set_cardtype {
   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;
@@ -454,12 +469,18 @@ sub process_set_cardtype {
   }
 }
 
+=item tokenized [ PAYINFO ]
+
+Returns true if object payinfo is tokenized
+
+Optionally, an arbitrary payby and payinfo can be passed.
+
+=cut
+
 sub tokenized {
   my $self = shift;
   my $payinfo = scalar(@_) ? shift : $self->payinfo;
-  ## or just $self->cust_main->tokenized($payinfo) ??
-  ##   everything that currently uses this mixin is linked to cust_main,
-  ##   but just in case, false laziness w/ FS::cust_main::Billing_Realtime
+  return 0 unless $payinfo; #avoid uninitialized value error
   $payinfo =~ /^99\d{14}$/;
 }