X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main.pm;h=4316988ca773e84a078e62b29b0317bfa4d93454;hb=b5124265c3f3781d0f961b836cbf674fde12ce54;hp=64e9b5f912e82b254bb3e0e6157c5c888d56ed9b;hpb=70e1035b6a95d2bb0b2bacc4316e9d0a973db813;p=freeside.git

diff --git a/FS/FS/cust_main.pm b/FS/FS/cust_main.pm
index 64e9b5f91..4316988ca 100644
--- 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 );
   }
 
-  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 \,\.\-\']+)$/