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

OrderSprinter 1.5.11

This commit is contained in:
Geno 2020-11-19 23:12:00 +01:00
parent 42de3120a4
commit b811f831f7
37 changed files with 573 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gastsystem/index.php
View File

@ -9,8 +9,8 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" href="css/gueststyle.css?v=1.5.10" /> <link rel="stylesheet" href="css/gueststyle.css?v=1.5.11" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.10" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.11" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" /> <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <script src="php/3rdparty/jquery-1.11.3.min.js"></script>
@ -105,7 +105,7 @@
<div data-role="footer" data-theme="b" id="thefooter1"> <div data-role="footer" data-theme="b" id="thefooter1">
<div class="ui-grid-a"> <div class="ui-grid-a">
<div class="ui-block-a">&nbsp;&nbsp;OrderSprinter</div> <div class="ui-block-a">&nbsp;&nbsp;OrderSprinter</div>
<div class="ui-block-b grid_right" id="versioninfo">1.5.10&nbsp;&nbsp;</div> <div class="ui-block-b grid_right" id="versioninfo">1.5.11&nbsp;&nbsp;</div>
</div><!-- /grid-a --> </div><!-- /grid-a -->
</div> </div>
</div> </div>

4
gastsystem/install.php
View File

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

BIN
printserver/OrderSprinterPrintserver.exe
View File

Binary file not shown.

2
spider/install/installer.php
View File

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

BIN
webapp/OrderSprinterPrintserver.exe
View File

Binary file not shown.

6
webapp/bar.html
View File

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

8
webapp/bill.html
View File

File diff suppressed because one or more lines are too long

2
webapp/css/bestformat.css
View File

File diff suppressed because one or more lines are too long

8
webapp/elements/grouping.js
View File

@ -50,6 +50,14 @@ function Grouping(set,hashFct) {
} }
return txt; return txt;
} }
this.outputListAdditionalParam = function(outputFct,secondParam) {
var txt = "";
for (var i=0;i<this.sortedset.length;i++) {
var anEntry = this.sortedset[i];
txt += outputFct(anEntry,secondParam);
}
return txt;
}
this.getItemsOfRow = function(rowId) { this.getItemsOfRow = function(rowId) {
var anEntrySet = this.sortedset[rowId]; var anEntrySet = this.sortedset[rowId];

2
webapp/feedback.html
View File

@ -4,7 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.11">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

12
webapp/index.html
View File

@ -9,8 +9,8 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.11">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.10"> <link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.11">
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -47,9 +47,9 @@ function fillUserList(userinfo) {
function createViewSelBox(preselection) { function createViewSelBox(preselection) {
var txt = '<select name="modus" id="modus" data-theme="e">'; var txt = '<select name="modus" id="modus" data-theme="e">';
if (preselection == 0) { if (preselection == 0) {
txt += '<option value="0" selected>Mobil</option><option value="1">Desktop</option>'; txt += '<option value="0" selected>Mobil</option><option value="1">Desktop (Firefox)</option>';
} else { } else {
txt += '<option value="0">Mobil</option><option value="1" selected>Desktop</option>'; txt += '<option value="0">Mobil</option><option value="1" selected>Desktop (Firefox)</option>';
} }
txt += '</select>'; txt += '</select>';
$("#moduscell").html(txt); $("#moduscell").html(txt);
@ -229,7 +229,7 @@ function handleResultOfInstallCheck(is_installed) {
if (is_installed == "Yes") { if (is_installed == "Yes") {
useInstallation(); useInstallation();
} else { } else {
setTimeout(function(){document.location.href = "install.html?v=1.5.10"},500); setTimeout(function(){document.location.href = "install.html?v=1.5.11"},500);
} }
} }
@ -272,7 +272,7 @@ $(document).on("pageinit", "#index-page", function () {
<tr><td>Modus: <td id="moduscell"> <tr><td>Modus: <td id="moduscell">
<select name="modus" id="modus" data-theme="e"> <select name="modus" id="modus" data-theme="e">
<option value="0">Mobil</option> <option value="0">Mobil</option>
<option value="1">Desktop</option> <option value="1">Desktop (Firefox)</option>
</select></tr> </select></tr>
<tr><td>Passwort: <td><input type="password" name="password" id="passwordfield" style="background:white;"/> <tr><td>Passwort: <td><input type="password" name="password" id="passwordfield" style="background:white;"/>
<!-- place for info --> <!-- place for info -->

2
webapp/install.html
View File

@ -794,7 +794,7 @@ El servicio web OrderSprinter no requiere una conexión a Internet. Sin embargo,
<tr id=updateline> <tr id=updateline>
<td>&nbsp;</td> <td>&nbsp;</td>
<td align=center> <td align=center>
<button id="updatebtn">Update -> 1.5.10</button> <button id="updatebtn">Update -> 1.5.11</button>
<span id="updateinprogresstxt" style="display:none;">Update... bitte warten.</span> <span id="updateinprogresstxt" style="display:none;">Update... bitte warten.</span>
</td> </td>
<td>&nbsp;</td> <td>&nbsp;</td>

2
webapp/install/installer.php
View File

@ -414,7 +414,7 @@ $zones[] = $timezone_identifiers[$i];
echo json_encode($zones); echo json_encode($zones);
} else if ($command == 'update') { } else if ($command == 'update') {
set_time_limit(60*30); set_time_limit(60*30);
$installerVersion = "1.5.10"; $installerVersion = "1.5.11";
$admin = new InstallAdmin(); $admin = new InstallAdmin();
$pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']); $pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);

6
webapp/kitchen.html
View File

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

10
webapp/kitchenbar.js
View File

@ -14,6 +14,7 @@ var cookedEntries = null;
var entriesToCook = null; var entriesToCook = null;
var user = ""; var user = "";
var beepordered = 0; var beepordered = 0;
var oneclickcooked = 0;
function beep() { function beep() {
var snd = new Audio("data:audio/wav;base64,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qJrx4KOQjahZxWbcZgztj2c49nKmkId44S71j0c8eV9yDK6uPRzx5X18eDvjvQ6yKo9ZSS6l//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="); var snd = new Audio("data:audio/wav;base64,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qJrx4KOQjahZxWbcZgztj2c49nKmkId44S71j0c8eV9yDK6uPRzx5X18eDvjvQ6yKo9ZSS6l//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=");
@ -99,6 +100,9 @@ function bindEntriesToCook() {
e.preventDefault(); e.preventDefault();
var ids = this.closest(".preparedlistitem").id; var ids = this.closest(".preparedlistitem").id;
var doRemove = false; var doRemove = false;
if (oneclickcooked == 1) {
doRemove = true;
}
if ($(this.closest(".preparedlistitem")).hasClass("cooking")) { if ($(this.closest(".preparedlistitem")).hasClass("cooking")) {
doRemove = true; doRemove = true;
} }
@ -122,8 +126,13 @@ function bindEntriesToCook() {
var idarr = idlist.split("_"); var idarr = idlist.split("_");
var firstid = idarr[0]; // this is the id to handle! var firstid = idarr[0]; // this is the id to handle!
var doRemove = false; var doRemove = false;
if (oneclickcooked == 1) {
doRemove = true;
}
if ($(this).hasClass("cooking")) { if ($(this).hasClass("cooking")) {
doRemove = true; doRemove = true;
}
if (doRemove) {
declareProductBeCookingOrCooked(firstid,"r"); declareProductBeCookingOrCooked(firstid,"r");
} else { } else {
declareProductBeCookingOrCooked(firstid,"c"); declareProductBeCookingOrCooked(firstid,"c");
@ -338,6 +347,7 @@ function insertGeneralConfigItems(configResult) {
if (configResult.status == "OK") { if (configResult.status == "OK") {
var values = configResult.msg; var values = configResult.msg;
beepordered = values.beepordered; beepordered = values.beepordered;
oneclickcooked = values.oneclickcooked;
setLanguage(values.userlanguage); setLanguage(values.userlanguage);
isInitialized = true; isInitialized = true;
if (displayHeaderFooter) { if (displayHeaderFooter) {

516
webapp/manager.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.11">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,10 +13,10 @@
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" /> <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <script src="php/3rdparty/jquery-1.11.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=1.5.10"></script> <script src="utilities.js?v=1.5.11"></script>
<script src="elements/tablemap.js?v=1.5.10"></script> <script src="elements/tablemap.js?v=1.5.11"></script>
<script src="elements/roommap.js?v=1.5.10"></script> <script src="elements/roommap.js?v=1.5.11"></script>
<script src="elements/groundplan.js?v=1.5.10"></script> <script src="elements/groundplan.js?v=1.5.11"></script>
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet"> <link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script> <script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
@ -134,7 +134,7 @@ var MAN_PAYWAY = ["Zahlungsart","Method of payment","Modo de pago"];
var MAN_USER_ID = ["Benutzer-ID","User id","Id del usario"]; var MAN_USER_ID = ["Benutzer-ID","User id","Id del usario"];
var MAN_STATE = ["Status","State","Estado"]; var MAN_STATE = ["Status","State","Estado"];
var MAN_REF = ["Referenz-Bon-ID","Reference Receipt id","Tique referenciado"]; var MAN_REF = ["Referenz-Bon-ID","Reference Receipt id","Tique referenciado"];
var MAN_CHANGE = ["Ändern","Change","Modificar"]; var MAN_CHANGE = ["Speichern","Save Changes","guardar cambios"];
var MAN_CONFIG_CHANGED = ["Konfiguration geändert","Configuration saved","Configuración modificado"]; var MAN_CONFIG_CHANGED = ["Konfiguration geändert","Configuration saved","Configuración modificado"];
var MAN_CONFIG_CHANGE_ERROR = ["Falsches Zahlenformat oder Serverproblem","Error","Error"]; var MAN_CONFIG_CHANGE_ERROR = ["Falsches Zahlenformat oder Serverproblem","Error","Error"];
@ -190,7 +190,7 @@ var MAN_RECEIPT_FONTSIZE = ["Schriftgröße Bon (Bildschirm)","Font size receipt
var MAN_EMAIL_DATA = ["Email senden","Send email","Enviar email"]; var MAN_EMAIL_DATA = ["Email senden","Send email","Enviar email"];
var MAN_EMAIL_WRONG_FORMAT = ["Keine gültige Email-Adresse angegeben.","No valid email address.","Dirección de email invalida."]; var MAN_EMAIL_WRONG_FORMAT = ["Keine gültige Email-Adresse angegeben.","No valid email address.","Dirección de email invalida."];
var MAN_EMAIL_EMPTY = ["Keine Email-Adresse angegeben.","No email address given.","No hay ningún dirección de email."]; var MAN_EMAIL_EMPTY = ["Keine Email-Adresse angegeben.","No email address given.","No hay ningún dirección de email."];
var MAN_HOSTTEXT_TXT = ["Vorlage Bewirtungsbeleg","Template Host Area","Bewirtungsbeleg"]; var MAN_HOSTTEXT_TXT = ["Vorlage Bewirtungsbeleg","Template hospitality receipt","Recibo de hospitalidad"];
var MAN_EMAIL_SENDER_TXT = ["Email-Absender:","Email sender:","Remitente de email:"]; var MAN_EMAIL_SENDER_TXT = ["Email-Absender:","Email sender:","Remitente de email:"];
var MAN_DEFAULT_EMAIL_TO = ["Standard-Email-Empfänger:","Standard email receiver","Destinario estandard de emails"]; var MAN_DEFAULT_EMAIL_TO = ["Standard-Email-Empfänger:","Standard email receiver","Destinario estandard de emails"];
var MAN_NEW_VERSION_AVAIL = ["Neue Version verfügbar", "New version available", "Hay una versión nueva"]; var MAN_NEW_VERSION_AVAIL = ["Neue Version verfügbar", "New version available", "Hay una versión nueva"];
@ -304,9 +304,20 @@ var MAN_STARTPRODSEARCH = ["Starte Produktsuche ab # Zeichen","Start product sea
var MAN_DISCOUNTNAME1 = ["Bezeichnung Rabatt 1","Name of discount 1","Nombre del descuento 1"]; var MAN_DISCOUNTNAME1 = ["Bezeichnung Rabatt 1","Name of discount 1","Nombre del descuento 1"];
var MAN_DISCOUNTNAME2 = ["Bezeichnung Rabatt 2","Name of discount 2","Nombre del descuento 2"]; var MAN_DISCOUNTNAME2 = ["Bezeichnung Rabatt 2","Name of discount 2","Nombre del descuento 2"];
var MAN_DISCOUNTNAME3 = ["Bezeichnung Rabatt 3","Name of discount 3","Nombre del descuento 3"]; var MAN_DISCOUNTNAME3 = ["Bezeichnung Rabatt 3","Name of discount 3","Nombre del descuento 3"];
var MAN_TEMPLATESECTION_TXT = ["Vorlagen:","Templates:","Dechados:"];
var MAN_PICKUP_CONFIGSECTION_TXT = ["Abholansicht:","Pickup display:","Vista de Recogidos:"];
var MAN_EMAILCONFIG_TXT = ["E-Mail-Konfiguration:","Email configuration:","Configuración de email:"];
var MAN_TRANSFER_SECTION_TXT = ["Datenübertragung:","Data transfer:","Transferencia de datos:"];
var MAN_TAXES_SECTION_TXT = ["Steuern:","Taxes:","Impuestos:"];
var MAN_SECURITY_SECTION_TXT = ["Sicherheit:","Security settings:","Seguridad:"];
var MAN_GEN_PRINT_SECTION_TXT = ["Allgemeine Druckeinstellungen:","General print settings:","Configuración general de impresión"];
var MAN_WORKRECEIPS_SECTION_TXT = ["Arbeitsbons:","Work receipts:","Tiquets de trabajo:"];
var MAN_DISCOUNT_SECTION_TXT = ["Rabatteinstellungen in Bestellansicht:","Discount settings in order view:","Descuentas en vista de camareros:"];
var MAN_TIMETRACKING = ["Zeiterfassung:","Time tracking:","Tiempos de los empleados:"]; var MAN_TIMETRACKING = ["Zeiterfassung:","Time tracking:","Tiempos de los empleados:"];
var MAN_MEMORYLIMIT = ["PHP Memory Limit (MB)","PHP Memory Limit (MB)","PHP Memory Limit (MB)"]; var MAN_MEMORYLIMIT = ["PHP Memory Limit (MB)","PHP Memory Limit (MB)","PHP Memory Limit (MB)"];
var MAN_POLL_SECTION_TXT = ["Abfrageintervalle des Druckservers;","Poll intervall of the printserver","Intervalo de consulta del print server"]; var MAN_POLL_SECTION_TXT = ["Abfrageintervalle des Druckservers:","Poll intervall of the printserver:","Intervalo de consulta del print server:"];
var MAN_SERVER_SECTION_TXT = ["Server:","Server:","Servidor:"];
var MAN_APPLY_SECTION_TXT = ["Änderungen speichern:","Apply changes:","Aplicar modificaciones"];
var MAN_POLLBILLS = ["Rechnungsbons (Sek.)","Bills (sec.)","Facturas"]; var MAN_POLLBILLS = ["Rechnungsbons (Sek.)","Bills (sec.)","Facturas"];
var MAN_POLLWORKSF = ["Speisearbeitsbons (Sek.)","Food work receipts (sec.)","Tiquets de trabajo de comidas"]; var MAN_POLLWORKSF = ["Speisearbeitsbons (Sek.)","Food work receipts (sec.)","Tiquets de trabajo de comidas"];
var MAN_POLLWORKSD = ["Getränkearbeitsbons (Sek.)","Drinks work receipts (sec.)","tiquets de trabajo de bebidas"]; var MAN_POLLWORKSD = ["Getränkearbeitsbons (Sek.)","Drinks work receipts (sec.)","tiquets de trabajo de bebidas"];
@ -386,6 +397,8 @@ var MAN_SHOWPREPINWAITER = ["Zeige Anzahl vorbereiteter Produkte in mobiler Tisc
var MAN_CLOSSHOWCI = ["Betriebsinfo auf Tagesabschlussbon","Print company info on closing receipt","Imprimir info del café en el cerramiento"]; var MAN_CLOSSHOWCI = ["Betriebsinfo auf Tagesabschlussbon","Print company info on closing receipt","Imprimir info del café en el cerramiento"];
var MAN_CLOSSHOWPAYTAXES = ["Individuelle Steuerbeträge pro Zahlungsweg auf Tagesabschluss","Print each tax per payment way on closing","Imprimir cada impuesto por cada camino de pagar en el cerramiento"]; var MAN_CLOSSHOWPAYTAXES = ["Individuelle Steuerbeträge pro Zahlungsweg auf Tagesabschluss","Print each tax per payment way on closing","Imprimir cada impuesto por cada camino de pagar en el cerramiento"];
var MAN_CLOSSHOWPRODS = ["Produktstatistik auf Tagesabschlussbon","Product statistics on closung","Statistica de productos en el cerramiento"]; var MAN_CLOSSHOWPRODS = ["Produktstatistik auf Tagesabschlussbon","Product statistics on closung","Statistica de productos en el cerramiento"];
var MAN_SHOWPAYMENTS = ["Zahldialog und Wechselgeldrechner (Mobil)","Payment way and calculator (mobil)","Modo de pagar y calculadora (movil)"];
var MAN_SHOWPAYMENTS_HINT = ["Wird der Zahldialog deaktiviert, wird stets eine Barzahlung angenommen!","If the payment dialog is deactivated all payments are declared as cash payments!","Si el dialogo de modo de pagar esta deactivado cada pagamiento es de moneda"];
var MAN_SHOWPAYMENT2 = ["EC-Karte","EC card","EC"]; var MAN_SHOWPAYMENT2 = ["EC-Karte","EC card","EC"];
var MAN_SHOWPAYMENT3 = ["Kreditkarten","credit card","tarjeta de credito"]; var MAN_SHOWPAYMENT3 = ["Kreditkarten","credit card","tarjeta de credito"];
var MAN_SHOWPAYMENT4 = ["Rechnung","Bill","Factura"]; var MAN_SHOWPAYMENT4 = ["Rechnung","Bill","Factura"];
@ -399,6 +412,7 @@ var MAN_PRINT_EXTRAS_HINT = ["Hinweis: Extras auf Kassenbon erst ab Printserverv
var MAN_FORCE_PRINT = ["Erzwinge Bondruck","Force print of receipt","Siempre imprimir tique"]; var MAN_FORCE_PRINT = ["Erzwinge Bondruck","Force print of receipt","Siempre imprimir tique"];
var MAN_PRICE_IN_LIST = ["Preisangabe neben Produkt","List price next to product","Mostrar precio en lista de productos"]; var MAN_PRICE_IN_LIST = ["Preisangabe neben Produkt","List price next to product","Mostrar precio en lista de productos"];
var MAN_GUEST_JOB_PRINT = ["Gastbestelljob drucken","Print guest order","Imprimir orden de remote"]; var MAN_GUEST_JOB_PRINT = ["Gastbestelljob drucken","Print guest order","Imprimir orden de remote"];
var MAN_GUEST_JOB_PRINT_HINT = ["Wird der Gastbestelljob nicht gedruckt, so durchläuft er die digitalen Workflowansichten Küche/Bar/Bereitstellung je nach Konfiguration der Produktkategorie. Im anderen Fall wird ein Arbeitsbon gedruckt.","If the guest order job is not printed, it passes through the digital workflow views Kitchen/Bar/Provision depending on the configuration of the product category. Otherwise, a receipt is printed.","Si el trabajo de pedido de invitados no se imprime, pasa a través de las vistas de flujo de trabajo digital Cocina/Bar/Provisión en función de la configuración de la categoría de producto. De lo contrario, se imprimirá un recibo."];
var MAN_ASK_DAYCODE = ["Abfrage Tageslosung","Require input of day code in guest system","Pregunta código del dia en sistema de huéspedes"]; var MAN_ASK_DAYCODE = ["Abfrage Tageslosung","Require input of day code in guest system","Pregunta código del dia en sistema de huéspedes"];
var MAN_SHOW_DAYCODE = ["Tageslosung in Bestellansicht anzeigen","Show day code in order view","Mostrat códiga del dia en vista de ordenes"]; var MAN_SHOW_DAYCODE = ["Tageslosung in Bestellansicht anzeigen","Show day code in order view","Mostrat códiga del dia en vista de ordenes"];
var MAN_ASK_TABLECODE = ["Abfrage Tischcode","Require input of table code","Pregunta código de la mesa en sistem de huéspedes"]; var MAN_ASK_TABLECODE = ["Abfrage Tischcode","Require input of table code","Pregunta código de la mesa en sistem de huéspedes"];
@ -407,6 +421,7 @@ var MAN_GUESTTIMEOUT_HINT = ["Ein Timeout von 0 bedeutet, dass kein Timeout abl
var MAN_RESTAURANT_MODE = ["Restaurantmodus","Restaurant mode","Usar para restaurantes"]; var MAN_RESTAURANT_MODE = ["Restaurantmodus","Restaurant mode","Usar para restaurantes"];
var MAN_REST_MODE_HINT = ["Hinweis: Wird der Restaurantmodus auf <i>Nein</i> gesetzt, wird in der <b>Desktopansicht</b> die Tischauswahl deaktiviert. Alle Produkte werden als Außer-Haus-Verkauf gebucht.","Hint: If the restautant mode is set to <i>no</i> in the <b>desktop view</b> the table selection is deactivated and all products are ordered as <i>to-go</i>","Nota: Si el modus del restaurante es configurado a <i>no</i> en la vista de <b>Desktop</b> la selección de las mesas es deactivada y todos los productos son ordenados como <i>to-go</i>"]; var MAN_REST_MODE_HINT = ["Hinweis: Wird der Restaurantmodus auf <i>Nein</i> gesetzt, wird in der <b>Desktopansicht</b> die Tischauswahl deaktiviert. Alle Produkte werden als Außer-Haus-Verkauf gebucht.","Hint: If the restautant mode is set to <i>no</i> in the <b>desktop view</b> the table selection is deactivated and all products are ordered as <i>to-go</i>","Nota: Si el modus del restaurante es configurado a <i>no</i> en la vista de <b>Desktop</b> la selección de las mesas es deactivada y todos los productos son ordenados como <i>to-go</i>"];
var MAN_SPECIAL_SETTINGS_TXT = ["Einstellungen für spezielle Abläufe:","Settings for special workflows:","Configuración para workflows muy escpeciales:"]; var MAN_SPECIAL_SETTINGS_TXT = ["Einstellungen für spezielle Abläufe:","Settings for special workflows:","Configuración para workflows muy escpeciales:"];
var MAN_DASH_SECTION_TXT = ["Dashboard:","Dashboard:","Dashboard:"];
var MAN_GUEST_SYSTEM_TXT = ["Einstellungen für das Gastsystem","Settings for the Guest system","Especificación del sistema de clientes"]; var MAN_GUEST_SYSTEM_TXT = ["Einstellungen für das Gastsystem","Settings for the Guest system","Especificación del sistema de clientes"];
var MAN_PRINT_ON_CLOSINGS = ["Tageserfassungsbons","Closing receipts","Tiques de cerramiento"]; var MAN_PRINT_ON_CLOSINGS = ["Tageserfassungsbons","Closing receipts","Tiques de cerramiento"];
var MAN_SHOW_PAYMENTS_DLG = ["Zahlungswege im Zahldialog","Payment ways in payment dialog","Que modos de pagar"]; var MAN_SHOW_PAYMENTS_DLG = ["Zahlungswege im Zahldialog","Payment ways in payment dialog","Que modos de pagar"];
@ -456,9 +471,15 @@ var MAN_PRINTPICKUPS = ["Drucke Abholbons","Pickup receipts","Imprimir tickets d
var MAN_PRINTPICKUPS_ALWAYS = ["Immer","Always","Siempre"]; var MAN_PRINTPICKUPS_ALWAYS = ["Immer","Always","Siempre"];
var MAN_PRINTPICKUPS_TOGO = ["Nur für Außer-Haus-Bestellungen","Only für to-go orders","Solo para To go"]; var MAN_PRINTPICKUPS_TOGO = ["Nur für Außer-Haus-Bestellungen","Only für to-go orders","Solo para To go"];
var MAN_PRINTPICKUP_HINT = ["Abholbons funktionieren nur in Kombination mit Arbeitsbons!","Pickup receipts only work with work receipts!","Tiquets de recogidos solo on tickets de trabajo!"]; var MAN_PRINTPICKUP_HINT = ["Abholbons funktionieren nur in Kombination mit Arbeitsbons!","Pickup receipts only work with work receipts!","Tiquets de recogidos solo on tickets de trabajo!"];
var MAN_LOCAL_PRINT_OPTION = ["Lokal (nicht empfohlen)","Local (not recommended)","Local (non recomendado)"];
var MAN_SERVER_PRINT_OPTION = ["Server","Server","Servidor"];
var MAN_SHOWHOSTPRINT = ["Bewirtungsbeleg auswählbar","Hospitality receipt selectable","recibo de hospitalidad posible"];
var MAN_ONECLICKCOOKED = ["1-Klick Zubereitung (Küchen-/Baransicht)","1-click cooked (Kitchen/Bar view)","1-click cocido (Cocina/Bar)"];
var MAN_SHOWPICKDELBTN = ["Zeige Entfernen-Button in Abholansicht","Show remove button in pickup view","Boton <i>eliminar</i> en vista de recogidos"];
var MAN_SHOWPICKHELP = ["Zeige Hilfebereich","Show help area","Mostrar area de ayuda"];
var lang = 0; var lang = 0;
var generalVals = [12,2,0,3,0,1,1,0,0,1, 0,50,20,10,1,0,0,0,1,0,1,0,0,1,1, 1,1,1,1,1,1,1,1,1,1, 1,2,3, 1,0, 1,0,1, 1,1,0,0, 0,0,0, 0,0,0,1,1, 0]; 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];
var numberOfClosings = 0; var numberOfClosings = 0;
@ -595,7 +616,12 @@ var generalValuesSettings = [
["pollclosings",MAN_POLLCLOSINGS[lang],"i",0,""], ["pollclosings",MAN_POLLCLOSINGS[lang],"i",0,""],
["pollpickups",MAN_POLLPICKUPS[lang],"i",0,""], ["pollpickups",MAN_POLLPICKUPS[lang],"i",0,""],
["printpickups",MAN_PRINTPICKUPS[lang],"s",55], ["printpickups",MAN_PRINTPICKUPS[lang],"s",55],
["showpickupsno",MAN_SHOWPICKUPSNO[lang],"i",0,""] ["showpickupsno",MAN_SHOWPICKUPSNO[lang],"i",0,""],
["showhostprint",MAN_SHOWHOSTPRINT[lang],"s",56],
["oneclickcooked",MAN_ONECLICKCOOKED[lang],"s",57],
["showpickupdelbtn",MAN_SHOWPICKDELBTN[lang],"s",58],
["showpickhelp",MAN_SHOWPICKHELP[lang],"s",59],
["showpayments",MAN_SHOWPAYMENTS[lang],"s",60]
]; ];
var predef = ""; var predef = "";
@ -731,16 +757,27 @@ function setLanguage(l) {
$("#digiprinthint").html(MAN_DIGI_PRINTWORK_HINT[l]); $("#digiprinthint").html(MAN_DIGI_PRINTWORK_HINT[l]);
$("#generalsectiontxt").html(MAN_GENSECTION_TXT[l]); $("#generalsectiontxt").html(MAN_GENSECTION_TXT[l]);
$("#mobilviewsectiontxt").html(MAN_MOBILSECTION_TXT[l]); $("#mobilviewsectiontxt").html(MAN_MOBILSECTION_TXT[l]);
$("#transfersectiontxt").html(MAN_TRANSFER_SECTION_TXT[l]);
$("#taxessectiontxt").html(MAN_TAXES_SECTION_TXT[l]);
$("#securitysectiontxt").html(MAN_SECURITY_SECTION_TXT[l]);
$("#generalprintsectiontxt").html(MAN_GEN_PRINT_SECTION_TXT[l]);
$("#workreceiptssectiontxt").html(MAN_WORKRECEIPS_SECTION_TXT[l]);
$("#discountsectiontxt").html(MAN_DISCOUNT_SECTION_TXT[l]);
$("#emailconfigsectiontxt").html(MAN_EMAILCONFIG_TXT[l]);
$("#pickupsectiontxt").html(MAN_PICKUP_CONFIGSECTION_TXT[l]);
$("#templatesectiontxt").html(MAN_TEMPLATESECTION_TXT[l]);
$("#timetrackingtxt").html(MAN_TIMETRACKING[l]); $("#timetrackingtxt").html(MAN_TIMETRACKING[l]);
$("#tasktxt").html(MAN_TASKS[l]); $("#tasktxt").html(MAN_TASKS[l]);
$("#desktopviewsectiontxt").html(MAN_DESKTOP_SECTION_TXT[l]); $("#desktopviewsectiontxt").html(MAN_DESKTOP_SECTION_TXT[l]);
$("#specialsettingssectiontxt").html(MAN_SPECIAL_SETTINGS_TXT[l]); $("#specialsettingssectiontxt").html(MAN_SPECIAL_SETTINGS_TXT[l]);
$("#dashsectiontxt").html(MAN_DASH_SECTION_TXT[l]);
$("#guestsystemsectiontxt").html(MAN_GUEST_SYSTEM_TXT[l]); $("#guestsystemsectiontxt").html(MAN_GUEST_SYSTEM_TXT[l]);
$("#closingprintstxt").html(MAN_PRINT_ON_CLOSINGS[l]); $("#closingprintstxt").html(MAN_PRINT_ON_CLOSINGS[l]);
$("#showpaymentstxt").html(MAN_SHOW_PAYMENTS_DLG[l]); $("#showpaymentstxt").html(MAN_SHOW_PAYMENTS_DLG[l]);
$("#printandqueuehint").html(MAN_PRINT_AND_QUEUE_HINT[l]); $("#printandqueuehint").html(MAN_PRINT_AND_QUEUE_HINT[l]);
$("#cashhint").html(MAN_CASH_HINT[l]); $("#cashhint").html(MAN_CASH_HINT[l]);
$("#returntoorderhint").html(MAN_RETURN_TO_ORDER_HINT[l]); $("#returntoorderhint").html(MAN_RETURN_TO_ORDER_HINT[l]);
$("#showpaymentshint").html(MAN_SHOWPAYMENTS_HINT[l]);
$("#hsinfiletxt").html(MAN_HSINFILE[l]); $("#hsinfiletxt").html(MAN_HSINFILE[l]);
$("#hsoutfiletxt").html(MAN_HSOUTFILE[l]); $("#hsoutfiletxt").html(MAN_HSOUTFILE[l]);
$("#hscurrencytxt").html(MAN_HSCURRENCY[l]); $("#hscurrencytxt").html(MAN_HSCURRENCY[l]);
@ -766,6 +803,8 @@ function setLanguage(l) {
$("#printextrashint").html(MAN_PRINT_EXTRAS_HINT[l]); $("#printextrashint").html(MAN_PRINT_EXTRAS_HINT[l]);
$("#pollssectiontxt").html(MAN_POLL_SECTION_TXT[l]); $("#pollssectiontxt").html(MAN_POLL_SECTION_TXT[l]);
$("#serversectiontxt").html(MAN_SERVER_SECTION_TXT[l]);
$("#applysectiontxt").html(MAN_APPLY_SECTION_TXT[l]);
$("#pollhint").html(MAN_POLL_HINT[l]); $("#pollhint").html(MAN_POLL_HINT[l]);
$("#pollbillstxt").html(MAN_POLLBILLS[l]); $("#pollbillstxt").html(MAN_POLLBILLS[l]);
$("#pollworksftxt").html(MAN_POLLWORKSF[l]); $("#pollworksftxt").html(MAN_POLLWORKSF[l]);
@ -773,6 +812,8 @@ function setLanguage(l) {
$("#pollclosingstxt").html(MAN_POLLCLOSINGS[l]); $("#pollclosingstxt").html(MAN_POLLCLOSINGS[l]);
$("#pollpickupstxt").html(MAN_POLLPICKUPS[l]); $("#pollpickupstxt").html(MAN_POLLPICKUPS[l]);
$("#showpickupsnotxt").html(MAN_SHOWPICKUPSNO[l]); $("#showpickupsnotxt").html(MAN_SHOWPICKUPSNO[l]);
$("#guestjobprinthint").html(MAN_GUEST_JOB_PRINT_HINT[l]);
} }
function createMonthSelection(label) { function createMonthSelection(label) {
@ -918,6 +959,7 @@ function insertGeneralConfigItems(configResult) {
$("#partOfclosshowpaytaxes").html(createYesNo("closshowpaytaxes",MAN_CLOSSHOWPAYTAXES,values.closshowpaytaxes)); $("#partOfclosshowpaytaxes").html(createYesNo("closshowpaytaxes",MAN_CLOSSHOWPAYTAXES,values.closshowpaytaxes));
$("#partOfclosshowprods").html(createYesNo("closshowprods",MAN_CLOSSHOWPRODS,values.closshowprods)); $("#partOfclosshowprods").html(createYesNo("closshowprods",MAN_CLOSSHOWPRODS,values.closshowprods));
$("#partOfshowpayments").html(createYesNo("showpayments",MAN_SHOWPAYMENTS, values.showpayments));
$("#partOfshowpayment2").html(createYesNo("showpayment2",MAN_SHOWPAYMENT2, values.showpayment2)); $("#partOfshowpayment2").html(createYesNo("showpayment2",MAN_SHOWPAYMENT2, values.showpayment2));
$("#partOfshowpayment3").html(createYesNo("showpayment3",MAN_SHOWPAYMENT3, values.showpayment3)); $("#partOfshowpayment3").html(createYesNo("showpayment3",MAN_SHOWPAYMENT3, values.showpayment3));
$("#partOfshowpayment4").html(createYesNo("showpayment4",MAN_SHOWPAYMENT4, values.showpayment4)); $("#partOfshowpayment4").html(createYesNo("showpayment4",MAN_SHOWPAYMENT4, values.showpayment4));
@ -926,6 +968,11 @@ function insertGeneralConfigItems(configResult) {
$("#partOfshowpayment7").html(createYesNo("showpayment7",MAN_SHOWPAYMENT7, values.showpayment7)); $("#partOfshowpayment7").html(createYesNo("showpayment7",MAN_SHOWPAYMENT7, values.showpayment7));
$("#partOfshowpayment8").html(createYesNo("showpayment8",MAN_SHOWPAYMENT8, values.showpayment8)); $("#partOfshowpayment8").html(createYesNo("showpayment8",MAN_SHOWPAYMENT8, values.showpayment8));
$("#partOfShowhostprint").html(createYesNo("showhostprint",MAN_SHOWHOSTPRINT, values.showhostprint));
$("#partOfOneclickcooked").html(createYesNo("oneclickcooked",MAN_ONECLICKCOOKED, values.oneclickcooked));
$("#partOfShowpickupdelbtn").html(createYesNo("showpickupdelbtn",MAN_SHOWPICKDELBTN, values.showpickupdelbtn));
$("#partOfShowpickhelp").html(createYesNo("showpickhelp",MAN_SHOWPICKHELP, values.showpickhelp));
var language = values.billlanguage; var language = values.billlanguage;
generalVals[2] = language; generalVals[2] = language;
$("#partOfBillLanguage").html(createBillLanguagePart(language)); $("#partOfBillLanguage").html(createBillLanguagePart(language));
@ -1013,6 +1060,11 @@ function insertGeneralConfigItems(configResult) {
generalVals[53] = values.showtogo; generalVals[53] = values.showtogo;
generalVals[54] = values.showprepinwaiter; generalVals[54] = values.showprepinwaiter;
generalVals[55] = values.printpickups; generalVals[55] = values.printpickups;
generalVals[56] = values.showhostprint;
generalVals[57] = values.oneclickcooked;
generalVals[58] = values.showpickupdelbtn;
generalVals[59] = values.showpickhelp;
generalVals[60] = values.showpayments;
defaulttmp = values.defaulttmp; defaulttmp = values.defaulttmp;
@ -1363,11 +1415,11 @@ function createPayPrintTypePart(localOrServer) {
html += '<label for="payprinttype">' + MAN_PRINT_CONCEPT[lang] + ':</label>'; html += '<label for="payprinttype">' + MAN_PRINT_CONCEPT[lang] + ':</label>';
html += '<select name="payprinttype" id="payprinttype" data-theme="e">'; html += '<select name="payprinttype" id="payprinttype" data-theme="e">';
if ((localOrServer == 'l') || (localOrServer == '1')) { if ((localOrServer == 'l') || (localOrServer == '1')) {
html += '<option value="1" selected>Lokal</option>'; html += '<option value="1" selected>' + MAN_LOCAL_PRINT_OPTION[lang] + '</option>';
html += '<option value="2">Server</option>'; html += '<option value="2">' + MAN_SERVER_PRINT_OPTION[lang] + '</option>';
} else { } else {
html += '<option value="1">Lokal</option>'; html += '<option value="1">' + MAN_LOCAL_PRINT_OPTION[lang] + '</option>';
html += '<option value="2" selected>Server</option>'; html += '<option value="2" selected>' + MAN_SERVER_PRINT_OPTION[lang] + '</option>';
} }
html += '</select></div>'; html += '</select></div>';
return html; return html;
@ -1446,7 +1498,7 @@ function initRestoreFileUpload() {
} else { } else {
alert("Import war erfolgreich."); alert("Import war erfolgreich.");
setTimeout(function(){ setTimeout(function(){
document.location.href = "index.html?v=1.5.10"; document.location.href = "index.html?v=1.5.11";
},250); },250);
} }
}, },
@ -2000,9 +2052,9 @@ function handleUpdateCheckResult(answer) {
var millis=getMillis(); var millis=getMillis();
setTimeout(function(){ setTimeout(function(){
document.location.href = "install.html?v=1.5.10&mode=onlyupdate&n=" + millis; document.location.href = "install.html?v=1.5.11&mode=onlyupdate&n=" + millis;
},250); },250);
document.location.href = "install.html?v=1.5.10&mode=onlyupdate&n=" + millis; document.location.href = "install.html?v=1.5.11&mode=onlyupdate&n=" + millis;
} }
function handleUpdateReplace(answer) { function handleUpdateReplace(answer) {
@ -3377,7 +3429,6 @@ $(document).on("pageinit", "#admin-page", function () {
<div class="ui-field-contain" id="datexportstartmonthpart"></div> <div class="ui-field-contain" id="datexportstartmonthpart"></div>
<div id=yearselectionexportstart> <div id=yearselectionexportstart>
<form>
<div class="ui-field-contain"> <div class="ui-field-contain">
<label for="select-year-export-start">Jahr:</label> <label for="select-year-export-start">Jahr:</label>
<select name="select-year-export-start" id="select-year-export-start"> <select name="select-year-export-start" id="select-year-export-start">
@ -3435,40 +3486,9 @@ $(document).on("pageinit", "#admin-page", function () {
<br><b><u><span id="generalsectiontxt">GENERAL</span></u></b><br><br> <br><b><u><span id="generalsectiontxt">GENERAL</span></u></b><br><br>
<div data-role="fieldcontain">
<label for="usstval">MwSt/Tax/IVA:</label>
<input type="text" value="" data-mini="true" placeholder="19,0" id="usstval" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="togotaxval">MwSt/Tax/IVA (ToGo):</label>
<input type="text" value="" data-mini="true" placeholder="7,0" id="togotaxval" data-theme="c" class="genConfigEl"/>
</div>
<div id=taxusage></div>
<div data-role="fieldcontain">
<label for="stornocode">Stornocode (Bons):</label>
<input type="password" value="" data-mini="true" id="stornocode" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="cancelunpaidcode">Stornocode (unbez. Bestellungen):</label>
<input type="password" value="" data-mini="true" id="cancelunpaidcode" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="cancelguestcode">Stornocode (Modul Gast):</label>
<input type="password" value="" data-mini="true" id="cancelguestcode" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="printpass">Printcode:</label>
<input type="password" value="" data-mini="true" id="printpass" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="remoteaccesscode">Fernzugriffscode:</label>
<input type="password" value="" data-mini="true" id="remoteaccesscode" class="genConfigEl"/>
</div>
<div id="partOfDefaultView"></div> <div id="partOfDefaultView"></div>
<div id="partOfForceprint"></div>
<div id="partOfPrintextras"></div>
<i id="printextrashint" style="padding-left: 50px;padding-right: 50px;">Hinweis: erfordert 1.4.17</i>
<div id="partOfRestaurantmode"></div> <div id="partOfRestaurantmode"></div>
<i id=restmodehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i> <i id=restmodehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
@ -3477,44 +3497,7 @@ $(document).on("pageinit", "#admin-page", function () {
<label for="companyinfo">Betriebsinfo:</label> <label for="companyinfo">Betriebsinfo:</label>
<textarea cols="40" rows="8" name="companyinfo" id="companyinfo" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea> <textarea cols="40" rows="8" name="companyinfo" id="companyinfo" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
</div> </div>
<div data-role="fieldcontain">
<label for="rectemplate">Kassenbonvorlage:</label>
<textarea cols="40" rows="8" name="rectemplate" id="rectemplate" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
<i id=rectemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
</div>
<div data-role="fieldcontain">
<label for="hosttext"><span id="hosttexttxt">Bewirtungsbeleg</span>:</label>
<textarea cols="40" rows="8" name="hosttext" id="hosttext" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
</div>
<div data-role="fieldcontain">
<label for="foodtemplate">Vorlage Speisebons:</label>
<textarea cols="40" rows="8" name="foodtemplate" id="foodtemplate" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
<i id=foodtemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
</div>
<div data-role="fieldcontain">
<label for="drinktemplate">Vorlage Getränkebons:</label>
<textarea cols="40" rows="8" name="drinktemplate" id="drinktemplate" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
<i id=drinktemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
</div>
<div data-role="fieldcontain">
<label for="canceltemplate">Vorlage Storno-Arbeitsbon:</label>
<textarea cols="40" rows="8" name="canceltemplate" id="canceltemplate" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
<i id=canceltemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
</div>
<div data-role="fieldcontain">
<label for="pickuptemplate">Vorlage Abholbon:</label>
<textarea cols="40" rows="8" name="pickuptemplate" id="pickuptemplate" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
<i id=pickuptemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
</div>
<div data-role="fieldcontain">
<label for="clostemplate">Vorlage html-Tageserfassung:</label>
<textarea cols="40" rows="8" name="clostemplate" id="clostemplate" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
<i id=clostemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
</div>
<div data-role="fieldcontain">
<label for="reservationnote">Reservierungstemplate Email:</label>
<textarea cols="40" rows="8" name="reservationnote" id="reservationnote" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
</div>
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="serverUrl">Webserver:</label> <label for="serverUrl">Webserver:</label>
<textarea cols="40" rows="1" name="serverUrl" id="serverUrl" class="genConfigEl" style="background-color:#FFFFFF;color:black;">localhost</textarea> <textarea cols="40" rows="1" name="serverUrl" id="serverUrl" class="genConfigEl" style="background-color:#FFFFFF;color:black;">localhost</textarea>
@ -3523,105 +3506,17 @@ $(document).on("pageinit", "#admin-page", function () {
<label for="webimpressum">Webimpressum:</label> <label for="webimpressum">Webimpressum:</label>
<textarea cols="40" rows="1" name="webimpressum" id="webimpressum" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea> <textarea cols="40" rows="1" name="webimpressum" id="webimpressum" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
</div> </div>
<div data-role="fieldcontain">
<label for="email"><span id="fromemailtxt">Sender-Email:</span></label>
<input type="email" value="" data-mini="true" placeholder="gastwirt@anbieter.de" id="email" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="emailbadrating"><span id="emailbadratingtxt">Sender-Email:</span></label>
<input type="email" value="" data-mini="true" placeholder="gastwirt@anbieter.de" id="emailbadrating" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="emailratingcontact"><span id="emailratingcontacttxt">Sender-Email:</span></label>
<input type="email" value="" data-mini="true" placeholder="gastwirt@anbieter.de" id="emailratingcontact" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="receiveremail"><span id="toemailtxt">Standard Emailempfänger:</span></label>
<input type="email" value="" data-mini="true" placeholder="gastwirt@anbieter.de" id="receiveremail" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="smtphost"><span id="smtphosttxt">SMTP Host:</span></label>
<input type="text" value="" data-mini="true" placeholder="beispiel.email.provider.de" id="smtphost" data-theme="c" class="genConfigEl"/>
</div>
<div id="partOfSmtpauth"></div>
<div data-role="fieldcontain">
<label for="smtpuser"><span id="smtpusertxt">SMTP Benutzer:</span></label>
<input type="text" value="" data-mini="true" placeholder="Benutzer" id="smtpuser" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="smtppass"><span id="smtppasstxt">SMTP Passwort:</span></label>
<input type="password" value="" data-mini="true" placeholder="password" id="smtppass" data-theme="c" class="genConfigEl"/>
</div>
<div id="partOfSmtpsecure"></div>
<div data-role="fieldcontain">
<label for="smtpport"><span id="smtpporttxt">SMTP Port:</span></label>
<input type="text" value="" data-mini="true" placeholder="587" id="smtpport" data-theme="c" class="genConfigEl"/>
</div>
<div id="partOfPayPrintType"></div>
<div id="partOfBillLanguage"></div> <div id="partOfBillLanguage"></div>
<div id="partOfReceiptFontSize"></div>
<div id="partOfPaymentConfig" style="display:none;"></div> <div id="partOfPaymentConfig" style="display:none;"></div>
<div id="partOfWorkflowConfig"></div> <div id="partOfWorkflowConfig"></div>
<div id="partOfPrintpickups"></div>
<div data-role="fieldcontain">
<label for="showpickupsno"><span id="showpickupsnotxt">Max Abholjobs</span></label>
<input type="text" value="" data-mini="true" placeholder="2" id="showpickupsno" data-theme="c" class="genConfigEl"/>
</div>
<div id="partIfDigiWorkflow"> <div id="partIfDigiWorkflow">
<div id="partOfDigigopaysetready"></div> <div id="partOfDigigopaysetready"></div>
<span id=digigopaysetreadyhint></span> <span id=digigopaysetreadyhint></span>
</div> </div>
<div id="partIfWorkReceiptsWorkflow">
<div id="partOfWaitergopayprint"></div>
<span id=waitergopayprinthint></span>
</div>
<div id="partOfDigiprintworkContainer">
<div id="partOfDigiprintwork"></div>
<i id=digiprinthint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
</div>
<div id="partAddrecPrinterIfServerPrint">
<div id="partOfAddRecPrinter"></div>
<span id=addrecprinterhint></span>
</div>
<div id="partOfOneprodworkrecf"></div>
<div id="partOfOneprodworkrecd"></div>
<div>
<div id="partOfBigFontWorkReceipt"></div>
<i id=workfontsizehint style="padding-left: 50px;padding-right: 50px;">Hinweis: Nicht für eigene Layouts</i>
</div>
<div id="partOfGroupWorkItemsf"></div>
<div id="partOfGroupWorkItemsd"></div>
<div id="partOfDiscount1"></div>
<div id="partOfDiscount2"></div>
<div id="partOfDiscount3"></div>
<div data-role="fieldcontain">
<label for="discountname1"><span id="discountname1txt">Rabattname 1:</span></label>
<input type="text" value="" data-mini="true" placeholder="Bezeichnung" id="discountname1" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="discountname2"><span id="discountname2txt">Rabattname 2:</span></label>
<input type="text" value="" data-mini="true" placeholder="Bezeichnung" id="discountname2" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="discountname3"><span id="discountname3txt">Rabattname 3:</span></label>
<input type="text" value="" data-mini="true" placeholder="Bezeichnung" id="discountname3" data-theme="c" class="genConfigEl"/>
</div>
<div id="partOfDashslot1"></div>
<div id="partOfDashslot2"></div>
<div id="partOfDashslot3"></div>
<div id="partOfHotelInterface"></div> <div id="partOfHotelInterface"></div>
<div id="hs3area"> <div id="hs3area">
@ -3643,38 +3538,6 @@ $(document).on("pageinit", "#admin-page", function () {
</div> </div>
</div> </div>
<div data-role="fieldcontain">
<label for="memorylimit"><span id="memorylimittxt">PHP Memory Limit:</span></label>
<input type="text" value="" data-mini="true" placeholder="256" id="memorylimit" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="updateurl"><span id="updateurltxt">Update-Server:</span></label>
<input type="text" value="" data-mini="true" placeholder="" id="updateurl" data-theme="c" class="genConfigEl"/>
</div>
<div class="grouparea">
<div data-role="fieldcontain">
<label for="tmpdir"><span id="tmpdirtxt">PHP-Tmp:</span></label>
<input type="text" value="" data-mini="true" placeholder="" id="tmpdir" data-theme="c" class="genConfigEl"/><br><br>
<button type="submit" data-theme="f" data-icon="check" id="defaulttmpbtn">Default</button><br>
<i><span id="tmpdirhint">Hinweis</span></i>
</div>
</div>
<div data-role="fieldcontain">
<label for="ftphost"><span id="ftphosttxt">FTP-Server:</span></label>
<input type="text" value="" data-mini="true" placeholder="" id="ftphost" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="ftpuser"><span id="ftpusertxt">FTP-User:</span></label>
<input type="text" value="" data-mini="true" placeholder="" id="ftpuser" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="ftppass"><span id="ftppasstxt">FTP-Pass:</span></label>
<input type="password" value="" data-mini="true" placeholder="" id="ftppass" data-theme="c" class="genConfigEl"/>
</div>
<div id="partOfAustria"></div> <div id="partOfAustria"></div>
<div id="partIfAustriaEnabled"> <div id="partIfAustriaEnabled">
@ -3717,6 +3580,203 @@ $(document).on("pageinit", "#admin-page", function () {
</div> </div>
</div> </div>
<br><b><u><span id="transfersectiontxt">Datentransfer</span></u></b><br><br>
<div data-role="fieldcontain">
<label for="ftphost"><span id="ftphosttxt">FTP-Server:</span></label>
<input type="text" value="" data-mini="true" placeholder="" id="ftphost" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="ftpuser"><span id="ftpusertxt">FTP-User:</span></label>
<input type="text" value="" data-mini="true" placeholder="" id="ftpuser" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="ftppass"><span id="ftppasstxt">FTP-Pass:</span></label>
<input type="password" value="" data-mini="true" placeholder="" id="ftppass" data-theme="c" class="genConfigEl"/>
</div>
<br><b><u><span id="taxessectiontxt">Steuern</span></u></b><br><br>
<div data-role="fieldcontain">
<label for="usstval">MwSt/Tax/IVA:</label>
<input type="text" value="" data-mini="true" placeholder="19,0" id="usstval" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="togotaxval">MwSt/Tax/IVA (ToGo):</label>
<input type="text" value="" data-mini="true" placeholder="7,0" id="togotaxval" data-theme="c" class="genConfigEl"/>
</div>
<i id="taxusage" style="padding-left: 50px;padding-right: 50px;">Hinweis zu Steuern</i><br><br>
<br><b><u><span id="securitysectiontxt">Sicherheit</span></u></b><br><br>
<div data-role="fieldcontain">
<label for="stornocode">Stornocode (Bons):</label>
<input type="password" value="" data-mini="true" id="stornocode" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="cancelunpaidcode">Stornocode (unbez. Bestellungen):</label>
<input type="password" value="" data-mini="true" id="cancelunpaidcode" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="cancelguestcode">Stornocode (Modul Gast):</label>
<input type="password" value="" data-mini="true" id="cancelguestcode" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="remoteaccesscode">Fernzugriffscode:</label>
<input type="password" value="" data-mini="true" id="remoteaccesscode" class="genConfigEl"/>
</div>
<br><b><u><span id="generalprintsectiontxt">Drucken allg.:</span></u></b><br><br>
<div id="partOfPayPrintType"></div>
<div data-role="fieldcontain">
<label for="printpass">Printcode:</label>
<input type="password" value="" data-mini="true" id="printpass" class="genConfigEl"/>
</div>
<div id="partOfReceiptFontSize"></div>
<div id="partOfForceprint"></div>
<div id="partOfPrintextras"></div>
<i id="printextrashint" style="padding-left: 50px;padding-right: 50px;">Hinweis: erfordert 1.4.17</i>
<div id="partOfShowhostprint"></div>
<div id="partAddrecPrinterIfServerPrint">
<div id="partOfAddRecPrinter"></div>
<span id=addrecprinterhint></span>
</div>
<br><b><u><span id="workreceiptssectiontxt">Arbeitsbons</span></u></b><br><br>
<div id="partOfDigiprintworkContainer">
<div id="partOfDigiprintwork"></div>
<i id=digiprinthint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
</div>
<div id="partIfWorkReceiptsWorkflow">
<div id="partOfWaitergopayprint"></div>
<span id=waitergopayprinthint></span>
</div>
<div id="partOfOneprodworkrecf"></div>
<div id="partOfOneprodworkrecd"></div>
<div>
<div id="partOfBigFontWorkReceipt"></div>
<i id=workfontsizehint style="padding-left: 50px;padding-right: 50px;">Hinweis: Nicht für eigene Layouts</i>
</div>
<div id="partOfGroupWorkItemsf"></div>
<div id="partOfGroupWorkItemsd"></div>
<br><b><u><span id="discountsectiontxt">Rabatte</span></u></b><br><br>
<div data-role="fieldcontain">
<label for="discountname1"><span id="discountname1txt">Rabattname 1:</span></label>
<input type="text" value="" data-mini="true" placeholder="Bezeichnung" id="discountname1" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="discountname2"><span id="discountname2txt">Rabattname 2:</span></label>
<input type="text" value="" data-mini="true" placeholder="Bezeichnung" id="discountname2" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="discountname3"><span id="discountname3txt">Rabattname 3:</span></label>
<input type="text" value="" data-mini="true" placeholder="Bezeichnung" id="discountname3" data-theme="c" class="genConfigEl"/>
</div>
<div id="partOfDiscount1"></div>
<div id="partOfDiscount2"></div>
<div id="partOfDiscount3"></div>
<br><b><u><span id="pickupsectiontxt">Abholansicht</span></u></b><br><br>
<div id="partOfPrintpickups"></div>
<div data-role="fieldcontain">
<label for="showpickupsno"><span id="showpickupsnotxt">Max Abholjobs</span></label>
<input type="text" value="" data-mini="true" placeholder="2" id="showpickupsno" data-theme="c" class="genConfigEl"/>
</div>
<div id="partOfShowpickupdelbtn"></div>
<div id="partOfShowpickhelp"></div>
<br><b><u><span id="emailconfigsectiontxt">Email</span></u></b><br><br>
<div data-role="fieldcontain">
<label for="smtphost"><span id="smtphosttxt">SMTP Host:</span></label>
<input type="text" value="" data-mini="true" placeholder="beispiel.email.provider.de" id="smtphost" data-theme="c" class="genConfigEl"/>
</div>
<div id="partOfSmtpauth"></div>
<div data-role="fieldcontain">
<label for="smtpuser"><span id="smtpusertxt">SMTP Benutzer:</span></label>
<input type="text" value="" data-mini="true" placeholder="Benutzer" id="smtpuser" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="smtppass"><span id="smtppasstxt">SMTP Passwort:</span></label>
<input type="password" value="" data-mini="true" placeholder="password" id="smtppass" data-theme="c" class="genConfigEl"/>
</div>
<div id="partOfSmtpsecure"></div>
<div data-role="fieldcontain">
<label for="smtpport"><span id="smtpporttxt">SMTP Port:</span></label>
<input type="text" value="" data-mini="true" placeholder="587" id="smtpport" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="email"><span id="fromemailtxt">Sender-Email:</span></label>
<input type="email" value="" data-mini="true" placeholder="gastwirt@anbieter.de" id="email" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="emailbadrating"><span id="emailbadratingtxt">Sender-Email:</span></label>
<input type="email" value="" data-mini="true" placeholder="gastwirt@anbieter.de" id="emailbadrating" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="emailratingcontact"><span id="emailratingcontacttxt">Sender-Email:</span></label>
<input type="email" value="" data-mini="true" placeholder="gastwirt@anbieter.de" id="emailratingcontact" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="receiveremail"><span id="toemailtxt">Standard Emailempfänger:</span></label>
<input type="email" value="" data-mini="true" placeholder="gastwirt@anbieter.de" id="receiveremail" data-theme="c" class="genConfigEl"/>
</div>
<br><b><u><span id="templatesectiontxt">Templates</span></u></b><br><br>
<div data-role="fieldcontain">
<label for="rectemplate">Kassenbonvorlage:</label>
<textarea cols="40" rows="8" name="rectemplate" id="rectemplate" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
<i id=rectemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
</div>
<div data-role="fieldcontain">
<label for="hosttext"><span id="hosttexttxt">Bewirtungsbeleg</span>:</label>
<textarea cols="40" rows="8" name="hosttext" id="hosttext" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
</div>
<div data-role="fieldcontain">
<label for="foodtemplate">Vorlage Speisebons:</label>
<textarea cols="40" rows="8" name="foodtemplate" id="foodtemplate" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
<i id=foodtemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
</div>
<div data-role="fieldcontain">
<label for="drinktemplate">Vorlage Getränkebons:</label>
<textarea cols="40" rows="8" name="drinktemplate" id="drinktemplate" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
<i id=drinktemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
</div>
<div data-role="fieldcontain">
<label for="canceltemplate">Vorlage Storno-Arbeitsbon:</label>
<textarea cols="40" rows="8" name="canceltemplate" id="canceltemplate" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
<i id=canceltemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
</div>
<div data-role="fieldcontain">
<label for="pickuptemplate">Vorlage Abholbon:</label>
<textarea cols="40" rows="8" name="pickuptemplate" id="pickuptemplate" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
<i id=pickuptemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
</div>
<div data-role="fieldcontain">
<label for="clostemplate">Vorlage html-Tageserfassung:</label>
<textarea cols="40" rows="8" name="clostemplate" id="clostemplate" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
<i id=clostemplatehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
</div>
<div data-role="fieldcontain">
<label for="reservationnote">Reservierungstemplate Email:</label>
<textarea cols="40" rows="8" name="reservationnote" id="reservationnote" class="genConfigEl" style="background-color:#FFFFFF;color:black;"></textarea>
</div>
<br><b><u><span id="timetrackingtxt">Zeitmanagement</span></u></b><br><br> <br><b><u><span id="timetrackingtxt">Zeitmanagement</span></u></b><br><br>
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<label for="minbeforecome"><span id="minbeforecometxt">Stempelminuten früher:</span></label> <label for="minbeforecome"><span id="minbeforecometxt">Stempelminuten früher:</span></label>
@ -3758,6 +3818,8 @@ $(document).on("pageinit", "#admin-page", function () {
<br><b><u><span id="showpaymentstxt">Zahlungswege</span></u></b><br><br> <br><b><u><span id="showpaymentstxt">Zahlungswege</span></u></b><br><br>
<div id="partOfshowpayments"></div>
<i id=showpaymentshint style="padding-left: 50px;padding-right: 50px;">Hinweis: alles Bar</i><br>
<div id="partOfshowpayment2"></div> <div id="partOfshowpayment2"></div>
<div id="partOfshowpayment3"></div> <div id="partOfshowpayment3"></div>
<div id="partOfshowpayment4"></div> <div id="partOfshowpayment4"></div>
@ -3766,6 +3828,11 @@ $(document).on("pageinit", "#admin-page", function () {
<div id="partOfshowpayment7"></div> <div id="partOfshowpayment7"></div>
<div id="partOfshowpayment8"></div> <div id="partOfshowpayment8"></div>
<br><b><u><span id="dashsectiontxt">Dashboard</span></u></b><br><br>
<div id="partOfDashslot1"></div>
<div id="partOfDashslot2"></div>
<div id="partOfDashslot3"></div>
<br><b><u><span id="guestsystemsectiontxt">Gastsystem</span></u></b><br><br> <br><b><u><span id="guestsystemsectiontxt">Gastsystem</span></u></b><br><br>
<div data-role="fieldcontain"> <div data-role="fieldcontain">
@ -3782,6 +3849,8 @@ $(document).on("pageinit", "#admin-page", function () {
</div> </div>
<div id="partOfGuestjobprint"></div> <div id="partOfGuestjobprint"></div>
<i id="guestjobprinthint" style="padding-left: 50px;padding-right: 50px;">Hinweis: Nicht drucken heißt digitalen Workflow.</i>
<div id="partOfAskdaycode"></div> <div id="partOfAskdaycode"></div>
<div id="partOfAsktablecode"></div> <div id="partOfAsktablecode"></div>
<div id="partOfShowdaycode"></div> <div id="partOfShowdaycode"></div>
@ -3793,6 +3862,8 @@ $(document).on("pageinit", "#admin-page", function () {
<br><b><u><span id="specialsettingssectiontxt">Spezialeinstellungen</span></u></b><br><br> <br><b><u><span id="specialsettingssectiontxt">Spezialeinstellungen</span></u></b><br><br>
<div id="partOfOneclickcooked"></div>
<div> <div>
<div id="partOfPrintAndQueueJobs"></div> <div id="partOfPrintAndQueueJobs"></div>
<i id=printandqueuehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i> <i id=printandqueuehint style="padding-left: 50px;padding-right: 50px;">Hinweis: siehe Anleitung</i>
@ -3832,11 +3903,36 @@ $(document).on("pageinit", "#admin-page", function () {
<input type="text" value="" data-mini="true" placeholder="2" id="pollpickups" data-theme="c" class="genConfigEl"/> <input type="text" value="" data-mini="true" placeholder="2" id="pollpickups" data-theme="c" class="genConfigEl"/>
</div> </div>
<br><b><u><span id="serversectiontxt">Server</span></u></b><br><br>
<div data-role="fieldcontain">
<label for="memorylimit"><span id="memorylimittxt">PHP Memory Limit:</span></label>
<input type="text" value="" data-mini="true" placeholder="256" id="memorylimit" data-theme="c" class="genConfigEl"/>
</div>
<div data-role="fieldcontain">
<label for="updateurl"><span id="updateurltxt">Update-Server:</span></label>
<input type="text" value="" data-mini="true" placeholder="" id="updateurl" data-theme="c" class="genConfigEl"/>
</div>
<div class="grouparea">
<div data-role="fieldcontain">
<label for="tmpdir"><span id="tmpdirtxt">PHP-Tmp:</span></label>
<input type="text" value="" data-mini="true" placeholder="" id="tmpdir" data-theme="c" class="genConfigEl"/><br><br>
<button type="submit" data-theme="f" data-icon="check" id="defaulttmpbtn">Default</button><br>
<i><span id="tmpdirhint">Hinweis</span></i>
</div>
</div>
<p>&nbsp; <p>&nbsp;
<button type="submit" data-theme="f" data-icon="check" id="changeConfig">Ändern</button> <br><b><u><span id="applysectiontxt">Ändern</span></u></b><br><br>
<div style="margin-left:30px;margin-right:30px;">
<button type="submit" data-theme="f" data-icon="check" id="changeConfig" style="height:150px;font-size:3em;">Ändern</button>
</div>
</form><!-- Konfiguration --> </form><!-- Konfiguration -->
<br><b><u>Logo:</u></b><br><br>
<img id="logoimgpart" height="70px" src="php/contenthandler.php?module=printqueue&command=getLogoAsPng" /> <img id="logoimgpart" height="70px" src="php/contenthandler.php?module=printqueue&command=getLogoAsPng" />
<form id="logoform" enctype="multipart/form-data" action="php/contenthandler.php?module=admin&command=readlogo" method="POST" data-ajax="false"> <form id="logoform" enctype="multipart/form-data" action="php/contenthandler.php?module=admin&command=readlogo" method="POST" data-ajax="false">
<input type="hidden" name="MAX_FILE_SIZE" value="16777210" /> <input type="hidden" name="MAX_FILE_SIZE" value="16777210" />

6
webapp/paydesk.html
View File

File diff suppressed because one or more lines are too long

64
webapp/php/admin.php
View File

@ -1141,6 +1141,7 @@ class Admin {
array("closshowci",1,false), array("closshowci",1,false),
array("closshowpaytaxes",1,false), array("closshowpaytaxes",1,false),
array("closshowprods",1,false), array("closshowprods",1,false),
array("showpayments",1,false),
array("showpayment2",1,false), array("showpayment2",1,false),
array("showpayment3",1,false), array("showpayment3",1,false),
array("showpayment4",1,false), array("showpayment4",1,false),
@ -1180,7 +1181,11 @@ class Admin {
array("pollworksd",2,false), array("pollworksd",2,false),
array("pollclosings",2,false), array("pollclosings",2,false),
array("pollpickups",2,false), array("pollpickups",2,false),
array("showpickupsno",20,false) array("showpickupsno",20,false),
array("showhostprint",1,false),
array("oneclickcooked",0,false),
array("showpickupdelbtn",1,false),
array("showpickhelp",1,false)
); );
if (is_null($pdo)) { if (is_null($pdo)) {
@ -1375,7 +1380,7 @@ class Admin {
$view = "preferences.html"; $view = "preferences.html";
} }
echo json_encode($view . "?v=1.5.10"); echo json_encode($view . "?v=1.5.11");
} }
} }
@ -1591,31 +1596,31 @@ class Admin {
if (!self::isOnlyRatingUser($rights, $right_rating, true)) { if (!self::isOnlyRatingUser($rights, $right_rating, true)) {
if ($_SESSION['modus'] == 0) { if ($_SESSION['modus'] == 0) {
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.10"); } if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.11"); }
} else { } else {
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.10"); } if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.11"); }
} }
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.10"); } if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.11"); }
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.10"); } if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.11"); }
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.10"); } if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.11"); }
if ($_SESSION['modus'] == 0) { if ($_SESSION['modus'] == 0) {
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.10"); } if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.11"); }
} }
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.10"); } if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.11"); }
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.10"); } if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.11"); }
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.10"); } if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.11"); }
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.10"); } if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.11"); }
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.10"); } if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.11"); }
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.10"); } if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.11"); }
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.10"); } if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.11"); }
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.10"); } if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.11"); }
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.10"); } if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.11"); }
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.10"); } if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.11"); }
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.10"); $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.11");
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.10"); } if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.11"); }
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.10"); $mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.11");
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.10"); $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.11");
} }
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
@ -2142,11 +2147,16 @@ class Admin {
"taskifempty" => array("dbcol" => "taskifempty","checknum" => 0), "taskifempty" => array("dbcol" => "taskifempty","checknum" => 0),
"taskownerempty" => array("dbcol" => "taskownerempty","checknum" => 0), "taskownerempty" => array("dbcol" => "taskownerempty","checknum" => 0),
"showtogo" => array("dbcol" => "showtogo","checknum" => 0), "showtogo" => array("dbcol" => "showtogo","checknum" => 0),
"showhostprint" => array("dbcol" => "showhostprint","checknum" => 0),
"oneclickcooked" => array("dbcol" => "oneclickcooked","checknum" => 0),
"showpickupdelbtn" => array("dbcol" => "showpickupdelbtn","checknum" => 0),
"showpickhelp" => array("dbcol" => "showpickhelp","checknum" => 0),
"closshowci" => array("dbcol" => "closshowci","checknum" => 0), "closshowci" => array("dbcol" => "closshowci","checknum" => 0),
"closshowpaytaxes" => array("dbcol" => "closshowpaytaxes","checknum" => 0), "closshowpaytaxes" => array("dbcol" => "closshowpaytaxes","checknum" => 0),
"closshowprods" => array("dbcol" => "closshowprods","checknum" => 0), "closshowprods" => array("dbcol" => "closshowprods","checknum" => 0),
"showpayments" => array("dbcol" => "showpayments","checknum" => 0),
"showpayment2" => array("dbcol" => "showpayment2","checknum" => 0), "showpayment2" => array("dbcol" => "showpayment2","checknum" => 0),
"showpayment3" => array("dbcol" => "showpayment3","checknum" => 0), "showpayment3" => array("dbcol" => "showpayment3","checknum" => 0),
"showpayment4" => array("dbcol" => "showpayment4","checknum" => 0), "showpayment4" => array("dbcol" => "showpayment4","checknum" => 0),
@ -2772,14 +2782,14 @@ class Admin {
$filenames = array(); $filenames = array();
foreach($tables as $table) { foreach($tables as $table) {
$sql = "DESCRIBE %$table%"; $sql = "DESCRIBE `%$table%`";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); $stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
$stmt->execute(); $stmt->execute();
$fields = $stmt->fetchAll(PDO::FETCH_COLUMN); $fields = $stmt->fetchAll(PDO::FETCH_COLUMN);
$fieldstr = implode(",",$fields); $fieldstr = implode(",",$fields);
$sql = "SELECT $fieldstr from %$table%"; $sql = "SELECT $fieldstr from `%$table%`";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); $stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
$stmt->execute(); $stmt->execute();
@ -3078,7 +3088,7 @@ class Admin {
self::doSql($pdo, "SET foreign_key_checks = 0", null); self::doSql($pdo, "SET foreign_key_checks = 0", null);
foreach($dbContent as $table) { foreach($dbContent as $table) {
$tablename = "%" . $table[$tableKey] . "%"; $tablename = "`%" . $table[$tableKey] . "%`";
$sql = "DELETE FROM $tablename"; $sql = "DELETE FROM $tablename";
CommonUtils::execSql($pdo, $sql, null); CommonUtils::execSql($pdo, $sql, null);
@ -3179,7 +3189,7 @@ class Admin {
continue; continue;
} }
$tablename = "%" . $table . "%"; $tablename = "`%" . $table . "%`";
$sql = "DELETE FROM $tablename"; $sql = "DELETE FROM $tablename";
CommonUtils::execSql($pdo, $sql, null); CommonUtils::execSql($pdo, $sql, null);
@ -3398,7 +3408,7 @@ class Admin {
self::doSql($pdo, "DELETE FROM %reservations%", null); self::doSql($pdo, "DELETE FROM %reservations%", null);
self::doSql($pdo, "DELETE FROM %groupcustomer%", null); self::doSql($pdo, "DELETE FROM %groupcustomer%", null);
self::doSql($pdo, "DELETE FROM %vacations%", null); self::doSql($pdo, "DELETE FROM %vacations%", null);
self::doSql($pdo, "DELETE FROM %groups%", null); self::doSql($pdo, "DELETE FROM `%groups%`", null);
self::doSql($pdo, "DELETE FROM %customers%", null); self::doSql($pdo, "DELETE FROM %customers%", null);
Workreceipts::resetWorkReceiptId($pdo); Workreceipts::resetWorkReceiptId($pdo);

16
webapp/php/customers.php
View File

@ -244,12 +244,12 @@ class Customers {
$currentTime = date('Y-m-d H:i:s'); $currentTime = date('Y-m-d H:i:s');
try { try {
$sql = "SELECT count(id) as countid from %groups% WHERE name=?"; $sql = "SELECT count(id) as countid from `%groups%` WHERE name=?";
$row = CommonUtils::getRowSqlObject($pdo, $sql, array($name)); $row = CommonUtils::getRowSqlObject($pdo, $sql, array($name));
if ($row->countid > 0) { if ($row->countid > 0) {
return array("status" => "ERROR","msg" => "Group name already exists","code" => 1); return array("status" => "ERROR","msg" => "Group name already exists","code" => 1);
} }
$sql = "INSERT INTO %groups% (name,remark,created) VALUES(?,?,?)"; $sql = "INSERT INTO `%groups%` (name,remark,created) VALUES(?,?,?)";
CommonUtils::execSql($pdo, $sql, array($name,$remark,$currentTime)); CommonUtils::execSql($pdo, $sql, array($name,$remark,$currentTime));
return array("status" => "OK"); return array("status" => "OK");
} catch (Exception $e) { } catch (Exception $e) {
@ -531,7 +531,7 @@ class Customers {
continue; continue;
} }
$sql = "SELECT groupid,name FROM %groupcustomer%,%groups% WHERE groupid=%groups%.id AND customerid=? ORDER BY name"; $sql = "SELECT groupid,name FROM %groupcustomer%,`%groups%` WHERE groupid=`%groups%`.id AND customerid=? ORDER BY name";
$assgroups = CommonUtils::fetchSqlAll($pdo, $sql, array($aCustomer["id"])); $assgroups = CommonUtils::fetchSqlAll($pdo, $sql, array($aCustomer["id"]));
if ($onlyOpenBills == 1) { if ($onlyOpenBills == 1) {
@ -595,7 +595,7 @@ class Customers {
private function getGroups($pdo,$search) { private function getGroups($pdo,$search) {
$s = '%' . $search . '%'; $s = '%' . $search . '%';
try { try {
$sql = "SELECT id,name,remark,DATE_FORMAT(created,'%e %b %Y - %k:%i') as created FROM %groups% WHERE name like ? ORDER BY name"; $sql = "SELECT id,name,remark,DATE_FORMAT(created,'%e %b %Y - %k:%i') as created FROM `%groups%` WHERE name like ? ORDER BY name";
$resultFiltered = CommonUtils::fetchSqlAll($pdo, $sql, array($s)); $resultFiltered = CommonUtils::fetchSqlAll($pdo, $sql, array($s));
$resultFoundGroups = array(); $resultFoundGroups = array();
@ -611,7 +611,7 @@ class Customers {
"customers" => $customersInGroup); "customers" => $customersInGroup);
} }
$sql = "SELECT id,name FROM %groups% ORDER BY name"; $sql = "SELECT id,name FROM `%groups%` ORDER BY name";
$resultAll = CommonUtils::fetchSqlAll($pdo, $sql, array($s)); $resultAll = CommonUtils::fetchSqlAll($pdo, $sql, array($s));
$result = array("filtered" => $resultFoundGroups,"all" => $resultAll); $result = array("filtered" => $resultFoundGroups,"all" => $resultAll);
@ -623,7 +623,7 @@ class Customers {
private function changeGroup($pdo,$id,$name,$remark) { private function changeGroup($pdo,$id,$name,$remark) {
try { try {
$sql = "UPDATE %groups% SET name=?,remark=? WHERE id=?"; $sql = "UPDATE `%groups%` SET name=?,remark=? WHERE id=?";
CommonUtils::execSql($pdo, $sql, array($name,$remark,$id)); CommonUtils::execSql($pdo, $sql, array($name,$remark,$id));
return array("status" => "OK"); return array("status" => "OK");
} catch (Exception $e) { } catch (Exception $e) {
@ -635,7 +635,7 @@ class Customers {
$sql = "DELETE FROM %groupcustomer% WHERE groupid=?"; $sql = "DELETE FROM %groupcustomer% WHERE groupid=?";
CommonUtils::execSql($pdo, $sql, array($id)); CommonUtils::execSql($pdo, $sql, array($id));
$sql = "DELETE FROM %groups% WHERE id=?"; $sql = "DELETE FROM `%groups%` WHERE id=?";
CommonUtils::execSql($pdo, $sql, array($id)); CommonUtils::execSql($pdo, $sql, array($id));
return array("status" => "OK"); return array("status" => "OK");
@ -853,7 +853,7 @@ class Customers {
$txt = "<head>"; $txt = "<head>";
$txt .= "<title>" . self::$CUS_OVERVIEW[$lang] . "</title>"; $txt .= "<title>" . self::$CUS_OVERVIEW[$lang] . "</title>";
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">'; $txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.10">'; $txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.11">';
$txt .= "</head>"; $txt .= "</head>";
return $txt; return $txt;
} }

2
webapp/php/debug.php
View File

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

12
webapp/php/pickup.php
View File

@ -6,7 +6,7 @@ require_once ('admin.php');
class Pickup { class Pickup {
public static function handleCommand($command) { public static function handleCommand($command) {
if (!in_array($command, array("getjobs","getmodus","declarepickready","declarepicknotready"))) { if (!in_array($command, array("getjobs","getmodus","declarepickready","declarepicknotready","deleteallcompletedjobs"))) {
echo json_encode(array("status" => "ERROR", "code" => ERROR_COMMAND_NOT_FOUND, "msg" => ERROR_COMMAND_NOT_FOUND_MSG)); echo json_encode(array("status" => "ERROR", "code" => ERROR_COMMAND_NOT_FOUND, "msg" => ERROR_COMMAND_NOT_FOUND_MSG));
return false; return false;
} }
@ -23,6 +23,8 @@ class Pickup {
$ret = self::declarepickready($pdo,$_POST["id"]); $ret = self::declarepickready($pdo,$_POST["id"]);
} else if ($command == "declarepicknotready") { } else if ($command == "declarepicknotready") {
$ret = self::declarepicknotready($pdo,$_POST["id"]); $ret = self::declarepicknotready($pdo,$_POST["id"]);
} else if ($command == "deleteallcompletedjobs") {
$ret = self::deleteallcompletedjobs($pdo);
} }
echo json_encode($ret); echo json_encode($ret);
} }
@ -100,4 +102,12 @@ class Pickup {
} }
return self::getjobs($pdo); return self::getjobs($pdo);
} }
private static function deleteallcompletedjobs($pdo) {
if (self::hasRightToRequestIncompleteJobs()) {
$sql = "DELETE FROM %printjobs% WHERE type=? AND pickready=?";
CommonUtils::execSql($pdo, $sql, array(7,1));
}
return self::getjobs($pdo);
}
} }

6
webapp/php/products.php
View File

@ -255,8 +255,7 @@ class Products {
} }
$typeArray[] = array("id" => $row['id'], "name" => $row['name'], "ref" => $ref,"sorting" => $row["sorting"]); $typeArray[] = array("id" => $row['id'], "name" => $row['name'], "ref" => $ref,"sorting" => $row["sorting"]);
} }
$sql = "select id,shortname,longname,audio,category as ref,favorite,$priceTxt as price,IF(unit is not null, unit, '0') as unit,IF(days is not null, days, '0123456') as days,IF(tax is not null, tax, 'null') as tax,IF(taxaustria is not null, taxaustria, 'null') as taxaustria,IF(amount is not null, amount, 'null') as amount,IFNULL(prodimageid,0) as prodimageid ";
$sql = "select id,shortname,longname,audio,category as ref,favorite,$priceTxt as price,IF(unit is not null, unit, '0') as unit,IF(days is not null, days, '0123456') as days,IF(tax is not null, tax, 'null') as tax,IF(taxaustria is not null, taxaustria, 'null') as taxaustria,IF(amount is not null, amount, 'null') as amount ";
$sql .= " from %products% where available='1' AND removed is null AND (days is null OR days like ?) AND (display = 'KG' OR display = 'K' OR display is null) ORDER BY sorting"; $sql .= " from %products% where available='1' AND removed is null AND (days is null OR days like ?) AND (display = 'KG' OR display = 'K' OR display is null) ORDER BY sorting";
$result = CommonUtils::fetchSqlAll($pdo, $sql, array("%$dayofweek%")); $result = CommonUtils::fetchSqlAll($pdo, $sql, array("%$dayofweek%"));
@ -282,7 +281,7 @@ class Products {
$stmt->execute(array($row['id'])); $stmt->execute(array($row['id']));
$extras = $stmt->fetchAll(PDO::FETCH_OBJ); $extras = $stmt->fetchAll(PDO::FETCH_OBJ);
$prodArray[] = array("id" => $row['id'], "name" => $row['shortname'], "longname" => $row['longname'], "audio" => $audio, "ref" => $ref, "favorite" => $fav, "price" => $row['price'], "unit" => $row['unit'],"days" => $row['days'],"tax" => $row['tax'], "taxaustria" => $row['taxaustria'],"amount" => $row['amount'],"extras" => $extras); $prodArray[] = array("id" => $row['id'], "name" => $row['shortname'], "longname" => $row['longname'], "audio" => $audio, "ref" => $ref, "favorite" => $fav, "price" => $row['price'], "unit" => $row['unit'],"days" => $row['days'],"tax" => $row['tax'], "taxaustria" => $row['taxaustria'],"amount" => $row['amount'],"prodimageid" => $row['prodimageid'], "extras" => $extras);
} }
$pdo->commit(); $pdo->commit();
@ -1277,7 +1276,6 @@ class Products {
fpassthru($fp); fpassthru($fp);
} }
// show image
function getprodimage($prodid,$size='h') { function getprodimage($prodid,$size='h') {
$imgcol = 'imgh'; $imgcol = 'imgh';

46
webapp/php/queuecontent.php
View File

@ -747,7 +747,7 @@ class QueueContent {
*/ */
function declareProductBeCookingOrCooked($queueid,$action) { function declareProductBeCookingOrCooked($queueid,$action) {
if (is_numeric($queueid)) { if (is_numeric($queueid)) {
$pdo = $this->dbutils->openDbAndReturnPdo(); $pdo = DbUtils::openDbAndReturnPdoStatic();
$pdo->beginTransaction(); $pdo->beginTransaction();
$sql = "SELECT cooking,productid FROM %queue% WHERE id=?"; $sql = "SELECT cooking,productid FROM %queue% WHERE id=?";
@ -757,30 +757,25 @@ class QueueContent {
$productid = $row->productid; $productid = $row->productid;
if ($action == 'r') { if ($action == 'r') {
if (is_null($cooking)) { $this->reallyDeclareAsCooked($pdo,$queueid);
$pdo->rollBack(); $useConditions = $this->getUseKitchenAndSupplyForProd($pdo,$productid);
echo json_encode(array("status" => "ERROR", "code" => ERROR_DB_PAR_ACCESS, "msg" => ERROR_DB_PAR_ACCESS_MSG)); if ($useConditions["usesupply"] == 0) {
$this->declareProductBeDeliveredWithGivenPdo($pdo,$queueid);
} else { } else {
$this->reallyDeclareAsCooked($pdo,$queueid); self::setNewProductsToServe($pdo, 1);
$useConditions = $this->getUseKitchenAndSupplyForProd($pdo,$productid);
if ($useConditions["usesupply"] == 0) {
$this->declareProductBeDeliveredWithGivenPdo($pdo,$queueid);
} else {
self::setNewProductsToServe($pdo, 1);
}
$payprinttype = CommonUtils::getConfigValue($pdo, 'payprinttype', "l");
$digiprintwork = CommonUtils::getConfigValue($pdo, 'digiprintwork', 1);
if (($payprinttype === 's') && ($digiprintwork == 1)) {
$theTableid = $this->getTableIdOfQueue($pdo, $queueid);
if (is_null($theTableid)) {
$theTableid = 0;
}
$this->doWorkPrint($pdo,$theTableid,array($queueid),$_SESSION['currentuser'],$payprinttype, $_SESSION['language'],false);
}
$pdo->commit();
echo json_encode(array("status" => "OK"));
} }
$payprinttype = CommonUtils::getConfigValue($pdo, 'payprinttype', "l");
$digiprintwork = CommonUtils::getConfigValue($pdo, 'digiprintwork', 1);
if (($payprinttype === 's') && ($digiprintwork == 1)) {
$theTableid = $this->getTableIdOfQueue($pdo, $queueid);
if (is_null($theTableid)) {
$theTableid = 0;
}
$this->doWorkPrint($pdo,$theTableid,array($queueid),$_SESSION['currentuser'],$payprinttype, $_SESSION['language'],false);
}
$pdo->commit();
echo json_encode(array("status" => "OK"));
} else if ($action == 'c') { } else if ($action == 'c') {
if (!is_null($cooking)) { if (!is_null($cooking)) {
$pdo->rollBack(); $pdo->rollBack();
@ -1503,7 +1498,7 @@ class QueueContent {
function getJsonProductsOfTableToPay($tableid) { function getJsonProductsOfTableToPay($tableid) {
$pdo = DbUtils::openDbAndReturnPdoStatic(); $pdo = DbUtils::openDbAndReturnPdoStatic();
$sql = "SELECT %queue%.id as id,longname,%queue%.price as price,%queue%.tax,%prodtype%.kind as kind,%pricelevel%.name as pricelevelname,%products%.id as prodid,%queue%.togo as togo, ordertime $sql = "SELECT %queue%.id as id,longname,%queue%.price as price,%queue%.tax,%prodtype%.kind as kind,%pricelevel%.name as pricelevelname,%products%.id as prodid,%queue%.togo as togo, ordertime,IFNULL(prodimageid,0) as prodimageid
FROM %queue% FROM %queue%
INNER JOIN %products% ON %queue%.productid = %products%.id INNER JOIN %products% ON %queue%.productid = %products%.id
INNER JOIN %pricelevel% ON %queue%.pricelevel = %pricelevel%.id INNER JOIN %pricelevel% ON %queue%.pricelevel = %pricelevel%.id
@ -1526,11 +1521,12 @@ class QueueContent {
$longName = $zeile['longname']; $longName = $zeile['longname'];
$togo = $zeile["togo"]; $togo = $zeile["togo"];
$queueid = $zeile['id']; $queueid = $zeile['id'];
$prodimageid = $zeile['prodimageid'];
$extras = $this->getExtrasOfQueueItem($pdo,$queueid); $extras = $this->getExtrasOfQueueItem($pdo,$queueid);
$prodId = $zeile['prodid']; $prodId = $zeile['prodid'];
$prodsToPay[] = array("id" => $queueid, "prodid" => $prodId, "longname" => $longName, "pricelevelname" => $thePriceLevelName, "price" => $thePrice, "tax" => $theTax, "togo" => $togo, "extras" => $extras); $prodsToPay[] = array("id" => $queueid, "prodid" => $prodId, "longname" => $longName, "pricelevelname" => $thePriceLevelName, "price" => $thePrice, "tax" => $theTax, "togo" => $togo, "prodimageid" => $prodimageid, "extras" => $extras);
} }
echo json_encode(array("status" => "OK", "msg" => $prodsToPay)); echo json_encode(array("status" => "OK", "msg" => $prodsToPay));
} }

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

@ -569,7 +569,7 @@ class Basedb {
`id` INT (10) NOT NULL AUTO_INCREMENT PRIMARY KEY , `id` INT (10) NOT NULL AUTO_INCREMENT PRIMARY KEY ,
`groupid` INT(10) NOT NULL, `groupid` INT(10) NOT NULL,
`customerid` INT(10) NOT NULL, `customerid` INT(10) NOT NULL,
FOREIGN KEY (groupid) REFERENCES %groups%(id), FOREIGN KEY (groupid) REFERENCES `%groups%`(id),
FOREIGN KEY (customerid) REFERENCES %customers%(id) FOREIGN KEY (customerid) REFERENCES %customers%(id)
) CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE = InnoDb ; ) CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE = InnoDb ;
"; ";

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

@ -1042,6 +1042,19 @@ class Version {
} }
} }
public static function upd_1510_1511($pdo, $prefix, $dbname) {
try {
self::insertOrUpdateConfigItem($pdo, 'showhostprint', 1);
self::insertOrUpdateConfigItem($pdo, 'oneclickcooked', 0);
self::insertOrUpdateConfigItem($pdo, 'showpickupdelbtn', 1);
self::insertOrUpdateConfigItem($pdo, 'showpickhelp', 1);
self::insertOrUpdateConfigItem($pdo, 'showpayments', 1);
return array(true);
} catch (PDOException $e) {
return array(false,$e);
}
}
public static $updateOrder = array( public static $updateOrder = array(
"1.3.0" => array("upd_1300_1301","1.3.1"), "1.3.0" => array("upd_1300_1301","1.3.1"),
"1.3.1" => array("upd_1301_1302","1.3.2"), "1.3.1" => array("upd_1301_1302","1.3.2"),
@ -1099,7 +1112,8 @@ class Version {
"1.5.6" => array("upd_1506_1507","1.5.7"), "1.5.6" => array("upd_1506_1507","1.5.7"),
"1.5.7" => array("upd_1507_1508","1.5.8"), "1.5.7" => array("upd_1507_1508","1.5.8"),
"1.5.8" => array("upd_1508_1509","1.5.9"), "1.5.8" => array("upd_1508_1509","1.5.9"),
"1.5.9" => array("upd_1509_1510","1.5.10") "1.5.9" => array("upd_1509_1510","1.5.10"),
"1.5.10" => array("upd_1510_1511","1.5.11")
); );
// RE;* also for install process no check is required // RE;* also for install process no check is required

103
webapp/pickups.html
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.11">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,7 +13,7 @@
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <script src="php/3rdparty/jquery-1.11.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=1.5.10"></script> <script src="utilities.js?v=1.5.11"></script>
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" /> <link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script> <script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
@ -29,9 +29,13 @@
var PICK_PICKUP_TITLE = ["Abholung","Pickup","Recogido"]; var PICK_PICKUP_TITLE = ["Abholung","Pickup","Recogido"];
var PICK_INCOMPLETE_TITLE = ["In Arbeit","In progress","Procesando"]; var PICK_INCOMPLETE_TITLE = ["In Arbeit","In progress","Procesando"];
var PICK_COMPLETE_TITLE = ["Abholbereit","Finished","Completado"]; var PICK_COMPLETE_TITLE = ["Abholbereit","Finished","Completado"];
var PICK_HELP_TITLE = ["Hilfe","Help","Informatión"];
var PICK_DEL_BTN = ["Alle abholbereiten Jobs löschen","Remove all completed jobs","Eliminar todos los trabajos completados"];
var lang = 0; var lang = 0;
var modus = 0; var modus = 0;
var showpickupdelbtn = 1;
var showpickhelp = 1;
function setLanguage(language) { function setLanguage(language) {
lang = language; lang = language;
@ -39,6 +43,19 @@ function setLanguage(language) {
$("#timetitletxt").html(PICK_PICKUP_TITLE[lang]); $("#timetitletxt").html(PICK_PICKUP_TITLE[lang]);
$("#incompletetitle").html(PICK_INCOMPLETE_TITLE[lang]); $("#incompletetitle").html(PICK_INCOMPLETE_TITLE[lang]);
$("#completetitle").html(PICK_COMPLETE_TITLE[lang]); $("#completetitle").html(PICK_COMPLETE_TITLE[lang]);
if (lang == 0) {
$("#help_en").html("");
$("#help_esp").html("");
} else if (lang == 1) {
$("#help_de").html("");
$("#help_esp").html("");
} else {
$("#help_de").html("");
$("#help_en").html("");
}
$("#helptitle").html(PICK_HELP_TITLE[lang]);
$("#delalljobsbtntxt").html(PICK_DEL_BTN[lang]);
} }
function getGeneralConfigItems() { function getGeneralConfigItems() {
@ -48,6 +65,8 @@ function getGeneralConfigItems() {
function insertGenConfigStartRest(configResult) { function insertGenConfigStartRest(configResult) {
if (configResult.status == "OK") { if (configResult.status == "OK") {
var values = configResult.msg; var values = configResult.msg;
showpickupdelbtn = values.showpickupdelbtn;
showpickhelp = values.showpickhelp;
setLanguage(values.userlanguage); setLanguage(values.userlanguage);
requestModus(); requestModus();
} else { } else {
@ -63,11 +82,26 @@ function insertModus(answer) {
modus = answer.msg; modus = answer.msg;
if (modus == 2) { if (modus == 2) {
$("#incompleteregion").show(); $("#incompleteregion").show();
if (showpickhelp == 1) {
$("#helparea").show();
}
if (showpickupdelbtn == 1) {
$("#deletearea").show();
}
bindDelJobsBtn();
} }
} }
startUpdates(); startUpdates();
} }
function bindDelJobsBtn() {
$("#deletecompletejobs").off("click").on("click", function (e) {
e.stopImmediatePropagation();
e.preventDefault();
doAjax("POST", "php/contenthandler.php?module=pickup&command=deleteallcompletedjobs", null, insertJobs, null);
});
}
function requestUpdateFromServer() { function requestUpdateFromServer() {
doAjax("GET", "php/contenthandler.php?module=pickup&command=getjobs", null, insertJobs, null); doAjax("GET", "php/contenthandler.php?module=pickup&command=getjobs", null, insertJobs, null);
} }
@ -119,14 +153,14 @@ function binding() {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
var id = this.id.split("_")[1]; var id = this.id.split("_")[1];
doAjax("POST", "php/contenthandler.php?module=pickup&command=declarepickready", {id:id}, requestUpdateFromServer, null); doAjax("POST", "php/contenthandler.php?module=pickup&command=declarepickready", {id:id}, insertJobs, null);
}); });
$(".pickupitemcomplete").off("click").on("click", function (e) { $(".pickupitemcomplete").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
var id = this.id.split("_")[1]; var id = this.id.split("_")[1];
doAjax("POST", "php/contenthandler.php?module=pickup&command=declarepicknotready", {id:id}, requestUpdateFromServer, null); doAjax("POST", "php/contenthandler.php?module=pickup&command=declarepicknotready", {id:id}, insertJobs, null);
}); });
} }
$(document).on("pageinit", "#time-page", function () { $(document).on("pageinit", "#time-page", function () {
@ -162,6 +196,67 @@ $(document).on("pageinit", "#time-page", function () {
<div id="completeitemarea" class="completeitemarea"></div> <div id="completeitemarea" class="completeitemarea"></div>
</div> </div>
<div id="deletearea" style="display:none;">
<button type="submit" data-theme="d" data-icon="delete" id="deletecompletejobs"><span id="delalljobsbtntxt">Alle fertigen Abholjobs entfernen</span></button>
</div>
<div id="helparea" data-role="collapsible" data-content-theme="c" data-collapsed="true" data-theme="e" style="display:none;">
<h2><span id="helptitle">Hilfe</span></h2>
<div id="help_de">
<p>Abholjobs können nur im Arbeitsablauf mit Arbeitsbons erzeugt werden. In der Konfiguration innerhalb der Verwaltungsansicht muss die
Erstellung von Abholjobs eingeschaltet werden.
<p>Für die Anzeige der Abholansicht muss der Benutzer grundsätzlich das Recht für die Abholansicht besitzen.
Die Abholansicht präsentiert sich jedoch unterschiedlich in Abhängigkeit von weiteren Rechten, die der angemeldete Benutzer besitzt:
Hat er auch das Recht für die Küche und/oder Bar, so sieht er zusätzlich zu den abholbereiten Jobs auch den Bereich mit den Jobs,
die noch zubereitet werden müssen und
kann Jobs sowohl als abholbereit kennzeichnen als auch versehentlich als solche gekennzeichnete Jobs wieder in der Bereich der
zuzubereitenden Jobs zurückschieben.
<p>Daraus ergibt sich, dass man für die Anzeige der Abholansicht im Gastraum einen Benutzer einrichten sollte,
der ausschließloch das Recht für Anzeige der Abholansicht besitzt.
<p>In der Konfiguration kann festgelegt werden, wie viele der zuletzt georderten Jobs maximal im Bereich der abholbereiten Jobs angezeigt werden sollen.
Durch die Erstellung einer Tageserfassung wird die Abholansicht wieder geleert.
Es ist aber auch möglich, mit einem Klick auf den entsprechenden Button alle abholbereiten Jobs aus der Anzeige zu entfernen.
</div>
<div id="help_en">
<p>Pickup jobs can only be created in the workflow with work receipts. In the configuration within the administration view, the
creation of pickup jobs can be activated.
<p>To display the pickup view, the user must have the right to display the pickup view.
However, the collection view presents itself differently depending on other rights that the logged on user has:
If he also has the right for the kitchen and/or bar, he sees the area with the completed jobs in addition to the jobs,
which still have to be prepared and can flag jobs as ready for pickup as well as moving jobs back to the incomplete jobs area.
<p>This means that a certain user should be set up to display the pickup view in the guest room, with the exclusive right to display the pickup view.
<p>In the configuration, you can define the maximum number of recently ordered jobs to be displayed in the area of the jobs ready for pickup.
By creating a closing, the pickup view is emptied again.
However, it is also possible to remove all jobs that are ready for pickup from the display by clicking on the corresponding button.
</div>
<div id="help_esp">
<p>Los tickets de pickup sólo se pueden crear en el workflow con recibos de trabajo. En la configuración dentro de la vista de
administración, se puede activar la creación de trabajos de cobranza.
<p>Para mostrar la vista <i>Recogido</i>, el usuario debe tener derecho a mostrar la vista de recogidos.
Sin embargo, la vista se presenta de forma diferente en función de otros derechos que tenga el usuario conectado:
Si también tiene derecho a la cocina y/o bar, ve el área con los trabajos completos además de los trabajos,
que todavía tienen que ser preparados y puede marcar jobs como listos para la recogida, así como jobs marcados accidentalmente
como tales en el área de la trabajos por preparar.
<p>Esto significa que se debe configurar un usuario para que muestre la vista de la colección en la habitación de invitados,
el agujero exclusivo tiene derecho a mostrar la vista de la colección.
<p>En la configuración, puede definir el número máximo de trabajos pedidos recientemente que se mostrarán en el área de trabajos listos
para su recogida. Al crear un cerramiento del dia, se vuelve a vaciar la vista de agrupación.
Sin embargo, también es posible eliminar de la pantalla todos los trabajos que están listos para su recogida haciendo clic en el
botón correspondiente.
</div>
</div>
</div> </div>
<div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;"> <div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;">

2
webapp/preferences.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.11">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

2
webapp/products.html
View File

@ -7,7 +7,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.11">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

2
webapp/rating.html
View File

@ -7,7 +7,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.11">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

2
webapp/reports.html
View File

@ -7,7 +7,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.11">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

2
webapp/reservation.html
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.11">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

2
webapp/supplydesk.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.11">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

4
webapp/tasks.html
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.11">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,7 +13,7 @@
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <script src="php/3rdparty/jquery-1.11.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=1.5.10"></script> <script src="utilities.js?v=1.5.11"></script>
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" /> <link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script> <script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>

2
webapp/timetracking.html
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.10"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.11">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />

7
webapp/utilities.js
View File

@ -253,6 +253,13 @@ function isFloat(n){
return Number(n) === n && n % 1 !== 0; return Number(n) === n && n % 1 !== 0;
} }
function roundtodigits(value, digits) {
value = parseFloat(value);
if (!value) return 0;
var factor = Math.pow(10,digits);
return Math.round(value * factor) / factor;
}
function getMillis() { function getMillis() {
var d = new Date(); var d = new Date();
var n = d.getTime(); var n = d.getTime();

6
webapp/waiter.html
View File

File diff suppressed because one or more lines are too long

4
webapp/waiterdesktop.php
View File

File diff suppressed because one or more lines are too long