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

OrderSprinter 1.6.4

This commit is contained in:
Geno 2020-11-19 23:14:04 +01:00
parent d42b9913e2
commit fcf86bd41e
40 changed files with 202 additions and 135 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 name="author" content="Stefan Pichel">
<link rel="stylesheet" href="css/gueststyle.css?v=1.6.3" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.6.3" />
<link rel="stylesheet" href="css/gueststyle.css?v=1.6.4" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.6.4" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
@ -115,7 +115,7 @@
<div data-role="footer" data-theme="b" id="thefooter1">
<div class="ui-grid-a">
<div class="ui-block-a">&nbsp;&nbsp;OrderSprinter</div>
<div class="ui-block-b grid_right" id="versioninfo">1.6.3&nbsp;&nbsp;</div>
<div class="ui-block-b grid_right" id="versioninfo">1.6.4&nbsp;&nbsp;</div>
</div><!-- /grid-a -->
</div>
</div>

4
gastsystem/install.php
View File

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

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::createEmptyTables($pdo, $prefix);
Database::setVersion($pdo,$prefix,"1.6.3");
Database::setVersion($pdo,$prefix,"1.6.4");
Database::setAccessPassword($pdo,$prefix,$adminpass);
Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour
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 name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.3">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.4">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,8 +13,8 @@
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=1.6.3"></script>
<script src="kitchenbar.js?v=1.6.3"></script>
<script src="utilities.js?v=1.6.4"></script>
<script src="kitchenbar.js?v=1.6.4"></script>
<style>
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook

4
webapp/bill.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.3">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.4">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -21,7 +21,7 @@
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui-i18n.min.js"></script>
<script src="utilities.js?v=1.6.3"></script>
<script src="utilities.js?v=1.6.4"></script>
<script src="receiptutils.js"></script>
<script>

4
webapp/customers.html
View File

@ -7,7 +7,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.3">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.4">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -23,7 +23,7 @@
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui-i18n.min.js"></script>
<script src="utilities.js?v=1.6.3"></script>
<script src="utilities.js?v=1.6.4"></script>
<script src="elements/customers.js"></script>
</head>

4
webapp/dash.php
View File

@ -4,7 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.3">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.4">
<link rel="stylesheet" href="css/ospage.css" />
@ -17,7 +17,7 @@
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=1.6.3"></script>
<script src="utilities.js?v=1.6.4"></script>
<script src="receiptutils.js"></script>
<script src="elements/dash.js"></script>
<script src="php/3rdparty/Chart.bundle.min.js"></script>

2
webapp/elements/groundplan.js
View File

@ -163,7 +163,7 @@ function Groundplan() {
$("#createtableqrcodesbtn").off("click").on("click", function (e) {
e.stopImmediatePropagation();
e.preventDefault();
window.open("php/contenthandler.php?module=roomtables&command=tableqrcodes&v=1.6.3",'_blank');
window.open("php/contenthandler.php?module=roomtables&command=tableqrcodes&v=1.6.4",'_blank');
});
this.bindRoomChanges();

4
webapp/feedback.html
View File

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

6
webapp/help.php
View File

@ -9,8 +9,8 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.3">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.6.3">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.4">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.6.4">
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -18,7 +18,7 @@
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=1.6.3"></script>
<script src="utilities.js?v=1.6.4"></script>
</head>
<body>

14
webapp/index.html
View File

@ -9,8 +9,8 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.3">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.6.3">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.4">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.6.4">
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -18,7 +18,7 @@
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=1.6.3"></script>
<script src="utilities.js?v=1.6.4"></script>
</head>
<body>
@ -132,7 +132,7 @@ function displayLoginOrLogoutMask(jsonContent) {
// user needs to log in!
$("#passwordfield").val("");
$("#logoutarea").hide();
setTimeout(function(){document.location.href = "index.html?v=1.6.3"},250);
setTimeout(function(){document.location.href = "index.html?v=1.6.4"},250);
}
}
@ -232,7 +232,7 @@ function handleResultOfInstallCheck(is_installed) {
if (is_installed == "Yes") {
useInstallation();
} else {
setTimeout(function(){document.location.href = "install.html?v=1.6.3"},500);
setTimeout(function(){document.location.href = "install.html?v=1.6.4"},500);
}
}
@ -295,11 +295,11 @@ $(document).on("pageinit", "#index-page", function () {
<div data-role="content">
<p><div id="toplogolocation" style="text-align: center;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=1.6.3&style=always" style="max-height:150px;"/></div>
<p><div id="toplogolocation" style="text-align: center;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=1.6.4&style=always" style="max-height:150px;"/></div>
<div data-role="collapsible" data-content-theme="c" data-collapsed="false" data-theme="e" id="loginmask">
<H2>Anmelden</H2>
<p><div id="middlelogolocation" style="text-align: left;padding-left: 80px;padding-right:80px;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=1.6.3&style=always" style="max-height:150px;"/></div>
<p><div id="middlelogolocation" style="text-align: left;padding-left: 80px;padding-right:80px;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=1.6.4&style=always" style="max-height:150px;"/></div>
<form method="post">
<table border=0>

2
webapp/install.html
View File

@ -915,7 +915,7 @@ El servicio web OrderSprinter no requiere una conexión a Internet. Sin embargo,
<tr id=updateline>
<td>&nbsp;</td>
<td align=center>
<button id="updatebtn">Update -> 1.6.3</button>
<button id="updatebtn">Update -> 1.6.4</button>
<span id="updateinprogresstxt" style="display:none;"><img id="installprogressindicator" src="php/3rdparty/images/ajax-loader.gif" alt="Progress indication" style="display:none;"/> Update... bitte warten.</span>
</td>
<td>&nbsp;</td>

2
webapp/install/installer.php
View File

@ -455,7 +455,7 @@ return;
}
set_time_limit(60*30);
$installerVersion = "1.6.3";
$installerVersion = "1.6.4";
$admin = new InstallAdmin();
$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 name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.3">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.4">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,8 +13,8 @@
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=1.6.3"></script>
<script src="kitchenbar.js?v=1.6.3"></script>
<script src="utilities.js?v=1.6.4"></script>
<script src="kitchenbar.js?v=1.6.4"></script>
<style>
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook

116
webapp/manager.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.3">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.4">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,10 +13,10 @@
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=1.6.3"></script>
<script src="elements/tablemap.js?v=1.6.3"></script>
<script src="elements/roommap.js?v=1.6.3"></script>
<script src="elements/groundplan.js?v=1.6.3"></script>
<script src="utilities.js?v=1.6.4"></script>
<script src="elements/tablemap.js?v=1.6.4"></script>
<script src="elements/roommap.js?v=1.6.4"></script>
<script src="elements/groundplan.js?v=1.6.4"></script>
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
@ -118,6 +118,7 @@ var MAN_CLOSING_DET_TXT = ["Ein Export im CSV-Format lässt sich mit Tabellenver
var MAN_CSV_EXP_RECEIPTS = ["CSV-Export Bons","CSV export of Receipts","Grabar tiques en CSV"];
var MAN_XLSX_EXP_RECEIPTS = ["... Excel","... Excel","... Excel"];
var MAN_CSV_EXP_ALL = ["CSV-Export komplett","CSV export all","Grabar todo en CSV"];
var MAN_PRINTVERB = ["Drucken","Print","Imprimir"];
var MAN_PRINT_ALL = ["Drucken Komplettbericht","Print all","Imprimir todo"];
var MAN_PRINT_RECEIPT = ["Drucken Zusammenfassung auf Bon","Print summary on receipt","Imprimir resumen en tique"];
var MAN_CLOS_HTML = ["Tageserfassung über Html-Vorlage","Closing formatted by html template","Resumen en tique por html template"];
@ -276,7 +277,6 @@ var MAN_PICKUP_PRINTER = ["Abholbon-Drucker","Pickup ticket printer","Impreso de
var MAN_UPDATE_PRINTJOBS = ["Aktualisieren","Update","Actualizar"];
var MAN_CLEAR_PRINTJOBS = ["Alle Druckjobs löschen","Clear all print jobs","Remover todo"];
var MAN_PRINT_JOBS_COUNT = ["Druckaufträge","print jobs","tareas de impresión"];
var MAN_REPRINT = ["Erneut drucken","Print again","Imprimir de nuevo"];
var MAN_PARSE_ERROR = ["Speisekarte konnte nicht erfolgreich eingelesen werden. Stimmt die Syntax, z.B. die korrekte Einrückung?",
"Menu could not be parsed - is the intendation correct?",
"Menú no se puede leido - esta correcto la intendación?"];
@ -520,6 +520,7 @@ var MAN_GUEST_QRTEXT = ["Beschriftung","Text next to QR code","Texto al lado del
var MAN_GUEST_QRFONTSIZE = ["Beschriftung Fontgröße","Font size","Tamaño del QR texto"];
var MAN_GUEST_QRSIZE = ["Größe (Pixels)","Size in pixels","Tamaño del codigo"];
var MAN_GUEST_QR_INFO = ["Die QR-Codes können im Bereich Datenbank/Raumplan/Anbindung Gastbestellsystem ausgedruckt werden.","The QR codes can be printed in the area Database/Tables/Integration Guest Order System","Los codigos QR se puede imprimir en la area de Base de datos/Mapa de las mesas/Integration ordenes por huespedes."];
var MAN_PRINTED_WORKRECEIPTS = ["Gedruckte Arbeitsbons","Printed work receipts","Tiquets de trabajo imprimidos"];
var lang = 0;
var generalVals = [12,2,0,3,0,1,1,0,0,1, 0,50,20,10,1,0,0,0,1,0,1,0,0,1,1, 1,1,1,1,1,1,1,1,1,1, 1,2,3, 1,0, 1,0,1, 1,1,0,0, 0,0,0, 0,0,0,1,1, 0,1,0,1,1, 1,2,0, 0,0,1,1,1, 0,0,1];
@ -535,6 +536,7 @@ var managerIsLoggedIn = false;
var defaulttmp = '';
var rolesOnceExtended = false;
var activeusers = [];
var printerqueueexpanded = false;
var generalValuesSettings = [
["usstval","MwSt","i",2,"Mehrwertsteuer ist kein Zahlenwert"],
@ -794,7 +796,6 @@ function setLanguage(l) {
$("#printjobsheader").html(MAN_PRINTJOBS[l]);
$("#updateprintqueue").html(MAN_UPDATE_PRINTJOBS[l]);
$("#clearprintqueue").html(MAN_CLEAR_PRINTJOBS[l]);
$("#reprintworkreceiptbtn").html(MAN_REPRINT[l]);
$("#tmimgdelbtntxt").html(MAN_TM_DEL[l]);
$("#tmimgbtntxt").html(MAN_TM[l]);
@ -895,6 +896,7 @@ function setLanguage(l) {
$("#lastclostxt").html(MAN_VERYLAST_CLOSING[l]);
$("#guestqrheadertxt").html(MAN_GUEST_QR_HEADER[l]);
$("#guestqrinfotxt").html(MAN_GUEST_QR_INFO[l]);
$("#printedworkreceiptsheader").html(MAN_PRINTED_WORKRECEIPTS[l]);
$("#reservationitemhint").html(MAN_RES_ITEM_HINT[l]);
}
@ -963,6 +965,18 @@ function showPanelsDueToUserStatus(jsonAnswer) {
}
}
function bindprinterqueueexpand() {
$("#printerqueue").off("collapsibleexpand").on("collapsibleexpand", function (e) {
e.stopImmediatePropagation();
e.preventDefault();
if (!printerqueueexpanded) {
printerqueueexpanded = true;
getSpooledPrintJobs();
}
});
}
function binddbactionuiexpand() {
$("#dbactionui").off("collapsibleexpand").on("collapsibleexpand", function (e) {
e.stopImmediatePropagation();
@ -1710,7 +1724,7 @@ function initRestoreFileUpload() {
} else {
alert("Import war erfolgreich.");
setTimeout(function(){
document.location.href = "index.html?v=1.6.3";
document.location.href = "index.html?v=1.6.4";
},250);
}
},
@ -1725,7 +1739,6 @@ function initRestoreFileUpload() {
$(document).ready(function() {
$.ajaxSetup({ cache: false });
$("#reprintworkreceipt").val("");
requestUnpaidTables();
var refreshId = setInterval(function() {
requestUnpaidTables();
@ -2194,38 +2207,38 @@ function binding() {
$("#backup_btn").off("click").on("click", function (e) {
e.stopImmediatePropagation();
e.preventDefault();
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=1.6.3";
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=1.6.4";
});
$("#backup_btnall").off("click").on("click", function (e) {
e.stopImmediatePropagation();
e.preventDefault();
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=1.6.3";
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=1.6.4";
});
$("#backup_btnalllogs").off("click").on("click", function (e) {
e.stopImmediatePropagation();
e.preventDefault();
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=1.6.3";
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=1.6.4";
});
$("#backup_btnftpall").off("click").on("click", function (e) {
e.stopImmediatePropagation();
e.preventDefault();
showProgressPopup();
doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=1.6.3",null,handleFtpResult,null);
doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=1.6.4",null,handleFtpResult,null);
});
$("#backup_debugdata").off("click").on("click", function (e) {
e.stopImmediatePropagation();
e.preventDefault();
window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=1.6.3",'_blank');
window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=1.6.4",'_blank');
});
$("#backupguests_btn").off("click").on("click", function (e) {
e.stopImmediatePropagation();
e.preventDefault();
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=1.6.3";
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=1.6.4";
});
$("#golive").off("click").on("click", function (e) {
@ -2291,14 +2304,6 @@ function binding() {
getSpooledPrintJobs();
});
$("#reprintworkreceiptbtn").off("click").on("click", function (e) {
e.stopImmediatePropagation();
e.preventDefault();
var data = {
workid: $("#reprintworkreceipt").val()
};
doAjax("GET","php/contenthandler.php?module=printqueue&command=reprintworkreceipt",data,handleReprint,null);
});
$("#clearprintqueue").off("click").on("click", function (e) {
e.stopImmediatePropagation();
e.preventDefault();
@ -2406,7 +2411,7 @@ function updateOneSingleFile() {
setTimeout(function(){
$("#sliderarea").hide();
var millis=getMillis();
document.location.href = "install.html?v=1.6.3&mode=onlyupdate&n=" + millis;
document.location.href = "install.html?v=1.6.4&mode=onlyupdate&n=" + millis;
},250);
}
}
@ -3613,6 +3618,37 @@ function handleGoLive(answer) {
}
}
function renderSingleWorkReceipt(job) {
var headertxt = job.workid + " - " + job.time + " - " + job.table;
var txt = '<h3>' + headertxt + '</h3><p />';
var prods = job.products;
var currency = $("#admin-page").data("currency");
prods.forEach(function(aProd) {
txt += toHtml(aProd.longname) + ' (' + aProd.price + currency + ')<br>';
var extras = aProd.extras;
if (extras.length > 0) {
extras.forEach(function(anExtra) {
txt += "&nbsp;&nbsp;&nbsp;+ " + toHtml(anExtra) + "<br>";
});
}
});
txt += '<button class="reprintworkreceiptbtn" type="submit" data-theme="f" data-icon="check" id="reprintworkreceiptbtn_' + job.workid + '">' + MAN_PRINTVERB[lang] + '</button>';
return txt;
}
function renderPrintedWorkReceipts(jobs) {
var txt = '';
for (var i=0;i<jobs.length;i++) {
var aJob = jobs[i];
txt += '<p />';
txt += '<div data-role="collapsible" data-collapsed="true" data-theme="e" data-content-theme="a" class="noprint" >';
txt += renderSingleWorkReceipt(aJob);
txt += '</div>';
}
return txt;
}
function createSpooledPrintJobButton(id,text) {
var txt = '<button type="submit" data-theme="d" class="spooledprintjob" data-icon="delete" id="' + id + '">' + text + '</button>';
return txt;
@ -3642,7 +3678,7 @@ function createSpooledRecPrintButtons(jobs) {
}
function createSpooledWorkPrintButtons(jobs) {
txt = '';
var txt = '';
for (var i=0;i<jobs.length;i++) {
var aJob = jobs[i];
//txt += createPrintJobButton('spooledJob_' + aJob.id,MAN_TABLE_TXT[lang] + ": " + aJob.tablename + (aJob.id + ": " + aJob.billdate + " - " + aJob.brutto.replace(".", decpoint)));
@ -3661,6 +3697,15 @@ function bindSpooledPrintJob() {
var id = this.id.split("_")[1];
doAjax("POST","php/contenthandler.php?module=printqueue&command=deleteSpooledPrintJob",{id:id},getSpooledPrintJobs,"Problem Printjob löschen");
});
$(".reprintworkreceiptbtn").off("click").on("click", function (e) {
e.stopImmediatePropagation();
e.preventDefault();
var data = {
workid: this.id.split("_")[1]
};
doAjax("GET","php/contenthandler.php?module=printqueue&command=reprintworkreceipt",data,handleReprint,null);
});
}
function insertPrintQueue(queue) {
@ -3693,6 +3738,11 @@ function insertPrintQueue(queue) {
li += '</ul>';
}
var printedWorkReceipts = queue.printedworkreceips;
var jobsList = renderPrintedWorkReceipts(printedWorkReceipts);
$("#printedworkreceiptsarea").html(jobsList);
$("#printedworkreceipts").trigger("create");
$("#printjobsarea").html(li);
$("#printjobsarea").trigger("create");
bindSpooledPrintJob();
@ -3727,7 +3777,7 @@ function continueInitialization() {
$("#userfile").val('');
if (adminIsLoggedIn || managerIsLoggedIn) {
getSpooledPrintJobs();
bindprinterqueueexpand();
getVersionInfoForUpdate();
@ -4526,12 +4576,12 @@ $(document).on("pageinit", "#admin-page", function () {
<h3><span id="printjobsheader">Druckerwarteschlangen</span></h3>
<p><div id=printjobsarea>Daten</div>
<div class="ui-grid-a" class="noprint">
<div class="ui-block-a"><input type="text" placeholder="Arbeitsbon-Id" id="reprintworkreceipt" style="background:white;" /></div>
<div class="ui-block-b"><button type="submit" data-theme="f" data-icon="check" id="reprintworkreceiptbtn">Re-Print</button></div>
</div><!-- /grid-a -->
<p /><div data-role="collapsible" data-collapsed="true" data-theme="e" data-content-theme="c" class="noprint" id="printedworkreceipts" >
<h3><span id="printedworkreceiptsheader">Gedruckte Arbeitsbons</span></h3>
<div id="printedworkreceiptsarea"></div>
</div>
<div class="ui-grid-a" class="noprint">
<div class="ui-grid-a noprint">
<div class="ui-block-a"><button type="submit" data-theme="f" data-icon="check" id="updateprintqueue">Refresh</button></div>
<div class="ui-block-b"><button type="submit" data-theme="d" data-icon="delete" id="clearprintqueue">Clear print jobs</button></div>
</div><!-- /grid-a -->
@ -4542,8 +4592,8 @@ $(document).on("pageinit", "#admin-page", function () {
<h3><span id="dbtxt">Datenbank</span></h3>
<div data-role="collapsible" data-collapsed="true" data-theme="f" data-content-theme="c" class="noprint" id="dbactionspeisenconfig">
<p><h3><span id="speisekarte">Speisekarte</span></h3></p>
<div class="ui-grid-a" class="noprint">
<p /><h3><span id="speisekarte">Speisekarte</span></h3>
<div class="ui-grid-a noprint">
<div class="ui-block-a"><button data-theme="e" data-icon="plus" id="readsamplemenu"><span id=samplemenutxt>Beispielkarte</span></button></div>
<div class="ui-block-b grid_right"><button type="submit" data-theme="f" class="applySpeisekarte" data-icon="check" id="readspeisekarte">Anwenden</button></div>
</div><!-- /grid-a -->

4
webapp/paydesk.html
View File

File diff suppressed because one or more lines are too long

42
webapp/php/admin.php
View File

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

17
webapp/php/bill.php
View File

@ -1257,6 +1257,7 @@ class Bill {
$this->t['host'][$l],
$this->t['Ref'][$l],
$this->t['State'][$l],
'Bestell-ID',
'Produkt',
'Produkt-ID',
'Barcode',
@ -1264,10 +1265,9 @@ class Bill {
$this->t['reason'][$l],
'Abrechnungsbenutzer',
'Abrechnungsbenutzer-ID',
$this->t['ClosId'][$l],
$this->t['ClosDate'][$l],
$this->t['ClosRemark'][$l],
'Tageserfassung'
$this->t['ClosId'][$l]
);
$lineLength = count($firstRow);
@ -1291,12 +1291,13 @@ class Bill {
(IF(B.host = '1','x','-')) as host,
IFNULL(B.ref,'') as reference,
B.status as status,
Q.id as queueid,
CONCAT($unit,productname) as productname,
productid,
IFNULL((SELECT barcode from %products% PR WHERE PR.id=productid),'') as barcode,
P.$payment_col as payment,
IFNULL(B.reason,'') as reason,
U.username,U.id as userid,closingid,C.closingdate as closingdate, IFNULL(C.remark,'') as remark,
U.username,U.id as userid,C.closingdate as closingdate, IFNULL(C.remark,'') as remark,
Q.clsid
from %billproducts% BP,%queue% Q,%bill% B,%payment% P,%user% U,%closing% C
WHERE BP.queueid=Q.id AND BP.billid=B.id AND B.closingid is not null AND B.paymentid=P.id
@ -1313,17 +1314,19 @@ class Bill {
'-' as host,
'' as reference,
'd' as status,
Q.id as queueid,
CONCAT($unit,productname) as productname,
productid,
IFNULL((SELECT barcode from %products% PR WHERE PR.id=productid),'') as barcode,
'' as payment,
'' as reason,
'' as username,'' as userid,
'' as closingid, '' as closingdate, '' as remark,
'' as closingdate, '' as remark,
Q.clsid
FROM %queue% Q
WHERE Q.toremove = '1'
AND ordertime >= ? AND ordertime <= ?
AND paidtime is null
UNION ALL
SELECT B.billdate as billdate,B.id as billid,B.billdate as ordertime,
DATE_FORMAT(B.billdate,'%w') as orderdayofweek,
@ -1334,10 +1337,11 @@ class Bill {
'' as host,
'' as reference,
status,
'' as queueid,
'Einlage' as productname,
'' as productid,
'' as barcode,
'Barzahlung' as payment, IFNULL(B.reason,'') as reason, U.username, U.id as userid,closingid,C.closingdate as closingdate,IFNULL(C.remark,'') as remark,
'Barzahlung' as payment, IFNULL(B.reason,'') as reason, U.username, U.id as userid,C.closingdate as closingdate,IFNULL(C.remark,'') as remark,
closingid
FROM %bill% B,%user% U,%closing% C WHERE B.status='c' AND B.closingid is not null AND B.userid=U.id AND B.closingid=C.id
AND B.billdate >= ? AND B.billdate <= ?
@ -1385,13 +1389,14 @@ class Bill {
$z['host'],
$z['reference'],
$cat,
$z['queueid'],
$z['productname'],
$z['productid'],
$z['barcode'],
$z['payment'],
$z['reason'],
$z['username'],$z['userid'],
$z['closingid'],$z['closingdate'],$z['remark'],$z['clsid']);
$z['closingdate'],$z['remark'],$z['clsid']);
$allcells[] = $line;
}

2
webapp/php/customers.php
View File

@ -878,7 +878,7 @@ class Customers {
$txt = "<head>";
$txt .= "<title>" . self::$CUS_OVERVIEW[$lang] . "</title>";
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.6.3">';
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.6.4">';
$txt .= "</head>";
return $txt;
}

2
webapp/php/debug.php
View File

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

9
webapp/php/printqueue.php
View File

@ -266,7 +266,14 @@ class PrintQueue {
$jobs[] = array("printer" => 9, "count" => count($result),"jobs" => $works);
echo json_encode(array("status" => "OK", "msg" => $jobs));
$sql = "SELECT %printjobs%.id as id,content FROM %printjobs% WHERE removed is not null";
$printedWorkReceips = CommonUtils::fetchSqlAll($pdo, $sql);
$printedWorkReceiptsInJson = array();
foreach ($printedWorkReceips as $printedWorkReceipt) {
$printedWorkReceiptsInJson[] = json_decode($printedWorkReceipt['content']);
}
echo json_encode(array("status" => "OK", "msg" => $jobs, "printedworkreceips" => $printedWorkReceiptsInJson));
}
function clearprintjobs($pdo) {

2
webapp/php/reservation.php
View File

@ -155,7 +155,7 @@ class Reservation {
$txt = "<html><head>";
$txt .= "<title>Reservierungsübersicht</title>";
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=1.6.3">';
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=1.6.4">';
$txt .= "</head>";
$txt .= "<body>";
$txt .= "<h1>Reservierungsübersicht für $day.$month.$year</h1><p>";

2
webapp/php/roomtables.php
View File

@ -598,7 +598,7 @@ class Roomtables {
$txt = "<html><head>";
$txt .= "<title>Tisch QR-Codes für die Gastbestellung</title>";
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=1.6.3">';
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=1.6.4">';
$txt .= "</head>";
$txt .= "<body>";
$txt .= "<h1>Tisch QR-Codes für die Gastbestellung</h1><p>";

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

@ -36,7 +36,7 @@ class OsQrcode {
readfile(__DIR__. '/../../img/oops.png');
return;
} else {
$text = $serverurl . "/nfclogin.php?a=" . $passhash . "_" . $userid . "v=1.6.3";
$text = $serverurl . "/nfclogin.php?a=" . $passhash . "_" . $userid . "v=1.6.4";
QRcode::png($text);
}
}

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

@ -1325,6 +1325,10 @@ class Version {
return array(true);
}
public static function upd_1603_1604($pdo, $prefix, $dbname) {
return array(true);
}
public static $updateOrder = array(
"1.3.0" => array("upd_1300_1301","1.3.1"),
"1.3.1" => array("upd_1301_1302","1.3.2"),
@ -1409,7 +1413,8 @@ class Version {
"1.5.33" => array("upd_1533_1600","1.6.0"),
"1.6.0" => array("upd_1600_1601","1.6.1"),
"1.6.1" => array("upd_1601_1602","1.6.2"),
"1.6.2" => array("upd_1602_1603","1.6.3")
"1.6.2" => array("upd_1602_1603","1.6.3"),
"1.6.3" => array("upd_1603_1604","1.6.4")
);
public static function runUpdateProcess($pdo,$prefix, $dbname, $untilVersion,$checkValidVersion) {

4
webapp/pickups.html
View File

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

4
webapp/preferences.html
View File

@ -5,7 +5,7 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.3">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.4">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,7 +13,7 @@
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="utilities.js?v=1.6.3"></script>
<script src="utilities.js?v=1.6.4"></script>
</head>

8
webapp/products.html
View File

@ -7,16 +7,16 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.3">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.4">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=1.6.3"></script>
<script src="elements/product.js?v=1.6.3"></script>
<script src="elements/extra.js?v=1.6.3"></script>
<script src="utilities.js?v=1.6.4"></script>
<script src="elements/product.js?v=1.6.4"></script>
<script src="elements/extra.js?v=1.6.4"></script>
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
</head>

4
webapp/productsdesktop.php
View File

@ -4,7 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.3">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.4">
<link rel="stylesheet" href="css/ospage.css" />
<link rel="stylesheet" href="css/tablepanel.css" />
@ -15,7 +15,7 @@
<script src="php/3rdparty/jquery-2.2.4.min.js"></script>
<script src="php/3rdparty/jqueryui1-12-0/jquery-ui.min.js"></script>
<script src="utilities.js?v=1.6.3"></script>
<script src="utilities.js?v=1.6.4"></script>
<script>

4
webapp/rating.html
View File

@ -7,14 +7,14 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.3">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.4">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=1.6.3"></script>
<script src="utilities.js?v=1.6.4"></script>
</head>
<body>

4
webapp/reports.html
View File

@ -7,14 +7,14 @@
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.3">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.4">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=1.6.3"></script>
<script src="utilities.js?v=1.6.4"></script>
<script src="elements/rating.js"></script>
</head>

8
webapp/reservation.html
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.3">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.4">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -13,9 +13,9 @@
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="elements/tablemap.js"></script>
<script src="elements/reservation.js?v=1.6.3"></script>
<script src="elements/reservation.js?v=1.6.4"></script>
<script src="utilities.js?v=1.6.3"></script>
<script src="utilities.js?v=1.6.4"></script>
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
@ -562,7 +562,7 @@ function bindCancelButtn() {
var year = date.getFullYear();
var dateStr = year + "-" + month + "-" + day;
setTimeout(function(){document.location.href = "reservation.html?v=1.6.3&date=" + dateStr;},500);
setTimeout(function(){document.location.href = "reservation.html?v=1.6.4&date=" + dateStr;},500);
});
}

8
webapp/sumuphandler.php
View File

@ -14,7 +14,7 @@
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=1.6.3"></script>
<script src="utilities.js?v=1.6.4"></script>
</head>
<body>
@ -30,7 +30,7 @@ var SUM_REASON = ["Grund","Reason","Razón"];
var SUM_CANCEL_ITEM = ["Stornierung","Cancellation","Revocación"];
var SUM_CANCELLATION_OK = ["Die Zahlung wurde in OrderSprinter storniert.","The payment was cancelled in OrderSprinter.","El pago se canceló en OrderSprinter."];
var nextpage = "paydesk.html?version=1.6.3";
var nextpage = "paydesk.html?version=1.6.4";
var lang;
@ -84,10 +84,10 @@ function setLanguage(language) {
if (nextPage == "p") {
$("#nextpagebtntxt").html(SUM_TO_PAYMENT[lang]);
nextpage = "paydesk.html?t=" + tableid + "&version=1.6.3";
nextpage = "paydesk.html?t=" + tableid + "&version=1.6.4";
} else {
$("#nextpagebtntxt").html(SUM_TO_ORDER[lang]);
nextpage = "waiter.html?version=1.6.3";
nextpage = "waiter.html?version=1.6.4";
}
var txt = "<table class='viewtable'>";

4
webapp/supplydesk.html
View File

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

4
webapp/tasks.html
View File

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

4
webapp/timetracking.html
View File

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

6
webapp/waiter.html
View File

File diff suppressed because one or more lines are too long

4
webapp/waiterdesktop.php
View File

@ -4,7 +4,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.3">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.4">
<link rel="stylesheet" href="css/ospage.css" />
<link rel="stylesheet" href="css/tablepanel.css" />
@ -16,7 +16,7 @@
<link rel="stylesheet" href="css/extraspanel.css" />
<link rel="stylesheet" href="css/actpanel.css" />
<link rel="stylesheet" href="css/paypanel.css" />
<link rel="stylesheet" href="css/numfield.css?v=1.6.3" />
<link rel="stylesheet" href="css/numfield.css?v=1.6.4" />
<link rel="stylesheet" href="php/3rdparty/jqueryui1-12-0/jquery-ui.min.css" />
<script src="php/3rdparty/jquery-2.2.4.min.js"></script>