Auftrags-Controller: Wiedervorlage

Hier werden die vorhandenen Funktionenn und das Template verwendet, wobei
die Eingabemaske in einem eigenen Browser-Fenster gerendert wird.

Todo: Umstellung auf Dialog für alle Masken (evtl. ein eigener
FollowUp-Controller und Methoden dafür in SL::DB::FollowUp)

Refs #375 (redmine)

diff --git a/SL/Controller/Order.pm b/SL/Controller/Order.pm
index bef3631..b5e5db1 100644 (file)
--- a/SL/Controller/Order.pm
+++ b/SL/Controller/Order.pm
@@ -1815,7 +1815,7 @@ sub pre_render {
   $self->get_item_cvpartnumber($_) for @{$self->order->items_sorted};
 
   $::request->{layout}->use_javascript("${_}.js") for qw(kivi.SalesPurchase kivi.Order kivi.File ckeditor/ckeditor ckeditor/adapters/jquery
-                                                         edit_periodic_invoices_config calculate_qty kivi.Validator);
+                                                         edit_periodic_invoices_config calculate_qty kivi.Validator follow_up);
   $self->setup_edit_action_bar;
 }
 
@@ -1907,6 +1907,18 @@ sub setup_edit_action_bar {
         disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
         only_if  => $deletion_allowed,
       ],
+
+      combobox => [
+        action => [
+          t8('more')
+        ],
+        action => [
+          t8('Follow-Up'),
+          call     => [ 'kivi.Order.follow_up_window' ],
+          disabled => !$self->order->id ? t8('This object has not been saved yet.') : undef,
+          only_if  => $::auth->assert('productivity'),
+        ],
+      ], # end of combobox "more"
     );
   }
 }

diff --git a/js/kivi.Order.js b/js/kivi.Order.js
index 288af2d..e524406 100644 (file)
--- a/js/kivi.Order.js
+++ b/js/kivi.Order.js
@@ -906,6 +906,36 @@ namespace('kivi.Order', function(ns) {
                                 width:  500 }});
   };
 
+  ns.follow_up_window = function() {
+    var id   = $('#id').val();
+    var type = $('#type').val();
+
+    var number_info = '';
+    if ($('#type').val() == 'sales_order' || $('#type').val() == 'purchase_order') {
+      number_info = $('#order_ordnumber').val();
+    } else if ($('#type').val() == 'sales_quotation' || $('#type').val() == 'request_quotation') {
+      number_info = $('#order_quonumber').val();
+    }
+
+    var name_info = '';
+    if ($('#type').val() == 'sales_order' || $('#type').val() == 'sales_quotation') {
+      name_info = $('#order_customer_id_name').val();
+    } else if ($('#type').val() == 'purchase_order' || $('#type').val() == 'request_quotation') {
+      name_info = $('#order_vendor_id_name').val();
+    }
+
+    var info = '';
+    if (number_info !== '') { info += ' (' + number_info + ')' }
+    if (name_info   !== '') { info += ' (' + name_info + ')' }
+
+    $('<input type="hidden" name="follow_up_rowcount">').appendTo('#order_form').val(1);
+    $('<input type="hidden" name="follow_up_trans_id_1">').appendTo('#order_form').val(id);
+    $('<input type="hidden" name="follow_up_trans_type_1">').appendTo('#order_form').val(type);
+    $('<input type="hidden" name="follow_up_trans_info_1">').appendTo('#order_form').val(info);
+
+    follow_up_window();
+  };
+
 });
 
 $(function() {