X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/4d050ca366a72bbdbcc3a0ef49b37867bee9eb59..30e1cefc44fe755fcfd222e60ba895815420fb66:/SL/Controller/RequirementSpecOrder.pm diff --git a/SL/Controller/RequirementSpecOrder.pm b/SL/Controller/RequirementSpecOrder.pm index 0e9785272..b02c985bc 100644 --- a/SL/Controller/RequirementSpecOrder.pm +++ b/SL/Controller/RequirementSpecOrder.pm @@ -54,22 +54,30 @@ sub action_new { sub action_create { my ($self) = @_; + if (!$::auth->assert($::form->{quotation} ? 'sales_quotation_edit' : 'sales_order_edit', 1)) { + return $self->js->flash('error', t8("You do not have the permissions to access this function."))->render($self); + } + # 1. Update sections with selected part IDs. my $section_attrs = $::form->{sections} || []; - my $sections = SL::DB::Manager::RequirementSpecItem->get_all(where => [ id => [ map { $_->{id} } @{ $section_attrs } ] ]); + my $sections = SL::DB::Manager::RequirementSpecItem->get_all_sorted(where => [ id => [ map { $_->{id} } @{ $section_attrs } ] ]); my %sections_by_id = map { ($_->{id} => $_) } @{ $sections }; $sections_by_id{ $_->{id} }->update_attributes(order_part_id => $_->{order_part_id}) for @{ $section_attrs }; # 2. Create actual quotation/order. - my $order = $self->create_order(sections => $sections); - $order->save; + my $order = $self->create_order(sections => $sections, additional_parts => $self->requirement_spec->parts_sorted); + $order->db->with_transaction(sub { + $order->save; + + $self->requirement_spec->add_orders(SL::DB::RequirementSpecOrder->new(order => $order, version => $self->requirement_spec->version)); + $self->requirement_spec->save; + + $self->requirement_spec->link_to_record($order); + }) or do { + $::lxdebug->message(LXDebug::WARN(), "Error creating the order object: $@"); + }; - $self->requirement_spec->orders( - @{ $self->requirement_spec->orders }, - SL::DB::RequirementSpecOrder->new(order => $order, version => $self->requirement_spec->version) - ); - $self->requirement_spec->save; $self->init_requirement_spec; # 3. Notify the user and return to list. @@ -86,6 +94,10 @@ sub action_update { my $order = $self->rs_order->order; my $sections = $self->requirement_spec->sections_sorted; + if (!$::auth->assert($order->quotation ? 'sales_quotation_edit' : 'sales_order_edit', 1)) { + return $self->js->flash('error', t8("You do not have the permissions to access this function."))->render($self); + } + my (@orderitems, %sections_seen); foreach my $item (@{ $order->items_sorted }) { my $section = first { my $num = $_->fb_number; $item->description =~ m{\b\Q${num}\E\b} && !$sections_seen{ $_->id } } @{ $sections }; @@ -108,34 +120,22 @@ sub action_update { } sub action_do_update { - my ($self) = @_; - - my $order = $self->rs_order->order; - my $sections = $self->requirement_spec->sections_sorted; - my %orderitems_by_id = map { ($_->id => $_) } @{ $order->orderitems }; - my %sections_by_id = map { ($_->id => $_) } @{ $sections }; - $self->{parts} = { map { ($_->id => $_) } @{ SL::DB::Manager::Part->get_all(where => [ id => [ uniq map { $_->order_part_id } @{ $sections } ] ]) } }; - my $language_id = $self->requirement_spec->customer->language_id; - - my %sections_seen; - - foreach my $attributes (@{ $::form->{orderitems} || [] }) { - my $orderitem = $orderitems_by_id{ $attributes->{id} }; - my $section = $sections_by_id{ $attributes->{section_id} }; - next unless $orderitem && $section; + my ($self) = @_; - $self->create_order_item(section => $section, item => $orderitem, language_id => $language_id)->save; - $sections_seen{ $section->id } = 1; - } + my $order = $self->rs_order->order; + my @new_orderitems = $self->do_update_sections; + push @new_orderitems, $self->do_update_additional_parts; - my @new_orderitems = map { $self->create_order_item(section => $_, language_id => $language_id) } - grep { !$sections_seen{ $_->id } } - @{ $sections }; - - $order->orderitems([ @{ $order->orderitems }, @new_orderitems ]) if @new_orderitems; + $order->add_orderitems(\@new_orderitems) if @new_orderitems; $order->calculate_prices_and_taxes; - $order->save; + + $order->db->with_transaction(sub { + $order->save; + $self->requirement_spec->link_to_record($order); + }) or do { + $::lxdebug->message(LXDebug::WARN(), "Error updating the order object: $@"); + }; $self->init_requirement_spec; @@ -191,7 +191,7 @@ sub action_delete { sub setup { my ($self) = @_; - $::auth->assert('sales_quotation_edit'); + $::auth->assert('requirement_spec_edit'); $::request->{layout}->use_stylesheet("${_}.css") for qw(jquery.contextMenu requirement_spec autocomplete_part); $::request->{layout}->use_javascript("${_}.js") for qw(jquery.jstree jquery/jquery.contextMenu client_js requirement_spec); @@ -226,9 +226,59 @@ sub init_all_parts_time_unit { # helpers # -sub load_parts_for_sections { - my ($self, %params) = @_; +sub do_update_sections { + my ($self) = @_; + my $order = $self->rs_order->order; + my $sections = $self->requirement_spec->sections_sorted; + my %orderitems_by_id = map { ($_->id => $_) } @{ $order->orderitems }; + my %sections_by_id = map { ($_->id => $_) } @{ $sections }; + $self->{parts} = { map { ($_->id => $_) } @{ SL::DB::Manager::Part->get_all(where => [ id => [ uniq map { $_->order_part_id } @{ $sections } ] ]) } }; + my $language_id = $self->requirement_spec->customer->language_id; + + my %sections_seen; + + foreach my $attributes (@{ $::form->{orderitems} || [] }) { + my $orderitem = $orderitems_by_id{ $attributes->{id} }; + my $section = $sections_by_id{ $attributes->{section_id} }; + next unless $orderitem && $section; + + $self->create_order_item(section => $section, item => $orderitem, language_id => $language_id)->save; + $sections_seen{ $section->id } = 1; + } + + my @new_orderitems = map { $self->create_order_item(section => $_, language_id => $language_id) } + grep { !$sections_seen{ $_->id } } + @{ $sections }; + + return @new_orderitems; +} + +sub do_update_additional_parts { + my ($self) = @_; + + my $order = $self->rs_order->order; + my $add_parts = $self->requirement_spec->parts_sorted; + my %orderitems_by = map { (($_->parts_id . '-' . $_->description) => $_) } @{ $order->items }; + $self->{parts} = { map { ($_->id => $_) } @{ SL::DB::Manager::Part->get_all(where => [ id => [ uniq map { $_->part_id } @{ $add_parts } ] ]) } }; + my $language_id = $self->requirement_spec->customer->language_id; + + my %add_part_seen; + my @new_orderitems; + + foreach my $add_part (@{ $add_parts }) { + my $key = $add_part->part_id . '-' . $add_part->description; + my $orderitem = $orderitems_by{$key}; + + if ($orderitem) { + $self->create_additional_part_order_item(additional_part => $add_part, item => $orderitem, language_id => $language_id)->save; + + } else { + push @new_orderitems, $self->create_additional_part_order_item(additional_part => $add_part, language_id => $language_id); + } + } + + return @new_orderitems; } sub create_order_item { @@ -243,11 +293,13 @@ sub create_order_item { if (!$section->{keep_description}) { $description = '<%fb_number%> <%title%>' unless $description =~ m{<%}; - $longdescription = '<%description%>' unless $longdescription =~ m{<%}; + $longdescription = '<%description%>' unless $longdescription =~ m{<%}; - foreach my $field (\$description, \$longdescription) { - $$field =~ s{<% (.+?) %>}{ $section->can($1) ? $section->$1 : '<' . t8('Invalid variable #1', $1) . '>' }egx; - } + $description =~ s{<% (.+?) %>}{ $section->can($1) ? $section->$1 : '<' . t8('Invalid variable #1', $1) . '>' }egx; + $longdescription =~ s{\<\% description \%\>}{!!!!DESCRIPTION!!!!}gx; + $longdescription =~ s{<[pP]> !!!!DESCRIPTION!!!! }{!!!!DESCRIPTION!!!!}gx; + $longdescription =~ s{\<\% (.+?) \%\>}{ $section->can($1) ? $::locale->quote_special_chars('HTML', $section->$1 // '') : '<' . t8('Invalid variable #1', $1) . '>' }egx; + $longdescription =~ s{!!!!DESCRIPTION!!!!}{ $section->description // '' }egx; } $item->assign_attributes( @@ -265,20 +317,50 @@ sub create_order_item { return $item; } +sub create_additional_part_order_item { + my ($self, %params) = @_; + + my $add_part = $params{additional_part}; + my $item = $params{item} || SL::DB::OrderItem->new; + my $part = $self->parts->{ $add_part->part_id }; + my $translation = $params{language_id} ? first { $params{language_id} == $_->language_id } @{ $part->translations } : {}; + my $description = $item->description || $add_part->description; + my $longdescription = $translation->{longdescription} || $part->notes; + + $item->assign_attributes( + parts_id => $part->id, + description => $description, + longdescription => $longdescription, + qty => $add_part->qty, + unit => $add_part->unit->name, + sellprice => $add_part->unit->convert_to($part->sellprice, $part->unit_obj), + lastcost => $part->lastcost, + discount => 0, + project_id => $self->requirement_spec->project_id, + ); + + return $item; +} + sub create_order { my ($self, %params) = @_; - $self->{parts} = { map { ($_->{id} => $_) } @{ SL::DB::Manager::Part->get_all(where => [ id => [ uniq map { $_->{order_part_id} } @{ $params{sections} } ] ]) } }; + my @part_ids = ( + map({ $_->{order_part_id} } @{ $params{sections} }), + map({ $_->part_id } @{ $params{additional_parts} }), + ); + $self->{parts} = { map { ($_->{id} => $_) } @{ SL::DB::Manager::Part->get_all(where => [ id => [ uniq @part_ids ] ]) } }; my $customer = SL::DB::Customer->new(id => $::form->{customer_id})->load; - my @orderitems = map { $self->create_order_item(section => $_, language_id => $customer->language_id) } @{ $params{sections} }; + my @orderitems = map { $self->create_order_item( section => $_, language_id => $customer->language_id) } @{ $params{sections} }; + my @add_items = map { $self->create_additional_part_order_item(additional_part => $_, language_id => $customer->language_id) } @{ $params{additional_parts} }; my $employee = SL::DB::Manager::Employee->current; my $order = SL::DB::Order->new( globalproject_id => $self->requirement_spec->project_id, transdate => DateTime->today_local, reqdate => $::form->{quotation} && $customer->payment_id ? $customer->payment->calc_date : undef, quotation => !!$::form->{quotation}, - orderitems => \@orderitems, + orderitems => [ @orderitems, @add_items ], customer_id => $customer->id, taxincluded => $customer->taxincluded, intnotes => $customer->notes,