Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision 4e5b5b9a

Von Jan Büren vor fast 3 Jahren hinzugefügt

  • ID 4e5b5b9af6890d18732f658eb5875aabf8c4d760
  • Vorgänger b403498c
  • Nachfolger 692cdaa8

E-Mail-Protokollierung in interne Bemerkung abschalten, falls Journal an

Unterschiede anzeigen:

SL/Controller/Order.pm
516 516
  $::form->{id} = $self->order->id; # this is used in SL::Mailer to create a linked record to the mail
517 517
  $::form->send_email(\%::myconfig, $::form->{print_options}->{format});
518 518

  
519
  # internal notes
520
  my $intnotes = $self->order->intnotes;
521
  $intnotes   .= "\n\n" if $self->order->intnotes;
522
  $intnotes   .= t8('[email]')                                                                                        . "\n";
523
  $intnotes   .= t8('Date')       . ": " . $::locale->format_date_object(DateTime->now_local, precision => 'seconds') . "\n";
524
  $intnotes   .= t8('To (email)') . ": " . $::form->{email}                                                           . "\n";
525
  $intnotes   .= t8('Cc')         . ": " . $::form->{cc}                                                              . "\n"    if $::form->{cc};
526
  $intnotes   .= t8('Bcc')        . ": " . $::form->{bcc}                                                             . "\n"    if $::form->{bcc};
527
  $intnotes   .= t8('Subject')    . ": " . $::form->{subject}                                                         . "\n\n";
528
  $intnotes   .= t8('Message')    . ": " . SL::HTML::Util->strip($::form->{message});
529

  
530
  $self->order->update_attributes(intnotes => $intnotes);
519
  # internal notes unless no email journal
520
  unless ($::instance_conf->get_email_journal) {
521
    my $intnotes = $self->order->intnotes;
522
    $intnotes   .= "\n\n" if $self->order->intnotes;
523
    $intnotes   .= t8('[email]')                                                                                        . "\n";
524
    $intnotes   .= t8('Date')       . ": " . $::locale->format_date_object(DateTime->now_local, precision => 'seconds') . "\n";
525
    $intnotes   .= t8('To (email)') . ": " . $::form->{email}                                                           . "\n";
526
    $intnotes   .= t8('Cc')         . ": " . $::form->{cc}                                                              . "\n"    if $::form->{cc};
527
    $intnotes   .= t8('Bcc')        . ": " . $::form->{bcc}                                                             . "\n"    if $::form->{bcc};
528
    $intnotes   .= t8('Subject')    . ": " . $::form->{subject}                                                         . "\n\n";
529
    $intnotes   .= t8('Message')    . ": " . SL::HTML::Util->strip($::form->{message});
530

  
531
    $self->order->update_attributes(intnotes => $intnotes);
532
  }
531 533

  
532 534
  $self->save_history('MAILED');
533 535

  

Auch abrufbar als: Unified diff