X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.MassInvoiceCreatePrint.js;h=93fa162619b8d3f5940131e9adace1354b5c4e40;hb=d1d70f4ad540f4d57d1b577b337b6db38074e223;hp=b27ab6a81b686f878afcd9fcc217b75385d3b669;hpb=cc6d0e60e203d7b7fab1e95908cbe4afca5e18a0;p=kivitendo-erp.git

diff --git a/js/kivi.MassInvoiceCreatePrint.js b/js/kivi.MassInvoiceCreatePrint.js
index b27ab6a81..93fa16261 100644
--- a/js/kivi.MassInvoiceCreatePrint.js
+++ b/js/kivi.MassInvoiceCreatePrint.js
@@ -12,6 +12,7 @@ namespace('kivi.MassInvoiceCreatePrint', function(ns) {
     alert(kivi.t8('No delivery orders have been selected.'));
     return false;
   };
+
   this.checkInvoiceSelection = function() {
     if ($("[data-checkall=1]:checked").size() > 0)
       return true;
@@ -24,7 +25,7 @@ namespace('kivi.MassInvoiceCreatePrint', function(ns) {
       return false;
 
     $('body').addClass('loading');
-    $('form').submit();
+    kivi.submit_form_with_action('form', 'MassInvoiceCreatePrint/create_invoices');
     return false;
   };
 
@@ -41,11 +42,19 @@ namespace('kivi.MassInvoiceCreatePrint', function(ns) {
     $('#cpa_start_process_button,.ui-dialog-titlebar button.ui-dialog-titlebar-close').prop('disabled', 'disabled');
     $('#cpa_start_process_abort_link').remove();
 
+    var filter = $('[name^=filter\\.]').serializeArray();
     var data = {
+      action:             'MassInvoiceCreatePrint/create_print_all_start',
       number_of_invoices: $('#cpa_number_of_invoices').val(),
-      printer_id:         $('#cpa_printer_id').val()
+      bothsided:          $('#cpa_bothsided').val(),
+      printer_id:         $('#cpa_printer_id').val(),
+      copy_printer_id:    $('#cpa_copy_printer_id').val(),
+      transdate:          $('#transdate').val()
     };
-    kivi.submit_ajax_form('controller.pl?action=MassInvoiceCreatePrint/create_print_all_start', '[name^=filter\\.]', data);
+
+    $(filter).each(function(index, obj){ data[obj.name] = obj.value; });
+
+    $.post('controller.pl', data, kivi.eval_json_result);
   };
 
   this.createPrintAllFinishProcess = function() {
@@ -67,11 +76,42 @@ namespace('kivi.MassInvoiceCreatePrint', function(ns) {
     $('.ui-dialog-titlebar button.ui-dialog-titlebar-close').prop('disabled', '')
   };
 
-  this.setup = function() {
-    $('#create_button').click(kivi.MassInvoiceCreatePrint.submitMassCreationForm);
-    $('#create_print_all_button').click(kivi.MassInvoiceCreatePrint.createPrintAllInitialize);
-    $('#action_print').click(kivi.MassInvoiceCreatePrint.checkInvoiceSelection);
+  ns.showMassPrintOptions = function() {
+    $('#printer_options_printer_id').val($('#printer_id').val());
+
+    kivi.popup_dialog({
+      id: 'print_options',
+      dialog: {
+        title: kivi.t8('Print options'),
+        width:  600,
+        height: 200
+      }
+    });
+
+    return true;
   };
-});
 
-$(kivi.MassInvoiceCreatePrint.setup);
+  ns.showMassPrintOptionsOrDownloadDirectly = function() {
+    if (!kivi.MassInvoiceCreatePrint.checkInvoiceSelection())
+      return false;
+
+    if ($('#print_options_printer_id').length === 0)
+      return kivi.MassInvoiceCreatePrint.massPrint();
+    return kivi.MassInvoiceCreatePrint.showMassPrintOptions();
+  };
+
+  ns.massPrint = function() {
+    $('#print_options').dialog('close');
+
+    $('#printer_id').val($('#print_options_printer_id').val());
+    $('#action').val('MassInvoiceCreatePrint/print');
+
+    $('#report_form').submit();
+
+    return true;
+  };
+
+  this.resetSearchForm = function() {
+    $("#filter_table input").val("");
+  };
+});