From d180d84e035a21291e2dc186b4430e3336998156 Mon Sep 17 00:00:00 2001
From: "G. Richardson" <information@kivitendo-premium.de>
Date: Wed, 6 May 2015 17:59:15 +0200
Subject: [PATCH] =?utf8?q?Keine=20Weiche=20f=C3=BCr=20mt940=20in=20SL/Cont?=
 =?utf8?q?roller/CsvImport.pm=20mehr?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Stattdessen ein eigener Controller BankImport, der die Daten über einen
neuen Helper in SL/Helper/MT940.pm (wo aqbanking-cli aufgerufen wird)
nach CSV konvertiert.

mt940 ist nun kein eigener Importtyp vom CSV-Import mehr. Stattdessen
wird nach der mt940 Upload-Maske ein CSV-Import-Profil geladen und
direkt ein Redirect auf den CSV-Import vom Typ Bankbewegungen
ausgeführt. Durch setzen des Parameters "force_profile" und ein Redirect
auf CsvImport/test statt CsvImport/new wird der Import auch direkt im
"Test und Vorschau"-Modus ausgeführt und der Benutzer sieht direkt das
Ergebnis. Ab hier verhält sich der Import also genau so, als ob der
User direkt eine CSV-Datei hochgeladen hätte.

Ein Nachteil der Umstellung ist, daß die CSV Profildefaults nun nicht
mehr auf den Typ "mt940" reagieren können und auf ein existierendes
CSV-Profil zurückgreifen müssen. Beim ersten MT940 Import wird bei
fehlen dieses Profils eine Meldung an den User gegeben.

Man könnte ein Referenzprofil per Update einspielen, allerdings sind die
Profile an Logins gebunden, und man bräuchte dafür ein globales Profil
und müßte hierfür generell die Profile erweitern.

TODO: Hilfetext wie das Profil einzustellen ist
---
 SL/Controller/BankImport.pm                   | 39 +++++++++++++++++++
 SL/Controller/CsvImport.pm                    | 32 ++++-----------
 SL/Helper/MT940.pm                            | 31 +++++++++++++++
 locale/de/all                                 |  4 +-
 menus/erp.ini                                 |  3 +-
 templates/webpages/bankimport/form.html       | 24 ++++++++++++
 .../webpages/csv_import/_form_mt940.html      | 12 ------
 templates/webpages/csv_import/form.html       |  2 -
 8 files changed, 106 insertions(+), 41 deletions(-)
 create mode 100644 SL/Controller/BankImport.pm
 create mode 100644 SL/Helper/MT940.pm
 create mode 100644 templates/webpages/bankimport/form.html
 delete mode 100644 templates/webpages/csv_import/_form_mt940.html

diff --git a/SL/Controller/BankImport.pm b/SL/Controller/BankImport.pm
new file mode 100644
index 000000000..58faf85a1
--- /dev/null
+++ b/SL/Controller/BankImport.pm
@@ -0,0 +1,39 @@
+package SL::Controller::BankImport;
+use strict;
+use Data::Dumper;
+use parent qw(SL::Controller::Base);
+
+use SL::Locale::String qw(t8);
+use SL::DB::CsvImportProfile;
+use SL::Helper::MT940;
+
+
+sub action_upload_mt940 {
+  my ($self, %params) = @_;
+
+  my $profile = SL::DB::Manager::CsvImportProfile->find_by(name => 'MT940', login => $::myconfig{login});
+  $self->render('bankimport/form', title => $::locale->text('MT940 import'), profile => $profile ? 1 : 0);
+
+}
+
+sub action_import_mt940 {
+  my ($self, %params) = @_;
+
+  die "missing file for action import" unless $::form->{file};
+
+  my $converted_data = SL::Helper::MT940::convert_mt940_data($::form->{file});
+
+  # store the converted data in a session file with a name expected by the profile type "bank_transactions"
+  my $file = SL::SessionFile->new("csv-import-bank_transactions.csv", mode => '>');
+  $file->fh->print($converted_data);
+  $file->fh->close;
+
+  my $profile = SL::DB::Manager::CsvImportProfile->find_by(name => 'MT940', login => $::myconfig{login});
+  die t8("The MT940 import needs an import profile called MT940") unless $profile;
+
+  $self->redirect_to(controller => 'controller.pl', action => 'CsvImport/test', 'profile.type' => 'bank_transactions', 'profile.id' => $profile->id, force_profile => 1);
+
+};
+
+1;
+
diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm
index e58d025e9..b74b04be0 100644
--- a/SL/Controller/CsvImport.pm
+++ b/SL/Controller/CsvImport.pm
@@ -224,7 +224,7 @@ sub check_auth {
 sub check_type {
   my ($self) = @_;
 
-  die "Invalid CSV import type" if none { $_ eq $::form->{profile}->{type} } qw(parts inventories customers_vendors addresses contacts projects orders bank_transactions mt940);
+  die "Invalid CSV import type" if none { $_ eq $::form->{profile}->{type} } qw(parts inventories customers_vendors addresses contacts projects orders bank_transactions);
   $self->type($::form->{profile}->{type});
 }
 
@@ -270,7 +270,6 @@ sub render_inputs {
             : $self->type eq 'projects'          ? $::locale->text('CSV import: projects')
             : $self->type eq 'orders'            ? $::locale->text('CSV import: orders')
             : $self->type eq 'bank_transactions' ? $::locale->text('CSV import: bank transactions')
-            : $self->type eq 'mt940'             ? $::locale->text('CSV import: MT940')
             : die;
 
   if ($self->{type} eq 'customers_vendors' or $self->{type} eq 'orders'  ) {
@@ -290,30 +289,16 @@ sub render_inputs {
 sub test_and_import_deferred {
   my ($self, %params) = @_;
 
-  $self->profile_from_form;
+  if ( $::form->{force_profile} && $::form->{profile}->{id} ) {
+    $self->load_default_profile;
+  }  else {
+    $self->profile_from_form;
+  };
 
-  if ( $::form->{file} && $::form->{FILENAME} =~ /\.940$/ ) {
-    my $mt940_file = SL::SessionFile->new($::form->{FILENAME}, mode => '>');
-    $mt940_file->fh->print($::form->{file});
-    $mt940_file->fh->close;
-
-    my $aqbin = $::lx_office_conf{applications}->{aqbanking};
-    die "Can't find aqbanking-cli, please check your configuration file.\n" unless -f $aqbin;
-    my $cmd = "$aqbin --cfgdir=\"users\" import --importer=\"swift\" --profile=\"SWIFT-MT940\" -f " . $mt940_file->file_name . " | $aqbin --cfgdir=\"users\" listtrans --exporter=\"csv\" --profile=\"AqMoney2\" ";
-    my $converted_mt940;
-    open(MT, "$cmd |");
-    $converted_mt940 .=  '"transaction_id";"local_bank_code";"local_account_number";"remote_bank_code";"remote_account_number";"transdate";"valutadate";"amount";"currency";"remote_name";"remote_name_1";"purpose";"purpose1";"purpose2";"purpose3";"purpose4";"purpose5";"purpose6";"purpose7";"purpose8";"purpose9";"purpose10";"purpose11"' . "\n";
-    my $headerline = <MT>;  # discard original header line
-    while (<MT>) {
-      $converted_mt940 .= $_;
-    };
+  if ($::form->{file}) {
     my $file = SL::SessionFile->new($self->csv_file_name, mode => '>');
-    $file->fh->print($converted_mt940);
+    $file->fh->print($::form->{file});
     $file->fh->close;
-  } elsif ($::form->{file}) {
-      my $file = SL::SessionFile->new($self->csv_file_name, mode => '>');
-      $file->fh->print($::form->{file});
-      $file->fh->close;
   }
 
   my $file = SL::SessionFile->new($self->csv_file_name, mode => '<', encoding => $self->profile->get('charset'));
@@ -641,7 +626,6 @@ sub init_worker {
        : $self->{type} eq 'projects'          ? SL::Controller::CsvImport::Project->new(@args)
        : $self->{type} eq 'orders'            ? SL::Controller::CsvImport::Order->new(@args)
        : $self->{type} eq 'bank_transactions' ? SL::Controller::CsvImport::BankTransaction->new(@args)
-       : $self->{type} eq 'mt940'             ? SL::Controller::CsvImport::BankTransaction->new(@args)
        :                                        die "Program logic error";
 }
 
diff --git a/SL/Helper/MT940.pm b/SL/Helper/MT940.pm
new file mode 100644
index 000000000..5c8865d02
--- /dev/null
+++ b/SL/Helper/MT940.pm
@@ -0,0 +1,31 @@
+package SL::Helper::MT940;
+
+use strict;
+
+sub convert_mt940_data {
+  my ($mt940_data) = @_;
+
+  # takes the data from an uploaded mt940 file, converts it to csv via aqbanking and returns the converted data
+  # The uploaded file data is stored as a session file, just like the aqbanking settings file.
+
+  my $import_filename = 'bank_transfer.940';
+  my $sfile = SL::SessionFile->new($import_filename, mode => '>');
+  $sfile->fh->print($mt940_data);
+  $sfile->fh->close;
+
+  my $aqbin = $::lx_office_conf{applications}->{aqbanking};
+  die "Can't find aqbanking-cli, please check your configuration file.\n" unless -f $aqbin;
+  my $cmd = "$aqbin --cfgdir=\"" . $sfile->get_path . "\" import --importer=\"swift\" --profile=\"SWIFT-MT940\" -f " . $sfile->get_path . "/$import_filename | $aqbin --cfgdir=\"" . $sfile->get_path . "\" listtrans --exporter=\"csv\" --profile=\"AqMoney2\" ";
+
+  my $converted_data = '"empty";"local_bank_code";"local_account_number";"remote_bank_code";"remote_account_number";"transdate";"valutadate";"amount";"currency";"remote_name";"remote_name_1";"purpose";"purpose1";"purpose2";"purpose3";"purpose4";"purpose5";"purpose6";"purpose7";"purpose8";"purpose9";"purpose10";"purpose11"' . "\n";
+
+  open my $mt, "-|", "$cmd" || die "Problem with executing aqbanking\n";
+  my $headerline = <$mt>;  # discard original aqbanking header line
+  while (<$mt>) {
+    $converted_data .= $_;
+  };
+  close $mt;
+  return $converted_data;
+};
+
+1;
diff --git a/locale/de/all b/locale/de/all
index 97f3b5b95..6479bf15a 100755
--- a/locale/de/all
+++ b/locale/de/all
@@ -453,7 +453,6 @@ $self->{texts} = {
   'CSS style for pictures'      => 'CSS Style für Bilder',
   'CSV'                         => 'CSV',
   'CSV export -- options'       => 'CSV-Export -- Optionen',
-  'CSV import: MT940'           => 'CSV Import: MT940',
   'CSV import: bank transactions' => 'CSV Import: Bankbewegungen',
   'CSV import: contacts'        => 'CSV-Import: Ansprechpersonen',
   'CSV import: customers and vendors' => 'CSV-Import: Kunden und Lieferanten',
@@ -1362,6 +1361,7 @@ $self->{texts} = {
   'Import'                      => 'Import',
   'Import CSV'                  => 'CSV-Import',
   'Import Status'               => 'Import Status',
+  'Import a MT940 file:'        => 'Laden Sie eine MT940 Datei hoch:',
   'Import file'                 => 'Import-Datei',
   'Import not started yet, please wait...' => 'Der Taskserver ist gerade ausgelastet. Ihr Import wird gleich gestartet, bitte warten...',
   'Import preview'              => 'Import-Vorschau',
@@ -1940,6 +1940,7 @@ $self->{texts} = {
   'Please contact your administrator or a service provider.' => 'Bitte kontaktieren Sie Ihren Administrator oder einen Dienstleister.',
   'Please contact your administrator.' => 'Bitte wenden Sie sich an Ihren Administrator.',
   'Please correct the settings and try again or deactivate that client.' => 'Bitte korrigieren Sie die Einstellungen und versuchen Sie es erneut, oder deaktivieren Sie diesen Mandanten.',
+  'Please create a CSV import profile called "MT940" for the import type bank transactions:' => 'Bitte erstellen Sie ein CSV Import Profil mit dem Namen "MT940" für den Importtyp Bankbewegungen',
   'Please define a taxkey for the following taxes and run the update again:' => 'Bitte definieren Sie einen Steuerschlüssel für die folgenden Steuern und starten Sie dann das Update erneut:',
   'Please do so in the administration area.' => 'Bitte erledigen Sie dies im Administrationsbereich.',
   'Please enter a profile name.' => 'Bitte geben Sie einen Profilnamen an.',
@@ -2580,6 +2581,7 @@ $self->{texts} = {
   'The GL transaction #1 has been deleted.' => 'Die Dialogbuchung #1 wurde gelöscht.',
   'The IBAN is missing.'        => 'Die IBAN fehlt.',
   'The LDAP server "#1:#2" is unreachable. Please check config/kivitendo.conf.' => 'Der LDAP-Server "#1:#2" ist nicht erreichbar. Bitte &uuml;berpr&uuml;fen Sie die Angaben in config/kivitendo.conf.',
+  'The MT940 import needs an import profile called MT940' => 'Der MT940 Import benötigt ein Importprofil mit dem Namen "MT940"',
   'The SEPA export has been created.' => 'Der SEPA-Export wurde erstellt',
   'The SEPA strings have been saved.' => 'Die bei SEPA-Überweisungen verwendeten Begriffe wurden gespeichert.',
   'The WebDAV feature has been used.' => 'Das WebDAV-Feature wurde benutzt.',
diff --git a/menus/erp.ini b/menus/erp.ini
index 05f2a2993..8e50ab04f 100644
--- a/menus/erp.ini
+++ b/menus/erp.ini
@@ -427,8 +427,7 @@ profile.type=bank_transactions
 [Cash--Bank Import--MT940]
 ACCESS=bank_transaction
 module=controller.pl
-action=CsvImport/new
-profile.type=mt940
+action=BankImport/upload_mt940
 
 [Cash--Bank transactions MT940]
 ACCESS=bank_transaction
diff --git a/templates/webpages/bankimport/form.html b/templates/webpages/bankimport/form.html
new file mode 100644
index 000000000..1c3d6728f
--- /dev/null
+++ b/templates/webpages/bankimport/form.html
@@ -0,0 +1,24 @@
+[%- USE HTML %]
+[%- USE LxERP %]
+[%- USE L %]
+[%- USE T8 %]
+
+ <div class="listtop">[% FORM.title %]</div>
+
+ [% IF profile %]
+ <p>
+ [% "Import a MT940 file:" | $T8 %]
+ </p>
+
+ <form method="post" action="controller.pl" enctype="multipart/form-data">
+  [% L.hidden_tag('action', 'BankImport/import_mt940') %]
+
+    [% L.input_tag('file', '', type => 'file', accept => '*') %]
+    [% L.submit_tag('action_import_mt940', LxERP.t8('Import')) %]
+
+ </form>
+ [% ELSE %]
+ <p>
+ [% "Please create a CSV import profile called \"MT940\" for the import type bank transactions:" | $T8 %] <a href="[% SELF.url_for(controller => 'CsvImport', action => 'new', 'profile.type' => 'bank_transactions' ) %]">CsvImport</a>
+ </p>
+ [% END %]
diff --git a/templates/webpages/csv_import/_form_mt940.html b/templates/webpages/csv_import/_form_mt940.html
deleted file mode 100644
index cb63e7de9..000000000
--- a/templates/webpages/csv_import/_form_mt940.html
+++ /dev/null
@@ -1,12 +0,0 @@
-[% USE LxERP %]
-[% USE L %]
-
-<tr>
- <th align="right">[%- LxERP.t8("Existing bank transactions") %]:</th>
- <td colspan="10">
-  [% opts = [ [ 'skip', LxERP.t8('Skip entry') ] , [ 'insert_new', LxERP.t8('Insert new') ] ] %]
-  [% L.select_tag('settings.update_policy', opts, default = SELF.profile.get('update_policy'), style = 'width: 300px') %]
- </td>
-</tr>
-
-
diff --git a/templates/webpages/csv_import/form.html b/templates/webpages/csv_import/form.html
index 745ef161c..c40c563d4 100644
--- a/templates/webpages/csv_import/form.html
+++ b/templates/webpages/csv_import/form.html
@@ -260,8 +260,6 @@
  [%- INCLUDE 'csv_import/_form_inventories.html' %]
 [%- ELSIF SELF.type == 'orders' %]
  [%- INCLUDE 'csv_import/_form_orders.html' %]
-[%- ELSIF SELF.type == 'mt940' %]
- [%- INCLUDE 'csv_import/_form_mt940.html' %]
 [%- ELSIF SELF.type == 'bank_transactions' %]
  [%- INCLUDE 'csv_import/_form_banktransactions.html' %]
 [%- END %]
-- 
2.20.1