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/DeliveryOrder.pm
480 480
  $::form->{id} = $self->order->id; # this is used in SL::Mailer to create a linked record to the mail
481 481
  $::form->send_email(\%::myconfig, 'pdf');
482 482

  
483
  # internal notes
484
  my $intnotes = $self->order->intnotes;
485
  $intnotes   .= "\n\n" if $self->order->intnotes;
486
  $intnotes   .= t8('[email]')                                                                                        . "\n";
487
  $intnotes   .= t8('Date')       . ": " . $::locale->format_date_object(DateTime->now_local, precision => 'seconds') . "\n";
488
  $intnotes   .= t8('To (email)') . ": " . $::form->{email}                                                           . "\n";
489
  $intnotes   .= t8('Cc')         . ": " . $::form->{cc}                                                              . "\n"    if $::form->{cc};
490
  $intnotes   .= t8('Bcc')        . ": " . $::form->{bcc}                                                             . "\n"    if $::form->{bcc};
491
  $intnotes   .= t8('Subject')    . ": " . $::form->{subject}                                                         . "\n\n";
492
  $intnotes   .= t8('Message')    . ": " . $::form->{message};
493

  
494
  $self->order->update_attributes(intnotes => $intnotes);
483
  # internal notes unless no email journal
484
  unless ($::instance_conf->get_email_journal) {
485

  
486
    my $intnotes = $self->order->intnotes;
487
    $intnotes   .= "\n\n" if $self->order->intnotes;
488
    $intnotes   .= t8('[email]')                                                                                        . "\n";
489
    $intnotes   .= t8('Date')       . ": " . $::locale->format_date_object(DateTime->now_local, precision => 'seconds') . "\n";
490
    $intnotes   .= t8('To (email)') . ": " . $::form->{email}                                                           . "\n";
491
    $intnotes   .= t8('Cc')         . ": " . $::form->{cc}                                                              . "\n"    if $::form->{cc};
492
    $intnotes   .= t8('Bcc')        . ": " . $::form->{bcc}                                                             . "\n"    if $::form->{bcc};
493
    $intnotes   .= t8('Subject')    . ": " . $::form->{subject}                                                         . "\n\n";
494
    $intnotes   .= t8('Message')    . ": " . $::form->{message};
495

  
496
    $self->order->update_attributes(intnotes => $intnotes);
497
  }
495 498

  
496 499
  $self->save_history('MAILED');
497 500

  

Auch abrufbar als: Unified diff