Fix Javascripts for orders

doc/resources/javascript/bcreader.js

@@ -1,4 +1,4 @@
-function bc_read(bc_comport, bc_noconnection, bc_nocode)
+require(["dojo/domReady!"], function bc_read(bc_comport, bc_noconnection, bc_nocode)
 {
   var data = new Object();
   var BCReader = dojo.byId('BCReader');
@@ -20,13 +20,13 @@ function bc_read(bc_comport, bc_noconnection, bc_nocode)
   {
     return bc_try_or_select(bc_comport, data);
   }
-}
+});
 
-function bc_select_and_try(bc_comport, data)
+require(["dojo/domReady!"], function bc_select_and_try(bc_comport, data)
 {
   var port_selected;
   port_selected = BCReader.SelectCom();
-  if(port_selected < 0) 
+  if(port_selected < 0)
     return false;
   else
     bc_comport.value = port_selected;
@@ -39,19 +39,19 @@ function bc_select_and_try(bc_comport, data)
     alert(data['fail'])
     return false;
   }
-}
+});
 
-function bc_try_or_select(bc_comport, data)
+require(["dojo/domReady!"], function bc_try_or_select(bc_comport, data)
 {
   return bc_try(bc_comport, data) || bc_select_and_try(bc_comport, data);
-}
+});
 
-function bc_try(bc_comport, data)
+require(["dojo/domReady!"], function bc_try(bc_comport, data)
 {
   var numCodes = -1;
   BCReader.SetCom(bc_comport.value)
-  if(!BCReader.Init()) 
-  {  
+  if(!BCReader.Init())
+  {
     bc_comport.value = -1;
     return false;
   }
@@ -89,18 +89,18 @@ function bc_try(bc_comport, data)
       }
     }
     BCReader.Exit();
-    bc_send(BarCodes);    
+    bc_send(BarCodes);
   }
   return true;
-}
+});
 
 // this function is testable even if there is no Barcode-Reader
-function bc_send(BarCodes)
+require(["dojo/domReady!"], function bc_send(BarCodes)
 {
   BarCodes["event"] = 'scan';
   var form = document.createElement( "form" );
   form.method = 'POST';
-  form.action = '/index.rbx'; 
+  form.action = '/index.rbx';
   for(fname in BarCodes)
   {
     var input = document.createElement( "input" );
@@ -119,13 +119,13 @@ function bc_send(BarCodes)
     },
     mimetype: "text/json"
   });
-}
+});
 
-function bc_clear()
+require(["dojo/domReady!"], function bc_clear()
 {
   if(BCReader.Init())
   {
     BCReader.Clear();
     BCReader.Exit();
   }
-}
+});

doc/resources/javascript/order.js

@@ -1,7 +1,7 @@
-function delete_position(url, evt, id)
+require(["dojo/domReady!"], function delete_position(url, evt, id)
 {
   var form = document.createElement( "form" );
-  form.action = url; 
+  form.action = url;
   form.style.display = 'none';
   form.method = 'POST'
   var data = {
@@ -17,49 +17,48 @@ function delete_position(url, evt, id)
   }
   document.body.appendChild(form);
   form.submit();
-}
+});
 
-function update_order_callback(data)
+require(["dojo/domReady!"], function update_order_callback(data)
 {
-	var name, input, value;
-	for(name in data)
-	{
-		if(input = dojo.byId(name))
-		{
-			value = data[name];
-			if(input.tagName == 'SPAN')
-			{
-				input.innerHTML = value;	
-			}
-			else
-			{
-				input.value = value;
-			}
-		}
-	}
-}
-
-function update_order(url, form)
+  var name, input, value;
+  for(name in data)
+  {
+    if(input = dojo.byId(name))
+    {
+        value = data[name];
+        if(input.tagName == 'SPAN')
+        {
+            input.innerHTML = value;
+        }
+        else
+        {
+            input.value = value;
+        }
+      }
+    }
+});
+require(["dojo/domReady!"], function update_order(url, form)
 {
   var event = form.event.value;
   form.event.value = 'ajax';
-	dojo.io.bind({
+    dojo.io.bind({
     encoding: "utf-8",
     url: url,
-		formNode: form,
-		load: function(type, data) { update_order_callback(data); },
-		mimetype: "text/json"
-	});
+        formNode: form,
+        load: function(type, data) { update_order_callback(data); },
+        mimetype: "text/json"
+    });
   form.event.value = event;
-}
+});
 
-function zeroise(form) 
+require(["dojo/domReady!"], function zeroise(form)
 {
-  for(name in form.elements) { 
+  for(name in form.elements) {
     var node = form[name];
     if(node && typeof(node) == 'object' && node.tagName == 'INPUT' && node.type == 'text') {
-      node.value = '0'; 
+      node.value = '0';
     }
 
   }
-}
+});

manual_test.md

@@ -34,6 +34,9 @@ After selecting abmelden the link "Abmelden" should no longer appear.
 **** when clicking on numerical value of Umsatz you see a list of orders.
 **** Click on an order and you must see the items orders with name, list price, effective price, total, MWSt
 *** Submit an order
+**** Check that it landed in directory specified via the order_destinations in etc/config.yml, eg. via
+     order_destinations:
+        - "file:///var/www/virbac.bbmb.ch/order_destinations"
 ** Search via name/id/address should work
 ** Changing the language to french and back should work
 ** Select a user and