X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/703a7cf8dd55983761032658a0ac8de65fbda144..bcc996e65643:/SL/BackgroundJob/CreatePeriodicInvoices.pm

diff --git a/SL/BackgroundJob/CreatePeriodicInvoices.pm b/SL/BackgroundJob/CreatePeriodicInvoices.pm
index 45a41d012..03cbdf51c 100644
--- a/SL/BackgroundJob/CreatePeriodicInvoices.pm
+++ b/SL/BackgroundJob/CreatePeriodicInvoices.pm
@@ -28,64 +28,72 @@ sub run {
   $self->{db_obj} = shift;
 
   $self->{job_errors} = [];
+  if (!$self->{db_obj}->db->with_transaction(sub {
+    1;                          # make Emacs happy
 
-  my $configs = SL::DB::Manager::PeriodicInvoicesConfig->get_all(query => [ active => 1 ]);
+    my $configs = SL::DB::Manager::PeriodicInvoicesConfig->get_all(query => [ active => 1 ]);
 
-  foreach my $config (@{ $configs }) {
-    my $new_end_date = $config->handle_automatic_extension;
-    _log_msg("Periodic invoice configuration ID " . $config->id . " extended through " . $new_end_date->strftime('%d.%m.%Y') . "\n") if $new_end_date;
-  }
+    foreach my $config (@{ $configs }) {
+      my $new_end_date = $config->handle_automatic_extension;
+      _log_msg("Periodic invoice configuration ID " . $config->id . " extended through " . $new_end_date->strftime('%d.%m.%Y') . "\n") if $new_end_date;
+    }
 
-  my (@new_invoices, @invoices_to_print, @invoices_to_email, @disabled_orders);
+    my (@new_invoices, @invoices_to_print, @invoices_to_email, @disabled_orders);
 
-  _log_msg("Number of configs: " . scalar(@{ $configs}));
+    _log_msg("Number of configs: " . scalar(@{ $configs}));
 
-  foreach my $config (@{ $configs }) {
-    # A configuration can be set to inactive by
-    # $config->handle_automatic_extension. Therefore the check in
-    # ...->get_all() does not suffice.
-    _log_msg("Config " . $config->id . " active " . $config->active);
-    next unless $config->active;
+    foreach my $config (@{ $configs }) {
+      # A configuration can be set to inactive by
+      # $config->handle_automatic_extension. Therefore the check in
+      # ...->get_all() does not suffice.
+      _log_msg("Config " . $config->id . " active " . $config->active);
+      next unless $config->active;
 
-    my @dates = _calculate_dates($config);
+      my @dates = _calculate_dates($config);
 
-    _log_msg("Dates: " . join(' ', map { $_->to_lxoffice } @dates));
+      _log_msg("Dates: " . join(' ', map { $_->to_lxoffice } @dates));
 
-    foreach my $date (@dates) {
-      my $data = $self->_create_periodic_invoice($config, $date);
-      next unless $data;
+      foreach my $date (@dates) {
+        my $data = $self->_create_periodic_invoice($config, $date);
+        next unless $data;
 
-      _log_msg("Invoice " . $data->{invoice}->invnumber . " posted for config ID " . $config->id . ", period start date " . $::locale->format_date(\%::myconfig, $date) . "\n");
+        _log_msg("Invoice " . $data->{invoice}->invnumber . " posted for config ID " . $config->id . ", period start date " . $::locale->format_date(\%::myconfig, $date) . "\n");
 
-      push @new_invoices,      $data;
-      push @invoices_to_print, $data if $config->print;
-      push @invoices_to_email, $data if $config->send_email;
+        push @new_invoices,      $data;
+        push @invoices_to_print, $data if $config->print;
+        push @invoices_to_email, $data if $config->send_email;
 
-      my $inactive_ordnumber = $config->disable_one_time_config;
-      if ($inactive_ordnumber) {
-        # disable one time configs and skip eventual invoices
-        _log_msg("Order " . $inactive_ordnumber . " deavtivated \n");
-        push @disabled_orders, $inactive_ordnumber;
-        last;
+        my $inactive_ordnumber = $config->disable_one_time_config;
+        if ($inactive_ordnumber) {
+          # disable one time configs and skip eventual invoices
+          _log_msg("Order " . $inactive_ordnumber . " deavtivated \n");
+          push @disabled_orders, $inactive_ordnumber;
+          last;
+        }
       }
     }
-  }
 
-  foreach my $inv ( @invoices_to_print ) { $self->_print_invoice($inv); }
-  foreach my $inv ( @invoices_to_email ) { $self->_email_invoice($inv); }
+    foreach my $inv ( @invoices_to_print ) { $self->_print_invoice($inv); }
+    foreach my $inv ( @invoices_to_email ) { $self->_email_invoice($inv); }
 
-  $self->_send_summary_email(
-    [ map { $_->{invoice} } @new_invoices      ],
-    [ map { $_->{invoice} } @invoices_to_print ],
-    [ map { $_->{invoice} } @invoices_to_email ],
-                             \@disabled_orders  ,
-  );
+    $self->_send_summary_email(
+      [ map { $_->{invoice} } @new_invoices      ],
+      [ map { $_->{invoice} } @invoices_to_print ],
+      [ map { $_->{invoice} } @invoices_to_email ],
+                               \@disabled_orders  ,
+    );
 
-  if (@{ $self->{job_errors} }) {
-    my $msg = join "\n", @{ $self->{job_errors} };
-    _log_msg("Errors: $msg");
-    die $msg;
-  }
+      1;
+    })) {
+      $::lxdebug->message(LXDebug->WARN(), "_create_invoice failed: " . join("\n", (split(/\n/, $self->{db_obj}->db->error))[0..2]));
+      return undef;
+    }
+
+    if (@{ $self->{job_errors} }) {
+      my $msg = join "\n", @{ $self->{job_errors} };
+      _log_msg("Errors: $msg");
+      die $msg;
+    }
 
   return 1;
 }
@@ -368,7 +376,9 @@ sub _email_invoice {
     grep { $_       }
     map  { trim($_) }
     (split(m{,}, $data->{config}->email_recipient_address),
-     $data->{config}->email_recipient_contact ? ($data->{config}->email_recipient_contact->cp_email) : ());
+     $data->{config}->email_recipient_contact   ? ($data->{config}->email_recipient_contact->cp_email) : (),
+     $data->{invoice}->{customer}->invoice_mail ? ($data->{invoice}->{customer}->invoice_mail) : ()
+    );
 
   return unless @recipients;
 
@@ -404,6 +414,8 @@ sub _email_invoice {
 
     for my $recipient (@recipients) {
       my $mail             = Mailer->new;
+      $mail->{record_id}   = $data->{invoice}->id,
+      $mail->{record_type} = 'invoice',
       $mail->{from}        = $data->{config}->email_sender || $::lx_office_conf{periodic_invoices}->{email_from};
       $mail->{to}          = $recipient;
       $mail->{bcc}         = $global_bcc;