TopQuickSearch::Contact: fragment statt hash für for_url

[kivitendo-erp.git] / SL / Controller / Letter.pm

diff --git a/SL/Controller/Letter.pm b/SL/Controller/Letter.pm
index 69e2bdf..4cc5b55 100644 (file)
--- a/SL/Controller/Letter.pm
+++ b/SL/Controller/Letter.pm
@@ -20,6 +20,7 @@ use SL::Helper::PrintOptions;
 use SL::Locale::String qw(t8);
 use SL::Mailer;
 use SL::IS;
+use SL::Presenter::Tag qw(select_tag);
 use SL::ReportGenerator;
 use SL::Webdav;
 use SL::Webdav::File;
@@ -124,7 +125,7 @@ sub action_update_contacts {
   $self->js
     ->replaceWith(
       '#letter_cp_id',
-      SL::Presenter->get->select_tag('letter.cp_id', $contacts, default => $default, value_key => 'cp_id', title_key => 'full_name')
+      select_tag('letter.cp_id', $contacts, default => $default, value_key => 'cp_id', title_key => 'full_name')
     )
     ->render;
 }
@@ -176,7 +177,7 @@ sub action_list {
   $self->prepare_report;
 
   my $letters = $self->models->get;
-  $self->report_generator_list_objects(report => $self->{report}, objects => $letters, action_bar => 1);
+  $self->report_generator_list_objects(report => $self->{report}, objects => $letters);
 
 }
 
@@ -241,8 +242,8 @@ sub action_print_letter {
       my $signature        = $::myconfig{signature};
       $mail->{$_}          = $params{email}->{$_} for qw(to cc subject message bcc);
       $mail->{from}        = qq|"$::myconfig{name}" <$::myconfig{email}>|;
-      $mail->{attachments} = [{ filename => $result{file_name},
-                                name     => $params{email}->{attachment_filename} }];
+      $mail->{attachments} = [{ path => $result{file_name},
+                                name => $params{email}->{attachment_filename} }];
       $mail->{message}    .=  "\n-- \n$signature";
       $mail->{message}     =~ s/\r//g;
 
@@ -301,48 +302,11 @@ 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,
-    HIDDEN     => \@hiddens,
-    SHOW_BCC   => $::auth->assert('email_bcc', 'may fail'),
-  );
-
-  $::request->layout->use_javascript("kivi.SalesPurchase.js");
-  $self->setup_edit_email_action_bar;
-  $self->render('letter/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)
-    }
-  );
+  $self->action_print_letter(email => $::form->{email_form});
 }
 
 ### internal methods
@@ -377,7 +341,9 @@ sub _display {
       options => { no_postscript   => 1,
                    no_opendocument => 1,
                    no_html         => 1,
-                   no_queue        => 1 }),
+                   no_queue        => 1,
+                   show_headers    => 1,
+                 }),
 
   );
 }
@@ -613,7 +579,6 @@ sub init_webdav_objects {
     number   => $self->letter->letternumber,
   );
 
-  my $webdav_path = $webdav->webdav_path;
   my @all_objects = $webdav->get_all_objects;
 
   return [ map {
@@ -690,12 +655,12 @@ sub setup_display_action_bar {
         action => [ t8('Export') ],
         action => [
           t8('Print'),
-          submit   => [ '#form', { action => 'Letter/print_letter' } ],
+          call     => [ 'kivi.SalesPurchase.show_print_dialog', 'Letter/print_letter' ],
           disabled => !$self->letter->id ? t8('The object has not been saved yet.') : undef,
         ],
         action => [
           t8('E-mail'),
-          submit   => [ '#form', { action => 'Letter/edit_email' } ],
+          call     => [ 'kivi.SalesPurchase.show_email_dialog', 'Letter/send_email' ],
           disabled => !$self->letter->id ? t8('The object has not been saved yet.') : undef,
         ],
       ],
@@ -703,36 +668,16 @@ sub setup_display_action_bar {
   }
 }
 
-sub setup_edit_email_action_bar {
-  my ($self, %params) = @_;
-
-  for my $bar ($::request->layout->get('actionbar')) {
-    $bar->add(
-      action => [
-        t8('Continue'),
-        submit    => [ '#form', { action => 'Letter/send_email' } ],
-        checks    => [ 'kivi.SalesPurchase.check_required_email_fields' ],
-        accesskey => 'enter',
-      ],
-    );
-  }
-}
-
 sub setup_list_action_bar {
   my ($self, %params) = @_;
 
   for my $bar ($::request->layout->get('actionbar')) {
     $bar->add(
       action => [
-        t8('Search'),
-        submit    => [ '#form', { action => 'Letter/list' } ],
-        checks    => [ 'kivi.SalesPurchase.check_required_email_fields' ],
+        t8('Update'),
+        submit    => [ '#search_form', { action => 'Letter/list' } ],
         accesskey => 'enter',
       ],
-      action => [
-        t8('Reset'),
-        call => [ 'kivi.call_jquery', '#form', 'resetForm' ],
-      ],
     );
   }
 }