use SL::Helper::Flash;
use SL::Locale::String;
use SL::SessionFile;
+use SL::SessionFile::Random;
use SL::Controller::CsvImport::Contact;
use SL::Controller::CsvImport::CustomerVendor;
use SL::Controller::CsvImport::Part;
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 all_units
+ scalar => [ qw(type profile 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_importable displayable_columns file all_taxzones) ],
'scalar --get_set_init' => [ qw(worker task_server num_imported mappings) ],
'array' => [
}
my $num_rows = $self->{report}->numrows;
- my $num_cols = SL::DB::Manager::CsvImportReportRow->get_all_count(query => [ csv_import_report_id => $report_id, row => 0 ]);
# manual paginating, yuck
my $page = $::form->{page} || 1;
sub action_add_mapping_from_upload {
my ($self) = @_;
- $self->profile_from_form;
+ if ($::form->{tmp_profile_id}) {
+ $self->profile_from_form(SL::DB::CsvImportProfile->new(id => $::form->{tmp_profile_id})->load);
+ } else {
+ $self->profile_from_form;
+ }
$self->setup_help;
- my $file = SL::SessionFile->new($self->csv_file_name, mode => '<', encoding => $self->profile->get('charset'));
+ my $file_name;
+ if ($self->profile->get('file_name')) {
+ $file_name = $self->profile->get('file_name');
+ } else {
+ $self->js
+ ->flash('error', t8('No file has been uploaded yet.'))
+ ->render;
+ return;
+ }
+
+ my $file = SL::SessionFile->new($file_name, mode => '<', encoding => $self->profile->get('charset'));
if (!$file->fh) {
$self->js
->flash('error', t8('No file has been uploaded yet.'))
$self->$sub(($char_map{$type}->{$char} || [])->[0] || $char);
}
- $self->file(SL::SessionFile->new($self->csv_file_name));
+ if ($self->profile->get('file_name')) {
+ $self->file(SL::SessionFile->new($self->profile->get('file_name')));
+ }
my $title = $self->type eq 'customers_vendors' ? $::locale->text('CSV import: customers and vendors')
: $self->type eq 'addresses' ? $::locale->text('CSV import: shipping addresses')
$self->setup_help;
+ $self->setup_render_inputs_action_bar;
+
$self->render('csv_import/form', title => $title);
}
sub test_and_import_deferred {
my ($self, %params) = @_;
- if ( $::form->{force_profile} && $::form->{profile}->{id} ) {
+ if ( $::form->{force_profile} && ($::form->{tmp_profile_id} || $::form->{profile}->{id}) ) {
+ $::form->{profile}->{id} = $::form->{tmp_profile_id} if $::form->{tmp_profile_id};
$self->load_default_profile;
- } else {
+ } elsif ($::form->{tmp_profile_id}) {
+ $self->profile_from_form(SL::DB::CsvImportProfile->new(id => $::form->{tmp_profile_id})->load);
+ } else {
$self->profile_from_form;
};
+ my $file_name;
if ($::form->{file}) {
- my $file = SL::SessionFile->new($self->csv_file_name, mode => '>');
+ my $file = SL::SessionFile::Random->new(mode => '>');
$file->fh->print($::form->{file});
$file->fh->close;
+ $file_name = $file->file_name;
+ $self->profile->set('file_name', $file_name);
+ } elsif ($self->profile->get('file_name')) {
+ $file_name = $self->profile->get('file_name');
+ } else {
+ flash('error', $::locale->text('No file has been uploaded yet.'));
+ return $self->action_new;
}
- my $file = SL::SessionFile->new($self->csv_file_name, mode => '<', encoding => $self->profile->get('charset'));
+ my $file = SL::SessionFile->new($file_name, mode => '<', encoding => $self->profile->get('charset'));
if (!$file->fh) {
flash('error', $::locale->text('No file has been uploaded yet.'));
return $self->action_new;
}
+ # save tempory profile
+ $self->profile($self->profile->clone_and_reset_deep)->save;
+
$self->{background_job} = SL::BackgroundJob::CsvImport->create_job(
- file => $self->csv_file_name,
- profile => $self->profile,
+ profile_id => $self->profile->id,
type => $self->profile->type,
test => $params{test},
employee_id => SL::DB::Manager::Employee->current->id,
my ($self, %params) = @_;
my $file = SL::SessionFile->new(
- $self->csv_file_name,
+ $self->profile->get('file_name'),
mode => '<',
encoding => $self->profile->get('charset'),
session_id => $params{session_id}
$::form->{settings}->{max_amount_diff} = $::form->parse_amount(\%::myconfig, $::form->{settings}->{max_amount_diff});
}
- delete $::form->{profile}->{id};
$self->profile($existing_profile || SL::DB::CsvImportProfile->new(login => $::myconfig{login}));
$self->profile->assign_attributes(%{ $::form->{profile} });
+
+ # save settings for file_name, as this is not in form, but maybe in existing_profile
+ push @settings, { key => 'file_name', value => $self->profile->get('file_name') } if $self->profile->get('file_name');
+
$self->profile->settings(map({ { key => $_, value => $::form->{settings}->{$_} } } keys %{ $::form->{settings} }),
@settings);
-
$self->profile->set('json_mappings', JSON::to_json($self->mappings));
-
$self->profile->set_defaults;
}
$self->track_progress(phase => 'building report', progress => 0);
- my $clone_profile = $self->profile->clone_and_reset_deep;
- $clone_profile->save; # weird bug. if this isn't saved before adding it to the report, it will default back to the last profile.
-
my $report = SL::DB::CsvImportReport->new(
session_id => $params{session_id},
- profile => $clone_profile,
+ profile_id => $self->profile->id,
type => $self->type,
file => '',
numrows => scalar @{ $self->data },
$self->track_progress(phase => 'building report', progress => 0);
- my $clone_profile = $self->profile->clone_and_reset_deep;
- $clone_profile->save; # weird bug. if this isn't saved before adding it to the report, it will default back to the last profile.
-
my $report = SL::DB::CsvImportReport->new(
session_id => $params{session_id},
- profile => $clone_profile,
+ profile_id => $self->profile->id,
type => $self->type,
file => '',
numrows => scalar @{ $self->data },
return $report->id;
}
-sub csv_file_name {
- my ($self) = @_;
- return "csv-import-" . $self->type . ".csv";
-}
-
sub init_worker {
my $self = shift;
}
sub check_task_server {
+ if (!$::auth->client->{task_server_user_id}) {
+ flash('error', t8('The task server is required for this module but not enabled for the current client. Please enable it for the client "#1" in the administration section.', $::auth->client->{name}));
+ }
+
return 1 if $_[0]->task_server->is_running;
- flash('info', t8('The task server is not running at the moment but needed for this module'));
+ flash('warning', t8('The task server is not running at the moment but needed for this module'));
1;
}
[ grep { $_->{from} } @{ $::form->{mappings} || [] } ]
}
+sub setup_render_inputs_action_bar {
+ my ($self, %params) = @_;
+
+ for my $bar ($::request->layout->get('actionbar')) {
+ $bar->add(
+ action => [
+ t8('Preview'),
+ submit => [ '#form', { action => 'CsvImport/test' } ],
+ accesskey => 'enter',
+ not_if => ($self->profile && $self->profile->get('dont_edit_profile')),
+ ],
+ action => [
+ t8('Import'),
+ submit => [ '#form', { action => 'CsvImport/import' } ],
+ disabled => t8('The test import has not been executed yet.'),
+ id => 'action_import',
+ ],
+ );
+ }
+}
+
1;
projects / kivitendo-erp.git / blobdiff