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

OrderSprinter 2.0.3

This commit is contained in:
Geno 2020-11-19 23:14:58 +01:00
parent dfa2aa8b1b
commit 074b379084
46 changed files with 205 additions and 160 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.2" /> <link rel="stylesheet" href="css/gueststyle.css?v=2.0.3" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=2.0.2" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=2.0.3" />
<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.2&nbsp;&nbsp;</div> <div class="ui-block-b grid_right" id="versioninfo">2.0.3&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.2">'; echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=2.0.3">';
echo "</head>"; echo "</head>";
echo "<body><div class=surround>"; echo "<body><div class=surround>";
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 2.0.2</span><br><br>"; echo "<span class=headerline>Installation OrderSprinter-Gastsystem 2.0.3</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/javaprinter/javaprinter.jar
View File

Binary file not shown.

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.2"); Database::setVersion($pdo,$prefix,"2.0.3");
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
tseconnector/swissbit/tseconnector.jar
View File

Binary file not shown.

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.2"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.3">
<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.2"></script> <script src="utilities.js?v=2.0.3"></script>
<script src="kitchenbar.js?v=2.0.2"></script> <script src="kitchenbar.js?v=2.0.3"></script>
<style> <style>
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook #tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook

6
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.2"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.3">
<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.2"></script> <script src="utilities.js?v=2.0.3"></script>
<script src="elements/customers.js?v=2.0.2"></script> <script src="elements/customers.js?v=2.0.3"></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.2"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.3">
<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.2"></script> <script src="utilities.js?v=2.0.3"></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.2",'_blank'); window.open("php/contenthandler.php?module=roomtables&command=tableqrcodes&v=2.0.3",'_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.2"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.3">
<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.2"></script> <script src="utilities.js?v=2.0.3"></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.2"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.3">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.2"> <link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.3">
<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.2"></script> <script src="utilities.js?v=2.0.3"></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.2"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.3">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.2"> <link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.3">
<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.2"></script> <script src="utilities.js?v=2.0.3"></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.2"},250); setTimeout(function(){document.location.href = "index.html?v=2.0.3"},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.2"},500); setTimeout(function(){document.location.href = "install.html?v=2.0.3"},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.2&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.3&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.2&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.3&style=always" style="max-height:150px;"/></div>
<div class="loginarea"> <div class="loginarea">
<form method="post"> <form method="post">

4
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.2"> <link rel="stylesheet" type="text/css" href="css/installstyle.css?v=2.0.3">
<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,7 +970,7 @@ 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.2</button> <button id="updatebtn" class="updatebtn">Update -> 2.0.3</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>

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.2"; $installerVersion = "2.0.3";
$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.2"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.3">
<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.2"></script> <script src="utilities.js?v=2.0.3"></script>
<script src="kitchenbar.js?v=2.0.2"></script> <script src="kitchenbar.js?v=2.0.3"></script>
<style> <style>
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook #tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook

57
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.2"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.3">
<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.2"></script> <script src="utilities.js?v=2.0.3"></script>
<script src="elements/tablemap.js?v=2.0.2"></script> <script src="elements/tablemap.js?v=2.0.3"></script>
<script src="elements/roommap.js?v=2.0.2"></script> <script src="elements/roommap.js?v=2.0.3"></script>
<script src="elements/groundplan.js?v=2.0.2"></script> <script src="elements/groundplan.js?v=2.0.3"></script>
<script src="elements/tse.js?v=2.0.2"></script> <script src="elements/tse.js?v=2.0.3"></script>
<script src="elements/closing.js?v=2.0.2"></script> <script src="elements/closing.js?v=2.0.3"></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>
@ -402,7 +402,6 @@ var MAN_SHOWPAYMENT8 = ["Gast","Guest","Huésped"];
var MAN_DBLOG = ["Debug-Logging","Debug logging","Debug logging"]; var MAN_DBLOG = ["Debug-Logging","Debug logging","Debug logging"];
var MAN_SHOWTRANSFERBTNS = ["'Bestellung senden'- und/oder 'Arbeitsbon'-Button einblenden","Show buttons for send orders and/or work receipts","Mostrar botones para transmitir ordenes"]; var MAN_SHOWTRANSFERBTNS = ["'Bestellung senden'- und/oder 'Arbeitsbon'-Button einblenden","Show buttons for send orders and/or work receipts","Mostrar botones para transmitir ordenes"];
var MAN_PRINT_EXTRAS = ["Extras auf Kassenbon","Print extras on receipts","Imprimir extras en tiquet"]; var MAN_PRINT_EXTRAS = ["Extras auf Kassenbon","Print extras on receipts","Imprimir extras en tiquet"];
var MAN_PRINT_EXTRAS_HINT = ["Hinweis: Extras auf Kassenbon erst ab Printserverversion 1.4.17 möglich.","Hint: Extras on receipt require printserver version 1.4.17+","Nota: Imprimir extras exije printserver 1.4.17+"];
var MAN_FORCE_PRINT = ["Erzwinge Bondruck","Force print of receipt","Siempre imprimir factura"]; var MAN_FORCE_PRINT = ["Erzwinge Bondruck","Force print of receipt","Siempre imprimir factura"];
var MAN_PRICE_IN_LIST = ["Preisangabe neben Produkt","List price next to product","Mostrar precio en lista de productos"]; var MAN_PRICE_IN_LIST = ["Preisangabe neben Produkt","List price next to product","Mostrar precio en lista de productos"];
var MAN_GUEST_JOB_PRINT = ["Gastbestelljob drucken","Print guest order","Imprimir orden de remote"]; var MAN_GUEST_JOB_PRINT = ["Gastbestelljob drucken","Print guest order","Imprimir orden de remote"];
@ -913,7 +912,6 @@ function setLanguage(l) {
$("#printerInstanceHint").html(MAN_PRINSTANCE_HINT[l]); $("#printerInstanceHint").html(MAN_PRINSTANCE_HINT[l]);
$("#guesttimeouthint").html(MAN_GUESTTIMEOUT_HINT[l]); $("#guesttimeouthint").html(MAN_GUESTTIMEOUT_HINT[l]);
$("#printextrashint").html(MAN_PRINT_EXTRAS_HINT[l]);
$("#serversectiontxt").html(MAN_SERVER_SECTION_TXT[l]); $("#serversectiontxt").html(MAN_SERVER_SECTION_TXT[l]);
$("#applysectiontxt").html(MAN_APPLY_SECTION_TXT[l]); $("#applysectiontxt").html(MAN_APPLY_SECTION_TXT[l]);
@ -1703,7 +1701,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.2"; document.location.href = "index.html?v=2.0.3";
},250); },250);
} }
}, },
@ -2099,37 +2097,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.2",null,handleGetRecTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getrectemplate&v=2.0.3",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.2",null,handleGetClsTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getclstemplate&v=2.0.3",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.2",null,handleGetCashTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getcashtemplate&v=2.0.3",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.2",null,handleGetFoodTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getfoodworktemplate&v=2.0.3",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.2",null,handleGetDrinkTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getdrinkworktemplate&v=2.0.3",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.2",null,handleGetCancelTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getcanceltemplate&v=2.0.3",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.2",null,handleGetPickupTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getpickuptemplate&v=2.0.3",null,handleGetPickupTemplate,null);
}); });
$("#changeConfig").off("click").on("click", function (e) { $("#changeConfig").off("click").on("click", function (e) {
@ -2257,38 +2255,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.2"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=2.0.3";
}); });
$("#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.2"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=2.0.3";
}); });
$("#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.2"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=2.0.3";
}); });
$("#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.2",null,handleFtpResult,null); doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=2.0.3",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.2",'_blank'); window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=2.0.3",'_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.2"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=2.0.3";
}); });
$("#golive").off("click").on("click", function (e) { $("#golive").off("click").on("click", function (e) {
@ -2486,7 +2484,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.2&mode=onlyupdate&n=" + millis; document.location.href = "install.html?v=2.0.3&mode=onlyupdate&n=" + millis;
},250); },250);
} }
} }
@ -2865,9 +2863,17 @@ function createClosing(closingresult) {
closing.clearCountingFields(); closing.clearCountingFields();
var decpoint = $("#admin-page").data("decpoint"); var decpoint = $("#admin-page").data("decpoint");
var msg = closingresult.msg; var msg = closingresult.msg;
var allsales = (msg.result.toString()).replace(".", decpoint);
var closingid = msg.closingid; var closingid = msg.closingid;
var doPrint = closingresult.print; var doPrint = closingresult.print;
alert("Errechnete Summe des Tagesabschlusses (" + $("#admin-page").data("currency") + "): " + (msg.result.toString()).replace(".", decpoint)); var counting = closingresult.counting;
var counted = (closingresult.counted.toString()).replace(".",decpoint);
var curr = $("#admin-page").data("currency");
var output = "Errechneter Gesamtumsatz des Abschlusses: " + allsales + " " + curr;
if (counting == 1) {
output += ". Gezählt wurde folgender Bargeldbestand: " + counted + " " + curr;
}
alert(output);
checkForFirstAndLastClosing(); checkForFirstAndLastClosing();
getExpectedCashSumsForNextClosing(); getExpectedCashSumsForNextClosing();
@ -4190,7 +4196,6 @@ $(document).on("pageinit", "#admin-page", function () {
</div> </div>
<div id="partOfForceprint"></div> <div id="partOfForceprint"></div>
<div id="partOfPrintextras"></div> <div id="partOfPrintextras"></div>
<i id="printextrashint" style="padding-left: 50px;padding-right: 50px;">Hinweis: erfordert 1.4.17</i>
<div id="partOfPrintextraprice"></div> <div id="partOfPrintextraprice"></div>
<div id="partOfShowhostprint"></div> <div id="partOfShowhostprint"></div>
<div id="partAddrecPrinterIfServerPrint"> <div id="partAddrecPrinterIfServerPrint">

8
webapp/paydesk.html
View File

File diff suppressed because one or more lines are too long

42
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.2"); echo json_encode($view . "?v=2.0.3");
} }
} }
@ -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.2"); } if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=2.0.3"); }
} else { } else {
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=2.0.2"); } if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=2.0.3"); }
} }
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=2.0.2"); } if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=2.0.3"); }
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=2.0.2"); } if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=2.0.3"); }
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=2.0.2"); } if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=2.0.3"); }
if ($_SESSION['modus'] == 0) { if ($_SESSION['modus'] == 0) {
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=2.0.2"); } if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=2.0.3"); }
} }
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=2.0.2"); } if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=2.0.3"); }
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=2.0.2"); } if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=2.0.3"); }
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=2.0.2"); } if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=2.0.3"); }
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=2.0.2"); } if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=2.0.3"); }
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=2.0.2"); } if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=2.0.3"); }
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=2.0.2"); } if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=2.0.3"); }
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=2.0.2"); } if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=2.0.3"); }
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=2.0.2"); } if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=2.0.3"); }
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=2.0.2"); } if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=2.0.3"); }
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?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.3"); }
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=2.0.2"); $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=2.0.3");
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=2.0.2"); } if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=2.0.3"); }
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=2.0.2"); $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=2.0.3");
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=2.0.2"); $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=2.0.3");
} }
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");

4
webapp/php/bill.php
View File

@ -1078,9 +1078,9 @@ class Bill {
$stmt->execute(array($row->brutto + $row->prevbrutto,$row->netto + $row->prevnetto,$lastId)); $stmt->execute(array($row->brutto + $row->prevbrutto,$row->netto + $row->prevnetto,$lastId));
$moneyTwoDigits = number_format($money, 2, '.', ''); $moneyTwoDigits = number_format($money, 2, '.', '');
if ($cashtype == self::$CASHTYPE_Privateinlage["value"]) { if (($cashtype == self::$CASHTYPE_Privateinlage["value"]) || ($cashtype == self::$CASHTYPE_Privatentnahme["value"])) {
$signStr = "Beleg^" . implode('_',array('0.00','0.00','0.00','0.00',$moneyTwoDigits)) . "^" . $moneyTwoDigits . ":Bar"; $signStr = "Beleg^" . implode('_',array('0.00','0.00','0.00','0.00',$moneyTwoDigits)) . "^" . $moneyTwoDigits . ":Bar";
} else if ($cashtype == self::$CASHTYPE_Einzahlung["value"]) { } else if (($cashtype == self::$CASHTYPE_Einzahlung["value"]) || ($cashtype == self::$CASHTYPE_Auszahlung["value"])) {
$signStr = "Beleg^" . implode('_',array($moneyTwoDigits,'0.00','0.00','0.00','0.00')) . "^" . $moneyTwoDigits . ":Bar"; $signStr = "Beleg^" . implode('_',array($moneyTwoDigits,'0.00','0.00','0.00','0.00')) . "^" . $moneyTwoDigits . ":Bar";
} else if ($cashtype == self::$CASHTYPE_TrinkgeldAN["value"]) { } else if ($cashtype == self::$CASHTYPE_TrinkgeldAN["value"]) {
$signStr = "Beleg^" . implode('_',array('0.00','0.00','0.00','0.00',$moneyTwoDigits)) . "^" . $moneyTwoDigits . ":Bar"; $signStr = "Beleg^" . implode('_',array('0.00','0.00','0.00','0.00',$moneyTwoDigits)) . "^" . $moneyTwoDigits . ":Bar";

13
webapp/php/closing.php
View File

@ -336,8 +336,9 @@ $sql = "SELECT COALESCE(SUM(B.brutto),'0.00') as sumbrutto FROM %bill% B,%closin
$result = CommonUtils::fetchSqlAll($pdo, $sql,array($newClosingId)); $result = CommonUtils::fetchSqlAll($pdo, $sql,array($newClosingId));
$salesAndCashOps = doubleVal($result[0]['sumbrutto']); $salesAndCashOps = doubleVal($result[0]['sumbrutto']);
$counted = $prevCountedVal + $salesAndCashOps;
$sql = "UPDATE %closing% SET counted=? WHERE id=?"; $sql = "UPDATE %closing% SET counted=? WHERE id=?";
CommonUtils::execSql($pdo, $sql, array($prevCountedVal + $salesAndCashOps,$newClosingId)); CommonUtils::execSql($pdo, $sql, array($counted,$newClosingId));
} }
$sql = "SELECT FORMAT(COALESCE(SUM(brutto),'0.00'),2) as cashsum FROM %closing% C "; $sql = "SELECT FORMAT(COALESCE(SUM(brutto),'0.00'),2) as cashsum FROM %closing% C ";
$sql .= " INNER JOIN %bill% B ON B.closingid=C.id "; $sql .= " INNER JOIN %bill% B ON B.closingid=C.id ";
@ -363,6 +364,8 @@ CommonUtils::execSql($pdo, $sql, array($newClosingId));
self::signValueByTseAndUpdateClosing($pdo, $newClosingId, "Kassenabschluss $newClosingId - $closingTime"); self::signValueByTseAndUpdateClosing($pdo, $newClosingId, "Kassenabschluss $newClosingId - $closingTime");
CommonUtils::execSql($pdo, "UPDATE %operations% SET clsid=? WHERE clsid is null", array($newClosingId));
// commit must before email, because there direct access to db happens // commit must before email, because there direct access to db happens
$pdo->commit(); $pdo->commit();
@ -399,7 +402,7 @@ CommonUtils::keepOnlyLastLog($pdo);
// call plugin after completion of closing // call plugin after completion of closing
CommonUtils::callPlugin($pdo, "createClosing", "after"); CommonUtils::callPlugin($pdo, "createClosing", "after");
return(array("status" => "OK", "msg" => $content, "print" => $doPrint)); return(array("status" => "OK", "msg" => $content, "print" => $doPrint, "counting" => $counting, "counted" => $counted));
} }
private function getSumOfBillsWithClosingId($pdo,$closingid,$onlyBar) { private function getSumOfBillsWithClosingId($pdo,$closingid,$onlyBar) {
@ -1029,7 +1032,7 @@ $decpoint = ".";
$masterData = self::getClosingMasterDataAtClsTime($pdo, $closingid); $masterData = self::getClosingMasterDataAtClsTime($pdo, $closingid);
$sql = "select id,closingdate,billcount,REPLACE(billsum,'.','$decpoint') as billsum,remark,signature,counting,REPLACE(counted,'.','$decpoint') as counted from %closing% where id=?"; $sql = "select id,closingdate,billcount,REPLACE(billsum,'.','$decpoint') as billsum,remark,signature,counting,REPLACE(counted,'.','$decpoint') as counted,counted as countedorig from %closing% where id=?";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); $stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
$stmt->execute(array($closingid)); $stmt->execute(array($closingid));
$closingpart = $stmt->fetchObject(); $closingpart = $stmt->fetchObject();
@ -1044,17 +1047,19 @@ return null;
} }
} }
$barTotalAfterTEPointDecpoint = self::getBarTotalAfterTE($pdo,$closingid,".");
$barTotalBeforeTE = self::getBarTotalBeforeTE($pdo,$closingid,$decpoint); $barTotalBeforeTE = self::getBarTotalBeforeTE($pdo,$closingid,$decpoint);
$barTotalAfterTE = self::getBarTotalAfterTE($pdo,$closingid,$decpoint); $barTotalAfterTE = self::getBarTotalAfterTE($pdo,$closingid,$decpoint);
$diffSollIst = 0.0; $diffSollIst = 0.0;
$counting = $closingpart->counting; $counting = $closingpart->counting;
$counted = $closingpart->counted; $counted = $closingpart->counted;
$countedWithPoint = $closingpart->countedorig;
if ($counting == 1) { if ($counting == 1) {
$sql = "SELECT id,value,count,iscoin,IF(iscoin='1','Münzen','Banknoten') as coinsornotes,"; $sql = "SELECT id,value,count,iscoin,IF(iscoin='1','Münzen','Banknoten') as coinsornotes,";
$sql .= "REPLACE(FORMAT((count*value*IF(iscoin='1',1,100))/100.0,2),'.','$decpoint') as sum,IF(iscoin='1',1,100) as factor "; $sql .= "REPLACE(FORMAT((count*value*IF(iscoin='1',1,100))/100.0,2),'.','$decpoint') as sum,IF(iscoin='1',1,100) as factor ";
$sql .= "FROM %counting% WHERE clsid=? ORDER BY iscoin DESC,value"; $sql .= "FROM %counting% WHERE clsid=? ORDER BY iscoin DESC,value";
$countingprotocol = CommonUtils::fetchSqlAll($pdo, $sql, array($closingid)); $countingprotocol = CommonUtils::fetchSqlAll($pdo, $sql, array($closingid));
$diffSollIst = number_format($barTotalAfterTE - $counted,2,$decpoint,''); $diffSollIst = number_format($barTotalAfterTEPointDecpoint - $countedWithPoint,2,$decpoint,'');
} else { } else {
$countingprotocol = array(); $countingprotocol = array();
} }

0
webapp/php/config.php Normal file → Executable file
View File

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.2">'; $txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=2.0.3">';
$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.2"; $version = "2.0.3";
$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/queuecontent.php
View File

@ -2032,6 +2032,8 @@ class QueueContent {
} }
$sql = $sql . " ORDER BY tableno"; $sql = $sql . " ORDER BY tableno";
$tmp = DbUtils::substTableAlias($sql);
$dbresult = CommonUtils::fetchSqlAll($pdo, $sql, null); $dbresult = CommonUtils::fetchSqlAll($pdo, $sql, null);
$arrayOfProdsForTable = array(); $arrayOfProdsForTable = array();

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.2">'; $txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=2.0.3">';
$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.2">'; $txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=2.0.3">';
$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>";

47
webapp/php/utilities/dsfinvk.php
View File

@ -12,7 +12,7 @@ class Dsfinvk {
array("header" => "Bonpos_Ust", "fileprefix" => "bonposust_", "csvfilename" => "lines_vat.csv", "fct" => "bonposust"), array("header" => "Bonpos_Ust", "fileprefix" => "bonposust_", "csvfilename" => "lines_vat.csv", "fct" => "bonposust"),
array("header" => "Bonpos_Preisfindung", "fileprefix" => "bonpospreis_", "csvfilename" => "itemamounts.csv", "fct" => "bonpospreisfindung"), array("header" => "Bonpos_Preisfindung", "fileprefix" => "bonpospreis_", "csvfilename" => "itemamounts.csv", "fct" => "bonpospreisfindung"),
array("header" => "Bonkopf", "fileprefix" => "bonkopf_", "csvfilename" => "transactions.csv", "fct" => "bonkopf"), array("header" => "Bonkopf", "fileprefix" => "bonkopf_", "csvfilename" => "transactions.csv", "fct" => "bonkopf"),
array("header" => "Bonkop_Ust", "fileprefix" => "bonkopfust_", "csvfilename" => "transactions_vat.csv", "fct" => "bonkopfust"), array("header" => "Bonkopf_Ust", "fileprefix" => "bonkopfust_", "csvfilename" => "transactions_vat.csv", "fct" => "bonkopfust"),
array("header" => "Bonkopf_AbrKreis", "fileprefix" => "bonkopfabrkreis_", "csvfilename" => "allocation_groups.csv", "fct" => "bonkopfabrkreis"), array("header" => "Bonkopf_AbrKreis", "fileprefix" => "bonkopfabrkreis_", "csvfilename" => "allocation_groups.csv", "fct" => "bonkopfabrkreis"),
array("header" => "Bonkopf_Zahlarten", "fileprefix" => "bonkopfzahlarten_", "csvfilename" => "datapayment.csv", "fct" => "bonkopfzahlarten"), array("header" => "Bonkopf_Zahlarten", "fileprefix" => "bonkopfzahlarten_", "csvfilename" => "datapayment.csv", "fct" => "bonkopfzahlarten"),
array("header" => "Bon_Referenzen", "fileprefix" => "bonrefs_", "csvfilename" => "references.csv", "fct" => "bonreferenzen"), array("header" => "Bon_Referenzen", "fileprefix" => "bonrefs_", "csvfilename" => "references.csv", "fct" => "bonreferenzen"),
@ -526,7 +526,7 @@ class Dsfinvk {
$ztime = "IF(C.closingdate is not null,CONCAT(DATE(C.closingdate),'T',TIME(C.closingdate)),'')"; $ztime = "IF(C.closingdate is not null,CONCAT(DATE(C.closingdate),'T',TIME(C.closingdate)),'')";
$logTimeFilter = "CASE WHEN O.logtime='0' THEN NULL ELSE O.logtime END"; $logTimeFilter = "CASE WHEN O.logtime='0' THEN NULL ELSE O.logtime END";
$taLogTime = "CONCAT(DATE(from_unixtime($logTimeFilter)),'T',TIME(from_unixtime($logTimeFilter)))"; $taLogTime = "CONCAT(DATE(from_unixtime($logTimeFilter)),'T',TIME(from_unixtime($logTimeFilter)))";
$billvorgang = "(CASE WHEN B.status is null OR status='x' THEN 'Kassenbon' WHEN B.status='s' THEN 'Bonstorno' WHEN B.status='c' THEN 'Barein-/auslage' ELSE '' END)"; $signtxt = "O.signtxt";
$belegtype = DbUtils::$PROCESSTYPE_BELEG; $belegtype = DbUtils::$PROCESSTYPE_BELEG;
$vorgangtype = DbUtils::$PROCESSTYPE_VORGANG; $vorgangtype = DbUtils::$PROCESSTYPE_VORGANG;
@ -565,8 +565,8 @@ class Dsfinvk {
"TSE_TA_VORGANGSART" => array("select" => "$processType","colname" => "vorgangsart","quote" => true), "TSE_TA_VORGANGSART" => array("select" => "$processType","colname" => "vorgangsart","quote" => true),
"TSE_TA_SIGZ" => array("select" => "O.sigcounter","colname" => "sigcounter","quote" => false), "TSE_TA_SIGZ" => array("select" => "O.sigcounter","colname" => "sigcounter","quote" => false),
"TSE_TA_SIG" => array("select" => "O.tsesignature","colname" => "tsesignature","quote" => false), "TSE_TA_SIG" => array("select" => "O.tsesignature","colname" => "tsesignature","quote" => false),
"TSE_TA_VORGANGSDATEN" => array("select" => "$billvorgang","colname" => "vorgang","quote" => true), "TSE_TA_FEHLER" => array("select" => "$tseerror","colname" => "tseerror","quote" => true),
"TSE_TA_FEHLER" => array("select" => "$tseerror","colname" => "tseerror","quote" => true) "TSE_VORGANGSDATEN" => array("select" => "$signtxt","colname" => "vorgang","quote" => true)
); );
$billTableStore = DbUtils::$OPERATION_IN_BILL_TABLE; $billTableStore = DbUtils::$OPERATION_IN_BILL_TABLE;
@ -590,8 +590,8 @@ class Dsfinvk {
"TSE_TA_VORGANGSART" => array("select" => "$processType","colname" => "vorgangsart","quote" => true), "TSE_TA_VORGANGSART" => array("select" => "$processType","colname" => "vorgangsart","quote" => true),
"TSE_TA_SIGZ" => array("select" => "O.sigcounter","colname" => "sigcounter","quote" => false), "TSE_TA_SIGZ" => array("select" => "O.sigcounter","colname" => "sigcounter","quote" => false),
"TSE_TA_SIG" => array("select" => "O.tsesignature","colname" => "tsesignature","quote" => false), "TSE_TA_SIG" => array("select" => "O.tsesignature","colname" => "tsesignature","quote" => false),
"TSE_TA_VORGANGSDATEN" => array("select" => "'Kassenabschluss'","colname" => "vorgang","quote" => true), "TSE_TA_FEHLER" => array("select" => "$tseerror","colname" => "tseerror","quote" => true),
"TSE_TA_FEHLER" => array("select" => "$tseerror","colname" => "tseerror","quote" => true) "TSE_VORGANGSDATEN" => array("select" => "$signtxt","colname" => "vorgang","quote" => true)
); );
$closingTableStore = DbUtils::$OPERATION_IN_CLOSING_TABLE; $closingTableStore = DbUtils::$OPERATION_IN_CLOSING_TABLE;
@ -617,8 +617,8 @@ class Dsfinvk {
"TSE_TA_VORGANGSART" => array("select" => "$processType","colname" => "vorgangsart","quote" => true), "TSE_TA_VORGANGSART" => array("select" => "$processType","colname" => "vorgangsart","quote" => true),
"TSE_TA_SIGZ" => array("select" => "O.sigcounter","colname" => "sigcounter","quote" => false), "TSE_TA_SIGZ" => array("select" => "O.sigcounter","colname" => "sigcounter","quote" => false),
"TSE_TA_SIG" => array("select" => "O.tsesignature","colname" => "tsesignature","quote" => false), "TSE_TA_SIG" => array("select" => "O.tsesignature","colname" => "tsesignature","quote" => false),
"TSE_TA_VORGANGSDATEN" => array("select" => "$queueVorgang","colname" => "vorgang","quote" => true), "TSE_TA_FEHLER" => array("select" => "$tseerror","colname" => "tseerror","quote" => true),
"TSE_TA_FEHLER" => array("select" => "$tseerror","colname" => "tseerror","quote" => true) "TSE_VORGANGSDATEN" => array("select" => "$signtxt","colname" => "vorgang","quote" => true)
); );
$queueTableStore = DbUtils::$OPERATION_IN_QUEUE_TABLE; $queueTableStore = DbUtils::$OPERATION_IN_QUEUE_TABLE;
$sqlQueuetxt = self::createSqlSelects($colsQueue, $fileToSave); $sqlQueuetxt = self::createSqlSelects($colsQueue, $fileToSave);
@ -651,13 +651,20 @@ class Dsfinvk {
private static function stammabschluss($pdo,$fileToSave) { private static function stammabschluss($pdo,$fileToSave) {
$paydeskid = CommonUtils::getConfigValue($pdo, 'paydeskid', 1); $paydeskid = CommonUtils::getConfigValue($pdo, 'paydeskid', 1);
$ztime = "IF(C.closingdate is not null,CONCAT(DATE(C.closingdate),'T',TIME(C.closingdate)),'')"; $ztime = "IF(C.closingdate is not null,CONCAT(DATE(C.closingdate),'T',TIME(C.closingdate)),'')";
$zstartbonid = "select bonid FROM %operations% where id=(SELECT O.id FROM %operations% O WHERE O.clsid=C.id GROUP BY O.id ORDER BY id LIMIT 1)";
$zstarttyperange = "(SELECT (CASE WHEN typerange='" . RANGE_ORDER . "' THEN 'BESTL-' WHEN typerange='" . RANGE_BILL . "' THEN 'BELEG-' WHEN typerange='" . RANGE_CLOSING . "' THEN 'SONST-' ELSE 'Unknown' END) FROM %operations% where id=(SELECT O.id FROM %operations% O WHERE O.clsid=C.id GROUP BY O.id ORDER BY id LIMIT 1))";
$zstartid = "CONCAT($zstarttyperange,($zstartbonid))";
$zstartid = "(SELECT MIN(O.bonid) from %operations% O INNER JOIN %bill% B ON B.opid=O.id WHERE B.closingid=C.id)"; $zendbonid = "select bonid FROM %operations% where id=(SELECT O.id FROM %operations% O WHERE O.clsid=C.id GROUP BY O.id ORDER BY id DESC LIMIT 1)";
$zendid = "(SELECT MAX(O.bonid) from %operations% O INNER JOIN %bill% B ON B.opid=O.id WHERE B.closingid=C.id)"; $zendtyperange = "(SELECT (CASE WHEN typerange='" . RANGE_ORDER . "' THEN 'BESTL-' WHEN typerange='" . RANGE_BILL . "' THEN 'BELEG-' WHEN typerange='" . RANGE_CLOSING . "' THEN 'SONST-' ELSE 'Unknown' END) FROM %operations% where id=(SELECT O.id FROM %operations% O WHERE O.clsid=C.id GROUP BY O.id ORDER BY id DESC LIMIT 1))";
$zendid = "CONCAT($zendtyperange,($zendbonid))";
$billsum = "ROUND(SUM(B.brutto),2)"; $billsum = "ROUND(SUM(B.brutto),2)";
$billcashsum = "ROUND(SUM(CASE WHEN B.paymentid='1' THEN B.brutto ELSE '0.00' END),2)"; $billcashsum = "ROUND(SUM(CASE WHEN B.paymentid='1' THEN B.brutto ELSE '0.00' END),2)";
$loc = self::_getAlpha3CountryCode('C.dsfinvk_country');
$cols = array( $cols = array(
"Z_KASSE_ID" => array("select" => "'$paydeskid'","colname" => "paydeskid","quote" => true), "Z_KASSE_ID" => array("select" => "'$paydeskid'","colname" => "paydeskid","quote" => true),
"Z_ERSTELLUNG" => array("select" => "$ztime","colname" => "zerstellung","quote" => false), "Z_ERSTELLUNG" => array("select" => "$ztime","colname" => "zerstellung","quote" => false),
@ -670,7 +677,7 @@ class Dsfinvk {
"STRASSE" => array("select" => "C.dsfinvk_street","colname" => "street","quote" => true), "STRASSE" => array("select" => "C.dsfinvk_street","colname" => "street","quote" => true),
"PLZ" => array("select" => "C.dsfinvk_postalcode","colname" => "plz","quote" => true), "PLZ" => array("select" => "C.dsfinvk_postalcode","colname" => "plz","quote" => true),
"ORT" => array("select" => "C.dsfinvk_city","colname" => "city","quote" => true), "ORT" => array("select" => "C.dsfinvk_city","colname" => "city","quote" => true),
"LAND" => array("select" => "C.dsfinvk_country","colname" => "country","quote" => true), "LAND" => array("select" => $loc,"colname" => "country","quote" => true),
"STRN" => array("select" => "C.dsfinvk_stnr","colname" => "strn","quote" => true), "STRN" => array("select" => "C.dsfinvk_stnr","colname" => "strn","quote" => true),
"USTID" => array("select" => "C.dsfinvk_ustid","colname" => "ustid","quote" => true), "USTID" => array("select" => "C.dsfinvk_ustid","colname" => "ustid","quote" => true),
"Z_SE_ZAHLUNGEN" => array("select" => "$billsum","colname" => "billsum","quote" => false), "Z_SE_ZAHLUNGEN" => array("select" => "$billsum","colname" => "billsum","quote" => false),
@ -686,9 +693,18 @@ class Dsfinvk {
return $dataPart; return $dataPart;
} }
private static function _getAlpha3CountryCode($field) {
$sql = "(CASE WHEN LOWER(SUBSTRING($field,1,4)) = 'Deut' THEN 'DEU' WHEN LOWER(SUBSTRING($field,1,5)) = 'Germa' THEN 'DEU' ";
$sql .= "WHEN LOWER(SUBSTRING($field,1,5)) = 'Öster' THEN 'AUT' WHEN LOWER(SUBSTRING($field,1,5)) = 'Austr' THEN 'AUT' ";
$sql .= "WHEN LOWER(SUBSTRING($field,1,6)) = 'Schwei' THEN 'CHE' WHEN LOWER(SUBSTRING($field,1,5)) = 'Switz' THEN 'CHE' ";
$sql .= "ELSE $field END)";
return $sql;
}
private static function stammorte($pdo,$fileToSave) { private static function stammorte($pdo,$fileToSave) {
$paydeskid = CommonUtils::getConfigValue($pdo, 'paydeskid', 1); $paydeskid = CommonUtils::getConfigValue($pdo, 'paydeskid', 1);
$ztime = "IF(C.closingdate is not null,CONCAT(DATE(C.closingdate),'T',TIME(C.closingdate)),'')"; $ztime = "IF(C.closingdate is not null,CONCAT(DATE(C.closingdate),'T',TIME(C.closingdate)),'')";
$loc = self::_getAlpha3CountryCode('C.dsfinvk_country');
$cols = array( $cols = array(
"Z_KASSE_ID" => array("select" => "'$paydeskid'","colname" => "paydeskid","quote" => true), "Z_KASSE_ID" => array("select" => "'$paydeskid'","colname" => "paydeskid","quote" => true),
@ -698,7 +714,7 @@ class Dsfinvk {
"LOC_STRASSE" => array("select" => "C.dsfinvk_street","colname" => "street","quote" => true), "LOC_STRASSE" => array("select" => "C.dsfinvk_street","colname" => "street","quote" => true),
"LOC_PLZ" => array("select" => "C.dsfinvk_postalcode","colname" => "plz","quote" => true), "LOC_PLZ" => array("select" => "C.dsfinvk_postalcode","colname" => "plz","quote" => true),
"LOC_ORT" => array("select" => "C.dsfinvk_city","colname" => "city","quote" => true), "LOC_ORT" => array("select" => "C.dsfinvk_city","colname" => "city","quote" => true),
"LOC_LAND" => array("select" => "C.dsfinvk_country","colname" => "country","quote" => true), "LOC_LAND" => array("select" => $loc,"colname" => "country","quote" => true),
"LOC_USTID" => array("select" => "C.dsfinvk_ustid","colname" => "ustid","quote" => true) "LOC_USTID" => array("select" => "C.dsfinvk_ustid","colname" => "ustid","quote" => true)
); );
$sqltxt = self::createSqlSelects($cols, $fileToSave); $sqltxt = self::createSqlSelects($cols, $fileToSave);
@ -794,7 +810,7 @@ class Dsfinvk {
"Z_ERSTELLUNG" => array("select" => "$ztime","colname" => "zerstellung","quote" => false), "Z_ERSTELLUNG" => array("select" => "$ztime","colname" => "zerstellung","quote" => false),
"Z_NR" => array("select" => "COALESCE(C.id,'')","colname" => "clsid","quote" => false), "Z_NR" => array("select" => "COALESCE(C.id,'')","colname" => "clsid","quote" => false),
"UST_SCHLUESSEL" => array("select" => "'$taxkey'","colname" => "akey","quote" => false), "UST_SCHLUESSEL" => array("select" => "'$taxkey'","colname" => "akey","quote" => false),
"UST_SATZ" => array("select" => "ROUND('$taxVal',2)","colname" => "avalue","quote" => false), "UST_SATZ" => array("select" => "ROUND(CAST('$taxVal' as DECIMAL(7,2)),2)","colname" => "avalue","quote" => false),
"UST_BESCHR" => array("select" => "'$taxDesc'","colname" => "aname","quote" => false), "UST_BESCHR" => array("select" => "'$taxDesc'","colname" => "aname","quote" => false),
); );
return "SELECT " . implode(',',self::createSqlSelects($colsTaxSet5, $fileToSave)) . " FROM %closing% C "; return "SELECT " . implode(',',self::createSqlSelects($colsTaxSet5, $fileToSave)) . " FROM %closing% C ";
@ -856,9 +872,9 @@ class Dsfinvk {
"Z_ERSTELLUNG" => array("select" => "$ztime","colname" => "zerstellung","quote" => false), "Z_ERSTELLUNG" => array("select" => "$ztime","colname" => "zerstellung","quote" => false),
"Z_NR" => array("select" => "COALESCE(C.id,'')","colname" => "clsid","quote" => false), "Z_NR" => array("select" => "COALESCE(C.id,'')","colname" => "clsid","quote" => false),
"TSE_ID" => array("select" => "'1'","colname" => "tseid","quote" => false), "TSE_ID" => array("select" => "'1'","colname" => "tseid","quote" => false),
"TSE_SERIAL" => array("select" => "$serialno","colname" => "tseseial","quote" => true, "suspect" => 1), "TSE_SERIAL" => array("select" => "$serialno","colname" => "tseseial","quote" => true),
"TSE_SIG_ALGO" => array("select" => "$sigalg","colname" => "sigalgo","quote" => true), "TSE_SIG_ALGO" => array("select" => "$sigalg","colname" => "sigalgo","quote" => true),
"TSE_ZEITFORMAT" => array("select" => "'unixTime'","colname" => "tsezeitformat","quote" => true, "suspect" => 1), "TSE_ZEITFORMAT" => array("select" => "'unixTime'","colname" => "tsezeitformat","quote" => true),
"TSE_PD_ENCODING" => array("select" => "'UTF-8'","colname" => "encoding","quote" => true), "TSE_PD_ENCODING" => array("select" => "'UTF-8'","colname" => "encoding","quote" => true),
"TSE_PUBLIC_KEY" => array("select" => $pubkey,"colname" => "pubkey","quote" => true), "TSE_PUBLIC_KEY" => array("select" => $pubkey,"colname" => "pubkey","quote" => true),
"TSE_ZERTIFIKAT_I" => array("select" => $certificate1,"colname" => "cert1","quote" => true), "TSE_ZERTIFIKAT_I" => array("select" => $certificate1,"colname" => "cert1","quote" => true),
@ -1045,6 +1061,7 @@ class Dsfinvk {
"Z_ERSTELLUNG" => array("select" => "$ztime","colname" => "zerstellung","quote" => false), "Z_ERSTELLUNG" => array("select" => "$ztime","colname" => "zerstellung","quote" => false),
"Z_NR" => array("select" => "COALESCE(C.id,'')","colname" => "clsid","quote" => false), "Z_NR" => array("select" => "COALESCE(C.id,'')","colname" => "clsid","quote" => false),
"ZAHLART_WAEH" => array("select" => "'$currency'","colname" => "paymentcurrency","quote" => true), "ZAHLART_WAEH" => array("select" => "'$currency'","colname" => "paymentcurrency","quote" => true),
"ZAHLART_BETRAG_WAEH" => array("select" => "ROUND(counted,2)","colname" => "cashsum")
); );
$sqltxt = self::createSqlSelects($cols, $fileToSave); $sqltxt = self::createSqlSelects($cols, $fileToSave);
$allCols = "SELECT " . implode(",",$sqltxt) . " FROM %closing% C "; $allCols = "SELECT " . implode(",",$sqltxt) . " FROM %closing% C ";

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

@ -23,6 +23,8 @@ class Operations {
$range = RANGE_ORDER; $range = RANGE_ORDER;
} else if ($opType == DbUtils::$PROCESSTYPE_BELEG) { } else if ($opType == DbUtils::$PROCESSTYPE_BELEG) {
$range = RANGE_BILL; $range = RANGE_BILL;
} else if ($opType == DbUtils::$PROCESSTYPE_SONSTIGER_VORGANG) {
$range = RANGE_CLOSING;
} }
$sql = "SELECT MAX(COALESCE(bonid,0)) as maxbonid FROM %operations% WHERE typerange=?"; $sql = "SELECT MAX(COALESCE(bonid,0)) as maxbonid FROM %operations% WHERE typerange=?";

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.2"; $text = $serverurl . "/nfclogin.php?a=" . $passhash . "_" . $userid . "v=2.0.3";
QRcode::png($text); QRcode::png($text);
} }
} }

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

@ -1543,6 +1543,19 @@ class Version {
public static function upd_2001_2002($pdo, $prefix, $dbname) { public static function upd_2001_2002($pdo, $prefix, $dbname) {
return array(true); return array(true);
} }
public static function upd_2002_2003($pdo, $prefix, $dbname) {
try {
self::execSql($pdo, "ALTER TABLE %operations% ADD clsid INT NULL");
self::execSql($pdo, "UPDATE %operations% O,%bill% B,%closing% C SET O.clsid=C.id where B.opid=O.id AND B.closingid=C.id");
self::execSql($pdo, "UPDATE %operations% O,%closing% C SET O.clsid=C.id WHERE C.opid=O.id");
self::execSql($pdo, "UPDATE %operations% O,%queue% Q SET O.clsid=Q.clsid WHERE Q.opidok=O.id");
self::execSql($pdo, "UPDATE %operations% O,%queue% Q SET O.clsid=Q.clsid WHERE Q.opidcancel=O.id");
return array(true);
} catch (PDOException $e) {
return array(false,$e);
}
}
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"),
@ -1638,7 +1651,8 @@ class Version {
"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") "2.0.1" => array("upd_2001_2002","2.0.2"),
"2.0.2" => array("upd_2002_2003","2.0.3")
); );
public static function runUpdateProcess($pdo,$prefix, $dbname, $untilVersion,$checkValidVersion) { public static function runUpdateProcess($pdo,$prefix, $dbname, $untilVersion,$checkValidVersion) {

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.2"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.3">
<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.2"></script> <script src="utilities.js?v=2.0.3"></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.2"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.3">
<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.2"></script> <script src="utilities.js?v=2.0.3"></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.2"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.3">
<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.2"></script> <script src="utilities.js?v=2.0.3"></script>
<script src="elements/product.js?v=2.0.2"></script> <script src="elements/product.js?v=2.0.3"></script>
<script src="elements/extra.js?v=2.0.2"></script> <script src="elements/extra.js?v=2.0.3"></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.2"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.3">
<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.2"></script> <script src="utilities.js?v=2.0.3"></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.2"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.3">
<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.2"></script> <script src="utilities.js?v=2.0.3"></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.2"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.3">
<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.2"></script> <script src="utilities.js?v=2.0.3"></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.2"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.3">
<link rel="stylesheet" type="text/css" href="css/osdatepicker.css?v=2.0.2"> <link rel="stylesheet" type="text/css" href="css/osdatepicker.css?v=2.0.3">
<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.2"></script> <script src="elements/reservation.js?v=2.0.3"></script>
<script src="elements/osdatepicker.js?v=2.0.2"></script> <script src="elements/osdatepicker.js?v=2.0.3"></script>
<script src="utilities.js?v=2.0.2"></script> <script src="utilities.js?v=2.0.3"></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.2&date=" + dateStr;},500); setTimeout(function(){document.location.href = "reservation.html?v=2.0.3&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.2"></script> <script src="utilities.js?v=2.0.3"></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.2"; var nextpage = "paydesk.html?version=2.0.3";
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.2"; nextpage = "paydesk.html?t=" + tableid + "&version=2.0.3";
} else { } else {
$("#nextpagebtntxt").html(SUM_TO_ORDER[lang]); $("#nextpagebtntxt").html(SUM_TO_ORDER[lang]);
nextpage = "waiter.html?version=2.0.2"; nextpage = "waiter.html?version=2.0.3";
} }
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.2"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.3">
<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.2"></script> <script src="utilities.js?v=2.0.3"></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.2"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.3">
<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.2"></script> <script src="utilities.js?v=2.0.3"></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.2"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.3">
<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.2"></script> <script src="utilities.js?v=2.0.3"></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