X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FShipto.pm;h=1d2fdd7f6e707ebfdb8bb5c4121b4cf51d10c5ff;hb=c92f5dc6cc52c841c8d39de834903648b4577824;hp=9c6a2e922e094d6329dfc39a71f24bb1bef614de;hpb=32115b41fee3d1e1523c60975c8da4641a33f37f;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/Shipto.pm b/SL/Controller/CsvImport/Shipto.pm
index 9c6a2e922..1d2fdd7f6 100644
--- a/SL/Controller/CsvImport/Shipto.pm
+++ b/SL/Controller/CsvImport/Shipto.pm
@@ -8,8 +8,7 @@ use parent qw(SL::Controller::CsvImport::Base);
 
 use Rose::Object::MakeMethods::Generic
 (
- scalar                  => [ qw(table) ],
- 'scalar --get_set_init' => [ qw(all_vc) ],
+ scalar => [ qw(table) ],
 );
 
 sub init_class {
@@ -17,93 +16,76 @@ sub init_class {
   $self->class('SL::DB::Shipto');
 }
 
-sub init_all_vc {
-  my ($self) = @_;
-
-  $self->all_vc({ customers => SL::DB::Manager::Customer->get_all,
-                  vendors   => SL::DB::Manager::Vendor->get_all });
-}
-
 sub check_objects {
   my ($self) = @_;
 
-  my %by_id     = map { ( $_->id => $_ ) } @{ $self->all_vc->{customers} }, @{ $self->all_vc->{vendors} };
-  my %by_number = ( customers => { map { ( $_->customernumber => $_->id ) } @{ $self->all_vc->{customers} } },
-                    vendors   => { map { ( $_->vendornumber   => $_->id ) } @{ $self->all_vc->{vendors}   } } );
-  my %by_name   = ( customers => { map { ( $_->name           => $_->id ) } @{ $self->all_vc->{customers} } },
-                    vendors   => { map { ( $_->name           => $_->id ) } @{ $self->all_vc->{vendors}   } } );
+  $self->controller->track_progress(phase => 'building data', progress => 0);
 
+  my $i;
+  my $num_data = scalar @{ $self->controller->data };
   foreach my $entry (@{ $self->controller->data }) {
-    my $object   = $entry->{object};
-    my $raw_data = $entry->{raw_data};
-
-    if ($object->trans_id) {
-      $object->trans_id(undef) if !$by_id{ $object->trans_id };
-    }
-
-    if (!$object->trans_id) {
-      my $vc_id = $by_number{customers}->{ $raw_data->{customernumber} } || $by_number{vendors}->{ $raw_data->{vendornumber} };
-      $object->trans_id($vc_id) if $vc_id;
-    }
+    $self->controller->track_progress(progress => $i/$num_data * 100) if $i % 100 == 0;
 
-    if (!$object->trans_id) {
-      my $vc_id = $by_name{customers}->{ $raw_data->{customer} } || $by_name{vendors}->{ $raw_data->{vendor} };
-      $object->trans_id($vc_id) if $vc_id;
-    }
-
-    if (!$object->trans_id) {
-      push @{ $entry->{errors} }, $::locale->text('Error: Customer/vendor not found');
-      next;
-    }
-
-    $object->module('CT');
-
-    $entry->{vc} = $by_id{ $object->trans_id };
+    $self->check_vc($entry, 'trans_id');
+    $entry->{object}->module('CT');
+  } continue {
+    $i++;
   }
-}
-
-sub check_duplicates {
-  my ($self, %params) = @_;
-
-  my $normalizer = sub { my $name = $_[0]; $name =~ s/[\s,\.\-]//g; return $name; };
-  my $name_maker = sub { return $normalizer->($_[0]->shiptoname) . '--' . $normalizer->($_[0]->shiptostreet) };
 
-  my %by_id_and_name;
-  if ('check_db' eq $self->controller->profile->get('duplicates')) {
-    foreach my $type (qw(customers vendors)) {
-      foreach my $vc (@{ $self->all_vc->{$type} }) {
-        $by_id_and_name{ $vc->id } = { map { ( $name_maker->($_) => 'db' ) } @{ $vc->shipto } };
-      }
-    }
-  }
-
-  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');
-    }
-  }
+  $self->add_info_columns({ header => $::locale->text('Customer/Vendor'), method => 'vc_name' });
 }
 
-sub field_lengths {
-  return ( shiptoname         => 75,
-           shiptodepartment_1 => 75,
-           shiptodepartment_2 => 75,
-           shiptostreet       => 75,
-           shiptozipcode      => 75,
-           shiptocity         => 75,
-           shiptocountry      => 75,
-           shiptocontact      => 75,
-           shiptophone        => 30,
-           shiptofax          => 30,
-         );
+sub get_duplicate_check_fields {
+  return {
+    shiptoname_and_shiptostreet => {
+      label     => $::locale->text('Name and Street'),
+      default   => 1,
+      maker     => sub {
+        my $o = shift;
+        return join(
+                 '--',
+                 $o->trans_id,
+                 map(
+                   { s/[\s,\.\-]//g; $_ }
+                   $o->shiptoname,
+                   $o->shiptostreet
+                 )
+        );
+      }
+    },
+
+    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
+                 )
+        );
+      }
+    },
+  };
 }
 
 sub init_profile {