{
'key' => 'invoice_from',
'section' => 'required',
- 'description' => 'Return address on email invoices',
+ 'description' => 'Return address on email invoices (address only, see invoice_from_name)',
'type' => 'text',
'per_agent' => 1,
+ 'validate' => sub { $_[0] =~
+ /^[^@]+\@[[:alnum:]-]+(\.[[:alnum:]-]+)+$/
+ ? '' : 'Invalid email address';
+ }
+ },
+
+ {
+ 'key' => 'invoice_from_name',
+ 'section' => 'invoicing',
+ 'description' => 'Return name on email invoices (set address in invoice_from)',
+ 'type' => 'text',
+ 'per_agent' => 1,
+ 'validate' => sub { (($_[0] =~ /[^[:alnum:][:space:]]/) && ($_[0] !~ /^\".*\"$/))
+ ? 'Invalid name. Use quotation marks around names that contain punctuation.'
+ : '' }
},
{
RT::ConnectToDatabase();
}
- my $from = $conf->config('invoice_from');
+ my $from = $conf->config('invoice_from_name') ?
+ $conf->config('invoice_from_name') . ' <' .
+ $conf->config('invoice_from') . '>' :
+ $conf->config('invoice_from');
my $outbuf = '';;
my( $fs_interp, $rt_interp ) = mason_interps('standalone', 'outbuf'=>\$outbuf);
(
to => $to,
- from => $conf->config('invoice_from', $agentnum),
+ from => $conf->config('invoice_from_name', $agentnum) ?
+ $conf->config('invoice_from_name', $agentnum) . ' <' .
+ $conf->config('invoice_from', $agentnum) . '>' :
+ $conf->config('invoice_from', $agentnum),
subject => $subject,
body => $body,
);
push @to, $options{bcc} if defined($options{bcc});
local $@; # just in case
- eval { sendmail($message, { transport => $transport,
- from => $from,
- to => \@to }) };
+# eval { sendmail($message, { transport => $transport,
+# from => $from,
+# to => \@to }) };
my $error = '';
if(ref($@) and $@->isa('Email::Sender::Failure')) {
my $conf = new FS::Conf;
+ if ($conf->config('invoice_from') =~ /\<(.*)\>/) {
+ my $realemail = $1;
+ $realemail =~ s/^\s*//; # remove leading spaces
+ $realemail =~ s/\s*$//; # remove trailing spaces
+ my $realname = $conf->config('invoice_from');
+ $realname =~ s/\<.*\>//; # remove email address
+ $realname =~ s/^\s*//; # remove leading spaces
+ $realname =~ s/\s*$//; # remove trailing spaces
+ # properly quote names that contain punctuation
+ if (($realname =~ /[^[:alnum:][:space:]]/) && ($realname !~ /^\".*\"$/)) {
+ $realname = '"' . $realname . '"';
+ }
+ $conf->set('invoice_from_name', $realname);
+ $conf->set('invoice_from', $realemail);
+ }
+
$conf->touch('payment_receipt')
if $conf->exists('payment_receipt_email')
|| $conf->config('payment_receipt_msgnum');
# this is where we set the From: address
$from ||= $self->_agent_invoice_from || #XXX should go away
+ $conf->config('invoice_from_name', $self->cust_main->agentnum ) ?
+ $conf->config('invoice_from_name', $self->cust_main->agentnum ) . ' <' .
+ $conf->config('invoice_from', $self->cust_main->agentnum ) . '>' :
$conf->config('invoice_from', $self->cust_main->agentnum );
my @invoicing_list = $self->cust_main->invoicing_list_emailonly;
my $cust_main = $self->cust_main;
my $error = send_email(
- 'from' => $conf->config('invoice_from', $self->cust_main->agentnum),
+ 'from' => $conf->config('invoice_from_name', $self->cust_main->agentnum) ?
+ $conf->config('invoice_from_name', $self->cust_main->agentnum) . ' <' .
+ $conf->config('invoice_from', $self->cust_main->agentnum) . '>' :
+ $conf->config('invoice_from', $self->cust_main->agentnum),
#invoice_from??? well as good as any
'to' => $conf->config('deletecredits'),
'subject' => 'FREESIDE NOTIFICATION: Credit deleted',
return unless $conf->exists($template);
- my $from = $conf->config('invoice_from', $self->agentnum)
+ my $from = $conf->config('invoice_from_name', $self->agentnum) ?
+ $conf->config('invoice_from_name', $self->agentnum) . ' <' .
+ $conf->config('invoice_from', $self->agentnum) . '>' :
+ $conf->config('invoice_from', $self->agentnum)
if $conf->exists('invoice_from', $self->agentnum);
$from = $options{from} if exists($options{from});
};
my $error = send_email(
- 'from' => $conf->config('invoice_from', $self->agentnum ),
+ 'from' => $conf->config('invoice_from_name', $self->agentnum ) ?
+ $conf->config('invoice_from_name', $self->agentnum ) . ' <' .
+ $conf->config('invoice_from', $self->agentnum ) . '>' :
+ $conf->config('invoice_from', $self->agentnum ),
'to' => [ grep { $_ ne 'POST' } $self->invoicing_list ],
'subject' => 'Your payment could not be processed',
'body' => [ $template->fill_in(HASH => $templ_hash) ],
'msgtype' => 'receipt',
};
$error = $queue->insert(
- 'from' => $conf->config('invoice_from', $cust_main->agentnum),
+ 'from' => $conf->config('invoice_from_name', $cust_main->agentnum ) ?
+ $conf->config('invoice_from_name', $cust_main->agentnum ) . ' <' .
+ $conf->config('invoice_from', $cust_main->agentnum ) . '>' :
+ $conf->config('invoice_from', $cust_main->agentnum ),
#invoice_from??? well as good as any
'to' => \@invoicing_list,
'subject' => 'Payment receipt',
}
else {
$error = send_email(
- 'from' => $conf->config('invoice_from', $self->cust_main->agentnum),
+ 'from' => $conf->config('invoice_from_name', $self->cust_main->agentnum) ?
+ $conf->config('invoice_from_name', $self->cust_main->agentnum) . ' <' .
+ $conf->config('invoice_from', $self->cust_main->agentnum) . '>' :
+ $conf->config('invoice_from', $self->cust_main->agentnum),
'to' => \@invoicing_list,
'subject' => ( $conf->config('cancelsubject') || 'Cancellation Notice' ),
'body' => [ map "$_\n", $conf->config('cancelmessage') ],
$from_addr = scalar( $conf->config($opt{'from_config'},
$cust_main->agentnum) );
}
- $from_addr ||= scalar( $conf->config('invoice_from',
- $cust_main->agentnum) );
+ $from_addr ||= $conf->config('invoice_from_name', $cust_main->agentnum) ?
+ $conf->config('invoice_from_name', $cust_main->agentnum) . ' <' .
+ $conf->config('invoice_from', $cust_main->agentnum) . '>' :
+ $conf->config('invoice_from', $cust_main->agentnum);
}
# my @cust_msg = ();
# if ( $conf->exists('log_sent_mail') and !$opt{'preview'} ) {
my $body = "Import from gateway ".$gateway->label."\n".$error_text;
send_email(
to => $mail_on_error,
- from => $conf->config('invoice_from'),
+ from => $conf->config('invoice_from_name') ?
+ $conf->config('invoice_from_name') . ' <' .
+ $conf->config('invoice_from') . '>' :
+ $conf->config('invoice_from'),
subject => $subject,
body => $body,
);
# this is where we set the From: address
$from ||= $conf->config('quotation_from', $self->cust_or_prospect->agentnum )
- || $conf->config('invoice_from', $self->cust_or_prospect->agentnum );
-
+ || ($conf->config('invoice_from_name', $self->cust_or_prospect->agentnum ) ?
+ $conf->config('invoice_from_name', $self->cust_or_prospect->agentnum ) . ' <' .
+ $conf->config('invoice_from', $self->cust_or_prospect->agentnum ) . '>' :
+ $conf->config('invoice_from', $self->cust_or_prospect->agentnum ));
$self->SUPER::email( {
'from' => $from,
%$opt,
# (maybe use only the raw content, so that we don't have to supply a
# customer for substitutions? ewww.)
my %message = (
- 'from' => $conf->config('invoice_from'),
+ 'from' => $conf->config('invoice_from_name') ?
+ $conf->config('invoice_from_name') . ' <' .
+ $conf->config('invoice_from') . '>' :
+ $conf->config('invoice_from'),
'to' => $to,
'subject' => $self->subject,
'nobody' => 1,
#DB_TYPE = mysql
DB_USER = freeside
-DB_PASSWORD=
+DB_PASSWORD=hRoVj902
DATASOURCE = DBI:${DB_TYPE}:dbname=freeside
DIST_CONF = ${FREESIDE_CONF}/default_conf
#mod_perl v2 1.999_22 on Apache 2.0 through 2.3 (Debian ancient through 7.x)
-#APACHE_VERSION=2
+APACHE_VERSION=2
#Apache 2.4 (Debian 8.x)
-APACHE_VERSION=2.4
+#APACHE_VERSION=2.4
#deb
FREESIDE_DOCUMENT_ROOT = /var/www/freeside
#(an include directory, not a file, "Include /etc/apache/conf.d" in httpd.conf)
#debian unstable/8.0+, apache2.4
-APACHE_CONF = /etc/apache2/conf-available
+#APACHE_CONF = /etc/apache2/conf-available
#deb (3.1+), apache2
-#APACHE_CONF = /etc/apache2/conf.d
+APACHE_CONF = /etc/apache2/conf.d
INSSERV_OVERRIDE = /etc/insserv/overrides
#RT_ENABLED = 0
RT_ENABLED = 1
-RT_DOMAIN = example.com
-RT_TIMEZONE = US/Pacific
+RT_DOMAIN = localhost
+RT_TIMEZONE = US/Central
#RT_TIMEZONE = US/Eastern
-FREESIDE_URL = "http://192.168.1.6/freeside/"
+FREESIDE_URL = "http://localhost/freeside/"
#for now, same db as specified in DATASOURCE... eventually, otherwise?
RT_DB_DATABASE = freeside
<& /elements/tr-td-label.html, 'label' => 'From:' &>
<TD><& /elements/input-text.html,
'field' => 'from_name',
- 'value' => $conf->config('company_name', $agent_virt_agentnum), #?
+ 'value' => $conf->config('invoice_from_name', $agent_virt_agentnum) ||
+ $conf->config('company_name', $agent_virt_agentnum), #?
'size' => 20,
&> <\
<& /elements/input-text.html,