Auftrags-Controller: Summen und Steuern nach Löschen von Artikeln neu berechnen.

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index 6aeee96693e74ac8a1a959152fe52dc0c94fa276..6f286e7d36cc4a7b619e768a021175697e563fc9 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -30,7 +30,7 @@ use Rose::Object::MakeMethods::Generic
 # safety
 __PACKAGE__->run_before('_check_auth');
 
-__PACKAGE__->run_before('_setup',
+__PACKAGE__->run_before('_recalc',
                         only => [ qw(edit update save) ]);
 
 
@@ -145,7 +145,7 @@ sub action_add_item {
 
   $self->order->add_items($item);
 
-  $self->_setup();
+  $self->_recalc();
 
   my $row_as_html = $self->p->render('order/tabs/_row', ITEM => $item);
 
@@ -192,7 +192,7 @@ sub action_set_item_values {
   $item->assign_attributes(%new_attr);
 
 
-  $self->_setup();
+  $self->_recalc();
 
   $self->js
     ->val( '#' . $::form->{qty_dom_id},       $item->qty_as_number)
@@ -208,6 +208,19 @@ sub action_set_item_values {
 }
 
 
+sub action_recalc_amounts_and_taxes {
+  my ($self) = @_;
+
+  $self->_recalc();
+
+  $self->js
+    ->html('#netamount_id', $::form->format_amount(\%::myconfig, $self->order->netamount, -2))
+    ->html('#amount_id',    $::form->format_amount(\%::myconfig, $self->order->amount,    -2))
+    ->remove('.tax_row')
+    ->insertBefore($self->build_tax_rows, '#amount_row_id')
+    ->render($self);
+}
+
 #
 # helpers
 #
@@ -310,7 +323,7 @@ sub _make_order {
 }
 
 
-sub _setup {
+sub _recalc {
   my ($self) = @_;
 
   # bb: todo: currency later

diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index 52bb065d77c14f30b7289f8f6362c5faad00efdd..83bd048591abd42e27e81d4b2ddc466cf604015c 100644 (file)
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -211,6 +211,8 @@ function add_item() {
 function delete_order_item_row(clicked) {
   var row = $(clicked).parents("tr").first();
   $(row).remove();
+
+  recalc_amounts_and_taxes()
 }
 
 function set_item_values(event) {
@@ -236,6 +238,14 @@ function set_item_values(event) {
   $.post("controller.pl", data, kivi.eval_json_result);
 }
 
+function recalc_amounts_and_taxes() {
+  var data = $('#order_form').serialize();
+  data += '&action=Order/recalc_amounts_and_taxes';
+  data += '&type=' + $('#type').val();
+
+  $.post("controller.pl", data, kivi.eval_json_result);
+}
+
 function display_linetotal(item_id, amount) {
   $('#item_' + item_id).parents("tr").first().find('[name="linetotal"]').html(amount);
 }