X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=SL%2FController%2FOrder.pm;h=76bc3f74652ff026aa374348c36d9ccce30957ca;hb=03ba13d2594f31e7af5eb3868435495c750ef1cb;hp=9b4c1bf4fb5abc7cc8e75c55ea4d3d43cdd8c5ca;hpb=ff5279eda2b2e7fb378bfc65ea582b10a06ed604;p=kivitendo-erp.git

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 9b4c1bf4f..76bc3f746 100644
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -26,6 +26,7 @@ use SL::Helper::CreatePDF qw(:all);
 use SL::Helper::PrintOptions;
 use SL::Helper::ShippedQty;
 use SL::Helper::UserPreferences::PositionsScrollbar;
+use SL::Helper::UserPreferences::UpdatePositions;
 
 use SL::Controller::Helper::GetModels;
 
@@ -40,7 +41,7 @@ use Sort::Naturally;
 use Rose::Object::MakeMethods::Generic
 (
  scalar => [ qw(item_ids_to_delete) ],
- 'scalar --get_set_init' => [ qw(order valid_types type cv p multi_items_models all_price_factors search_cvpartnumber) ],
+ 'scalar --get_set_init' => [ qw(order valid_types type cv p multi_items_models all_price_factors search_cvpartnumber show_update_button) ],
 );
 
 
@@ -241,11 +242,8 @@ sub action_save_as_new {
 # print the order
 #
 # This is called if "print" is pressed in the print dialog.
-# If PDF creation was requested and succeeded, the pdf is stored in a session
-# file and the filename is stored as session value with an unique key. A
-# javascript function with this key is then called. This function calls the
-# download action below (action_download_pdf), which offers the file for
-# download.
+# If PDF creation was requested and succeeded, the pdf is offered for download
+# via send_file (which uses ajax in this case).
 sub action_print {
   my ($self) = @_;
 
@@ -297,16 +295,13 @@ sub action_print {
 
   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::print-${key}" => $sfile->file_name);
-
-    $self->js
-    ->run('kivi.Order.download_pdf', $pdf_filename, $key)
-    ->flash('info', t8('The PDF has been created'));
+    $self->js->flash('info', t8('The PDF has been created'));
+    $self->send_file(
+      \$pdf,
+      type         => SL::MIME->mime_type_from_ext($pdf_filename),
+      name         => $pdf_filename,
+      js_no_render => 1,
+    );
 
   } elsif ($media eq 'printer') {
     # printer
@@ -353,21 +348,6 @@ sub action_print {
   $self->js->render;
 }
 
-# offer pdf for download
-#
-# It needs to get the key for the session value to get the pdf file.
-sub action_download_pdf {
-  my ($self) = @_;
-
-  my $key = $::form->{key};
-  my $tmp_filename = $::auth->get_session_value("Order::print-${key}");
-  return $self->send_file(
-    $tmp_filename,
-    type => SL::MIME->mime_type_from_ext($::form->{pdf_filename}),
-    name => $::form->{pdf_filename},
-  );
-}
-
 # open the email dialog
 sub action_show_email_dialog {
   my ($self) = @_;
@@ -790,11 +770,9 @@ sub action_add_item {
 
   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,
-                                     TYPE                => $self->type,
-                                     ALL_PRICE_FACTORS   => $self->all_price_factors,
-                                     SEARCH_CVPARTNUMBER => $self->search_cvpartnumber,
+                                     ITEM => $item,
+                                     ID   => $item_id,
+                                     SELF => $self,
   );
 
   $self->js
@@ -818,11 +796,9 @@ sub action_add_item {
       $self->get_item_cvpartnumber($item);
       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,
-                                         TYPE                => $self->type,
-                                         ALL_PRICE_FACTORS   => $self->all_price_factors,
-                                         SEARCH_CVPARTNUMBER => $self->search_cvpartnumber,
+                                         ITEM => $item,
+                                         ID   => $item_id,
+                                         SELF => $self,
       );
       $self->js
         ->append('#row_table_id', $row_as_html);
@@ -901,11 +877,9 @@ sub action_add_multi_items {
     $self->get_item_cvpartnumber($item);
     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,
-                                       TYPE                => $self->type,
-                                       ALL_PRICE_FACTORS   => $self->all_price_factors,
-                                       SEARCH_CVPARTNUMBER => $self->search_cvpartnumber,
+                                       ITEM => $item,
+                                       ID   => $item_id,
+                                       SELF => $self,
     );
 
     $self->js->append('#row_table_id', $row_as_html);
@@ -1045,8 +1019,14 @@ sub action_update_row_from_master_data {
 
     $self->js
       ->run('kivi.Order.update_sellprice', $item_id, $item->sellprice_as_number)
-      ->val('.row_entry:has(#item_' . $item_id . ') [name = "order.orderitems[].description"]', $item->description)
-      ->val('.row_entry:has(#item_' . $item_id . ') [name = "order.orderitems[].longdescription"]', $item->longdescription);
+      ->html('.row_entry:has(#item_' . $item_id . ') [name = "partnumber"] a', $item->part->partnumber)
+      ->val ('.row_entry:has(#item_' . $item_id . ') [name = "order.orderitems[].description"]', $item->description)
+      ->val ('.row_entry:has(#item_' . $item_id . ') [name = "order.orderitems[].longdescription"]', $item->longdescription);
+
+    if ($self->search_cvpartnumber) {
+      $self->get_item_cvpartnumber($item);
+      $self->js->html('.row_entry:has(#item_' . $item_id . ') [name = "cvpartnumber"]', $item->{cvpartnumber});
+    }
   }
 
   $self->recalc();
@@ -1208,6 +1188,12 @@ sub init_search_cvpartnumber {
   return $search_cvpartnumber;
 }
 
+sub init_show_update_button {
+  my ($self) = @_;
+
+  !!SL::Helper::UserPreferences::UpdatePositions->new()->get_show_update_button();
+}
+
 sub init_p {
   SL::Presenter->get;
 }
@@ -1669,10 +1655,11 @@ sub pre_render {
   $self->{positions_scrollbar_height} = SL::Helper::UserPreferences::PositionsScrollbar->new()->get_height();
 
   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(
+  $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;
+  $print_form->{language_id} = $self->order->language_id;
+  $self->{print_options}     = SL::Helper::PrintOptions->get_print_options(
     form => $print_form,
     options => {dialog_name_prefix => 'print_options.',
                 show_headers       => 1,
@@ -1945,6 +1932,9 @@ sub get_title_for {
 sub get_item_cvpartnumber {
   my ($self, $item) = @_;
 
+  return if !$self->search_cvpartnumber;
+  return if !$self->order->customervendor;
+
   if ($self->cv eq 'vendor') {
     my @mms = grep { $_->make eq $self->order->customervendor->id } @{$item->part->makemodels};
     $item->{cvpartnumber} = $mms[0]->model if scalar @mms;
@@ -2165,10 +2155,6 @@ should be implemented.
 C<show_multi_items_dialog> does not use the currently inserted string for
 filtering.
 
-=item *
-
-The language selected in print or email dialog is not saved when the order is saved.
-
 =back
 
 =head1 To discuss / Nice to have