X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main_invoice.pm;h=61a8f75343cd72a0138faf08b727a7a91c4394b8;hb=6b86dff993093cc34ca370ec8352103a7f3208f8;hp=bd7d53dd6e5e0f33e421a1938884f24ebb698575;hpb=6cd87c0d3b5280446301c647fa5f1ec5a593fa3f;p=freeside.git

diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm
index bd7d53dd6..61a8f7534 100644
--- a/FS/FS/cust_main_invoice.pm
+++ b/FS/FS/cust_main_invoice.pm
@@ -48,7 +48,7 @@ FS::Record.  The following fields are currently supported:
 
 =item custnum - customer (see L<FS::cust_main>)
 
-=item dest - Invoice destination: If numeric, a <a href="#svc_acct">svcnum</a>, if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)
+=item dest - Invoice destination: If numeric, a svcnum (see L<FS::svc_acct>), if string, a literal email address, or `POST' to enable mailing (the default if no cust_main_invoice records exist)
 
 =back
 
@@ -117,7 +117,10 @@ sub check {
 
 =item checkdest
 
-Checks the dest field only.
+Checks the dest field only.  If it finds that the account ends in the
+same domain configured as the B<domain> configuration file, it will change the
+invoice destination from an email address to a service number (see
+L<FS::svc_acct>).
 
 =cut
 
@@ -130,13 +133,14 @@ sub checkdest {
   if ( $self->dest eq 'POST' ) {
     #contemplate our navel
   } elsif ( $self->dest =~ /^(\d+)$/ ) {
-    return "Unknown local account (specified by svcnum)"
+    return "Unknown local account (specified by svcnum: ". $self->dest. ")"
       unless qsearchs( 'svc_acct', { 'svcnum' => $self->dest } );
   } elsif ( $self->dest =~ /^([\w\.\-]+)\@(([\w\.\-]+\.)+\w+)$/ ) {
     my($user, $domain) = ($1, $2);
     if ( $domain eq $mydomain ) {
       my $svc_acct = qsearchs( 'svc_acct', { 'username' => $user } );
-      return "Unknown local account (specified literally)" unless $svc_acct;
+      return "Unknown local account: $user\@$domain (specified literally)"
+        unless $svc_acct;
       $svc_acct->svcnum =~ /^(\d+)$/ or die "Non-numeric svcnum?!";
       $self->dest($1);
     }
@@ -155,8 +159,9 @@ Returns the literal email address for this record (or `POST').
 
 sub address {
   my $self = shift;
-  if ( $self->dest =~ /(\d+)$/ ) {
-    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $1 } );
+  if ( $self->dest =~ /^(\d+)$/ ) {
+    my $svc_acct = qsearchs( 'svc_acct', { 'svcnum' => $1 } )
+      or return undef;
     $svc_acct->username . '@' . $mydomain;
   } else {
     $self->dest;
@@ -167,7 +172,7 @@ sub address {
 
 =head1 VERSION
 
-$Id: cust_main_invoice.pm,v 1.1 1999-08-04 09:03:53 ivan Exp $
+$Id: cust_main_invoice.pm,v 1.6 2001-08-12 00:06:33 ivan Exp $
 
 =head1 BUGS