Commit f9a6008e authored by Nigel Kukard's avatar Nigel Kukard
Browse files

Merge branch 'pdf' into 'master'

Slightly better invoice email subject

See merge request !46
parents 2dec9e9d 137e93b9
Pipeline #4104 passed with stages
in 2 minutes and 42 seconds
...@@ -78,6 +78,9 @@ server = localhost ...@@ -78,6 +78,9 @@ server = localhost
# Email attachment template # Email attachment template
#email_template= invoices/invoice1.tt2 #email_template= invoices/invoice1.tt2
# Email message subject prefix
#email_subject_prefix=
# Email body template # Email body template
#email_message_template= #email_message_template=
......
...@@ -1346,13 +1346,17 @@ sub sendInvoice ...@@ -1346,13 +1346,17 @@ sub sendInvoice
# } # }
# } # }
# Build email subject
my $emailSubject = $config->{'invoicing'}{'email_subject_prefix'} // "";
$emailSubject .= "$invoiceTitle: $invoiceNumber";
# Create message # Create message
my $msg = MIME::Lite->new( my $msg = MIME::Lite->new(
From => $config->{'invoicing'}{'email_from'}, From => $config->{'invoicing'}{'email_from'},
To => $emailAddy, To => $emailAddy,
Bcc => $config->{'invoicing'}{'email_bcc'}, Bcc => $config->{'invoicing'}{'email_bcc'},
'Reply-To' => $config->{'invoicing'}{'email_reply_to'}, 'Reply-To' => $config->{'invoicing'}{'email_reply_to'},
Subject => "Invoice: ".$invoice->{'Number'}, Subject => $emailSubject,
Type => 'multipart/mixed' Type => 'multipart/mixed'
); );
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment