use SL::DB::CsvImportReport;
use SL::DB::Unit;
use SL::DB::Helper::Paginated ();
+use SL::DBUtils qw(do_statement);
use SL::Helper::Flash;
use SL::Locale::String;
use SL::SessionFile;
+use SL::SessionFile::Random;
+use SL::Controller::CsvImport::AdditionalBillingAddress;
use SL::Controller::CsvImport::Contact;
use SL::Controller::CsvImport::CustomerVendor;
use SL::Controller::CsvImport::Part;
use SL::Controller::CsvImport::Shipto;
use SL::Controller::CsvImport::Project;
use SL::Controller::CsvImport::Order;
+use SL::Controller::CsvImport::DeliveryOrder;
use SL::Controller::CsvImport::ARTransaction;
use SL::JSON;
use SL::Controller::CsvImport::BankTransaction;
use SL::BackgroundJob::CsvImport;
use SL::System::TaskServer;
-use List::MoreUtils qw(none);
+use List::MoreUtils qw(any none);
use List::Util qw(min);
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 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' => [
$self->profile($profile);
if ($data->{errors} and my $first_error = $data->{errors}->[0]) {
- flash('error', $::locale->text('There was an error parsing the csv file: #1 in line #2: #3', $first_error->[2], $first_error->[0], $first_error->[1]));
+ flash('error', $::locale->text('There was an error parsing the csv file: #1 in line #2.', $first_error->[2], $first_error->[4]));
}
if ($data->{progress}{finished} || $data->{errors}) {
$::form->error(t8('No report with id #1', $report_id));
}
- 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 ]);
+ my $show_info_err = ($self->{report}->profile->get('full_preview', 0) == 1);
+ my $show_first_20 = ($self->{report}->profile->get('full_preview', 0) == 2);
+
+ my $num_rows = 0;
+ if ($show_first_20) {
+ $num_rows = min($self->{report}->numrows, 20);
+ } elsif ($show_info_err) {
+ # count each status row only once
+ $num_rows = SL::DB::Manager::CsvImportReportStatus->get_all_count(query => [csv_import_report_id => $report_id],
+ select => ['row'],
+ distinct => 1,);
+ } else {
+ # show all
+ $num_rows = $self->{report}->numrows;
+ }
# manual paginating, yuck
my $page = $::form->{page} || 1;
my $last_row_header = $self->{report_numheaders} - 1;
my $first_row_data = $pages->{per_page} * ($pages->{page}-1) + $self->{report_numheaders};
my $last_row_data = min($pages->{per_page} * $pages->{page}, $num_rows) + $self->{report_numheaders} - 1;
- $self->{display_rows} = [
- $first_row_header
- ..
- $last_row_header,
- $first_row_data
- ..
- $last_row_data
- ];
+
+
+ $self->{display_rows} = [];
+ if ($show_info_err) {
+ my $limit = $last_row_data - $first_row_data + 1;
+ my $offset = $first_row_data - $self->{report_numheaders};
+ my @err_rows = map { $_->row } @{SL::DB::Manager::CsvImportReportStatus->get_all(query => [csv_import_report_id => $report_id],
+ distinct => 1,
+ select => ['row'],
+ limit => $limit,
+ offset => $offset,
+ sort_by => 'row')};
+ $self->{display_rows} = [ $first_row_header .. $last_row_header,
+ @err_rows ];
+
+ } else {
+
+ $self->{display_rows} = [ $first_row_header .. $last_row_header,
+ $first_row_data .. $last_row_data ];
+ }
my @query = (
+ row => $self->{display_rows},
csv_import_report_id => $report_id,
- or => [
- and => [
- row => { ge => $first_row_header },
- row => { le => $last_row_header },
- ],
- and => [
- row => { ge => $first_row_data },
- row => { le => $last_row_data },
- ]
- ]
);
- my $rows = SL::DB::Manager::CsvImportReportRow ->get_all(query => \@query);
- my $status = SL::DB::Manager::CsvImportReportStatus->get_all(query => \@query);
+ my $rows = SL::DB::Manager::CsvImportReportRow ->get_all(query => \@query, sort_by => 'row');
+ my $status = SL::DB::Manager::CsvImportReportStatus->get_all(query => \@query, sort_by => 'row');
+ $self->{num_errors} = SL::DB::Manager::CsvImportReportStatus->get_all_count(query => [csv_import_report_id => $report_id, type => 'errors']);
$self->{report_rows} = $self->{report}->folded_rows(rows => $rows);
$self->{report_status} = $self->{report}->folded_status(status => $status);
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.'))
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 ar_transactions);
+ die "Invalid CSV import type" if none { $_ eq $::form->{profile}->{type} } qw(parts inventories customers_vendors billing_addresses addresses contacts projects orders delivery_orders bank_transactions ar_transactions);
$self->type($::form->{profile}->{type});
}
$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 'billing_addresses' ? $::locale->text('CSV import: additional billing addresses')
: $self->type eq 'addresses' ? $::locale->text('CSV import: shipping addresses')
: $self->type eq 'contacts' ? $::locale->text('CSV import: contacts')
: $self->type eq 'parts' ? $::locale->text('CSV import: parts and services')
: $self->type eq 'inventories' ? $::locale->text('CSV import: inventories')
: $self->type eq 'projects' ? $::locale->text('CSV import: projects')
: $self->type eq 'orders' ? $::locale->text('CSV import: orders')
+ : $self->type eq 'delivery_orders' ? $::locale->text('CSV import: delivery orders')
: $self->type eq 'bank_transactions' ? $::locale->text('CSV import: bank transactions')
: $self->type eq 'ar_transactions' ? $::locale->text('CSV import: ar transactions')
: die;
- if ($self->{type} eq 'customers_vendors' or $self->{type} eq 'orders' or $self->{type} eq 'ar_transactions' ) {
+ if ( any { $_ eq $self->{type} } qw(customers_vendors orders delivery_orders ar_transactions) ) {
$self->all_taxzones(SL::DB::Manager::TaxZone->get_all_sorted(query => [ obsolete => 0 ]));
};
$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}->{sellprice_adjustment} = $::form->parse_amount(\%::myconfig, $::form->{settings}->{sellprice_adjustment});
}
- if ($self->type eq 'orders') {
+ if ($self->type eq 'orders' or $self->{type} eq 'ar_transactions') {
$::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 },
push @raw_methods, $self->raw_data_headers->{headers}->[$i];
}
- $sth->execute($report->id, $_, 0, $headers[$_]) for 0 .. $#headers;
+ do_statement($::form, $sth, $query, $report->id, $_, 0, $headers[$_]) for 0 .. $#headers;
# col offsets
my $o1 = @info_methods;
$self->track_progress(progress => $row / @{ $self->data } * 100) if $row % 1000 == 0;
my $data_row = $self->{data}[$row];
- $sth->execute($report->id, $_, $row + 1, $data_row->{info_data}{ $info_methods[$_] }) for 0 .. $#info_methods;
- $sth->execute($report->id, $o1 + $_, $row + 1, $data_row->{object}->${ \ $methods[$_] }) for 0 .. $#methods;
- $sth->execute($report->id, $o2 + $_, $row + 1, $data_row->{raw_data}{ $raw_methods[$_] }) for 0 .. $#raw_methods;
+ my $object = $data_row->{object_to_save} || $data_row->{object};
+ do_statement($::form, $sth, $query, $report->id, $_, $row + 1, $data_row->{info_data}{ $info_methods[$_] }) for 0 .. $#info_methods;
+ do_statement($::form, $sth, $query, $report->id, $o1 + $_, $row + 1, $object->${ \ $methods[$_] }) for 0 .. $#methods;
+ do_statement($::form, $sth, $query, $report->id, $o2 + $_, $row + 1, $data_row->{raw_data}{ $raw_methods[$_] }) for 0 .. $#raw_methods;
- $sth2->execute($report->id, $row + 1, 'information', $_) for @{ $data_row->{information} || [] };
- $sth2->execute($report->id, $row + 1, 'errors', $_) for @{ $data_row->{errors} || [] };
+ do_statement($::form, $sth2, $query2, $report->id, $row + 1, 'information', $_) for @{ $data_row->{information} || [] };
+ do_statement($::form, $sth2, $query2, $report->id, $row + 1, 'errors', $_) for @{ $data_row->{errors} || [] };
}
1;
}) or do { die SL::DB->client->error };
$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 },
for my $i (0 .. $#{ $self->worker->profile }) {
my $row_ident = $self->worker->profile->[$i]->{row_ident};
- $sth->execute($report->id, $_, $i, $headers->{$row_ident}->[$_]) for 0 .. $#{ $headers->{$row_ident} };
+ do_statement($::form, $sth, $query, $report->id, $_, $i, $headers->{$row_ident}->[$_]) for 0 .. $#{ $headers->{$row_ident} };
}
# col offsets
my $o1 = $off1->{$row_ident};
my $o2 = $off2->{$row_ident};
- $sth->execute($report->id, $_, $row + $n_header_rows, $data_row->{info_data}{ $info_methods->{$row_ident}->[$_] }) for 0 .. $#{ $info_methods->{$row_ident} };
- $sth->execute($report->id, $o1 + $_, $row + $n_header_rows, $data_row->{object}->${ \ $methods->{$row_ident}->[$_] }) for 0 .. $#{ $methods->{$row_ident} };
- $sth->execute($report->id, $o2 + $_, $row + $n_header_rows, $data_row->{raw_data}{ $raw_methods->{$row_ident}->[$_] }) for 0 .. $#{ $raw_methods->{$row_ident} };
+ my $object = $data_row->{object_to_save} || $data_row->{object};
+ do_statement($::form, $sth, $query, $report->id, $_, $row + $n_header_rows, $data_row->{info_data}{ $info_methods->{$row_ident}->[$_] }) for 0 .. $#{ $info_methods->{$row_ident} };
+ do_statement($::form, $sth, $query, $report->id, $o1 + $_, $row + $n_header_rows, $object->${ \ $methods->{$row_ident}->[$_] }) for 0 .. $#{ $methods->{$row_ident} };
+ do_statement($::form, $sth, $query, $report->id, $o2 + $_, $row + $n_header_rows, $data_row->{raw_data}{ $raw_methods->{$row_ident}->[$_] }) for 0 .. $#{ $raw_methods->{$row_ident} };
- $sth2->execute($report->id, $row + $n_header_rows, 'information', $_) for @{ $data_row->{information} || [] };
- $sth2->execute($report->id, $row + $n_header_rows, 'errors', $_) for @{ $data_row->{errors} || [] };
+ do_statement($::form, $sth2, $query2, $report->id, $row + $n_header_rows, 'information', $_) for @{ $data_row->{information} || [] };
+ do_statement($::form, $sth2, $query2, $report->id, $row + $n_header_rows, 'errors', $_) for @{ $data_row->{errors} || [] };
}
1;
}) or do { die SL::DB->client->error };
return $report->id;
}
-sub csv_file_name {
- my ($self) = @_;
- return "csv-import-" . $self->type . ".csv";
-}
-
sub init_worker {
my $self = shift;
return $self->{type} eq 'customers_vendors' ? SL::Controller::CsvImport::CustomerVendor->new(@args)
: $self->{type} eq 'contacts' ? SL::Controller::CsvImport::Contact->new(@args)
+ : $self->{type} eq 'billing_addresses' ? SL::Controller::CsvImport::AdditionalBillingAddress->new(@args)
: $self->{type} eq 'addresses' ? SL::Controller::CsvImport::Shipto->new(@args)
: $self->{type} eq 'parts' ? SL::Controller::CsvImport::Part->new(@args)
: $self->{type} eq 'inventories' ? SL::Controller::CsvImport::Inventory->new(@args)
: $self->{type} eq 'projects' ? SL::Controller::CsvImport::Project->new(@args)
: $self->{type} eq 'orders' ? SL::Controller::CsvImport::Order->new(@args)
+ : $self->{type} eq 'delivery_orders' ? SL::Controller::CsvImport::DeliveryOrder->new(@args)
: $self->{type} eq 'bank_transactions' ? SL::Controller::CsvImport::BankTransaction->new(@args)
: $self->{type} eq 'ar_transactions' ? SL::Controller::CsvImport::ARTransaction->new(@args)
: die "Program logic error";
}
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