Projekt

Allgemein

Profil

« Zurück | Weiter » 

Revision cc6d7fec

Von Bernd Bleßmann vor fast 5 Jahren hinzugefügt

  • ID cc6d7fecf8eb51ffb76504d6798b7c361371e5c2
  • Vorgänger 30d53fc8
  • Nachfolger d8dd48ce

Abteilungen bei Ansprechpersonen: Freitext-Feld und/oder Auswahlliste

Die Abteilung wird entweder nur mit einer Auswahlliste angezeigt oder mit
Freitext-Feld und Auswahlliste. Das ist annähernd das alte Verhalten - im
Freitext-Feld eingegebener Text wird auch in contact_departments gespeichert.

In der Mandantenkonfiguration ist das Freitext-Feld (altes Verhalten)
abschaltbar.

Todo: Fremdschlüsselbeziehung zwischen contacts und contact_departments

Unterschiede anzeigen:

SL/Controller/CustomerVendor.pm
use SL::DB::Customer;
use SL::DB::Vendor;
use SL::DB::Business;
use SL::DB::ContactDepartment;
use SL::DB::ContactTitle;
use SL::DB::Employee;
use SL::DB::Greeting;
......
}
$self->{cv}->greeting(trim $self->{cv}->greeting);
my $save_greeting = $self->{cv}->greeting
my $save_greeting = $self->{cv}->greeting
&& $::instance_conf->get_vc_greetings_use_textfield
&& SL::DB::Manager::Greeting->get_all_count(where => [description => $self->{cv}->greeting]) == 0;
$self->{contact}->cp_title(trim($self->{contact}->cp_title));
my $save_contact_title = $self->{contact}->cp_title
my $save_contact_title = $self->{contact}->cp_title
&& $::instance_conf->get_contact_titles_use_textfield
&& SL::DB::Manager::ContactTitle->get_all_count(where => [description => $self->{contact}->cp_title]) == 0;
$self->{contact}->cp_abteilung(trim($self->{contact}->cp_abteilung));
my $save_contact_department = $self->{contact}->cp_abteilung
&& $::instance_conf->get_contact_departments_use_textfield
&& SL::DB::Manager::ContactDepartment->get_all_count(where => [description => $self->{contact}->cp_abteilung]) == 0;
my $db = $self->{cv}->db;
$db->with_transaction(sub {
......
$self->{contact}->cp_cv_id($self->{cv}->id);
if( $self->{contact}->cp_name ne '' || $self->{contact}->cp_givenname ne '' ) {
SL::DB::ContactTitle->new(description => $self->{contact}->cp_title)->save if $save_contact_title;
SL::DB::ContactTitle ->new(description => $self->{contact}->cp_title) ->save if $save_contact_title;
SL::DB::ContactDepartment->new(description => $self->{contact}->cp_abteilung)->save if $save_contact_department;
$self->{contact}->save(cascade => 1);
}
......
}
}
$self->{all_contact_departments} = SL::DB::Manager::ContactDepartment->get_all_sorted();
foreach my $contact (@{ $self->{cv}->contacts }) {
if ($contact->cp_abteilung && !grep {$contact->cp_abteilung eq $_->description} @{$self->{all_contact_departments}}) {
unshift @{$self->{all_contact_departments}}, (SL::DB::ContactDepartment->new(description => $contact->cp_abteilung));
}
}
$self->{all_currencies} = SL::DB::Manager::Currency->get_all();
$self->{all_languages} = SL::DB::Manager::Language->get_all();
......
$self->{all_pricegroups} = SL::DB::Manager::Pricegroup->get_all_sorted(query => [ or => [ id => $self->{cv}->pricegroup_id, obsolete => 0 ] ]);
}
$query =
'SELECT DISTINCT(cp_abteilung) AS department
FROM contacts
WHERE cp_abteilung IS NOT NULL AND cp_abteilung != \'\'
ORDER BY cp_abteilung';
$self->{all_departments} = [
map(
{ $_->{department}; }
selectall_hashref_query($::form, $dbh, $query)
)
];
$self->{contacts} = $self->{cv}->contacts;
$self->{contacts} ||= [];

Auch abrufbar als: Unified diff