X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fpay_batch.pm;h=afff261a0361cd3eac536c0b58d05c1d82d4fa10;hb=387c96b0d8f224f3ade27bed9348f37b432bbb8a;hp=9a0b235a97426b5dd6b15c1faa7ba5e1a4d0e94d;hpb=b48548f7e5fb15aacc0040ae0557d05b87fecfb2;p=freeside.git

diff --git a/FS/FS/pay_batch.pm b/FS/FS/pay_batch.pm
index 9a0b235a9..afff261a0 100644
--- a/FS/FS/pay_batch.pm
+++ b/FS/FS/pay_batch.pm
@@ -7,6 +7,7 @@ use Text::CSV_XS;
 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 @@ sub import_results {
   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
@@ -357,15 +360,20 @@ sub import_results {
     }
 
     # purge CVV when the batch is processed
-    $new_cust_pay_batch->cust_main->remove_cvv
-      if ( $payby eq 'CARD' or $payby eq 'DCRD' );
+    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 ( {
         'custnum'  => $custnum,
 	'payby'    => $payby,
-        'paybatch' => $self->batchnum,
+        'paybatch' => $hash{'paybatch'} || $self->batchnum,
         'payinfo'  => ( $hash{'payinfo'} || $cust_pay_batch->payinfo ),
         map { $_ => $hash{$_} } (qw( paid _date )),
       } );
@@ -406,11 +414,11 @@ sub import_results {
           return $error;
 	}
 
-      } # foreach $cust_event
+      }
 
-    } # if(status eq 'Approved')
+    }
 
-  } # foreach(@all_values)
+  }
   
   $dbh->commit or die $dbh->errstr if $oldAutoCommit;
   '';