OrderSprinter 1.1.8

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?v=1.1.7">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
  
 	<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?v=1.1.7">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

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?v=1.1.7">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
  
 	<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,8 +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?v=1.1.7">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
- <link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.1.7">
+ <link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.1.8">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

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.7</button>
+      	<button id="updatebtn">Update -> 1.1.8</button>
       	</td>
       	<td>&nbsp;</td>
     </tr>

webapp/install/installer.php

@@ -706,6 +706,18 @@ $ret &= $this->setVersion($prefix, '1.1.7');
 return $ret;
 }
 
+function updateUserTable1107_1108($prefix,$version) {
+$ret = true;
+if ($version != "1.1.7") {
+$ret = $this->updateUserTable1106_1107($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+$ret &= $this->setVersion($prefix, '1.1.8');
+return $ret;
+}
+
 function setVersion($prefix,$theVersion) {
 $pdo = $this->pdo;
 try {
@@ -777,7 +789,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.7')");
+$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.1.8')");
 $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')");
@@ -1149,7 +1161,7 @@ return;
 $supportedVersions = array("1.0.22","1.0.23","1.0.24","1.0.25","1.0.26","1.0.27","1.0.28","1.0.29",
 "1.0.30","1.0.31","1.0.32","1.0.33","1.0.34","1.0.35","1.0.36","1.0.37","1.0.38","1.0.39",
 "1.0.40",
-"1.1.0","1.1.1","1.1.2","1.1.3","1.1.4","1.1.5","1.1.6"
+"1.1.0","1.1.1","1.1.2","1.1.3","1.1.4","1.1.5","1.1.6","1.1.7"
 );
 
 if (!in_array($version, $supportedVersions)) {
@@ -1157,7 +1169,7 @@ echo json_encode("Quellversion nicht unterstützt");
 return;
 }
 
-$ret = $admin->updateUserTable1106_1107($_POST['prefix'], $version);
+$ret = $admin->updateUserTable1107_1108($_POST['prefix'], $version);
 
 if(session_id() == '') {
 session_start();

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?v=1.1.7">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

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?v=1.1.7">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
  
 	<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?v=1.1.7">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
 	<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

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

webapp/php/printqueue.php

@@ -353,7 +353,7 @@ class PrintQueue {
 	function getNextWorkPrintJobs($md5pass,$theType,$printer) {
 		$isCorrect = $this->isPasswordCorrect($md5pass,false);
 
-		if ($isCorrect || true) {
+		if ($isCorrect) {
 			$pdo = $this->dbutils->openDbAndReturnPdo();
 			
 			$bigFontWorkReceipt = $this->getBigFontWorkReceiptSetting($pdo);

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?v=1.1.7">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
  
 	<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?v=1.1.7">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
 	<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?v=1.1.7">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
 	<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?v=1.1.7">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
 	<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?v=1.1.7">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
 	<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?v=1.1.7">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
  
 	<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?v=1.1.7">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
@@ -34,6 +34,7 @@
 var W_TABLES = ["Tische","Tables","Mesas"];
 var W_ROOMS = ["Räume","Rooms","Espacios"];
 var W_SELECTION = ["Auswahl","Selection","Selección"];
+var W_LAST_SELECTED = ["zuletzt","last","seleccionado"];
 var W_FAVS = ["Favoriten","Favorites","Favoritos"];
 var W_NEW_ORDER = ["Neue Order","New Orders","Ordenes nuevas"];
 var W_KIT_BAR = ["nicht serviert/unbezahlt","unserved/unpaid","no servido/impagado"];
@@ -135,6 +136,8 @@ var tableListActive = false;
 
 var queueIdsOfTakeAway = [];
 
+var lastSelectedProduct = "";
+
 function toHtml(text) {
 	return (text.replace(/"/g, '&quot;').replace(/</g, "&lt;").replace(/>/g, "&gt;"));
 }
@@ -491,6 +494,8 @@ function addProductToQueue(productid,extras,changedPrice) {
 	
 	var prodprop = getProdProperties(productid);
 	var prodname = prodprop.name;
+	lastSelectedProduct = prodname;
+	$("#lastselectedprod").html(lastSelectedProdToStr());
 	var prodprice = prodprop.price;
 	var entry = {
 			name: prodname,
@@ -762,7 +767,7 @@ function insertTableList(roominfo) {
 }
 
 function initializeEverything() {
-    
+	lastSelectedProduct = "";
 	$(".modules").off("click").on("click", function (e) {
 		$("#menuswitch").trigger("mouseout");
 		e.stopImmediatePropagation();
@@ -848,6 +853,7 @@ function handleClickInTablemap(data) {
 
 // Now we prepare the second page (tables) for display
 $(document).on("pagebeforeshow", "#tables-page", function () {
+	lastSelectedProduct = "";
 	tableListActive = true;
 	if (nextPage == "") {
 		reloadPage();
@@ -1171,8 +1177,16 @@ function bindExtrasSel() {
 	});
 }
 
+function lastSelectedProdToStr() {
+	return " (" + W_LAST_SELECTED[lang] + ": " + lastSelectedProduct + ")";
+}
+
 function listOfTypesProds(ref) {
-	var li = "<li data-role=\"list-divider\" data-theme=\"b\" data-role=\"heading\" >" + W_SELECTION[lang] + '</li>';
+	var li = "<li data-role=\"list-divider\" data-theme=\"b\" data-role=\"heading\" >" + W_SELECTION[lang] + "<span id=lastselectedprod>";
+	if (lastSelectedProduct != "") {
+		li += lastSelectedProdToStr();
+	}
+	li += "</span></li>";
 
 	var prodtypes = $("#typprodpage").data("types_prods");
 	var size = getProdSizeClass();
@@ -1619,6 +1633,7 @@ function handleTestForLoggedIn(answer) {
 
 //Now we prepare the product page (level 0) for display
 $(document).on("pagebeforeshow", "#typprodpage", function () {
+	lastSelectedProduct = "";
 	tableListActive = false;
 	if (nextPage == "") {
 		reloadPage();
@@ -1671,6 +1686,7 @@ function bindSendNewOrdersButton() {
 	$("#sendorder_btn").off("click").on("click", function (e) {
 		e.stopImmediatePropagation();
 		e.preventDefault();
+		lastSelectedProduct = "";
 		if (extrasMenuOpen) {
 			alert(W_OPEN_PANEL[lang]);
 		} else {
@@ -1683,6 +1699,7 @@ function bindSendNewOrdersButton() {
 		$("#workprint_btn").off("click").on("click", function(e) {
 			e.stopImmediatePropagation();
 			e.preventDefault();
+			lastSelectedProduct = "";
 			if (extrasMenuOpen) {
 				alert(W_OPEN_PANEL[lang]);
 			} else {
@@ -1701,6 +1718,7 @@ function bindSendNewOrdersButton() {
 		$("#gopaydesk_btn").off("click").on("click", function(e) {
 			e.stopImmediatePropagation();
 			e.preventDefault();
+			lastSelectedProduct = "";
 			
 			if (neworders.length > 0) {
 				sendNewOrders(false,"s",goToPayDesk);