X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FPriceRule.pm;h=0579c534935ad7e6a31cde93eb1b2bda8799e1d4;hb=feb6f563968f53e59511578429b1dd61fda52008;hp=013445570616e3e6f05eb58ff2bbe30e5ac78aa0;hpb=72180323f463c9814fbcf21c3376201e6829b21b;p=kivitendo-erp.git diff --git a/SL/Controller/PriceRule.pm b/SL/Controller/PriceRule.pm index 013445570..0579c5349 100644 --- a/SL/Controller/PriceRule.pm +++ b/SL/Controller/PriceRule.pm @@ -13,12 +13,11 @@ use SL::DB::Pricegroup; use SL::DB::PartsGroup; use SL::DB::Business; use SL::Helper::Flash; -use SL::ClientJS; use SL::Locale::String; use Rose::Object::MakeMethods::Generic ( - 'scalar --get_set_init' => [ qw(models price_rule vc js pricegroups partsgroups businesses) ], + 'scalar --get_set_init' => [ qw(models price_rule vc pricegroups partsgroups businesses) ], ); # __PACKAGE__->run_before('check_auth'); @@ -35,9 +34,11 @@ sub action_list { my $price_rules = $self->models->get; + $self->setup_search_action_bar; + $self->prepare_report; - $self->report_generator_list_objects(report => $self->{report}, objects => $price_rules); + $self->report_generator_list_objects(report => $self->{report}, objects => $price_rules, $::form->{inline} ? (layout => 0, header => 0) : ()); } sub action_new { @@ -87,7 +88,11 @@ sub action_add_item_row { ->js ->before('#price_rule_new_items', $html) ->reinit_widgets - ->render($self); + ->render; +} + +sub action_price_type_help { + $_[0]->render('price_rule/price_type_help', { layout => 0 }); } # @@ -105,13 +110,36 @@ sub check_auth { sub display_form { my ($self, %params) = @_; my $is_new = !$self->price_rule->id; - my $title = $is_new ? t8('Create a new price rule') : t8('Edit price rule'); + my $title = $self->form_title(($is_new ? 'create' : 'edit'), $self->price_rule->type); + $self->setup_form_action_bar; $self->render('price_rule/form', title => $title, %params ); } +sub form_title { + my ($self, $action, $type) = @_; + + return { + edit => { + customer => t8('Edit sales price rule'), + vendor => t8('Edit purchase price rule'), + '' => t8('Edit price rule'), + }, + create => { + customer => t8('Create a new sales price rule'), + vendor => t8('Create a new purchase price rule'), + '' => t8('Create a new price rule'), + }, + list => { + customer => t8('Sales Price Rules'), + vendor => t8('Purchase Price Rules'), + '' => t8('Price Rules'), + }, + }->{$action}{$type}; +} + sub create_or_update { my $self = shift; my $is_new = !$self->price_rule->id; @@ -143,15 +171,17 @@ sub prepare_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 reduction discount items); + my @sortable = qw(name type priority price reduction discount ); my %column_defs = ( name => { obj_link => sub { $self->url_for(action => 'edit', 'price_rule.id' => $_[0]->id, callback => $callback) } }, priority => { sub => sub { $_[0]->priority_as_text } }, price => { sub => sub { $_[0]->price_as_number } }, + reduction => { sub => sub { $_[0]->reduction_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; @@ -163,14 +193,15 @@ sub prepare_report { std_column_visibility => 1, controller_class => 'PriceRule', output_format => 'HTML', - title => $::locale->text('Price Rules'), - allow_pdf_export => 1, - allow_csv_export => 1, + title => $self->form_title('list', $self->vc), + allow_pdf_export => !$::form->{inline}, + allow_csv_export => !$::form->{inline}, ); $report->set_columns(%column_defs); $report->set_column_order(@columns); $report->set_export_options(qw(list filter)); $report->set_options_from_form; + $self->models->get_models_url_params(sub{ map { $_ => $::form->{$_} } qw(inline) }); $self->models->set_report_generator_sort_options(report => $report, sortable_columns => \@sortable); $report->set_options( raw_bottom_info_text => $self->render('price_rule/report_bottom', { output => 0 }), @@ -194,15 +225,21 @@ sub make_filter_summary { push @filter_strings, "$_->[1]: $_->[0]" if $_->[0]; } + if ($filter->{has_item_type}) { + push @filter_strings, sprintf "%s: %s", t8('Has item type'), join ', ', map { + SL::DB::Manager::PriceRuleItem->get_type($_)->{description} + } @{ $filter->{has_item_type} || [] }; + } + $self->{filter_summary} = join ', ', @filter_strings; } sub all_price_rule_item_types { - SL::DB::Manager::PriceRuleItem->get_all_types($_[0]->price_rule->type); + SL::DB::Manager::PriceRuleItem->get_all_types($_[0]->vc || $_[0]->price_rule->type); } sub add_javascripts { - $::request->{layout}->add_javascripts(qw(kivi.PriceRule.js autocomplete_customer.js autocomplete_vendor.js autocomplete_part.js)); + $::request->{layout}->add_javascripts(qw(kivi.PriceRule.js autocomplete_vendor.js kivi.Part.js kivi.CustomerVendor.js)); } sub init_price_rule { @@ -232,22 +269,22 @@ sub init_vc { $::form->{filter}{type}; } -sub init_js { - SL::ClientJS->new; -} - sub init_businesses { SL::DB::Manager::Business->get_all; } sub init_pricegroups { - SL::DB::Manager::Pricegroup->get_all; + SL::DB::Manager::Pricegroup->get_all_sorted; } sub init_partsgroups { SL::DB::Manager::PartsGroup->get_all; } +sub all_price_types { + SL::DB::Manager::PriceRule->all_price_types; +} + sub init_models { my ($self) = @_; @@ -259,9 +296,78 @@ sub init_models { priority => t8('Priority'), price => t8('Price'), discount => t8('Discount'), + reduction => t8('Reduced Master Data'), obsolete => t8('Obsolete'), + items => t8('Rule Details'), }, ); } +sub setup_search_action_bar { + my ($self, %params) = @_; + + return if $::form->{inline}; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + action => [ + t8('Update'), + submit => [ '#search_form', { action => 'PriceRule/list' } ], + accesskey => 'enter', + ], + + combobox => [ + action => [ + t8('Add'), + ], + link => [ + t8('New Sales Price Rule'), + link => $self->url_for(action => 'new', 'price_rule.type' => 'customer', callback => $self->models->get_callback), + ], + link => [ + t8('New Purchase Price Rule'), + link => $self->url_for(action => 'new', 'price_rule.type' => 'vendor', callback => $self->models->get_callback), + ], + ], # end of combobox "Add" + ); + } +} + +sub setup_form_action_bar { + my ($self) = @_; + + my $is_new = !$self->price_rule->id; + + for my $bar ($::request->layout->get('actionbar')) { + $bar->add( + combobox => [ + action => [ + $is_new ? t8('Create') : t8('Save'), + submit => [ '#form', { action => 'PriceRule/' . ($is_new ? 'create' : 'update') } ], + accesskey => 'enter', + ], + action => [ + t8('Use as new'), + submit => [ '#form', { action => 'PriceRule/create' } ], + disabled => $is_new ? t8('The object has not been saved yet.') : undef, + ], + ], # end of combobox "Save" + + action => [ + t8('Delete'), + submit => [ '#form', { action => 'PriceRule/destroy' } ], + confirm => t8('Do you really want to delete this object?'), + disabled => $is_new ? t8('The object has not been saved yet.') + : $self->price_rule->in_use ? t8('This object has already been used.') + : undef, + ], + + link => [ + t8('Abort'), + link => $self->url_for(action => 'list', 'filter.type' => $self->price_rule->type), + ], + ); + } +} + 1;