OrderSprinter 1.1.6

javaprinter/config.json

@@ -14,7 +14,7 @@
    "printfoodtickets2" : 1,
    "printdrinktickets2" : 1,
    "escinits" : [ 27, 64, 27, 116, 0 ],
-   "escposts" : [ 27,64,29,86,65,10],
+   "escposts" : [ 29, 86, 66, 10, 27, 64],
    "useeveryprintdevice" : 1,
    "verbose_closing_summary" : 1,
    "smallformat" : 0,

webapp/bar.html

@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

webapp/bill.html

@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

webapp/css/numfield.css

@@ -0,0 +1,30 @@
+@CHARSET "UTF-8";
+
+.numfield {
+	border-radius:25px;
+	background: #bbbbbb;
+	padding: 10px;
+	border-style: solid;
+	border-color: green;
+	width: 280px;
+	border-spacing: 5px;
+}
+
+.numfield td {
+	border-radius: 15px;
+	background: #eeeeee;
+	padding: 10px;
+	border-style: solid;
+	border-color: black;
+	font-size: 30px;
+	text-align: center;
+	color: black;
+}
+
+.numfield td:hover {
+	background: #999999;
+}
+
+.numfield td.numnav {
+	color:red;
+}

webapp/elements/product.js

@@ -5,7 +5,7 @@
 function createProdTableHeaderLine() {
 	var txt = "<tr><th>Name"
 				+ "<th>Typ&nbsp;&nbsp;"
-				+ "<th>Durchlauf Küche"
+				+ "<th>Durchlauf Küche"
 				+ "<th>Durchlauf Bereitst." +
 				+ "<th>Drucker" +
 				"<th id=shortnameheader class='prodheader'>Kurzname<th>Preis (A)" +
@@ -13,7 +13,7 @@ function createProdTableHeaderLine() {
 				"<th class='prodheader'>Preis (C)" +
 				"<th class='prodheader'>Steuersatz" +
 				"<th class='prodheader'>Audio" +
-				"<th class='prodheader'>Verfügbar";
+				"<th class='prodheader'>Verfügbar";
 	return txt;
 }
 

webapp/elements/tablemap.js

@@ -263,5 +263,5 @@ Tablemap.prototype.imgUploaded = function(text,instance) {
 }
 
 Tablemap.prototype.imgNotUploaded = function(text) {
-	alert("Bild konnte nicht hichgeladen werden. Ist es zu groß (> 1 MB)? Oder wurde der Dateiname nicht angegeben?");
+	alert("Bild konnte nicht hochgeladen werden. Ist es zu groß (> 1 MB)? Oder wurde der Dateiname nicht angegeben?");
 }

webapp/feedback.html

@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"> 
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

webapp/index.html

@@ -7,7 +7,8 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
+ <link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.1.6">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@@ -35,6 +36,7 @@ function fillUserList(userinfo) {
 	});
 	text += '</select>';
 	$("#userlist").html(text);
+	$("#passwordfield").val("");
 	$("#loginmask").trigger("create");
 }
 
@@ -106,6 +108,7 @@ function displayLoginOrLogoutMask(jsonContent) {
 	} else {
 		alert("Falsches Passwort?");
 		// user needs to log in!
+		$("#passwordfield").val("");
 		$("#logoutarea").hide();
 		$("#invalidusercredentials").popup( "open", {transition: 'flip'} );
 	}
@@ -137,6 +140,57 @@ function binding() {
 		e.preventDefault();
 		doLogout();
 	});
+	
+	
+	$(".numfield td").off("click").on("click", function (e) {
+		e.stopImmediatePropagation();
+		e.preventDefault();
+		
+		var val=$(this).html();
+		var classes = $(this).attr("class")
+		if (classes == "numnav") {
+			if (val == "1") {
+				showNumPanel();
+			} else if (val == "a") {
+				showCharPanelLower();
+			} else if (val == "#") {
+				showSpecialsPanel();
+			} else if (val == "abc") {
+				showCharPanelLower();
+			} else if (val == "ABC") {
+				showCharPanelUpper();
+			}
+		} else {
+			// REM* char input
+			var password = String($("#passwordfield").val());
+			$("#passwordfield").val(password + val);
+		}
+	});
+}
+
+function showNumPanel() {
+	$("#numfield_num").show();
+	$("#numfield_char_lower").hide();
+	$("#numfield_char_upper").hide();
+	$("#numfield_specials").hide();
+}
+function showCharPanelLower() {
+	$("#numfield_num").hide();
+	$("#numfield_char_lower").show();
+	$("#numfield_char_upper").hide();
+	$("#numfield_specials").hide();
+}
+function showCharPanelUpper() {
+	$("#numfield_num").hide();
+	$("#numfield_char_lower").hide();
+	$("#numfield_char_upper").show();
+	$("#numfield_specials").hide();
+}
+function showSpecialsPanel() {
+	$("#numfield_num").hide();
+	$("#numfield_char_lower").hide();
+	$("#numfield_char_upper").hide();
+	$("#numfield_specials").show();
 }
 
 function startInstallationOrUseIt() {
@@ -188,8 +242,49 @@ $(document).on("pageinit", "#index-page", function () {
 			<table border=0>
 			   <tr><td>Username: <td id="userlist"><tr>
 			   <tr><td>Passwort: <td><input type="password" name="password" id="passwordfield"/><tr />
-			   <tr><td colspan=2 align=center><input type="submit" value="Anmelden" id="loginbutton" data-theme="d"/></tr>
+			   
 		   </table>
+		   
+		   <table class=numfield id="numfield_num">
+		   	<tr><td>1<td>2<td>3</tr>
+		   	<tr><td>4<td>5<td>6</tr>
+		   	<tr><td>7<td>8<td>9</tr>
+		   	<tr><td>0<td class=numnav>a<td class=numnav>#</tr>
+		   </table>
+		   
+		   <table class=numfield id="numfield_char_lower" style="display:none;">
+		   	<tr><td>a<td>b<td>c<td>d</tr>
+		   	<tr><td>e<td>f<td>g<td>h</tr>
+		   	<tr><td>i<td>j<td>k<td>l</tr>
+		   	<tr><td>m<td>n<td>o<td>p</tr>
+		   	<tr><td>q<td>r<td>s<td>t</tr>
+		   	<tr><td>u<td>v<td>w<td>x</tr>
+		   	<tr><td>y<td>z<td class=numnav>1<td class=numnav>#</tr>
+		   	<tr><td colspan=4 class=numnav>ABC</tr>
+		   </table>
+		   
+		   <table class=numfield id="numfield_char_upper" style="display:none;">
+		   	<tr><td>A<td>B<td>C<td>D</tr>
+		   	<tr><td>E<td>F<td>G<td>H</tr>
+		   	<tr><td>I<td>J<td>K<td>L</tr>
+		   	<tr><td>M<td>N<td>O<td>P</tr>
+		   	<tr><td>Q<td>R<td>S<td>T</tr>
+		   	<tr><td>U<td>V<td>W<td>X</tr>
+		   	<tr><td>Y<td>Z<td class=numnav>1<td class=numnav>#</tr>
+		   	<tr><td colspan=4 class=numnav>abc</tr>
+		   </table>
+		   
+		   <table class=numfield id="numfield_specials" style="display:none;">
+		   	<tr><td>!<td>§<td>$<td>+</tr>
+		   	<tr><td>%<td>&<td>/<td>-</tr>
+		   	<tr><td>(<td>)<td>=<td>#</tr>
+		   	<tr><td>?<td>_<td class=numnav>1<td class=numnav>a</tr>
+		   </table>
+		   
+		   <table border=0 style="width:280px;">
+		   	<tr><td align=center><input type="submit" value="Anmelden" id="loginbutton" data-theme="d"/></tr>
+		   </table>
+		   
 		  </form>
 	</div>  <!--  Login-Maske -->  
   

webapp/install.html

@@ -679,7 +679,7 @@ $(document).ready(function() {
     <tr id=updateline>
     	<td>&nbsp;</td>
     	<td align=center>
-      	<button id="updatebtn">Update -> 1.1.5</button>
+      	<button id="updatebtn">Update -> 1.1.6</button>
       	</td>
       	<td>&nbsp;</td>
     </tr>

webapp/install/installer.php

@@ -617,6 +617,10 @@ return true;
 return false;
 }
 }
+function updateUserTable1105_1106($prefix) {
+return $this->setVersion($prefix, '1.1.6');
+}
+
 function setVersion($prefix,$theVersion) {
 $pdo = $this->pdo;
 try {
@@ -688,7 +692,7 @@ $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VAL
 $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'billlanguage', $billlanguage)");
 $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'currency', '$currency')");
 $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'receiptfontsize', '12')");
-$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.1.5')");
+$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.1.6')");
 $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'paymentconfig', '0')");
 $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'remoteaccesscode', null)");
 $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'decpoint', '$decpoint')");
@@ -1090,6 +1094,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if ($version == "1.0.14") {
 $ret &= $admin->updateUserTable1014_1015();
 $ret &= $admin->updateUserTable1015_1016();
@@ -1122,6 +1127,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if ($version == "1.0.15") {
 $ret &= $admin->updateUserTable1015_1016();
 $ret &= $admin->updateUserTable1016_1017();
@@ -1154,6 +1160,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if ($version == "1.0.16") {
 $ret &= $admin->updateUserTable1016_1017();
 $ret &= $admin->updateUserTable1017_1018();
@@ -1185,6 +1192,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.17") || ($version == "1.0.18")) {
 $ret &= $admin->updateUserTable1018_1019();
 $ret &= $admin->updateUserTable1019_1020();
@@ -1215,6 +1223,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if ($version == "1.0.19") {
 $ret &= $admin->updateUserTable1019_1020();
 $ret &= $admin->updateUserTable1022_1023($_POST['prefix']);
@@ -1244,6 +1253,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.20") || ($version == "1.0.21")) {
 // nothing to do... :) (but maybe user has pressed though)
 } else if (($version == "1.0.22")) {
@@ -1274,6 +1284,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.23")) {
 $ret &= $admin->updateUserTable1023_1024($_POST['prefix']);
 $ret &= $admin->updateUserTable1024_1025($_POST['prefix']);
@@ -1301,6 +1312,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.24")) {
 $ret &= $admin->updateUserTable1024_1025($_POST['prefix']);
 $ret &= $admin->updateUserTable1025_1026($_POST['prefix']);
@@ -1327,6 +1339,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.25")) {
 $ret &= $admin->updateUserTable1025_1026($_POST['prefix']);
 $ret &= $admin->updateUserTable1026_1027($_POST['prefix']);
@@ -1352,6 +1365,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.26")) {
 $ret &= $admin->updateUserTable1026_1027($_POST['prefix']);
 $ret &= $admin->updateUserTable1027_1028($_POST['prefix']);
@@ -1376,6 +1390,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.27")) {
 $ret &= $admin->updateUserTable1027_1028($_POST['prefix']);
 $ret &= $admin->updateUserTable1028_1029($_POST['prefix']);
@@ -1399,6 +1414,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.28")) {
 $ret &= $admin->updateUserTable1028_1029($_POST['prefix']);
 $ret &= $admin->updateUserTable1029_1030($_POST['prefix']);
@@ -1421,6 +1437,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.29")) {
 $ret &= $admin->updateUserTable1029_1030($_POST['prefix']);
 $ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
@@ -1442,6 +1459,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.30")) {
 $ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
 $ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
@@ -1462,6 +1480,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.31")) {
 $ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
 $ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
@@ -1481,6 +1500,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.32")) {
 $ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
 $ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
@@ -1499,6 +1519,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.33")) {
 $ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
 $ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
@@ -1516,6 +1537,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.34")) {
 $ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
 $ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
@@ -1532,6 +1554,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.35")) {
 $ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
 $ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
@@ -1547,6 +1570,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.36")) {
 $ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
 $ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
@@ -1561,6 +1585,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.37")) {
 $ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
 $ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
@@ -1574,6 +1599,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.38")) {
 $ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
 $ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
@@ -1586,6 +1612,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.39")) {
 $ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
 $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
@@ -1597,6 +1624,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.40")) {
 $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
 $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
@@ -1607,6 +1635,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.41")) {
 $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
 $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
@@ -1616,6 +1645,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.42")) {
 $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
 $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
@@ -1624,6 +1654,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.0.43")) {
 $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
 $ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
@@ -1631,26 +1662,34 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.1.0")) {
 $ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
 $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.1.1")) {
 $ret &= $admin->updateUserTable1101_1102($_POST['prefix']);
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.1.2")) {
 $ret &= $admin->updateUserTable1102_1103($_POST['prefix']);
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.1.3")) {
 $ret &= $admin->updateUserTable1103_1104($_POST['prefix']);
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else if (($version == "1.1.4")) {
 $ret &= $admin->updateUserTable1104_1105($_POST['prefix']);
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
+} else if (($version == "1.1.5")) {
+$ret &= $admin->updateUserTable1105_1106($_POST['prefix']);
 } else {
 echo json_encode("Quellversion nicht unterstützt");
 return;

webapp/kitchen.html

@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

webapp/kitchenbar.js

@@ -322,7 +322,7 @@ function getAndDisplayAllEntries()
 
 function getGeneralConfigItems() {
 	doAjax("GET", "php/contenthandler.php?module=admin&command=getGeneralConfigItems", null, insertGeneralConfigItems, "Fehler Konfigurationsdaten");
-	doAjax("GET","php/contenthandler.php?module=admin&command=getJsonMenuItemsAndVersion",null,setUser,"Benutzerdaten nicht übermittelt");
+	doAjax("GET","php/contenthandler.php?module=admin&command=getJsonMenuItemsAndVersion",null,setUser,"Benutzerdaten nicht übermittelt");
 }
 
 function setUser(userAndVersion) {
@@ -351,24 +351,10 @@ function insertGeneralConfigItems(configResult) {
 }
 
 function setWorkMode(urlsuffix) {
-	if (urlsuffix.length<=1) {
-		// no limitations - display all
 	displayWorkToDo = true;
 	displayFinished = true;
 	displayHeaderFooter = true;
-	} else {
+	return;
-		var modes = (urlsuffix.replace("?","")).split(",");
-		$("#hrline").hide();
-		if (modes.indexOf("toprepare") >= 0) { 
-			displayWorkToDo = true;
-		} 
-		if (modes.indexOf("finished") >= 0) {
-			displayFinished = true;
-		}
-		if (modes.indexOf("headerfooter") >= 0) { 
-			displayHeaderFooter = true;
-		}
-	}
 }
 
 /**

webapp/manager.html

@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

webapp/paydesk.html

@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   

webapp/php/admin.php

@@ -1074,19 +1074,19 @@ class Admin {
 			$right_rating = $_SESSION['right_rating'];
 			
 			if (!self::isOnlyRatingUser($rights, $right_rating, true)) {		
-				if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html"); };
+				if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.1.6"); };
-				if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html"); };
+				if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.6"); };
-				if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html"); };
+				if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.6"); };
-				if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html"); };
+				if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.6"); };
 				if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html"); };
-				if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html"); };
+				if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.1.6"); };
-				if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html"); };
+				if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.6"); };
-				if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html");	};
+				if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.6");	};
-				if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html"); };
+				if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.6"); };
-				if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html"); };
+				if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.6"); };
-				if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html"); };
+				if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.6"); };
-				$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html");
+				$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.6");
-				$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html");
+				$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.6");
 			}
 			
 			$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
@@ -1095,7 +1095,7 @@ class Admin {
 			$waiterMessage = $this->getMessage(null, "waitermessage");
 		}
 		// CAUTION: change version also in config.txt!!!
-		$mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.5", 
+		$mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.6", 
 				"user" => $currentUser, 
 				"menu" => $mainMenu, 
 				"waitermessage" => $waiterMessage,

webapp/preferences.html

@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

webapp/products.html

@@ -7,7 +7,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   

webapp/rating.html

@@ -7,7 +7,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   

webapp/reports.html

@@ -7,7 +7,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   

webapp/reservation.html

@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"> 
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   

webapp/supplydesk.html

@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

webapp/waiter.html

@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"> 
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
     <meta name="author" content="Stefan Pichel">
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.6">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />