Auftrags-Controller: per js prüfen, ob Kunde oder Lieferant angegeben ist.

diff --git a/templates/webpages/order/form.html b/templates/webpages/order/form.html
index 31a4dc019fb377d6fead26eba1697df43ca67eeb..bba8503b1452226686d88d19f289040394a66295 100644 (file)
--- a/templates/webpages/order/form.html
+++ b/templates/webpages/order/form.html
@@ -41,6 +41,7 @@
 <script type='text/javascript'>
 
 function save() {
 <script type='text/javascript'>
 
 function save() {

+  if (!check_cv()) return;

   var data = $('#order_form').serialize();
   data += '&action=Order/save';
 
   var data = $('#order_form').serialize();
   data += '&action=Order/save';
 


@@ -48,6 +49,7 @@ function save() {
 }
 
 function create_pdf() {
 }
 
 function create_pdf() {

+  if (!check_cv()) return;

   var data = $('#order_form').serialize();
   data += '&action=Order/create_pdf';
 
   var data = $('#order_form').serialize();
   data += '&action=Order/create_pdf';
 


@@ -63,6 +65,7 @@ function download_pdf(pdf_filename, key) {
 }
 
 function email() {
 }
 
 function email() {

+  if (!check_cv()) return;

   var data = $('#order_form').serialize();
   data += '&action=Order/show_email_dialog';
 
   var data = $('#order_form').serialize();
   data += '&action=Order/show_email_dialog';
 


@@ -70,10 +73,18 @@ function email() {
 }
 
 function save_and_delivery_order() {
 }
 
 function save_and_delivery_order() {

+  if (!check_cv()) return;

   var data = $('#order_form').serialize();
   data += '&action=Order/save_and_delivery_order';
 
   $.post("controller.pl", data, kivi.eval_json_result);
 }
 
   var data = $('#order_form').serialize();
   data += '&action=Order/save_and_delivery_order';
 
   $.post("controller.pl", data, kivi.eval_json_result);
 }
 

+function check_cv() {
+  if ($('#order_[%- cv_id %]').val() == '') {
+    alert(kivi.t8('Please select a [%- SELF.cv %].'));
+    return false;
+  }
+  return true;
+}

 </script>
 </script>

diff --git a/templates/webpages/order/tabs/basic_data.html b/templates/webpages/order/tabs/basic_data.html
index 26962e45ff078742a1c95ed21b63a9a86b2f339a..aa39b2421f38a43d20764fcc684c66a2c2198d6d 100644 (file)
--- a/templates/webpages/order/tabs/basic_data.html
+++ b/templates/webpages/order/tabs/basic_data.html
@@ -252,6 +252,7 @@ function reload_cv_dependend_selections() {
 
 function add_item() {
   if ($('#add_item_parts_id').val() == '') return;
 
 function add_item() {
   if ($('#add_item_parts_id').val() == '') return;

+  if (!check_cv()) return;

 
   var data = $('#order_form').serialize();
   data += '&action=Order/add_item';
 
   var data = $('#order_form').serialize();
   data += '&action=Order/add_item';