X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_pay_batch.pm;h=c4427c38713b6e1773e2d1c5b32b198ff3f50733;hb=98567e531e90ee1c7c195d5f1e708898d47a8452;hp=7c5c6c40457b43345d6b978dbb46902bfbb544b8;hpb=6cd87c0d3b5280446301c647fa5f1ec5a593fa3f;p=freeside.git

diff --git a/FS/FS/cust_pay_batch.pm b/FS/FS/cust_pay_batch.pm
index 7c5c6c404..c4427c387 100644
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -35,7 +35,7 @@ following fields are currently supported:
 
 =over 4
 
-=item trancode - 77 for charges
+=item paybatchnum - primary key (automatically assigned)
 
 =item cardnum
 
@@ -117,7 +117,8 @@ sub check {
   my $self = shift;
 
   my $error = 
-      $self->ut_numbern('trancode')
+      $self->ut_numbern('paybatchnum')
+    || $self->ut_numbern('trancode') #depriciated
     || $self->ut_number('cardnum') 
     || $self->ut_money('amount')
     || $self->ut_number('invnum')
@@ -125,7 +126,7 @@ sub check {
     || $self->ut_text('address1')
     || $self->ut_textn('address2')
     || $self->ut_text('city')
-    || $self->ut_text('state')
+    || $self->ut_textn('state')
   ;
 
   return $error if $error;
@@ -172,13 +173,16 @@ sub check {
     $self->payname($1);
   }
 
-  $self->zip =~ /^\s*(\w[\w\-\s]{3,8}\w)\s*$/
-    or return "Illegal zip: ". $self->zip;
-  $self->zip($1);
+  #$self->zip =~ /^\s*(\w[\w\-\s]{3,8}\w)\s*$/
+  #  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);
 
+  $error = $self->ut_zip('zip', $self->country);
+  return $error if $error;
+
   #check invnum, custnum, ?
 
   ''; #no error
@@ -188,7 +192,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.6 2002-02-22 23:08:11 ivan Exp $
 
 =head1 BUGS