DeliveryOrder: fix validate on save

diff --git a/SL/Controller/DeliveryOrder.pm b/SL/Controller/DeliveryOrder.pm
index 2d93289405b48b57309bac17788efaa922724ecf..a43ddd88d5450ae531dde870b0a97e5fc261b4c8 100644 (file)
--- a/SL/Controller/DeliveryOrder.pm
+++ b/SL/Controller/DeliveryOrder.pm
@@ -1161,7 +1161,7 @@ sub make_order {
   # order here solves this problem.
   my $order;
   $order   = SL::DB::DeliveryOrder->new(id => $::form->{id})->load(with => [ 'orderitems', 'orderitems.part' ]) if $::form->{id};
-  $order ||= SL::DB::DeliveryOrder->new(orderitems  => [], currency_id => $::instance_conf->get_currency_id(), order_type => $self->type_data->validate_type($::form->{type}));
+  $order ||= SL::DB::DeliveryOrder->new(orderitems  => [], currency_id => $::instance_conf->get_currency_id(), order_type => $self->type_data->validate($::form->{type}));
 
   my $cv_id_method = $self->cv . '_id';
   if (!$::form->{id} && $::form->{$cv_id_method}) {

diff --git a/SL/Controller/DeliveryOrder/TypeData.pm b/SL/Controller/DeliveryOrder/TypeData.pm
index 52366f224d31e05a91e5f91746678f3859079013..5b7cfe949efc17aa255407f369796c9bc8f0e229 100644 (file)
--- a/SL/Controller/DeliveryOrder/TypeData.pm
+++ b/SL/Controller/DeliveryOrder/TypeData.pm
@@ -20,6 +20,11 @@ sub new {
   return $o;
 }
 
+sub validate {
+  my ($self, $string) = @_;
+  validate_type($string);
+}
+
 sub text {
   my ($self, $string) = @_;
   get3($self->c->type, "text", $string);

diff --git a/SL/DB/Manager/DeliveryOrder.pm b/SL/DB/Manager/DeliveryOrder.pm
index 9f45ca0c938aa4d3ebc1aba2f0603cc7f991761f..3880bcf3ada1c3f8213c357cabca5137dc5daacf 100644 (file)
--- a/SL/DB/Manager/DeliveryOrder.pm
+++ b/SL/DB/Manager/DeliveryOrder.pm
@@ -29,7 +29,7 @@ sub type_filter {
   my $class = shift;
   my $type  = lc(shift || '');
 
-  return type => validate_type($type);
+  return order_type => validate_type($type);
 }
 
 sub _sort_spec {