add pkey to batch payments and fix a doc typo

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

diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
index 7c5c6c4..671cd71 100644 (file)
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -35,6 +35,8 @@ following fields are currently supported:
 
 =over 4
 
+=item paybatchnum - primary key (automatically assigned)
+
 =item trancode - 77 for charges
 
 =item cardnum
@@ -117,7 +119,8 @@ sub check {
   my $self = shift;
 
   my $error = 
-      $self->ut_numbern('trancode')
+      $self->ut_numbern('paybatchnum')
+    || $self->ut_numbern('trancode')
     || $self->ut_number('cardnum') 
     || $self->ut_money('amount')
     || $self->ut_number('invnum')
@@ -176,7 +179,7 @@ sub check {
     or return "Illegal zip: ". $self->zip;
   $self->zip($1);
 
-  $self->country =~ /^(\w\w)$/ or return "Illegal \w\wy";
+  $self->country =~ /^(\w\w)$/ or return "Illegal country: ". $self->country;
   $self->country($1);
 
   #check invnum, custnum, ?
@@ -188,7 +191,7 @@ sub check {
 
 =head1 VERSION
 
-$Id: cust_pay_batch.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: cust_pay_batch.pm,v 1.3 2001-10-02 16:00:30 jeff Exp $
 
 =head1 BUGS