X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FPriceSource%2FPriceRules.pm;h=48ab563115bf5a2f7ee337aa60cfaef663905bcf;hb=770cfea95d02adbaa8e6ebfddd39ef9e52252b97;hp=140706d473365183c4c5c132953b87047c6c093e;hpb=9b8edca08cd8be8a7e4e49b545a7122e5f28c870;p=kivitendo-erp.git

diff --git a/SL/PriceSource/PriceRules.pm b/SL/PriceSource/PriceRules.pm
index 140706d47..48ab56311 100644
--- a/SL/PriceSource/PriceRules.pm
+++ b/SL/PriceSource/PriceRules.pm
@@ -45,10 +45,39 @@ sub price_from_source {
   my ($self, $source, $spec) = @_;
 
   my $rule = SL::DB::Manager::PriceRule->find_by(id => $spec);
+
+  return SL::PriceSource::Discount->new(
+    price_source => $self,
+    missing      => t8('The price rule for this price does not exist anymore'),
+  ) if !$rule;
+
+  if ($rule->price_type != SL::DB::Manager::PriceRule::PRICE_DISCOUNT()) {
+    return $self->make_price_from_rule($rule);
+  } else {
+    return SL::PriceSource::Price->new(
+      price_source => $self,
+      invalid      => t8('The price rule is not a rule for prices'),
+    );
+  }
+}
+
+sub discount_from_source {
+  my ($self, $source, $spec) = @_;
+
+  my $rule = SL::DB::Manager::PriceRule->find_by(id => $spec);
+
+  return SL::PriceSource::Discount->new(
+    price_source => $self,
+    missing      => t8('The price rule for this discount does not exist anymore'),
+  ) if !$rule;
+
   if ($rule->price_type == SL::DB::Manager::PriceRule::PRICE_DISCOUNT()) {
     return $self->make_discount_from_rule($rule);
   } else {
-    return $self->make_price_from_rule($rule);
+    return SL::PriceSource::Discount->new(
+      price_source => $self,
+      invalid      => t8('The price rule is not a rule for discounts'),
+    );
   }
 }
 
@@ -92,6 +121,7 @@ sub make_price_from_rule {
     price        => $self->price_for_rule($rule),
     spec         => $rule->id,
     description  => $rule->name,
+    priority     => $rule->priority,
     price_source => $self,
     (invalid      => t8('This Price Rule is no longer valid'))x!!$rule->obsolete,
   )
@@ -104,6 +134,7 @@ sub make_discount_from_rule {
     discount     => $rule->discount / 100,
     spec         => $rule->id,
     description  => $rule->name,
+    priority     => $rule->priority,
     price_source => $self,
     (invalid      => t8('This Price Rule is no longer valid'))x!!$rule->obsolete,
   )