X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpayinfo_Mixin.pm;h=3a32ad5b23a20f0bab1050022d0fa85881e35ca4;hb=80542a7f5c52ac2f631adc82d0e4326554200793;hp=4f26e8c6f54a132d45752ee1810dbd72aaa4de0d;hpb=43f9be2fd8ef088788ade01d2e4bcc0667be36e5;p=freeside.git

diff --git a/FS/FS/payinfo_Mixin.pm b/FS/FS/payinfo_Mixin.pm
index 4f26e8c6f..3a32ad5b2 100644
--- a/FS/FS/payinfo_Mixin.pm
+++ b/FS/FS/payinfo_Mixin.pm
@@ -67,8 +67,9 @@ sub payinfo {
   my($self,$payinfo) = @_;
 
   if ( defined($payinfo) ) {
+    $self->paymask($self->mask_payinfo) unless $self->payinfo =~ /^99\d{14}$/; #make sure old mask is set
     $self->setfield('payinfo', $payinfo);
-    $self->paymask($self->mask_payinfo) unless $payinfo =~ /^99\d{14}$/; #token
+    $self->paymask($self->mask_payinfo) unless $payinfo =~ /^99\d{14}$/; #remask unless tokenizing
   } else {
     $self->getfield('payinfo');
   }
@@ -420,15 +421,30 @@ sub paydate_epoch_sql {
 Find all records with a credit card payment type and no paycardtype, and
 replace them in order to set their paycardtype.
 
+This method actually just starts a queue job.
+
 =cut
 
 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") ) {
+    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");
+  }
+}
+
+sub process_set_cardtype {
+  my $table = shift;
+
   # assign cardtypes to CARD/DCRDs that need them; check_payinfo_cardtype
   # will do this. ignore any problems with the cards.
   local $ignore_masked_payinfo = 1;
   my $search = FS::Cursor->new({
-    table     => $class->table,
+    table     => $table,
     extra_sql => q[ WHERE payby IN('CARD','DCRD') AND paycardtype IS NULL ],
   });
   while (my $record = $search->fetch) {