X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FContact.pm;h=81fa0e80d8451217dfb5e0598f85ea7f236c5f98;hb=d4925a8b60f04674885e30d9316dc0263f8b9a84;hp=5d0a1bea7fe2dc13c465291f439341a52626f934;hpb=346be50ec6aac3cb58bc2a4c427777b414f07bd1;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/Contact.pm b/SL/Controller/CsvImport/Contact.pm
index 5d0a1bea7..81fa0e80d 100644
--- a/SL/Controller/CsvImport/Contact.pm
+++ b/SL/Controller/CsvImport/Contact.pm
@@ -13,6 +13,9 @@ use Rose::Object::MakeMethods::Generic
  scalar => [ qw(table) ],
 );
 
+sub set_profile_defaults {
+};
+
 sub init_class {
   my ($self) = @_;
   $self->class('SL::DB::Contact');
@@ -24,14 +27,66 @@ sub init_all_cvar_configs {
   return SL::DB::Manager::CustomVariableConfig->get_all(where => [ module => 'Contacts' ]);
 }
 
+sub force_allow_columns {
+  return qw(cp_id);
+}
+
 sub check_objects {
   my ($self) = @_;
 
+  $self->controller->track_progress(phase => 'building data', progress => 0);
+
+  my $i              = 0;
+  my $num_data       = scalar @{ $self->controller->data };
+  my $update_policy  = $self->controller->profile->get('update_policy') || 'update_existing';
+  my %contacts_by_id = map { ( $_->cp_id => $_ ) } @{ $self->existing_objects };
+  my $methods        = $self->controller->headers->{methods};
+  my %used_methods   = map { ( $_ => 1 ) } @{ $methods };
+
   foreach my $entry (@{ $self->controller->data }) {
+    $self->controller->track_progress(progress => $i/$num_data * 100) if $i % 100 == 0;
+
+    my $object = $entry->{object};
+    if ($object->cp_id) {
+      my $existing_contact = $contacts_by_id{ $object->cp_id };
+      if (!$existing_contact) {
+        $contacts_by_id{ $object->cp_id } = $object if $object->cp_id;
+
+      } elsif ($update_policy eq 'skip') {
+        push(@{ $entry->{errors} }, $::locale->text('Skipping due to existing entry in database'));
+        next;
+
+      } elsif ($update_policy eq 'update_existing') {
+        # Update existing customer/vendor records.
+        $entry->{object_to_save} = $existing_contact;
+
+        $object->cp_cv_id($existing_contact->cp_cv_id);
+
+        foreach (qw(cp_name cp_gender)) {
+          $object->$_($existing_contact->$_) if !$object->$_;
+        }
+
+        $existing_contact->$_( $entry->{object}->$_ ) for @{ $methods };
+
+        push @{ $entry->{information} }, $::locale->text('Updating existing entry in database');
+
+      } else {
+        $object->cp_id(undef);
+      }
+    }
+
     $self->check_name($entry);
     $self->check_vc($entry, 'cp_cv_id');
     $self->check_gender($entry);
     $self->handle_cvars($entry);
+
+    my @cleaned_fields = $self->clean_fields(qr{[\r\n]}, $object, qw(cp_title cp_givenname cp_name cp_email cp_phone1 cp_phone2 cp_fax cp_mobile1 cp_mobile2 cp_satphone cp_satfax
+                                                                     cp_privatphone cp_privatemail cp_abteilung cp_street cp_zipcode cp_city cp_position));
+
+    push @{ $entry->{information} }, $::locale->text('Illegal characters have been removed from the following fields: #1', join(', ', @cleaned_fields))
+      if @cleaned_fields;
+  } continue {
+    $i++;
   }
 
   $self->add_info_columns({ header => $::locale->text('Customer/Vendor'), method => 'vc_name' });
@@ -54,43 +109,24 @@ sub check_gender {
   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');
 }
 
-sub check_duplicates {
-  my ($self, %params) = @_;
-
-  my $normalizer = sub { my $name = $_[0]; $name =~ s/[\s,\.\-]//g; return $name; };
-
-  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 } };
+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
+                 )
+        );
       }
-    }
-  }
-
-  foreach my $entry (@{ $self->controller->data }) {
-    next if @{ $entry->{errors} };
-
-    my $name = $normalizer->($entry->{object}->cp_name);
-
-    $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');
-    }
-  }
-}
-
-sub field_lengths {
-  return ( cp_title     => 75,
-           cp_givenname => 75,
-           cp_name      => 75,
-           cp_phone1    => 75,
-           cp_phone2    => 75,
-           cp_gender    =>  1,
-         );
+    },
+  };
 }
 
 sub setup_displayable_columns {
@@ -106,6 +142,7 @@ sub setup_displayable_columns {
                                  { name => 'cp_fax',         description => $::locale->text('Fax')                           },
                                  { name => 'cp_gender',      description => $::locale->text('Gender')                        },
                                  { name => 'cp_givenname',   description => $::locale->text('Given Name')                    },
+                                 { name => 'cp_id',          description => $::locale->text('Database ID')                   },
                                  { name => 'cp_mobile1',     description => $::locale->text('Mobile1')                       },
                                  { name => 'cp_mobile2',     description => $::locale->text('Mobile2')                       },
                                  { name => 'cp_name',        description => $::locale->text('Name')                          },
@@ -117,11 +154,14 @@ 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')               },
+                                 { name => 'customer_gln',   description => $::locale->text('Customer GLN')                  },
                                  { name => 'vendor',         description => $::locale->text('Vendor (name)')                 },
                                  { name => 'vendornumber',   description => $::locale->text('Vendor Number')                 },
+                                 { name => 'vendor_gln',     description => $::locale->text('Vendor GLN')                    },
                                 );
 }