X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;ds=sidebyside;f=SL%2FController%2FCustomerVendor.pm;h=b8672f14d28804b4f27d69b0c04c1f303987b360;hb=653e4c281c0197eaf7200716dfca99479842b3b6;hp=0fc7206dc437cd4a1986347ef50718bdc4a9ca93;hpb=e03993be556024f24e5a4940fa08078ee8cd3840;p=kivitendo-erp.git

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index 0fc7206dc..b8672f14d 100644
--- a/SL/Controller/CustomerVendor.pm
+++ b/SL/Controller/CustomerVendor.pm
@@ -18,6 +18,8 @@ use SL::DB::PaymentTerm;
 use SL::DB::Pricegroup;
 use SL::DB::Contact;
 use SL::DB::FollowUp;
+use SL::DB::History;
+use SL::DB::Currency;
 
 # safety
 __PACKAGE__->run_before(
@@ -37,6 +39,7 @@ __PACKAGE__->run_before(
     'save_and_order',
     'save_and_quotation',
     'save_and_rfq',
+    'delete',
     'delete_contact',
     'delete_shipto',
   ]
@@ -83,49 +86,59 @@ sub action_edit {
 sub _save {
   my ($self) = @_;
 
-  my $cvs_by_nr;
-  if ( $self->is_vendor() ) {
-    if ( $self->{cv}->vendornumber ) {
-      $cvs_by_nr = SL::DB::Manager::Vendor->get_all(query => [vendornumber => $self->{cv}->vendornumber]);
-    }
-  }
-  else {
-    if ( $self->{cv}->customernumber ) {
-      $cvs_by_nr = SL::DB::Manager::Customer->get_all(query => [customernumber => $self->{cv}->customernumber]);
+  my $db = $self->{cv}->db;
+
+  $db->do_transaction(sub {
+    my $cvs_by_nr;
+    if ( $self->is_vendor() ) {
+      if ( $self->{cv}->vendornumber ) {
+        $cvs_by_nr = SL::DB::Manager::Vendor->get_all(query => [vendornumber => $self->{cv}->vendornumber]);
+      }
+    } else {
+      if ( $self->{cv}->customernumber ) {
+        $cvs_by_nr = SL::DB::Manager::Customer->get_all(query => [customernumber => $self->{cv}->customernumber]);
+      }
     }
-  }
 
-  foreach my $entry (@{$cvs_by_nr}) {
-    if( $entry->id != $self->{cv}->id ) {
-      my $msg =
-        $self->is_vendor() ? $::locale->text('This vendor number is already in use.') : $::locale->text('This customer number is already in use.');
+    foreach my $entry (@{$cvs_by_nr}) {
+      if( $entry->id != $self->{cv}->id ) {
+        my $msg =
+          $self->is_vendor() ? $::locale->text('This vendor number is already in use.') : $::locale->text('This customer number is already in use.');
 
-      $::form->error($msg);
+        $::form->error($msg);
+      }
     }
-  }
 
-  $self->{cv}->save(cascade => 1);
+    $self->{cv}->save(cascade => 1);
 
-  $self->{contact}->cp_cv_id($self->{cv}->id);
-  if( $self->{contact}->cp_name ne '' || $self->{contact}->cp_givenname ne '' ) {
-    $self->{contact}->save();
-  }
+    $self->{contact}->cp_cv_id($self->{cv}->id);
+    if( $self->{contact}->cp_name ne '' || $self->{contact}->cp_givenname ne '' ) {
+      $self->{contact}->save();
+    }
 
-  if( $self->{note}->subject ne '' && $self->{note}->body ne '' ) {
-    $self->{note}->trans_id($self->{cv}->id);
-    $self->{note}->save();
-    $self->{note_followup}->save();
+    if( $self->{note}->subject ne '' && $self->{note}->body ne '' ) {
+      $self->{note}->trans_id($self->{cv}->id);
+      $self->{note}->save();
+      $self->{note_followup}->save();
 
-    $self->{note} = SL::DB::Note->new();
-    $self->{note_followup} = SL::DB::FollowUp->new();
-  }
+      $self->{note} = SL::DB::Note->new();
+      $self->{note_followup} = SL::DB::FollowUp->new();
+    }
 
-  $self->{shipto}->trans_id($self->{cv}->id);
-  if( $self->{shipto}->shiptoname ne '' ) {
-    $self->{shipto}->save();
-  }
+    $self->{shipto}->trans_id($self->{cv}->id);
+    if( $self->{shipto}->shiptoname ne '' ) {
+      $self->{shipto}->save();
+    }
+
+    my $snumbers = $self->is_vendor() ? 'vendornumber_'. $self->{cv}->vendornumber : 'customernumber_'. $self->{cv}->customernumber;
+    SL::DB::History->new(
+      trans_id => $self->{cv}->id,
+      snumbers => $snumbers,
+      employee_id => SL::DB::Manager::Employee->current->id,
+      addition => 'SAVED',
+    )->save();
+  }) || die($db->error);
 
-  #TODO: history
 }
 
 sub action_save {
@@ -133,7 +146,7 @@ sub action_save {
 
   $self->_save();
 
-  $self->action_edit();
+  $self->redirect_to(action => 'edit', id => $self->{cv}->id);
 }
 
 sub action_save_and_close {
@@ -232,15 +245,23 @@ sub action_save_and_quotation {
 sub action_delete {
   my ($self) = @_;
 
-  if( !$self->is_orphaned() ) {
-    SL::Helper::Flash::flash('error', $::locale->text('blaabla'));
+  my $db = $self->{cv}->db;
 
+  if( !$self->is_orphaned() ) {
     $self->action_edit();
-  }
-  else {
-    $self->{cv}->delete();
+  } else {
 
-    #TODO: history
+    $db->do_transaction(sub {
+      $self->{cv}->delete(cascade => 1);
+
+      my $snumbers = $self->is_vendor() ? 'vendornumber_'. $self->{cv}->vendornumber : 'customernumber_'. $self->{cv}->customernumber;
+      SL::DB::History->new(
+        trans_id => $self->{cv}->id,
+        snumbers => $snumbers,
+        employee_id => SL::DB::Manager::Employee->current->id,
+        addition => 'DELETED',
+      )->save();
+    }) || die($db->error);
 
     my $msg = $self->is_vendor() ? $::locale->text('Vendor deleted!') : $::locale->text('Customer deleted!');
     $::form->redirect($msg);
@@ -252,17 +273,22 @@ sub action_delete {
 sub action_delete_contact {
   my ($self) = @_;
 
+  my $db = $self->{contact}->db;
+
   if ( !$self->{contact}->cp_id ) {
     SL::Helper::Flash::flash('error', $::locale->text('No contact selected to delete'));
   } else {
-    if ( $self->{contact}->used ) {
-      $self->{contact}->detach();
-      $self->{contact}->save();
-      SL::Helper::Flash::flash('info', $::locale->text('Contact is in use and was flagged invalid.'));
-    } else {
-      $self->{contact}->delete();
-      SL::Helper::Flash::flash('info', $::locale->text('Contact deleted.'));
-    }
+
+    $db->do_transaction(sub {
+      if ( $self->{contact}->used ) {
+        $self->{contact}->detach();
+        $self->{contact}->save();
+        SL::Helper::Flash::flash('info', $::locale->text('Contact is in use and was flagged invalid.'));
+      } else {
+        $self->{contact}->delete(cascade => 1);
+        SL::Helper::Flash::flash('info', $::locale->text('Contact deleted.'));
+      }
+    }) || die($db->error);
 
     $self->{contact} = SL::DB::Contact->new();
   }
@@ -273,17 +299,22 @@ sub action_delete_contact {
 sub action_delete_shipto {
   my ($self) = @_;
 
+  my $db = $self->{shipto}->db;
+
   if ( !$self->{shipto}->shipto_id ) {
     SL::Helper::Flash::flash('error', $::locale->text('No shipto selected to delete'));
   } else {
-    if ( $self->{shipto}->used ) {
-      $self->{shipto}->detach();
-      $self->{shipto}->save();
-      SL::Helper::Flash::flash('info', $::locale->text('Shipto is in use and was flagged invalid.'));
-    } else {
-      $self->{shipto}->delete();
-      SL::Helper::Flash::flash('info', $::locale->text('Shipto deleted.'));
-    }
+
+    $db->do_transaction(sub {
+      if ( $self->{shipto}->used ) {
+        $self->{shipto}->detach();
+        $self->{shipto}->save(cascade => 1);
+        SL::Helper::Flash::flash('info', $::locale->text('Shipto is in use and was flagged invalid.'));
+      } else {
+        $self->{shipto}->delete(cascade => 1);
+        SL::Helper::Flash::flash('info', $::locale->text('Shipto deleted.'));
+      }
+    }) || die($db->error);
 
     $self->{shipto} = SL::DB::Shipto->new();
   }
@@ -328,8 +359,7 @@ sub action_get_delivery {
     $arap = 'ap';
     $db = 'vendor';
     $qty_sign = ' * -1 AS qty';
-  }
-  else {
+  } else {
     $arap = 'ar';
     $db = 'customer';
     $qty_sign = '';
@@ -416,8 +446,7 @@ sub action_ajaj_get_contact {
 
         if ( $_ eq 'birthday' && $self->{contact}->$name ) {
           $name => $self->{contact}->$name->to_lxoffice;
-        }
-        else {
+        } else {
           $name => $self->{contact}->$name;
         }
       }
@@ -433,8 +462,7 @@ sub action_ajaj_get_contact {
       {
         if ( $_->config->type eq 'number' ) {
           $_->config->name => $::form->format_amount(\%::myconfig, $_->value, -2);
-        }
-        else {
+        } else {
           $_->config->name => $_->value;
         }
       }
@@ -533,25 +561,16 @@ sub _instantiate_args {
 
   my $curr_employee = SL::DB::Manager::Employee->current;
 
-  foreach ( 'cv.creditlimit', 'cv.discount' ) {
-    my ($namespace, $varname) = split('.', $_, 2);
-    $::form->{$namespace}->{$varname} = $::form->parse_amount(\%::myconfig, $::form->{$namespace}->{$varname});
-  }
-  $::form->{cv}->{discount} /= 100;
-
   if ( $::form->{cv}->{id} ) {
     if ( $self->is_vendor() ) {
       $self->{cv} = SL::DB::Vendor->new(id => $::form->{cv}->{id})->load();
-    }
-    else {
+    } else {
       $self->{cv} = SL::DB::Customer->new(id => $::form->{cv}->{id})->load();
     }
-  }
-  else {
+  } else {
     if ( $self->is_vendor() ) {
       $self->{cv} = SL::DB::Vendor->new();
-    }
-    else {
+    } else {
       $self->{cv} = SL::DB::Customer->new();
     }
   }
@@ -567,25 +586,14 @@ sub _instantiate_args {
     $cvar->value($value);
   }
 
-#  foreach my $cvar_key (keys(%{$::form->{cv_cvars}})) {
-#    my $cvar_value = $::form->{cv_cvars}->{$cvar_key};
-#    my $cvar = $self->{cv}->cvar_by_name($cvar_key);
-#    $cvar->value($cvar_value);
-#  }
-
   if ( $::form->{note}->{id} ) {
     $self->{note} = SL::DB::Note->new(id => $::form->{note}->{id})->load();
-  }
-  else {
+  } else {
     $self->{note} = SL::DB::Note->new();
   }
   $self->{note}->assign_attributes(%{$::form->{note}});
   $self->{note}->created_by($curr_employee->id);
   $self->{note}->trans_module('ct');
-  #  if ( $self->{note}->trans_id != $self->{cv}->id ) {
-  #    die($::locale->text('Error'));
-  #  }
-
 
   $self->{note_followup} = SL::DB::FollowUp->new();
   $self->{note_followup}->assign_attributes(%{$::form->{note_followup}});
@@ -594,26 +602,18 @@ sub _instantiate_args {
 
   if ( $::form->{shipto}->{shipto_id} ) {
     $self->{shipto} = SL::DB::Shipto->new(shipto_id => $::form->{shipto}->{shipto_id})->load();
-  }
-  else {
+  } else {
     $self->{shipto} = SL::DB::Shipto->new();
   }
   $self->{shipto}->assign_attributes(%{$::form->{shipto}});
   $self->{shipto}->module('CT');
-#  if ( $self->{shipto}->trans_id != $self->{cv}->id ) {
-#    die($::locale->text('Error'));
-#  }
 
   if ( $::form->{contact}->{cp_id} ) {
     $self->{contact} = SL::DB::Contact->new(cp_id => $::form->{contact}->{cp_id})->load();
-  }
-  else {
+  } else {
     $self->{contact} = SL::DB::Contact->new();
   }
   $self->{contact}->assign_attributes(%{$::form->{contact}});
-#  if ( $self->{contact}->cp_cv_id != $self->{cv}->id ) {
-#    die($::locale->text('Error'));
-#  }
 
   foreach my $cvar (@{$self->{contact}->cvars_by_config()}) {
     my $value = $::form->{contact_cvars}->{$cvar->config->name};
@@ -631,8 +631,7 @@ sub _load_customer_vendor {
 
   if ( $self->is_vendor() ) {
     $self->{cv} = SL::DB::Vendor->new(id => $::form->{id})->load();
-  }
-  else {
+  } else {
     $self->{cv} = SL::DB::Customer->new(id => $::form->{id})->load();
   }
 
@@ -645,8 +644,7 @@ sub _load_customer_vendor {
     if ( $self->{shipto}->trans_id != $self->{cv}->id ) {
       die($::locale->text('Error'));
     }
-  }
-  else {
+  } else {
     $self->{shipto} = SL::DB::Shipto->new();
   }
 
@@ -656,8 +654,7 @@ sub _load_customer_vendor {
     if ( $self->{contact}->cp_cv_id != $self->{cv}->id ) {
       die($::locale->text('Error'));
     }
-  }
-  else {
+  } else {
     $self->{contact} = SL::DB::Contact->new();
   }
 }
@@ -667,8 +664,7 @@ sub _create_customer_vendor {
 
   if ( $self->is_vendor() ) {
     $self->{cv} = SL::DB::Vendor->new();
-  }
-  else {
+  } else {
     $self->{cv} = SL::DB::Customer->new();
   }
 
@@ -720,18 +716,7 @@ sub _pre_render {
     )
   ];
 
-  $query =
-    'SELECT curr
-     FROM defaults';
-  my $curr = selectall_hashref_query($::form, $dbh, $query)->[0]->{curr};
-  my @currencies = grep(
-    { $_; }
-    map(
-      { s/\s//g; $_; }
-      split(m/:/, $curr)
-    )
-  );
-  $self->{all_currencies} = \@currencies;
+  $self->{all_currencies} = SL::DB::Manager::Currency->get_all();
 
   $self->{all_languages} = SL::DB::Manager::Language->get_all();
 
@@ -765,9 +750,6 @@ sub _pre_render {
 
   $self->{template_args} = {};
 
-  $self->{cv}->discount($self->{cv}->discount * 100);
-
-
   $::request->{layout}->add_javascripts('autocomplete_customer.js');
 }