Virtual field merge

[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 6acb4fe..1a53046 100644 (file)
--- a/FS/FS/cust_pay_batch.pm
+++ b/FS/FS/cust_pay_batch.pm
@@ -126,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;
@@ -173,23 +173,26 @@ 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 country: ". $self->country;
   $self->country($1);
 
+  $error = $self->ut_zip('zip', $self->country);
+  return $error if $error;
+
   #check invnum, custnum, ?
 
-  ''; #no error
+  $self->SUPER::check;
 }
 
 =back
 
 =head1 VERSION
 
-$Id: cust_pay_batch.pm,v 1.4 2001-10-30 19:05:27 ivan Exp $
+$Id: cust_pay_batch.pm,v 1.7 2003-08-05 00:20:42 khoff Exp $
 
 =head1 BUGS