X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FPriceSource%2FPricegroup.pm;h=3bae2d0d5a525e9f2f55569e4d5264fc5adcb387;hb=9447acbeb7b1cd0bb4691aa1da8f533ca9099064;hp=b1c75f879f43fd124b4c179af5d501d8392697ba;hpb=0409db7c50da81e1eb613bd33663fb5b07935a01;p=kivitendo-erp.git

diff --git a/SL/PriceSource/Pricegroup.pm b/SL/PriceSource/Pricegroup.pm
index b1c75f879..3bae2d0d5 100644
--- a/SL/PriceSource/Pricegroup.pm
+++ b/SL/PriceSource/Pricegroup.pm
@@ -4,6 +4,7 @@ use strict;
 use parent qw(SL::PriceSource::Base);
 
 use SL::PriceSource::Price;
+use SL::DB::Price;
 use SL::Locale::String;
 use List::UtilsBy qw(min_by);
 use List::Util qw(first);
@@ -15,12 +16,25 @@ sub description { t8('Pricegroup') }
 sub available_prices {
   my ($self, %params) = @_;
 
+  return () unless $self->record->is_sales;
+
   my $item = $self->record_item;
 
+  my $query = [ parts_id => $item->parts_id, price => { gt => 0 } ];
+
+  # add a pricegroup_filter for obsolete pricegroups, unless part of an
+  # existing pricegroup where that pricegroup was actually used.
+  if ( $self->record->id and $item->active_price_source =~ m/^pricegroup/ ) {
+    my ($pricegroup_id) = $item->active_price_source =~ m/^pricegroup\/(\d+)$/;
+    push(@{$query}, or => [ 'pricegroup.obsolete' => 0, 'pricegroup_id' => $pricegroup_id ]);
+  } else {
+    push(@{$query}, 'pricegroup.obsolete' => 0);
+  }
+
   my $prices = SL::DB::Manager::Price->get_all(
-    query        => [ parts_id => $item->parts_id, price => { gt => 0 } ],
+    query        => $query,
     with_objects => 'pricegroup',
-    order_by     => 'pricegroun.id',
+    sort_by      => 'pricegroup.sortkey',
   );
 
   return () unless @$prices;
@@ -30,34 +44,48 @@ sub available_prices {
   } @$prices;
 }
 
+sub available_discounts { }
+
 sub price_from_source {
   my ($self, $source, $spec) = @_;
 
-  my $price = SL::DB::Manager::Price->find_by(id => $spec);
+  my $price = SL::DB::Manager::Price->find_by(pricegroup_id => $spec, parts_id => $self->part->id);
+
+  if (!$price) {
+    return SL::PriceSource::Price->new(
+      price_source => $self,
+      missing      => t8('Could not find an entry for this part in the pricegroup.'),
+    );
+  }
 
   return $self->make_price($price);
 }
 
+sub discount_from_source { }
+
 sub best_price {
   my ($self, %params) = @_;
 
-  my @prices    = $self->availabe_prices;
+  return () unless $self->record->is_sales;
+
+  my @prices    = $self->available_prices;
   my $customer  = $self->record->customer;
-  my $min_price = min_by { $_->price } @prices;
 
-  return $min_price if !$customer || !$customer->cv_klass;
+  return () if !$customer || !$customer->pricegroup_id;
 
-  my $best_price = first { $_->spec == $customer->cv_class } @prices;
+  my $best_price = first { $_->spec == $customer->pricegroup_id } @prices;
 
-  return $best_price || $min_price;
+  return $best_price || ();
 }
 
+sub best_discount { }
+
 sub make_price {
   my ($self, $price_obj) = @_;
 
   SL::PriceSource::Price->new(
     price        => $price_obj->price,
-    spec         => $price_obj->id,
+    spec         => $price_obj->pricegroup->id,
     description  => $price_obj->pricegroup->pricegroup,
     price_source => $self,
   )