delete CVV when processing batch results, RT#9652

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 3556878..2a31a5b 100644 (file)
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -4926,8 +4926,7 @@ sub realtime_bop {
 
   #false laziness w/misc/process/payment.cgi - check both to make sure working
   # correctly
-  if ( defined $self->dbdef_table->column('paycvv')
-       && length($self->paycvv)
+  if ( length($self->paycvv)
        && ! grep { $_ eq cardtype($options{payinfo}) } $conf->config('cvv-save')
   ) {
     my $error = $self->remove_cvv;

diff --git a/FS/FS/pay_batch.pm b/FS/FS/pay_batch.pm
index 0b8c9f7..9a0b235 100644 (file)
--- a/FS/FS/pay_batch.pm
+++ b/FS/FS/pay_batch.pm
@@ -356,6 +356,10 @@ sub import_results {
       return "error updating status of paybatchnum $hash{'paybatchnum'}: $error\n";
     }
 
+    # purge CVV when the batch is processed
+    $new_cust_pay_batch->cust_main->remove_cvv
+      if ( $payby eq 'CARD' or $payby eq 'DCRD' );
+
     if ( $new_cust_pay_batch->status =~ /Approved/i ) {
 
       my $cust_pay = new FS::cust_pay ( {
@@ -402,11 +406,11 @@ sub import_results {
           return $error;
        }
 
-      }
+      } # foreach $cust_event
 
-    }
+    } # if(status eq 'Approved')
 
-  }
+  } # foreach(@all_values)
   
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';