CustomerVendor-Controller: Daten in Neu-Anzeige bei Fehler beibehalten

[mfinanz.git] / SL / Controller / CustomerVendor.pm

diff --git a/SL/Controller/CustomerVendor.pm b/SL/Controller/CustomerVendor.pm
index 3e6ad82175197331c69c014fcdacd18a5e06e90e..468e02618d69dd1cef5a26afe166ab842f54e308 100644 (file)
--- a/SL/Controller/CustomerVendor.pm
+++ b/SL/Controller/CustomerVendor.pm
@@ -365,7 +365,7 @@ sub action_delete_contact {
       }
     }) || die($db->error);
 
       }
     }) || die($db->error);
 

-    $self->{contact} = SL::DB::Contact->new();
+    $self->{contact} = $self->_new_contact_object;

   }
 
   $self->action_edit();
   }
 
   $self->action_edit();


@@ -679,11 +679,7 @@ sub _instantiate_args {
       $self->{cv} = SL::DB::Customer->new(id => $::form->{cv}->{id})->load();
     }
   } else {
       $self->{cv} = SL::DB::Customer->new(id => $::form->{cv}->{id})->load();
     }
   } else {

-    if ( $self->is_vendor() ) {
-      $self->{cv} = SL::DB::Vendor->new();
-    } else {
-      $self->{cv} = SL::DB::Customer->new();
-    }
+    $self->{cv} = $self->_new_customer_vendor_object;

   }
   $self->{cv}->assign_attributes(%{$::form->{cv}});
 
   }
   $self->{cv}->assign_attributes(%{$::form->{cv}});
 


@@ -735,7 +731,7 @@ sub _instantiate_args {
   if ( $::form->{contact}->{cp_id} ) {
     $self->{contact} = SL::DB::Contact->new(cp_id => $::form->{contact}->{cp_id})->load();
   } else {
   if ( $::form->{contact}->{cp_id} ) {
     $self->{contact} = SL::DB::Contact->new(cp_id => $::form->{contact}->{cp_id})->load();
   } else {

-    $self->{contact} = SL::DB::Contact->new();
+    $self->{contact} = $self->_new_contact_object;

   }
   $self->{contact}->assign_attributes(%{$::form->{contact}});
 
   }
   $self->{contact}->assign_attributes(%{$::form->{contact}});
 


@@ -786,18 +782,14 @@ sub _load_customer_vendor {
       die($::locale->text('Error'));
     }
   } else {
       die($::locale->text('Error'));
     }
   } else {

-    $self->{contact} = SL::DB::Contact->new();
+    $self->{contact} = $self->_new_contact_object;

   }
 }
 
 sub _create_customer_vendor {
   my ($self) = @_;
 
   }
 }
 
 sub _create_customer_vendor {
   my ($self) = @_;
 

-  if ( $self->is_vendor() ) {
-    $self->{cv} = SL::DB::Vendor->new();
-  } else {
-    $self->{cv} = SL::DB::Customer->new();
-  }
+  $self->{cv} = $self->_new_customer_vendor_object;

   $self->{cv}->currency_id($::instance_conf->get_currency_id());
 
   $self->{note} = SL::DB::Note->new();
   $self->{cv}->currency_id($::instance_conf->get_currency_id());
 
   $self->{note} = SL::DB::Note->new();


@@ -806,7 +798,7 @@ sub _create_customer_vendor {
 
   $self->{shipto} = SL::DB::Shipto->new();
 
 
   $self->{shipto} = SL::DB::Shipto->new();
 

-  $self->{contact} = SL::DB::Contact->new();
+  $self->{contact} = $self->_new_contact_object;

 }
 
 sub _pre_render {
 }
 
 sub _pre_render {


@@ -970,4 +962,21 @@ sub init_vendor_models {
   );
 }
 
   );
 }
 

+sub _new_customer_vendor_object {
+  my ($self) = @_;
+
+  my $class  = 'SL::DB::' . ($self->is_vendor ? 'Vendor' : 'Customer');
+  return $class->new(
+    contacts         => [],
+    shipto           => [],
+    custom_variables => [],
+  );
+}
+
+sub _new_contact_object {
+  my ($self) = @_;
+
+  return SL::DB::Contact->new(custom_variables => []);
+}
+

 1;
 1;