[freeside-commits] freeside/FS/FS cust_main.pm, 1.464.2.44, 1.464.2.45 pay_batch.pm, 1.15.2.7, 1.15.2.8

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv15511/FS/FS

Modified Files:
      Tag: FREESIDE_1_9_BRANCH
	cust_main.pm pay_batch.pm 
Log Message:
delete CVV when processing batch results, RT#9652

Index: pay_batch.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/pay_batch.pm,v
retrieving revision 1.15.2.7
retrieving revision 1.15.2.8
diff -u -w -d -r1.15.2.7 -r1.15.2.8
--- pay_batch.pm	19 Aug 2010 11:55:34 -0000	1.15.2.7
+++ pay_batch.pm	24 Aug 2010 03:03:31 -0000	1.15.2.8
@@ -7,6 +7,7 @@
 use FS::Record qw( dbh qsearch qsearchs );
 use FS::cust_pay;
 use FS::Conf;
+use Business::CreditCard qw(cardtype);
 
 @ISA = qw(FS::Record);
 
@@ -198,6 +199,8 @@
   my $job = $param->{'job'};
   $job->update_statustext(0) if $job;
 
+  my $conf = new FS::Conf;
+
   my $filetype            = $info->{'filetype'};      # CSV or fixed
   my @fields              = @{ $info->{'fields'}};
   my $formatre            = $info->{'formatre'};      # for fixed
@@ -356,6 +359,15 @@
       return "error updating status of paybatchnum $hash{'paybatchnum'}: $error\n";
     }
 
+    # purge CVV when the batch is processed
+    if ( $payby =~ /^(CARD|DCRD)$/ ) {
+      my $payinfo = $hash{'payinfo'} || $cust_pay_batch->payinfo;
+      if ( ! grep { $_ eq cardtype($payinfo) }
+          $conf->config('cvv-save') ) {
+        $new_cust_pay_batch->cust_main->remove_cvv;
+      }
+    }
+
     if ( $new_cust_pay_batch->status =~ /Approved/i ) {
 
       my $cust_pay = new FS::cust_pay ( {

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.464.2.44
retrieving revision 1.464.2.45
diff -u -w -d -r1.464.2.44 -r1.464.2.45
--- cust_main.pm	18 Aug 2010 19:42:39 -0000	1.464.2.44
+++ cust_main.pm	24 Aug 2010 03:03:31 -0000	1.464.2.45
@@ -5612,8 +5612,7 @@
 
   #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;