Auftrags-Controller: zweite Zeile zeigen CVars.

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

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 637df37b808d869d0840d0db11d3265478189fc5..4cd7864365bb29826ffd6f45c5b1675866719e2b 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -125,7 +125,7 @@ sub action_customer_vendor_changed {
     ->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')
+    ->focus('#order_' . $self->cv . '_id')
     ->render($self);
 }
 
@@ -140,7 +140,8 @@ sub action_add_item {
   $item->assign_attributes(%$form_attr);
 
   my $part        = SL::DB::Part->new(id => $form_attr->{parts_id})->load;
-  my $cv_discount = $self->order->customer? $self->order->customer->discount : 0.0;
+  my $cv_method   = $self->cv;
+  my $cv_discount = $self->order->$cv_method? $self->order->$cv_method->discount : 0.0;
 
   my %new_attr;
   $new_attr{part}        = $part;
@@ -151,16 +152,16 @@ sub action_add_item {
   $new_attr{discount}    = $cv_discount       if ! $item->discount;
 
   $item->assign_attributes(%new_attr);
-  $item->id(join('_', 'new', Time::HiRes::gettimeofday(), int rand 1000000000000)) if !$item->id;
 
   $self->order->add_items($item);
 
   $self->_recalc();
 
-  my $row_as_html = $self->p->render('order/tabs/_row', ITEM => $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);
 
   $self->js
-    ->append('#row_table_id tbody', $row_as_html)
+    ->append('#row_table_id', $row_as_html)
     ->val('#add_item_parts_id', '')
     ->val('#add_item_parts_id_name', '')
     ->val('#add_item_description', '')
@@ -168,6 +169,7 @@ sub action_add_item {
     ->val('#add_item_sellprice_as_number', '')
     ->val('#add_item_discount_as_percent', '')
     ->run('row_table_scroll_down')
+    ->run('row_set_keyboard_events_by_id', $item_id)
     ->focus('#add_item_parts_id_name');
 
   $self->_js_redisplay_amounts_and_taxes;