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

OrderSprinter 1.6.7

This commit is contained in:
Geno 2020-11-19 23:14:13 +01:00
parent e947c9726d
commit 46b9bd0301
41 changed files with 255 additions and 146 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=1.6.6" /> <link rel="stylesheet" href="css/gueststyle.css?v=1.6.7" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.6.6" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.6.7" />
<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">1.6.6&nbsp;&nbsp;</div> <div class="ui-block-b grid_right" id="versioninfo">1.6.7&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=1.6.6">'; echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.6.7">';
echo "</head>"; echo "</head>";
echo "<body><div class=surround>"; echo "<body><div class=surround>";
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.6.6</span><br><br>"; echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.6.7</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/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,"1.6.6"); Database::setVersion($pdo,$prefix,"1.6.7");
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=1.6.6"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
<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=1.6.6"></script> <script src="utilities.js?v=1.6.7"></script>
<script src="kitchenbar.js?v=1.6.6"></script> <script src="kitchenbar.js?v=1.6.7"></script>
<style> <style>
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook #tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook

7
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=1.6.6"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
<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=1.6.6"></script> <script src="utilities.js?v=1.6.7"></script>
<script src="elements/customers.js?v=1.6.6"></script> <script src="elements/customers.js?v=1.6.7"></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=1.6.6"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
<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=1.6.6"></script> <script src="utilities.js?v=1.6.7"></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=1.6.6",'_blank'); window.open("php/contenthandler.php?module=roomtables&command=tableqrcodes&v=1.6.7",'_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=1.6.6"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
<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=1.6.6"></script> <script src="utilities.js?v=1.6.7"></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=1.6.6"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.6.6"> <link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.6.7">
<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=1.6.6"></script> <script src="utilities.js?v=1.6.7"></script>
</head> </head>
<body> <body>

14
webapp/index.html
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=1.6.6"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.6.6"> <link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.6.7">
<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=1.6.6"></script> <script src="utilities.js?v=1.6.7"></script>
</head> </head>
<body> <body>
@ -132,7 +132,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=1.6.6"},250); setTimeout(function(){document.location.href = "index.html?v=1.6.7"},250);
} }
} }
@ -232,7 +232,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=1.6.6"},500); setTimeout(function(){document.location.href = "install.html?v=1.6.7"},500);
} }
} }
@ -295,11 +295,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=1.6.6&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=1.6.7&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=1.6.6&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=1.6.7&style=always" style="max-height:150px;"/></div>
<form method="post"> <form method="post">
<table border=0> <table border=0>

2
webapp/install.html
View File

@ -915,7 +915,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">Update -> 1.6.6</button> <button id="updatebtn">Update -> 1.6.7</button>
<span id="updateinprogresstxt" style="display:none;"><img id="installprogressindicator" src="php/3rdparty/images/ajax-loader.gif" alt="Progress indication" style="display:none;"/> Update... bitte warten.</span> <span id="updateinprogresstxt" style="display:none;"><img id="installprogressindicator" src="php/3rdparty/images/ajax-loader.gif" alt="Progress indication" style="display:none;"/> Update... bitte warten.</span>
</td> </td>
<td>&nbsp;</td> <td>&nbsp;</td>

2
webapp/install/installer.php
View File

@ -455,7 +455,7 @@ return;
} }
set_time_limit(60*30); set_time_limit(60*30);
$installerVersion = "1.6.6"; $installerVersion = "1.6.7";
$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=1.6.6"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
<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=1.6.6"></script> <script src="utilities.js?v=1.6.7"></script>
<script src="kitchenbar.js?v=1.6.6"></script> <script src="kitchenbar.js?v=1.6.7"></script>
<style> <style>
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook #tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook

98
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=1.6.6"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
<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,10 +13,10 @@
<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=1.6.6"></script> <script src="utilities.js?v=1.6.7"></script>
<script src="elements/tablemap.js?v=1.6.6"></script> <script src="elements/tablemap.js?v=1.6.7"></script>
<script src="elements/roommap.js?v=1.6.6"></script> <script src="elements/roommap.js?v=1.6.7"></script>
<script src="elements/groundplan.js?v=1.6.6"></script> <script src="elements/groundplan.js?v=1.6.7"></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>
@ -526,6 +526,15 @@ var MAN_GUEST_QRSIZE = ["Größe (Pixels)","Size in pixels","Tamaño del codigo"
var MAN_GUEST_QR_INFO = ["Die QR-Codes können im Bereich Datenbank/Raumplan/Anbindung Gastbestellsystem ausgedruckt werden.","The QR codes can be printed in the area Database/Tables/Integration Guest Order System","Los codigos QR se puede imprimir en la area de Base de datos/Mapa de las mesas/Integration ordenes por huespedes."]; var MAN_GUEST_QR_INFO = ["Die QR-Codes können im Bereich Datenbank/Raumplan/Anbindung Gastbestellsystem ausgedruckt werden.","The QR codes can be printed in the area Database/Tables/Integration Guest Order System","Los codigos QR se puede imprimir en la area de Base de datos/Mapa de las mesas/Integration ordenes por huespedes."];
var MAN_PRINTED_WORKRECEIPTS = ["Gedruckte Arbeitsbons","Printed work receipts","Tiquets de trabajo imprimidos"]; var MAN_PRINTED_WORKRECEIPTS = ["Gedruckte Arbeitsbons","Printed work receipts","Tiquets de trabajo imprimidos"];
var MAN_DSFINVK_SECTION = ["DSFinV-K Export","DSFinV-K Export","DSFinV-K Export"];
var MAN_DSFINVK_NAME = ["Name des Unternehmens","Name of company","Nombre de la compania"];
var MAN_DSFINVK_STREET = ["Straße","Street","Calle"];
var MAN_DSFINVK_POSTALCODE = ["Postleitzahl","Postal Code","Código postal"];
var MAN_DSFINVK_CITY = ["Stadt","City","Ciudad"];
var MAN_DSFINVK_COUNTRY = ["Land","Country","País"];
var MAN_DSFINVK_STNR = ["Steuernummer","Tax number","Número de identificación fiscal"];
var MAN_DSFINVK_USTID = ["UStID","UStID","UStID"];
var lang = 0; var lang = 0;
var generalVals = [12,2,0,3,0,1,1,0,0,1, 0,50,20,10,1,0,0,0,1,0,1,0,0,1,1, 1,1,1,1,1,1,1,1,1,1, 1,2,3, 1,0, 1,0,1, 1,1,0,0, 0,0,0, 0,0,0,1,1, 0,1,0,1,1, 1,2,0, 0,0,1,1,1, 0,0,1]; var generalVals = [12,2,0,3,0,1,1,0,0,1, 0,50,20,10,1,0,0,0,1,0,1,0,0,1,1, 1,1,1,1,1,1,1,1,1,1, 1,2,3, 1,0, 1,0,1, 1,1,0,0, 0,0,0, 0,0,0,1,1, 0,1,0,1,1, 1,2,0, 0,0,1,1,1, 0,0,1];
@ -690,7 +699,15 @@ var generalValuesSettings = [
["guestqrtext",MAN_GUEST_QRTEXT[lang],"i",0], ["guestqrtext",MAN_GUEST_QRTEXT[lang],"i",0],
["guestqrfontsize",MAN_GUEST_QRFONTSIZE[lang],"i",0], ["guestqrfontsize",MAN_GUEST_QRFONTSIZE[lang],"i",0],
["guestqrsize",MAN_GUEST_QRSIZE[lang],"i",0], ["guestqrsize",MAN_GUEST_QRSIZE[lang],"i",0],
["reservationitem",MAN_RES_ITEM[lang],"i",0] ["reservationitem",MAN_RES_ITEM[lang],"i",0],
["dsfinvk_name",MAN_DSFINVK_NAME[lang],"i",0,""],
["dsfinvk_street",MAN_DSFINVK_STREET[lang],"i",0,""],
["dsfinvk_postalcode",MAN_DSFINVK_POSTALCODE[lang],"i",0,""],
["dsfinvk_city",MAN_DSFINVK_CITY[lang],"i",0,""],
["dsfinvk_country",MAN_DSFINVK_COUNTRY[lang],"i",0,""],
["dsfinvk_stnr",MAN_DSFINVK_STNR[lang],"i",0,""],
["dsfinvk_ustid",MAN_DSFINVK_USTID[lang],"i",0,""]
]; ];
var predef = ""; var predef = "";
@ -906,6 +923,15 @@ function setLanguage(l) {
$("#printedworkreceiptsheader").html(MAN_PRINTED_WORKRECEIPTS[l]); $("#printedworkreceiptsheader").html(MAN_PRINTED_WORKRECEIPTS[l]);
$("#reservationitemhint").html(MAN_RES_ITEM_HINT[l]); $("#reservationitemhint").html(MAN_RES_ITEM_HINT[l]);
$("#dsfinvksectiontxt").html(MAN_DSFINVK_SECTION[l]);
$("#dsfinvk_nametxt").html(MAN_DSFINVK_NAME[l]);
$("#dsfinvk_streettxt").html(MAN_DSFINVK_STREET[l]);
$("#dsfinvk_postalcodetxt").html(MAN_DSFINVK_POSTALCODE[l]);
$("#dsfinvk_citytxt").html(MAN_DSFINVK_CITY[l]);
$("#dsfinvk_countrytxt").html(MAN_DSFINVK_COUNTRY[l]);
$("#dsfinvk_stnrtxt").html(MAN_DSFINVK_STNR[l]);
$("#dsfinvk_ustidtxt").html(MAN_DSFINVK_USTID[l]);
} }
function toggleinlinedisplayelem(iconid) { function toggleinlinedisplayelem(iconid) {
@ -1168,6 +1194,14 @@ function insertGeneralConfigItems(configResult) {
$("#guestqrsize").val(values.guestqrsize); $("#guestqrsize").val(values.guestqrsize);
$("#guestqrfontsize").val(values.guestqrfontsize); $("#guestqrfontsize").val(values.guestqrfontsize);
$("#dsfinvk_name").val(values.dsfinvk_name);
$("#dsfinvk_street").val(values.dsfinvk_street);
$("#dsfinvk_postalcode").val(values.dsfinvk_postalcode);
$("#dsfinvk_city").val(values.dsfinvk_city);
$("#dsfinvk_country").val(values.dsfinvk_country);
$("#dsfinvk_stnr").val(values.dsfinvk_stnr);
$("#dsfinvk_ustid").val(values.dsfinvk_ustid);
generalVals[5] = values.smtpauth; generalVals[5] = values.smtpauth;
generalVals[6] = values.smtpsecure; generalVals[6] = values.smtpsecure;
generalVals[7] = values.bigfontworkreceipt; generalVals[7] = values.bigfontworkreceipt;
@ -1738,7 +1772,7 @@ function initRestoreFileUpload() {
} else { } else {
alert("Import war erfolgreich."); alert("Import war erfolgreich.");
setTimeout(function(){ setTimeout(function(){
document.location.href = "index.html?v=1.6.6"; document.location.href = "index.html?v=1.6.7";
},250); },250);
} }
}, },
@ -2101,7 +2135,7 @@ 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=1.6.6",null,handleGetRecTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getrectemplate&v=1.6.7",null,handleGetRecTemplate,null);
}) })
$("#changeConfig").off("click").on("click", function (e) { $("#changeConfig").off("click").on("click", function (e) {
@ -2227,38 +2261,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=1.6.6"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=1.6.7";
}); });
$("#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=1.6.6"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=1.6.7";
}); });
$("#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=1.6.6"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=1.6.7";
}); });
$("#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=1.6.6",null,handleFtpResult,null); doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=1.6.7",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=1.6.6",'_blank'); window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=1.6.7",'_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=1.6.6"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=1.6.7";
}); });
$("#golive").off("click").on("click", function (e) { $("#golive").off("click").on("click", function (e) {
@ -2439,7 +2473,7 @@ function updateOneSingleFile() {
setTimeout(function(){ setTimeout(function(){
$("#sliderarea").hide(); $("#sliderarea").hide();
var millis=getMillis(); var millis=getMillis();
document.location.href = "install.html?v=1.6.6&mode=onlyupdate&n=" + millis; document.location.href = "install.html?v=1.6.7&mode=onlyupdate&n=" + millis;
},250); },250);
} }
} }
@ -4089,6 +4123,40 @@ $(document).on("pageinit", "#admin-page", function () {
</div> <!-- partIfAustriaEnabled --> </div> <!-- partIfAustriaEnabled -->
</div> <!-- confgensection --> </div> <!-- confgensection -->
<p><a class="genconflink" href="" onclick="javascript:showconfsection('confdsfinvksection'); return false">
<span id="dsfinvksectiontxt">DSFINVK</span> <span id="confdsfinvksection_expandicon" style="display:inline;">&#8690;</span><span id="confdsfinvksection_collapseicon" style="display:none;">&#8689</span></a>
<div style="display: none" id="confdsfinvksection">
<div data-role="fieldcontain">
<label for="dsfinvk_name"><span id="dsfinvk_nametxt">Name:</span></label>
<input type="text" value="" data-mini="true" placeholder="3" id="dsfinvk_name" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="dsfinvk_street"><span id="dsfinvk_streettxt">Str</span></label>
<input type="text" value="" data-mini="true" placeholder="3" id="dsfinvk_street" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="dsfinvk_postalcode"><span id="dsfinvk_postalcodetxt">PLZ</span></label>
<input type="text" value="" data-mini="true" placeholder="3" id="dsfinvk_postalcode" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="dsfinvk_city"><span id="dsfinvk_citytxt">Stadt</span></label>
<input type="text" value="" data-mini="true" placeholder="3" id="dsfinvk_city" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="dsfinvk_country"><span id="dsfinvk_countrytxt">Land</span></label>
<input type="text" value="" data-mini="true" placeholder="3" id="dsfinvk_country" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="dsfinvk_stnr"><span id="dsfinvk_stnrtxt">STNR</span></label>
<input type="text" value="" data-mini="true" placeholder="3" id="dsfinvk_stnr" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="dsfinvk_ustid"><span id="dsfinvk_ustidtxt">USTID</span></label>
<input type="text" value="" data-mini="true" placeholder="3" id="dsfinvk_ustid" data-theme="c" class="genConfigEl"/>
</div>
</div> <!-- confdsfinvksection -->
<p><a class="genconflink" href="" onclick="javascript:showconfsection('confdatatransfersection'); return false"> <p><a class="genconflink" href="" onclick="javascript:showconfsection('confdatatransfersection'); return false">
<span id="transfersectiontxt">Datentransfer</span> <span id="confdatatransfersection_expandicon" style="display:inline;">&#8690;</span><span id="confdatatransfersection_collapseicon" style="display:none;">&#8689</span></a> <span id="transfersectiontxt">Datentransfer</span> <span id="confdatatransfersection_expandicon" style="display:inline;">&#8690;</span><span id="confdatatransfersection_collapseicon" style="display:none;">&#8689</span></a>
<div style="display: none" id="confdatatransfersection"> <div style="display: none" id="confdatatransfersection">

7
webapp/paydesk.html
View File

File diff suppressed because one or more lines are too long

62
webapp/php/admin.php
View File

@ -1251,7 +1251,15 @@ class Admin {
array("guestqrfontsize",null,false), array("guestqrfontsize",null,false),
array("reservationitem",null,false), array("reservationitem",null,false),
array("sn",null,false) array("sn",null,false),
array("dsfinvk_name",'',true),
array("dsfinvk_street",'',true),
array("dsfinvk_postalcode",'',true),
array("dsfinvk_city",'',true),
array("dsfinvk_country",'',true),
array("dsfinvk_stnr",'',true),
array("dsfinvk_ustid",'',true)
); );
if (is_null($pdo)) { if (is_null($pdo)) {
@ -1449,7 +1457,7 @@ class Admin {
$view = "preferences.html"; $view = "preferences.html";
} }
echo json_encode($view . "?v=1.6.6"); echo json_encode($view . "?v=1.6.7");
} }
} }
@ -1676,31 +1684,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=1.6.6"); } if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.6.7"); }
} else { } else {
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.6.6"); } if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.6.7"); }
} }
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.6.6"); } if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.6.7"); }
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.6.6"); } if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.6.7"); }
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.6.6"); } if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.6.7"); }
if ($_SESSION['modus'] == 0) { if ($_SESSION['modus'] == 0) {
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.6.6"); } if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.6.7"); }
} }
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.6.6"); } if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.6.7"); }
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.6.6"); } if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.6.7"); }
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.6.6"); } if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.6.7"); }
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.6.6"); } if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.6.7"); }
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.6.6"); } if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.6.7"); }
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.6.6"); } if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.6.7"); }
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.6.6"); } if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.6.7"); }
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.6.6"); } if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.6.7"); }
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.6.6"); } if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.6.7"); }
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.6.6"); } if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.6.7"); }
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.6.6"); $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.6.7");
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.6.6"); } if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.6.7"); }
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.6.6"); $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.6.7");
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.6.6"); $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.6.7");
} }
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
@ -2344,7 +2352,15 @@ class Admin {
"guestqrtext" => array("dbcol" => "guestqrtext","checknum" => 0), "guestqrtext" => array("dbcol" => "guestqrtext","checknum" => 0),
"guestqrsize" => array("dbcol" => "guestqrsize","checknum" => 1), "guestqrsize" => array("dbcol" => "guestqrsize","checknum" => 1),
"guestqrfontsize" => array("dbcol" => "guestqrfontsize","checknum" => 1), "guestqrfontsize" => array("dbcol" => "guestqrfontsize","checknum" => 1),
"reservationitem" => array("dbcol" => "reservationitem","checknum" => 0) "reservationitem" => array("dbcol" => "reservationitem","checknum" => 0),
"dsfinvk_name" => array("dbcol" => "dsfinvk_name","checknum" => 0,"ismasterdata" => 1),
"dsfinvk_street" => array("dbcol" => "dsfinvk_street","checknum" => 0,"ismasterdata" => 1),
"dsfinvk_postalcode" => array("dbcol" => "dsfinvk_postalcode","checknum" => 0,"ismasterdata" => 1),
"dsfinvk_city" => array("dbcol" => "dsfinvk_city","checknum" => 0,"ismasterdata" => 1),
"dsfinvk_country" => array("dbcol" => "dsfinvk_country","checknum" => 0,"ismasterdata" => 1),
"dsfinvk_stnr" => array("dbcol" => "dsfinvk_stnr","checknum" => 0,"ismasterdata" => 1),
"dsfinvk_ustid" => array("dbcol" => "dsfinvk_ustid","checknum" => 0,"ismasterdata" => 1)
); );
$isMasterData = self::isMasterDataInSetOfChangedValues($changedValues, $valueSpecifications); $isMasterData = self::isMasterDataInSetOfChangedValues($changedValues, $valueSpecifications);

2
webapp/php/closing.php
View File

@ -257,7 +257,7 @@ $indexunclosedqueue = intval($rval);
} }
} }
set_time_limit(60*60); set_time_limit(60*60);
$sql = "UPDATE %queue% Q,%work% W SET Q.clsid=? WHERE Q.id > ? AND Q.clsid is null"; $sql = "UPDATE %queue% Q SET Q.clsid=? WHERE Q.id > ? AND Q.clsid is null";
CommonUtils::execSql($pdo, $sql, array($newClosingId,$indexunclosedqueue)); CommonUtils::execSql($pdo, $sql, array($newClosingId,$indexunclosedqueue));

2
webapp/php/commonutils.php
View File

@ -509,7 +509,7 @@ class CommonUtils {
} }
public static function canMasterDataBeChanged($pdo) { public static function canMasterDataBeChanged($pdo) {
$sql = "SELECT COUNT(id) as countid FROM %queue% WHERE clsid is null"; $sql = "SELECT COUNT(id) as countid FROM %queue% WHERE isclosed is null OR isclosed='0'";
$res = CommonUtils::fetchSqlAll($pdo, $sql); $res = CommonUtils::fetchSqlAll($pdo, $sql);
if (intval($res[0]["countid"]) > 0) { if (intval($res[0]["countid"]) > 0) {
return false; return false;

2
webapp/php/customers.php
View File

@ -891,7 +891,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=1.6.6">'; $txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.6.7">';
$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 = "1.6.6"; $version = "1.6.7";
$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=1.6.6">'; $txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=1.6.7">';
$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

@ -598,7 +598,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=1.6.6">'; $txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=1.6.7">';
$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>";

45
webapp/php/updater.php
View File

@ -159,19 +159,6 @@ class Updater {
private static function doCheck($lineArr) { private static function doCheck($lineArr) {
if (!is_writable("..")) {
return array("status" => "ERROR","msg" => "Root directory not writable. But this is necessary to create and delete install directory.");
}
if (!file_exists("../install")) {
if (!mkdir('../install', 0777)) {
return array("status" => "ERROR","msg" => "Install directory could not be created.");
}
} else {
if (!is_writable("../install")) {
return array("status" => "ERROR","msg" => "Cannot write into install directory.");
}
}
if (count($lineArr) < 2) { if (count($lineArr) < 2) {
return array("status" => "OK","msg" => ''); return array("status" => "OK","msg" => '');
} }
@ -185,11 +172,18 @@ class Updater {
$dirname = dirname($aLine); $dirname = dirname($aLine);
$isDirExists = file_exists($dirname); $isDirExists = file_exists($dirname);
if (!$isDirExists) {
$ret = self::createSubDir($dirname);
if ($ret["status"] != "OK") {
return $ret;
}
}
$isFileExists = file_exists($aLine); $isFileExists = file_exists($aLine);
$isDirWritable = is_writable($dirname); $isDirWritable = is_writable($dirname);
$isFileWritable = is_writable($aLine); $isFileWritable = is_writable($aLine);
if ($isDirExists) {
if ($isFileExists) { if ($isFileExists) {
if (!$isFileWritable) { if (!$isFileWritable) {
return array("status" => "ERROR","msg" => $aLine . " cannot be overwritten"); return array("status" => "ERROR","msg" => $aLine . " cannot be overwritten");
@ -197,16 +191,31 @@ class Updater {
} else { } else {
// file does not exist, but can it be created? // file does not exist, but can it be created?
if (!$isDirWritable) { if (!$isDirWritable) {
return array("status" => "ERROR","msg" => $basename . " cannot be written into $dirname"); return array("status" => "ERROR","msg" => $basename . " cannot be written into $dirname with this path: " . $aLine);
} }
} }
} else {
return array("status" => "ERROR","msg" => $dirname . " does not exist");
}
} }
return array("status" => "OK","msg" => ""); return array("status" => "OK","msg" => "");
} }
private static function createSubDir($dirname) {
if (!is_writable("/..")) {
return array("status" => "ERROR","msg" => "Root directory not writable. But this is necessary to create and delete install directory.");
}
if (!file_exists($dirname)) {
if (!mkdir($dirname, 0777)) {
return array("status" => "ERROR","msg" => "$dirname directory could not be created.");
}
} else {
if (!is_writable($dirname)) {
return array("status" => "ERROR","msg" => "Cannot write into $dirname directory.");
}
}
return array("status" => "OK");
}
public static function updatecheck($pdo) { public static function updatecheck($pdo) {
$url = CommonUtils::getConfigValue($pdo, "updateurl", ''); $url = CommonUtils::getConfigValue($pdo, "updateurl", '');

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

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

@ -1364,6 +1364,21 @@ class Version {
} }
} }
public static function upd_1606_1607($pdo, $prefix, $dbname) {
try {
self::insertOrUpdateConfigItem($pdo, 'dsfinvk_name', '');
self::insertOrUpdateConfigItem($pdo, 'dsfinvk_street', '');
self::insertOrUpdateConfigItem($pdo, 'dsfinvk_postalcode', '');
self::insertOrUpdateConfigItem($pdo, 'dsfinvk_city', '');
self::insertOrUpdateConfigItem($pdo, 'dsfinvk_country', '');
self::insertOrUpdateConfigItem($pdo, 'dsfinvk_stnr', '');
self::insertOrUpdateConfigItem($pdo, 'dsfinvk_ustid', '');
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"),
"1.3.1" => array("upd_1301_1302","1.3.2"), "1.3.1" => array("upd_1301_1302","1.3.2"),
@ -1451,7 +1466,8 @@ class Version {
"1.6.2" => array("upd_1602_1603","1.6.3"), "1.6.2" => array("upd_1602_1603","1.6.3"),
"1.6.3" => array("upd_1603_1604","1.6.4"), "1.6.3" => array("upd_1603_1604","1.6.4"),
"1.6.4" => array("upd_1604_1605","1.6.5"), "1.6.4" => array("upd_1604_1605","1.6.5"),
"1.6.5" => array("upd_1605_1606","1.6.6") "1.6.5" => array("upd_1605_1606","1.6.6"),
"1.6.6" => array("upd_1606_1607","1.6.7")
); );
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=1.6.6"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
<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=1.6.6"></script> <script src="utilities.js?v=1.6.7"></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=1.6.6"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
<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=1.6.6"></script> <script src="utilities.js?v=1.6.7"></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=1.6.6"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
<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=1.6.6"></script> <script src="utilities.js?v=1.6.7"></script>
<script src="elements/product.js?v=1.6.6"></script> <script src="elements/product.js?v=1.6.7"></script>
<script src="elements/extra.js?v=1.6.6"></script> <script src="elements/extra.js?v=1.6.7"></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=1.6.6"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
<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=1.6.6"></script> <script src="utilities.js?v=1.6.7"></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=1.6.6"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
<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=1.6.6"></script> <script src="utilities.js?v=1.6.7"></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=1.6.6"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
<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=1.6.6"></script> <script src="utilities.js?v=1.6.7"></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=1.6.6"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
<link rel="stylesheet" type="text/css" href="css/osdatepicker.css?v=1.6.6"> <link rel="stylesheet" type="text/css" href="css/osdatepicker.css?v=1.6.7">
<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=1.6.6"></script> <script src="elements/reservation.js?v=1.6.7"></script>
<script src="elements/osdatepicker.js?v=1.6.6"></script> <script src="elements/osdatepicker.js?v=1.6.7"></script>
<script src="utilities.js?v=1.6.6"></script> <script src="utilities.js?v=1.6.7"></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=1.6.6&date=" + dateStr;},500); setTimeout(function(){document.location.href = "reservation.html?v=1.6.7&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=1.6.6"></script> <script src="utilities.js?v=1.6.7"></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=1.6.6"; var nextpage = "paydesk.html?version=1.6.7";
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=1.6.6"; nextpage = "paydesk.html?t=" + tableid + "&version=1.6.7";
} else { } else {
$("#nextpagebtntxt").html(SUM_TO_ORDER[lang]); $("#nextpagebtntxt").html(SUM_TO_ORDER[lang]);
nextpage = "waiter.html?version=1.6.6"; nextpage = "waiter.html?version=1.6.7";
} }
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=1.6.6"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
<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=1.6.6"></script> <script src="utilities.js?v=1.6.7"></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=1.6.6"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
<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=1.6.6"></script> <script src="utilities.js?v=1.6.7"></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=1.6.6"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
<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=1.6.6"></script> <script src="utilities.js?v=1.6.7"></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

6
webapp/waiterdesktop.php
View File

File diff suppressed because one or more lines are too long