- }
- }
-
- foreach my $entry (@{ $self->controller->data }) {
- next if @{ $entry->{errors} };
-
- my $name = $name_maker->($entry->{object});
-
- $by_id_and_name{ $entry->{vc}->id } ||= { };
- if (!$by_id_and_name{ $entry->{vc}->id }->{ $name }) {
- $by_id_and_name{ $entry->{vc}->id }->{ $name } = 'csv';
-
- } else {
- push @{ $entry->{errors} }, $by_id_and_name{ $entry->{vc}->id }->{ $name } eq 'db' ? $::locale->text('Duplicate in database') : $::locale->text('Duplicate in CSV file');
- }
- }
+ },
+
+ shiptoname => {
+ label => $::locale->text('Name'),
+ default => 1,
+ maker => sub {
+ my $o = shift;
+ return join(
+ '--',
+ $o->trans_id,
+ map(
+ { s/[\s,\.\-]//g; $_ }
+ $o->shiptoname
+ )
+ );
+ }
+ },
+
+ shiptostreet => {
+ label => $::locale->text('Street'),
+ default => 1,
+ maker => sub {
+ my $o = shift;
+ return join(
+ '--',
+ $o->trans_id,
+ map(
+ { s/[\s,\.\-]//g; $_ }
+ $o->shiptostreet
+ )
+ );
+ }
+ },
+ };