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

OrderSprinter 1.5.33

This commit is contained in:
Geno 2020-11-19 23:12:59 +01:00
parent c3798751cd
commit be41226c0d
41 changed files with 324 additions and 118 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.32" /> <link rel="stylesheet" href="css/gueststyle.css?v=1.5.33" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.32" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.33" />
<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>
@ -113,7 +113,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.32&nbsp;&nbsp;</div> <div class="ui-block-b grid_right" id="versioninfo">1.5.33&nbsp;&nbsp;</div>
</div><!-- /grid-a --> </div><!-- /grid-a -->
</div> </div>
</div> </div>

4
gastsystem/install.php
View File

@ -114,10 +114,10 @@ if (isset($_POST['code'])) {
} else { } else {
echo "<html>"; echo "<html>";
echo "<head><title>Installation Gastsystem</title>"; echo "<head><title>Installation Gastsystem</title>";
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.32">'; echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.33">';
echo "</head>"; echo "</head>";
echo "<body><div class=surround>"; echo "<body><div class=surround>";
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.32</span><br><br>"; echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.33</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.32"); Database::setVersion($pdo,$prefix,"1.5.33");
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.32"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.33">
<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.32"></script> <script src="utilities.js?v=1.5.33"></script>
<script src="kitchenbar.js?v=1.5.32"></script> <script src="kitchenbar.js?v=1.5.33"></script>
<style> <style>
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook #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 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.32"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.33">
<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" />
@ -21,7 +21,7 @@
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" /> <link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script> <script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui-i18n.min.js"></script> <script src="php/3rdparty/jqueryui1-11-4/jquery-ui-i18n.min.js"></script>
<script src="utilities.js?v=1.5.32"></script> <script src="utilities.js?v=1.5.33"></script>
<script src="receiptutils.js"></script> <script src="receiptutils.js"></script>
<script> <script>

4
webapp/customers.html
View File

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

4
webapp/dash.php
View File

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

4
webapp/feedback.html
View File

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

6
webapp/help.php
View File

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

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.32"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.33">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.32"> <link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.33">
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -18,7 +18,7 @@
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" /> <link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
<script src="php/3rdparty/jquery-2.0.3.min.js"></script> <script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
<script src="utilities.js?v=1.5.32"></script> <script src="utilities.js?v=1.5.33"></script>
</head> </head>
<body> <body>
@ -231,7 +231,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.32"},500); setTimeout(function(){document.location.href = "install.html?v=1.5.33"},500);
} }
} }
@ -285,11 +285,11 @@ $(document).on("pageinit", "#index-page", function () {
<div data-role="content"> <div data-role="content">
<p><div id="toplogolocation" style="text-align: center;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=1.5.32&style=always" style="max-height:150px;"/></div> <p><div id="toplogolocation" style="text-align: center;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=1.5.33&style=always" style="max-height:150px;"/></div>
<div data-role="collapsible" data-content-theme="c" data-collapsed="false" data-theme="e" id="loginmask"> <div data-role="collapsible" data-content-theme="c" data-collapsed="false" data-theme="e" id="loginmask">
<H2>Anmelden</H2> <H2>Anmelden</H2>
<p><div id="middlelogolocation" style="text-align: left;padding-left: 80px;padding-right:80px;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=1.5.32&style=always" style="max-height:150px;"/></div> <p><div id="middlelogolocation" style="text-align: left;padding-left: 80px;padding-right:80px;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=1.5.33&style=always" style="max-height:150px;"/></div>
<form method="post"> <form method="post">
<table border=0> <table border=0>

2
webapp/install.html
View File

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

2
webapp/install/installer.php
View File

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

59
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.32"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.33">
<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.32"></script> <script src="utilities.js?v=1.5.33"></script>
<script src="elements/tablemap.js?v=1.5.32"></script> <script src="elements/tablemap.js?v=1.5.33"></script>
<script src="elements/roommap.js?v=1.5.32"></script> <script src="elements/roommap.js?v=1.5.33"></script>
<script src="elements/groundplan.js?v=1.5.32"></script> <script src="elements/groundplan.js?v=1.5.33"></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>
@ -459,6 +459,8 @@ var MAN_LOGOLOC = [["Unsichtbar","Invisible","No logo"],["Oben","Top","Arriba"],
var MAN_AUSTRIA_BIND = ["Anbindung","Binding","Coneción"]; var MAN_AUSTRIA_BIND = ["Anbindung","Binding","Coneción"];
var MAN_AUSTRIABIND_OPTIONS = ["-","cbird","QRK R2B", "QRK Receipt"]; var MAN_AUSTRIABIND_OPTIONS = ["-","cbird","QRK R2B", "QRK Receipt"];
var MAN_ARE_YOU_SURE_DEMO_DATA = ["Sind Sie sicher?","Are you sure?","Cuidado! Realmente quiere insertar demo data?"]; var MAN_ARE_YOU_SURE_DEMO_DATA = ["Sind Sie sicher?","Are you sure?","Cuidado! Realmente quiere insertar demo data?"];
var MAN_VERYFIRST_CLOSING = ["Allererste Tageserfassung","Very First closing","Primera cerrada"];
var MAN_VERYLAST_CLOSING = ["Letzte Tageserfassung","Last closing","Ultima cerrada"];
var MAN_DAYNAMES = [ var MAN_DAYNAMES = [
["Montag","Monday","Lunes"], ["Montag","Monday","Lunes"],
@ -499,7 +501,7 @@ var MAN_UPDATE_BTN_CLICK = ["Das Update startet und kann einige Minuten dauern.
var MAN_PLEASE_WAIT = ["Die Erstellung von Umsatzreports kann mehrere Minuten dauern. Bitte haben Sie nach dem Anklicken eines Umsatzexportbuttons etwas Geduld.","The creation of sales reports may take several minutes. Please be patient after clicking on a report button.","La creación de informes de ventas puede tardar varios minutos. Por favor, tenga paciencia después de hacer clic en un botón de ventas."]; var MAN_PLEASE_WAIT = ["Die Erstellung von Umsatzreports kann mehrere Minuten dauern. Bitte haben Sie nach dem Anklicken eines Umsatzexportbuttons etwas Geduld.","The creation of sales reports may take several minutes. Please be patient after clicking on a report button.","La creación de informes de ventas puede tardar varios minutos. Por favor, tenga paciencia después de hacer clic en un botón de ventas."];
var MAN_NO_VALUE = ["Kein Eintrag vorhanden","No entry available","No hay ningun data"]; var MAN_NO_VALUE = ["Kein Eintrag vorhanden","No entry available","No hay ningun data"];
var MAN_INVALID_CLOS_PERIOD = ["IDs der ersten oder letzten Tageserfassung nicht festgelegt","ID of the first or last closing not set","ID de la primera o última cerrada no fijado"]; var MAN_INVALID_CLOS_PERIOD = ["IDs der ersten oder letzten Tageserfassung nicht festgelegt","ID of the first or last closing not set","ID de la primera o última cerrada no fijado"];
var MAN_PDFREPORTS = ["PDF-Berichte","PDF Reports","PDF Reports"]; var MAN_PDFREPORTS = ["PDF/CSV-Berichte","PDF/CSV Reports","PDF/CSV Reports"];
var MAN_CONFIGREPORTS = ["Export der Kassenprogrammierung","Export of POS programming","Export Historia"]; var MAN_CONFIGREPORTS = ["Export der Kassenprogrammierung","Export of POS programming","Export Historia"];
var MAN_RUN_DATA = ["Andere Verlaufsdaten","Other runtime data","Otra data"]; var MAN_RUN_DATA = ["Andere Verlaufsdaten","Other runtime data","Otra data"];
var MAN_START_END_HINT = ["Start- und Enddatum dienen zur zeitlichen Eingrenzung der csv/Excel-Umsatzexports und Zeiterfassungsberichte und auch zur Vorauswahl der Tageserfassungen für die PDF-Berichte.","The start and end dates are used for limitation of the csv/Excel sales reports and the work time reports, as well as for preselection of the closings for the pdf reports.","La mes y año sirven para limitar unos exportes y para prellenar la seleccion de cerradas para los PDF exports."]; var MAN_START_END_HINT = ["Start- und Enddatum dienen zur zeitlichen Eingrenzung der csv/Excel-Umsatzexports und Zeiterfassungsberichte und auch zur Vorauswahl der Tageserfassungen für die PDF-Berichte.","The start and end dates are used for limitation of the csv/Excel sales reports and the work time reports, as well as for preselection of the closings for the pdf reports.","La mes y año sirven para limitar unos exportes y para prellenar la seleccion de cerradas para los PDF exports."];
@ -874,6 +876,9 @@ function setLanguage(l) {
$("#pdfreporthint").html(MAN_PDF_REPORT_HINT[l]); $("#pdfreporthint").html(MAN_PDF_REPORT_HINT[l]);
$("#importturbohint").html(MAN_TURBO_HINT[l]); $("#importturbohint").html(MAN_TURBO_HINT[l]);
$("#firstclostxt").html(MAN_VERYFIRST_CLOSING[l]);
$("#lastclostxt").html(MAN_VERYLAST_CLOSING[l]);
} }
function toggleinlinedisplayelem(iconid) { function toggleinlinedisplayelem(iconid) {
@ -908,6 +913,16 @@ function createMonthSelection(label) {
return monthHtml; return monthHtml;
} }
function checkForFirstAndLastClosing() {
doAjax("GET","php/contenthandler.php?module=closing&command=getFirstAndLastClosing",null,insertFirstAndLastClosingInfo,null,true);
}
function insertFirstAndLastClosingInfo(answer) {
if (answer.status == "OK") {
$("#veryfirstclosing").html(answer.firstclosing);
$("#verylastclosing").html(answer.lastclosing);
}
}
function showPanelsDueToUserStatus(jsonAnswer) { function showPanelsDueToUserStatus(jsonAnswer) {
if (jsonAnswer == "admin") { if (jsonAnswer == "admin") {
$("#dbactionui").show(); $("#dbactionui").show();
@ -1673,7 +1688,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.32"; document.location.href = "index.html?v=1.5.33";
},250); },250);
} }
}, },
@ -1996,6 +2011,8 @@ function bindingExports() {
window.location.href = "php/contenthandler.php?module=bill&command=exportAllExcel&" + dateparams; window.location.href = "php/contenthandler.php?module=bill&command=exportAllExcel&" + dateparams;
} else if (theId == "createpdfexport") { } else if (theId == "createpdfexport") {
window.open("php/contenthandler.php?module=bill&command=exportPdfReportClosPeriod&" + closperiod,'_blank'); window.open("php/contenthandler.php?module=bill&command=exportPdfReportClosPeriod&" + closperiod,'_blank');
} else if (theId == "createcsvsummary") {
window.open("php/contenthandler.php?module=bill&command=exportCsvSummaryClosPeriod&" + closperiod,'_blank');
} else if (theId == "createpdfsummary") { } else if (theId == "createpdfsummary") {
window.open("php/contenthandler.php?module=bill&command=exportPdfSummaryClosPeriod&" + closperiod,'_blank'); window.open("php/contenthandler.php?module=bill&command=exportPdfSummaryClosPeriod&" + closperiod,'_blank');
} else if (theId == "createlogexport") { } else if (theId == "createlogexport") {
@ -2155,38 +2172,38 @@ function binding() {
$("#backup_btn").off("click").on("click", function (e) { $("#backup_btn").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=1.5.32"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=1.5.33";
}); });
$("#backup_btnall").off("click").on("click", function (e) { $("#backup_btnall").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=1.5.32"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=1.5.33";
}); });
$("#backup_btnalllogs").off("click").on("click", function (e) { $("#backup_btnalllogs").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=1.5.32"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=1.5.33";
}); });
$("#backup_btnftpall").off("click").on("click", function (e) { $("#backup_btnftpall").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
showProgressPopup(); showProgressPopup();
doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=1.5.32",null,handleFtpResult,null); doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=1.5.33",null,handleFtpResult,null);
}); });
$("#backup_debugdata").off("click").on("click", function (e) { $("#backup_debugdata").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=1.5.32",'_blank'); window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=1.5.33",'_blank');
}); });
$("#backupguests_btn").off("click").on("click", function (e) { $("#backupguests_btn").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=1.5.32"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=1.5.33";
}); });
$("#golive").off("click").on("click", function (e) { $("#golive").off("click").on("click", function (e) {
@ -2367,7 +2384,7 @@ function updateOneSingleFile() {
setTimeout(function(){ setTimeout(function(){
$("#sliderarea").hide(); $("#sliderarea").hide();
var millis=getMillis(); var millis=getMillis();
document.location.href = "install.html?v=1.5.32&mode=onlyupdate&n=" + millis; document.location.href = "install.html?v=1.5.33&mode=onlyupdate&n=" + millis;
},250); },250);
} }
} }
@ -2737,7 +2754,8 @@ function createClosing(closingresult) {
var msg = closingresult.msg; var msg = closingresult.msg;
var closingid = msg.closingid; var closingid = msg.closingid;
var doPrint = closingresult.print; var doPrint = closingresult.print;
alert("Summe des Tagesabschlusses (" + $("#admin-page").data("currency") + "): " + (msg.result.toString()).replace(".", decpoint)); alert("Summe des Tagesabschlusses (" + $("#admin-page").data("currency") + "): " + (msg.result.toString()).replace(".", decpoint));
checkForFirstAndLastClosing();
if (doPrint == 1) { if (doPrint == 1) {
if (generalVals[1] == 2) { if (generalVals[1] == 2) {
@ -3661,6 +3679,8 @@ function insertPrintQueue(queue) {
function continueInitialization() { function continueInitialization() {
doAjax("GET","php/contenthandler.php?module=admin&command=isLoggedinUserAdminOrManagerOrTE",null,showPanelsDueToUserStatus,"Fehler"); doAjax("GET","php/contenthandler.php?module=admin&command=isLoggedinUserAdminOrManagerOrTE",null,showPanelsDueToUserStatus,"Fehler");
checkForFirstAndLastClosing();
askAndFillUserList(); askAndFillUserList();
hideMenu(); hideMenu();
@ -3765,11 +3785,11 @@ $(document).on("pageinit", "#admin-page", function () {
<div id="dataexport" data-role="collapsible" data-content-theme="c" style="display:none;"> <div id="dataexport" data-role="collapsible" data-content-theme="c" style="display:none;">
<h3><span id="dataexporttxt">Datenexport</span></h3> <h3><span id="dataexporttxt">Datenexport</span></h3>
<p><span id="dataexportdettxt">Hier können Sie eine csv-Datei erzeugen lassen, die ... <p><span id="dataexportdettxt">Hier können Sie eine csv-Datei erzeugen lassen, die ...</span>
</span> <p><span id="firstclostxt">Erste TE</span>: <span id="veryfirstclosing"></span>
</p> <p><span id="lastclostxt">Letzte TE</span>: <span id="verylastclosing"></span>
<b>Startdatum Umsätze:</b> <p><b>Startdatum Umsätze:</b>
<div class="ui-field-contain" id="datexportstartmonthpart"></div> <div class="ui-field-contain" id="datexportstartmonthpart"></div>
<div id=yearselectionexportstart> <div id=yearselectionexportstart>
@ -3809,6 +3829,7 @@ $(document).on("pageinit", "#admin-page", function () {
<button type="submit" data-theme="f" class="cancelButton exportbtn" data-icon="check" id="createpdfexport">PDF-Umsatzbericht</button> <button type="submit" data-theme="f" class="cancelButton exportbtn" data-icon="check" id="createpdfexport">PDF-Umsatzbericht</button>
<button type="submit" data-theme="f" class="cancelButton exportbtn" data-icon="check" id="createpdfsummary">PDF-Zusammenfassung</button> <button type="submit" data-theme="f" class="cancelButton exportbtn" data-icon="check" id="createpdfsummary">PDF-Zusammenfassung</button>
<button type="submit" data-theme="f" class="cancelButton exportbtn" data-icon="check" id="createcsvsummary">Tageserfassungen als CSV</button>
<i id="pdfexporthinthint" style="padding-left: 50px;padding-right: 50px;">Bitte warten nach Klick</i> <i id="pdfexporthinthint" style="padding-left: 50px;padding-right: 50px;">Bitte warten nach Klick</i>
<hr /> <hr />
<div id="exportconfigreportsdivheader" class="headertext">Export Programmierung</div> <div id="exportconfigreportsdivheader" class="headertext">Export Programmierung</div>

4
webapp/paydesk.html
View File

File diff suppressed because one or more lines are too long

42
webapp/php/admin.php
View File

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

14
webapp/php/bill.php
View File

@ -45,7 +45,7 @@ class Bill {
function handleCommand($command) { function handleCommand($command) {
$cmdsThatNeedAdminOrManagerRights = array('exportCsv','exportAllCsv','exportAllExcel','exportXlsx','exportPdfReport','exportPdfReportClosPeriod', $cmdsThatNeedAdminOrManagerRights = array('exportCsv','exportAllCsv','exportAllExcel','exportXlsx','exportPdfReport','exportPdfReportClosPeriod',
'exportPdfSummary','exportPdfSummaryClosPeriod'); 'exportPdfSummary','exportPdfSummaryClosPeriod','exportPdfSummaryClosPeriod');
if (in_array($command, $cmdsThatNeedAdminOrManagerRights)) { if (in_array($command, $cmdsThatNeedAdminOrManagerRights)) {
if (!$this->hasCurrentUserAdminOrManagerRights()) { if (!$this->hasCurrentUserAdminOrManagerRights()) {
echo json_encode(array("status" => "ERROR", "code" => ERROR_BILL_NOT_AUTHOTRIZED, "msg" => ERROR_BILL_NOT_AUTHOTRIZED_MSG)); echo json_encode(array("status" => "ERROR", "code" => ERROR_BILL_NOT_AUTHOTRIZED, "msg" => ERROR_BILL_NOT_AUTHOTRIZED_MSG));
@ -86,6 +86,10 @@ class Bill {
$this->exportPdfSummaryClosPeriod($_GET['closidstart'],$_GET['closidend']); $this->exportPdfSummaryClosPeriod($_GET['closidstart'],$_GET['closidend']);
return; return;
} }
if ($command == 'exportCsvSummaryClosPeriod') {
$this->exportCsvSummaryClosPeriod($_GET['closidstart'],$_GET['closidend']);
return;
}
if ($command == 'autoBackupPdfSummary') { if ($command == 'autoBackupPdfSummary') {
$this->autoBackupPdfSummary($_POST['remoteaccesscode']); $this->autoBackupPdfSummary($_POST['remoteaccesscode']);
return; return;
@ -1183,6 +1187,14 @@ class Bill {
} }
$pdfExport->exportPdfSummaryClosPeriod($lang,$closidstart,$closidend); $pdfExport->exportPdfSummaryClosPeriod($lang,$closidstart,$closidend);
} }
private function exportCsvSummaryClosPeriod($closidstart,$closidend) {
$pdfExport = new PdfExport();
$lang = 0;
if(isset($_GET["lang"])) {
$lang = $_GET['lang'];
}
$pdfExport->exportCsvSummaryClosPeriod($lang,$closidstart,$closidend);
}
private function exportAllCsvOrExcel($startMonth,$startYear,$endMonth,$endYear,$exportFormat) { private function exportAllCsvOrExcel($startMonth,$startYear,$endMonth,$endYear,$exportFormat) {
set_time_limit(60*5); set_time_limit(60*5);

21
webapp/php/closing.php
View File

@ -23,7 +23,7 @@ if ($command != 'exportCsv') {
echo json_encode(array("status" => "ERROR", "code" => ERROR_MANAGER_NOT_AUTHOTRIZED, "msg" => ERROR_MANAGER_NOT_AUTHOTRIZED_MSG)); echo json_encode(array("status" => "ERROR", "code" => ERROR_MANAGER_NOT_AUTHOTRIZED, "msg" => ERROR_MANAGER_NOT_AUTHOTRIZED_MSG));
} else { } else {
// exception - result is not handled on HTML/JS side // exception - result is not handled on HTML/JS side
echo "Fehlende Benutzerrechte"; echo json_encode(array("status" => "ERROR","msg" => "Fehlende Benutzerrechte"));
} }
return; return;
} }
@ -58,6 +58,8 @@ $this->getClosingSummary($_GET['closingid'],null,true);
$this->htmlreport($_GET["closid"]); $this->htmlreport($_GET["closid"]);
} else if ($command == 'getClosingsListOfMonthYear') { } else if ($command == 'getClosingsListOfMonthYear') {
$this->getClosingsListOfMonthYear($_GET["month"],$_GET["year"]); $this->getClosingsListOfMonthYear($_GET["month"],$_GET["year"]);
} else if ($command == 'getFirstAndLastClosing') {
self::getFirstAndLastClosing();
} else { } else {
echo "Command not supported."; echo "Command not supported.";
} }
@ -387,6 +389,23 @@ $stmt->execute(array($closingid));
return ($stmt->fetchAll(PDO::FETCH_OBJ)); return ($stmt->fetchAll(PDO::FETCH_OBJ));
} }
private static function getFirstAndLastClosing() {
$pdo = DbUtils::openDbAndReturnPdoStatic();
$sql = "select id,closingdate from %closing% ORDER BY closingdate LIMIT 1";
$firstClosing = CommonUtils::fetchSqlAll($pdo, $sql);
$sql = "select id,closingdate from %closing% ORDER BY closingdate DESC LIMIT 1";
$lastClosing = CommonUtils::fetchSqlAll($pdo, $sql);
echo json_encode(array("status" => "OK", "firstclosing" => self::closingSqlDateToText($firstClosing),"lastclosing" => self::closingSqlDateToText($lastClosing)));
}
private static function closingSqlDateToText($closdate) {
if (count($closdate) > 0) {
return $closdate[0]["closingdate"];
} else {
return "";
}
}
private function getClosingsListOfMonthYear($month,$year) { private function getClosingsListOfMonthYear($month,$year) {
$pdo = DbUtils::openDbAndReturnPdoStatic(); $pdo = DbUtils::openDbAndReturnPdoStatic();
date_default_timezone_set(DbUtils::getTimeZone()); date_default_timezone_set(DbUtils::getTimeZone());

2
webapp/php/commonutils.php
View File

@ -380,7 +380,7 @@ class CommonUtils {
public static function log($pdo, $component, $message) { public static function log($pdo, $component, $message) {
$dblog = self::getConfigValue($pdo, "dblog", 1); $dblog = self::getConfigValue($pdo, "dblog", 1);
if ($dblog == 1) { if ($dblog == 1) {
date_default_timezone_set(DbUtils::getTimeZone()); date_default_timezone_set(DbUtils::getTimeZoneDb($pdo));
$currentTime = date('Y-m-d H:i:s'); $currentTime = date('Y-m-d H:i:s');
$sql = "INSERT INTO %log% (date,component,message) VALUES(?,?,?)"; $sql = "INSERT INTO %log% (date,component,message) VALUES(?,?,?)";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql)); $stmt = $pdo->prepare(DbUtils::substTableAlias($sql));

2
webapp/php/customers.php
View File

@ -878,7 +878,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.32">'; $txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.33">';
$txt .= "</head>"; $txt .= "</head>";
return $txt; return $txt;
} }

11
webapp/php/dbutils.php
View File

@ -156,6 +156,17 @@ class DbUtils {
} }
} }
public static function getTimeZoneDb($pdo) {
if (is_null($pdo)) {
return "Europe/Berlin";
}
try {
return CommonUtils::getConfigValue($pdo, 'timezone', "Europe/Berlin");
} catch (Exception $ex) {
return "Europe/Berlin";
}
}
public static $userCols = array( public static $userCols = array(
array("col" => 'id', "hist" => 1, "new" => null, "update" => null), array("col" => 'id', "hist" => 1, "new" => null, "update" => null),
array("col" => 'username', "hist" => 1, "new" => 'username', "update" => null), array("col" => 'username', "hist" => 1, "new" => 'username', "update" => null),

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.32"; $version = "1.5.33";
$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 {

4
webapp/php/printqueue.php
View File

@ -136,7 +136,7 @@ class PrintQueue {
} }
private function saveLastPrintServerAccess($pdo) { private function saveLastPrintServerAccess($pdo) {
date_default_timezone_set(DbUtils::getTimeZone()); date_default_timezone_set(DbUtils::getTimeZoneDb($pdo));
$date = new DateTime(); $date = new DateTime();
$unixTimeStamp = $date->getTimestamp(); $unixTimeStamp = $date->getTimestamp();
$sql = "SELECT count(id) as countid FROM %work% WHERE item=?"; $sql = "SELECT count(id) as countid FROM %work% WHERE item=?";
@ -681,7 +681,7 @@ class PrintQueue {
function getLastLog ($md5pass) { function getLastLog ($md5pass) {
$pdo = DbUtils::openDbAndReturnPdoStatic(); $pdo = DbUtils::openDbAndReturnPdoStatic();
$isCorrect = $this->isPasswordCorrect($pdo,$md5pass,false); $isCorrect = $this->isPasswordCorrect($pdo,$md5pass,false);
if ($isCorrect || true) { if ($isCorrect) {
echo json_encode(CommonUtils::getLastLog($pdo)); echo json_encode(CommonUtils::getLastLog($pdo));
} else { } else {
echo json_encode("Log file from server unavaible due to wrong printcode"); echo json_encode("Log file from server unavaible due to wrong printcode");

65
webapp/php/reservation.php
View File

@ -22,6 +22,8 @@ class Reservation {
$this->delReservation($_POST['id']); $this->delReservation($_POST['id']);
} else if ($command == 'emailConfirmReservation') { } else if ($command == 'emailConfirmReservation') {
$this->emailConfirmReservation($_POST['to'],$_POST['msg']); $this->emailConfirmReservation($_POST['to'],$_POST['msg']);
} else if ($command == 'reservationsAsHtml') {
$this->reservationsAsHtml($_GET['day'],$_GET['month'],$_GET['year']);
} }
else { else {
echo "Kommando nicht unterstuetzt."; echo "Kommando nicht unterstuetzt.";
@ -119,16 +121,69 @@ class Reservation {
} }
} }
private function getReservations($day,$month,$year) { private static function getNoOfActiveRooms($pdo) {
$sql = "SELECT COUNT(id) as countid FROM %room% WHERE removed is null";
$result = CommonUtils::fetchSqlAll($pdo, $sql, null);
if (count($result) > 0) {
return $result[0]["countid"];
}
return 0;
}
private function reservationsAsHtml($day,$month,$year) {
$pdo = DbUtils::openDbAndReturnPdoStatic(); $pdo = DbUtils::openDbAndReturnPdoStatic();
$sql = self::getSqlForResByTime();
$timeSortedReservations = $this->getReservationsCore($pdo,$day,$month,$year,$sql . " ORDER BY starttime,roomsorting,tablesorting");
$numberOfActiveRooms = self::getNoOfActiveRooms($pdo);
// REM* the many sortings in the sql allow the sorting by time, room-sort and table-sort header( "Expires: Mon, 20 Dec 1998 01:00:00 GMT" );
header( "Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT" );
header( "Cache-Control: no-cache, must-revalidate" );
header( "Pragma: no-cache" );
header( "Content-Type: text/html; charset=utf8" );
$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.5.33">';
$txt .= "</head>";
$txt .= "<body>";
$txt .= "<h1>Reservierungsübersicht für $day.$month.$year</h1><p>";
$txt .= "<table class='gridtable'>";
$txt .= "<tr><th>Startuhrzeit<th>Dauer (Std.)<th>Gast<th>Personen<th>Platz<th>Zusatzinfo</tr>";
foreach ($timeSortedReservations as $row) {
$txt .= "<tr>";
$txt .= "<td>" . $row['start'] . ":00";
$txt .= "<td>" . $row['duration'];
$txt .= "<td>" . htmlspecialchars($row['guest']);
$txt .= "<td>" . htmlspecialchars($row['persons']);
if ($numberOfActiveRooms > 1) {
$txt .= "<td>" . htmlspecialchars($row['roomname']) . "/" . htmlspecialchars($row['tablename']);
} else {
$txt .= "<td>" . htmlspecialchars($row['tablename']);
}
$txt .= "<td>" . htmlspecialchars($row['remark']);
$txt .= "</tr>";
}
$txt .= "</table></body></html>";
echo $txt;
}
private static function getSqlForResByTime() {
// REM* roomname and tablename only for the html output
$sql = "SELECT R.id,U.username as username,creationdate,scheduledate,starttime,name,email,persons,duration,phone,remark,tableid, "; $sql = "SELECT R.id,U.username as username,creationdate,scheduledate,starttime,name,email,persons,duration,phone,remark,tableid, ";
$sql .= "IF(tableid is null,'-1',(SELECT RO.id as roomid FROM %room% RO,%resttables% T WHERE T.id=tableid AND T.roomid=RO.id)) as roomid, "; $sql .= "IF(tableid is null,'-1',(SELECT RO.id as roomid FROM %room% RO,%resttables% T WHERE T.id=tableid AND T.roomid=RO.id)) as roomid, ";
$sql .= "IF(tableid is null,'-1',(SELECT RO.sorting as roomsorting FROM %room% RO,%resttables% T WHERE T.id=tableid AND T.roomid=RO.id)) as roomsorting, "; $sql .= "IF(tableid is null,'-1',(SELECT RO.sorting as roomsorting FROM %room% RO,%resttables% T WHERE T.id=tableid AND T.roomid=RO.id)) as roomsorting, ";
$sql .= "IF(tableid is null,'-1',(SELECT T.sorting as tablesorting FROM %room% RO,%resttables% T WHERE T.id=tableid AND T.roomid=RO.id)) as tablesorting "; $sql .= "IF(tableid is null,'',(SELECT RO.roomname as roomname FROM %room% RO,%resttables% T WHERE T.id=tableid AND T.roomid=RO.id)) as roomname, ";
$sql .= "IF(tableid is null,'-1',(SELECT T.sorting as tablesorting FROM %room% RO,%resttables% T WHERE T.id=tableid AND T.roomid=RO.id)) as tablesorting, ";
$sql .= "IF(tableid is null,'',(SELECT T.tableno as tablename FROM %room% RO,%resttables% T WHERE T.id=tableid AND T.roomid=RO.id)) as tablename ";
$sql .= "FROM %reservations% R,%user% U "; $sql .= "FROM %reservations% R,%user% U ";
$sql .= "WHERE DATE(scheduledate)=? AND R.creator=U.id "; $sql .= "WHERE DATE(scheduledate)=? AND R.creator=U.id ";
return $sql;
}
private function getReservations($day,$month,$year) {
$pdo = DbUtils::openDbAndReturnPdoStatic();
// REM* the many sortings in the sql allow the sorting by time, room-sort and table-sort
$sql = self::getSqlForResByTime();
$timeSortedReservations = $this->getReservationsCore($pdo,$day,$month,$year,$sql . " ORDER BY starttime,roomsorting,tablesorting"); $timeSortedReservations = $this->getReservationsCore($pdo,$day,$month,$year,$sql . " ORDER BY starttime,roomsorting,tablesorting");
// REM* and now by table // REM* and now by table
@ -202,7 +257,9 @@ class Reservation {
"phone" => $row['phone'], "phone" => $row['phone'],
"remark" => $row['remark'], "remark" => $row['remark'],
"roomid" => $row['roomid'], "roomid" => $row['roomid'],
"tableid" => $row['tableid'] "tableid" => $row['tableid'],
"roomname" => $row['roomname'],
"tablename" => $row['tablename']
); );
} }
return $resArray; return $resArray;

63
webapp/php/utilities/pdfexport.php
View File

@ -689,6 +689,69 @@ class PdfExport extends FPDF {
$this->exportPdfSummaryCore($pdo, $lang, 0, 0, 0, 0, $closidstart,$closidend); $this->exportPdfSummaryCore($pdo, $lang, 0, 0, 0, 0, $closidstart,$closidend);
} }
public function exportCsvSummaryClosPeriod($lang,$closidstart,$closidend) {
$pdo = DbUtils::openDbAndReturnPdoStatic();
$this->exportCsvSummaryCore($pdo, $lang, 0, 0, 0, 0, $closidstart,$closidend);
}
private function exportCsvSummaryCore($pdo, $lang, $startMonth, $startYear, $endMonth, $endYear, $closidstart = null, $closidend = null) {
header("Expires: Mon, 20 Dec 1998 01:00:00 GMT");
header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
header("Cache-Control: no-cache, must-revalidate");
header("Pragma: no-cache");
header("Content-Disposition: attachment; filename='Tageserfassungen.csv'");
header("Content-Type: text/csv; charset=utf8");
$decpoint = CommonUtils::getConfigValue($pdo, 'decpoint', '.');
$currency = CommonUtils::getConfigValue($pdo, 'currency', 'Eur');
$curTxt = "(" . $currency . ")";
$txt = "Tageserfassungs-ID;Datum;Steuersatz;Typ;Netto $curTxt;Steuer $curTxt;Brutto $curTxt\r\n";
if (is_null($closidstart) || is_null($closidend)) {
$txt .= "Erste und/oder letzte ID der Tageserassungen wurden nicht angegeben!";
} else {
$sql = "SELECT DISTINCT %closing%.id as id, DATE(closingdate) as datewotime,TIME(closingdate) as thetime FROM %closing% WHERE id >= ? AND id <= ? ";
$allClosings = CommonUtils::fetchSqlAll($pdo, $sql, array($closidstart, $closidend));
foreach ($allClosings as $aClosing) {
$closingid = $aClosing["id"];
$date = $this->osDateToGerman($aClosing["datewotime"]) . " " . $aClosing["thetime"];
$sql = "SELECT %queue%.tax,SUM(price) as brutto,ROUND(SUM(price)/(1 + %queue%.tax/100.0),2) as netto FROM %queue%,%bill% WHERE billid=%bill%.id AND %bill%.closingid=? GROUP BY %queue%.tax";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
$stmt->execute(array($closingid));
$closingDetails = $stmt->fetchAll(PDO::FETCH_OBJ);
foreach ($closingDetails as $aClosingDetail) {
$tax = str_replace(".", $decpoint, $aClosingDetail->tax);
$brutto = str_replace(".", $decpoint, $aClosingDetail->brutto);
$netto = str_replace(".", $decpoint, $aClosingDetail->netto);
$sumtax = number_format($aClosingDetail->brutto - $aClosingDetail->netto, 2, $decpoint, '');
$sumtax = str_replace(".", $decpoint, $sumtax);
$txt .= "$closingid;$date;$tax;Umsatz;$netto;$sumtax;$brutto\r\n";
}
$sql = "SELECT SUM(brutto) as cashsum FROM %bill% WHERE closingid=? AND status=?";
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
$stmt->execute(array($closingid, 'c'));
$row = $stmt->fetchObject();
$cashsum = $row->cashsum;
if (!is_null($cashsum) || (abs($cashsum) > 0.01)) {
$cash = str_replace(".", $decpoint, $cashsum);
$txt .= "$closingid;$date;0" . $decpoint . "00;Kassenein-/auslage;$cash;0" . $decpoint . "0;$cash\r\n";
}
}
}
echo $txt;
}
public function exportPdfSummaryCore($pdo,$lang,$startMonth,$startYear,$endMonth,$endYear,$closidstart = null,$closidend = null) { public function exportPdfSummaryCore($pdo,$lang,$startMonth,$startYear,$endMonth,$endYear,$closidstart = null,$closidend = null) {
$this->decpoint = self::getConfigItem($pdo,"decpoint"); $this->decpoint = self::getConfigItem($pdo,"decpoint");

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

@ -1283,6 +1283,10 @@ class Version {
return array(true); return array(true);
} }
public static function upd_1532_1533($pdo, $prefix, $dbname) {
return array(true);
}
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"),
@ -1362,7 +1366,8 @@ class Version {
"1.5.28" => array("upd_1528_1529","1.5.29"), "1.5.28" => array("upd_1528_1529","1.5.29"),
"1.5.29" => array("upd_1529_1530","1.5.30"), "1.5.29" => array("upd_1529_1530","1.5.30"),
"1.5.30" => array("upd_1530_1531","1.5.31"), "1.5.30" => array("upd_1530_1531","1.5.31"),
"1.5.31" => array("upd_1531_1532","1.5.32") "1.5.31" => array("upd_1531_1532","1.5.32"),
"1.5.32" => array("upd_1532_1533","1.5.33")
); );
public static function runUpdateProcess($pdo,$prefix, $dbname, $untilVersion,$checkValidVersion) { public static function runUpdateProcess($pdo,$prefix, $dbname, $untilVersion,$checkValidVersion) {

4
webapp/pickups.html
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.33">
<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.32"></script> <script src="utilities.js?v=1.5.33"></script>
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" /> <link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script> <script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>

4
webapp/preferences.html
View File

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

8
webapp/products.html
View File

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

4
webapp/productsdesktop.php
View File

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

4
webapp/rating.html
View File

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

4
webapp/reports.html
View File

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

26
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.32"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.33">
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" /> <link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@ -14,7 +14,7 @@
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script> <script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
<script src="elements/tablemap.js"></script> <script src="elements/tablemap.js"></script>
<script src="utilities.js?v=1.5.32"></script> <script src="utilities.js?v=1.5.33"></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>
@ -87,6 +87,7 @@ var RES_ROOM = ["Raum","Room","Habitación"];
var RES_TABLE = ["Tisch","Table","Mesa"]; var RES_TABLE = ["Tisch","Table","Mesa"];
var RES_BY_TIMES = ["Reservierungen nach Uhrzeit","Reservations sorted by times","Reservaciones ordenado por tiempos"]; var RES_BY_TIMES = ["Reservierungen nach Uhrzeit","Reservations sorted by times","Reservaciones ordenado por tiempos"];
var RES_BY_TABLES = ["Reservierungen nach Tisch","Reservations sorted by table","Reservaciones ordenado por mesa"]; var RES_BY_TABLES = ["Reservierungen nach Tisch","Reservations sorted by table","Reservaciones ordenado por mesa"];
var RES_HTMLREPORT = ["Übersicht","Overview","Lista en html"];
var lang = (-1); var lang = (-1);
var reservationnote = ""; var reservationnote = "";
@ -448,11 +449,18 @@ function createTableOfReservationsByTime(res) {
} }
$("#dayschedule").html(html); $("#dayschedule").html(html);
$("#dayschedule").trigger("create"); if (hasTotalRes) {
var htmlReportBtn = '<p><button id="htmlreportbtn" data-theme="f">' + RES_HTMLREPORT[lang] + '</button>';
$("#reshtmlarea").html(htmlReportBtn);
} else {
$("#reshtmlarea").html("");
}
$("#resbytimes").trigger("create");
bindHourButton(); bindHourButton();
bindCustomerField(); bindCustomerField();
bindChangeButton(); bindChangeButton();
bindHtmlReportButton();
} }
function createTableOfReservationsByTables(res) { function createTableOfReservationsByTables(res) {
@ -623,7 +631,7 @@ function bindCancelButtn() {
var year = date.getFullYear(); var year = date.getFullYear();
var dateStr = year + "-" + month + "-" + day; var dateStr = year + "-" + month + "-" + day;
setTimeout(function(){document.location.href = "reservation.html?v=1.5.32&date=" + dateStr;},500); setTimeout(function(){document.location.href = "reservation.html?v=1.5.33&date=" + dateStr;},500);
}); });
} }
@ -674,6 +682,15 @@ function bindChangeButton() {
openEditPageForRes(res); openEditPageForRes(res);
}); });
} }
function bindHtmlReportButton() {
$("#htmlreportbtn").off("click").on("click", function (e) {
e.stopImmediatePropagation();
e.preventDefault();
var date = $("#datepicker").datepicker("getDate");
var getParam = "day=" + date.getDate() + "&month=" + (date.getMonth() + 1) + "&year=" + date.getFullYear();
window.open("php/contenthandler.php?module=reservation&command=reservationsAsHtml&" + getParam,'_blank');
});
}
function bindChangeResByTableButton() { function bindChangeResByTableButton() {
$(".schtablebtn").off("click").on("click", function (e) { $(".schtablebtn").off("click").on("click", function (e) {
var resid = ((this.id).split("_"))[1]; var resid = ((this.id).split("_"))[1];
@ -1001,6 +1018,7 @@ function bindRoomSelect(roomsectionid,roomselectid,tablesectionid,tableselectid,
<div id="resbytimes" data-role="collapsible" data-theme="c" data-content-theme="c" data-collapsed="false"> <div id="resbytimes" data-role="collapsible" data-theme="c" data-content-theme="c" data-collapsed="false">
<h3><span id="resbytimesheadertxt">Reservierungen nach Z.</span></h3> <h3><span id="resbytimesheadertxt">Reservierungen nach Z.</span></h3>
<table id="dayschedule"></table> <table id="dayschedule"></table>
<div id="reshtmlarea"></div>
</div> <!-- resbytimes --> </div> <!-- resbytimes -->
<div id="resbytables" data-role="collapsible" data-theme="c" data-content-theme="c" data-collapsed="false"> <div id="resbytables" data-role="collapsible" data-theme="c" data-content-theme="c" data-collapsed="false">

8
webapp/sumuphandler.php
View File

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

4
webapp/supplydesk.html
View File

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

4
webapp/tasks.html
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.33">
<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.32"></script> <script src="utilities.js?v=1.5.33"></script>
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" /> <link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script> <script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>

4
webapp/timetracking.html
View File

@ -5,7 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="content-type" content="text/html; charset=utf-8"> <meta http-equiv="content-type" content="text/html; charset=utf-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.33">
<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.32"></script> <script src="utilities.js?v=1.5.33"></script>
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" /> <link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script> <script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>

6
webapp/waiter.html
View File

File diff suppressed because one or more lines are too long

4
webapp/waiterdesktop.php
View File

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