From 05f4e6ebf1257a454290c04e5e7ede90eca0e465 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bernd=20Ble=C3=9Fmann?= Date: Tue, 23 Mar 2021 10:40:51 +0100 Subject: [PATCH] Mahnungen: DMS/WebDAV: erzeugte Dokumente nach Mahnlauf ablegen. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Und zwar außerhalb der Transaktion und nur wenn diese erfolgreich war, sonst können bei eine abgebrochenen Transaktion abgelegte Dokumente vorhanden sein, ohne das eine Mahnung oder Mahnrechnung in der DB existiert. --- SL/DN.pm | 140 +++++++++++++++++++++++++------------------------------ 1 file changed, 64 insertions(+), 76 deletions(-) diff --git a/SL/DN.pm b/SL/DN.pm index 46d3c8e9e..435f57873 100644 --- a/SL/DN.pm +++ b/SL/DN.pm @@ -317,8 +317,18 @@ sub save_dunning { my ($self, $myconfig, $form, $rows) = @_; $main::lxdebug->enter_sub(); + $form->{DUNNING_PDFS_STORAGE} = []; + my $rc = SL::DB->client->with_transaction(\&_save_dunning, $self, $myconfig, $form, $rows); + # Save PDFs in filemanagement and webdav after transation succeeded, + # because otherwise files in the storage may exists if the transaction + # failed. Ignore all errros. + # Todo: Maybe catch errros and display them as warnings or non fatal errors in the status. + if (!$error && $form->{DUNNING_PDFS_STORAGE} && scalar @{ $form->{DUNNING_PDFS_STORAGE} }) { + _store_pdf_to_webdav_and_filemanagement($_->{dunning_id}, $_->{path}, $_->{name}) for @{ $form->{DUNNING_PDFS_STORAGE} }; + } + if (!$rc) { die SL::DB->client->error } @@ -998,9 +1008,12 @@ sub print_dunning { delete $form->{tmpfile}; - push @{ $form->{DUNNING_PDFS} }, $filename; - push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'path' => "${spool}/$filename", - 'name' => $form->get_formname_translation('dunning') . "_${dunning_id}.pdf" }; + push @{ $form->{DUNNING_PDFS} } , $filename; + push @{ $form->{DUNNING_PDFS_EMAIL} } , { 'path' => "${spool}/$filename", + 'name' => $form->get_formname_translation('dunning') . "_${dunning_id}.pdf" }; + push @{ $form->{DUNNING_PDFS_STORAGE} }, { 'dunning_id' => $dunning_id, + 'path' => "${spool}/$filename", + 'name' => $form->get_formname_translation('dunning') . "_${dunning_id}.pdf" }; my $employee_id = ($::instance_conf->get_dunning_creator eq 'invoice_employee') ? $form->{employee_id} : @@ -1019,30 +1032,6 @@ sub print_dunning { # this generates the file in the spool directory $form->parse_template($myconfig); - # save dunning pdf in filemanagement/webdav - if ($::instance_conf->get_doc_storage) { - SL::File->save( - object_id => $dunning_id, - object_type => 'dunning', - mime_type => 'application/pdf', - source => 'created', - file_type => 'document', - file_name => $form->{attachment_filename}, - file_path => "${spool}/$filename", - ); - } - if ($::instance_conf->get_webdav_documents) { - my $webdav = SL::Webdav->new( - type => 'dunning', - number => $dunning_id, - ); - my $webdav_file = SL::Webdav::File->new( - webdav => $webdav, - filename => $form->{attachment_filename}, - ); - $webdav_file->store(file => "${spool}/$filename"); - } - $main::lxdebug->leave_sub(); } @@ -1140,33 +1129,12 @@ sub print_invoice_for_fees { restore_form($saved_form); - push @{ $form->{DUNNING_PDFS} }, $filename; - push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'path' => "${spool}/$filename", - 'name' => $attachment_filename }; - - # save dunning fee pdf in filemanagement/webdav - if ($::instance_conf->get_doc_storage) { - SL::File->save( - object_id => $dunning_id, - object_type => 'dunning', - mime_type => 'application/pdf', - source => 'created', - file_type => 'document', - file_name => $attachment_filename, - file_path => "${spool}/$filename", - ); - } - if ($::instance_conf->get_webdav_documents) { - my $webdav = SL::Webdav->new( - type => 'dunning', - number => $dunning_id, - ); - my $webdav_file = SL::Webdav::File->new( - webdav => $webdav, - filename => $attachment_filename, - ); - $webdav_file->store(file => "${spool}/$filename"); - } + push @{ $form->{DUNNING_PDFS} }, $filename; + push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'path' => "${spool}/$filename", + 'name' => $attachment_filename }; + push @{ $form->{DUNNING_PDFS_STORAGE} }, { 'dunning_id' => $dunning_id, + 'path' => "${spool}/$filename", + 'name' => $attachment_filename }; $main::lxdebug->leave_sub(); } @@ -1234,36 +1202,56 @@ sub print_original_invoice { my $attachment_filename = $form->get_formname_translation('invoice') . "_" . $invoice->invnumber . ".pdf"; - push @{ $form->{DUNNING_PDFS} }, $file_name; - push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'path' => "${spool}/$file_name", - 'name' => $attachment_filename }; + push @{ $form->{DUNNING_PDFS} }, $file_name; + push @{ $form->{DUNNING_PDFS_EMAIL} }, { 'path' => "${spool}/$file_name", + 'name' => $attachment_filename }; + push @{ $form->{DUNNING_PDFS_STORAGE} }, { 'dunning_id' => $dunning_id, + 'path' => "${spool}/$file_name", + 'name' => $attachment_filename }; $form->{recipient_locale} = $saved_reicpient_locale; +} + +sub _store_pdf_to_webdav_and_filemanagement { + my ($dunning_id, $path, $name) =@_; + + my @errors; - # save original invoice pdf in filemanagement/webdav for dunning if ($::instance_conf->get_doc_storage) { - SL::File->save( - object_id => $dunning_id, - object_type => 'dunning', - mime_type => 'application/pdf', - source => 'created', - file_type => 'document', - file_name => $attachment_filename, - file_path => "${spool}/$file_name", - ); + eval { + SL::File->save( + object_id => $dunning_id, + object_type => 'dunning', + mime_type => 'application/pdf', + source => 'created', + file_type => 'document', + file_name => $name, + file_path => $path, + ); + 1; + } or do { + push @errors, $::locale->text('Storing PDF in storage backend failed: #1', $@); + }; } + if ($::instance_conf->get_webdav_documents) { - my $webdav = SL::Webdav->new( - type => 'dunning', - number => $dunning_id, - ); - my $webdav_file = SL::Webdav::File->new( - webdav => $webdav, - filename => $attachment_filename, - ); - $webdav_file->store(file => "${spool}/$file_name"); + eval { + my $webdav = SL::Webdav->new( + type => 'dunning', + number => $dunning_id, + ); + my $webdav_file = SL::Webdav::File->new( + webdav => $webdav, + filename => $name, + ); + $webdav_file->store(file => $path); + } or do { + push @errors, $::locale->text('Storing PDF to webdav folder failed: #1', $@); + }; } + return @errors; } + 1; -- 2.20.1