X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FOrder.pm;h=8ed5b3326c43fb03dc396357eb04df4d450aec64;hb=78c6fdee686577ce29d3392661bc4d39bc5481a9;hp=5828132b3adc2a56f20561d22b4cff618c8de38d;hpb=91abaf6cbfa5bb429df7fce3748b3d37082551ad;p=kivitendo-erp.git

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 5828132b3..8ed5b3326 100644
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -10,6 +10,7 @@ use SL::SessionFile::Random;
 use SL::PriceSource;
 use SL::Form;
 use SL::Webdav;
+use SL::Template;
 
 use SL::DB::Order;
 use SL::DB::Customer;
@@ -20,10 +21,14 @@ use SL::DB::Project;
 use SL::DB::Default;
 use SL::DB::Unit;
 use SL::DB::Price;
+use SL::DB::PriceFactor;
 use SL::DB::Part;
+use SL::DB::Printer;
+use SL::DB::Language;
 
 use SL::Helper::DateTime;
 use SL::Helper::CreatePDF qw(:all);
+use SL::Helper::PrintOptions;
 
 use SL::Controller::Helper::GetModels;
 
@@ -34,7 +39,8 @@ use File::Spec;
 
 use Rose::Object::MakeMethods::Generic
 (
- 'scalar --get_set_init' => [ qw(order valid_types type cv p multi_items_models) ],
+ scalar => [ qw(item_ids_to_delete) ],
+ 'scalar --get_set_init' => [ qw(order valid_types type cv p multi_items_models all_price_factors) ],
 );
 
 
@@ -42,10 +48,10 @@ use Rose::Object::MakeMethods::Generic
 __PACKAGE__->run_before('_check_auth');
 
 __PACKAGE__->run_before('_recalc',
-                        only => [ qw(edit update save save_and_delivery_order create_pdf send_email) ]);
+                        only => [ qw(save save_and_delivery_order print create_pdf send_email) ]);
 
 __PACKAGE__->run_before('_get_unalterable_data',
-                        only => [ qw(save save_and_delivery_order create_pdf send_email) ]);
+                        only => [ qw(save save_and_delivery_order print create_pdf send_email) ]);
 
 #
 # actions
@@ -70,19 +76,8 @@ sub action_add {
 sub action_edit {
   my ($self) = @_;
 
-  $self->_pre_render();
-  $self->render(
-    'order/form',
-    title => $self->type eq _sales_order_type()    ? $::locale->text('Edit Sales Order')
-           : $self->type eq _purchase_order_type() ? $::locale->text('Edit Purchase Order')
-           : '',
-    %{$self->{template_args}}
-  );
-}
-
-sub action_update {
-  my ($self) = @_;
-
+  $self->_load_order;
+  $self->_recalc();
   $self->_pre_render();
   $self->render(
     'order/form',
@@ -132,30 +127,68 @@ sub action_save {
   $self->redirect_to(@redirect_params);
 }
 
-sub action_create_pdf {
+sub action_print {
   my ($self) = @_;
 
-  my $pdf;
-  my @errors = _create_pdf($self->order, \$pdf);
-  if (scalar @errors) {
-    return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render($self);
+  my $format      = $::form->{print_options}->{format};
+  my $media       = $::form->{print_options}->{media};
+  my $formname    = $::form->{print_options}->{formname};
+  my $copies      = $::form->{print_options}->{copies};
+  my $groupitems  = $::form->{print_options}->{groupitems};
+
+  # only pdf by now
+  if (none { $format eq $_ } qw(pdf)) {
+    return $self->js->flash('error', t8('Format \'#1\' is not supported yet/anymore.', $format))->render;
   }
 
-  my $sfile = SL::SessionFile::Random->new(mode => "w");
-  $sfile->fh->print($pdf);
-  $sfile->fh->close;
+  # only screen or printer by now
+  if (none { $media eq $_ } qw(screen printer)) {
+    return $self->js->flash('error', t8('Media \'#1\' is not supported yet/anymore.', $media))->render;
+  }
 
-  my $key = join('_', Time::HiRes::gettimeofday(), int rand 1000000000000);
-  $::auth->set_session_value("Order::create_pdf-${key}" => $sfile->file_name);
+  my $language;
+  $language = SL::DB::Language->new(id => $::form->{print_options}->{language_id})->load if $::form->{print_options}->{language_id};
 
   my $form = Form->new;
   $form->{ordnumber} = $self->order->ordnumber;
-  $form->{formname}  = $self->type;
   $form->{type}      = $self->type;
-  $form->{language}  = 'de';
-  $form->{format}    = 'pdf';
+  $form->{format}    = $format;
+  $form->{formname}  = $formname;
+  $form->{language}  = '_' . $language->template_code if $language;
+  my $pdf_filename   = $form->generate_attachment_filename();
+
+  my $pdf;
+  my @errors = _create_pdf($self->order, \$pdf, { format     => $format,
+                                                  formname   => $formname,
+                                                  language   => $language,
+                                                  groupitems => $groupitems });
+  if (scalar @errors) {
+    return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render;
+  }
+
+  if ($media eq 'screen') {
+    # screen/download
+    my $sfile = SL::SessionFile::Random->new(mode => "w");
+    $sfile->fh->print($pdf);
+    $sfile->fh->close;
+
+    my $key = join('_', Time::HiRes::gettimeofday(), int rand 1000000000000);
+    $::auth->set_session_value("Order::create_pdf-${key}" => $sfile->file_name);
 
-  my $pdf_filename = $form->generate_attachment_filename();
+    $self->js
+    ->run('kivi.Order.download_pdf', $pdf_filename, $key)
+    ->flash('info', t8('The PDF has been created'));
+
+  } elsif ($media eq 'printer') {
+    # printer
+    my $printer_id = $::form->{print_options}->{printer_id};
+    SL::DB::Printer->new(id => $printer_id)->load->print_document(
+      copies  => $copies,
+      content => $pdf,
+    );
+
+    $self->js->flash('info', t8('The PDF has been printed'));
+  }
 
   # copy file to webdav folder
   if ($self->order->ordnumber && $::instance_conf->get_webdav_documents) {
@@ -175,9 +208,7 @@ sub action_create_pdf {
     }
   }
 
-  $self->js
-    ->run('download_pdf', $pdf_filename, $key)
-    ->flash('info', t8('The PDF has been created'))->render($self);
+  $self->js->render;
 }
 
 sub action_download_pdf {
@@ -221,7 +252,7 @@ sub action_show_email_dialog {
 
   my $dialog_html = $self->render('order/tabs/_email_dialog', { output => 0 });
   $self->js
-      ->run('show_email_dialog', $dialog_html)
+      ->run('kivi.Order.show_email_dialog', $dialog_html)
       ->reinit_widgets
       ->render($self);
 }
@@ -261,7 +292,7 @@ sub action_send_email {
 
   $self->js
       ->val('#order_intnotes', $intnotes)
-      ->run('close_email_dialog')
+      ->run('kivi.Order.close_email_dialog')
       ->render($self);
 }
 
@@ -329,6 +360,24 @@ sub action_customer_vendor_changed {
   $self->js->render();
 }
 
+sub action_unit_changed {
+  my ($self) = @_;
+
+  my $idx  = first_index { $_ eq $::form->{item_id} } @{ $::form->{orderitem_ids} };
+  my $item = $self->order->items_sorted->[$idx];
+
+  my $old_unit_obj = SL::DB::Unit->new(name => $::form->{old_unit})->load;
+  $item->sellprice($item->unit_obj->convert_to($item->sellprice, $old_unit_obj));
+
+  $self->_recalc();
+
+  $self->js
+    ->run('kivi.Order.update_sellprice', $::form->{item_id}, $item->sellprice_as_number);
+  $self->_js_redisplay_linetotals;
+  $self->_js_redisplay_amounts_and_taxes;
+  $self->js->render();
+}
+
 sub action_add_item {
   my ($self) = @_;
 
@@ -336,21 +385,24 @@ sub action_add_item {
 
   return unless $form_attr->{parts_id};
 
-  my $item = _make_item($self->order, $form_attr);
+  my $item = _new_item($self->order, $form_attr);
   $self->order->add_items($item);
 
   $self->_recalc();
 
   my $item_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
-  my $row_as_html = $self->p->render('order/tabs/_row', ITEM => $item, ID => $item_id);
+  my $row_as_html = $self->p->render('order/tabs/_row',
+                                     ITEM              => $item,
+                                     ID                => $item_id,
+                                     ALL_PRICE_FACTORS => $self->all_price_factors
+  );
 
   $self->js
     ->append('#row_table_id', $row_as_html)
     ->val('.add_item_input', '')
-    ->run('row_table_scroll_down')
-    ->run('row_set_keyboard_events_by_id', $item_id)
-    ->on('.recalc', 'change', 'recalc_amounts_and_taxes')
-    ->on('.reformat_number', 'change', 'reformat_number')
+    ->run('kivi.Order.init_row_handlers')
+    ->run('kivi.Order.row_table_scroll_down')
+    ->run('kivi.Order.renumber_positions')
     ->focus('#add_item_parts_id_name');
 
   $self->_js_redisplay_amounts_and_taxes;
@@ -365,6 +417,9 @@ sub action_show_multi_items_dialog {
 
 sub action_multi_items_update_result {
   my $max_count = 100;
+
+  $::form->{multi_items}->{filter}->{obsolete} = 0;
+
   my $count = $_[0]->multi_items_models->count;
 
   if ($count == 0) {
@@ -388,7 +443,7 @@ sub action_add_multi_items {
 
   my @items;
   foreach my $attr (@form_attr) {
-    push @items, _make_item($self->order, $attr);
+    push @items, _new_item($self->order, $attr);
   }
   $self->order->add_items(@items);
 
@@ -396,18 +451,20 @@ sub action_add_multi_items {
 
   foreach my $item (@items) {
     my $item_id = join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000);
-    my $row_as_html = $self->p->render('order/tabs/_row', ITEM => $item, ID => $item_id);
+    my $row_as_html = $self->p->render('order/tabs/_row',
+                                       ITEM              => $item,
+                                       ID                => $item_id,
+                                       ALL_PRICE_FACTORS => $self->all_price_factors
+    );
 
-    $self->js
-        ->append('#row_table_id', $row_as_html)
-        ->run('row_set_keyboard_events_by_id', $item_id);
+    $self->js->append('#row_table_id', $row_as_html);
   }
 
   $self->js
-    ->run('close_multi_items_dialog')
-    ->run('row_table_scroll_down')
-    ->on('.recalc', 'change', 'recalc_amounts_and_taxes')
-    ->on('.reformat_number', 'change', 'reformat_number')
+    ->run('kivi.Order.close_multi_items_dialog')
+    ->run('kivi.Order.init_row_handlers')
+    ->run('kivi.Order.row_table_scroll_down')
+    ->run('kivi.Order.renumber_positions')
     ->focus('#add_item_parts_id_name');
 
   $self->_js_redisplay_amounts_and_taxes;
@@ -424,21 +481,56 @@ sub action_recalc_amounts_and_taxes {
   $self->js->render();
 }
 
+sub action_reorder_items {
+  my ($self) = @_;
+
+  my %sort_keys = (
+    partnumber  => sub { $_[0]->part->partnumber },
+    description => sub { $_[0]->description },
+    qty         => sub { $_[0]->qty },
+    sellprice   => sub { $_[0]->sellprice },
+    discount    => sub { $_[0]->discount },
+  );
+
+  my $method = $sort_keys{$::form->{order_by}};
+  my @to_sort = map { { old_pos => $_->position, order_by => $method->($_) } } @{ $self->order->items_sorted };
+  if ($::form->{sort_dir}) {
+    @to_sort = sort { $a->{order_by} cmp $b->{order_by} } @to_sort;
+  } else {
+    @to_sort = sort { $b->{order_by} cmp $a->{order_by} } @to_sort;
+  }
+  $self->js
+    ->run('kivi.Order.redisplay_items', \@to_sort)
+    ->render;
+}
+
 sub action_price_popup {
   my ($self) = @_;
 
   my $idx  = first_index { $_ eq $::form->{item_id} } @{ $::form->{orderitem_ids} };
-  my $item = $self->order->items->[$idx];
+  my $item = $self->order->items_sorted->[$idx];
 
   $self->render_price_dialog($item);
 }
 
+sub action_get_item_longdescription {
+  my $longdescription;
+
+  if ($::form->{item_id}) {
+    $longdescription = SL::DB::OrderItem->new(id => $::form->{item_id})->load->longdescription;
+  } elsif ($::form->{parts_id}) {
+    $longdescription = SL::DB::Part->new(id => $::form->{parts_id})->load->notes;
+  }
+  $_[0]->render(\ $longdescription, { type => 'text' });
+}
+
+
 sub _js_redisplay_linetotals {
   my ($self) = @_;
 
-  my @data = map {$::form->format_amount(\%::myconfig, $_->{linetotal}, 2, 0)} @{ $self->order->items };
+  my @data = map {$::form->format_amount(\%::myconfig, $_->{linetotal}, 2, 0)} @{ $self->order->items_sorted };
   $self->js
-    ->run('redisplay_linetotals', \@data);
+    ->run('kivi.Order.redisplay_linetotals', \@data);
 }
 
 sub _js_redisplay_amounts_and_taxes {
@@ -496,7 +588,7 @@ sub init_p {
 }
 
 sub init_order {
-  _make_order();
+  $_[0]->_make_order;
 }
 
 sub init_multi_items_models {
@@ -516,6 +608,10 @@ sub init_multi_items_models {
   );
 }
 
+sub init_all_price_factors {
+  SL::DB::Manager::PriceFactor->get_all;
+}
+
 sub _check_auth {
   my ($self) = @_;
 
@@ -583,6 +679,14 @@ sub render_price_dialog {
   $self->js->render;
 }
 
+sub _load_order {
+  my ($self) = @_;
+
+  return if !$::form->{id};
+
+  $self->order(SL::DB::Manager::Order->find_by(id => $::form->{id}));
+}
+
 sub _make_order {
   my ($self) = @_;
 
@@ -593,14 +697,57 @@ sub _make_order {
   $order   = SL::DB::Manager::Order->find_by(id => $::form->{id}) if $::form->{id};
   $order ||= SL::DB::Order->new(orderitems => []);
 
+  my $form_orderitems = delete $::form->{order}->{orderitems};
   $order->assign_attributes(%{$::form->{order}});
 
+  # remove deleted items
+  $self->item_ids_to_delete([]);
+  foreach my $idx (reverse 0..$#{$order->orderitems}) {
+    my $item = $order->orderitems->[$idx];
+    if (none { $item->id == $_->{id} } @{$form_orderitems}) {
+      splice @{$order->orderitems}, $idx, 1;
+      push @{$self->item_ids_to_delete}, $item->id;
+    }
+  }
+
+  my @items;
+  my $pos = 1;
+  foreach my $form_attr (@{$form_orderitems}) {
+    my $item = _make_item($order, $form_attr);
+    $item->position($pos);
+    push @items, $item;
+    $pos++;
+  }
+  $order->add_items(grep {!$_->id} @items);
+
   return $order;
 }
 
+
+# Make item objects from form values. For items already existing read from db.
+# Create a new item else. And assign attributes.
 sub _make_item {
   my ($record, $attr) = @_;
 
+  my $item;
+  $item = first { $_->id == $attr->{id} } @{$record->items} if $attr->{id};
+
+  my $is_new = !$item;
+
+  # add_custom_variables adds cvars to an orderitem with no cvars for saving, but
+  # they cannot be retrieved via custom_variables until the order/orderitem is
+  # saved. Adding empty custom_variables to new orderitem here solves this problem.
+  $item ||= SL::DB::OrderItem->new(custom_variables => []);
+
+  $item->assign_attributes(%$attr);
+  $item->longdescription($item->part->notes) if $is_new && !defined $attr->{longdescription};
+
+  return $item;
+}
+
+sub _new_item {
+  my ($record, $attr) = @_;
+
   my $item = SL::DB::OrderItem->new;
   $item->assign_attributes(%$attr);
 
@@ -633,13 +780,16 @@ sub _make_item {
 
   my %new_attr;
   $new_attr{part}                   = $part;
-  $new_attr{description}            = $part->description if ! $item->description;
-  $new_attr{qty}                    = 1.0                if ! $item->qty;
+  $new_attr{description}            = $part->description     if ! $item->description;
+  $new_attr{qty}                    = 1.0                    if ! $item->qty;
+  $new_attr{price_factor_id}        = $part->price_factor_id if ! $item->price_factor_id;
   $new_attr{sellprice}              = $price_src->price;
   $new_attr{discount}               = $discount_src->discount;
   $new_attr{active_price_source}    = $price_src;
   $new_attr{active_discount_source} = $discount_src;
 
+  $new_attr{longdescription}        = $part->notes if ! defined $attr->{longdescription};
+
   # add_custom_variables adds cvars to an orderitem with no cvars for saving, but
   # they cannot be retrieved via custom_variables until the order/orderitem is
   # saved. Adding empty custom_variables to new orderitem here solves this problem.
@@ -675,15 +825,6 @@ sub _get_unalterable_data {
   my ($self) = @_;
 
   foreach my $item (@{ $self->order->items }) {
-    if ($item->id) {
-      # load data from orderitems (db)
-      my $db_item = SL::DB::OrderItem->new(id => $item->id)->load;
-      $item->$_($db_item->$_) for qw(longdescription);
-    } else {
-      # set data from part (or other sources)
-      $item->longdescription($item->part->notes);
-    }
-
     # autovivify all cvars that are not in the form (cvars_by_config can do it).
     # workaround to pre-parse number-cvars (parse_custom_variable_values does not parse number values).
     foreach my $var (@{ $item->cvars_by_config }) {
@@ -722,7 +863,8 @@ sub _save {
 
   $db->do_transaction(
     sub {
-      $self->order->save();
+      SL::DB::OrderItem->new(id => $_)->delete for @{$self->item_ids_to_delete};
+      $self->order->save(cascade => 1);
   }) || push(@{$errors}, $db->error);
 
   return $errors;
@@ -748,11 +890,24 @@ sub _pre_render {
 
   $self->{current_employee_id} = SL::DB::Manager::Employee->current->id;
 
-  foreach  my $item (@{$self->order->items}) {
+  my $print_form = Form->new('');
+  $print_form->{type}      = $self->type;
+  $print_form->{printers}  = SL::DB::Manager::Printer->get_all_sorted;
+  $print_form->{languages} = SL::DB::Manager::Language->get_all_sorted;
+  $self->{print_options}   = SL::Helper::PrintOptions->get_print_options(
+    form => $print_form,
+    options => {dialog_name_prefix => 'print_options.',
+                show_headers       => 1,
+                no_queue           => 1,
+                no_postscript      => 1,
+                no_opendocument    => 1,
+                no_html            => 1},
+  );
+
+  foreach my $item (@{$self->order->orderitems}) {
     my $price_source = SL::PriceSource->new(record_item => $item, record => $self->order);
     $item->active_price_source(   $price_source->price_from_source(   $item->active_price_source   ));
     $item->active_discount_source($price_source->discount_from_source($item->active_discount_source));
-
   }
 
   if ($self->order->ordnumber && $::instance_conf->get_webdav) {
@@ -768,29 +923,48 @@ sub _pre_render {
                                                 } } @all_objects;
   }
 
-  $::request->{layout}->use_javascript("${_}.js")  for qw(ckeditor/ckeditor ckeditor/adapters/jquery);
+  $::request->{layout}->use_javascript("${_}.js")  for qw(kivi.SalesPurchase kivi.Order ckeditor/ckeditor ckeditor/adapters/jquery);
 }
 
 sub _create_pdf {
   my ($order, $pdf_ref, $params) = @_;
 
+  my @errors = ();
+
   my $print_form = Form->new('');
-  $print_form->{type}     = $order->type;
-  $print_form->{formname} = $order->type;
-  $print_form->{format}   = $params->{format} || 'pdf',
-  $print_form->{media}    = $params->{media}  || 'file';
+  $print_form->{type}        = $order->type;
+  $print_form->{formname}    = $params->{formname} || $order->type;
+  $print_form->{format}      = $params->{format}   || 'pdf';
+  $print_form->{media}       = $params->{media}    || 'file';
+  $print_form->{groupitems}  = $params->{groupitems};
+  $print_form->{media}       = 'file'                             if $print_form->{media} eq 'screen';
+  $print_form->{language}    = $params->{language}->template_code if $print_form->{language};
+  $print_form->{language_id} = $params->{language}->id            if $print_form->{language};
 
   $order->flatten_to_form($print_form, format_amounts => 1);
   # flatten_to_form sets payment_terms from customer/vendor - we do not want that here
   delete $print_form->{payment_terms} if !$print_form->{payment_id};
 
-  my @errors = ();
+  # search for the template
+  my ($template_file, @template_files) = SL::Helper::CreatePDF->find_template(
+    name        => $print_form->{formname},
+    email       => $print_form->{media} eq 'email',
+    language    => $params->{language},
+    printer_id  => $print_form->{printer_id},  # todo
+  );
+
+  if (!defined $template_file) {
+    push @errors, $::locale->text('Cannot find matching template for this print request. Please contact your template maintainer. I tried these: #1.', join ', ', map { "'$_'"} @template_files);
+  }
+
+  return @errors if scalar @errors;
+
   $print_form->throw_on_error(sub {
     eval {
       $print_form->prepare_for_printing;
 
       $$pdf_ref = SL::Helper::CreatePDF->create_pdf(
-        template  => SL::Helper::CreatePDF->find_template(name => $print_form->{formname}),
+        template  => $template_file,
         variables => $print_form,
         variable_content_types => {
           longdescription => 'html',
@@ -814,3 +988,93 @@ sub _purchase_order_type {
 }
 
 1;
+
+__END__
+
+=encoding utf-8
+
+=head1 NAME
+
+SL::Controller::Order - controller for orders
+
+=head1 TODO
+
+=over 2
+
+=item *
+
+testing
+
+
+=item *
+
+currency
+
+
+=item *
+
+customer/vendor details ('D'-button)
+
+
+=item *
+
+credit limit
+
+
+=item *
+
+more workflows (save as new / invoice)
+
+
+=item *
+
+price sources: little symbols showing better price / better discount
+
+
+=item *
+
+custom shipto address
+
+
+=item *
+
+periodic invoices
+
+
+=item *
+
+more details on second row (marge, ...)
+
+
+=item *
+
+language / part translations
+
+
+=item *
+
+access rights
+
+
+=item *
+
+preset salesman from customer
+
+
+=item *
+
+display weights
+
+
+=item *
+
+force project if enabled in client config
+
+
+=back
+
+=head1 AUTHOR
+
+Bernd Bleßmann E<lt>bernd@kivitendo-premium.deE<gt>
+
+=cut