Revision 4e5b5b9a
Von Jan Büren vor etwa 3 Jahren hinzugefügt
| SL/Common.pm | ||
|---|---|---|
|
|
||
|
my ($self, $myconfig, $form) = @_;
|
||
|
|
||
|
return unless ($::instance_conf->get_email_journal);
|
||
|
|
||
|
my ($table, $query, $dbh);
|
||
|
|
||
|
if ($form->{script} eq 'oe.pl') {
|
||
| ... | ... | |
|
the middle by a single space and remove tailing line feed/carriage
|
||
|
return characters).
|
||
|
|
||
|
=item C<save_email_status>
|
||
|
|
||
|
Adds sending information to internal notes.
|
||
|
Does nothing if the client config email_journal is enabled.
|
||
|
|
||
|
=back
|
||
|
|
||
|
=head1 BUGS
|
||
| SL/Controller/DeliveryOrder.pm | ||
|---|---|---|
|
$::form->{id} = $self->order->id; # this is used in SL::Mailer to create a linked record to the mail
|
||
|
$::form->send_email(\%::myconfig, 'pdf');
|
||
|
|
||
|
# internal notes
|
||
|
my $intnotes = $self->order->intnotes;
|
||
|
$intnotes .= "\n\n" if $self->order->intnotes;
|
||
|
$intnotes .= t8('[email]') . "\n";
|
||
|
$intnotes .= t8('Date') . ": " . $::locale->format_date_object(DateTime->now_local, precision => 'seconds') . "\n";
|
||
|
$intnotes .= t8('To (email)') . ": " . $::form->{email} . "\n";
|
||
|
$intnotes .= t8('Cc') . ": " . $::form->{cc} . "\n" if $::form->{cc};
|
||
|
$intnotes .= t8('Bcc') . ": " . $::form->{bcc} . "\n" if $::form->{bcc};
|
||
|
$intnotes .= t8('Subject') . ": " . $::form->{subject} . "\n\n";
|
||
|
$intnotes .= t8('Message') . ": " . $::form->{message};
|
||
|
|
||
|
$self->order->update_attributes(intnotes => $intnotes);
|
||
|
# internal notes unless no email journal
|
||
|
unless ($::instance_conf->get_email_journal) {
|
||
|
|
||
|
my $intnotes = $self->order->intnotes;
|
||
|
$intnotes .= "\n\n" if $self->order->intnotes;
|
||
|
$intnotes .= t8('[email]') . "\n";
|
||
|
$intnotes .= t8('Date') . ": " . $::locale->format_date_object(DateTime->now_local, precision => 'seconds') . "\n";
|
||
|
$intnotes .= t8('To (email)') . ": " . $::form->{email} . "\n";
|
||
|
$intnotes .= t8('Cc') . ": " . $::form->{cc} . "\n" if $::form->{cc};
|
||
|
$intnotes .= t8('Bcc') . ": " . $::form->{bcc} . "\n" if $::form->{bcc};
|
||
|
$intnotes .= t8('Subject') . ": " . $::form->{subject} . "\n\n";
|
||
|
$intnotes .= t8('Message') . ": " . $::form->{message};
|
||
|
|
||
|
$self->order->update_attributes(intnotes => $intnotes);
|
||
|
}
|
||
|
|
||
|
$self->save_history('MAILED');
|
||
|
|
||
| SL/Controller/Order.pm | ||
|---|---|---|
|
$::form->{id} = $self->order->id; # this is used in SL::Mailer to create a linked record to the mail
|
||
|
$::form->send_email(\%::myconfig, $::form->{print_options}->{format});
|
||
|
|
||
|
# internal notes
|
||
|
my $intnotes = $self->order->intnotes;
|
||
|
$intnotes .= "\n\n" if $self->order->intnotes;
|
||
|
$intnotes .= t8('[email]') . "\n";
|
||
|
$intnotes .= t8('Date') . ": " . $::locale->format_date_object(DateTime->now_local, precision => 'seconds') . "\n";
|
||
|
$intnotes .= t8('To (email)') . ": " . $::form->{email} . "\n";
|
||
|
$intnotes .= t8('Cc') . ": " . $::form->{cc} . "\n" if $::form->{cc};
|
||
|
$intnotes .= t8('Bcc') . ": " . $::form->{bcc} . "\n" if $::form->{bcc};
|
||
|
$intnotes .= t8('Subject') . ": " . $::form->{subject} . "\n\n";
|
||
|
$intnotes .= t8('Message') . ": " . SL::HTML::Util->strip($::form->{message});
|
||
|
|
||
|
$self->order->update_attributes(intnotes => $intnotes);
|
||
|
# internal notes unless no email journal
|
||
|
unless ($::instance_conf->get_email_journal) {
|
||
|
my $intnotes = $self->order->intnotes;
|
||
|
$intnotes .= "\n\n" if $self->order->intnotes;
|
||
|
$intnotes .= t8('[email]') . "\n";
|
||
|
$intnotes .= t8('Date') . ": " . $::locale->format_date_object(DateTime->now_local, precision => 'seconds') . "\n";
|
||
|
$intnotes .= t8('To (email)') . ": " . $::form->{email} . "\n";
|
||
|
$intnotes .= t8('Cc') . ": " . $::form->{cc} . "\n" if $::form->{cc};
|
||
|
$intnotes .= t8('Bcc') . ": " . $::form->{bcc} . "\n" if $::form->{bcc};
|
||
|
$intnotes .= t8('Subject') . ": " . $::form->{subject} . "\n\n";
|
||
|
$intnotes .= t8('Message') . ": " . SL::HTML::Util->strip($::form->{message});
|
||
|
|
||
|
$self->order->update_attributes(intnotes => $intnotes);
|
||
|
}
|
||
|
|
||
|
$self->save_history('MAILED');
|
||
|
|
||
Auch abrufbar als: Unified diff
E-Mail-Protokollierung in interne Bemerkung abschalten, falls Journal an