PriceSources: discount_from_source analog zu price_from_source implemeniert.

Wenn keine zur Rabatt-Quelle passende Klasse gefunden werden kann, wird auch
hier ein spezieller leerer Rabatt zurückgeliefert.

diff --git a/SL/PriceSource.pm b/SL/PriceSource.pm
index 681210c00b2cd551662fa7667220dc2b12b752dd..66daad285bdbce31dd0598338786ef0fd5de38a8 100644 (file)
--- a/SL/PriceSource.pm
+++ b/SL/PriceSource.pm
@@ -31,6 +31,17 @@ sub price_from_source {
     : empty_price();
 }
 
+sub discount_from_source {
+  my ($self, $source) = @_;
+  my ($source_name, $spec) = split m{/}, $source, 2;
+
+  my $class = SL::PriceSource::ALL->price_source_class_by_name($source_name);
+
+  return $class
+    ? $class->new(record_item => $self->record_item, record => $self->record)->discount_from_source($source, $spec)
+    : empty_discount();
+}
+
 sub available_prices {
   map { $_->available_prices } $_[0]->all_price_sources;
 }
@@ -54,6 +65,12 @@ sub empty_price {
   );
 }
 
+sub empty_discount {
+  SL::PriceSource::Discount->new(
+    description => t8('None (PriceSource Discount)'),
+  );
+}
+
 1;
 
 __END__
@@ -136,25 +153,43 @@ not have to be registered in C<record>.
 
 Attempts to retrieve a formerly calculated price with the same conditions
 
+=item C<discount_from_source>
+
+Attempts to retrieve a formerly calculated discount with the same conditions
+
 =item C<available_prices>
 
 Returns all available prices.
 
+=item C<available_discounts>
+
+Returns all available discounts.
+
 =item C<best_price>
 
 Attempts to get the best available price. returns L<empty_price> if no price is found.
 
+=item C<best_discount>
+
+Attempts to get the best available discount. returns L<empty_discount> if no discount is found.
+
 =item C<empty_price>
 
 A special empty price, that does not change the previously entered price, and
 opens the price field to manual changes.
 
+=item C<empty_discount>
+
+A special empty discount, that does not change the previously entered discount, and
+opens the discount field to manual changes.
+
 =back
 
 =head1 SEE ALSO
 
 L<SL::PriceSource::Base>,
 L<SL::PriceSource::Price>,
+L<SL::PriceSource::Discount>,
 L<SL::PriceSource::ALL>
 
 =head1 BUGS AND CAVEATS

diff --git a/SL/PriceSource/Base.pm b/SL/PriceSource/Base.pm
index 8233c58bd945d6a938167dfce2322a6d96a37412..1e8f20d9312b6b07e9e04bedeb1fcac8bce36a68 100644 (file)
--- a/SL/PriceSource/Base.pm
+++ b/SL/PriceSource/Base.pm
@@ -21,6 +21,8 @@ sub best_discounts { die 'best_discounts needs to be implemented' }
 
 sub price_from_source { die 'price_from_source needs to be implemented:' . "@_" }
 
+sub discount_from_source { die 'discount_from_source needs to be implemented:' . "@_" }
+
 sub part {
   $_[0]->record_item->part;
 }

diff --git a/SL/PriceSource/Business.pm b/SL/PriceSource/Business.pm
index fc7b298fc1979b1fc81969286daafdc3991270da..20a1d549ae26f33bb04e60cfa35446f15b0d4370 100644 (file)
--- a/SL/PriceSource/Business.pm
+++ b/SL/PriceSource/Business.pm
@@ -28,7 +28,9 @@ sub available_discounts {
   );
 }
 
-sub price_from_source {
+sub price_from_source { }
+
+sub discount_from_source {
   my ($self, $source, $spec) = @_;
 
   my $business = SL::DB::Business->load_cached($spec);

diff --git a/SL/PriceSource/Customer.pm b/SL/PriceSource/Customer.pm
index 52d35ee926c49064aa5f4a02964d6e66b05aece5..c0cfbc09a86b083373545412b40c0a5f238bd7b1 100644 (file)
--- a/SL/PriceSource/Customer.pm
+++ b/SL/PriceSource/Customer.pm
@@ -29,7 +29,9 @@ sub available_discounts {
   );
 }
 
-sub price_from_source {
+sub price_from_source { }
+
+sub discount_from_source {
   my ($self, $source, $spec) = @_;
 
   my $customer = SL::DB::Customer->load_cached($spec);

diff --git a/SL/PriceSource/Makemodel.pm b/SL/PriceSource/Makemodel.pm
index 3c5031d1d457a9fb6dfd93b7325e59249f67bbfa..bda7b81efd4fb036883842434faaf8ac704678e0 100644 (file)
--- a/SL/PriceSource/Makemodel.pm
+++ b/SL/PriceSource/Makemodel.pm
@@ -39,6 +39,8 @@ sub price_from_source {
 
 }
 
+sub discount_from_source { }
+
 sub best_price {
   my ($self, %params) = @_;
 

diff --git a/SL/PriceSource/MasterData.pm b/SL/PriceSource/MasterData.pm
index 14fe88f34787010985f5be3c98ffc0b52a05d55f..1305f4b045db6f72897b6acbe5abafabd825bce6 100644 (file)
--- a/SL/PriceSource/MasterData.pm
+++ b/SL/PriceSource/MasterData.pm
@@ -31,6 +31,8 @@ sub price_from_source {
   : do { die "unknown spec '$spec'" };
 }
 
+sub discount_from_source { }
+
 sub best_price {
   $_[0]->record->is_sales
   ? $_[0]->make_sellprice

diff --git a/SL/PriceSource/PriceRules.pm b/SL/PriceSource/PriceRules.pm
index e1d1c126b842ed524996c654d5bd8051962d1381..6685578670ea9b8170608de236ba2f33b9ad572b 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 {

diff --git a/SL/PriceSource/Pricegroup.pm b/SL/PriceSource/Pricegroup.pm
index 2a8adae13395a5beae6668ea4994f16ffae974e3..6408300b13a4de5d1260cb768c69207ea89a8d00 100644 (file)
--- a/SL/PriceSource/Pricegroup.pm
+++ b/SL/PriceSource/Pricegroup.pm
@@ -44,6 +44,8 @@ sub price_from_source {
   return $self->make_price($price);
 }
 
+sub discount_from_source { }
+
 sub best_price {
   my ($self, %params) = @_;
 

diff --git a/SL/PriceSource/Vendor.pm b/SL/PriceSource/Vendor.pm
index 0b09ad698f3aa0b2876cfe110de1e324cf58c370..7eee13085cea1a353e8c9578c0f4ac9e3b4a78ac 100644 (file)
--- a/SL/PriceSource/Vendor.pm
+++ b/SL/PriceSource/Vendor.pm
@@ -28,7 +28,9 @@ sub available_discounts {
   );
 }
 
-sub price_from_source {
+sub price_from_source { }
+
+sub discount_from_source {
   my ($self, $source, $spec) = @_;
 
   my $vendor = SL::DB::Vendor->load_cached($spec);

diff --git a/bin/mozilla/io.pl b/bin/mozilla/io.pl
index 4ad3cbf2fe66810cf2410c77ac1e24768fc0bf1a..f42db465410f74ef90bdf1056654be4f8b62ea2d 100644 (file)
--- a/bin/mozilla/io.pl
+++ b/bin/mozilla/io.pl
@@ -345,7 +345,7 @@ sub display_row {
     if ($form->{"id_${i}"} && !$is_delivery_order) {
       my $price_source  = SL::PriceSource->new(record_item => $record_item, record => $record);
       my $price         = $price_source->price_from_source($::form->{"active_price_source_$i"});
-      my $discount      = $price_source->price_from_source($::form->{"active_discount_source_$i"});
+      my $discount      = $price_source->discount_from_source($::form->{"active_discount_source_$i"});
       my $best_price    = $price_source->best_price;
       my $best_discount = $price_source->best_discount;
       $column_data{price_source} .= $cgi->button(-value => $price->source_description, -onClick => "kivi.io.price_chooser($i)");