genofire
/
ordersprinter
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OrderSprinter 1.1.1

This commit is contained in:
Geno 2020-11-19 22:48:24 +01:00
parent 453427da71
commit cac002e113
28 changed files with 306 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
javaprinter/javaprinter.jar
View File

Binary file not shown.

BIN
printserver/OrderSprinterPrintserver.exe Normal file → Executable file
View File

Binary file not shown.

BIN
webapp/OrderSprinterPrintserver.exe Normal file → Executable file
View File

Binary file not shown.

1
webapp/bar.html
View File

@ -3,6 +3,7 @@
<title>Ansicht Bar</title> <title>Ansicht Bar</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-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">

1
webapp/bill.html
View File

@ -3,6 +3,7 @@
<title>Ansicht Kassenbons</title> <title>Ansicht Kassenbons</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-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">

1
webapp/index.html
View File

@ -5,6 +5,7 @@
<title>OrderSprinter Startseite</title> <title>OrderSprinter Startseite</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-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">

3
webapp/install.html
View File

@ -2,6 +2,7 @@
<html> <html>
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="author" content="Stefan Pichel">
<title>Setup</title> <title>Setup</title>
<link rel="stylesheet" type="text/css" href="css/bestformat.css"> <link rel="stylesheet" type="text/css" href="css/bestformat.css">
<script src="php/3rdparty/jquery-2.0.3.min.js"></script> <script src="php/3rdparty/jquery-2.0.3.min.js"></script>
@ -678,7 +679,7 @@ $(document).ready(function() {
<tr id=updateline> <tr id=updateline>
<td>&nbsp;</td> <td>&nbsp;</td>
<td align=center> <td align=center>
<button id="updatebtn">Update -> 1.1.0</button> <button id="updatebtn">Update -> 1.1.1</button>
</td> </td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>

62
webapp/install/installer.php
View File

@ -532,6 +532,35 @@ function updateUserTable1043_1100($prefix) {
return $this->setVersion($prefix, '1.1.0'); return $this->setVersion($prefix, '1.1.0');
} }
function updateUserTable1100_1101($prefix) {
$pdo = $this->pdo;
try {
$adminCl = new Admin();
DbUtils::overrulePrefix($prefix);
$sql = "ALTER TABLE %user% ADD keeptypelevel INT(1) NULL AFTER prefertablemap";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
$stmt->execute();
$sql = "UPDATE %user% SET keeptypelevel=?";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
$stmt->execute(array(1));
$sql = "ALTER TABLE %user% MODIFY keeptypelevel INT(1) NOT NULL";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
$stmt->execute();
$sql = "INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL,?,?)";
$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($sql));
$stmt->execute(array('bigfontworkreceipt','0'));
$this->updateVersion($pdo, '1.1.1');
return true;
} catch (PDOException $e) {
return false;
}
}
function setVersion($prefix,$theVersion) { function setVersion($prefix,$theVersion) {
$pdo = $this->pdo; $pdo = $this->pdo;
try { try {
@ -603,13 +632,14 @@ $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 , '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 , '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 , 'receiptfontsize', '12')");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.1.0')"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.1.1')");
$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 , '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 , 'remoteaccesscode', null)");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'decpoint', '$decpoint')"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'decpoint', '$decpoint')");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'timezone', '$timezone')"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'timezone', '$timezone')");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'webimpressum', 'Musterrestaurant\nBeispielstrasse 123\n12345 Musterort')"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'webimpressum', 'Musterrestaurant\nBeispielstrasse 123\n12345 Musterort')");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'cancelunpaidcode', '')"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'cancelunpaidcode', '')");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'bigfontworkreceipt', '0')");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'smtphost', '')"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'smtphost', '')");
$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'smtpauth', '1')"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'smtpauth', '1')");
@ -975,6 +1005,7 @@ $ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if ($version == "1.0.14") { } else if ($version == "1.0.14") {
$ret &= $admin->updateUserTable1014_1015(); $ret &= $admin->updateUserTable1014_1015();
$ret &= $admin->updateUserTable1015_1016(); $ret &= $admin->updateUserTable1015_1016();
@ -1002,6 +1033,7 @@ $ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
$ret &= $admin->updateUserTable1040_1041($_POST['prefix']); $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if ($version == "1.0.15") { } else if ($version == "1.0.15") {
$ret &= $admin->updateUserTable1015_1016(); $ret &= $admin->updateUserTable1015_1016();
$ret &= $admin->updateUserTable1016_1017(); $ret &= $admin->updateUserTable1016_1017();
@ -1029,6 +1061,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if ($version == "1.0.16") { } else if ($version == "1.0.16") {
$ret &= $admin->updateUserTable1016_1017(); $ret &= $admin->updateUserTable1016_1017();
$ret &= $admin->updateUserTable1017_1018(); $ret &= $admin->updateUserTable1017_1018();
@ -1055,6 +1088,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.17") || ($version == "1.0.18")) { } else if (($version == "1.0.17") || ($version == "1.0.18")) {
$ret &= $admin->updateUserTable1018_1019(); $ret &= $admin->updateUserTable1018_1019();
$ret &= $admin->updateUserTable1019_1020(); $ret &= $admin->updateUserTable1019_1020();
@ -1080,6 +1114,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if ($version == "1.0.19") { } else if ($version == "1.0.19") {
$ret &= $admin->updateUserTable1019_1020(); $ret &= $admin->updateUserTable1019_1020();
$ret &= $admin->updateUserTable1022_1023($_POST['prefix']); $ret &= $admin->updateUserTable1022_1023($_POST['prefix']);
@ -1104,6 +1139,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.20") || ($version == "1.0.21")) { } else if (($version == "1.0.20") || ($version == "1.0.21")) {
// nothing to do... :) (but maybe user has pressed though) // nothing to do... :) (but maybe user has pressed though)
} else if (($version == "1.0.22")) { } else if (($version == "1.0.22")) {
@ -1129,6 +1165,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.23")) { } else if (($version == "1.0.23")) {
$ret &= $admin->updateUserTable1023_1024($_POST['prefix']); $ret &= $admin->updateUserTable1023_1024($_POST['prefix']);
$ret &= $admin->updateUserTable1024_1025($_POST['prefix']); $ret &= $admin->updateUserTable1024_1025($_POST['prefix']);
@ -1151,6 +1188,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.24")) { } else if (($version == "1.0.24")) {
$ret &= $admin->updateUserTable1024_1025($_POST['prefix']); $ret &= $admin->updateUserTable1024_1025($_POST['prefix']);
$ret &= $admin->updateUserTable1025_1026($_POST['prefix']); $ret &= $admin->updateUserTable1025_1026($_POST['prefix']);
@ -1172,6 +1210,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.25")) { } else if (($version == "1.0.25")) {
$ret &= $admin->updateUserTable1025_1026($_POST['prefix']); $ret &= $admin->updateUserTable1025_1026($_POST['prefix']);
$ret &= $admin->updateUserTable1026_1027($_POST['prefix']); $ret &= $admin->updateUserTable1026_1027($_POST['prefix']);
@ -1192,6 +1231,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.26")) { } else if (($version == "1.0.26")) {
$ret &= $admin->updateUserTable1026_1027($_POST['prefix']); $ret &= $admin->updateUserTable1026_1027($_POST['prefix']);
$ret &= $admin->updateUserTable1027_1028($_POST['prefix']); $ret &= $admin->updateUserTable1027_1028($_POST['prefix']);
@ -1211,6 +1251,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.27")) { } else if (($version == "1.0.27")) {
$ret &= $admin->updateUserTable1027_1028($_POST['prefix']); $ret &= $admin->updateUserTable1027_1028($_POST['prefix']);
$ret &= $admin->updateUserTable1028_1029($_POST['prefix']); $ret &= $admin->updateUserTable1028_1029($_POST['prefix']);
@ -1229,6 +1270,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.28")) { } else if (($version == "1.0.28")) {
$ret &= $admin->updateUserTable1028_1029($_POST['prefix']); $ret &= $admin->updateUserTable1028_1029($_POST['prefix']);
$ret &= $admin->updateUserTable1029_1030($_POST['prefix']); $ret &= $admin->updateUserTable1029_1030($_POST['prefix']);
@ -1246,6 +1288,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.29")) { } else if (($version == "1.0.29")) {
$ret &= $admin->updateUserTable1029_1030($_POST['prefix']); $ret &= $admin->updateUserTable1029_1030($_POST['prefix']);
$ret &= $admin->updateUserTable1030_1031($_POST['prefix']); $ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
@ -1262,6 +1305,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.30")) { } else if (($version == "1.0.30")) {
$ret &= $admin->updateUserTable1030_1031($_POST['prefix']); $ret &= $admin->updateUserTable1030_1031($_POST['prefix']);
$ret &= $admin->updateUserTable1031_1032($_POST['prefix']); $ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
@ -1277,6 +1321,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.31")) { } else if (($version == "1.0.31")) {
$ret &= $admin->updateUserTable1031_1032($_POST['prefix']); $ret &= $admin->updateUserTable1031_1032($_POST['prefix']);
$ret &= $admin->updateUserTable1032_1033($_POST['prefix']); $ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
@ -1291,6 +1336,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.32")) { } else if (($version == "1.0.32")) {
$ret &= $admin->updateUserTable1032_1033($_POST['prefix']); $ret &= $admin->updateUserTable1032_1033($_POST['prefix']);
$ret &= $admin->updateUserTable1033_1034($_POST['prefix']); $ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
@ -1304,6 +1350,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.33")) { } else if (($version == "1.0.33")) {
$ret &= $admin->updateUserTable1033_1034($_POST['prefix']); $ret &= $admin->updateUserTable1033_1034($_POST['prefix']);
$ret &= $admin->updateUserTable1034_1035($_POST['prefix']); $ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
@ -1316,6 +1363,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.34")) { } else if (($version == "1.0.34")) {
$ret &= $admin->updateUserTable1034_1035($_POST['prefix']); $ret &= $admin->updateUserTable1034_1035($_POST['prefix']);
$ret &= $admin->updateUserTable1035_1036($_POST['prefix']); $ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
@ -1327,6 +1375,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.35")) { } else if (($version == "1.0.35")) {
$ret &= $admin->updateUserTable1035_1036($_POST['prefix']); $ret &= $admin->updateUserTable1035_1036($_POST['prefix']);
$ret &= $admin->updateUserTable1036_1037($_POST['prefix']); $ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
@ -1337,6 +1386,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.36")) { } else if (($version == "1.0.36")) {
$ret &= $admin->updateUserTable1036_1037($_POST['prefix']); $ret &= $admin->updateUserTable1036_1037($_POST['prefix']);
$ret &= $admin->updateUserTable1037_1038($_POST['prefix']); $ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
@ -1346,6 +1396,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.37")) { } else if (($version == "1.0.37")) {
$ret &= $admin->updateUserTable1037_1038($_POST['prefix']); $ret &= $admin->updateUserTable1037_1038($_POST['prefix']);
$ret &= $admin->updateUserTable1038_1039($_POST['prefix']); $ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
@ -1354,6 +1405,7 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.38")) { } else if (($version == "1.0.38")) {
$ret &= $admin->updateUserTable1038_1039($_POST['prefix']); $ret &= $admin->updateUserTable1038_1039($_POST['prefix']);
$ret &= $admin->updateUserTable1039_1040($_POST['prefix']); $ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
@ -1361,26 +1413,34 @@ $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.39")) { } else if (($version == "1.0.39")) {
$ret &= $admin->updateUserTable1039_1040($_POST['prefix']); $ret &= $admin->updateUserTable1039_1040($_POST['prefix']);
$ret &= $admin->updateUserTable1040_1041($_POST['prefix']); $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.40")) { } else if (($version == "1.0.40")) {
$ret &= $admin->updateUserTable1040_1041($_POST['prefix']); $ret &= $admin->updateUserTable1040_1041($_POST['prefix']);
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.41")) { } else if (($version == "1.0.41")) {
$ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']);
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.42")) { } else if (($version == "1.0.42")) {
$ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']);
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.0.43")) { } else if (($version == "1.0.43")) {
$ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']);
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else if (($version == "1.1.0")) {
$ret &= $admin->updateUserTable1100_1101($_POST['prefix']);
} else { } else {
echo json_encode("Quellversion nicht unterstützt"); echo json_encode("Quellversion nicht unterstützt");
return; return;

1
webapp/kitchen.html
View File

@ -3,6 +3,7 @@
<title>Ansicht Kueche</title> <title>Ansicht Kueche</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-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">

30
webapp/manager.html
View File

@ -3,6 +3,7 @@
<title>Ansicht Verwaltungs</title> <title>Ansicht Verwaltungs</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-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">
@ -10,8 +11,8 @@
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" /> <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-2.0.3.min.js"></script> <script src="php/3rdparty/jquery-1.11.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="utilities.js"></script> <script src="utilities.js"></script>
<script src="elements/tablemap.js"></script> <script src="elements/tablemap.js"></script>
<script src="elements/roommap.js"></script> <script src="elements/roommap.js"></script>
@ -128,6 +129,7 @@ var MAN_TABLE_LABEL = ["Tische","Tables","Mesas"];
var MAN_LANG_OF_RECEIPT = ["Bonsprache","Receipt language","Idioma de tique"]; var MAN_LANG_OF_RECEIPT = ["Bonsprache","Receipt language","Idioma de tique"];
var MAN_PRINT_CONCEPT = ["Druckkonzept","Print concept","Concepto de impresión"]; var MAN_PRINT_CONCEPT = ["Druckkonzept","Print concept","Concepto de impresión"];
var MAN_PAYMENT_CONFIG = ["Menü Zahlungsweg","Menu Payment Type","Selección tipo de pagar"]; var MAN_PAYMENT_CONFIG = ["Menü Zahlungsweg","Menu Payment Type","Selección tipo de pagar"];
var MAN_WORKFONT_CONFIG = ["Arbeitsbon Schriftgröße","Font size work receipt","Tamaño de letras en tiques de trabajo"];
var MAN_RES_NOTE = ["Reservierungsbestätigung","Confirmation reservation","Text de email para reservación"]; var MAN_RES_NOTE = ["Reservierungsbestätigung","Confirmation reservation","Text de email para reservación"];
var MAN_CHANGE_CONFIG_HEAD = ["Konfiguration ändern?","Change configuration?","Modificar configuración?"]; var MAN_CHANGE_CONFIG_HEAD = ["Konfiguration ändern?","Change configuration?","Modificar configuración?"];
var MAN_CHANGE_CONFIG_CONTENT = ["Sollen folgende Werte geändert werden? ","Do you want to change these values? ","Debe ser cambiado estos datos? "]; var MAN_CHANGE_CONFIG_CONTENT = ["Sollen folgende Werte geändert werden? ","Do you want to change these values? ","Debe ser cambiado estos datos? "];
@ -225,8 +227,11 @@ var MAN_ROOM_PRINTER_1 = ["Drucker 1","Printer 1","Imprimadora 1"];
var MAN_ROOM_PRINTER_2 = ["Drucker 2","Printer 2","Imprimadora 2"]; var MAN_ROOM_PRINTER_2 = ["Drucker 2","Printer 2","Imprimadora 2"];
var MAN_ROOM_PRINTER_TXT = ["Arbeitsdrucker","Work printer","Imprimadora de trabajo"]; var MAN_ROOM_PRINTER_TXT = ["Arbeitsdrucker","Work printer","Imprimadora de trabajo"];
var MAN_SIZE_NORMAL = ["normal","normal","normal"];
var MAN_SIZE_BIG = ["groß","big","grande"];
var lang = 0; var lang = 0;
var generalVals = [12,2,0,3,0,1,1]; var generalVals = [12,2,0,3,0,1,1,0];
var numberOfClosings = 0; var numberOfClosings = 0;
@ -243,6 +248,7 @@ var generalValuesSettings = [
["receiveremail","Empfänger-Emailadresse","i",0], ["receiveremail","Empfänger-Emailadresse","i",0],
["payprinttype",MAN_PRINT_CONCEPT[lang],"s",1], ["payprinttype",MAN_PRINT_CONCEPT[lang],"s",1],
["paymentconfig",MAN_PAYMENT_CONFIG[lang],"s",3], ["paymentconfig",MAN_PAYMENT_CONFIG[lang],"s",3],
["bigfontworkreceipt",MAN_WORKFONT_CONFIG[lang],"s",7],
["workflowconfig",MAN_WORKFLOW[lang],"s",4], ["workflowconfig",MAN_WORKFLOW[lang],"s",4],
["receiptfontsize",MAN_RECEIPT_FONTSIZE[lang],"s",0], ["receiptfontsize",MAN_RECEIPT_FONTSIZE[lang],"s",0],
["billlanguage",MAN_LANG_OF_RECEIPT[lang],"s",2], ["billlanguage",MAN_LANG_OF_RECEIPT[lang],"s",2],
@ -420,6 +426,7 @@ function insertGeneralConfigItems(configResult) {
$("#partOfPayPrintType").html(createPayPrintTypePart(payPrintType)); $("#partOfPayPrintType").html(createPayPrintTypePart(payPrintType));
$("#partOfPaymentConfig").html(createPaymentConfigPart(values.paymentconfig)); $("#partOfPaymentConfig").html(createPaymentConfigPart(values.paymentconfig));
$("#partOfWorkflowConfig").html(createWorkflowConfigPart(values.workflowconfig)); $("#partOfWorkflowConfig").html(createWorkflowConfigPart(values.workflowconfig));
$("#partOfBigFontWorkReceipt").html(createBigFontWorkReceiptPart(values.bigfontworkreceipt));
var language = values.billlanguage; var language = values.billlanguage;
generalVals[2] = language; generalVals[2] = language;
$("#partOfBillLanguage").html(createBillLanguagePart(language)); $("#partOfBillLanguage").html(createBillLanguagePart(language));
@ -442,6 +449,7 @@ function insertGeneralConfigItems(configResult) {
generalVals[5] = values.smtpauth; generalVals[5] = values.smtpauth;
generalVals[6] = values.smtpsecure; generalVals[6] = values.smtpsecure;
generalVals[7] = values.bigfontworkreceipt;
$("#smtphost").val(values.smtphost); $("#smtphost").val(values.smtphost);
$("#partOfSmtpauth").html(createSMTPAuth(values.smtpauth)); $("#partOfSmtpauth").html(createSMTPAuth(values.smtpauth));
@ -501,6 +509,21 @@ function createPaymentConfigPart(payment) {
return html; return html;
} }
function createBigFontWorkReceiptPart(theValue) {
var html = '<div class="ui-field-contain">';
html += '<label for="bigfontworkreceipt">' + MAN_WORKFONT_CONFIG[lang] + ':</label>';
html += '<select name="bigfontworkreceipt" id="bigfontworkreceipt" data-theme="e">';
if (theValue == 0) {
html += '<option value="0" selected>' + MAN_SIZE_NORMAL[lang] + '</option>';
html += '<option value="1">' + MAN_SIZE_BIG[lang] + '</option>';
} else {
html += '<option value="0">' + MAN_SIZE_NORMAL[lang] + '</option>';
html += '<option value="1" selected>' + MAN_SIZE_BIG[lang] + '</option>';
}
html += '</select></div>';
return html;
}
function createWorkflowConfigPart(workflow) { function createWorkflowConfigPart(workflow) {
var html = '<div class="ui-field-contain">'; var html = '<div class="ui-field-contain">';
html += '<label for="workflowconfig">' + MAN_WORKFLOW[lang] + ':</label>'; html += '<label for="workflowconfig">' + MAN_WORKFLOW[lang] + ':</label>';
@ -1945,6 +1968,7 @@ $(document).on("pageinit", "#admin-page", function () {
<div id="partOfReceiptFontSize"></div> <div id="partOfReceiptFontSize"></div>
<div id="partOfPaymentConfig"></div> <div id="partOfPaymentConfig"></div>
<div id="partOfWorkflowConfig"></div> <div id="partOfWorkflowConfig"></div>
<div id="partOfBigFontWorkReceipt"></div>
<button type="submit" data-theme="f" data-icon="check" id="changeConfig">Ändern</button> <button type="submit" data-theme="f" data-icon="check" id="changeConfig">Ändern</button>
</form><!-- Konfiguration --> </form><!-- Konfiguration -->

1
webapp/paydesk.html
View File

@ -3,6 +3,7 @@
<title>Ansicht Kasse</title> <title>Ansicht Kasse</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-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">
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />

7
webapp/php/3rdparty/jqueryui1-11-4/jquery-ui-i18n.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

7
webapp/php/3rdparty/jqueryui1-11-4/jquery-ui.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

7
webapp/php/3rdparty/jqueryui1-11-4/jquery-ui.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

5
webapp/php/3rdparty/jqueryui1-11-4/jquery-ui.structure.min.css vendored Normal file
View File

@ -0,0 +1,5 @@
/*! jQuery UI - v1.11.4 - 2015-12-22
* http://jqueryui.com
* Copyright jQuery Foundation and other contributors; Licensed MIT */
.ui-helper-hidden{display:none}.ui-helper-hidden-accessible{border:0;clip:rect(0 0 0 0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.ui-helper-reset{margin:0;padding:0;border:0;outline:0;line-height:1.3;text-decoration:none;font-size:100%;list-style:none}.ui-helper-clearfix:before,.ui-helper-clearfix:after{content:"";display:table;border-collapse:collapse}.ui-helper-clearfix:after{clear:both}.ui-helper-clearfix{min-height:0}.ui-helper-zfix{width:100%;height:100%;top:0;left:0;position:absolute;opacity:0;filter:Alpha(Opacity=0)}.ui-front{z-index:100}.ui-state-disabled{cursor:default!important}.ui-icon{display:block;text-indent:-99999px;overflow:hidden;background-repeat:no-repeat}.ui-widget-overlay{position:fixed;top:0;left:0;width:100%;height:100%}.ui-datepicker{width:17em;padding:.2em .2em 0;display:none}.ui-datepicker .ui-datepicker-header{position:relative;padding:.2em 0}.ui-datepicker .ui-datepicker-prev,.ui-datepicker .ui-datepicker-next{position:absolute;top:2px;width:1.8em;height:1.8em}.ui-datepicker .ui-datepicker-prev-hover,.ui-datepicker .ui-datepicker-next-hover{top:1px}.ui-datepicker .ui-datepicker-prev{left:2px}.ui-datepicker .ui-datepicker-next{right:2px}.ui-datepicker .ui-datepicker-prev-hover{left:1px}.ui-datepicker .ui-datepicker-next-hover{right:1px}.ui-datepicker .ui-datepicker-prev span,.ui-datepicker .ui-datepicker-next span{display:block;position:absolute;left:50%;margin-left:-8px;top:50%;margin-top:-8px}.ui-datepicker .ui-datepicker-title{margin:0 2.3em;line-height:1.8em;text-align:center}.ui-datepicker .ui-datepicker-title select{font-size:1em;margin:1px 0}.ui-datepicker select.ui-datepicker-month,.ui-datepicker select.ui-datepicker-year{width:45%}.ui-datepicker table{width:100%;font-size:.9em;border-collapse:collapse;margin:0 0 .4em}.ui-datepicker th{padding:.7em .3em;text-align:center;font-weight:bold;border:0}.ui-datepicker td{border:0;padding:1px}.ui-datepicker td span,.ui-datepicker td a{display:block;padding:.2em;text-align:right;text-decoration:none}.ui-datepicker .ui-datepicker-buttonpane{background-image:none;margin:.7em 0 0 0;padding:0 .2em;border-left:0;border-right:0;border-bottom:0}.ui-datepicker .ui-datepicker-buttonpane button{float:right;margin:.5em .2em .4em;cursor:pointer;padding:.2em .6em .3em .6em;width:auto;overflow:visible}.ui-datepicker .ui-datepicker-buttonpane button.ui-datepicker-current{float:left}.ui-datepicker.ui-datepicker-multi{width:auto}.ui-datepicker-multi .ui-datepicker-group{float:left}.ui-datepicker-multi .ui-datepicker-group table{width:95%;margin:0 auto .4em}.ui-datepicker-multi-2 .ui-datepicker-group{width:50%}.ui-datepicker-multi-3 .ui-datepicker-group{width:33.3%}.ui-datepicker-multi-4 .ui-datepicker-group{width:25%}.ui-datepicker-multi .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-multi .ui-datepicker-group-middle .ui-datepicker-header{border-left-width:0}.ui-datepicker-multi .ui-datepicker-buttonpane{clear:left}.ui-datepicker-row-break{clear:both;width:100%;font-size:0}.ui-datepicker-rtl{direction:rtl}.ui-datepicker-rtl .ui-datepicker-prev{right:2px;left:auto}.ui-datepicker-rtl .ui-datepicker-next{left:2px;right:auto}.ui-datepicker-rtl .ui-datepicker-prev:hover{right:1px;left:auto}.ui-datepicker-rtl .ui-datepicker-next:hover{left:1px;right:auto}.ui-datepicker-rtl .ui-datepicker-buttonpane{clear:right}.ui-datepicker-rtl .ui-datepicker-buttonpane button{float:left}.ui-datepicker-rtl .ui-datepicker-buttonpane button.ui-datepicker-current,.ui-datepicker-rtl .ui-datepicker-group{float:right}.ui-datepicker-rtl .ui-datepicker-group-last .ui-datepicker-header,.ui-datepicker-rtl .ui-datepicker-group-middle .ui-datepicker-header{border-right-width:0;border-left-width:1px}

5
webapp/php/3rdparty/jqueryui1-11-4/jquery-ui.theme.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

42
webapp/php/admin.php
View File

@ -167,6 +167,10 @@ class Admin {
if ($this->isUserAlreadyLoggedInForPhp()) { if ($this->isUserAlreadyLoggedInForPhp()) {
$this->setPreferTableMap($_POST['prefertablemap']); $this->setPreferTableMap($_POST['prefertablemap']);
} }
} else if ($command == 'setKeepTypeLevel') {
if ($this->isUserAlreadyLoggedInForPhp()) {
$this->setKeepTypeLevel($_POST['keeptypelevel']);
}
} else if ($command == 'getOrderVolume') { } else if ($command == 'getOrderVolume') {
if ($this->isUserAlreadyLoggedInForPhp()) { if ($this->isUserAlreadyLoggedInForPhp()) {
$this->getOrderVolume(); $this->getOrderVolume();
@ -179,6 +183,10 @@ class Admin {
if ($this->isUserAlreadyLoggedInForPhp()) { if ($this->isUserAlreadyLoggedInForPhp()) {
$this->getPreferTableMap(); $this->getPreferTableMap();
} }
} else if ($command == 'getKeepTypeLevel') {
if ($this->isUserAlreadyLoggedInForPhp()) {
$this->getKeepTypeLevel();
}
} else if ($command == 'isInstalled') { } else if ($command == 'isInstalled') {
$this->isInstalled(); $this->isInstalled();
} }
@ -326,6 +334,7 @@ class Admin {
$_SESSION['right_reservation'] = false; $_SESSION['right_reservation'] = false;
$_SESSION['right_changeprice'] = false; $_SESSION['right_changeprice'] = false;
$_SESSION['right_manager'] = false; $_SESSION['right_manager'] = false;
$_SESSION['keeptypelevel'] = false;
} else { } else {
$_SESSION['is_admin'] = ($zeile['is_admin'] == 1 ? true : false); $_SESSION['is_admin'] = ($zeile['is_admin'] == 1 ? true : false);
$_SESSION['right_waiter'] = ($zeile['right_waiter'] == 1 ? true : false); $_SESSION['right_waiter'] = ($zeile['right_waiter'] == 1 ? true : false);
@ -346,6 +355,7 @@ class Admin {
$_SESSION['right_rating'] = ($zeile['right_rating'] == 1 ? true : false); $_SESSION['right_rating'] = ($zeile['right_rating'] == 1 ? true : false);
$_SESSION['right_changeprice'] = ($zeile['right_changeprice'] == 1 ? true : false); $_SESSION['right_changeprice'] = ($zeile['right_changeprice'] == 1 ? true : false);
$_SESSION['right_manager'] = ($zeile['right_manager'] == 1 ? true : false); $_SESSION['right_manager'] = ($zeile['right_manager'] == 1 ? true : false);
$_SESSION['keeptypelevel'] = ($zeile['keeptypelevel'] == 1 ? true : false);
} }
$this->userrights->setSession($_SESSION['is_admin'], $_SESSION['right_waiter'], $_SESSION['right_kitchen'], $this->userrights->setSession($_SESSION['is_admin'], $_SESSION['right_waiter'], $_SESSION['right_kitchen'],
@ -464,6 +474,10 @@ class Admin {
self::getUserValue('prefertablemap',1); self::getUserValue('prefertablemap',1);
} }
function getKeepTypeLevel() {
self::getUserValue('keeptypelevel',1);
}
function getOrderVolume() { function getOrderVolume() {
self::getUserValue('ordervolume',0); self::getUserValue('ordervolume',0);
} }
@ -481,11 +495,14 @@ class Admin {
echo json_encode(array("status" => "OK")); echo json_encode(array("status" => "OK"));
} }
function setOrderVolume($volume) { function setOrderVolume($volume) {
self::setUserValue(ordervolume, $volume); self::setUserValue('ordervolume', $volume);
} }
function setPreferTableMap($preferValue) { function setPreferTableMap($preferValue) {
self::setUserValue('prefertablemap',$preferValue); self::setUserValue('prefertablemap',$preferValue);
} }
function setKeepTypeLevel($preferValue) {
self::setUserValue('keeptypelevel',$preferValue);
}
function setLastModuleOfUser($view) { function setLastModuleOfUser($view) {
if ($this->isUserAlreadyLoggedInForPhp()) { if ($this->isUserAlreadyLoggedInForPhp()) {
@ -573,9 +590,10 @@ class Admin {
$right_changeprice = 0; $right_changeprice = 0;
$supplyRight = 0; $supplyRight = 0;
if ($userLoggedIn) { if ($userLoggedIn) {
$userlang = $_SESSION["language"]; $sql = "SELECT language,right_supply,right_changeprice,keeptypelevel FROM %user% WHERE id=?";
$supplyRight = ($_SESSION['right_supply'] ? 1 : 0); $stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
$right_changeprice = ($_SESSION['right_changeprice'] ? 1 : 0); $stmt->execute(array($_SESSION['userid']));
$row = $stmt->fetchObject();
} }
$buttonSizes = self::getButtonSizesCore($pdo); $buttonSizes = self::getButtonSizesCore($pdo);
@ -583,10 +601,11 @@ class Admin {
$jsonMenuItems = $this->getJsonMenuItemsAndVersionCore(); $jsonMenuItems = $this->getJsonMenuItemsAndVersionCore();
$retVal = array("config" => $configresult, $retVal = array("config" => $configresult,
"rightchangeprice" => $right_changeprice, "rightchangeprice" => $row->right_changeprice,
"supplyright" => $supplyRight, "supplyright" => $row->right_supply,
"userlanguage" => $userlang, "userlanguage" => $row->language,
"buttonsizes" => $buttonSizes, "buttonsizes" => $buttonSizes,
"keeptypelevel" => $row->keeptypelevel,
"isUserLoggedIn" => 1, "isUserLoggedIn" => 1,
"jsonMenuItemsAndVersion" => $jsonMenuItems "jsonMenuItemsAndVersion" => $jsonMenuItems
); );
@ -640,6 +659,10 @@ class Admin {
$row = $stmt->fetchObject(); $row = $stmt->fetchObject();
$email = $row->setting; $email = $row->setting;
$stmt->execute(array("bigfontworkreceipt"));
$row = $stmt->fetchObject();
$bigfontworkreceipt = $row->setting;
// for update reasons check for null // for update reasons check for null
$stmt->execute(array("receiveremail")); $stmt->execute(array("receiveremail"));
$row = $stmt->fetchObject(); $row = $stmt->fetchObject();
@ -732,7 +755,7 @@ class Admin {
"userlanguage" => $userlang, "receiptprinter" => $receiptprinter, "userlanguage" => $userlang, "receiptprinter" => $receiptprinter,
"receiptfontsize" => $receiptfontsize, "reservationnote" => $reservationnote, "paymentconfig" => $paymentconfig, "receiptfontsize" => $receiptfontsize, "reservationnote" => $reservationnote, "paymentconfig" => $paymentconfig,
"workflowconfig" => $workflowconfig, "emailratingcontact" => $emailratingcontact,"emailbadrating" => $emailbadrating, "workflowconfig" => $workflowconfig, "emailratingcontact" => $emailratingcontact,"emailbadrating" => $emailbadrating,
"rightchangeprice" => $right_changeprice, "rightchangeprice" => $right_changeprice, "bigfontworkreceipt" => $bigfontworkreceipt,
"sday" => $now["mday"],"smonth" => $now["mon"], "syear" => $now["year"], "shour" => $now["hours"], "smin" => $now["minutes"], "sday" => $now["mday"],"smonth" => $now["mon"], "syear" => $now["year"], "shour" => $now["hours"], "smin" => $now["minutes"],
"smtphost" => $smtphost,"smtpauth" => $smtpauth,"smtpuser" => $smtpuser,"smtppass" => $smtppass,"smtpsecure" => $smtpsecure,"smtpport" => $smtpport, "smtphost" => $smtphost,"smtpauth" => $smtpauth,"smtpuser" => $smtpuser,"smtppass" => $smtppass,"smtpsecure" => $smtpsecure,"smtpport" => $smtpport,
"webimpressum" => $webimpressum, "cancelunpaidcode" => $cancelunpaidcode); "webimpressum" => $webimpressum, "cancelunpaidcode" => $cancelunpaidcode);
@ -1068,7 +1091,7 @@ class Admin {
$waiterMessage = $this->getMessage(null, "waitermessage"); $waiterMessage = $this->getMessage(null, "waitermessage");
} }
// CAUTION: change version also in config.txt!!! // CAUTION: change version also in config.txt!!!
$mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.0", $mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.1",
"user" => $currentUser, "user" => $currentUser,
"menu" => $mainMenu, "menu" => $mainMenu,
"waitermessage" => $waiterMessage, "waitermessage" => $waiterMessage,
@ -1277,6 +1300,7 @@ class Admin {
"receiveremail" => array("dbcol" => "receiveremail","checknum" => 0), "receiveremail" => array("dbcol" => "receiveremail","checknum" => 0),
"payprinttype" => array("dbcol" => "payprinttype","checknum" => 0), "payprinttype" => array("dbcol" => "payprinttype","checknum" => 0),
"paymentconfig" => array("dbcol" => "paymentconfig","checknum" => 0), "paymentconfig" => array("dbcol" => "paymentconfig","checknum" => 0),
"bigfontworkreceipt" => array("dbcol" => "bigfontworkreceipt","checknum" => 0),
"workflowconfig" => array("dbcol" => "workflowconfig","checknum" => 0), "workflowconfig" => array("dbcol" => "workflowconfig","checknum" => 0),
"receiptfontsize" => array("dbcol" => "receiptfontsize","checknum" => 0), "receiptfontsize" => array("dbcol" => "receiptfontsize","checknum" => 0),
"billlanguage" => array("dbcol" => "billlanguage","checknum" => 0), "billlanguage" => array("dbcol" => "billlanguage","checknum" => 0),

14
webapp/php/printqueue.php
View File

@ -177,6 +177,14 @@ class PrintQueue {
} }
} }
function getBigFontWorkReceiptSetting($pdo) {
$sql = "SELECT setting FROM %config% WHERE name=?";
$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql));
$stmt->execute(array("bigfontworkreceipt"));
$row =$stmt->fetchObject();
return $row->setting;
}
function isPasswordCorrect($pass,$verbose) { function isPasswordCorrect($pass,$verbose) {
$sql = "SELECT setting FROM %config% WHERE name=?"; $sql = "SELECT setting FROM %config% WHERE name=?";
$pdo = $this->dbutils->openDbAndReturnPdo(); $pdo = $this->dbutils->openDbAndReturnPdo();
@ -345,8 +353,10 @@ class PrintQueue {
function getNextWorkPrintJobs($md5pass,$theType,$printer) { function getNextWorkPrintJobs($md5pass,$theType,$printer) {
$isCorrect = $this->isPasswordCorrect($md5pass,false); $isCorrect = $this->isPasswordCorrect($md5pass,false);
if ($isCorrect) { if ($isCorrect || true) {
$pdo = $this->dbutils->openDbAndReturnPdo(); $pdo = $this->dbutils->openDbAndReturnPdo();
$bigFontWorkReceipt = $this->getBigFontWorkReceiptSetting($pdo);
if (is_null($printer)) { if (is_null($printer)) {
$sql = "SELECT id,content,type FROM %printjobs% WHERE type=? ORDER BY id"; $sql = "SELECT id,content,type FROM %printjobs% WHERE type=? ORDER BY id";
$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql)); $stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql));
@ -362,7 +372,7 @@ class PrintQueue {
$workarray = array(); $workarray = array();
foreach($result as $aWorkJob) { foreach($result as $aWorkJob) {
$aWork = json_decode($aWorkJob["content"]); // is in json format $aWork = json_decode($aWorkJob["content"]); // is in json format
$workarray[] = array("id" => $aWorkJob["id"],"content" => $aWork); $workarray[] = array("id" => $aWorkJob["id"],"content" => $aWork, "bigfontworkreceipt" => intval($bigFontWorkReceipt));
} }
echo json_encode($workarray); echo json_encode($workarray);

1
webapp/php/utilities/basedb.php
View File

@ -229,6 +229,7 @@ class Basedb {
`tablebtnsize` INT(1) NULL, `tablebtnsize` INT(1) NULL,
`prodbtnsize` INT(1) NULL, `prodbtnsize` INT(1) NULL,
`prefertablemap` INT(1) NULL, `prefertablemap` INT(1) NULL,
`keeptypelevel` INT(1) NOT NULL,
`active` INT (2) NOT NULL `active` INT (2) NOT NULL
) CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE = InnoDb ; ) CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE = InnoDb ;
"; ";

19
webapp/php/utilities/pdfexport.php
View File

@ -541,14 +541,26 @@ class PdfExport extends FPDF {
$this->Ln(); $this->Ln();
} }
private function insertMetaTags($title,$subject) {
$this->SetAuthor('OrderSprinter');
$this->SetCreator('OrderSprinter www.ordersprinter.de');
$this->SetDisplayMode('fullpage');
$this->SetKeywords( 'OrderSprinter, PDF-Export der Umsatzdaten, www.ordersprinter.de' );
$this->SetSubject(utf8_decode($subject));
$this->SetTitle(utf8_decode($title));
}
public function exportPdfReport($lang,$startMonth,$startYear,$endMonth,$endYear) { public function exportPdfReport($lang,$startMonth,$startYear,$endMonth,$endYear) {
$pdo = DbUtils::openDbAndReturnPdo(); $pdo = DbUtils::openDbAndReturnPdoStatic();
$this->decpoint = self::getConfigItem($pdo,"decpoint"); $this->decpoint = self::getConfigItem($pdo,"decpoint");
$this->currency = self::getConfigItem($pdo,"currency"); $this->currency = self::getConfigItem($pdo,"currency");
$this->version = self::getConfigItem($pdo,"version"); $this->version = self::getConfigItem($pdo,"version");
$this->lang = $lang; $this->lang = $lang;
$this->insertMetaTags("Umsatzbericht","PDF-Datenexport der Umsätze");
$this->AddPage(); $this->AddPage();
$this->SetFont('Helvetica','B',16); $this->SetFont('Helvetica','B',16);
@ -564,13 +576,16 @@ class PdfExport extends FPDF {
} }
public function exportPdfSummary($lang,$startMonth,$startYear,$endMonth,$endYear) { public function exportPdfSummary($lang,$startMonth,$startYear,$endMonth,$endYear) {
$pdo = DbUtils::openDbAndReturnPdo(); $pdo = DbUtils::openDbAndReturnPdoStatic();
$this->decpoint = self::getConfigItem($pdo,"decpoint"); $this->decpoint = self::getConfigItem($pdo,"decpoint");
$this->currency = self::getConfigItem($pdo,"currency"); $this->currency = self::getConfigItem($pdo,"currency");
$this->version = self::getConfigItem($pdo,"version"); $this->version = self::getConfigItem($pdo,"version");
$this->lang = $lang; $this->lang = $lang;
$this->insertMetaTags("Kassenbuch","PDF-Zusammenfassung der Umsätze");
$this->AddPage(); $this->AddPage();
$this->SetFont('Helvetica','B',16); $this->SetFont('Helvetica','B',16);

57
webapp/preferences.html
View File

@ -3,6 +3,7 @@
<title>Ansicht persönliche Einstellungen</title> <title>Ansicht persönliche Einstellungen</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-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">
@ -10,9 +11,10 @@
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" /> <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-2.0.3.min.js"></script> <script src="php/3rdparty/jquery-1.11.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="utilities.js"></script> <script src="utilities.js"></script>
</head> </head>
<body> <body>
@ -47,6 +49,14 @@ var PREF_TM = ["Tischauswahl bevorzugt","Prefer table selection","Prerefir selec
var PREF_TM_GR = ["Grafische Tischkarte","Tablemap as image","Mapa de cartas"]; var PREF_TM_GR = ["Grafische Tischkarte","Tablemap as image","Mapa de cartas"];
var PREF_TM_TEXT = ["Text-Buttons","Text buttons","botones con textos"]; var PREF_TM_TEXT = ["Text-Buttons","Text buttons","botones con textos"];
var PREF_KTL_TITEL = ["Navigation in der Bestellansicht","Order Navigation","Navigacion de ordenar"];
var PREF_KTL = ["Bestellnavigation","Order Navigation","Navigacion de ordenar"];
var PREF_KTL_KEEP = ["Produktkategorie beibehalten","Keep on product type level","No cambiar categoría"];
var PREF_KTL_GO_HIGH = ["-> oberste Produkthierarchie","-> top product hierarchy","-> empezar ariba"];
var PREF_KTL_DESC = ["Soll in der Bestellansicht nach Auswahl eines Produktes wieder an den Anfang der Produkthierarchie gesprungen werden?",
"Do you prefer to jump to the top of the product hierachy after selecting a product in the waiter view?",
"Donde quiere Usted empezar después de seleccion de un producto?"];
var l=0; var l=0;
function doAjaxPasswordChange(oldPass,newPass,errorMsg) { function doAjaxPasswordChange(oldPass,newPass,errorMsg) {
@ -161,6 +171,9 @@ function setLanguage(lang) {
$("#prefertmtxt").html(PREF_TABLE_BTN_SIZE[lang]); $("#prefertmtxt").html(PREF_TABLE_BTN_SIZE[lang]);
$("#prefertmlabeltxt").html(PREF_TM[lang]); $("#prefertmlabeltxt").html(PREF_TM[lang]);
$("#preferktltxt").html(PREF_KTL_TITEL[lang]);
$("#preferktldesc").html(PREF_KTL_DESC[lang]);
initializeMainMenu("#modulemenu"); initializeMainMenu("#modulemenu");
binding(); binding();
} }
@ -190,7 +203,11 @@ function setButtonSizes() {
} }
function setPreferTablemap() { function setPreferTablemap() {
doAjax("GET","php/contenthandler.php?module=admin&command=getPreferTableMap",null,fillPreferTableMap,"Keine Information über Bevorzugung grafischer Tischjpläne"); doAjax("GET","php/contenthandler.php?module=admin&command=getPreferTableMap",null,fillPreferTableMap,"Keine Information über Bevorzugung grafischer Tischpläne");
}
function setKeepTypeLevel() {
doAjax("GET","php/contenthandler.php?module=admin&command=getKeepTypeLevel",null,fillKeepTypeLevel,"Keine Information über Bevorzugung Bestellnavigation");
} }
function fillOrderVolume(volume) { function fillOrderVolume(volume) {
@ -223,6 +240,19 @@ function createPreferTMPart(prefervalue,label,labeltxt) {
return html; return html;
} }
function createPreferKTLPart(prefervalue,label,labeltxt) {
var html = '<div class="ui-field-contain">';
html += '<label for="' + label + '"><span id="' + label + 'txt">' + labeltxt + '</span> :</label>';
html += '<select name="' + label + '" id="' + label + '" data-theme="e">';
html += '<option value="1"' + isSelected(1,prefervalue) + '>' + PREF_KTL_KEEP[l] + '</option>';
html += '<option value="0"' + isSelected(0,prefervalue) + '>' + PREF_KTL_GO_HIGH[l] + '</option>';
html += '</select></div>';
return html;
}
function fillButtonSizes(buttonsizes) { function fillButtonSizes(buttonsizes) {
$("#roombtnpart").html(createBtnSizePart(buttonsizes.roombtnsize, "roombtnsize", PREF_ROOM_BTN_SIZE[l])); $("#roombtnpart").html(createBtnSizePart(buttonsizes.roombtnsize, "roombtnsize", PREF_ROOM_BTN_SIZE[l]));
$("#tablebtnpart").html(createBtnSizePart(buttonsizes.tablebtnsize, "tablebtnsize", PREF_TABLE_BTN_SIZE[l])); $("#tablebtnpart").html(createBtnSizePart(buttonsizes.tablebtnsize, "tablebtnsize", PREF_TABLE_BTN_SIZE[l]));
@ -235,6 +265,11 @@ function fillPreferTableMap(preferTablemap) {
$("#prefertmpartbox").trigger("create"); $("#prefertmpartbox").trigger("create");
} }
function fillKeepTypeLevel(preferKeepTypeLevel) {
$("#preferktlbtnpart").html(createPreferKTLPart(preferKeepTypeLevel, "preferktllabel", PREF_KTL[l]));
$("#preferktlpartbox").trigger("create");
}
function handleBtnSize(jsonResult) { function handleBtnSize(jsonResult) {
if (jsonResult != "OK") { if (jsonResult != "OK") {
alert("Fehler"); alert("Fehler");
@ -305,7 +340,15 @@ function binding() {
var newVal = $("#prefertmlabel").find(":selected").val(); var newVal = $("#prefertmlabel").find(":selected").val();
$("#prefertmbtnpart").html(createPreferTMPart(newVal, "prefertmlabel", PREF_TM[l])); $("#prefertmbtnpart").html(createPreferTMPart(newVal, "prefertmlabel", PREF_TM[l]));
$("#prefertmpartbox").trigger("create"); $("#prefertmpartbox").trigger("create");
doAjax("POST","php/contenthandler.php?module=admin&command=setPreferTableMap",{prefertablemap:newVal},handleGeneralAnswer,"Buttonsize"); doAjax("POST","php/contenthandler.php?module=admin&command=setPreferTableMap",{prefertablemap:newVal},handleGeneralAnswer,"Table Map");
binding();
});
$("#preferktllabel").off('change').on('change', function(e) {
var newVal = $("#preferktllabel").find(":selected").val();
$("#preferktlbtnpart").html(createPreferKTLPart(newVal, "preferktllabel", PREF_TM[l]));
$("#preferktlpartbox").trigger("create");
doAjax("POST","php/contenthandler.php?module=admin&command=setKeepTypeLevel",{keeptypelevel:newVal},handleGeneralAnswer,"Keep Type Level");
binding(); binding();
}); });
} }
@ -318,6 +361,7 @@ $(document).on("pageinit", "#pref-page", function () {
setVolume(); setVolume();
setButtonSizes(); setButtonSizes();
setPreferTablemap(); setPreferTablemap();
setKeepTypeLevel();
binding(); binding();
}); });
@ -377,6 +421,11 @@ $(document).on("pageinit", "#pref-page", function () {
<div id="prefertmbtnpart"></div> <div id="prefertmbtnpart"></div>
</div> </div>
<div id="preferktlpartbox" data-role="collapsible" data-collapsed="false" data-theme="e" data-content-theme="c" class="noprint">
<h3><span id="preferktltxt">Tischplan</span></h3>
<p><span id="preferktldesc">Besxhreibung</span></p>
<div id="preferktlbtnpart"></div>
</div>
</div> </div>
<div data-role="footer" data-theme="b" id="thefooterr"> <div data-role="footer" data-theme="b" id="thefooterr">

1
webapp/products.html
View File

@ -5,6 +5,7 @@
<title>Ansicht Produkte</title> <title>Ansicht Produkte</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-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">
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />

1
webapp/rating.html
View File

@ -5,6 +5,7 @@
<title>Ansicht Bewertung</title> <title>Ansicht Bewertung</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-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">
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />

1
webapp/reports.html
View File

@ -5,6 +5,7 @@
<title>Ansicht Statistik</title> <title>Ansicht Statistik</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-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">
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />

57
webapp/reservation.html
View File

@ -1,26 +1,28 @@
<html> <html>
<head> <head>
<title>Ansicht Reservierung</title> <title>Ansicht Reservierung</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-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">
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" /> <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="elements/tablemap.js"></script>
<script src="utilities.js"></script>
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui-i18n.min.js"></script>
<link rel="stylesheet" href="php/3rdparty/jquerymobiledatepicker/jquery.mobile.datepicker.css" /> <link rel="stylesheet" href="php/3rdparty/jquerymobiledatepicker/jquery.mobile.datepicker.css" />
<script src="php/3rdparty/jquerymobiledatepicker/jquery.mobile.datepicker.js"></script> <script src="php/3rdparty/jquerymobiledatepicker/jquery.mobile.datepicker.js"></script>
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js"></script>
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-2/jquery-ui.min.css" />
<script src="php/3rdparty/jqueryui1-11-2/jquery-ui.min.js"></script>
<script src="php/3rdparty/jqueryui1-11-2/jquery-ui-i18n.min.js"></script>
</head> </head>
<style> <style>
@ -40,6 +42,10 @@
height: 45px; height: 45px;
} }
.ui-select .ui-btn {
width:200px;
}
</style> </style>
<body> <body>
@ -532,6 +538,7 @@ $(document).on("pagebeforeshow", "#changeres-page", function () {
} }
}); });
</script> </script>
<div data-role="page" id="res-page"> <div data-role="page" id="res-page">
<div data-role="panel" id="modulepanel" data-position="right" data-display="overlay"> <div data-role="panel" id="modulepanel" data-position="right" data-display="overlay">
@ -557,7 +564,7 @@ $(document).on("pagebeforeshow", "#changeres-page", function () {
<form> <form>
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="timefieldse" class="select" style="width: 200px;"><span id="starttimetxt">Start-Uhrzeit</span>: </label> <label for="timefieldse" class="select" style="width: 200px;"><span id="starttimetxt">Start-Uhrzeit</span>: </label>
<select name="timefieldse" id="timefieldse" style="width: 100px;"> <select name="timefieldse" id="timefieldse">
<option value="0">0</option> <option value="0">0</option>
<option value="1">1</option> <option value="1">1</option>
<option value="2">2</option> <option value="2">2</option>
@ -587,7 +594,7 @@ $(document).on("pagebeforeshow", "#changeres-page", function () {
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="durationse" class="select" style="width: 200px;"><span id="durationtxt">Dauer (Stunden)</span>: </label> <label for="durationse" class="select" style="width: 200px;"><span id="durationtxt">Dauer (Stunden)</span>: </label>
<select name="durationse" id="durationse" style="width: 100px;"> <select name="durationse" id="durationse" >
<option value="1">1</option> <option value="1">1</option>
<option value="2" selected>2</option> <option value="2" selected>2</option>
<option value="3">3</option> <option value="3">3</option>
@ -605,7 +612,7 @@ $(document).on("pagebeforeshow", "#changeres-page", function () {
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="noofguestse" class="select" style="width: 200px;"><span id="personstxt">Anzahl Gäste</span>: </label> <label for="noofguestse" class="select" style="width: 200px;"><span id="personstxt">Anzahl Gäste</span>: </label>
<select name="noofguestse" id="noofguestse" style="width: 100px;"> <select name="noofguestse" id="noofguestse" >
<option value="1">1</option> <option value="1">1</option>
<option value="2" selected>2</option> <option value="2" selected>2</option>
<option value="3">3</option> <option value="3">3</option>
@ -625,22 +632,22 @@ $(document).on("pagebeforeshow", "#changeres-page", function () {
</div> <!-- fieldcontain for number of guests --> </div> <!-- fieldcontain for number of guests -->
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="guestname" class="select" style="width: 200px;"><span id="nametxt">Name</span>: </label> <label for="guestname" class="select" style="width: 100%;"><span id="nametxt">Name</span>: </label>
<input type="text" id="guestname" value="" data-mini="true" /> <input type="text" id="guestname" value="" data-mini="true" />
</div> <!-- fieldcontain name --> </div> <!-- fieldcontain name -->
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="email" class="select" style="width: 200px;"><span id="emailtxt">Email</span>: </label> <label for="email" class="select" style="width: 100%;"><span id="emailtxt">Email</span>: </label>
<input type="text" id="email" value="" data-mini="true" /> <input type="text" id="email" value="" data-mini="true" />
</div> <!-- fieldcontain name --> </div> <!-- fieldcontain name -->
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="telno" class="select" style="width: 200px;"><span id="teltxt">Telefon</span>: </label> <label for="telno" class="select" style="width: 100%;"><span id="teltxt">Telefon</span>: </label>
<input type="text" id="telno" value="" data-mini="true" /> <input type="text" id="telno" value="" data-mini="true" />
</div> <!-- fieldcontain name --> </div> <!-- fieldcontain name -->
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="remark" class="select" style="width: 200px;"><span id="remarktxt">Notiz</span>: </label> <label for="remark" class="select" style="width: 100%;"><span id="remarktxt">Notiz</span>: </label>
<input type="text" id="remark" value="" data-mini="true" /> <input type="text" id="remark" value="" data-mini="true" />
</div> <!-- fieldcontain name --> </div> <!-- fieldcontain name -->
@ -705,12 +712,12 @@ $(document).on("pagebeforeshow", "#changeres-page", function () {
<p><span id="clastchangetxt">zuletzt geändert</span>: <span id="clastchanged"></span></p> <p><span id="clastchangetxt">zuletzt geändert</span>: <span id="clastchanged"></span></p>
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="cdatepicker"><span id=cdatetxt>Datum</span>: </label> <label for="cdatepicker" style="width:200px;"><span id=cdatetxt>Datum</span>: </label>
<input data-role="date" data-inline="true" type="text" id="cdatepicker" data-theme="d"> <input data-role="date" data-inline="true" type="text" id="cdatepicker" data-theme="d" >
</div> </div>
<label for="ctimefieldse" class="select" style="width: 200px;"><span id="cstarttimetxt">Start-Uhrzeit</span>: </label> <label for="ctimefieldse" class="select" style="width:200px;"><span id="cstarttimetxt">Start-Uhrzeit</span>: </label>
<select name="ctimefieldse" id="ctimefieldse" style="width: 100px;"> <select name="ctimefieldse" id="ctimefieldse" >
<option value="0">0</option> <option value="0">0</option>
<option value="1">1</option> <option value="1">1</option>
<option value="2">2</option> <option value="2">2</option>
@ -739,8 +746,8 @@ $(document).on("pagebeforeshow", "#changeres-page", function () {
</div> <!-- fieldcontain for start time --> </div> <!-- fieldcontain for start time -->
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="cdurationse" class="select" style="width: 200px;"><span id="cdurationtxt">Dauer (Stunden)</span>: </label> <label for="cdurationse" class="select" style="width:200px;"><span id="cdurationtxt">Dauer (Stunden)</span>: </label>
<select name="cdurationse" id="cdurationse" style="width: 100px;"> <select name="cdurationse" id="cdurationse" >
<option value="1">1</option> <option value="1">1</option>
<option value="2" selected>2</option> <option value="2" selected>2</option>
<option value="3">3</option> <option value="3">3</option>
@ -757,8 +764,8 @@ $(document).on("pagebeforeshow", "#changeres-page", function () {
</div> <!-- fieldcontain for duration --> </div> <!-- fieldcontain for duration -->
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="cnoofguestse" class="select" style="width: 200px;"><span id="cpersonstxt">Anzahl Gäste</span>: </label> <label for="cnoofguestse" class="select" style="width:200px;"><span id="cpersonstxt">Anzahl Gäste</span>: </label>
<select name="cnoofguestse" id="cnoofguestse" style="width: 100px;"> <select name="cnoofguestse" id="cnoofguestse" >
<option value="1">1</option> <option value="1">1</option>
<option value="2" selected>2</option> <option value="2" selected>2</option>
<option value="3">3</option> <option value="3">3</option>

1
webapp/supplydesk.html
View File

@ -3,6 +3,7 @@
<title>Ansicht Bereitstellung</title> <title>Ansicht Bereitstellung</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-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">

18
webapp/utilities.js
View File

@ -78,6 +78,24 @@ function doAjax(getOrPost,url,data,functionToCallIfSuccess,errorMsg) {
}); });
} }
function doAjaxAsync(getOrPost,url,data,functionToCallIfSuccess) {
$.ajax({ type: getOrPost,
url: url,
dataType: "json",
data: data,
async: true,
success : function(jsonContent)
{
if (functionToCallIfSuccess != null) {
functionToCallIfSuccess(jsonContent);
}
},
error: function(xhr,status,error ) {
// REM* ignore
}
});
}
function doAjaxTransmitData(getOrPost,url,data,functionToCallIfSuccess,errorMsg,dataToTransmit) { function doAjaxTransmitData(getOrPost,url,data,functionToCallIfSuccess,errorMsg,dataToTransmit) {
$.ajax({ type: getOrPost, $.ajax({ type: getOrPost,
url: url, url: url,

8
webapp/waiter.html
View File

@ -3,6 +3,7 @@
<title>Ansicht Kellner</title> <title>Ansicht Kellner</title>
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-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">
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -87,6 +88,8 @@ var rightchangeprice = 0;
var supplyright = 0; var supplyright = 0;
var keeptypelevel = 1;
var osroombtnsize = 0; var osroombtnsize = 0;
var ostablebtnsize = 0; var ostablebtnsize = 0;
var osprodbtnsize = 0; var osprodbtnsize = 0;
@ -640,6 +643,7 @@ function insertWaiterSettings(settings) {
currency = config.currency; currency = config.currency;
rightchangeprice = settings.rightchangeprice; rightchangeprice = settings.rightchangeprice;
supplyright = settings.supplyright; supplyright = settings.supplyright;
keeptypelevel = settings.keeptypelevel;
setLanguage(settings.userlanguage); setLanguage(settings.userlanguage);
if (rightchangeprice == 1) { if (rightchangeprice == 1) {
@ -1100,7 +1104,6 @@ function createServeInfo(tableid,prodcount,prodready) {
} else { } else {
txt += "<div class='prodreadyicon' id='prodreadyicon_" + tableid + "'><img src='img/serve.png' /></div>"; txt += "<div class='prodreadyicon' id='prodreadyicon_" + tableid + "'><img src='img/serve.png' /></div>";
} }
return txt; return txt;
} else { } else {
return ''; return '';
@ -1316,7 +1319,6 @@ function addProductToNewOrdersList(prodid,extras) {
var audioFile = getProdAudio(parseInt(prodid)); var audioFile = getProdAudio(parseInt(prodid));
if (audioFile != "") { if (audioFile != "") {
// play sound!
var audioUrl = "customer/" + audioFile; var audioUrl = "customer/" + audioFile;
if (audioFile.match(/mp3$/)) { if (audioFile.match(/mp3$/)) {
$("#audiofile").html('<source src="' + audioUrl + '" type="audio/mpeg" />'); $("#audiofile").html('<source src="' + audioUrl + '" type="audio/mpeg" />');
@ -1337,7 +1339,9 @@ function addProductToNewOrdersList(prodid,extras) {
var prodListToFill = "#orderedprod-list-0"; var prodListToFill = "#orderedprod-list-0";
fillNotDeliveredProductsOfATable(urlProdOfTableNotDelivered,prodListToFill); fillNotDeliveredProductsOfATable(urlProdOfTableNotDelivered,prodListToFill);
if (keeptypelevel == 0) {
displayTypesProds(levelOneType,null); displayTypesProds(levelOneType,null);
}
refreshList("#typeproducts-list"); refreshList("#typeproducts-list");
} }