S:C:PayPostingImport Bei Erfolg, importierte Buchungen anzeigen

diff --git a/SL/Controller/PayPostingImport.pm b/SL/Controller/PayPostingImport.pm
index 76a5a99..03a44d0 100644 (file)
--- a/SL/Controller/PayPostingImport.pm
+++ b/SL/Controller/PayPostingImport.pm
@@ -26,7 +26,6 @@ sub action_import_datev_pay_postings {
   die t8("missing file for action import") unless ($::form->{file});
 
   my $filename= $::form->{ATTACHMENTS}{file}{filename};
-
   # check name and first fields of CSV data
   die t8("Wrong file name, expects name like: DTVF_*_LOHNBUCHUNG*.csv") unless $filename =~ /^DTVF_.*_LOHNBUCHUNGEN_LUG.*\.csv$/;
   die t8("not a valid DTVF file, expected first field in A1 'DTVF'")   unless ($::form->{file} =~ m/^"DTVF";/);
@@ -34,20 +33,21 @@ sub action_import_datev_pay_postings {
     unless ($::form->{file} =~ m/Umsatz;S\/H;;;;;Konto;Gegenkonto.*;;Belegdatum;Belegfeld 1;Belegfeld 2;;Buchungstext/);
 
   # check if file is already imported
-  my $acc_trans_doc = SL::DB::Manager::AccTransaction->get_first(source => $filename);
-  die t8("Already imported") if ref $acc_trans_doc eq 'SL::DB::AccTransaction';
+  my $acc_trans_doc = SL::DB::Manager::AccTransaction->get_first(query => [ source => $filename ]);
+  die t8("Already imported: ") . $acc_trans_doc->source if ref $acc_trans_doc eq 'SL::DB::AccTransaction';
 
-  if (parse_and_import($::form->{file}, $filename)) {
+  if (parse_and_import($self)) {
     flash_later('info', t8("All pay postings successfully imported."));
   }
-  # $self->redirect_to("gl.pl?action=search", source => $filename);
+  $self->setup_pay_posting_action_bar;
+  $self->render('pay_posting_import/form', title => $::locale->text('Imported Pay Postings'));
 }
 
 sub parse_and_import {
-  my $doc      = shift;
+  my $self     = shift;
 
   my $csv = Text::CSV_XS->new ({ binary => 0, auto_diag => 1, sep_char => ";" });
-  open my $fh, "<:encoding(cp1252)", \$doc;
+  open (my $fh, "<:encoding(cp1252)", \$::form->{file}) or die "cannot open $::form->{file} $!";
   # Read/parse CSV
   # Umsatz S/H Konto Gegenkonto (ohne BU-Schlüssel) Belegdatum Belegfeld 1 Belegfeld 2 Buchungstext
   my $year = substr($csv->getline($fh)->[12], 0, 4);
@@ -103,7 +103,7 @@ sub parse_and_import {
           source => $::form->{ATTACHMENTS}{file}{filename},
       )->post;
 
-      # push @rows, $current_transaction->id;
+      push @{ $self->{gl_trans} }, $current_transaction;
 
       if ($::instance_conf->get_doc_storage) {
         my $file = SL::File->save(object_id   => $current_transaction->id,
@@ -112,7 +112,7 @@ sub parse_and_import {
                        source      => 'uploaded',
                        file_type   => 'attachment',
                        file_name   => $::form->{ATTACHMENTS}{file}{filename},
-                       file_contents   => $doc
+                       file_contents   => $::form->{file},
                       );
       }
     }

diff --git a/templates/webpages/pay_posting_import/form.html b/templates/webpages/pay_posting_import/form.html
index f20f933..81d2a48 100644 (file)
--- a/templates/webpages/pay_posting_import/form.html
+++ b/templates/webpages/pay_posting_import/form.html
@@ -4,6 +4,35 @@
 [%- USE T8 %]
 [%- INCLUDE 'common/flash.html' %]
 <div class="listtop">[% FORM.title %]</div>
+
+[% IF (SELF.gl_trans.size) %]
+  <p>[% SELF.gl_trans.size %][% "entries imported" | $T8 %].</p>
+<div style="padding-bottom: 15px">
+ <table id="gl_trans">
+  <thead>
+   <tr>
+    <th class="listheading">[%- LxERP.t8("Date") %]</th>
+    <th class="listheading">[%- LxERP.t8("Description") %]</th>
+    <th class="listheading">[%- LxERP.t8("Debit") %]</th>
+    <th class="listheading">[%- LxERP.t8("Credit") %]</th>
+    <th class="listheading">[%- LxERP.t8("Amount") %]</th>
+   </tr>
+  </thead>
+  <tbody>
+  [%- FOREACH gl = SELF.gl_trans %]
+    <tr class="listrow[% loop.count % 2 %]">
+    <td>[%- gl.transdate.to_kivitendo -%]</td>
+    <td align="left">[%- gl.description -%]</td>
+    <td align="left">[%- gl.transactions.1.chart.accno -%]&nbsp;[%- gl.transactions.1.chart.description -%]</td>
+    <td align="left">[%- gl.transactions.0.chart.accno -%]&nbsp;[%- gl.transactions.0.chart.description -%]</td>
+    <td align="right"> [%- LxERP.format_amount(gl.transactions.0.amount    , 2) %]</td>
+   </tr>
+  [% END %]
+     </tbody>
+ </table>
+ <div>
+[% END %]
+
 <p>
  [% "Import a File:" | $T8 %]
 </p>