Auftrags-Controller: auch bei geladenen Positionen die ID übergeben.

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

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 1c64e40d0c56e1cfac1bc96e2301b883dd7449bf..79e4ee83470ce45609943eb3fd1ca9c66b76d6ce 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -4,7 +4,6 @@ use strict;
 use parent qw(SL::Controller::Base);
 
 use SL::Helper::Flash;
 use parent qw(SL::Controller::Base);
 
 use SL::Helper::Flash;

-use SL::ClientJS;

 use SL::Presenter;
 use SL::Locale::String;
 use SL::SessionFile::Random;
 use SL::Presenter;
 use SL::Locale::String;
 use SL::SessionFile::Random;


@@ -19,17 +18,19 @@ use SL::DB::Employee;
 use SL::DB::Project;
 use SL::DB::Default;
 use SL::DB::Unit;
 use SL::DB::Project;
 use SL::DB::Default;
 use SL::DB::Unit;

+use SL::DB::Price;

 
 use SL::Helper::DateTime;
 use SL::Helper::CreatePDF qw(:all);
 
 use List::Util qw(max first);
 
 use SL::Helper::DateTime;
 use SL::Helper::CreatePDF qw(:all);
 
 use List::Util qw(max first);

-use List::MoreUtils qw(none pairwise);
+use List::MoreUtils qw(none pairwise first_index);

 use English qw(-no_match_vars);
 use English qw(-no_match_vars);

+use File::Spec;

 
 use Rose::Object::MakeMethods::Generic
 (
 
 use Rose::Object::MakeMethods::Generic
 (

- 'scalar --get_set_init' => [ qw(order valid_types type cv js p) ],
+ 'scalar --get_set_init' => [ qw(order valid_types type cv p) ],

 );
 
 
 );
 
 


@@ -94,7 +95,7 @@ sub action_save {
 
   if (scalar @{ $errors }) {
     $self->js->flash('error', $_) foreach @{ $errors };
 
   if (scalar @{ $errors }) {
     $self->js->flash('error', $_) foreach @{ $errors };

-    return $self->js->render($self);
+    return $self->js->render();

   }
 
   flash_later('info', $::locale->text('The order has been saved'));
   }
 
   flash_later('info', $::locale->text('The order has been saved'));


@@ -120,19 +121,25 @@ sub action_create_pdf {
   $sfile->fh->print($pdf);
   $sfile->fh->close;
 
   $sfile->fh->print($pdf);
   $sfile->fh->close;
 

-  my $tmp_filename = $sfile->file_name;
-  my $pdf_filename = t8('Sales Order') . '_' . $self->order->ordnumber . '.pdf';
+  my $key = join('_', Time::HiRes::gettimeofday(), int rand 1000000000000);
+  $::auth->set_session_value("Order::create_pdf-${key}" => $sfile->file_name);
+
+  $::form->{formname}  = $self->type;
+  $::form->{language} = 'de';
+  my $pdf_filename =  $::form->get_formname_translation . '_' . $self->order->ordnumber . '.pdf';

 
   $self->js
 
   $self->js

-    ->run('download_pdf', $tmp_filename, $pdf_filename)
+    ->run('download_pdf', $pdf_filename, $key)

     ->flash('info', t8('The PDF has been created'))->render($self);
 }
 
 sub action_download_pdf {
   my ($self) = @_;
 
     ->flash('info', t8('The PDF has been created'))->render($self);
 }
 
 sub action_download_pdf {
   my ($self) = @_;
 

+  my $key = $::form->{key};
+  my $tmp_filename = $::auth->get_session_value("Order::create_pdf-${key}");

   return $self->send_file(
   return $self->send_file(

-    $::form->{tmp_filename},
+    $tmp_filename,

     type => 'application/pdf',
     name => $::form->{pdf_filename},
   );
     type => 'application/pdf',
     name => $::form->{pdf_filename},
   );


@@ -186,12 +193,8 @@ sub action_send_email {
     return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render($self);
   }
 
     return $self->js->flash('error', t8('Conversion to PDF failed: #1', $errors[0]))->render($self);
   }
 

-  my $sfile = SL::SessionFile::Random->new(mode => "w");
-  $sfile->fh->print($pdf);
-  $sfile->fh->close;
-
-  $mail->{attachments} = [{ "filename" => $sfile->file_name,
-                            "name"     => $::form->{email}->{attachment_filename} }];
+  $mail->{attachments} = [{ "content" => $pdf,
+                            "name"    => $::form->{email}->{attachment_filename} }];

 
   if (my $err = $mail->send) {
     return $self->js->flash('error', t8('Sending E-mail: ') . $err)
 
   if (my $err = $mail->send) {
     return $self->js->flash('error', t8('Sending E-mail: ') . $err)


@@ -222,7 +225,7 @@ sub action_save_and_delivery_order {
 
   if (scalar @{ $errors }) {
     $self->js->flash('error', $_) foreach @{ $errors };
 
   if (scalar @{ $errors }) {
     $self->js->flash('error', $_) foreach @{ $errors };

-    return $self->js->render($self);
+    return $self->js->render();

   }
 
   my $delivery_order = $self->order->convert_to_delivery_order($self->order);
   }
 
   my $delivery_order = $self->order->convert_to_delivery_order($self->order);


@@ -242,31 +245,39 @@ sub action_save_and_delivery_order {
 sub action_customer_vendor_changed {
   my ($self) = @_;
 
 sub action_customer_vendor_changed {
   my ($self) = @_;
 

-  if ($self->cv eq 'customer') {
-    $self->order->customer(SL::DB::Manager::Customer->find_by_or_create(id => $::form->{cv_id}));
-
-  } elsif ($self->cv eq 'vendor') {
-    $self->order->vendor(SL::DB::Manager::Vendor->find_by_or_create(id => $::form->{cv_id}));
-  }
+  my $cv_method = $self->cv;

 
 

-  if ($self->order->{$self->cv}->contacts && scalar @{ $self->order->{$self->cv}->contacts } > 0) {
+  if ($self->order->$cv_method->contacts && scalar @{ $self->order->$cv_method->contacts } > 0) {

     $self->js->show('#cp_row');
   } else {
     $self->js->hide('#cp_row');
   }
 
     $self->js->show('#cp_row');
   } else {
     $self->js->hide('#cp_row');
   }
 

-  if ($self->order->{$self->cv}->shipto && scalar @{ $self->order->{$self->cv}->shipto } > 0) {
+  if ($self->order->$cv_method->shipto && scalar @{ $self->order->$cv_method->shipto } > 0) {

     $self->js->show('#shipto_row');
   } else {
     $self->js->hide('#shipto_row');
   }
 
     $self->js->show('#shipto_row');
   } else {
     $self->js->hide('#shipto_row');
   }
 

+  $self->order->taxzone_id($self->order->$cv_method->taxzone_id);
+
+  if ($self->order->is_sales) {
+    $self->order->taxincluded(defined($self->order->$cv_method->taxincluded_checked)
+                              ? $self->order->$cv_method->taxincluded_checked
+                              : $::myconfig{taxincluded_checked});
+  }
+
+  $self->_recalc();
+

   $self->js
   $self->js

-    ->replaceWith('#order_cp_id',     $self->build_contact_select)
-    ->replaceWith('#order_shipto_id', $self->build_shipto_select)
-    ->val('#order_taxzone_id', $self->order->{$self->cv}->taxzone_id)
-    ->focus('#order_' . $self->cv . '_id')
-    ->render($self);
+    ->replaceWith('#order_cp_id',       $self->build_contact_select)
+    ->replaceWith('#order_shipto_id',   $self->build_shipto_select)
+    ->val(        '#order_taxzone_id',  $self->order->taxzone_id)
+    ->val(        '#order_taxincluded', $self->order->taxincluded)
+    ->focus(      '#order_' . $self->cv . '_id');
+
+  $self->_js_redisplay_amounts_and_taxes;
+  $self->js->render();

 }
 
 sub action_add_item {
 }
 
 sub action_add_item {


@@ -279,17 +290,42 @@ sub action_add_item {
   my $item = SL::DB::OrderItem->new;
   $item->assign_attributes(%$form_attr);
 
   my $item = SL::DB::OrderItem->new;
   $item->assign_attributes(%$form_attr);
 

-  my $part        = SL::DB::Part->new(id => $form_attr->{parts_id})->load;
-  my $cv_method   = $self->cv;
-  my $cv_discount = $self->order->$cv_method? $self->order->$cv_method->discount : 0.0;
+  my $part         = SL::DB::Part->new(id => $form_attr->{parts_id})->load;
+
+  my $price_source = SL::PriceSource->new(record_item => $item, record => $self->order);
+
+  my $price_src;
+  if ($item->sellprice) {
+    $price_src = $price_source->price_from_source("");
+    $price_src->price($item->sellprice);
+  } else {
+    $price_src = $price_source->best_price
+           ? $price_source->best_price
+           : $price_source->price_from_source("");
+    $price_src->price(0) if !$price_source->best_price;
+  }
+
+  # bb: not sure but: maybe there should be a $price_source->discount_from_source
+  # which can also return an empty_discout if source is "".
+  my $discount;
+  my $discount_src;
+  if ($item->discount) {
+    $discount = $item->discount;
+  } else {
+    $discount = $price_source->best_discount
+              ? $price_source->best_discount->discount
+              : 0;
+    $discount_src = $price_source->best_discount->source if $price_source->best_discount;
+  }

 
   my %new_attr;
 
   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{unit}        = $part->unit;
-  $new_attr{sellprice}   = $part->sellprice   if ! $item->sellprice;
-  $new_attr{discount}    = $cv_discount       if ! $item->discount;
+  $new_attr{part}                   = $part;
+  $new_attr{description}            = $part->description if ! $item->description;
+  $new_attr{qty}                    = 1.0                if ! $item->qty;
+  $new_attr{sellprice}              = $price_src->price;
+  $new_attr{discount}               = $discount;
+  $new_attr{active_price_source}    = $price_src;
+  $new_attr{active_discount_source} = $discount_src;

 
   # 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
 
   # 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


@@ -319,7 +355,7 @@ sub action_add_item {
     ->focus('#add_item_parts_id_name');
 
   $self->_js_redisplay_amounts_and_taxes;
     ->focus('#add_item_parts_id_name');
 
   $self->_js_redisplay_amounts_and_taxes;

-  $self->js->render($self);
+  $self->js->render();

 }
 
 sub action_recalc_amounts_and_taxes {
 }
 
 sub action_recalc_amounts_and_taxes {


@@ -329,7 +365,16 @@ sub action_recalc_amounts_and_taxes {
 
   $self->_js_redisplay_linetotals;
   $self->_js_redisplay_amounts_and_taxes;
 
   $self->_js_redisplay_linetotals;
   $self->_js_redisplay_amounts_and_taxes;

-  $self->js->render($self);
+  $self->js->render();
+}
+
+sub action_price_popup {
+  my ($self) = @_;
+
+  my $idx  = first_index { $_ eq $::form->{item_id} } @{ $::form->{orderitem_ids} };
+  my $item = $self->order->items->[$idx];
+
+  $self->render_price_dialog($item);

 }
 
 sub _js_redisplay_linetotals {
 }
 
 sub _js_redisplay_linetotals {


@@ -390,10 +435,6 @@ sub init_cv {
   return $cv;
 }
 
   return $cv;
 }
 

-sub init_js {
-  SL::ClientJS->new;
-}
-

 sub init_p {
   SL::Presenter->get;
 }
 sub init_p {
   SL::Presenter->get;
 }


@@ -441,13 +482,34 @@ sub build_tax_rows {
   my ($self) = @_;
 
   my $rows_as_html;
   my ($self) = @_;
 
   my $rows_as_html;

-  foreach my $tax (@{ $self->{taxes} }) {
+  foreach my $tax (sort { $a->{tax}->rate cmp $b->{tax}->rate } @{ $self->{taxes} }) {

     $rows_as_html .= $self->p->render('order/tabs/_tax_row', TAX => $tax, TAXINCLUDED => $self->order->taxincluded);
   }
   return $rows_as_html;
 }
 
 
     $rows_as_html .= $self->p->render('order/tabs/_tax_row', TAX => $tax, TAXINCLUDED => $self->order->taxincluded);
   }
   return $rows_as_html;
 }
 
 

+sub render_price_dialog {
+  my ($self, $record_item) = @_;
+
+  my $price_source = SL::PriceSource->new(record_item => $record_item, record => $self->order);
+
+  $self->js
+    ->run(
+      'kivi.io.price_chooser_dialog',
+      t8('Available Prices'),
+      $self->render('order/tabs/_price_sources_dialog', { output => 0 }, price_source => $price_source)
+    )
+    ->reinit_widgets;
+
+#   if (@errors) {
+#     $self->js->text('#dialog_flash_error_content', join ' ', @errors);
+#     $self->js->show('#dialog_flash_error');
+#   }
+
+  $self->js->render;
+}
+

 sub _make_order {
   my ($self) = @_;
 
 sub _make_order {
   my ($self) = @_;
 


@@ -463,7 +525,6 @@ sub _make_order {
   return $order;
 }
 
   return $order;
 }
 

-

 sub _recalc {
   my ($self) = @_;
 
 sub _recalc {
   my ($self) = @_;
 


@@ -492,13 +553,18 @@ sub _get_unalterable_data {
     if ($item->id) {
       # load data from orderitems (db)
       my $db_item = SL::DB::OrderItem->new(id => $item->id)->load;
     if ($item->id) {
       # load data from orderitems (db)
       my $db_item = SL::DB::OrderItem->new(id => $item->id)->load;

-      $item->$_($db_item->$_) for qw(active_discount_source active_price_source longdescription);
+      $item->$_($db_item->$_) for qw(longdescription);

     } else {
       # set data from part (or other sources)
       $item->longdescription($item->part->notes);
     } else {
       # set data from part (or other sources)
       $item->longdescription($item->part->notes);

-      #$item->active_price_source('');
-      #$item->active_discount_source('');

     }
     }

+
+    # 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 }) {
+      $var->unparsed_value($::form->parse_amount(\%::myconfig, $var->{__unparsed_value})) if ($var->config->type eq 'number' && exists($var->{__unparsed_value}));
+    }
+    $item->parse_custom_variable_values;

   }
 }
 
   }
 }
 


@@ -506,11 +572,6 @@ sub _get_unalterable_data {
 sub _save {
   my ($self) = @_;
 
 sub _save {
   my ($self) = @_;
 

-  # autovivify all cvars that are not in the form (cvars_by_config can do it)
-  foreach my $item (@{ $self->order->items }) {
-    $item->cvars_by_config;
-  }
-

   my $errors = [];
   my $db = $self->order->db;
 
   my $errors = [];
   my $db = $self->order->db;
 


@@ -541,6 +602,17 @@ sub _pre_render {
 
   $self->{current_employee_id} = SL::DB::Manager::Employee->current->id;
 
 
   $self->{current_employee_id} = SL::DB::Manager::Employee->current->id;
 

+  foreach  my $item (@{$self->order->items}) {
+    my $price_source = SL::PriceSource->new(record_item => $item, record => $self->order);
+
+    my $price_src = $price_source->price_from_source($item->active_price_source);
+    $item->active_price_source($price_src);
+
+    my $discount_src;
+    $discount_src = $price_source->price_from_source($item->active_discount_source)->source if $item->active_discount_source;
+    $item->active_discount_source($discount_src);
+  }
+

   $::request->{layout}->use_javascript("${_}.js")  for qw(ckeditor/ckeditor ckeditor/adapters/jquery);
 }
 
   $::request->{layout}->use_javascript("${_}.js")  for qw(ckeditor/ckeditor ckeditor/adapters/jquery);
 }
 


@@ -548,8 +620,8 @@ sub _create_pdf {
   my ($order, $pdf_ref, $params) = @_;
 
   my $print_form = Form->new('');
   my ($order, $pdf_ref, $params) = @_;
 
   my $print_form = Form->new('');

-  $print_form->{type}     = 'sales_order';
-  $print_form->{formname} = 'sales_order',
+  $print_form->{type}     = $order->type;
+  $print_form->{formname} = $order->type;

   $print_form->{format}   = $params->{format} || 'pdf',
   $print_form->{media}    = $params->{media}  || 'file';
 
   $print_form->{format}   = $params->{format} || 'pdf',
   $print_form->{media}    = $params->{media}  || 'file';