per-agent disable_previous_balance, #15863

[freeside.git] / FS / FS / cust_pay_void.pm

diff --git a/FS/FS/cust_pay_void.pm b/FS/FS/cust_pay_void.pm
index 1a298ba..f1193cd 100644 (file)
--- a/FS/FS/cust_pay_void.pm
+++ b/FS/FS/cust_pay_void.pm
@@ -207,11 +207,12 @@ sub check {
     $payinfo =~ s/\D//g;
     $self->payinfo($payinfo);
     if ( $self->payinfo ) {
-      $self->payinfo =~ /^(\d{13,16})$/
+      $self->payinfo =~ /^(\d{13,16}|\d{8,9})$/
         or return "Illegal (mistyped?) credit card number (payinfo)";
       $self->payinfo($1);
       validate($self->payinfo) or return "Illegal credit card number";
-      return "Unknown card type" if cardtype($self->payinfo) eq "Unknown";
+      return "Unknown card type" if $self->payinfo !~ /^99\d{14}$/ #token
+                                 && cardtype($self->payinfo) eq "Unknown";
     } else {
       $self->payinfo('N/A');
     }
@@ -253,12 +254,13 @@ sub void_access_user {
 sub _upgrade_data {  # class method
   my ($class, %opts) = @_;
 
-  my $sql = "SELECT usernum FROM access_user WHERE username = ( SELECT history_user FROM h_cust_pay_void WHERE paynum = ? AND history_action = 'insert' ) ";
+  my $sql = "SELECT usernum FROM access_user WHERE username = ( SELECT history_user FROM h_cust_pay_void WHERE paynum = ? AND history_action = 'insert' ORDER BY history_date LIMIT 1 ) ";
   my $sth = dbh->prepare($sql) or die dbh->errstr;
 
   foreach my $cust_pay_void (qsearch('cust_pay_void', {'void_usernum' => ''})) {
     $sth->execute($cust_pay_void->paynum) or die $sth->errstr;
-    my $usernum = $sth->fetchrow_arrayref->[0] or next;
+    my $row = $sth->fetchrow_arrayref;
+    my $usernum = $row ? $row->[0] : '';
     if ( $usernum ) {
       $cust_pay_void->void_usernum($usernum);
       my $error = $cust_pay_void->replace;