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

OrderSprinter 2.0.2

This commit is contained in:
Geno 2020-11-19 23:14:55 +01:00
parent 06a0e9de9b
commit dfa2aa8b1b
40 changed files with 320 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gastsystem/index.php
View File

@ -9,8 +9,8 @@
<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"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" href="css/gueststyle.css?v=2.0.1" /> <link rel="stylesheet" href="css/gueststyle.css?v=2.0.2" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=2.0.1" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=2.0.2" />
<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-1.11.3.min.js"></script>
@ -115,7 +115,7 @@
<div data-role="footer" data-theme="b" id="thefooter1"> <div data-role="footer" data-theme="b" id="thefooter1">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a">&nbsp;&nbsp;OrderSprinter</div> <div class="ui-block-a">&nbsp;&nbsp;OrderSprinter</div>
<div class="ui-block-b grid_right" id="versioninfo">2.0.1&nbsp;&nbsp;</div> <div class="ui-block-b grid_right" id="versioninfo">2.0.2&nbsp;&nbsp;</div>
</div><!-- /grid-a --> </div><!-- /grid-a -->
</div> </div>
</div> </div>

4
gastsystem/install.php
View File

@ -114,10 +114,10 @@ if (isset($_POST['code'])) {
} else { } else {
echo "<html>"; echo "<html>";
echo "<head><title>Installation Gastsystem</title>"; echo "<head><title>Installation Gastsystem</title>";
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=2.0.1">'; echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=2.0.2">';
echo "</head>"; echo "</head>";
echo "<body><div class=surround>"; echo "<body><div class=surround>";
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 2.0.1</span><br><br>"; echo "<span class=headerline>Installation OrderSprinter-Gastsystem 2.0.2</span><br><br>";
echo "<form action='install.php' method='post'><input class=installfield name=code id=code type=text placeholder='Installationscode' />"; echo "<form action='install.php' method='post'><input class=installfield name=code id=code type=text placeholder='Installationscode' />";
echo "<br><input type=submit value='Installation starten' class=installbtn />"; echo "<br><input type=submit value='Installation starten' class=installbtn />";
echo "</form></div></html>"; echo "</form></div></html>";

BIN
printserver/windows/OrderSprinterPrintserver.exe
View File

Binary file not shown.

2
spider/install/installer.php
View File

@ -85,7 +85,7 @@ class Installer {
} }
Database::dropTables($pdo); Database::dropTables($pdo);
Database::createEmptyTables($pdo, $prefix); Database::createEmptyTables($pdo, $prefix);
Database::setVersion($pdo,$prefix,"2.0.1"); Database::setVersion($pdo,$prefix,"2.0.2");
Database::setAccessPassword($pdo,$prefix,$adminpass); Database::setAccessPassword($pdo,$prefix,$adminpass);
Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour
return array("status" => "OK","msg" => "Installation successful"); return array("status" => "OK","msg" => "Installation successful");

BIN
webapp/OrderSprinterPrintserver.exe
View File

Binary file not shown.

6
webapp/bar.html
View File

@ -5,7 +5,7 @@
<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"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.2">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,8 +13,8 @@
<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-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
<script src="kitchenbar.js?v=2.0.1"></script> <script src="kitchenbar.js?v=2.0.2"></script>
<style> <style>
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook #tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook

97
webapp/bill.html
View File

File diff suppressed because one or more lines are too long

6
webapp/customers.html
View File

@ -7,7 +7,7 @@
<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"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.2">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -23,8 +23,8 @@
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" /> <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.min.js"></script>
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui-i18n.min.js"></script> <script src="php/3rdparty/jqueryui1-11-4/jquery-ui-i18n.min.js"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
<script src="elements/customers.js?v=2.0.1"></script> <script src="elements/customers.js?v=2.0.2"></script>
</head> </head>
<body> <body>

4
webapp/dash.php
View File

@ -4,7 +4,7 @@
<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"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.2">
<link rel="stylesheet" href="css/ospage.css" /> <link rel="stylesheet" href="css/ospage.css" />
@ -17,7 +17,7 @@
<script src="php/3rdparty/jquery-2.0.3.min.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="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
<script src="receiptutils.js"></script> <script src="receiptutils.js"></script>
<script src="elements/dash.js"></script> <script src="elements/dash.js"></script>
<script src="php/3rdparty/Chart.bundle.min.js"></script> <script src="php/3rdparty/Chart.bundle.min.js"></script>

2
webapp/elements/groundplan.js
View File

@ -163,7 +163,7 @@ function Groundplan() {
$("#createtableqrcodesbtn").off("click").on("click", function (e) { $("#createtableqrcodesbtn").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
window.open("php/contenthandler.php?module=roomtables&command=tableqrcodes&v=2.0.1",'_blank'); window.open("php/contenthandler.php?module=roomtables&command=tableqrcodes&v=2.0.2",'_blank');
}); });
this.bindRoomChanges(); this.bindRoomChanges();

4
webapp/feedback.html
View File

@ -4,7 +4,7 @@
<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">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.2">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -12,7 +12,7 @@
<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-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
<script src="kitchenbar.js"></script> <script src="kitchenbar.js"></script>
<style> <style>

6
webapp/help.php
View File

@ -9,8 +9,8 @@
<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"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.2">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.2">
<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" />
@ -18,7 +18,7 @@
<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-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
</head> </head>
<body> <body>

14
webapp/index.html
View File

@ -10,8 +10,8 @@
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="manifest" href="manifest.webmanifest"> <link rel="manifest" href="manifest.webmanifest">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.2">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.2">
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle-brightenergy.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle-brightenergy.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" />
@ -19,7 +19,7 @@
<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-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
</head> </head>
<body> <body>
@ -133,7 +133,7 @@ function displayLoginOrLogoutMask(jsonContent) {
// user needs to log in! // user needs to log in!
$("#passwordfield").val(""); $("#passwordfield").val("");
$("#logoutarea").hide(); $("#logoutarea").hide();
setTimeout(function(){document.location.href = "index.html?v=2.0.1"},250); setTimeout(function(){document.location.href = "index.html?v=2.0.2"},250);
} }
} }
@ -233,7 +233,7 @@ function handleResultOfInstallCheck(is_installed) {
if (is_installed == "Yes") { if (is_installed == "Yes") {
useInstallation(); useInstallation();
} else { } else {
setTimeout(function(){document.location.href = "install.html?v=2.0.1"},500); setTimeout(function(){document.location.href = "install.html?v=2.0.2"},500);
} }
} }
@ -296,11 +296,11 @@ $(document).on("pageinit", "#index-page", function () {
<div data-role="content"> <div data-role="content">
<p><div id="toplogolocation" style="text-align: center;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=2.0.1&style=always" style="max-height:150px;"/></div> <p><div id="toplogolocation" style="text-align: center;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=2.0.2&style=always" style="max-height:150px;"/></div>
<div data-role="collapsible" data-content-theme="c" data-collapsed="false" data-theme="e" id="loginmask"> <div data-role="collapsible" data-content-theme="c" data-collapsed="false" data-theme="e" id="loginmask">
<H2>Anmelden</H2> <H2>Anmelden</H2>
<p><div id="middlelogolocation" style="text-align: left;padding-left: 80px;padding-right:80px;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=2.0.1&style=always" style="max-height:150px;"/></div> <p><div id="middlelogolocation" style="text-align: left;padding-left: 80px;padding-right:80px;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=2.0.2&style=always" style="max-height:150px;"/></div>
<div class="loginarea"> <div class="loginarea">
<form method="post"> <form method="post">

6
webapp/install.html
View File

@ -4,7 +4,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<title>Setup</title> <title>Setup</title>
<link rel="stylesheet" type="text/css" href="css/installstyle.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/installstyle.css?v=2.0.2">
<script src="php/3rdparty/jquery-2.0.3.min.js"></script> <script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="utilities.js"></script> <script src="utilities.js"></script>
@ -970,13 +970,13 @@ El servicio web OrderSprinter no requiere una conexión a Internet. Sin embargo,
<tr id=updateline> <tr id=updateline>
<td>&nbsp;</td> <td>&nbsp;</td>
<td align=center> <td align=center>
<button id="updatebtn" class="updatebtn">Update -> 2.0.1</button> <button id="updatebtn" class="updatebtn">Update -> 2.0.2</button>
<span id="updateinprogresstxt" style="display:none;"><img id="installprogressindicator" src="php/3rdparty/images/ajax-loader.gif" alt="Progress indication" /> Update... bitte warten.</span> <span id="updateinprogresstxt" style="display:none;"><img id="installprogressindicator" src="php/3rdparty/images/ajax-loader.gif" alt="Progress indication" /> Update... bitte warten.</span>
</td> </td>
<td>&nbsp;</td> <td>&nbsp;</td>
</tr> </tr>
<tr> <tr>
<td align=center colspan=2><button type="submit" id="startinstall" onclick="startinstall();" class="startbtn">Starte Installation</button> <td align=center colspan=2><button type="submit" id="startinstall" class="startbtn">Starte Installation</button>
<td><div id=progress>&nbsp;<img id="freshinstallprogressindicator" style="display:none;" src="php/3rdparty/images/ajax-loader.gif" alt="Progress indication"/></div> <td><div id=progress>&nbsp;<img id="freshinstallprogressindicator" style="display:none;" src="php/3rdparty/images/ajax-loader.gif" alt="Progress indication"/></div>
</tr> </tr>
</table> </table>

2
webapp/install/installer.php
View File

@ -480,7 +480,7 @@ return;
} }
set_time_limit(60*30); set_time_limit(60*30);
$installerVersion = "2.0.1"; $installerVersion = "2.0.2";
$admin = new InstallAdmin(); $admin = new InstallAdmin();
$pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']); $pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);

6
webapp/kitchen.html
View File

@ -5,7 +5,7 @@
<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"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.2">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,8 +13,8 @@
<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-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
<script src="kitchenbar.js?v=2.0.1"></script> <script src="kitchenbar.js?v=2.0.2"></script>
<style> <style>
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook #tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook

92
webapp/manager.html
View File

@ -5,7 +5,7 @@
<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"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.2">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -14,12 +14,12 @@
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <script src="php/3rdparty/jquery-1.11.3.min.js"></script>
<!-- <script src="https://code.jquery.com/jquery-1.11.3.js"></script> --> <!-- <script src="https://code.jquery.com/jquery-1.11.3.js"></script> -->
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
<script src="elements/tablemap.js?v=2.0.1"></script> <script src="elements/tablemap.js?v=2.0.2"></script>
<script src="elements/roommap.js?v=2.0.1"></script> <script src="elements/roommap.js?v=2.0.2"></script>
<script src="elements/groundplan.js?v=2.0.1"></script> <script src="elements/groundplan.js?v=2.0.2"></script>
<script src="elements/tse.js?v=2.0.1"></script> <script src="elements/tse.js?v=2.0.2"></script>
<script src="elements/closing.js?v=2.0.1"></script> <script src="elements/closing.js?v=2.0.2"></script>
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet"> <link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script> <script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
@ -1703,7 +1703,7 @@ function initRestoreFileUpload() {
} else { } else {
alert("Import war erfolgreich."); alert("Import war erfolgreich.");
setTimeout(function(){ setTimeout(function(){
document.location.href = "index.html?v=2.0.1"; document.location.href = "index.html?v=2.0.2";
},250); },250);
} }
}, },
@ -2099,37 +2099,37 @@ function bindConfig() {
$("#samplerectemplate").off("click").on("click", function (e) { $("#samplerectemplate").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
doAjax("GET","php/contenthandler.php?module=admin&command=getrectemplate&v=2.0.1",null,handleGetRecTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getrectemplate&v=2.0.2",null,handleGetRecTemplate,null);
}); });
$("#sampleclstemplate").off("click").on("click", function (e) { $("#sampleclstemplate").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
doAjax("GET","php/contenthandler.php?module=admin&command=getclstemplate&v=2.0.1",null,handleGetClsTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getclstemplate&v=2.0.2",null,handleGetClsTemplate,null);
}); });
$("#samplecashtemplate").off("click").on("click", function (e) { $("#samplecashtemplate").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
doAjax("GET","php/contenthandler.php?module=admin&command=getcashtemplate&v=2.0.1",null,handleGetCashTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getcashtemplate&v=2.0.2",null,handleGetCashTemplate,null);
}); });
$("#samplefoodworktemplate").off("click").on("click", function (e) { $("#samplefoodworktemplate").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
doAjax("GET","php/contenthandler.php?module=admin&command=getfoodworktemplate&v=2.0.1",null,handleGetFoodTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getfoodworktemplate&v=2.0.2",null,handleGetFoodTemplate,null);
}); });
$("#sampledrinkworktemplate").off("click").on("click", function (e) { $("#sampledrinkworktemplate").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
doAjax("GET","php/contenthandler.php?module=admin&command=getdrinkworktemplate&v=2.0.1",null,handleGetDrinkTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getdrinkworktemplate&v=2.0.2",null,handleGetDrinkTemplate,null);
}); });
$("#samplecanceltemplate").off("click").on("click", function (e) { $("#samplecanceltemplate").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
doAjax("GET","php/contenthandler.php?module=admin&command=getcanceltemplate&v=2.0.1",null,handleGetCancelTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getcanceltemplate&v=2.0.2",null,handleGetCancelTemplate,null);
}); });
$("#samplepickuptemplate").off("click").on("click", function (e) { $("#samplepickuptemplate").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
doAjax("GET","php/contenthandler.php?module=admin&command=getpickuptemplate&v=2.0.1",null,handleGetPickupTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getpickuptemplate&v=2.0.2",null,handleGetPickupTemplate,null);
}); });
$("#changeConfig").off("click").on("click", function (e) { $("#changeConfig").off("click").on("click", function (e) {
@ -2257,38 +2257,38 @@ function binding() {
$("#backup_btn").off("click").on("click", function (e) { $("#backup_btn").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=2.0.1"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=2.0.2";
}); });
$("#backup_btnall").off("click").on("click", function (e) { $("#backup_btnall").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=2.0.1"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=2.0.2";
}); });
$("#backup_btnalllogs").off("click").on("click", function (e) { $("#backup_btnalllogs").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=2.0.1"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=2.0.2";
}); });
$("#backup_btnftpall").off("click").on("click", function (e) { $("#backup_btnftpall").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
showProgressPopup(); showProgressPopup();
doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=2.0.1",null,handleFtpResult,null); doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=2.0.2",null,handleFtpResult,null);
}); });
$("#backup_debugdata").off("click").on("click", function (e) { $("#backup_debugdata").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=2.0.1",'_blank'); window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=2.0.2",'_blank');
}); });
$("#backupguests_btn").off("click").on("click", function (e) { $("#backupguests_btn").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=2.0.1"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=2.0.2";
}); });
$("#golive").off("click").on("click", function (e) { $("#golive").off("click").on("click", function (e) {
@ -2486,7 +2486,7 @@ function updateOneSingleFile() {
setTimeout(function(){ setTimeout(function(){
$("#sliderarea").hide(); $("#sliderarea").hide();
var millis=getMillis(); var millis=getMillis();
document.location.href = "install.html?v=2.0.1&mode=onlyupdate&n=" + millis; document.location.href = "install.html?v=2.0.2&mode=onlyupdate&n=" + millis;
},250); },250);
} }
} }
@ -3770,6 +3770,43 @@ function continueInitialization() {
} }
binding(); binding();
initLogoFileUpload();
}
function initLogoFileUpload() {
var settings = {
url: "php/contenthandler.php?module=admin&command=readlogo",
method: "POST",
allowedTypes:"jpg,png,gif",
fileName: "logofile",
multiple: false,
uploadQueueOrder: 'replace',
showFileCounter: false,
dragDropStr: "<span>Bilddatei</span>",
extErrorStr: " ist nicht erlaubt. Erlaubte Dateiendung: ",
onSuccess:function(files,data,xhr)
{
var answer = jQuery.parseJSON(data);
if (answer.status != "OK") {
alert("Upload war nicht erfolgreich: " + answer.msg);
} else {
handleLogoUploadAnswer(null);
}
},
onError: function(files,status,errMsg)
{
$("#uploadlogostatus").html("<font color='red'>Upload fehlgeschlagen</font>");
}
};
$("#uploadlogofilearea").uploadFile(settings);
$("#uploadlogofilearea").trigger("create");
}
function handleLogoUploadAnswer(answer) {
d = new Date();
$("#logoimgpart").attr("src", "php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&"+d.getTime());
} }
$(document).on("pageinit", "#admin-page", function () { $(document).on("pageinit", "#admin-page", function () {
@ -4644,13 +4681,10 @@ $(document).on("pageinit", "#admin-page", function () {
<br><b><u>Logo:</u></b><br><br> <br><b><u>Logo:</u></b><br><br>
<img id="logoimgpart" style="height:70px;" src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel" /> <img id="logoimgpart" style="height:70px;" src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel" />
<form id="logoform" enctype="multipart/form-data" action="php/contenthandler.php?module=admin&command=readlogo" method="POST" data-ajax="false">
<input type="hidden" name="MAX_FILE_SIZE" value="16777210" /> <p /><div id="uploadlogofilearea">Logo</div>
<span id=upllogotxt>Logo-Datei hochladen:</span> <div id="uploadlogostatus"></div>
<input name="logofile" id="logofile" type="file" />
<div id=logoinfoafterclick></div>
<input type="submit" data-theme="f" value="Laden" id="logobtntxt" formaction="php/contenthandler.php?module=admin&command=readlogo"/>
</form>
<form> <form>
<a href="#" data-theme="d" data-role="button" data-icon="delete" data-ajax="false" id="dellogobtn">Kein Logo</a> <a href="#" data-theme="d" data-role="button" data-icon="delete" data-ajax="false" id="dellogobtn">Kein Logo</a>
</form> </form>

8
webapp/paydesk.html
View File

File diff suppressed because one or more lines are too long

57
webapp/php/admin.php
View File

@ -1553,7 +1553,7 @@ class Admin {
$view = "preferences.html"; $view = "preferences.html";
} }
echo json_encode($view . "?v=2.0.1"); echo json_encode($view . "?v=2.0.2");
} }
} }
@ -1768,31 +1768,31 @@ class Admin {
if (!self::isOnlyRatingUser($rights, $right_rating, true)) { if (!self::isOnlyRatingUser($rights, $right_rating, true)) {
if ($_SESSION['modus'] == 0) { if ($_SESSION['modus'] == 0) {
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=2.0.1"); } if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=2.0.2"); }
} else { } else {
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=2.0.1"); } if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=2.0.2"); }
} }
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=2.0.1"); } if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=2.0.2"); }
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=2.0.1"); } if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=2.0.2"); }
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=2.0.1"); } if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=2.0.2"); }
if ($_SESSION['modus'] == 0) { if ($_SESSION['modus'] == 0) {
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=2.0.1"); } if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=2.0.2"); }
} }
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=2.0.1"); } if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=2.0.2"); }
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=2.0.1"); } if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=2.0.2"); }
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=2.0.1"); } if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=2.0.2"); }
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=2.0.1"); } if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=2.0.2"); }
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=2.0.1"); } if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=2.0.2"); }
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=2.0.1"); } if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=2.0.2"); }
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=2.0.1"); } if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=2.0.2"); }
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=2.0.1"); } if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=2.0.2"); }
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=2.0.1"); } if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=2.0.2"); }
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=2.0.1"); } if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=2.0.2"); }
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=2.0.1"); $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=2.0.2");
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=2.0.1"); } if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=2.0.2"); }
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=2.0.1"); $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=2.0.2");
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=2.0.1"); $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=2.0.2");
} }
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
@ -2232,19 +2232,19 @@ class Admin {
if ($_FILES['logofile']['error'] != UPLOAD_ERR_OK //checks for errors if ($_FILES['logofile']['error'] != UPLOAD_ERR_OK //checks for errors
&& is_uploaded_file($_FILES['logofile']['tmp_name'])) { //checks that file is uploaded && is_uploaded_file($_FILES['logofile']['tmp_name'])) { //checks that file is uploaded
header("Location: ../infopage.html?e=manager.html=Kann_Datei_nicht_laden."); echo json_encode(array("status" => "ERROR","msg" => "Kann Datei nicht laden"));
exit(); return;
} }
if(!file_exists($_FILES['logofile']['tmp_name']) || !is_uploaded_file($_FILES['logofile']['tmp_name'])) { if(!file_exists($_FILES['logofile']['tmp_name']) || !is_uploaded_file($_FILES['logofile']['tmp_name'])) {
header("Location: ../infopage.html?e=manager.html=Datei_nicht_angegeben."); echo json_encode(array("status" => "ERROR","msg" => "Datei nicht angegeben"));
exit(); return;
} }
if ($_FILES['logofile']['error'] != UPLOAD_ERR_OK //checks for errors if ($_FILES['logofile']['error'] != UPLOAD_ERR_OK //checks for errors
&& is_uploaded_file($_FILES['logofile']['tmp_name'])) { //checks that file is uploaded && is_uploaded_file($_FILES['logofile']['tmp_name'])) { //checks that file is uploaded
header("Location: ../infopage.html?e=manager.html=Kann_Datei_nicht_laden."); echo json_encode(array("status" => "ERROR","msg" => "Kann Datei nicht laden"));
exit(); return;
} }
$pdo = DbUtils::openDbAndReturnPdoStatic(); $pdo = DbUtils::openDbAndReturnPdoStatic();
@ -2253,8 +2253,7 @@ class Admin {
self::changeItemInTable($pdo, "logoimg", $imageScaled, "%logo%"); self::changeItemInTable($pdo, "logoimg", $imageScaled, "%logo%");
header("Location: ../infopage.html?i=manager.html=Import_war_erfolgreich."); /* Browser umleiten */ echo json_encode(array("status" => "OK"));
exit;
} }
private static function returnInRange($aVal,$min,$max, $default) { private static function returnInRange($aVal,$min,$max, $default) {

3
webapp/php/contenthandler.php
View File

@ -7,6 +7,7 @@ require_once ('products.php');
require_once ('roomtables.php'); require_once ('roomtables.php');
require_once ('reports.php'); require_once ('reports.php');
require_once ('bill.php'); require_once ('bill.php');
require_once ('vouchermanager.php');
require_once ('rksv.php'); require_once ('rksv.php');
require_once ('closing.php'); require_once ('closing.php');
require_once ('printqueue.php'); require_once ('printqueue.php');
@ -107,6 +108,8 @@ if ($module == 'admin') {
Demodata::handleCommand($command); Demodata::handleCommand($command);
} else if ($module == 'tse') { } else if ($module == 'tse') {
Tse::handleCommand($command); Tse::handleCommand($command);
} else if ($module == 'vouchers') {
Vouchermanager::handleCommand($command);
} }

2
webapp/php/customers.php
View File

@ -892,7 +892,7 @@ class Customers {
$txt = "<head>"; $txt = "<head>";
$txt .= "<title>" . self::$CUS_OVERVIEW[$lang] . "</title>"; $txt .= "<title>" . self::$CUS_OVERVIEW[$lang] . "</title>";
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">'; $txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=2.0.1">'; $txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=2.0.2">';
$txt .= "</head>"; $txt .= "</head>";
return $txt; return $txt;
} }

2
webapp/php/debug.php
View File

@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
if (strlen($status) > 150) { if (strlen($status) > 150) {
$status = substr($status, 0,149); $status = substr($status, 0,149);
} }
$version = "2.0.1"; $version = "2.0.2";
$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion); $arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
} else { } else {

2
webapp/php/reservation.php
View File

@ -236,7 +236,7 @@ class Reservation {
$txt = "<html><head>"; $txt = "<html><head>";
$txt .= "<title>Reservierungsübersicht</title>"; $txt .= "<title>Reservierungsübersicht</title>";
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">'; $txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=2.0.1">'; $txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=2.0.2">';
$txt .= "</head>"; $txt .= "</head>";
$txt .= "<body>"; $txt .= "<body>";
$txt .= "<h1>Reservierungsübersicht für $day.$month.$year</h1><p>"; $txt .= "<h1>Reservierungsübersicht für $day.$month.$year</h1><p>";

2
webapp/php/roomtables.php
View File

@ -638,7 +638,7 @@ class Roomtables {
$txt = "<html><head>"; $txt = "<html><head>";
$txt .= "<title>Tisch QR-Codes für die Gastbestellung</title>"; $txt .= "<title>Tisch QR-Codes für die Gastbestellung</title>";
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">'; $txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=2.0.1">'; $txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=2.0.2">';
$txt .= "</head>"; $txt .= "</head>";
$txt .= "<body>"; $txt .= "<body>";
$txt .= "<h1>Tisch QR-Codes für die Gastbestellung</h1><p>"; $txt .= "<h1>Tisch QR-Codes für die Gastbestellung</h1><p>";

2
webapp/php/utilities/osqrcode.php
View File

@ -36,7 +36,7 @@ class OsQrcode {
readfile(__DIR__. '/../../img/oops.png'); readfile(__DIR__. '/../../img/oops.png');
return; return;
} else { } else {
$text = $serverurl . "/nfclogin.php?a=" . $passhash . "_" . $userid . "v=2.0.1"; $text = $serverurl . "/nfclogin.php?a=" . $passhash . "_" . $userid . "v=2.0.2";
QRcode::png($text); QRcode::png($text);
} }
} }

10
webapp/php/utilities/version.php
View File

@ -1487,9 +1487,10 @@ class Version {
// Food: erm. Steuersatz -> needs to be put 5%, Drinks: allg. Steuersatz -> needs to be put to 16% // Food: erm. Steuersatz -> needs to be put 5%, Drinks: allg. Steuersatz -> needs to be put to 16%
self::execSql($pdo, "ALTER TABLE %products% MODIFY tax INT NULL DEFAULT NULL"); self::execSql($pdo, "ALTER TABLE %products% MODIFY tax INT NULL DEFAULT NULL");
self::execSql($pdo, "UPDATE %products% P, %prodtype% T SET P.tax='2' WHERE P.category=T.id AND T.kind='0'"); self::execSql($pdo, "UPDATE %products% P, %prodtype% T SET P.tax='2' WHERE P.category=T.id AND T.kind='0'");
self::execSql($pdo, "UPDATE %products% P, %prodtype% T SET P.tax='1',P.togotax='1' WHERE P.category=T.id AND T.kind='1'"); self::execSql($pdo, "UPDATE %products% P, %prodtype% T SET P.tax='1' WHERE P.category=T.id AND T.kind='1'");
self::execSql($pdo, "ALTER TABLE %products% ADD togotax INT NULL DEFAULT NULL AFTER tax"); self::execSql($pdo, "ALTER TABLE %products% ADD togotax INT NULL DEFAULT NULL AFTER tax");
self::execSql($pdo, "UPDATE %products% SET togotax='2'"); self::execSql($pdo, "UPDATE %products% SET togotax='2'");
self::execSql($pdo, "UPDATE %products% P, %prodtype% T SET P.togotax='1' WHERE P.category=T.id AND T.kind='1'");
self::execSql($pdo, "ALTER TABLE %histprod% MODIFY tax INT NULL DEFAULT NULL"); self::execSql($pdo, "ALTER TABLE %histprod% MODIFY tax INT NULL DEFAULT NULL");
self::execSql($pdo, "ALTER TABLE %histprod% ADD togotax INT NULL DEFAULT NULL AFTER tax"); self::execSql($pdo, "ALTER TABLE %histprod% ADD togotax INT NULL DEFAULT NULL AFTER tax");
self::insertOrUpdateConfigItem($pdo, 'tax', '16.0'); self::insertOrUpdateConfigItem($pdo, 'tax', '16.0');
@ -1539,6 +1540,10 @@ class Version {
} }
} }
public static function upd_2001_2002($pdo, $prefix, $dbname) {
return array(true);
}
public static $updateOrder = array( public static $updateOrder = array(
"1.3.0" => array("upd_1300_1301","1.3.1"), "1.3.0" => array("upd_1300_1301","1.3.1"),
"1.3.1" => array("upd_1301_1302","1.3.2"), "1.3.1" => array("upd_1301_1302","1.3.2"),
@ -1632,7 +1637,8 @@ class Version {
"1.6.8" => array("upd_1608_1609","1.6.9"), "1.6.8" => array("upd_1608_1609","1.6.9"),
"1.6.9" => array("upd_1609_1610","1.6.10"), "1.6.9" => array("upd_1609_1610","1.6.10"),
"1.6.10" => array("upd_1610_2000","2.0.0"), "1.6.10" => array("upd_1610_2000","2.0.0"),
"2.0.0" => array("upd_2000_2001","2.0.1") "2.0.0" => array("upd_2000_2001","2.0.1"),
"2.0.1" => array("upd_2001_2002","2.0.2")
); );
public static function runUpdateProcess($pdo,$prefix, $dbname, $untilVersion,$checkValidVersion) { public static function runUpdateProcess($pdo,$prefix, $dbname, $untilVersion,$checkValidVersion) {

39
webapp/php/vouchermanager.php Normal file
View File

@ -0,0 +1,39 @@
<?php
class Vouchermanager {
public static function handleCommand($command) {
if (!self::hasCurrentUserBillRights()) {
echo json_encode(array("status" => "ERROR","msg" => "Fehlender Benutzerrechte"));
return;
}
if ($command == "getvouchers") {
$pdo = DbUtils::openDbAndReturnPdoStatic();
$vouchers = Vouchermanager::getvouchers($pdo);
echo json_encode($vouchers);
}
}
private static function hasCurrentUserBillRights() {
if (session_id() == '') {
session_start();
}
if (!isset($_SESSION['angemeldet']) || !$_SESSION['angemeldet']) {
return false;
} else {
return ($_SESSION['right_bill']);
}
}
private static function getvouchers($pdo) {
$decpoint = CommonUtils::getConfigValue($pdo, 'decpoint', '.');
$currency = CommonUtils::getConfigValue($pdo, 'currency', '');
$creatoruserSql = "COALESCE((SELECT username FROM %user% U WHERE U.id=creatorid),'')";
$redeemeruserSql = "COALESCE((SELECT username FROM %user% U WHERE U.id=redeemerid),'')";
$sql = "SELECT V.id,creationdate,V.name,COALESCE(redeemdate,'') as redeemdate,creatorid,$creatoruserSql as creatoruser,$redeemeruserSql as redeemeruser,CONCAT(REPLACE(ROUND(price,2),'.','$decpoint'),' ','$currency') as price,ordertype,COALESCE(removed,0) as removed FROM %vouchers% V ";
$sql .= " INNER JOIN %queue% Q ON Q.voucherid=V.id WHERE ordertype=?";
$result = CommonUtils::fetchSqlAll($pdo, $sql, array(DbUtils::$ORDERTYPE_1ZweckKauf));
return array("status" => "OK","msg" => $result);
}
}

4
webapp/pickups.html
View File

@ -5,7 +5,7 @@
<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"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.2">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,7 +13,7 @@
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <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="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" /> <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.min.js"></script>

4
webapp/preferences.html
View File

@ -5,7 +5,7 @@
<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"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.2">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,7 +13,7 @@
<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-1.11.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet"> <link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script> <script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
</head> </head>

8
webapp/products.html
View File

@ -7,16 +7,16 @@
<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"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.2">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
<script src="elements/product.js?v=2.0.1"></script> <script src="elements/product.js?v=2.0.2"></script>
<script src="elements/extra.js?v=2.0.1"></script> <script src="elements/extra.js?v=2.0.2"></script>
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet"> <link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script> <script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
</head> </head>

4
webapp/productsdesktop.php
View File

@ -4,7 +4,7 @@
<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"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.2">
<link rel="stylesheet" href="css/ospage.css" /> <link rel="stylesheet" href="css/ospage.css" />
<link rel="stylesheet" href="css/tablepanel.css" /> <link rel="stylesheet" href="css/tablepanel.css" />
@ -15,7 +15,7 @@
<script src="php/3rdparty/jquery-2.2.4.min.js"></script> <script src="php/3rdparty/jquery-2.2.4.min.js"></script>
<script src="php/3rdparty/jqueryui1-12-0/jquery-ui.min.js"></script> <script src="php/3rdparty/jqueryui1-12-0/jquery-ui.min.js"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
<script> <script>

4
webapp/rating.html
View File

@ -7,14 +7,14 @@
<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"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.2">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
</head> </head>
<body> <body>

4
webapp/reports.html
View File

@ -7,14 +7,14 @@
<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"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.2">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<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-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
<script src="elements/rating.js"></script> <script src="elements/rating.js"></script>
</head> </head>

12
webapp/reservation.html
View File

@ -5,8 +5,8 @@
<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"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.2">
<link rel="stylesheet" type="text/css" href="css/osdatepicker.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/osdatepicker.css?v=2.0.2">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -14,10 +14,10 @@
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <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="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="elements/tablemap.js"></script> <script src="elements/tablemap.js"></script>
<script src="elements/reservation.js?v=2.0.1"></script> <script src="elements/reservation.js?v=2.0.2"></script>
<script src="elements/osdatepicker.js?v=2.0.1"></script> <script src="elements/osdatepicker.js?v=2.0.2"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" /> <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.min.js"></script>
@ -627,7 +627,7 @@ function bindCancelButtn() {
var year = date.getFullYear(); var year = date.getFullYear();
var dateStr = year + "-" + month + "-" + day; var dateStr = year + "-" + month + "-" + day;
setTimeout(function(){document.location.href = "reservation.html?v=2.0.1&date=" + dateStr;},500); setTimeout(function(){document.location.href = "reservation.html?v=2.0.2&date=" + dateStr;},500);
}); });
} }

8
webapp/sumuphandler.php
View File

@ -14,7 +14,7 @@
<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-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
</head> </head>
<body> <body>
@ -30,7 +30,7 @@ var SUM_REASON = ["Grund","Reason","Razón"];
var SUM_CANCEL_ITEM = ["Stornierung","Cancellation","Revocación"]; var SUM_CANCEL_ITEM = ["Stornierung","Cancellation","Revocación"];
var SUM_CANCELLATION_OK = ["Die Zahlung wurde in OrderSprinter storniert.","The payment was cancelled in OrderSprinter.","El pago se canceló en OrderSprinter."]; var SUM_CANCELLATION_OK = ["Die Zahlung wurde in OrderSprinter storniert.","The payment was cancelled in OrderSprinter.","El pago se canceló en OrderSprinter."];
var nextpage = "paydesk.html?version=2.0.1"; var nextpage = "paydesk.html?version=2.0.2";
var lang; var lang;
@ -84,10 +84,10 @@ function setLanguage(language) {
if (nextPage == "p") { if (nextPage == "p") {
$("#nextpagebtntxt").html(SUM_TO_PAYMENT[lang]); $("#nextpagebtntxt").html(SUM_TO_PAYMENT[lang]);
nextpage = "paydesk.html?t=" + tableid + "&version=2.0.1"; nextpage = "paydesk.html?t=" + tableid + "&version=2.0.2";
} else { } else {
$("#nextpagebtntxt").html(SUM_TO_ORDER[lang]); $("#nextpagebtntxt").html(SUM_TO_ORDER[lang]);
nextpage = "waiter.html?version=2.0.1"; nextpage = "waiter.html?version=2.0.2";
} }
var txt = "<table class='viewtable'>"; var txt = "<table class='viewtable'>";

4
webapp/supplydesk.html
View File

@ -5,7 +5,7 @@
<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"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.2">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,7 +13,7 @@
<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-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
<style> <style>
#tableWithPreparedProds,#tableWithDeliveredEntries,#headertableToCook #tableWithPreparedProds,#tableWithDeliveredEntries,#headertableToCook

4
webapp/tasks.html
View File

@ -5,7 +5,7 @@
<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"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.2">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,7 +13,7 @@
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <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="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" /> <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.min.js"></script>

4
webapp/timetracking.html
View File

@ -5,7 +5,7 @@
<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"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.2">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,7 +13,7 @@
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <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="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=2.0.1"></script> <script src="utilities.js?v=2.0.2"></script>
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" /> <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.min.js"></script>

6
webapp/waiter.html
View File

File diff suppressed because one or more lines are too long

26
webapp/waiterdesktop.php
View File

File diff suppressed because one or more lines are too long