X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FCsvImport%2FContact.pm;h=e5dadbbebe50d308f9bccc7c3632507ffa49ba8f;hb=58fdd50dbb6b909d48b2846f36857b2bd2219441;hp=ace6654018d8f65dca33ea74572cb74493be7197;hpb=7b9d1666e389bfedba43b2d0fd5d1b0e3f129e88;p=kivitendo-erp.git

diff --git a/SL/Controller/CsvImport/Contact.pm b/SL/Controller/CsvImport/Contact.pm
index ace665401..e5dadbbeb 100644
--- a/SL/Controller/CsvImport/Contact.pm
+++ b/SL/Controller/CsvImport/Contact.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,62 +16,32 @@ sub init_class {
   $self->class('SL::DB::Contact');
 }
 
-sub init_all_vc {
-  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' ]) });
-}
-
 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}   } } );
-
   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+$//;
+    $self->check_name($entry);
+    $self->check_vc($entry, 'cp_cv_id');
+    $self->check_gender($entry);
+  }
 
-    if (!$name) {
-      push @{ $entry->{errors} }, $::locale->text('Error: Name missing');
-      next;
-    }
+  $self->add_info_columns({ header => $::locale->text('Customer/Vendor'), method => 'vc_name' });
+}
 
-    if ($object->cp_cv_id) {
-      $object->cp_cv_id(undef) if !$by_id{ $object->cp_cv_id };
-    }
+sub check_name {
+  my ($self, $entry) = @_;
 
-    if (!$object->cp_cv_id) {
-      $::lxdebug->message(0, "cnum" . $raw_data->{customernumber});
-      my $vc_id = $by_number{customers}->{ $raw_data->{customernumber} } || $by_number{vendors}->{ $raw_data->{vendornumber} };
-      $object->cp_cv_id($vc_id) if $vc_id;
-    }
+  my $name     =  $entry->{object}->cp_name;
+  $name        =~ s/^\s+//;
+  $name        =~ s/\s+$//;
 
-    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;
-    }
+  push @{ $entry->{errors} }, $::locale->text('Error: Name missing') unless $name;
+}
 
-    $entry->{vc} = $by_id{ $object->cp_cv_id };
+sub check_gender {
+  my ($self, $entry) = @_;
 
-    if (($object->cp_gender ne 'm') && ($object->cp_gender ne 'f')) {
-      push @{ $entry->{errors} }, $::locale->text('Error: Gender (cp_gender) missing or invalid');
-      next;
-    }
-  }
+  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 {
@@ -114,4 +83,35 @@ sub field_lengths {
          );
 }
 
+sub setup_displayable_columns {
+  my ($self) = @_;
+
+  $self->SUPER::setup_displayable_columns;
+
+  $self->add_displayable_columns({ name => 'cp_abteilung',   description => $::locale->text('Department')                    },
+                                 { name => 'cp_birthday',    description => $::locale->text('Birthday')                      },
+                                 { name => 'cp_cv_id',       description => $::locale->text('Customer/Vendor (database ID)') },
+                                 { name => 'cp_email',       description => $::locale->text('E-mail')                        },
+                                 { name => 'cp_fax',         description => $::locale->text('Fax')                           },
+                                 { name => 'cp_gender',      description => $::locale->text('Gender')                        },
+                                 { name => 'cp_givenname',   description => $::locale->text('Given Name')                    },
+                                 { name => 'cp_mobile1',     description => $::locale->text('Mobile1')                       },
+                                 { name => 'cp_mobile2',     description => $::locale->text('Mobile2')                       },
+                                 { name => 'cp_name',        description => $::locale->text('Name')                          },
+                                 { name => 'cp_phone1',      description => $::locale->text('Phone1')                        },
+                                 { name => 'cp_phone2',      description => $::locale->text('Phone2')                        },
+                                 { name => 'cp_privatemail', description => $::locale->text('Private E-mail')                },
+                                 { name => 'cp_privatphone', description => $::locale->text('Private Phone')                 },
+                                 { name => 'cp_project',     description => $::locale->text('Project')                       },
+                                 { name => 'cp_satfax',      description => $::locale->text('Sat. Fax')                      },
+                                 { name => 'cp_satphone',    description => $::locale->text('Sat. Phone')                    },
+                                 { name => 'cp_title',       description => $::locale->text('Title')                         },
+
+                                 { name => 'customer',       description => $::locale->text('Customer (name)')               },
+                                 { name => 'customernumber', description => $::locale->text('Customer Number')               },
+                                 { name => 'vendor',         description => $::locale->text('Vendor (name)')                 },
+                                 { name => 'vendornumber',   description => $::locale->text('Vendor Number')                 },
+                                );
+}
+
 1;