Merge branch 'master' of http://wagnertech.de/git/mfinanz

[mfinanz.git] / SL / Controller / PriceRule.pm

diff --git a/SL/Controller/PriceRule.pm b/SL/Controller/PriceRule.pm
index 3b1c8c2e19cc0f813c72c5f86b0688b577041194..6b7ec06b425df05ad40fbc6fa575a668719f1103 100644 (file)
--- a/SL/Controller/PriceRule.pm
+++ b/SL/Controller/PriceRule.pm
@@ -17,7 +17,7 @@ use SL::Locale::String;
 
 use Rose::Object::MakeMethods::Generic
 (
- 'scalar --get_set_init' => [ qw(models price_rule vc pricegroups partsgroups businesses) ],
+ 'scalar --get_set_init' => [ qw(models price_rule vc pricegroups partsgroups businesses cvar_configs) ],
 );
 
 # __PACKAGE__->run_before('check_auth');
@@ -38,7 +38,7 @@ sub action_list {
 
   $self->prepare_report;
 
-  $self->report_generator_list_objects(report => $self->{report}, objects => $price_rules, $::form->{inline} ? (layout => 0, header => 0) : (action_bar => 1));
+  $self->report_generator_list_objects(report => $self->{report}, objects => $price_rules, $::form->{inline} ? (layout => 0, header => 0) : ());
 }
 
 sub action_new {
@@ -80,7 +80,9 @@ sub action_destroy {
 sub action_add_item_row {
   my ($self, %params) = @_;
 
-  my $item = SL::DB::PriceRuleItem->new(type => $::form->{type});
+  my $item = $::form->{type} =~ m{cvar/(\d+)}
+    ? SL::DB::PriceRuleItem->new(type => 'cvar', custom_variable_configs_id => $1)
+    : SL::DB::PriceRuleItem->new(type => $::form->{type});
 
   my $html = $self->render('price_rule/item', { output => 0 }, item => $item);
 
@@ -189,6 +191,10 @@ sub prepare_report {
   if ( $report->{options}{output_format} =~ /^(pdf|csv)$/i ) {
     $self->models->disable_plugin('paginated');
   }
+
+  my $title        = t8('Price Rules');
+  $report->{title} = $title; #for browser titlebar (title-tag)
+
   $report->set_options(
     std_column_visibility => 1,
     controller_class      => 'PriceRule',
@@ -235,11 +241,14 @@ sub make_filter_summary {
 }
 
 sub all_price_rule_item_types {
-  SL::DB::Manager::PriceRuleItem->get_all_types($_[0]->vc || $_[0]->price_rule->type);
+  my $item_types = SL::DB::Manager::PriceRuleItem->get_all_types($_[0]->vc || $_[0]->price_rule->type);
+  my @cvar_types = map [ "cvar/" . $_->id, $_->presenter->description_with_module ], @{$_[0]->cvar_configs };
+
+  [ @$item_types, @cvar_types ];
 }
 
 sub add_javascripts  {
-  $::request->{layout}->add_javascripts(qw(kivi.PriceRule.js autocomplete_customer.js autocomplete_vendor.js kivi.Part.js));
+  $::request->{layout}->add_javascripts(qw(kivi.PriceRule.js autocomplete_vendor.js kivi.Part.js kivi.CustomerVendor.js));
 }
 
 sub init_price_rule {
@@ -255,7 +264,9 @@ sub init_price_rule {
 
   my @items;
   for my $raw_item (@$items) {
-    my $item = $raw_item->{id} ? $old_items{ $raw_item->{id} } || SL::DB::PriceRuleItem->new(id => $raw_item->{id})->load : SL::DB::PriceRuleItem->new;
+    my $item = $raw_item->{id}
+      ? $old_items{ $raw_item->{id} } || SL::DB::PriceRuleItem->new(id => $raw_item->{id})->load
+      : SL::DB::PriceRuleItem->new;
     $item->assign_attributes(%$raw_item);
     push @items, $item;
   }
@@ -281,6 +292,16 @@ sub init_partsgroups {
   SL::DB::Manager::PartsGroup->get_all;
 }
 
+sub init_cvar_configs {
+  # eligible cvars for this are all that are reachable from a record or recorditem (all modules but requirement spec)
+  # and of a type that price rules support (currently: id-based with picker, numeric or date) and by special request select
+  SL::DB::Manager::CustomVariableConfig->get_all(where => [
+    "!module" => 'RequirementSpecs',
+    type => [ qw(timestamp date number integer customer vendor part select) ],
+  ]) ;
+}
+
+
 sub all_price_types {
   SL::DB::Manager::PriceRule->all_price_types;
 }