OrderSprinter 1.5.30
This commit is contained in:
parent
6cdd0aad83
commit
87e84e50f3
|
|
@ -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=1.5.29" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.29" />
|
||||
<link rel="stylesheet" href="css/gueststyle.css?v=1.5.30" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.30" />
|
||||
<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>
|
||||
|
|
@ -113,7 +113,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">1.5.29 </div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo">1.5.30 </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=1.5.29">';
|
||||
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.30">';
|
||||
echo "</head>";
|
||||
echo "<body><div class=surround>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.29</span><br><br>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.30</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.
|
|
@ -85,7 +85,7 @@ class Installer {
|
|||
}
|
||||
Database::dropTables($pdo);
|
||||
Database::createEmptyTables($pdo, $prefix);
|
||||
Database::setVersion($pdo,$prefix,"1.5.29");
|
||||
Database::setVersion($pdo,$prefix,"1.5.30");
|
||||
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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
|
||||
<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=1.5.29"></script>
|
||||
<script src="kitchenbar.js?v=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></script>
|
||||
<script src="kitchenbar.js?v=1.5.30"></script>
|
||||
<style>
|
||||
|
||||
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook
|
||||
|
|
|
|||
|
|
@ -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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
<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=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></script>
|
||||
<script src="receiptutils.js"></script>
|
||||
|
||||
<script>
|
||||
|
|
|
|||
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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
<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=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></script>
|
||||
<script src="elements/customers.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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
|
||||
<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=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></script>
|
||||
<script src="receiptutils.js"></script>
|
||||
<script src="elements/dash.js"></script>
|
||||
<script src="php/3rdparty/Chart.bundle.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
|
||||
<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=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.30">
|
||||
|
||||
<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=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.30">
|
||||
|
||||
<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=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
@ -231,7 +231,7 @@ function handleResultOfInstallCheck(is_installed) {
|
|||
if (is_installed == "Yes") {
|
||||
useInstallation();
|
||||
} else {
|
||||
setTimeout(function(){document.location.href = "install.html?v=1.5.29"},500);
|
||||
setTimeout(function(){document.location.href = "install.html?v=1.5.30"},500);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -285,11 +285,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=1.5.29&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.5.30&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=1.5.29&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.5.30&style=always" style="max-height:150px;"/></div>
|
||||
|
||||
<form method="post">
|
||||
<table border=0>
|
||||
|
|
|
|||
|
|
@ -916,7 +916,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">Update -> 1.5.29</button>
|
||||
<button id="updatebtn">Update -> 1.5.30</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>
|
||||
</td>
|
||||
<td> </td>
|
||||
|
|
|
|||
|
|
@ -455,7 +455,7 @@ return;
|
|||
}
|
||||
|
||||
set_time_limit(60*30);
|
||||
$installerVersion = "1.5.29";
|
||||
$installerVersion = "1.5.30";
|
||||
|
||||
$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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
|
||||
<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=1.5.29"></script>
|
||||
<script src="kitchenbar.js?v=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></script>
|
||||
<script src="kitchenbar.js?v=1.5.30"></script>
|
||||
<style>
|
||||
|
||||
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook
|
||||
|
|
|
|||
|
|
@ -68,6 +68,7 @@ function removeOrRedeclareAnIdFromPrepared(theId,doRemove) {
|
|||
if (anEntry.id == theId) {
|
||||
found = true;
|
||||
var longname = anEntry.longname;
|
||||
var isguestorder = anEntry.isguestorder;
|
||||
var option = anEntry.option;
|
||||
var extras = anEntry.extras;
|
||||
break;
|
||||
|
|
@ -80,6 +81,7 @@ function removeOrRedeclareAnIdFromPrepared(theId,doRemove) {
|
|||
id: theId,
|
||||
tablename: tablename,
|
||||
longname: longname,
|
||||
isguestorder: isguestorder,
|
||||
option: option,
|
||||
extras: extras
|
||||
};
|
||||
|
|
@ -173,6 +175,9 @@ function listOfTable(table) {
|
|||
var icon = "check";
|
||||
var status = "not_cooking";
|
||||
var label = toHtml(entry.longname);
|
||||
if (entry.isguestorder == 1) {
|
||||
label = "<span class='guestorder'>" + label + "</span>";
|
||||
}
|
||||
if (entry.cooking != '') {
|
||||
theme ='d';
|
||||
status = "cooking";
|
||||
|
|
@ -183,6 +188,7 @@ function listOfTable(table) {
|
|||
|
||||
var entryToAdd = {
|
||||
name: label + extratxt,
|
||||
isguestorder: entry.isguestorder,
|
||||
cooking: entry.cooking,
|
||||
queueid: entry.id,
|
||||
option: option,
|
||||
|
|
@ -391,6 +397,7 @@ function groupMadeItems(theSet) {
|
|||
var counts = [];
|
||||
var joinedvals = [];
|
||||
var names = [];
|
||||
var isguestorders = [];
|
||||
var options = [];
|
||||
var extras = [];
|
||||
var tables = [];
|
||||
|
|
@ -400,6 +407,7 @@ function groupMadeItems(theSet) {
|
|||
counts:counts,
|
||||
joinedvals : joinedvals,
|
||||
names: names,
|
||||
isguestorders: isguestorders,
|
||||
options: options,
|
||||
extras: extras,
|
||||
tables: tables,
|
||||
|
|
@ -410,11 +418,12 @@ function groupMadeItems(theSet) {
|
|||
for (i=0;i<theSet.length;i++) {
|
||||
var anEntry = theSet[i];
|
||||
var name=anEntry.name;
|
||||
var isguestorder = anEntry.isguestorder;
|
||||
var option=anEntry.option;
|
||||
var extras = anEntry.extras;
|
||||
var table = anEntry.table;
|
||||
var queueid = anEntry.queueid;
|
||||
var joinedNeedle = name + "-" + option + "-" + "-" + table + "_" + extras;
|
||||
var joinedNeedle = name + "-" + isguestorder + " - " + option + "-" + "-" + table + "_" + extras;
|
||||
var index = grouped.joinedvals.indexOf(joinedNeedle);
|
||||
if (index >= 0) {
|
||||
grouped.counts[index] = grouped.counts[index] + 1;
|
||||
|
|
@ -426,6 +435,7 @@ function groupMadeItems(theSet) {
|
|||
grouped.counts[gLength] = 1;
|
||||
grouped.joinedvals[gLength] = joinedNeedle;
|
||||
grouped.names[gLength] = name;
|
||||
grouped.isguestorders[gLength] = isguestorder;
|
||||
grouped.options[gLength] = option;
|
||||
grouped.extras[gLength] = extras;
|
||||
grouped.tables[gLength] = table;
|
||||
|
|
@ -439,6 +449,7 @@ function groupItemToMake(theSet) {
|
|||
var counts = [];
|
||||
var joinedvals = [];
|
||||
var names = [];
|
||||
var isguestorders = [];
|
||||
var options = [];
|
||||
var cookings = [];
|
||||
var waiticons = [];
|
||||
|
|
@ -447,6 +458,7 @@ function groupItemToMake(theSet) {
|
|||
var grouped = { counts:counts,
|
||||
joinedvals : joinedvals,
|
||||
names: names,
|
||||
isguestorders: isguestorders,
|
||||
options: options,
|
||||
cookings: cookings,
|
||||
waiticons: waiticons,
|
||||
|
|
@ -457,11 +469,12 @@ function groupItemToMake(theSet) {
|
|||
for (i=0;i<theSet.length;i++) {
|
||||
var anEntry = theSet[i];
|
||||
var name=anEntry.name;
|
||||
var isguestorder = anEntry.isguestorder;
|
||||
var option=anEntry.option;
|
||||
var waiticon = anEntry.waiticon;
|
||||
var cooking = anEntry.cooking;
|
||||
var queueid = anEntry.queueid;
|
||||
var joinedNeedle = name + "-" + option + "-" + waiticon + "-" + cooking;
|
||||
var joinedNeedle = name + "-" + isguestorder + "-" + option + "-" + waiticon + "-" + cooking;
|
||||
var index = grouped.joinedvals.indexOf(joinedNeedle);
|
||||
if (index >= 0) {
|
||||
grouped.counts[index] = grouped.counts[index] + 1;
|
||||
|
|
@ -473,6 +486,7 @@ function groupItemToMake(theSet) {
|
|||
grouped.counts[gLength] = 1;
|
||||
grouped.joinedvals[gLength] = joinedNeedle;
|
||||
grouped.names[gLength] = name;
|
||||
grouped.isguestorders[gLength] = isguestorder;
|
||||
grouped.options[gLength] = option;
|
||||
grouped.cookings[gLength] = cooking;
|
||||
grouped.waiticons[gLength] = waiticon;
|
||||
|
|
|
|||
|
|
@ -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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<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" />
|
||||
<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=1.5.29"></script>
|
||||
<script src="elements/tablemap.js?v=1.5.29"></script>
|
||||
<script src="elements/roommap.js?v=1.5.29"></script>
|
||||
<script src="elements/groundplan.js?v=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></script>
|
||||
<script src="elements/tablemap.js?v=1.5.30"></script>
|
||||
<script src="elements/roommap.js?v=1.5.30"></script>
|
||||
<script src="elements/groundplan.js?v=1.5.30"></script>
|
||||
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
|
|
@ -507,6 +507,7 @@ var MAN_1ST_CLOSING = ["Erste Tageserfassung","First closing","Cerrada primera"]
|
|||
var MAN_LAST_CLOSING = ["Letzte Tageserfassung","Last closing","Cerrada última"];
|
||||
var MAN_PDF_REPORT_HINT = ["Erste und letzte Tageserfassung des Reports nach Eingrenzung des Datumsbereich (oben) auswählen:","Choose first and last closing after limit the time frame (above):","Seleccione la cerrada primera y última después de delimitar el intervalo de fechas (arriba):"];
|
||||
var MAN_PRINT_EXTRAPRICE = ["Preisangabe bei Extras auf Bon","Show price next to extra on receipt","Precio al lado del extra"];
|
||||
var MAN_TURBO_HINT = ["Mit dem Turbo-Slider lässt sich die Import-Geschwindigkeit beeinflussen. Je höher der Turbo-Wert eingestellt ist, desto größer muss die max_allowed_packet in der DB-Konfiguration sein.","With the Turbo-Slider you can influence the import speed. The higher the turbo value is set, the larger the max_allowed_packet must be in the DB configuration.","Con el Turbo-Slider puede influir en la velocidad de importación. Cuanto mayor sea el valor del turbo, mayor tengo que ser el tamaño del max_allowed_packet en la configuración de la base de datos."];
|
||||
|
||||
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];
|
||||
|
|
@ -871,6 +872,8 @@ function setLanguage(l) {
|
|||
$("#otherrundatadivheader").html(MAN_RUN_DATA[l]);
|
||||
$("#datesstartendhint").html(MAN_START_END_HINT[l]);
|
||||
$("#pdfreporthint").html(MAN_PDF_REPORT_HINT[l]);
|
||||
|
||||
$("#importturbohint").html(MAN_TURBO_HINT[l]);
|
||||
}
|
||||
|
||||
function toggleinlinedisplayelem(iconid) {
|
||||
|
|
@ -1224,6 +1227,9 @@ function insertGeneralConfigItems(configResult) {
|
|||
$("#partOfLogolocation").html(createLogolocation(values.logolocation));
|
||||
|
||||
$("#configpart").trigger("create");
|
||||
|
||||
$("#importturboslider").val(values.turbo);
|
||||
$("#importturboslider").slider("refresh");
|
||||
bindConfig();
|
||||
continueInitialization();
|
||||
} else {
|
||||
|
|
@ -1667,7 +1673,7 @@ function initRestoreFileUpload() {
|
|||
} else {
|
||||
alert("Import war erfolgreich.");
|
||||
setTimeout(function(){
|
||||
document.location.href = "index.html?v=1.5.29";
|
||||
document.location.href = "index.html?v=1.5.30";
|
||||
},250);
|
||||
}
|
||||
},
|
||||
|
|
@ -1859,6 +1865,15 @@ function bindingRolesPart() {
|
|||
});
|
||||
}
|
||||
|
||||
function bindImportTurboSlider() {
|
||||
$("#importturboslider").off("slidestop").on("slidestop", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
var turbo = $("#importturboslider").val();
|
||||
doAjax("POST","php/contenthandler.php?module=admin&command=setTurbo",{turbo:turbo}, null,null,true);
|
||||
});
|
||||
}
|
||||
|
||||
function updateStartClosingForSales() {
|
||||
var data = {
|
||||
month: $("#select-month-export-start").find(":selected").val(),
|
||||
|
|
@ -2140,38 +2155,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=1.5.29";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=1.5.30";
|
||||
});
|
||||
|
||||
$("#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=1.5.29";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=1.5.30";
|
||||
});
|
||||
|
||||
$("#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=1.5.29";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=1.5.30";
|
||||
});
|
||||
|
||||
$("#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=1.5.29",null,handleFtpResult,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=1.5.30",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=1.5.29",'_blank');
|
||||
window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=1.5.30",'_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=1.5.29";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=1.5.30";
|
||||
});
|
||||
|
||||
$("#golive").off("click").on("click", function (e) {
|
||||
|
|
@ -2352,7 +2367,7 @@ function updateOneSingleFile() {
|
|||
setTimeout(function(){
|
||||
$("#sliderarea").hide();
|
||||
var millis=getMillis();
|
||||
document.location.href = "install.html?v=1.5.29&mode=onlyupdate&n=" + millis;
|
||||
document.location.href = "install.html?v=1.5.30&mode=onlyupdate&n=" + millis;
|
||||
},250);
|
||||
}
|
||||
}
|
||||
|
|
@ -2924,6 +2939,7 @@ function displayReceivedClosings(closingresult) {
|
|||
bindingClosing();
|
||||
bindingExports();
|
||||
bindingRolesPart();
|
||||
bindImportTurboSlider();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -4749,6 +4765,10 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
</div>
|
||||
|
||||
<div id=restorearea>
|
||||
<div id="importturboarea">
|
||||
<label for="importturboslider" id="importturbosliderlabel">Import-Turbo: <span id="importturbohint">Hinweis</span></label>
|
||||
<input type="range" name="importturboslider" id="importturboslider" value="5" min="1" max="20" data-theme="b" data-track-theme="e" /><br>
|
||||
</div>
|
||||
<span id=uplfiletxt>Diese Datei hochladen (<i>importieren</i>):</span>
|
||||
<div id="restorefilearea">Upload</div>
|
||||
<div id="restorestatus"></div>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -70,6 +70,7 @@ class Admin {
|
|||
"fillSpeisekarte" => array("loggedin" => 1, "isadmin" => 1, "rights" => null),
|
||||
"assignTaxes" => array("loggedin" => 1, "isadmin" => 1, "rights" => null),
|
||||
"getDbStat" => array("loggedin" => 1, "isadmin" => 1, "rights" => null),
|
||||
"setTurbo" => array("loggedin" => 1, "isadmin" => 1, "rights" => null),
|
||||
|
||||
"exportConfigCsv" => array("loggedin" => 1, "isadmin" => 0, "rights" => array("manager_or_admin")),
|
||||
"exportUserCsv" => array("loggedin" => 1, "isadmin" => 0, "rights" => array("manager_or_admin")),
|
||||
|
|
@ -395,6 +396,8 @@ class Admin {
|
|||
$this->getDailycode();
|
||||
} else if ($command == 'askforcompanyinfo') {
|
||||
self::askforcompanyinfo();
|
||||
} else if ($command == 'setTurbo') {
|
||||
$this->setTurbo($_POST["turbo"]);
|
||||
}
|
||||
else {
|
||||
echo "Command not supported.";
|
||||
|
|
@ -1224,7 +1227,8 @@ class Admin {
|
|||
array("logolocation",1,false),
|
||||
array("austriabind",0,false),
|
||||
array("doublereceipt",0,false),
|
||||
array("printextraprice",1,false)
|
||||
array("printextraprice",1,false),
|
||||
array("turbo",5,false)
|
||||
);
|
||||
|
||||
if (is_null($pdo)) {
|
||||
|
|
@ -1419,7 +1423,7 @@ class Admin {
|
|||
$view = "preferences.html";
|
||||
}
|
||||
|
||||
echo json_encode($view . "?v=1.5.29");
|
||||
echo json_encode($view . "?v=1.5.30");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1640,31 +1644,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=1.5.29"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.30"); }
|
||||
} else {
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.29"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.30"); }
|
||||
}
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.29"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.29"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.29"); }
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.30"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.30"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.30"); }
|
||||
if ($_SESSION['modus'] == 0) {
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.29"); }
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.30"); }
|
||||
}
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.29"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.29"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.29"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.29"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.29"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.29"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.29"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.29"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.29"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.29"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.29");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.29"); }
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.30"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.30"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.30"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.30"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.30"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.30"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.30"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.30"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.30"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.30"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.30");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.30"); }
|
||||
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.29");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.29");
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.30");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.30");
|
||||
}
|
||||
|
||||
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
||||
|
|
@ -1772,7 +1776,17 @@ class Admin {
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
private function setTurbo($turbo) {
|
||||
try {
|
||||
$pdo = DbUtils::openDbAndReturnPdoStatic();
|
||||
$hist = new HistFiller();
|
||||
$hist->updateConfigInHist($pdo, "turbo", $turbo);
|
||||
echo json_encode(array("status" => "OK"));
|
||||
} catch (Exception $ex) {
|
||||
echo json_encode(array("status" => "ERROR","msg" => "Error: " . $ex->getMessage()));
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
private function getDbStat() {
|
||||
try {
|
||||
|
|
@ -3252,7 +3266,7 @@ class Admin {
|
|||
$typeIsOnlyConfig = false;
|
||||
}
|
||||
|
||||
$chunkSize = 20;
|
||||
$chunkSize = CommonUtils::getConfigValue($pdo, 'turbo', 1);
|
||||
if ($tablename == '%prodimages%') {
|
||||
$chunkSize = 1;
|
||||
}
|
||||
|
|
@ -3388,7 +3402,7 @@ class Admin {
|
|||
$typeIsOnlyConfig = false;
|
||||
}
|
||||
|
||||
$chunkSize = 20;
|
||||
$chunkSize = CommonUtils::getConfigValue($pdo, 'turbo', 1);
|
||||
if ($tablename == '%prodimages%') {
|
||||
$chunkSize = 1;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -878,7 +878,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=1.5.29">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.30">';
|
||||
$txt .= "</head>";
|
||||
return $txt;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
|
|||
if (strlen($status) > 150) {
|
||||
$status = substr($status, 0,149);
|
||||
}
|
||||
$version = "1.5.29";
|
||||
$version = "1.5.30";
|
||||
|
||||
$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1740,11 +1740,9 @@ class Products {
|
|||
|
||||
private function setPriceLevelInfo($levelId) {
|
||||
if (is_numeric($levelId)) {
|
||||
$pdo = DbUtils::openDbAndReturnPdoStatic();
|
||||
$updateSql = "UPDATE %config% SET setting=? WHERE name='pricelevel'";
|
||||
$stmt = $pdo->prepare(DbUtils::substTableAlias($updateSql));
|
||||
$stmt->execute(array($levelId));
|
||||
|
||||
$pdo = DbUtils::openDbAndReturnPdoStatic();
|
||||
$hist = new HistFiller();
|
||||
$hist->updateConfigInHist($pdo, "pricelevel", $levelId);
|
||||
echo json_encode("OK");
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -218,9 +218,9 @@ class QueueContent {
|
|||
$unit = CommonUtils::caseOfSqlUnitSelection($pdo);
|
||||
|
||||
if ($this->areBillExisting($pdo)) {
|
||||
$sql = "SELECT DISTINCT Q.id as id,%resttables%.id as tableid,tablenr,CONCAT($unit,Q.productname) as longname,anoption,tableno,date_format(ordertime,'%Y-%m-%d %H:%i:00') as ordertime,cooking,TIMESTAMPDIFF(MINUTE,ordertime,?) AS waittime FROM %queue% Q,%products%,%prodtype%,%resttables%,%bill% ";
|
||||
$sql = "SELECT DISTINCT Q.id as id,IF(Q.orderuser IS NULL,'1','0') as isguestorder,%resttables%.id as tableid,tablenr,CONCAT($unit,Q.productname) as longname,anoption,tableno,date_format(ordertime,'%Y-%m-%d %H:%i:00') as ordertime,cooking,TIMESTAMPDIFF(MINUTE,ordertime,?) AS waittime FROM %queue% Q,%products%,%prodtype%,%resttables%,%bill% ";
|
||||
} else {
|
||||
$sql = "SELECT DISTINCT Q.id as id,%resttables%.id as tableid,tablenr,CONCAT($unit,Q.productname) as longname,anoption,tableno,date_format(ordertime,'%Y-%m-%d %H:%i:00') as ordertime,cooking,TIMESTAMPDIFF(MINUTE,ordertime,?) AS waittime FROM %queue% Q,%products%,%prodtype%,%resttables% ";
|
||||
$sql = "SELECT DISTINCT Q.id as id,IF(Q.orderuser IS NULL,'1','0') as isguestorder,%resttables%.id as tableid,tablenr,CONCAT($unit,Q.productname) as longname,anoption,tableno,date_format(ordertime,'%Y-%m-%d %H:%i:00') as ordertime,cooking,TIMESTAMPDIFF(MINUTE,ordertime,?) AS waittime FROM %queue% Q,%products%,%prodtype%,%resttables% ";
|
||||
}
|
||||
$sql .= "WHERE (readytime IS NULL AND ";
|
||||
$sql .= "Q.toremove='0' AND ";
|
||||
|
|
@ -243,7 +243,7 @@ class QueueContent {
|
|||
|
||||
$result1 = $stmt->fetchAll();
|
||||
|
||||
$sql = "SELECT DISTINCT Q.id as id,'-' as tableid,'-' as tablenr,CONCAT($unit,Q.productname) as longname,anoption,'-' as tableno,date_format(ordertime,'%Y-%m-%d %H:%i:00') as ordertime,cooking,TIMESTAMPDIFF(MINUTE,ordertime,?) AS waittime FROM %products%,%prodtype%,%queue% Q LEFT OUTER JOIN %bill% b ";
|
||||
$sql = "SELECT DISTINCT Q.id as id,IF(Q.orderuser IS NULL,'1','0') as isguestorder,'-' as tableid,'-' as tablenr,CONCAT($unit,Q.productname) as longname,anoption,'-' as tableno,date_format(ordertime,'%Y-%m-%d %H:%i:00') as ordertime,cooking,TIMESTAMPDIFF(MINUTE,ordertime,?) AS waittime FROM %products%,%prodtype%,%queue% Q LEFT OUTER JOIN %bill% b ";
|
||||
$sql .= " ON Q.billid=b.id ";
|
||||
$sql .= "WHERE (readytime IS NULL AND ";
|
||||
$sql .= "Q.toremove='0' AND ";
|
||||
|
|
@ -274,6 +274,7 @@ class QueueContent {
|
|||
}
|
||||
|
||||
$arr = array("id" => $zeile['id'],
|
||||
"isguestorder" => $zeile['isguestorder'],
|
||||
"tableid" => $zeile['tableid'],
|
||||
"tablenr" => $zeile['tableno'],
|
||||
"longname" => $zeile['longname'],
|
||||
|
|
@ -321,6 +322,7 @@ class QueueContent {
|
|||
|
||||
$anEntryForThisTable = array("id" => $foundItem['id'],
|
||||
"longname" => $foundItem['longname'],
|
||||
"isguestorder" => $foundItem['isguestorder'],
|
||||
"option" => $foundItem['option'],
|
||||
"extras" => $extras,
|
||||
"cooking" => $this->getUserName($foundItem['cooking']),
|
||||
|
|
|
|||
|
|
@ -1266,6 +1266,15 @@ class Version {
|
|||
}
|
||||
}
|
||||
|
||||
public static function upd_1529_1530($pdo, $prefix, $dbname) {
|
||||
try {
|
||||
self::insertOrUpdateConfigItem($pdo, 'turbo', '5');
|
||||
return array(true);
|
||||
} catch (PDOException $e) {
|
||||
return array(false,$e);
|
||||
}
|
||||
}
|
||||
|
||||
public static $updateOrder = array(
|
||||
"1.3.0" => array("upd_1300_1301","1.3.1"),
|
||||
"1.3.1" => array("upd_1301_1302","1.3.2"),
|
||||
|
|
@ -1342,7 +1351,8 @@ class Version {
|
|||
"1.5.25" => array("upd_1525_1526","1.5.26"),
|
||||
"1.5.26" => array("upd_1526_1527","1.5.27"),
|
||||
"1.5.27" => array("upd_1527_1528","1.5.28"),
|
||||
"1.5.28" => array("upd_1528_1529","1.5.29")
|
||||
"1.5.28" => array("upd_1528_1529","1.5.29"),
|
||||
"1.5.29" => array("upd_1529_1530","1.5.30")
|
||||
);
|
||||
|
||||
public static function runUpdateProcess($pdo,$prefix, $dbname, $untilVersion,$checkValidVersion) {
|
||||
|
|
@ -1368,6 +1378,7 @@ class Version {
|
|||
}
|
||||
$updContext = self::$updateOrder[$curversion];
|
||||
$updFct = $updContext[0];
|
||||
set_time_limit(60*60);
|
||||
$ret = call_user_func_array(["Version", $updFct], $params);
|
||||
if (!$ret[0]) {
|
||||
return array("status" => "ERROR","msg" => $ret[1]);
|
||||
|
|
|
|||
|
|
@ -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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
<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=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
|
||||
<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=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
<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=1.5.29"></script>
|
||||
<script src="elements/product.js?v=1.5.29"></script>
|
||||
<script src="elements/extra.js?v=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></script>
|
||||
<script src="elements/product.js?v=1.5.30"></script>
|
||||
<script src="elements/extra.js?v=1.5.30"></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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
|
||||
<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=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
<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=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
<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=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></script>
|
||||
<script src="elements/rating.js"></script>
|
||||
</head>
|
||||
|
||||
|
|
|
|||
|
|
@ -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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
<script src="elements/tablemap.js"></script>
|
||||
|
||||
<script src="utilities.js?v=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></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>
|
||||
|
|
@ -623,7 +623,7 @@ function bindCancelButtn() {
|
|||
var year = date.getFullYear();
|
||||
var dateStr = year + "-" + month + "-" + day;
|
||||
|
||||
setTimeout(function(){document.location.href = "reservation.html?v=1.5.29&date=" + dateStr;},500);
|
||||
setTimeout(function(){document.location.href = "reservation.html?v=1.5.30&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=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></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=1.5.29";
|
||||
var nextpage = "paydesk.html?version=1.5.30";
|
||||
|
||||
var lang;
|
||||
|
||||
|
|
@ -84,10 +84,10 @@ function setLanguage(language) {
|
|||
|
||||
if (nextPage == "p") {
|
||||
$("#nextpagebtntxt").html(SUM_TO_PAYMENT[lang]);
|
||||
nextpage = "paydesk.html?t=" + tableid + "&version=1.5.29";
|
||||
nextpage = "paydesk.html?t=" + tableid + "&version=1.5.30";
|
||||
} else {
|
||||
$("#nextpagebtntxt").html(SUM_TO_ORDER[lang]);
|
||||
nextpage = "waiter.html?version=1.5.29";
|
||||
nextpage = "waiter.html?version=1.5.30";
|
||||
}
|
||||
|
||||
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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
|
||||
<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=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></script>
|
||||
<style>
|
||||
|
||||
#tableWithPreparedProds,#tableWithDeliveredEntries,#headertableToCook
|
||||
|
|
|
|||
|
|
@ -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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
<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=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
<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=1.5.29"></script>
|
||||
<script src="utilities.js?v=1.5.30"></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>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -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=1.5.29">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.30">
|
||||
|
||||
<link rel="stylesheet" href="css/ospage.css" />
|
||||
<link rel="stylesheet" href="css/tablepanel.css" />
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
<link rel="stylesheet" href="css/extraspanel.css" />
|
||||
<link rel="stylesheet" href="css/actpanel.css" />
|
||||
<link rel="stylesheet" href="css/paypanel.css" />
|
||||
<link rel="stylesheet" href="css/numfield.css?v=1.5.29" />
|
||||
<link rel="stylesheet" href="css/numfield.css?v=1.5.30" />
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jqueryui1-12-0/jquery-ui.min.css" />
|
||||
<script src="php/3rdparty/jquery-2.2.4.min.js"></script>
|
||||
|
|
|
|||
Loading…
Reference in New Issue