X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FPriceSource%2FPriceRules.pm;h=48ab563115bf5a2f7ee337aa60cfaef663905bcf;hb=2bc2e21bb970197e0b4151d19648e7bb5ce21b18;hp=6685578670ea9b8170608de236ba2f33b9ad572b;hpb=e1c3b6b77d4407069cb09897a9e79cd8686e41bf;p=kivitendo-erp.git diff --git a/SL/PriceSource/PriceRules.pm b/SL/PriceSource/PriceRules.pm index 668557867..48ab56311 100644 --- a/SL/PriceSource/PriceRules.pm +++ b/SL/PriceSource/PriceRules.pm @@ -45,22 +45,40 @@ 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'), + ); } - - return; } 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 SL::PriceSource::Discount->new( + price_source => $self, + invalid => t8('The price rule is not a rule for discounts'), + ); } - - return; } sub best_price {