don't require_cardname for non-CARD payby's

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 64e9b5f..4316988 100644 (file)
--- a/FS/FS/cust_main.pm
+++ b/FS/FS/cust_main.pm
@@ -689,7 +689,8 @@ sub check {
     return gettext('expired_card') if $y<$nowy || ( $y==$nowy && $1<$nowm );
   }
 
     return gettext('expired_card') if $y<$nowy || ( $y==$nowy && $1<$nowm );
   }
 

-  if ( $self->payname eq '' && ! $conf->exists('require_cardname') ) {
+  if ( $self->payname eq '' &&
+       ( ! $conf->exists('require_cardname') || $self->payby ne 'CARD' ) ) {

     $self->payname( $self->first. " ". $self->getfield('last') );
   } else {
     $self->payname =~ /^([\w \,\.\-\']+)$/
     $self->payname( $self->first. " ". $self->getfield('last') );
   } else {
     $self->payname =~ /^([\w \,\.\-\']+)$/