[freeside-commits] freeside/FS/FS cust_main.pm, 1.541, 1.542 pay_batch.pm, 1.22, 1.23

[Mark Wells]

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

Modified Files:
	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.22
retrieving revision 1.23
diff -u -w -d -r1.22 -r1.23
--- pay_batch.pm	19 Aug 2010 11:55:33 -0000	1.22
+++ pay_batch.pm	24 Aug 2010 01:59:31 -0000	1.23
@@ -356,6 +356,10 @@
       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 @@
           return $error;
 	}
 
-      }
+      } # foreach $cust_event
 
-    }
+    } # if(status eq 'Approved')
 
-  }
+  } # foreach(@all_values)
   
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';

Index: cust_main.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/cust_main.pm,v
retrieving revision 1.541
retrieving revision 1.542
diff -u -w -d -r1.541 -r1.542
--- cust_main.pm	23 Aug 2010 20:02:41 -0000	1.541
+++ cust_main.pm	24 Aug 2010 01:59:31 -0000	1.542
@@ -4926,8 +4926,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;