X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/f9b53d4af20d99001897df018b22f30bf7c9186d..3675add4feb3acce37e8e9fea1813f94c9a77e18:/SL/Controller/Letter.pm

diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm
index 6509742d7..14922a77a 100644
--- a/SL/Controller/Letter.pm
+++ b/SL/Controller/Letter.pm
@@ -3,18 +3,24 @@ package SL::Controller::Letter;
 use strict;
 use parent qw(SL::Controller::Base);
 
+use Carp;
+use File::Basename;
 use POSIX qw(strftime);
 use SL::Controller::Helper::GetModels;
 use SL::Controller::Helper::ReportGenerator;
+use SL::CT;
 use SL::DB::Letter;
 use SL::DB::LetterDraft;
 use SL::DB::Employee;
-use SL::Helper::Flash qw(flash);
+use SL::Helper::Flash qw(flash flash_later);
 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;
+use SL::Webdav::File;
 
 use Rose::Object::MakeMethods::Generic (
   'scalar --get_set_init' => [ qw(letter all_employees models) ],
@@ -167,7 +173,7 @@ sub action_list {
 }
 
 sub action_print_letter {
-  my ($self, $old_form) = @_;
+  my ($self, %params) = @_;
 
   my $display_form = $::form->{display_form} || "display_form";
   my $letter       = $self->_update;
@@ -219,67 +225,72 @@ sub action_print_letter {
     template  => $template_file,
     variables => $::form,
     return    => 'file_name',
+    variable_content_types => {
+      body                 => 'html',
+    },
   );
 
   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;
-    }
-
-    if (!$::form->{printer_id} || $::form->{media} eq 'screen') {
-
-      my $file = IO::File->new($pdf_file_name, 'r') || croak("Cannot open file '$pdf_file_name'");
-      my $size = -s $pdf_file_name;
-      my $content_type    =  'application/pdf';
-      $::form->{letternumber} = $self->letter->letternumber;
-      my $attachment_name =  $::form->generate_attachment_filename;
-      $attachment_name    =~ s:.*//::g;
+      $mail->send;
+      unlink $pdf_file_name;
 
-      print $::form->create_http_response(content_type        => $content_type,
-                                          content_disposition => 'attachment; filename="' . $attachment_name . '"',
-                                          content_length      => $size);
+      flash_later('info', t8('The email has been sent.'));
+      $self->redirect_to(action => 'edit', 'letter.id' => $self->letter->id);
 
-      $::locale->with_raw_io(\*STDOUT, sub { print while <$file> });
-      $file->close;
+      return 1;
+    }
 
-      Common::copy_file_to_webdav_folder($::form) if $::instance_conf->get_webdav_documents;
+    if (!$::form->{printer_id} || $::form->{media} eq 'screen') {
+      $self->send_file($pdf_file_name, name => $attachment_name);
       unlink $pdf_file_name;
+
       return 1;
     }
 
     my $printer = SL::DB::Printer->new(id => $::form->{printer_id})->load;
-    my $command = SL::Template::create(type => 'ShellCommand', form => Form->new(''))->parse($printer->printer_command);
+    $printer->print_document(
+      copies    => $::form->{copies},
+      file_name => $pdf_file_name,
+    );
 
-    open my $out, '|-', $command or die $!;
-    binmode $out;
-    print $out scalar(read_file($pdf_file_name));
-    close $out;
-    Common::copy_file_to_webdav_folder($::form) 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', id => $letter->{id}, 'printer_id' => $::form->{printer_id});
+    $self->redirect_to(action => 'edit', 'letter.id' => $self->letter->id, media => 'printer', printer_id => $::form->{printer_id});
     1;
   } or do {
-    unlink $pdf_file_name;
+    unlink $pdf_file_name if $pdf_file_name;
     $::form->error(t8("Creating the PDF failed:") . " " . $@);
   };
-
 }
 
 sub action_update {
@@ -301,9 +312,54 @@ sub action_delete_drafts {
   $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) = @_;
 
+  $::request->{layout}->use_javascript("${_}.js") for qw(ckeditor/ckeditor ckeditor/adapters/jquery);
+
   my $letter = $self->letter;
 
  $params{title} ||= t8('Edit Letter');
@@ -315,6 +371,7 @@ sub _display {
   $::request->layout->add_javascripts('edit_part_window.js');
 
   $::form->{language_id} ||= $params{language_id};
+  $::form->{printers}      = SL::DB::Manager::Printer->get_all_sorted;
 
   $self->render('letter/edit',
     %params,
@@ -422,19 +479,6 @@ sub make_filter_summary {
   $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) = @_;