X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FController%2FCsvImport%2FContact.pm;h=b2657fb4488d43c4a63bf909d48e7a5026a977a0;hb=78c5d01b4d391a1f500c43d3a769711fc8b49ca3;hp=04697cb9b7385b2574ce94a8c643d44f077df947;hpb=32115b41fee3d1e1523c60975c8da4641a33f37f;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/Contact.pm b/SL/Controller/CsvImport/Contact.pm
index 04697cb9b..b2657fb44 100644
--- a/SL/Controller/CsvImport/Contact.pm
+++ b/SL/Controller/CsvImport/Contact.pm
@@ -3,13 +3,14 @@ package SL::Controller::CsvImport::Contact;
 use strict;
 
 use SL::Helper::Csv;
+use SL::DB::CustomVariable;
+use SL::DB::CustomVariableConfig;
 
 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,90 +18,68 @@ sub init_class {
   $self->class('SL::DB::Contact');
 }
 
-sub init_all_vc {
+sub init_all_cvar_configs {
   my ($self) = @_;
 
-  $self->all_vc({ customers => SL::DB::Manager::Customer->get_all(with_objects => [ 'contacts' ]),
-                  vendors   => SL::DB::Manager::Vendor->get_all(  with_objects => [ 'contacts' ]) });
+  return SL::DB::Manager::CustomVariableConfig->get_all(where => [ module => 'Contacts' ]);
 }
 
 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};
-
-    my $name     =  $object->cp_name;
-    $name        =~ s/^\s+//;
-    $name        =~ s/\s+$//;
-
-    if (!$name) {
-      push @{ $entry->{errors} }, $::locale->text('Error: Name missing');
-      next;
-    }
-
-    if ($object->cp_cv_id) {
-      $object->cp_cv_id(undef) if !$by_id{ $object->cp_cv_id };
-    }
-
-    if (!$object->cp_cv_id) {
-      my $vc_id = $by_number{customers}->{ $raw_data->{customernumber} } || $by_number{vendors}->{ $raw_data->{vendornumber} };
-      $object->cp_cv_id($vc_id) if $vc_id;
-    }
-
-    if (!$object->cp_cv_id) {
-      my $vc_id = $by_name{customers}->{ $raw_data->{customer} } || $by_name{vendors}->{ $raw_data->{vendor} };
-      $object->cp_cv_id($vc_id) if $vc_id;
-    }
-
-    if (!$object->cp_cv_id) {
-      push @{ $entry->{errors} }, $::locale->text('Error: Customer/vendor not found');
-      next;
-    }
-
-    $entry->{vc} = $by_id{ $object->cp_cv_id };
-
-    if (($object->cp_gender ne 'm') && ($object->cp_gender ne 'f')) {
-      push @{ $entry->{errors} }, $::locale->text('Error: Gender (cp_gender) missing or invalid');
-      next;
-    }
+    $self->controller->track_progress(progress => $i/$num_data * 100) if $i % 100 == 0;
+
+    $self->check_name($entry);
+    $self->check_vc($entry, 'cp_cv_id');
+    $self->check_gender($entry);
+    $self->handle_cvars($entry);
+  } continue {
+    $i++;
   }
+
+  $self->add_info_columns({ header => $::locale->text('Customer/Vendor'), method => 'vc_name' });
+  $self->add_cvar_raw_data_columns;
 }
 
-sub check_duplicates {
-  my ($self, %params) = @_;
+sub check_name {
+  my ($self, $entry) = @_;
 
-  my $normalizer = sub { my $name = $_[0]; $name =~ s/[\s,\.\-]//g; return $name; };
+  my $name     =  $entry->{object}->cp_name;
+  $name        =~ s/^\s+//;
+  $name        =~ s/\s+$//;
 
-  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 { ( $normalizer->($_->cp_name) => 'db' ) } @{ $vc->contacts } };
-      }
-    }
-  }
-
-  foreach my $entry (@{ $self->controller->data }) {
-    next if @{ $entry->{errors} };
+  push @{ $entry->{errors} }, $::locale->text('Error: Name missing') unless $name;
+}
 
-    my $name = $normalizer->($entry->{object}->cp_name);
+sub check_gender {
+  my ($self, $entry) = @_;
 
-    $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';
+  push @{ $entry->{errors} }, $::locale->text('Error: Gender (cp_gender) missing or invalid') if ($entry->{object}->cp_gender ne 'm') && ($entry->{object}->cp_gender ne 'f');
+}
 
-    } 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');
-    }
-  }
+sub get_duplicate_check_fields {
+  return {
+    cp_name => {
+      label     => $::locale->text('Name'),
+      default   => 1,
+      maker     => sub {
+        my $o = shift;
+        return join(
+                 '--',
+                 $o->cp_cv_id,
+                 map(
+                   { s/[\s,\.\-]//g; $_ }
+                   $o->cp_name
+                 )
+        );
+      }
+    },
+  };
 }
 
 sub field_lengths {
@@ -117,6 +96,7 @@ sub setup_displayable_columns {
   my ($self) = @_;
 
   $self->SUPER::setup_displayable_columns;
+  $self->add_cvar_columns_to_displayable_columns;
 
   $self->add_displayable_columns({ name => 'cp_abteilung',   description => $::locale->text('Department')                    },
                                  { name => 'cp_birthday',    description => $::locale->text('Birthday')                      },
@@ -136,6 +116,7 @@ sub setup_displayable_columns {
                                  { name => 'cp_satfax',      description => $::locale->text('Sat. Fax')                      },
                                  { name => 'cp_satphone',    description => $::locale->text('Sat. Phone')                    },
                                  { name => 'cp_title',       description => $::locale->text('Title')                         },
+                                 { name => 'cp_position',    description => $::locale->text('Function/Position')             },
 
                                  { name => 'customer',       description => $::locale->text('Customer (name)')               },
                                  { name => 'customernumber', description => $::locale->text('Customer Number')               },