PriceRule: Regeldetails anzeigen

diff --git a/SL/Controller/PriceRule.pm b/SL/Controller/PriceRule.pm
index 82d5d858f60ee709d17a5eb46d51c7495f217886..3d7a75e275d03e7c4d4c985218828226b88e9dcc 100644 (file)
--- a/SL/Controller/PriceRule.pm
+++ b/SL/Controller/PriceRule.pm
@@ -145,8 +145,8 @@ sub prepare_report {
   my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
   $self->{report} = $report;
 
   my $report      = SL::ReportGenerator->new(\%::myconfig, $::form);
   $self->{report} = $report;
 

-  my @columns     = qw(name type priority price discount);
-  my @sortable    = qw(name type priority price discount);
+  my @columns     = qw(name type priority price discount items);
+  my @sortable    = qw(name type priority price discount      );

 
   my %column_defs = (
     name          => { obj_link => sub { $self->url_for(action => 'edit', 'price_rule.id' => $_[0]->id, callback => $callback) } },
 
   my %column_defs = (
     name          => { obj_link => sub { $self->url_for(action => 'edit', 'price_rule.id' => $_[0]->id, callback => $callback) } },


@@ -154,6 +154,7 @@ sub prepare_report {
     price         => { sub  => sub { $_[0]->price_as_number } },
     discount      => { sub  => sub { $_[0]->discount_as_number } },
     obsolete      => { sub  => sub { $_[0]->obsolete_as_bool_yn } },
     price         => { sub  => sub { $_[0]->price_as_number } },
     discount      => { sub  => sub { $_[0]->discount_as_number } },
     obsolete      => { sub  => sub { $_[0]->obsolete_as_bool_yn } },

+    items         => { sub  => sub { $_[0]->item_summary } },

   );
 
   map { $column_defs{$_}->{text} ||= $::locale->text( $self->models->get_sort_spec->{$_}->{title} ) } keys %column_defs;
   );
 
   map { $column_defs{$_}->{text} ||= $::locale->text( $self->models->get_sort_spec->{$_}->{title} ) } keys %column_defs;


@@ -262,6 +263,7 @@ sub init_models {
       price    => t8('Price'),
       discount => t8('Discount'),
       obsolete => t8('Obsolete'),
       price    => t8('Price'),
       discount => t8('Discount'),
       obsolete => t8('Obsolete'),

+      items    => t8('Rule Details'),

     },
   );
 }
     },
   );
 }

diff --git a/SL/DB/PriceRule.pm b/SL/DB/PriceRule.pm
index 5c2552ddbdaa3f024e8c18a90665365f2a48f592..0a9f09d850123840602c1790d7893ad59b424875 100644 (file)
--- a/SL/DB/PriceRule.pm
+++ b/SL/DB/PriceRule.pm
@@ -95,7 +95,7 @@ sub clone_and_reset_deep {
 sub full_description {
   my ($self) = @_;
 
 sub full_description {
   my ($self) = @_;
 

-  my $items = join ', ', map { $_->full_description } $self->items;
+  my $items = $self->item_summary;

   my $price = $self->price_or_discount
             ? t8('Discount #1%', $self->discount_as_number)
             : t8('Price #1', $self->price_as_number);
   my $price = $self->price_or_discount
             ? t8('Discount #1%', $self->discount_as_number)
             : t8('Price #1', $self->price_as_number);


@@ -103,6 +103,10 @@ sub full_description {
   sprintf "%s: %s (%s)", $self->name, $price, $items;
 }
 
   sprintf "%s: %s (%s)", $self->name, $price, $items;
 }
 

+sub item_summary {
+  join ', ', map { $_->full_description } $_[0]->items;
+}
+

 sub in_use {
   my ($self) = @_;
 
 sub in_use {
   my ($self) = @_;
 

diff --git a/locale/de/all b/locale/de/all
index dea431383347016ce16aaf11fd01e80514fd3c2d..c000ae6dbc8be298126d31f8384470c9a1b919e4 100755 (executable)
--- a/locale/de/all
+++ b/locale/de/all
@@ -2072,6 +2072,7 @@ $self->{texts} = {
   'Row was created from current record' => 'Zeile wurde aus aktuellem Beleg erstellt',
   'Row was linked to another record' => 'Zeile wurde über einen anderen Beleg verlinkt',
   'Row was source for current record' => 'Zeile war Quelle für aktuellen Beleg',
   'Row was created from current record' => 'Zeile wurde aus aktuellem Beleg erstellt',
   'Row was linked to another record' => 'Zeile wurde über einen anderen Beleg verlinkt',
   'Row was source for current record' => 'Zeile war Quelle für aktuellen Beleg',

+  'Rule Details'                => 'Regel Details',

   'Run at'                      => 'Ausgeführt um',
   'SAVED'                       => 'Gespeichert',
   'SAVED FOR DUNNING'           => 'Gespeichert',
   'Run at'                      => 'Ausgeführt um',
   'SAVED'                       => 'Gespeichert',
   'SAVED FOR DUNNING'           => 'Gespeichert',