/ - Diff - projekt kivitendo - wissen

     use SL::Helper::CreatePDF;
     use SL::Helper::PrintOptions;
     use SL::Locale::String qw(t8);
     use SL::Mailer;
     use SL::IS;
     use SL::ReportGenerator;
     use SL::Webdav;
-...
+    }
     sub action_print_letter {
       my ($self, $old_form) = @_;
       my ($self, %params) = @_;
       my $display_form = $::form->{display_form} || "display_form";
       my $letter       = $self->_update;
-...
       my $pdf_file_name;
       eval {
         $pdf_file_name = SL::Helper::CreatePDF->create_pdf(%create_params);
         $pdf_file_name          = SL::Helper::CreatePDF->create_pdf(%create_params);
         $::form->{letternumber} = $self->letter->letternumber;
         my $attachment_name     = $::form->generate_attachment_filename;
         if ($::instance_conf->get_webdav_documents) {
           my $webdav_file = SL::Webdav::File->new(
             filename => $attachment_name,
             webdav   => SL::Webdav->new(
               type   => 'letter',
               number => $self->letter->letternumber,
             ),
           );
           $webdav_file->store(file => $pdf_file_name);
+        }
         # set some form defaults for printing webdav copy variables
         if ( $::form->{media} eq 'email') {
           my $mail             = Mailer->new;
           my $signature        = $::myconfig{signature};
           $mail->{$_}          = $::form->{$_}               for qw(cc subject message bcc to);
           $mail->{$_}          = $params{email}->{$_} for qw(to cc subject message bcc);
           $mail->{from}        = qq|"$::myconfig{name}" <$::myconfig{email}>|;
           $mail->{fileid}      = time() . '.' . $$ . '.';
           $mail->{attachments} =  [{ "filename" => $pdf_file_name,
                                      "name"     => $::form->{attachment_name} }];
           $mail->{attachments} = [{ filename => $pdf_file_name,
                                     name     => $params{email}->{attachment_filename} }];
           $mail->{message}    .=  "\n-- \n$signature";
           $mail->{message}     =~ s/\r//g;
           # copy_file_to_webdav was already done via io.pl -> edit_e_mail
           my $err = $mail->send;
           return !$err;
+        }
           $mail->send;
           unlink $pdf_file_name;
         $::form->{letternumber} = $self->letter->letternumber;
         my $attachment_name     = $::form->generate_attachment_filename;
         my $webdav_file         = SL::Webdav::File->new(
           filename => $attachment_name,
           webdav   => SL::Webdav->new(
             type   => 'letter',
             number => $self->letter->letternumber,
           ),
         );
           flash_later('info', t8('The email has been sent.'));
           $self->redirect_to(action => 'edit', 'letter.id' => $self->letter->id);
           return 1;
+        }
         if (!$::form->{printer_id} || $::form->{media} eq 'screen') {
           $self->send_file($pdf_file_name, name => $attachment_name);
           $webdav_file->store(file => $pdf_file_name) if $::instance_conf->get_webdav_documents;
           unlink $pdf_file_name;
           return 1;
-...
           file_name => $pdf_file_name,
         );
         $webdav_file->store(file => $pdf_file_name) if $::instance_conf->get_webdav_documents;
         unlink $pdf_file_name;
         flash_later('info', t8('The documents have been sent to the printer \'#1\'.', $printer->printer_description));
         $self->redirect_to(action => 'edit', 'letter.id' => $self->letter->id, media => 'printer', printer_id => $::form->{printer_id});
 ;
       } or do {
         unlink $pdf_file_name;
         unlink $pdf_file_name if $pdf_file_name;
         $::form->error(t8("Creating the PDF failed:") . " " . $@);
       };
+    }
     sub action_update {
-...
       $self->action_add(skip_drafts => 1);
+    }
     sub action_edit_email {
       my ($self) = @_;
       my $letter = $self->_update;
       $self->export_letter_to_form($letter);
       $::form->{formname}     = "letter";
       $::form->{type}         = "letter";
       $::form->{letternumber} = $self->letter->letternumber;
       my @hiddens = map {
         my $value = $letter->$_;
         $value    = $value->to_kivitendo if ref($_) =~ m{Date};
         { name => "letter.$_", value => $value }
       } ($letter->meta->columns);
       my %vars = (
         script     => 'controller.pl',
         title      => t8('Send letter via e-mail'),
         email      => $letter->contact ? $letter->contact->cp_email : '',
         subject    => $::form->generate_email_subject,
         a_filename => $::form->generate_attachment_filename,
         action     => 'Letter/send_email',
         HIDDEN     => \@hiddens,
         SHOW_BCC   => $::auth->assert('email_bcc', 'may fail'),
       );
       $self->render('generic/edit_email', %vars);
+    }
     sub action_send_email {
       my ($self) = @_;
       $::form->{media} = 'email';
       $self->action_print_letter(
         email => {
           to => $::form->{email},
           map { ($_ => $::form->{$_}) } qw(cc bcc subject attachment_filename message)
+        }
       );
+    }
     sub _display {
       my ($self, %params) = @_;
-...
       $self->{filter_summary} = join ', ', @filter_strings;
+    }
     sub e_mail {
       my $letter = _update();
       $letter->check_number;
       $letter->save;
       $::form->{formname} = "letter";
       $letter->export_to($::form);
       $::form->{id} = $letter->{id};
       edit_e_mail();
+    }
     sub load_letter_draft {
       my ($self, %params) = @_;

bin/mozilla/io.pl
1059	1059	a_filename => $attachment_filename,
1060	1060	subject => $subject,
1061	1061	print_options => print_options('inline' => 1),
	1062	action => 'send_email',
1062	1063	HIDDEN => [ map +{ name => $_, value => $form->{$_} }, @hidden_keys ],
1063	1064	SHOW_BCC => $::auth->assert('email_bcc', 'may fail') });
1064	1065

doc/changelog
13	13	- Die Weiterleitung nach dem Löschen von Briefen wurde gefixt.
14	14	- Das Drucken von Briefen direkt auf Drucker wurde gefixt.
15	15	- Die Auswahl einer Ansprechpersonen in der Brieffunktion wurde gefixt.
	16	- Briefe können nun per E-Mail verschickt werden.
16	17
17	18
18	19	2016-03-12 - Release 3.4.0

       </tr>
     </table>
     <input type="hidden" name="nextsub" value="send_email">
     [% L.hidden_tag('action', action) %]
     <br>
     [% L.submit_tag('action', LxERP.t8('Continue'), onclick="return check_prerequisites();") %]
     [% L.submit_tag('dummy_action', LxERP.t8('Continue'), onclick="return check_prerequisites();") %]
     </form>
     <script type="text/javascript">

templates/webpages/letter/edit.html
145	145	<input class="submit" type="submit" name="action_update" id="update_button" value="[% 'Update' \| $T8 %]">
146	146
147	147	[%- IF letter.letternumber %]
	148	<input class="submit" type="submit" name="action_edit_email" value="[% 'E-mail' \| $T8 %]">
148	149	<input class="submit" type="submit" name="action_print_letter" value="[% 'Print' \| $T8 %]">
149	150	[% END %]
150	151

Projekt

Allgemein

Profil

projekt kivitendo

Revision 3675add4

Von Moritz Bunkus vor mehr als 8 Jahren hinzugefügt