X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport.pm;h=e603faa407023b7b25b55eabfc60769c9a65b73f;hb=e74dac176e01090f7e3b6bd9e99596a36e614284;hp=7717e2ceeedacb7882e339f46d125667e950de7a;hpb=0297cac9a9ee9ada4fa4fd70123a24e0fa13aac9;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport.pm b/SL/Controller/CsvImport.pm
index 7717e2cee..e603faa40 100644
--- a/SL/Controller/CsvImport.pm
+++ b/SL/Controller/CsvImport.pm
@@ -4,9 +4,13 @@ use strict;
 
 use SL::DB::Buchungsgruppe;
 use SL::DB::CsvImportProfile;
+use SL::DB::Unit;
 use SL::Helper::Flash;
 use SL::SessionFile;
+use SL::Controller::CsvImport::Contact;
 use SL::Controller::CsvImport::CustomerVendor;
+use SL::Controller::CsvImport::Part;
+use SL::Controller::CsvImport::Shipto;
 
 use List::MoreUtils qw(none);
 
@@ -14,8 +18,8 @@ use parent qw(SL::Controller::Base);
 
 use Rose::Object::MakeMethods::Generic
 (
- scalar => [ qw(type profile file all_profiles all_charsets sep_char all_sep_chars quote_char all_quote_chars escape_char all_escape_chars all_buchungsgruppen
-                import_status errors headers data num_imported num_importable) ],
+ scalar => [ qw(type profile file all_profiles all_charsets sep_char all_sep_chars quote_char all_quote_chars escape_char all_escape_chars all_buchungsgruppen all_units
+                import_status errors headers raw_data_headers info_headers data num_imported num_importable displayable_columns) ],
 );
 
 __PACKAGE__->run_before('check_auth');
@@ -64,6 +68,26 @@ sub action_destroy {
   $self->redirect_to(action => 'new', 'profile.type' => $self->type);
 }
 
+sub action_download_sample {
+  my $self = shift;
+
+  $self->profile_from_form;
+  $self->setup_help;
+
+  my $file_name = 'csv_import_sample_' . $self->type . '.csv';
+  my $file      = SL::SessionFile->new($file_name, mode => '>', encoding => $self->profile->get('charset'));
+  my $csv       = Text::CSV_XS->new({ binary => 1, map { ( $_ => $self->profile->get($_) ) } qw(sep_char escape_char quote_char),});
+
+  $csv->print($file->fh, [ map { $_->{name}        } @{ $self->displayable_columns } ]);
+  $file->fh->print("\r\n");
+  $csv->print($file->fh, [ map { $_->{description} } @{ $self->displayable_columns } ]);
+  $file->fh->print("\r\n");
+
+  $file->fh->close;
+
+  $self->send_file($file->file_name, name => $file_name);
+}
+
 #
 # filters
 #
@@ -119,7 +143,12 @@ sub render_inputs {
             : $self->type eq 'parts'             ? $::locale->text('CSV import: parts and services')
             : die;
 
-  $self->all_buchungsgruppen(SL::DB::Manager::Buchungsgruppe->get_all_sorted);
+  if ($self->{type} eq 'parts') {
+    $self->all_buchungsgruppen(SL::DB::Manager::Buchungsgruppe->get_all_sorted);
+    $self->all_units(SL::DB::Manager::Unit->get_all_sorted);
+  }
+
+  $self->setup_help;
 
   $self->render('csv_import/form', title => $title);
 }
@@ -141,16 +170,17 @@ sub test_and_import {
     return $self->action_new;
   }
 
-  my $worker = $self->{type} eq 'customers_vendors' ? SL::Controller::CsvImport::CustomerVendor->new(controller => $self, file => $file)
-             : $self->{type} eq 'contacts'          ? SL::Controller::CsvImport::Contact->new(       controller => $self, file => $file)
-             :                                        die "Program logic error";
-
+  my $worker = $self->create_worker($file);
   $worker->run;
+
+  $self->num_imported(0);
   $worker->save_objects if !$params{test};
 
-  $self->num_importable(scalar grep { !$_ } map { scalar @{ $_->{errors} } } @{ $self->data });
+  $self->num_importable(scalar grep { !$_ } map { scalar @{ $_->{errors} } } @{ $self->data || [] });
   $self->import_status($params{test} ? 'tested' : 'imported');
 
+  flash('info', $::locale->text('Objects have been imported.')) if !$params{test};
+
   $self->action_new;
 }
 
@@ -189,6 +219,10 @@ sub profile_from_form {
     push @settings, { key => "${type}_char", value => $char };
   }
 
+  if ($self->type eq 'parts') {
+    $::form->{settings}->{sellprice_adjustment} = $::form->parse_amount(\%::myconfig, $::form->{settings}->{sellprice_adjustment});
+  }
+
   delete $::form->{profile}->{id};
   $self->profile($existing_profile || SL::DB::CsvImportProfile->new);
   $self->profile->assign_attributes(%{ $::form->{profile} });
@@ -217,4 +251,21 @@ sub csv_file_name {
   return "csv-import-" . $self->type . ".csv";
 }
 
+sub create_worker {
+  my ($self, $file) = @_;
+
+  return $self->{type} eq 'customers_vendors' ? SL::Controller::CsvImport::CustomerVendor->new(controller => $self, file => $file)
+       : $self->{type} eq 'contacts'          ? SL::Controller::CsvImport::Contact->new(       controller => $self, file => $file)
+       : $self->{type} eq 'addresses'         ? SL::Controller::CsvImport::Shipto->new(        controller => $self, file => $file)
+       : $self->{type} eq 'parts'             ? SL::Controller::CsvImport::Part->new(          controller => $self, file => $file)
+       :                                        die "Program logic error";
+}
+
+sub setup_help {
+  my ($self) = @_;
+
+  $self->create_worker->setup_displayable_columns;
+}
+
+
 1;