X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=bin%2Fmozilla%2Fct.pl;h=5c76ae36f78748d9c2f2a4b056098dd5ae5056f7;hb=0e5b1ea3ee6a7ad8ec9b735971eb894c850c5a64;hp=2275c7ff53909f45c8b725474733c7eb91021980;hpb=734e61e805dae3e7b72e5247797503dbbc56b63b;p=kivitendo-erp.git

diff --git a/bin/mozilla/ct.pl b/bin/mozilla/ct.pl
index 2275c7ff5..5c76ae36f 100644
--- a/bin/mozilla/ct.pl
+++ b/bin/mozilla/ct.pl
@@ -36,6 +36,14 @@
 # $locale->text('Vendors')
 # $locale->text('Add Customer')
 # $locale->text('Add Vendor')
+# $locale->text('Edit Customer')
+# $locale->text('Edit Vendor')
+# $locale->text('Customer saved!')
+# $locale->text('Vendor saved!')
+# $locale->text('Customer deleted!')
+# $locale->text('Cannot delete customer!')
+# $locale->text('Vendor deleted!')
+# $locale->text('Cannot delete vendor!')
 
 use CGI::Ajax;
 use POSIX qw(strftime);
@@ -110,23 +118,14 @@ sub list_names {
   my @options;
   if ($form->{status} eq 'all') {
     push @options, $locale->text('All');
-
   } elsif ($form->{status} eq 'orphaned') {
     push @options, $locale->text('Orphaned');
   }
 
-  if ($form->{name}) {
-    push @options, $locale->text('Name') . " : $form->{name}";
-  }
-  if ($form->{contact}) {
-    push @options, $locale->text('Contact') . " : $form->{contact}";
-  }
-  if ($form->{"$form->{db}number"}) {
-    push @options, $locale->text('Number') . qq| : $form->{"$form->{db}number"}|;
-  }
-  if ($form->{email}) {
-    push @options, $locale->text('E-mail') . " : $form->{email}";
-  }
+  push @options, $locale->text('Name') . " : $form->{name}"                    if $form->{name};
+  push @options, $locale->text('Contact') . " : $form->{contact}"              if $form->{contact};
+  push @options, $locale->text('Number') . qq| : $form->{"$form->{db}number"}| if $form->{"$form->{db}number"};
+  push @options, $locale->text('E-mail') . " : $form->{email}"                 if $form->{email};
 
   my @columns = (
     'id',        'name',  "$form->{db}number", 'address',  'contact',  'phone',
@@ -241,9 +240,6 @@ sub edit {
   $form->{javascript} = qq|<script type=text/javascript src=js/show_history.js></script>|;
   #/show hhistory button
   
-  # $locale->text('Edit Customer')
-  # $locale->text('Edit Vendor')
-
   CT->get_tuple(\%myconfig, \%$form);
   CT->populate_drop_down_boxes(\%myconfig, \%$form);
 
@@ -276,24 +272,20 @@ sub form_header {
   $form->{is_customer}    = $form->{db}     eq 'customer';
   $form->{salesman_label} = sub { $_[0]->{name} ne "" ? $_[0]->{name} : $_[0]->{login} };
   $form->{shipto_label}   = sub { "$_[0]->{shiptoname} $_[0]->{shiptodepartment_1}" };
+  $form->{contacts_label} = sub { join ", ", grep { $_ } $_[0]->{cp_name}, $_[0]->{cp_givenname} };
   $form->{taxzone_id}     = 0                                                               if !$form->{id};
   $form->{jsscript}       = 1;
   $form->{fokus}          = "ct.greeting";
+  $form->{AJAX}           = [ new CGI::Ajax( map {; "get_$_" => "$form->{script}?action=get_$_" } qw(shipto contact delivery) ) ];
 
   unshift @{ $form->{SHIPTO} },   +{ shipto_id => '0', shiptoname => '' }, +{ shipto_id => '0', shiptoname => 'Alle' };
   unshift @{ $form->{CONTACTS} }, +{ cp_id     => '0', cp_name => $locale->text('New contact') };
 
-  push @{ $form->{AJAX} }, map { 
-    new CGI::Ajax( "get_$_" => "$form->{script}?action=get_$_" ) 
-  } qw(shipto contact delivery);
-
   $form->{title} = $form->{title_save} 
                 || $locale->text("$form->{title} " . ucfirst $form->{db}) . ($form->{title} eq "Edit" ? " $form->{name}" : '');
 
-## LINET: Create a drop-down box with all prior titles and greetings.
   CT->query_titles_and_greetings(\%myconfig, \%$form);
   map { $form->{"MB_$_"} = [ map +{ id => $_, description => $_ }, @{ $form->{$_} } ] } qw(TITLES GREETINGS COMPANY_GREETINGS DEPARTMENT);
-## /LINET
 
   $form->{NOTES} ||= [ ];
 
@@ -462,9 +454,6 @@ sub save_and_close {
 
   $auth->assert('customer_vendor_edit');
 
-  # $locale->text('Customer saved!')
-  # $locale->text('Vendor saved!')
-
   $msg = ucfirst $form->{db};
   $imsg .= " saved!";
 
@@ -494,9 +483,6 @@ sub save {
 
   $auth->assert('customer_vendor_edit');
 
-  # $locale->text('Customer saved!')
-  # $locale->text('Vendor saved!')
-
   $msg = ucfirst $form->{db};
   $imsg .= " saved!";
 
@@ -533,11 +519,6 @@ sub delete {
 
   $auth->assert('customer_vendor_edit');
 
-  # $locale->text('Customer deleted!')
-  # $locale->text('Cannot delete customer!')
-  # $locale->text('Vendor deleted!')
-  # $locale->text('Cannot delete vendor!')
-
   CT->delete(\%myconfig, \%$form);
 
   $msg = ucfirst $form->{db};
@@ -583,10 +564,8 @@ sub get_contact {
   $auth->assert('customer_vendor_edit');
 
   CT->get_contact(\%myconfig, \%$form);
-
-  $result = "$form->{cp_name}";
-  map { $result .= "__pjx__" . $form->{$_} } qw(cp_greeting cp_title cp_givenname cp_phone1 cp_phone2 cp_email cp_abteilung cp_fax cp_mobile1 cp_mobile2 cp_satphone cp_satfax cp_project cp_privatphone cp_privatemail cp_birthday);
-  print $cgi->header(), $result;
+  print $cgi->header(), join '__pjx__', map $form->{"cp_$_"}, 
+    qw(name greeting title givenname phone1 phone2 email abteilung fax mobile1 mobile2 satphone satfax project privatphone privatemail birthday used);
   $lxdebug->leave_sub();
 
 }
@@ -597,10 +576,8 @@ sub get_shipto {
   $auth->assert('customer_vendor_edit');
 
   CT->get_shipto(\%myconfig, \%$form);
-
-  $result = "$form->{shiptoname}";
-  map { $result .= "__pjx__" . $form->{$_} } qw(shiptodepartment_1 shiptodepartment_2 shiptostreet shiptozipcode shiptocity shiptocountry shiptocontact shiptophone shiptofax shiptoemail);
-  print $cgi->header(), $result;
+  print $cgi->header(),  join '__pjx__', map $form->{"shipto$_"},
+    qw(name department_1 department_2 street zipcode city country contact phone fax email used);
   $lxdebug->leave_sub();
 
 }
@@ -617,4 +594,38 @@ sub get_delivery {
   $lxdebug->leave_sub();
 }
 
+sub delete_shipto {
+  $main::lxdebug->enter_sub();
+
+  $auth->assert('customer_vendor_edit');
+
+  CT->get_shipto(\%myconfig, \%$form);
+
+  unless ($form->{shiptoused}) {
+    CT->delete_shipto($form->{shipto_id});
+    @$form{ grep /^shipto/, keys %$form } = undef;
+  }
+
+  edit();
+
+  $main::lxdebug->leave_sub();
+}
+
+sub delete_contact {
+  $main::lxdebug->enter_sub();
+
+  $auth->assert('customer_vendor_edit');
+
+  CT->get_contact(\%myconfig, \%$form);
+
+  unless ($form->{cp_used}) {
+    CT->delete_shipto($form->{cp_id});
+    @$form{ grep /^cp_/, keys %$form } = undef;
+  }
+
+  edit();
+
+  $main::lxdebug->leave_sub();
+}
+
 sub continue { call_sub($form->{nextsub}); }