_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);
+ my (@new_invoices, @invoices_to_print, @invoices_to_email, @disabled_orders);
_log_msg("Number of configs: " . scalar(@{ $configs}));
# last;
}
+ # disable one time configs (periodicity is only one time).
+ my $inactive_ordnumber = $config->disable_one_time_config;
+ push @disabled_orders, $inactive_ordnumber if $inactive_ordnumber;
}
- $self->_print_invoice($_) for @invoices_to_print;
- $self->_email_invoice($_) for @invoices_to_email;
+ 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 ,
);
if (@{ $self->{job_errors} }) {
my $order = $config->order;
my $invoice;
- if (!$self->{db_obj}->db->do_transaction(sub {
+ if (!$self->{db_obj}->db->with_transaction(sub {
1; # make Emacs happy
$invoice = SL::DB::Invoice->new_from($order);
_log_msg("_create_invoice created for period start date $period_start_date id " . $invoice->id . " number " . $invoice->invnumber . " netamount " . $invoice->netamount . " amount " . $invoice->amount);
# die $invoice->transaction_description;
+
+ 1;
})) {
$::lxdebug->message(LXDebug->WARN(), "_create_invoice failed: " . join("\n", (split(/\n/, $self->{db_obj}->db->error))[0..2]));
return undef;
}
sub _send_summary_email {
- my ($self, $posted_invoices, $printed_invoices, $emailed_invoices) = @_;
-
+ my ($self, $posted_invoices, $printed_invoices, $emailed_invoices,
+ $disabled_orders) = @_;
my %config = %::lx_office_conf;
return if !$config{periodic_invoices} || !$config{periodic_invoices}->{send_email_to} || !scalar @{ $posted_invoices };
my $filename = $email_template || ( (SL::DB::Default->get->templates || "templates/webpages") . "/oe/periodic_invoices_email.txt" );
my %params = ( POSTED_INVOICES => $posted_invoices,
PRINTED_INVOICES => $printed_invoices,
- EMAILED_INVOICES => $emailed_invoices );
+ EMAILED_INVOICES => $emailed_invoices,
+ DISABLED_ORDERS => $disabled_orders );
my $output;
$template->process($filename, \%params, \$output);