PriceSources: discount_from_source analog zu price_from_source implemeniert.

[kivitendo-erp.git] / SL / PriceSource / PriceRules.pm

diff --git a/SL/PriceSource/PriceRules.pm b/SL/PriceSource/PriceRules.pm
index e1d1c12..6685578 100644 (file)
--- a/SL/PriceSource/PriceRules.pm
+++ b/SL/PriceSource/PriceRules.pm
@@ -44,12 +44,23 @@ sub available_discounts {
 sub price_from_source {
   my ($self, $source, $spec) = @_;
 
+  my $rule = SL::DB::Manager::PriceRule->find_by(id => $spec);
+  if ($rule->price_type != SL::DB::Manager::PriceRule::PRICE_DISCOUNT()) {
+    return $self->make_price_from_rule($rule);
+  }
+
+  return;
+}
+
+sub discount_from_source {
+  my ($self, $source, $spec) = @_;
+
   my $rule = SL::DB::Manager::PriceRule->find_by(id => $spec);
   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;
 }
 
 sub best_price {