OrderSprinter 2.0.5
This commit is contained in:
parent
04d606a604
commit
b790972266
|
|
@ -9,8 +9,8 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" href="css/gueststyle.css?v=2.0.4" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=2.0.4" />
|
||||
<link rel="stylesheet" href="css/gueststyle.css?v=2.0.5" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=2.0.5" />
|
||||
<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" />
|
||||
<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 class="ui-grid-a">
|
||||
<div class="ui-block-a"> OrderSprinter</div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo">2.0.4 </div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo">2.0.5 </div>
|
||||
</div><!-- /grid-a -->
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -114,10 +114,10 @@ if (isset($_POST['code'])) {
|
|||
} else {
|
||||
echo "<html>";
|
||||
echo "<head><title>Installation Gastsystem</title>";
|
||||
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=2.0.4">';
|
||||
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=2.0.5">';
|
||||
echo "</head>";
|
||||
echo "<body><div class=surround>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 2.0.4</span><br><br>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 2.0.5</span><br><br>";
|
||||
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 "</form></div></html>";
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -22,7 +22,7 @@ tabprefix="os_"
|
|||
remoteaccesscode="please_change"
|
||||
|
||||
# OrderSprinter-Version
|
||||
version="2_0_4"
|
||||
version="2_0_5"
|
||||
|
||||
# Warnhinweis an den Anwender mit der Möglichkeit des Abbruchs
|
||||
echo "Dieses Skript ist für die Ausführung auf einem frisch aufgesetzten"
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ class Installer {
|
|||
}
|
||||
Database::dropTables($pdo);
|
||||
Database::createEmptyTables($pdo, $prefix);
|
||||
Database::setVersion($pdo,$prefix,"2.0.4");
|
||||
Database::setVersion($pdo,$prefix,"2.0.5");
|
||||
Database::setAccessPassword($pdo,$prefix,$adminpass);
|
||||
Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour
|
||||
return array("status" => "OK","msg" => "Installation successful");
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.5">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<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" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.4"></script>
|
||||
<script src="kitchenbar.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
<script src="kitchenbar.js?v=2.0.5"></script>
|
||||
<style>
|
||||
|
||||
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -7,7 +7,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.5">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<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" />
|
||||
<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="utilities.js?v=2.0.4"></script>
|
||||
<script src="elements/customers.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
<script src="elements/customers.js?v=2.0.5"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.5">
|
||||
|
||||
<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.mobile-1.4.0.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
<script src="receiptutils.js"></script>
|
||||
<script src="elements/dash.js"></script>
|
||||
<script src="php/3rdparty/Chart.bundle.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ function Groundplan() {
|
|||
$("#createtableqrcodesbtn").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.open("php/contenthandler.php?module=roomtables&command=tableqrcodes&v=2.0.4",'_blank');
|
||||
window.open("php/contenthandler.php?module=roomtables&command=tableqrcodes&v=2.0.5",'_blank');
|
||||
});
|
||||
|
||||
this.bindRoomChanges();
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.5">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<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" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
<script src="kitchenbar.js"></script>
|
||||
<style>
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.5">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.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" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="manifest" href="manifest.webmanifest">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.5">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle-brightenergy.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" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
@ -140,7 +140,7 @@ function displayLoginOrLogoutMask(jsonContent) {
|
|||
// user needs to log in!
|
||||
$("#passwordfield").val("");
|
||||
$("#logoutarea").hide();
|
||||
setTimeout(function(){document.location.href = "index.html?v=2.0.4";},250);
|
||||
setTimeout(function(){document.location.href = "index.html?v=2.0.5";},250);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -240,7 +240,7 @@ function handleResultOfInstallCheck(is_installed) {
|
|||
if (is_installed == "Yes") {
|
||||
useInstallation();
|
||||
} else {
|
||||
setTimeout(function(){document.location.href = "install.html?v=2.0.4";},500);
|
||||
setTimeout(function(){document.location.href = "install.html?v=2.0.5";},500);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -312,11 +312,11 @@ $(document).on("pageinit", "#index-page", function () {
|
|||
|
||||
<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.4&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.5&style=always" style="max-height:150px;"/></div>
|
||||
<div data-role="collapsible" data-content-theme="c" data-collapsed="false" data-theme="e" id="loginmask">
|
||||
<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.4&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.5&style=always" style="max-height:150px;"/></div>
|
||||
|
||||
<div class="loginarea">
|
||||
<form method="post">
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<meta charset="UTF-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<title>Setup</title>
|
||||
<link rel="stylesheet" type="text/css" href="css/installstyle.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/installstyle.css?v=2.0.5">
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.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>
|
||||
<td> </td>
|
||||
<td align=center>
|
||||
<button id="updatebtn" class="updatebtn">Update -> 2.0.4</button>
|
||||
<button id="updatebtn" class="updatebtn">Update -> 2.0.5</button>
|
||||
<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>
|
||||
|
|
|
|||
|
|
@ -513,7 +513,7 @@ return;
|
|||
}
|
||||
|
||||
set_time_limit(60*30);
|
||||
$installerVersion = "2.0.4";
|
||||
$installerVersion = "2.0.5";
|
||||
|
||||
$admin = new InstallAdmin();
|
||||
$pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.5">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<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" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.4"></script>
|
||||
<script src="kitchenbar.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
<script src="kitchenbar.js?v=2.0.5"></script>
|
||||
<style>
|
||||
|
||||
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook
|
||||
|
|
|
|||
|
|
@ -15,6 +15,8 @@ var entriesToCook = null;
|
|||
var user = "";
|
||||
var beepordered = 0;
|
||||
var oneclickcooked = 0;
|
||||
var kitchenextrasize = 0;
|
||||
var kitchenoptionsize = 0;
|
||||
|
||||
function beep() {
|
||||
var snd = new Audio("data:audio/wav;base64,//uQRAAAAWMSLwUIYAAsYkXgoQwAEaYLWfkWgAI0wWs/ItAAAGDgYtAgAyN+QWaAAihwMWm4G8QQRDiMcCBcH3Cc+CDv/7xA4Tvh9Rz/y8QADBwMWgQAZG/ILNAARQ4GLTcDeIIIhxGOBAuD7hOfBB3/94gcJ3w+o5/5eIAIAAAVwWgQAVQ2ORaIQwEMAJiDg95G4nQL7mQVWI6GwRcfsZAcsKkJvxgxEjzFUgfHoSQ9Qq7KNwqHwuB13MA4a1q/DmBrHgPcmjiGoh//EwC5nGPEmS4RcfkVKOhJf+WOgoxJclFz3kgn//dBA+ya1GhurNn8zb//9NNutNuhz31f////9vt///z+IdAEAAAK4LQIAKobHItEIYCGAExBwe8jcToF9zIKrEdDYIuP2MgOWFSE34wYiR5iqQPj0JIeoVdlG4VD4XA67mAcNa1fhzA1jwHuTRxDUQ//iYBczjHiTJcIuPyKlHQkv/LHQUYkuSi57yQT//uggfZNajQ3Vmz+Zt//+mm3Wm3Q576v////+32///5/EOgAAADVghQAAAAA//uQZAUAB1WI0PZugAAAAAoQwAAAEk3nRd2qAAAAACiDgAAAAAAABCqEEQRLCgwpBGMlJkIz8jKhGvj4k6jzRnqasNKIeoh5gI7BJaC1A1AoNBjJgbyApVS4IDlZgDU5WUAxEKDNmmALHzZp0Fkz1FMTmGFl1FMEyodIavcCAUHDWrKAIA4aa2oCgILEBupZgHvAhEBcZ6joQBxS76AgccrFlczBvKLC0QI2cBoCFvfTDAo7eoOQInqDPBtvrDEZBNYN5xwNwxQRfw8ZQ5wQVLvO8OYU+mHvFLlDh05Mdg7BT6YrRPpCBznMB2r//xKJjyyOh+cImr2/4doscwD6neZjuZR4AgAABYAAAABy1xcdQtxYBYYZdifkUDgzzXaXn98Z0oi9ILU5mBjFANmRwlVJ3/6jYDAmxaiDG3/6xjQQCCKkRb/6kg/wW+kSJ5//rLobkLSiKmqP/0ikJuDaSaSf/6JiLYLEYnW/+kXg1WRVJL/9EmQ1YZIsv/6Qzwy5qk7/+tEU0nkls3/zIUMPKNX/6yZLf+kFgAfgGyLFAUwY//uQZAUABcd5UiNPVXAAAApAAAAAE0VZQKw9ISAAACgAAAAAVQIygIElVrFkBS+Jhi+EAuu+lKAkYUEIsmEAEoMeDmCETMvfSHTGkF5RWH7kz/ESHWPAq/kcCRhqBtMdokPdM7vil7RG98A2sc7zO6ZvTdM7pmOUAZTnJW+NXxqmd41dqJ6mLTXxrPpnV8avaIf5SvL7pndPvPpndJR9Kuu8fePvuiuhorgWjp7Mf/PRjxcFCPDkW31srioCExivv9lcwKEaHsf/7ow2Fl1T/9RkXgEhYElAoCLFtMArxwivDJJ+bR1HTKJdlEoTELCIqgEwVGSQ+hIm0NbK8WXcTEI0UPoa2NbG4y2K00JEWbZavJXkYaqo9CRHS55FcZTjKEk3NKoCYUnSQ0rWxrZbFKbKIhOKPZe1cJKzZSaQrIyULHDZmV5K4xySsDRKWOruanGtjLJXFEmwaIbDLX0hIPBUQPVFVkQkDoUNfSoDgQGKPekoxeGzA4DUvnn4bxzcZrtJyipKfPNy5w+9lnXwgqsiyHNeSVpemw4bWb9psYeq//uQZBoABQt4yMVxYAIAAAkQoAAAHvYpL5m6AAgAACXDAAAAD59jblTirQe9upFsmZbpMudy7Lz1X1DYsxOOSWpfPqNX2WqktK0DMvuGwlbNj44TleLPQ+Gsfb+GOWOKJoIrWb3cIMeeON6lz2umTqMXV8Mj30yWPpjoSa9ujK8SyeJP5y5mOW1D6hvLepeveEAEDo0mgCRClOEgANv3B9a6fikgUSu/DmAMATrGx7nng5p5iimPNZsfQLYB2sDLIkzRKZOHGAaUyDcpFBSLG9MCQALgAIgQs2YunOszLSAyQYPVC2YdGGeHD2dTdJk1pAHGAWDjnkcLKFymS3RQZTInzySoBwMG0QueC3gMsCEYxUqlrcxK6k1LQQcsmyYeQPdC2YfuGPASCBkcVMQQqpVJshui1tkXQJQV0OXGAZMXSOEEBRirXbVRQW7ugq7IM7rPWSZyDlM3IuNEkxzCOJ0ny2ThNkyRai1b6ev//3dzNGzNb//4uAvHT5sURcZCFcuKLhOFs8mLAAEAt4UWAAIABAAAAAB4qbHo0tIjVkUU//uQZAwABfSFz3ZqQAAAAAngwAAAE1HjMp2qAAAAACZDgAAAD5UkTE1UgZEUExqYynN1qZvqIOREEFmBcJQkwdxiFtw0qEOkGYfRDifBui9MQg4QAHAqWtAWHoCxu1Yf4VfWLPIM2mHDFsbQEVGwyqQoQcwnfHeIkNt9YnkiaS1oizycqJrx4KOQjahZxWbcZgztj2c49nKmkId44S71j0c8eV9yDK6uPRzx5X18eDvjvQ6yKo9ZSS6l//8elePK/Lf//IInrOF/FvDoADYAGBMGb7FtErm5MXMlmPAJQVgWta7Zx2go+8xJ0UiCb8LHHdftWyLJE0QIAIsI+UbXu67dZMjmgDGCGl1H+vpF4NSDckSIkk7Vd+sxEhBQMRU8j/12UIRhzSaUdQ+rQU5kGeFxm+hb1oh6pWWmv3uvmReDl0UnvtapVaIzo1jZbf/pD6ElLqSX+rUmOQNpJFa/r+sa4e/pBlAABoAAAAA3CUgShLdGIxsY7AUABPRrgCABdDuQ5GC7DqPQCgbbJUAoRSUj+NIEig0YfyWUho1VBBBA//uQZB4ABZx5zfMakeAAAAmwAAAAF5F3P0w9GtAAACfAAAAAwLhMDmAYWMgVEG1U0FIGCBgXBXAtfMH10000EEEEEECUBYln03TTTdNBDZopopYvrTTdNa325mImNg3TTPV9q3pmY0xoO6bv3r00y+IDGid/9aaaZTGMuj9mpu9Mpio1dXrr5HERTZSmqU36A3CumzN/9Robv/Xx4v9ijkSRSNLQhAWumap82WRSBUqXStV/YcS+XVLnSS+WLDroqArFkMEsAS+eWmrUzrO0oEmE40RlMZ5+ODIkAyKAGUwZ3mVKmcamcJnMW26MRPgUw6j+LkhyHGVGYjSUUKNpuJUQoOIAyDvEyG8S5yfK6dhZc0Tx1KI/gviKL6qvvFs1+bWtaz58uUNnryq6kt5RzOCkPWlVqVX2a/EEBUdU1KrXLf40GoiiFXK///qpoiDXrOgqDR38JB0bw7SoL+ZB9o1RCkQjQ2CBYZKd/+VJxZRRZlqSkKiws0WFxUyCwsKiMy7hUVFhIaCrNQsKkTIsLivwKKigsj8XYlwt/WKi2N4d//uQRCSAAjURNIHpMZBGYiaQPSYyAAABLAAAAAAAACWAAAAApUF/Mg+0aohSIRobBAsMlO//Kk4soosy1JSFRYWaLC4qZBYWFRGZdwqKiwkNBVmoWFSJkWFxX4FFRQWR+LsS4W/rFRb/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////VEFHAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU291bmRib3kuZGUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMjAwNGh0dHA6Ly93d3cuc291bmRib3kuZGUAAAAAAAAAACU=");
|
||||
|
|
@ -170,7 +172,11 @@ function listOfTable(table) {
|
|||
var option = '';
|
||||
if (entry.option != '') {
|
||||
var theComment = toHtml(entry.option);
|
||||
option = '<p>' + theComment + '</p>';
|
||||
if (kitchenoptionsize == 0) {
|
||||
option = '<p>' + theComment + '</p>';
|
||||
} else {
|
||||
option = '<p style="font-size:' + kitchenoptionsize + 'px;">' + theComment + '</p>';
|
||||
}
|
||||
}
|
||||
var icon = "check";
|
||||
var status = "not_cooking";
|
||||
|
|
@ -184,7 +190,7 @@ function listOfTable(table) {
|
|||
label += "<small><i> (" + entry.cooking + ")</i></small>";
|
||||
}
|
||||
|
||||
var extratxt = createExtraParagraph(entry.extras);
|
||||
var extratxt = createExtraParagraph(entry.extras,kitchenextrasize);
|
||||
|
||||
var entryToAdd = {
|
||||
name: label + extratxt,
|
||||
|
|
@ -268,7 +274,7 @@ function fillTableWithCookedEntriesCore() {
|
|||
|
||||
var label = toHtml(entry.longname);
|
||||
|
||||
var extratxt = createExtraParagraph(entry.extras);
|
||||
var extratxt = createExtraParagraph(entry.extras,0);
|
||||
|
||||
var table = entry.tablename;
|
||||
var entryToAdd = {
|
||||
|
|
@ -354,6 +360,8 @@ function insertGeneralConfigItems(configResult) {
|
|||
var values = configResult.msg;
|
||||
beepordered = values.beepordered;
|
||||
oneclickcooked = values.oneclickcooked;
|
||||
kitchenextrasize = values.kitchenextrasize;
|
||||
kitchenoptionsize = values.kitchenoptionsize;
|
||||
setLanguage(values.userlanguage);
|
||||
isInitialized = true;
|
||||
if (displayHeaderFooter) {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.5">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<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="https://code.jquery.com/jquery-1.11.3.js"></script> -->
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.4"></script>
|
||||
<script src="elements/tablemap.js?v=2.0.4"></script>
|
||||
<script src="elements/roommap.js?v=2.0.4"></script>
|
||||
<script src="elements/groundplan.js?v=2.0.4"></script>
|
||||
<script src="elements/tse.js?v=2.0.4"></script>
|
||||
<script src="elements/closing.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
<script src="elements/tablemap.js?v=2.0.5"></script>
|
||||
<script src="elements/roommap.js?v=2.0.5"></script>
|
||||
<script src="elements/groundplan.js?v=2.0.5"></script>
|
||||
<script src="elements/tse.js?v=2.0.5"></script>
|
||||
<script src="elements/closing.js?v=2.0.5"></script>
|
||||
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
|
|
@ -541,6 +541,9 @@ var MAN_COINS_HINT = ["Münzenwertangaben in kleinster Einheit, z.B. Eurocents.
|
|||
var MAN_EXPECTED_CASH = ["Barumsätze, die noch nicht in einem Kassenabschluss erfasst wurden","Cash sums that are still not in a closing","Las ventas en efectivo que aún no se han registrado en un saldo de caja"];
|
||||
var MAN_EXPECTED_CASH_IN_PAYDESK = ["Bargeld, das sich aktuell in der Kasse befinden sollte","Cash that should currently be in the cash register","El efectivo que debería estar actualmente en la caja registradora"];
|
||||
var MAN_EXPECTED_CASH_HEADER = ["Bargeldumsätze","Cash sales","Moneda"];
|
||||
var MAN_KITCHEN_EXTRA_SIZE = ["Schriftgrüße Extras-Angabe in Küchen-/Baransicht","Fontsize of extras in kitchen/bar view","Tamaño de font de extras en cocina"];
|
||||
var MAN_KITCHEN_OPTION_SIZE = ["Schriftgrüße der Kommentare in Küchen-/Baransicht","Fontsize of comments in kitchen/bar view","Tamaño de font de comentarios en cocina"];
|
||||
var MAN_KITCHEN_FONTSIZE_HINT = ["Wird als Schriftgröße der Wert 0 angegeben, so wird die Standardschriftgröße verwendet.","If the value 0 is set for the font size the default font size will be applied.","Si el tamaño de la fuente se especifica como 0, se utiliza el tamaño de la fuente por defecto."];
|
||||
|
||||
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,0];
|
||||
|
|
@ -725,7 +728,9 @@ var generalValuesSettings = [
|
|||
["coins",MAN_COINS,"i",0],
|
||||
["notes",MAN_NOTES,"i",0],
|
||||
["coinvalname",MAN_COIN_VALNAME,"i",0],
|
||||
["notevalname",MAN_NOTE_VALNAME,"i",0]
|
||||
["notevalname",MAN_NOTE_VALNAME,"i",0],
|
||||
["kitchenextrasize",MAN_KITCHEN_EXTRA_SIZE[lang],"i",0],
|
||||
["kitchenoptionsize",MAN_KITCHEN_OPTION_SIZE[lang],"i",0]
|
||||
];
|
||||
|
||||
var predef = "";
|
||||
|
|
@ -965,6 +970,10 @@ function setLanguage(l) {
|
|||
$("#cashinpaydesk").html(MAN_EXPECTED_CASH_IN_PAYDESK[l]);
|
||||
$("#unenclosedsales").html(MAN_EXPECTED_CASH[l]);
|
||||
|
||||
$("#kitchenextrasizetxt").html(MAN_KITCHEN_EXTRA_SIZE[l]);
|
||||
$("#kitchenoptionsizetxt").html(MAN_KITCHEN_OPTION_SIZE[l]);
|
||||
$("#kitchenfontsizehint").html(MAN_KITCHEN_FONTSIZE_HINT[l]);
|
||||
|
||||
tse = new TSE();
|
||||
}
|
||||
|
||||
|
|
@ -1250,6 +1259,8 @@ function insertGeneralConfigItems(configResult) {
|
|||
$("#dsfinvk_stnr").val(values.dsfinvk_stnr);
|
||||
$("#dsfinvk_ustid").val(values.dsfinvk_ustid);
|
||||
$("#tseoutput").val("");
|
||||
$("#kitchenextrasize").val(values.kitchenextrasize);
|
||||
$("#kitchenoptionsize").val(values.kitchenoptionsize);
|
||||
|
||||
generalVals[5] = values.smtpauth;
|
||||
generalVals[6] = values.smtpsecure;
|
||||
|
|
@ -1701,7 +1712,7 @@ function initRestoreFileUpload() {
|
|||
} else {
|
||||
alert("Import war erfolgreich.");
|
||||
setTimeout(function(){
|
||||
document.location.href = "index.html?v=2.0.4";
|
||||
document.location.href = "index.html?v=2.0.5";
|
||||
},250);
|
||||
}
|
||||
},
|
||||
|
|
@ -2097,37 +2108,37 @@ function bindConfig() {
|
|||
$("#samplerectemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getrectemplate&v=2.0.4",null,handleGetRecTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getrectemplate&v=2.0.5",null,handleGetRecTemplate,null);
|
||||
});
|
||||
$("#sampleclstemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getclstemplate&v=2.0.4",null,handleGetClsTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getclstemplate&v=2.0.5",null,handleGetClsTemplate,null);
|
||||
});
|
||||
$("#samplecashtemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getcashtemplate&v=2.0.4",null,handleGetCashTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getcashtemplate&v=2.0.5",null,handleGetCashTemplate,null);
|
||||
});
|
||||
$("#samplefoodworktemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getfoodworktemplate&v=2.0.4",null,handleGetFoodTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getfoodworktemplate&v=2.0.5",null,handleGetFoodTemplate,null);
|
||||
});
|
||||
$("#sampledrinkworktemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getdrinkworktemplate&v=2.0.4",null,handleGetDrinkTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getdrinkworktemplate&v=2.0.5",null,handleGetDrinkTemplate,null);
|
||||
});
|
||||
$("#samplecanceltemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getcanceltemplate&v=2.0.4",null,handleGetCancelTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getcanceltemplate&v=2.0.5",null,handleGetCancelTemplate,null);
|
||||
});
|
||||
$("#samplepickuptemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getpickuptemplate&v=2.0.4",null,handleGetPickupTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getpickuptemplate&v=2.0.5",null,handleGetPickupTemplate,null);
|
||||
});
|
||||
|
||||
$("#changeConfig").off("click").on("click", function (e) {
|
||||
|
|
@ -2255,38 +2266,38 @@ function binding() {
|
|||
$("#backup_btn").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=2.0.4";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=2.0.5";
|
||||
});
|
||||
|
||||
$("#backup_btnall").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=2.0.4";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=2.0.5";
|
||||
});
|
||||
|
||||
$("#backup_btnalllogs").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=2.0.4";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=2.0.5";
|
||||
});
|
||||
|
||||
$("#backup_btnftpall").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
showProgressPopup();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=2.0.4",null,handleFtpResult,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=2.0.5",null,handleFtpResult,null);
|
||||
});
|
||||
|
||||
$("#backup_debugdata").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=2.0.4",'_blank');
|
||||
window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=2.0.5",'_blank');
|
||||
});
|
||||
|
||||
$("#backupguests_btn").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=2.0.4";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=2.0.5";
|
||||
});
|
||||
|
||||
$("#golive").off("click").on("click", function (e) {
|
||||
|
|
@ -2484,7 +2495,7 @@ function updateOneSingleFile() {
|
|||
setTimeout(function(){
|
||||
$("#sliderarea").hide();
|
||||
var millis=getMillis();
|
||||
document.location.href = "install.html?v=2.0.4&mode=onlyupdate&n=" + millis;
|
||||
document.location.href = "install.html?v=2.0.5&mode=onlyupdate&n=" + millis;
|
||||
},250);
|
||||
}
|
||||
}
|
||||
|
|
@ -4380,6 +4391,26 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
</div>
|
||||
</div> <!-- conftemplatessection -->
|
||||
|
||||
|
||||
<p><a class="genconflink" href="" onclick="javascript:showconfsection('conflayoutsection'); return false">
|
||||
Layout <span id="conflayoutsection_expandicon" style="display:inline;">⇲</span>
|
||||
<span id="conflayoutsection_collapseicon" style="display:none;">⇱</span></a>
|
||||
<div style="display: none" id="conflayoutsection" class="confblock">
|
||||
|
||||
<div data-role="fieldcontain">
|
||||
<label for="kitchenextrasize"><span id="kitchenextrasizetxt">Größe (Pixel)</span>:</label>
|
||||
<input type="text" value="" data-mini="true" id="kitchenextrasize" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
<div data-role="fieldcontain">
|
||||
<label for="kitchenoptionsize"><span id="kitchenoptionsizetxt">Größe (Pixel)</span>:</label>
|
||||
<input type="text" value="" data-mini="true" id="kitchenoptionsize" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
|
||||
<i style="padding-left: 50px;padding-right: 50px;"><span id="kitchenfontsizehint">Hinweis bei Fontgröße 0</span></i>
|
||||
|
||||
</div> <!-- conflayoutsection -->
|
||||
|
||||
|
||||
<p><a class="genconflink" href="" onclick="javascript:showconfsection('confsumupsection'); return false">
|
||||
<span id="sumuptxt">SumUp-Anbindung</span> <span id="confsumupsection_expandicon" style="display:inline;">⇲</span>
|
||||
<span id="confsumupsection_collapseicon" style="display:none;">⇱</span></a>
|
||||
|
|
@ -4544,17 +4575,18 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
</div>
|
||||
<div data-role="fieldcontain">
|
||||
<label for="guestqrsize">Größe (Pixel):</label>
|
||||
<input type="text" value="" data-mini="true" placeholder="Gastbestellung" id="guestqrsize" data-theme="c" class="genConfigEl"/>
|
||||
<input type="text" value="" data-mini="true" id="guestqrsize" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
<div data-role="fieldcontain">
|
||||
<label for="guestqrfontsize">Beschriftung Fontgröße:</label>
|
||||
<input type="text" value="" data-mini="true" placeholder="Gastbestellung" id="guestqrfontsize" data-theme="c" class="genConfigEl"/>
|
||||
<input type="text" value="" data-mini="true" id="guestqrfontsize" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
|
||||
<i style="padding-left: 50px;padding-right: 50px;"><span id="guestqrinfotxt">Druck in Datenbank/Raumplan/Anbindunbg Gastbestellsystem</span></i>
|
||||
|
||||
|
||||
</div> <!-- confguestsyssection -->
|
||||
|
||||
|
||||
<p><a class="genconflink" href="" onclick="javascript:showconfsection('confspecialssection'); return false">
|
||||
<span id="specialsettingssectiontxt">Spezialeinstellungen</span> <span id="confspecialssection_expandicon" style="display:inline;">⇲</span>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1355,7 +1355,10 @@ class Admin {
|
|||
array("coins",'',true),
|
||||
array("notes",'',true),
|
||||
array("coinvalname",'',true),
|
||||
array("notevalname",'',true)
|
||||
array("notevalname",'',true),
|
||||
|
||||
array("kitchenextrasize",null,false),
|
||||
array("kitchenoptionsize",null,false)
|
||||
);
|
||||
|
||||
if (is_null($pdo)) {
|
||||
|
|
@ -1553,7 +1556,7 @@ class Admin {
|
|||
$view = "preferences.html";
|
||||
}
|
||||
|
||||
echo json_encode($view . "?v=2.0.4");
|
||||
echo json_encode($view . "?v=2.0.5");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1768,31 +1771,31 @@ class Admin {
|
|||
|
||||
if (!self::isOnlyRatingUser($rights, $right_rating, true)) {
|
||||
if ($_SESSION['modus'] == 0) {
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=2.0.4"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=2.0.5"); }
|
||||
} else {
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=2.0.4"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=2.0.5"); }
|
||||
}
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=2.0.4"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=2.0.4"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=2.0.4"); }
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=2.0.5"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=2.0.5"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=2.0.5"); }
|
||||
if ($_SESSION['modus'] == 0) {
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=2.0.4"); }
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=2.0.5"); }
|
||||
}
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=2.0.4"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=2.0.4"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=2.0.4"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=2.0.4"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=2.0.4"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=2.0.4"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=2.0.4"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=2.0.4"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=2.0.4"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=2.0.4"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=2.0.4");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=2.0.4"); }
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=2.0.5"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=2.0.5"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=2.0.5"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=2.0.5"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=2.0.5"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=2.0.5"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=2.0.5"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=2.0.5"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=2.0.5"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=2.0.5"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=2.0.5");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=2.0.5"); }
|
||||
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=2.0.4");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=2.0.4");
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=2.0.5");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=2.0.5");
|
||||
}
|
||||
|
||||
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
||||
|
|
@ -2452,7 +2455,9 @@ class Admin {
|
|||
"coins" => array("dbcol" => "coins","checknum" => 0),
|
||||
"notes" => array("dbcol" => "notes","checknum" => 0),
|
||||
"coinvalname" => array("dbcol" => "coinvalname","checknum" => 0),
|
||||
"notevalname" => array("dbcol" => "notevalname","checknum" => 0)
|
||||
"notevalname" => array("dbcol" => "notevalname","checknum" => 0),
|
||||
"kitchenextrasize" => array("dbcol" => "kitchenextrasize","checknum" => 1),
|
||||
"kitchenoptionsize" => array("dbcol" => "kitchenoptionsize","checknum" => 1)
|
||||
);
|
||||
|
||||
$isMasterData = self::isMasterDataInSetOfChangedValues($changedValues, $valueSpecifications);
|
||||
|
|
|
|||
|
|
@ -1080,6 +1080,8 @@ class Bill {
|
|||
$moneyTwoDigits = number_format($money, 2, '.', '');
|
||||
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";
|
||||
} else if ($cashtype == self::$CASHTYPE_Geldtransit["value"]) {
|
||||
$signStr = "Beleg^" . implode('_',array($moneyTwoDigits,'0.00','0.00','0.00','0.00')) . "^" . $moneyTwoDigits . ":Bar";
|
||||
} 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";
|
||||
} else if ($cashtype == self::$CASHTYPE_TrinkgeldAN["value"]) {
|
||||
|
|
|
|||
|
|
@ -892,7 +892,7 @@ class Customers {
|
|||
$txt = "<head>";
|
||||
$txt .= "<title>" . self::$CUS_OVERVIEW[$lang] . "</title>";
|
||||
$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.4">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=2.0.5">';
|
||||
$txt .= "</head>";
|
||||
return $txt;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
|
|||
if (strlen($status) > 150) {
|
||||
$status = substr($status, 0,149);
|
||||
}
|
||||
$version = "2.0.4";
|
||||
$version = "2.0.5";
|
||||
|
||||
$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1424,15 +1424,11 @@ class QueueContent {
|
|||
$logtime = $tseLog["logtime"];
|
||||
$trans = $tseLog["trans"];
|
||||
$sigcounter = $tseLog["sigcounter"];
|
||||
$signtxt = $signTxtValue;
|
||||
$tseSignature = $tseLog["signature"];
|
||||
$sigalgRef = CommonUtils::referenceValueInTseValuesTable($pdo, $tseLog["sigalg"]);
|
||||
$pubkeyRef = CommonUtils::referenceValueInTseValuesTable($pdo, $tseLog["publickey"]);
|
||||
$serialNoRef = CommonUtils::referenceValueInTseValuesTable($pdo, $tseLog["serialno"]);
|
||||
$certificateRef = CommonUtils::referenceValueInTseValuesTable($pdo, $tseLog["certificate"]);
|
||||
if (strlen($signtxt) > 120) {
|
||||
$signtxt = substr($signtxt, 120, 10);
|
||||
}
|
||||
}
|
||||
|
||||
$opid = Operations::createOperation(
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ class Reservation {
|
|||
$txt = "<html><head>";
|
||||
$txt .= "<title>Reservierungsübersicht</title>";
|
||||
$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.4">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=2.0.5">';
|
||||
$txt .= "</head>";
|
||||
$txt .= "<body>";
|
||||
$txt .= "<h1>Reservierungsübersicht für $day.$month.$year</h1><p>";
|
||||
|
|
|
|||
|
|
@ -638,7 +638,7 @@ class Roomtables {
|
|||
$txt = "<html><head>";
|
||||
$txt .= "<title>Tisch QR-Codes für die Gastbestellung</title>";
|
||||
$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.4">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=2.0.5">';
|
||||
$txt .= "</head>";
|
||||
$txt .= "<body>";
|
||||
$txt .= "<h1>Tisch QR-Codes für die Gastbestellung</h1><p>";
|
||||
|
|
|
|||
|
|
@ -976,6 +976,7 @@ class Dsfinvk {
|
|||
|
||||
$colsPrivateinlage = self::_zgvtyp_helper_billsSums($fileToSave, $paydeskid, $ztime, array("label" => "Privateinlage", "cashtype" => 2));
|
||||
$colsPrivatentnahme = self::_zgvtyp_helper_billsSums($fileToSave, $paydeskid, $ztime, array("label" => "Privatentnahme", "cashtype" => 1));
|
||||
$colsGeldtransit = self::_zgvtyp_helper_billsSums($fileToSave, $paydeskid, $ztime, array("label" => "Geldtransit", "cashtype" => 3));
|
||||
$colsEinzahlung = self::_zgvtyp_helper_billsSums($fileToSave, $paydeskid, $ztime, array("label" => "Einzahlung", "cashtype" => 5));
|
||||
$colsAuszahlung = self::_zgvtyp_helper_billsSums($fileToSave, $paydeskid, $ztime, array("label" => "Auszahlung", "cashtype" => 6));
|
||||
$colsTrinkgeldAN= self::_zgvtyp_helper_billsSums($fileToSave, $paydeskid, $ztime, array("label" => "TrinkgeldAN", "cashtype" => 7));
|
||||
|
|
@ -1003,6 +1004,7 @@ class Dsfinvk {
|
|||
|
||||
$allCols = implode(" UNION ALL ",array(
|
||||
$colsPrivateinlage,$colsPrivatentnahme,
|
||||
$colsGeldtransit,
|
||||
$colsEinzahlung,$colsAuszahlung,
|
||||
$colsTrinkgeldAN,$colsTrinkgeldAG,
|
||||
$colsDiffSollIst,
|
||||
|
|
|
|||
|
|
@ -34,6 +34,10 @@ class Operations {
|
|||
$res = CommonUtils::fetchSqlAll($pdo, $sql);
|
||||
$maxid = intval($res[0]["maxid"]);
|
||||
|
||||
if (strlen($signtxt) > 120) {
|
||||
// the signtxt is only for debug purposes. So cut it and show that it was cut
|
||||
$signtxt = substr($signtxt, 0, 117) . "...";
|
||||
}
|
||||
$sql = "INSERT INTO %operations% (id,typerange,bonid,processtype,handledintable,logtime,trans,sigcounter,tsesignature,pubkey,sigalg,serialno,certificate,signtxt,tseerror,terminalid) VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)";
|
||||
CommonUtils::execSql($pdo, $sql, array($maxid+1,$range,$maxbonid+1,$opType,$table,$logtime,$trans, $sigcounter, $tseSignature, $pubkeyRef, $sigalgRef, $serialNoRef,$certificateRef, $signtxt, $tseerror, $terminalEntryId));
|
||||
$opid = $pdo->lastInsertId();
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ class OsQrcode {
|
|||
readfile(__DIR__. '/../../img/oops.png');
|
||||
return;
|
||||
} else {
|
||||
$text = $serverurl . "/nfclogin.php?a=" . $passhash . "_" . $userid . "&v=2.0.4";
|
||||
$text = $serverurl . "/nfclogin.php?a=" . $passhash . "_" . $userid . "&v=2.0.5";
|
||||
QRcode::png($text);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1559,6 +1559,16 @@ class Version {
|
|||
public static function upd_2003_2004($pdo, $prefix, $dbname) {
|
||||
return array(true);
|
||||
}
|
||||
public static function upd_2004_2005($pdo, $prefix, $dbname) {
|
||||
try {
|
||||
self::insertOrUpdateConfigItem($pdo, 'kitchenextrasize', 0);
|
||||
self::insertOrUpdateConfigItem($pdo, 'kitchenoptionsize', 0);
|
||||
return array(true);
|
||||
|
||||
} catch (PDOException $e) {
|
||||
return array(false,$e);
|
||||
}
|
||||
}
|
||||
|
||||
public static $updateOrder = array(
|
||||
"1.3.0" => array("upd_1300_1301","1.3.1"),
|
||||
|
|
@ -1656,7 +1666,8 @@ class Version {
|
|||
"2.0.0" => array("upd_2000_2001","2.0.1"),
|
||||
"2.0.1" => array("upd_2001_2002","2.0.2"),
|
||||
"2.0.2" => array("upd_2002_2003","2.0.3"),
|
||||
"2.0.3" => array("upd_2003_2004","2.0.4")
|
||||
"2.0.3" => array("upd_2003_2004","2.0.4"),
|
||||
"2.0.4" => array("upd_2004_2005","2.0.5")
|
||||
);
|
||||
|
||||
public static function runUpdateProcess($pdo,$prefix, $dbname, $untilVersion,$checkValidVersion) {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.5">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<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.mobile-1.4.5.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.5">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<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" />
|
||||
<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="utilities.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.5">
|
||||
<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/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.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.4"></script>
|
||||
<script src="elements/product.js?v=2.0.4"></script>
|
||||
<script src="elements/extra.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
<script src="elements/product.js?v=2.0.5"></script>
|
||||
<script src="elements/extra.js?v=2.0.5"></script>
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.5">
|
||||
|
||||
<link rel="stylesheet" href="css/ospage.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/jqueryui1-12-0/jquery-ui.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
|
||||
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.5">
|
||||
<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/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.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.5">
|
||||
<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/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.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
<script src="elements/rating.js"></script>
|
||||
</head>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/osdatepicker.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.5">
|
||||
<link rel="stylesheet" type="text/css" href="css/osdatepicker.css?v=2.0.5">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<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.mobile-1.4.5.min.js"></script>
|
||||
<script src="elements/tablemap.js"></script>
|
||||
<script src="elements/reservation.js?v=2.0.4"></script>
|
||||
<script src="elements/osdatepicker.js?v=2.0.4"></script>
|
||||
<script src="elements/reservation.js?v=2.0.5"></script>
|
||||
<script src="elements/osdatepicker.js?v=2.0.5"></script>
|
||||
|
||||
<script src="utilities.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
|
||||
|
|
@ -627,7 +627,7 @@ function bindCancelButtn() {
|
|||
var year = date.getFullYear();
|
||||
var dateStr = year + "-" + month + "-" + day;
|
||||
|
||||
setTimeout(function(){document.location.href = "reservation.html?v=2.0.4&date=" + dateStr;},500);
|
||||
setTimeout(function(){document.location.href = "reservation.html?v=2.0.5&date=" + dateStr;},500);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<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.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
@ -30,7 +30,7 @@ var SUM_REASON = ["Grund","Reason","Razó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 nextpage = "paydesk.html?version=2.0.4";
|
||||
var nextpage = "paydesk.html?version=2.0.5";
|
||||
|
||||
var lang;
|
||||
|
||||
|
|
@ -84,10 +84,10 @@ function setLanguage(language) {
|
|||
|
||||
if (nextPage == "p") {
|
||||
$("#nextpagebtntxt").html(SUM_TO_PAYMENT[lang]);
|
||||
nextpage = "paydesk.html?t=" + tableid + "&version=2.0.4";
|
||||
nextpage = "paydesk.html?t=" + tableid + "&version=2.0.5";
|
||||
} else {
|
||||
$("#nextpagebtntxt").html(SUM_TO_ORDER[lang]);
|
||||
nextpage = "waiter.html?version=2.0.4";
|
||||
nextpage = "waiter.html?version=2.0.5";
|
||||
}
|
||||
|
||||
var txt = "<table class='viewtable'>";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.5">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<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" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
<style>
|
||||
|
||||
#tableWithPreparedProds,#tableWithDeliveredEntries,#headertableToCook
|
||||
|
|
@ -174,7 +174,7 @@ function listOfTable(table) {
|
|||
$.each(itemsForTable, function (i, entry) {
|
||||
var option = '';
|
||||
|
||||
var extratxt = createExtraParagraph(entry.extras);
|
||||
var extratxt = createExtraParagraph(entry.extras,0);
|
||||
|
||||
if (entry.option != '') {
|
||||
option = '<p>' + toHtml(entry.option) + '</p>';
|
||||
|
|
@ -251,7 +251,7 @@ function filltableWithDeliveredEntries(answer) {
|
|||
var queue_entry_id = queueentry.id;
|
||||
var tablename = queueentry.tablename;
|
||||
|
||||
var extratxt = createExtraParagraph(queueentry.extras);
|
||||
var extratxt = createExtraParagraph(queueentry.extras,0);
|
||||
|
||||
theList += '<li data-theme="e" data-icon="arrow-u" id="' + queue_entry_id + '" class="deliveredlistitem"><a href="#">' + prodname + extratxt;
|
||||
theList += '<p>' + tablename + ' - ' + queueentry.delivertime + '</p>';
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.5">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<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.mobile-1.4.5.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.4">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.5">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<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.mobile-1.4.5.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=2.0.4"></script>
|
||||
<script src="utilities.js?v=2.0.5"></script>
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -227,13 +227,18 @@ function toHtml(text) {
|
|||
}
|
||||
}
|
||||
|
||||
function createExtraParagraph(extras) {
|
||||
function createExtraParagraph(extras,fontsize) {
|
||||
if ((extras == null) || (extras == "")) {
|
||||
return "";
|
||||
}
|
||||
var extratxt = "";
|
||||
for (var j=0;j<extras.length;j++) {
|
||||
extratxt += "<p>+ " + toHtml(extras[j]) + "</p>";
|
||||
if (fontsize == 0) {
|
||||
extratxt += "<p>+ " + toHtml(extras[j]) + "</p>";
|
||||
} else {
|
||||
extratxt += "<p style='font-size:" + fontsize + "px;'>+ " + toHtml(extras[j]) + "</p>";
|
||||
}
|
||||
|
||||
}
|
||||
return extratxt;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue