X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_main_invoice.pm;h=48f47e0cd32df349059eb037aabdc94cc4f9863f;hb=f441bdef352ddd432e305da35e80813ca30e517f;hp=ebbadc6d99dbcdd53eb5289b9ed25ed4929ec77e;hpb=f726710e136944a42cf3ac405eb5d29637eb67a6;p=freeside.git diff --git a/FS/FS/cust_main_invoice.pm b/FS/FS/cust_main_invoice.pm index ebbadc6d9..48f47e0cd 100644 --- a/FS/FS/cust_main_invoice.pm +++ b/FS/FS/cust_main_invoice.pm @@ -7,6 +7,7 @@ use FS::Record qw( qsearchs ); use FS::Conf; use FS::cust_main; use FS::svc_acct; +use FS::Msgcat qw(gettext); @ISA = qw( FS::Record ); @@ -42,7 +43,7 @@ FS::Record. The following fields are currently supported: =item custnum - customer (see L) -=item dest - Invoice destination: If numeric, a svcnum (see L), 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), if string, a literal email address, `POST' to enable mailing (the default if no cust_main_invoice records exist), or `FAX' to enable faxing via a HylaFAX server. =back @@ -106,15 +107,17 @@ sub check { return "Unknown customer" unless qsearchs('cust_main',{ 'custnum' => $self->custnum }); - ''; #noerror + $self->SUPER::check; } =item checkdest -Checks the dest field only. If it finds that the account ends in the -same domain configured as the B configuration file, it will change the -invoice destination from an email address to a service number (see -L). +Checks the dest field only. + +#If it finds that the account ends in the +#same domain configured as the B configuration file, it will change the +#invoice destination from an email address to a service number (see +#L). =cut @@ -124,23 +127,16 @@ sub checkdest { my $error = $self->ut_text('dest'); return $error if $error; - if ( $self->dest eq 'POST' ) { + if ( $self->dest =~ /^(POST|FAX)$/ ) { #contemplate our navel } elsif ( $self->dest =~ /^(\d+)$/ ) { 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: $user\@$domain (specified literally)" -# unless $svc_acct; -# $svc_acct->svcnum =~ /^(\d+)$/ or die "Non-numeric svcnum?!"; -# $self->dest($1); -# } $self->dest("$1\@$2"); } else { - return "Illegal destination!"; + return gettext("illegal_email_invoice_address"). ': '. $self->dest; } ''; #no error @@ -148,7 +144,7 @@ sub checkdest { =item address -Returns the literal email address for this record (or `POST'). +Returns the literal email address for this record (or `POST' or `FAX'). =cut @@ -165,10 +161,6 @@ sub address { =back -=head1 VERSION - -$Id: cust_main_invoice.pm,v 1.10 2002-02-10 17:02:37 ivan Exp $ - =head1 BUGS =head1 SEE ALSO