use SL::Controller::CsvImport::Contact;
use SL::Controller::CsvImport::CustomerVendor;
use SL::Controller::CsvImport::Part;
+use SL::Controller::CsvImport::Inventory;
use SL::Controller::CsvImport::Shipto;
use SL::Controller::CsvImport::Project;
+use SL::Controller::CsvImport::Order;
+use SL::JSON;
+use SL::Controller::CsvImport::BankTransaction;
use SL::BackgroundJob::CsvImport;
use SL::System::TaskServer;
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
- import_status errors headers raw_data_headers info_headers data num_imported num_importable displayable_columns file) ],
+ import_status errors headers raw_data_headers info_headers data num_imported num_importable displayable_columns file all_taxzones) ],
'scalar --get_set_init' => [ qw(worker task_server) ],
'array' => [
progress_tracker => { },
$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.', $first_error->[2], $first_error->[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]));
}
if ($data->{progress}{finished} || $data->{errors}) {
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");
+ if ($self->worker->is_multiplexed) {
+ foreach my $p (@{ $self->worker->profile }) {
+ $csv->print($file->fh, [ map { $_->{name} } @{ $self->displayable_columns->{$p->{row_ident}} } ]);
+ $file->fh->print("\r\n");
+ }
+ foreach my $p (@{ $self->worker->profile }) {
+ $csv->print($file->fh, [ map { $_->{description} } @{ $self->displayable_columns->{$p->{row_ident}} } ]);
+ $file->fh->print("\r\n");
+ }
+ } else {
+ $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;
my $pages = {};
$pages->{per_page} = $::form->{per_page} || 20;
$pages->{max} = SL::DB::Helper::Paginated::ceil($num_rows, $pages->{per_page}) || 1;
- $pages->{cur} = $page < 1 ? 1
+ $pages->{page} = $page < 1 ? 1
: $page > $pages->{max} ? $pages->{max}
: $page;
- $pages->{common} = [ grep { $_->{visible} } @{ SL::DB::Helper::Paginated::make_common_pages($pages->{cur}, $pages->{max}) } ];
+ $pages->{common} = [ grep { $_->{visible} } @{ SL::DB::Helper::Paginated::make_common_pages($pages->{page}, $pages->{max}) } ];
+ $self->{report_numheaders} = $self->{report}->numheaders;
+ my $first_row_header = 0;
+ 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} = [
- 0,
- $pages->{per_page} * ($pages->{cur}-1) + 1
+ $first_row_header
+ ..
+ $last_row_header,
+ $first_row_data
..
- min($pages->{per_page} * $pages->{cur}, $num_rows)
+ $last_row_data
];
my @query = (
csv_import_report_id => $report_id,
or => [
- row => 0,
and => [
- row => { gt => $pages->{per_page} * ($pages->{cur}-1) },
- row => { le => $pages->{per_page} * $pages->{cur} },
+ row => { ge => $first_row_header },
+ row => { le => $last_row_header },
+ ],
+ and => [
+ row => { ge => $first_row_data },
+ row => { le => $last_row_data },
]
]
);
sub check_type {
my ($self) = @_;
- die "Invalid CSV import type" if none { $_ eq $::form->{profile}->{type} } qw(parts customers_vendors addresses contacts projects);
+ 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});
}
: $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 'bank_transactions' ? $::locale->text('CSV import: bank transactions')
: die;
+ if ($self->{type} eq 'customers_vendors' or $self->{type} eq 'orders' ) {
+ $self->all_taxzones(SL::DB::Manager::TaxZone->get_all_sorted(query => [ obsolete => 0 ]));
+ };
+
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);
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}) {
my $file = SL::SessionFile->new($self->csv_file_name, mode => '>');
}
$self->{background_job} = SL::BackgroundJob::CsvImport->create_job(
- file => $self->csv_file_name,
- profile => $self->profile,
- type => $self->profile->type,
- test => $params{test},
+ file => $self->csv_file_name,
+ profile => $self->profile,
+ type => $self->profile->type,
+ test => $params{test},
+ employee_id => SL::DB::Manager::Employee->current->id,
)->save;
if ($self->task_server->is_running) {
$self->task_server->start;
}
- flash('info', $::locale->text('Your import is beig processed.'));
+ flash('info', $::locale->text('Your import is being processed.'));
$self->{deferred} = 1;
- $self->render_inputs;
+ if ($::request->type eq 'json') {
+ $self->render(\ SL::JSON::to_json($self->{background_job}->as_tree), { type => 'json' })
+ } else {
+ $self->render_inputs;
+ }
}
sub test_and_import {
$profile ||= SL::DB::CsvImportProfile->new(type => $self->{type}, login => $::myconfig{login});
$self->profile($profile);
+ $self->worker->set_profile_defaults;
$self->profile->set_defaults;
}
where => [
type => $self->type,
login => $::myconfig{login},
+ '!name' => '',
],
sort_by => 'name'));
}
$::form->{settings}->{sellprice_adjustment} = $::form->parse_amount(\%::myconfig, $::form->{settings}->{sellprice_adjustment});
}
+ if ($self->type eq 'orders') {
+ $::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} });
}
sub save_report {
- my ($self, $report_id) = @_;
+ my ($self, %params) = @_;
+
+ if ($self->worker->is_multiplexed) {
+ return $self->save_report_multi(%params);
+ } else {
+ return $self->save_report_single(%params);
+ }
+}
+
+sub save_report_single {
+ my ($self, %params) = @_;
$self->track_progress(phase => 'building report', progress => 0);
$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 => $::auth->create_or_refresh_session,
+ session_id => $params{session_id},
profile => $clone_profile,
type => $self->type,
file => '',
numrows => scalar @{ $self->data },
+ numheaders => 1,
);
$report->save(cascade => 1) or die $report->db->error;
return $report->id;
}
+sub save_report_multi {
+ my ($self, %params) = @_;
+
+ $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,
+ type => $self->type,
+ file => '',
+ numrows => scalar @{ $self->data },
+ numheaders => scalar @{ $self->worker->profile },
+ );
+
+ $report->save(cascade => 1) or die $report->db->error;
+
+ my $dbh = $::form->get_standard_dbh;
+ $dbh->begin_work;
+
+ my $query = 'INSERT INTO csv_import_report_rows (csv_import_report_id, col, row, value) VALUES (?, ?, ?, ?)';
+ my $query2 = 'INSERT INTO csv_import_report_status (csv_import_report_id, row, type, value) VALUES (?, ?, ?, ?)';
+
+ my $sth = $dbh->prepare($query);
+ my $sth2 = $dbh->prepare($query2);
+
+ # save headers
+ my ($headers, $info_methods, $raw_methods, $methods);
+
+ for my $i (0 .. $#{ $self->worker->profile }) {
+ my $row_ident = $self->worker->profile->[$i]->{row_ident};
+
+ for my $i (0 .. $#{ $self->info_headers->{$row_ident}->{headers} }) {
+ next unless $self->info_headers->{$row_ident}->{used}->{ $self->info_headers->{$row_ident}->{methods}->[$i] };
+ push @{ $headers->{$row_ident} }, $self->info_headers->{$row_ident}->{headers}->[$i];
+ push @{ $info_methods->{$row_ident} }, $self->info_headers->{$row_ident}->{methods}->[$i];
+ }
+ for my $i (0 .. $#{ $self->headers->{$row_ident}->{headers} }) {
+ next unless $self->headers->{$row_ident}->{used}->{ $self->headers->{$row_ident}->{headers}->[$i] };
+ push @{ $headers->{$row_ident} }, $self->headers->{$row_ident}->{headers}->[$i];
+ push @{ $methods->{$row_ident} }, $self->headers->{$row_ident}->{methods}->[$i];
+ }
+
+ for my $i (0 .. $#{ $self->raw_data_headers->{$row_ident}->{headers} }) {
+ next unless $self->raw_data_headers->{$row_ident}->{used}->{ $self->raw_data_headers->{$row_ident}->{headers}->[$i] };
+ push @{ $headers->{$row_ident} }, $self->raw_data_headers->{$row_ident}->{headers}->[$i];
+ push @{ $raw_methods->{$row_ident} }, $self->raw_data_headers->{$row_ident}->{headers}->[$i];
+ }
+
+ }
+
+ 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} };
+ }
+
+ # col offsets
+ my ($off1, $off2);
+ for my $i (0 .. $#{ $self->worker->profile }) {
+ my $row_ident = $self->worker->profile->[$i]->{row_ident};
+ my $n_info_methods = $info_methods->{$row_ident} ? scalar @{ $info_methods->{$row_ident} } : 0;
+ my $n_methods = $methods->{$row_ident} ? scalar @{ $methods->{$row_ident} } : 0;
+
+ $off1->{$row_ident} = $n_info_methods;
+ $off2->{$row_ident} = $off1->{$row_ident} + $n_methods;
+ }
+
+ my $n_header_rows = scalar @{ $self->worker->profile };
+
+ for my $row (0 .. $#{ $self->data }) {
+ $self->track_progress(progress => $row / @{ $self->data } * 100) if $row % 1000 == 0;
+ my $data_row = $self->{data}[$row];
+ my $row_ident = $data_row->{raw_data}{datatype};
+
+ 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} };
+
+ $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} || [] };
+ }
+
+ $dbh->commit;
+
+ return $report->id;
+}
+
sub csv_file_name {
my ($self) = @_;
return "csv-import-" . $self->type . ".csv";
: $self->{type} eq 'contacts' ? SL::Controller::CsvImport::Contact->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 'bank_transactions' ? SL::Controller::CsvImport::BankTransaction->new(@args)
: die "Program logic error";
}
projects / kivitendo-erp.git / blobdiff