OrderSprinter 1.1.16

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.15">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.16">
  
 	<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.15">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.16">
  
 	<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.15">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.16">
  
 	<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.15">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.16">
- <link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.1.15">
+ <link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.1.16">
  
 	<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.15</button>
+      	<button id="updatebtn">Update -> 1.1.16</button>
       	</td>
       	<td>&nbsp;</td>
     </tr>

webapp/install/installer.php

@@ -856,6 +856,18 @@ $ret &= $this->setVersion($prefix, '1.1.15');
 return $ret;
 }
 
+function updateUserTable1115_1116($prefix,$version) {
+$ret = true;
+if ($version != "1.1.15") {
+$ret = $this->updateUserTable1114_1115($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+$ret &= $this->setVersion($prefix, '1.1.16');
+return $ret;
+}
+
 function setVersion($prefix,$theVersion) {
 $pdo = $this->pdo;
 try {
@@ -927,7 +939,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.15')");
+$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.1.16')");
 $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')");
@@ -1300,7 +1312,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.0.41","1.0.42","1.0.43",
-"1.1.0","1.1.1","1.1.2","1.1.3","1.1.4","1.1.5","1.1.6","1.1.7","1.1.8", "1.1.9","1.1.10","1.1.11","1.1.12","1.1.13","1.1.14"
+"1.1.0","1.1.1","1.1.2","1.1.3","1.1.4","1.1.5","1.1.6","1.1.7","1.1.8", "1.1.9","1.1.10","1.1.11","1.1.12","1.1.13","1.1.14","1.1.15"
 );
 
 if (!in_array($version, $supportedVersions)) {
@@ -1308,7 +1320,7 @@ echo json_encode("Quellversion nicht unterstützt");
 return;
 }
 
-$ret = $admin->updateUserTable1114_1115($_POST['prefix'], $version);
+$ret = $admin->updateUserTable1115_1116($_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.15">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.16">
  
 	<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.15">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.16">
  
 	<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.15">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.16">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
@@ -62,8 +62,8 @@ var P_ALL = ["Alles","All","Todo"];
 var P_CONTENT_RECEIPT = ["Inhalt Kassenbon","Content of receipt","Contenido del tique"];
 var P_ONLY_PAY = ["Nur Zahlung","Only pay","Solo pagar"];
 var P_PAY_PRINT = ["Bondruck","Pay+Print","Pagar+Imprimir"];
-var P_PAYWAY = ["Zahlungsart","Payment type","Modo de pago"];
+var P_CHANGE_CALC = ["Wechselgeldrechner:","Change Calculator:","Calculadora de Cambio:"];
-var P_CHOOSE_PAYWAY = ["Auswahl der Zahlungsart","Selection of method of payment","Selección del modo de pago"];
+var P_CHOOSE_PAYWAY = ["Auswahl der Zahlungsart:","Selection of method of payment:","Selección del modo de pago:"];
 var P_CANCEL = ["Abbrechen","Cancel","Cancelar"];
 var P_CASHTAKEOUT = ["Barentnahme aus der Kasse","Cash take-out","Sacar dinero"];
 var P_CASHTAKIN = ["Bareinlage in die Kasse","Cash insert","Insertar dinero"];
@@ -90,6 +90,7 @@ var P_PAY_RETURN = ["Zurück: ", "Return: ","Torna: "];
 var P_CALC_PAYBACK = ["Berechne","Calculate","Calcular"];
 var P_HAS_PAID = ["Bezahlt: ","Paid: ","Pagado: "];
 var P_TOGO = ["Außer-Haus-Verkauf","Sale with Tax No 2","Venta IVA 2"];
+var P_TIP = ["Trinkg.: ","Tip: ","Prop.: "];
 
 var lang = 0;
 var receiptfontsize = 12;
@@ -197,7 +198,7 @@ function setLanguage(language) {
 	$("#OnlyPayTxt").html(P_ONLY_PAY[lang]);
 	$("#payprinttxt").html(P_PAY_PRINT[lang]);
 	
-	$("#payway").html(P_PAYWAY[lang]);
+	$("#payway").html(P_CHANGE_CALC[lang]);
 	
 	$("#choosepayway").html(P_CHOOSE_PAYWAY[lang]);
 	$("#canceltxt").html(P_CANCEL[lang]);
@@ -223,6 +224,7 @@ function setLanguage(language) {
 	$("#calcreturn").html(P_CALC_PAYBACK[lang]);
 	$("#haspaidtxt").html(P_HAS_PAID[lang]);
 	$("#tableselimmaptxt").html(P_TABLE_SEL[lang]);
+	$("#tiptxt").html(P_TIP[lang]);
 }
 
 function getButtonSizes() {
@@ -923,6 +925,9 @@ function selectPayment(tableid,tablename,printoption) {
 		$("#haspaid").val("");
 		$("#topayback").html("0" + decpoint + "00");
 		
+		$("#tipfield").attr("placeholder", "0.00".replace(".",decpoint) + " " + currency);
+		$("#tipfield").val("");
+		
 		// start pay process by selection of payment types
 		$.mobile.changePage("#paymentdialog");
 		bindCalcReturn();
@@ -947,7 +952,15 @@ function bindCalcReturn() {
 		try {
 	 		var hasPaid = parseFloat($("#haspaid").val().replace(decpoint,"."));
 	 		var toPay = parseFloat($("#topayval").html().replace(decpoint,"."));
-	 		var toRet = hasPaid - toPay;
+	 		
+	 		var tip = $("#tipfield").val().trim();
+	 		if (tip == "") {
+	 			tip = 0.0;
+	 		} else {
+	 			tip = parseFloat(tip.replace(decpoint,"."));
+	 		}
+	 		
+	 		var toRet = hasPaid - (toPay + tip);
 	 		if ($.isNumeric(parseFloat(toRet))) {
 	 			var toReturn = toRet.toFixed(2).replace(".",decpoint);
 	 			$("#topayback").html(toReturn);
@@ -1307,19 +1320,23 @@ $(document).on("pageinit", "#info-page", function () {
     <p>
     	<div>
     		<form>
-	    		<table>
+	    		<table style="border: 1px solid black;">
 	    			<tr>
 	    				<td><span id=topaytxt>Zahlen: </span><td><i><b><span id=topayval>0,00</span></b></i><span id="curtopay"></span>
 	    				<td>&nbsp;<td><span id=haspaidtxt>Bezahlt: </span><td style="width:30px;color:yellow;"><input type="text" id="haspaid" value="" data-mini="true" placeholder="" />
 	    			</tr><tr>
-	    				<td><span id="rettxt">Zurück: </span><td><i><b><span id="topayback">0,00</span></b></i><span id=curtopay2></span></td>
+	    				<td><span id="rettxt">Zurück: </span><td><i><b><span id="topayback" style="background-color:#ffff99;">0,00</span></b></i><span id=curtopay2></span></td>
-	    				<td>&nbsp;<td><td><button id="calcreturnbtn" type="submit" data-theme="b" style="width:200px;"><span id="calcreturn">Berechne</span></button>
+	    				<td>&nbsp;<td><span id=tiptxt>Trinkg.: </span><td style="width:30px;color:yellow;"><input type="text" id="tipfield" value="" data-mini="true" placeholder="" />
+	    			</tr>
+	    			<tr>
+	    				<td colspan=4>
+	    				<td><button id="calcreturnbtn" type="submit" data-theme="b" style="width:200px;"><span id="calcreturn">Berechne</span></button>
 	    			</tr>
 	    		</table>
     		</form>
     	</div>
     </p>
-    <p><span id="choosepayway">Auswahl der Zahlungsart</span></p>
+    <p><b><span id="choosepayway">Auswahl der Zahlungsart</span></b></p>
 	    <div id=paymentlist>
 		    <a href="#" class="sure-do" data-role="button" data-theme="b" data-rel="back">Ja</a>
 	    </div>

webapp/php/admin.php

@@ -1108,19 +1108,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.15"); };
+				if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.1.16"); };
-				if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.15"); };
+				if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.16"); };
-				if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.15"); };
+				if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.16"); };
-				if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.15"); };
+				if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.16"); };
 				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.15"); };
+				if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.1.16"); };
-				if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.15"); };
+				if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.16"); };
-				if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.15");	};
+				if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.16");	};
-				if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.15"); };
+				if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.16"); };
-				if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.15"); };
+				if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.16"); };
-				if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.15"); };
+				if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.16"); };
-				$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.15");
+				$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.16");
-				$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.15");
+				$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.16");
 			}
 			
 			$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
@@ -1129,7 +1129,7 @@ class Admin {
 			$waiterMessage = $this->getMessage(null, "waitermessage");
 		}
 		// CAUTION: change version also in config.txt!!!
-		$mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.15", 
+		$mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.16", 
 				"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?v=1.1.15">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.16">
  
 	<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.15">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.16">
 	<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.15">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.16">
 	<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.15">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.16">
 	<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.15">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.16">
 	<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.15">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.16">
  
 	<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.15">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.16">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />