PDFs werden nicht mehr bei wiederkehrenden Rechnung per E-Mail erzeugt/angehangen

fix redmine #238

diff --git a/SL/BackgroundJob/CreatePeriodicInvoices.pm b/SL/BackgroundJob/CreatePeriodicInvoices.pm
index c8b16ab4bdb25111a1f493a447997b3709315532..055dd16f40bf13cfca550256fbe524988a7f2d32 100644 (file)
--- a/SL/BackgroundJob/CreatePeriodicInvoices.pm
+++ b/SL/BackgroundJob/CreatePeriodicInvoices.pm
@@ -404,7 +404,7 @@ sub _email_invoice {
       $mail->{subject}     = $data->{config}->email_subject;
       $mail->{message}     = $data->{config}->email_body;
       $mail->{attachments} = [{
       $mail->{subject}     = $data->{config}->email_subject;
       $mail->{message}     = $data->{config}->email_body;
       $mail->{attachments} = [{

-        filename => $pdf_file_name,
+        path     => $pdf_file_name,

         name     => sprintf('%s %s.pdf', $::locale->text('Invoice'), $data->{invoice}->invnumber),
       }];
 
         name     => sprintf('%s %s.pdf', $::locale->text('Invoice'), $data->{invoice}->invnumber),
       }];
 

diff --git a/SL/Mailer.pm b/SL/Mailer.pm
index c8fe0f2a4c69eab8898865388787eb51b471bcec..0a2715cb204e7cd1fd20cebe2c355ab5436e9eff 100644 (file)
--- a/SL/Mailer.pm
+++ b/SL/Mailer.pm
@@ -162,7 +162,7 @@ sub _create_attachment_part {
   $attachment_content ||= ' ';
   $attributes{charset}  = $self->{charset} if $self->{charset} && ($attributes{content_type} =~ m{^text/});
 
   $attachment_content ||= ' ';
   $attributes{charset}  = $self->{charset} if $self->{charset} && ($attributes{content_type} =~ m{^text/});
 

-  $::lxdebug->message(LXDebug->DEBUG2(), "mail6 mtype=" . $attributes{Type} . " filename=" . $attributes{Filename});
+  $::lxdebug->message(LXDebug->DEBUG2(), "mail6 mtype=" . $attributes{content_type} . " filename=" . $attributes{filename});

 
   my $ent;
   if ( $attributes{content_type} eq 'message/rfc822' ) {
 
   my $ent;
   if ( $attributes{content_type} eq 'message/rfc822' ) {


@@ -247,6 +247,7 @@ sub send {
     #$::lxdebug->message(0, "message: " . $email->as_string);
     # return "boom";
 
     #$::lxdebug->message(0, "message: " . $email->as_string);
     # return "boom";
 

+    $::lxdebug->message(LXDebug->DEBUG2(), "mail1 from=".$self->{from}." to=".$self->{to});

     my $from_obj = (Email::Address->parse($self->{from}))[0];
 
     $self->{driver}->start_mail(from => $from_obj->address, to => [ $self->_all_recipients ]);
     my $from_obj = (Email::Address->parse($self->{from}))[0];
 
     $self->{driver}->start_mail(from => $from_obj->address, to => [ $self->_all_recipients ]);