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

OrderSprinter 2.0.8

This commit is contained in:
Geno 2020-11-19 23:15:14 +01:00
parent 3200b90e52
commit c22dd36628
54 changed files with 1986 additions and 180 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=2.0.7" /> <link rel="stylesheet" href="css/gueststyle.css?v=2.0.8" />
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=2.0.7" /> <link rel="stylesheet" href="php/ossystem.php?command=getcss&v=2.0.8" />
<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>
@ -115,7 +115,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">2.0.7&nbsp;&nbsp;</div> <div class="ui-block-b grid_right" id="versioninfo">2.0.8&nbsp;&nbsp;</div>
</div><!-- /grid-a --> </div><!-- /grid-a -->
</div> </div>
</div> </div>

5
gastsystem/install.php
View File

@ -49,6 +49,7 @@ class Installer {
DbUtils::execSql($pdo, $sql, array('types','')); DbUtils::execSql($pdo, $sql, array('types',''));
DbUtils::execSql($pdo, $sql, array('products','')); DbUtils::execSql($pdo, $sql, array('products',''));
DbUtils::execSql($pdo, $sql, array('currency','')); DbUtils::execSql($pdo, $sql, array('currency',''));
DbUtils::execSql($pdo, $sql, array('theme',''));
DbUtils::execSql($pdo, $sql, array('decpoint','')); DbUtils::execSql($pdo, $sql, array('decpoint',''));
$sql = " $sql = "
@ -114,10 +115,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=2.0.7">'; echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=2.0.8">';
echo "</head>"; echo "</head>";
echo "<body><div class=surround>"; echo "<body><div class=surround>";
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 2.0.7</span><br><br>"; echo "<span class=headerline>Installation OrderSprinter-Gastsystem 2.0.8</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>";

2
gastsystem/js/ordering.js
View File

File diff suppressed because one or more lines are too long

217
gastsystem/php/3rdparty/orderstyle/orderstyle-bluethunder.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

217
gastsystem/php/3rdparty/orderstyle/orderstyle-brightenergy.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

217
gastsystem/php/3rdparty/orderstyle/orderstyle-cool.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

217
gastsystem/php/3rdparty/orderstyle/orderstyle-darksoul.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

217
gastsystem/php/3rdparty/orderstyle/orderstyle-greenfield.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

217
gastsystem/php/3rdparty/orderstyle/orderstyle-pale.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

217
gastsystem/php/3rdparty/orderstyle/orderstyle-pinklady.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

217
gastsystem/php/3rdparty/orderstyle/orderstyle-stylisch.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

46
gastsystem/php/ossystem.php
View File

@ -39,13 +39,54 @@ class OsSystem {
$color = imagecolorallocatealpha($php_img, 0, 0, 0, 127); $color = imagecolorallocatealpha($php_img, 0, 0, 0, 127);
imagepng($php_img, NULL); imagepng($php_img, NULL);
imagecolordeallocate( $color ); imagecolordeallocate( $php_img,$color );
imagedestroy($php_img); imagedestroy($php_img);
return; return;
} }
self::outputEmptyImage(); self::outputEmptyImage();
} }
public static function getcss($pdo) {
$guesttheme = DbUtils::getConfigItem($pdo,"guesttheme",8);
switch ($guesttheme) {
case 0:
$cssFile = "orderstyle.min.css";
break;
case 1:
$cssFile = "orderstyle-pale.min.css";
break;
case 2:
$cssFile = "orderstyle-darksoul.min.css";
break;
case 3:
$cssFile = "orderstyle-stylisch.min.css";
break;
case 4:
$cssFile = "orderstyle-bluethunder.min.css";
break;
case 5:
$cssFile = "orderstyle-cool.min.css";
break;
case 6:
$cssFile = "orderstyle-pinklady.min.css";
break;
case 7:
$cssFile = "orderstyle-greenfield.min.css";
break;
case 8:
$cssFile = "orderstyle-brightenergy.min.css";
break;
default:
$cssFile = "orderstyle-brightenergy.min.css";
break;
}
$cssMobileFile = "3rdparty/orderstyle/" . $cssFile;
header('Content-type: text/css');
readfile($cssMobileFile);
}
private static function checkIndividualFileWriteStatus($filename) { private static function checkIndividualFileWriteStatus($filename) {
if (file_exists($filename)) { if (file_exists($filename)) {
if (is_writable($filename)) { if (is_writable($filename)) {
@ -134,6 +175,9 @@ if (isset($_GET["command"])) {
case "getprodimage": case "getprodimage":
OsSystem::getprodimage($pdo,$_GET["prodid"]); OsSystem::getprodimage($pdo,$_GET["prodid"]);
break; break;
case "getcss":
OsSystem::getcss($pdo);
break;
default: default:
break; break;
} }

2
gastsystem/sync.php
View File

@ -24,6 +24,8 @@ class Sync {
self::insertIntoSystemTable($pdo, $systemdata, 'types'); self::insertIntoSystemTable($pdo, $systemdata, 'types');
self::insertIntoSystemTable($pdo, $systemdata, 'products'); self::insertIntoSystemTable($pdo, $systemdata, 'products');
self::insertIntoSystemTable($pdo, $systemdata, 'currency'); self::insertIntoSystemTable($pdo, $systemdata, 'currency');
self::insertIntoSystemTable($pdo, $systemdata, 'guesttheme');
self::insertIntoSystemTable($pdo, $systemdata, 'theme');
self::insertIntoSystemTable($pdo, $systemdata, 'decpoint'); self::insertIntoSystemTable($pdo, $systemdata, 'decpoint');
self::insertIntoSystemTable($pdo, $systemdata, 'askdaycode'); self::insertIntoSystemTable($pdo, $systemdata, 'askdaycode');

BIN
printserver/javaprinter/javaprinter.jar
View File

Binary file not shown.

BIN
printserver/windows/OrderSprinterPrintserver.exe
View File

Binary file not shown.

2
scripts/ubuntuinstaller.sh
View File

@ -22,7 +22,7 @@ tabprefix="os_"
remoteaccesscode="please_change" remoteaccesscode="please_change"
# OrderSprinter-Version # OrderSprinter-Version
version="2_0_7" version="2_0_8"
# Warnhinweis an den Anwender mit der Möglichkeit des Abbruchs # Warnhinweis an den Anwender mit der Möglichkeit des Abbruchs
echo "Dieses Skript ist für die Ausführung auf einem frisch aufgesetzten" echo "Dieses Skript ist für die Ausführung auf einem frisch aufgesetzten"

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,"2.0.7"); Database::setVersion($pdo,$prefix,"2.0.8");
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
tseconnector/swissbit/tseconnector.jar
View File

Binary file not shown.

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=2.0.7"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.8">
<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=2.0.7"></script> <script src="utilities.js?v=2.0.8"></script>
<script src="kitchenbar.js?v=2.0.7"></script> <script src="kitchenbar.js?v=2.0.8"></script>
<style> <style>
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook #tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook

6
webapp/bill.html
View File

File diff suppressed because one or more lines are too long

6
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=2.0.7"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.8">
<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,8 +23,8 @@
<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=2.0.7"></script> <script src="utilities.js?v=2.0.8"></script>
<script src="elements/customers.js?v=2.0.7"></script> <script src="elements/customers.js?v=2.0.8"></script>
</head> </head>
<body> <body>

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=2.0.7"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.8">
<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=2.0.7"></script> <script src="utilities.js?v=2.0.8"></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>

2
webapp/elements/groundplan.js
View File

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

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=2.0.7"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.8">
<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=2.0.7"></script> <script src="utilities.js?v=2.0.8"></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=2.0.7"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.8">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.7"> <link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.8">
<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=2.0.7"></script> <script src="utilities.js?v=2.0.8"></script>
</head> </head>
<body> <body>

14
webapp/index.html
View File

@ -10,8 +10,8 @@
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<link rel="manifest" href="manifest.webmanifest"> <link rel="manifest" href="manifest.webmanifest">
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.7"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.8">
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.7"> <link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.8">
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle-brightenergy.min.css" /> <link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle-brightenergy.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" />
@ -19,7 +19,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=2.0.7"></script> <script src="utilities.js?v=2.0.8"></script>
</head> </head>
<body> <body>
@ -140,7 +140,7 @@ function displayLoginOrLogoutMask(jsonContent) {
// user needs to log in! // user needs to log in!
$("#passwordfield").val(""); $("#passwordfield").val("");
$("#logoutarea").hide(); $("#logoutarea").hide();
setTimeout(function(){document.location.href = "index.html?v=2.0.7";},250); setTimeout(function(){document.location.href = "index.html?v=2.0.8";},250);
} }
} }
@ -240,7 +240,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=2.0.7";},500); setTimeout(function(){document.location.href = "install.html?v=2.0.8";},500);
} }
} }
@ -312,11 +312,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=2.0.7&style=always" style="max-height:150px;"/></div> <p><div id="toplogolocation" style="text-align: center;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=2.0.8&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=2.0.7&style=always" style="max-height:150px;"/></div> <p><div id="middlelogolocation" style="text-align: left;padding-left: 80px;padding-right:80px;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=2.0.8&style=always" style="max-height:150px;"/></div>
<div class="loginarea"> <div class="loginarea">
<form method="post"> <form method="post">

4
webapp/install.html
View File

@ -4,7 +4,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="author" content="Stefan Pichel"> <meta name="author" content="Stefan Pichel">
<title>Setup</title> <title>Setup</title>
<link rel="stylesheet" type="text/css" href="css/installstyle.css?v=2.0.7"> <link rel="stylesheet" type="text/css" href="css/installstyle.css?v=2.0.8">
<script src="php/3rdparty/jquery-2.0.3.min.js"></script> <script src="php/3rdparty/jquery-2.0.3.min.js"></script>
<script src="utilities.js"></script> <script src="utilities.js"></script>
@ -970,7 +970,7 @@ El servicio web OrderSprinter no requiere una conexión a Internet. Sin embargo,
<tr id=updateline> <tr id=updateline>
<td>&nbsp;</td> <td>&nbsp;</td>
<td align=center> <td align=center>
<button id="updatebtn" class="updatebtn">Update -> 2.0.7</button> <button id="updatebtn" class="updatebtn">Update -> 2.0.8</button>
<span id="updateinprogresstxt" style="display:none;"><img id="installprogressindicator" src="php/3rdparty/images/ajax-loader.gif" alt="Progress indication" /> Update... bitte warten.</span> <span id="updateinprogresstxt" style="display:none;"><img id="installprogressindicator" src="php/3rdparty/images/ajax-loader.gif" alt="Progress indication" /> Update... bitte warten.</span>
</td> </td>
<td>&nbsp;</td> <td>&nbsp;</td>

2
webapp/install/installer.php
View File

@ -513,7 +513,7 @@ return;
} }
set_time_limit(60*30); set_time_limit(60*30);
$installerVersion = "2.0.7"; $installerVersion = "2.0.8";
$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=2.0.7"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.8">
<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=2.0.7"></script> <script src="utilities.js?v=2.0.8"></script>
<script src="kitchenbar.js?v=2.0.7"></script> <script src="kitchenbar.js?v=2.0.8"></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=2.0.7"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.8">
<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,12 +14,12 @@
<script src="php/3rdparty/jquery-1.11.3.min.js"></script> <script src="php/3rdparty/jquery-1.11.3.min.js"></script>
<!-- <script src="https://code.jquery.com/jquery-1.11.3.js"></script> --> <!-- <script src="https://code.jquery.com/jquery-1.11.3.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=2.0.7"></script> <script src="utilities.js?v=2.0.8"></script>
<script src="elements/tablemap.js?v=2.0.7"></script> <script src="elements/tablemap.js?v=2.0.8"></script>
<script src="elements/roommap.js?v=2.0.7"></script> <script src="elements/roommap.js?v=2.0.8"></script>
<script src="elements/groundplan.js?v=2.0.7"></script> <script src="elements/groundplan.js?v=2.0.8"></script>
<script src="elements/tse.js?v=2.0.7"></script> <script src="elements/tse.js?v=2.0.8"></script>
<script src="elements/closing.js?v=2.0.7"></script> <script src="elements/closing.js?v=2.0.8"></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>
@ -458,6 +458,7 @@ var MAN_VERYFIRST_CLOSING = ["Allererste Tageserfassung","Very First closing","P
var MAN_VERYLAST_CLOSING = ["Letzte Tageserfassung","Last closing","Ultima cerrada"]; var MAN_VERYLAST_CLOSING = ["Letzte Tageserfassung","Last closing","Ultima cerrada"];
var MAN_COUNTING_HINT = ["Das Ausfüllen des Zählprotokolls ist freiwillig.","The counting protocol is optional","La finalización del protocolo de conteo es voluntaria."]; var MAN_COUNTING_HINT = ["Das Ausfüllen des Zählprotokolls ist freiwillig.","The counting protocol is optional","La finalización del protocolo de conteo es voluntaria."];
var MAN_DSFINVK_WARNING = ["Achtung: Die Unternehmenseinträge für die digitale Exportschnittstelle (DSFinv-k) wurden noch nicht alle in der Konfiguration festgelegt!","Attention: The company entries for the digital export interface (DSFinv-k) have not all been defined in the configuration yet!","Atención: ¡Las entradas de la compañía para la interfaz de exportación digital (DSFinv-k) aún no están definidas en la configuración!"]; var MAN_DSFINVK_WARNING = ["Achtung: Die Unternehmenseinträge für die digitale Exportschnittstelle (DSFinv-k) wurden noch nicht alle in der Konfiguration festgelegt!","Attention: The company entries for the digital export interface (DSFinv-k) have not all been defined in the configuration yet!","Atención: ¡Las entradas de la compañía para la interfaz de exportación digital (DSFinv-k) aún no están definidas en la configuración!"];
var MAN_GUEST_THEME = ["Farbschema","Theme","Color"];
var MAN_DAYNAMES = [ var MAN_DAYNAMES = [
["Montag","Monday","Lunes"], ["Montag","Monday","Lunes"],
@ -546,7 +547,7 @@ var MAN_KITCHEN_OPTION_SIZE = ["Schriftgrüße der Kommentare in Küchen-/Barans
var MAN_KITCHEN_FONTSIZE_HINT = ["Wird als Schriftgröße der Wert 0 angegeben, so wird die Standardschriftgröße verwendet.","If the value 0 is set for the font size the default font size will be applied.","Si el tamaño de la fuente se especifica como 0, se utiliza el tamaño de la fuente por defecto."]; var MAN_KITCHEN_FONTSIZE_HINT = ["Wird als Schriftgröße der Wert 0 angegeben, so wird die Standardschriftgröße verwendet.","If the value 0 is set for the font size the default font size will be applied.","Si el tamaño de la fuente se especifica como 0, se utiliza el tamaño de la fuente por defecto."];
var lang = 0; var lang = 0;
var generalVals = [12,2,0,3,0,1,1,0,0,1, 0,50,20,10,1,0,0,0,1,0,1,0,0,1,1, 1,1,1,1,1,1,1,1,1,1, 1,2,3, 1,0, 1,0,1, 1,1,0,0, 0,0,0, 0,0,0,1,1, 0,1,0,1,1, 1,2,0, 0,0,1,1,1, 0,0,1,0]; var generalVals = [12,2,0,3,0,1,1,0,0,1, 0,50,20,10,1,0,0,0,1,0,1,0,0,1,1, 1,1,1,1,1,1,1,1,1,1, 1,2,3, 1,0, 1,0,1, 1,1,0,0, 0,0,0, 0,0,0,1,1, 0,1,0,1,1, 1,2,0, 0,0,1,1,1, 0,0,1,0, 8];
var numberOfClosings = 0; var numberOfClosings = 0;
@ -730,7 +731,9 @@ var generalValuesSettings = [
["coinvalname",MAN_COIN_VALNAME,"i",0], ["coinvalname",MAN_COIN_VALNAME,"i",0],
["notevalname",MAN_NOTE_VALNAME,"i",0], ["notevalname",MAN_NOTE_VALNAME,"i",0],
["kitchenextrasize",MAN_KITCHEN_EXTRA_SIZE[lang],"i",0], ["kitchenextrasize",MAN_KITCHEN_EXTRA_SIZE[lang],"i",0],
["kitchenoptionsize",MAN_KITCHEN_OPTION_SIZE[lang],"i",0] ["kitchenoptionsize",MAN_KITCHEN_OPTION_SIZE[lang],"i",0],
["guesttheme",MAN_GUEST_THEME[lang],"s",72]
]; ];
var predef = ""; var predef = "";
@ -1191,6 +1194,7 @@ function insertGeneralConfigItems(configResult) {
$("#partOfPrintextraprice").html(createYesNo("printextraprice",MAN_PRINT_EXTRAPRICE, values.printextraprice)); $("#partOfPrintextraprice").html(createYesNo("printextraprice",MAN_PRINT_EXTRAPRICE, values.printextraprice));
$("#partOfPriceinlist").html(createYesNo("priceinlist",MAN_PRICE_IN_LIST, values.priceinlist)); $("#partOfPriceinlist").html(createYesNo("priceinlist",MAN_PRICE_IN_LIST, values.priceinlist));
$("#partOfGuestjobprint").html(createYesNo("guestjobprint",MAN_GUEST_JOB_PRINT, values.guestjobprint)); $("#partOfGuestjobprint").html(createYesNo("guestjobprint",MAN_GUEST_JOB_PRINT, values.guestjobprint));
$("#partOfGuestTheme").html(createGuestTheme(values.guesttheme));
$("#partOfAskdaycode").html(createYesNo("askdaycode",MAN_ASK_DAYCODE, values.askdaycode)); $("#partOfAskdaycode").html(createYesNo("askdaycode",MAN_ASK_DAYCODE, values.askdaycode));
$("#partOfAsktablecode").html(createYesNo("asktablecode",MAN_ASK_TABLECODE, values.asktablecode)); $("#partOfAsktablecode").html(createYesNo("asktablecode",MAN_ASK_TABLECODE, values.asktablecode));
$("#partOfShowdaycode").html(createYesNo("showdaycode",MAN_SHOW_DAYCODE, values.showdaycode)); $("#partOfShowdaycode").html(createYesNo("showdaycode",MAN_SHOW_DAYCODE, values.showdaycode));
@ -1337,6 +1341,7 @@ function insertGeneralConfigItems(configResult) {
generalVals[69] = values.doublereceipt; generalVals[69] = values.doublereceipt;
generalVals[70] = values.printextraprice; generalVals[70] = values.printextraprice;
generalVals[71] = values.usetse; generalVals[71] = values.usetse;
generalVals[72] = values.guesttheme;
defaulttmp = values.defaulttmp; defaulttmp = values.defaulttmp;
@ -1546,7 +1551,9 @@ function createPrintAndQueueJobs(theValue) {
function createCash(theValue) { function createCash(theValue) {
return createYesNo("cashenabled",MAN_CASH, theValue); return createYesNo("cashenabled",MAN_CASH, theValue);
} }
function createGuestTheme(theValue) {
return createPreferMobileThemePart(theValue,"guesttheme",MAN_GUEST_THEME[lang],lang);
}
function createYesNo(label,nameOnGui,theValue) { function createYesNo(label,nameOnGui,theValue) {
return createSelectField(label,[MAN_NO[lang],MAN_YES[lang]],theValue,nameOnGui[lang]); return createSelectField(label,[MAN_NO[lang],MAN_YES[lang]],theValue,nameOnGui[lang]);
} }
@ -1712,7 +1719,7 @@ function initRestoreFileUpload() {
} else { } else {
alert("Import war erfolgreich."); alert("Import war erfolgreich.");
setTimeout(function(){ setTimeout(function(){
document.location.href = "index.html?v=2.0.7"; document.location.href = "index.html?v=2.0.8";
},250); },250);
} }
}, },
@ -2108,37 +2115,37 @@ function bindConfig() {
$("#samplerectemplate").off("click").on("click", function (e) { $("#samplerectemplate").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
doAjax("GET","php/contenthandler.php?module=admin&command=getrectemplate&v=2.0.7",null,handleGetRecTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getrectemplate&v=2.0.8",null,handleGetRecTemplate,null);
}); });
$("#sampleclstemplate").off("click").on("click", function (e) { $("#sampleclstemplate").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
doAjax("GET","php/contenthandler.php?module=admin&command=getclstemplate&v=2.0.7",null,handleGetClsTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getclstemplate&v=2.0.8",null,handleGetClsTemplate,null);
}); });
$("#samplecashtemplate").off("click").on("click", function (e) { $("#samplecashtemplate").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
doAjax("GET","php/contenthandler.php?module=admin&command=getcashtemplate&v=2.0.7",null,handleGetCashTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getcashtemplate&v=2.0.8",null,handleGetCashTemplate,null);
}); });
$("#samplefoodworktemplate").off("click").on("click", function (e) { $("#samplefoodworktemplate").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
doAjax("GET","php/contenthandler.php?module=admin&command=getfoodworktemplate&v=2.0.7",null,handleGetFoodTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getfoodworktemplate&v=2.0.8",null,handleGetFoodTemplate,null);
}); });
$("#sampledrinkworktemplate").off("click").on("click", function (e) { $("#sampledrinkworktemplate").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
doAjax("GET","php/contenthandler.php?module=admin&command=getdrinkworktemplate&v=2.0.7",null,handleGetDrinkTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getdrinkworktemplate&v=2.0.8",null,handleGetDrinkTemplate,null);
}); });
$("#samplecanceltemplate").off("click").on("click", function (e) { $("#samplecanceltemplate").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
doAjax("GET","php/contenthandler.php?module=admin&command=getcanceltemplate&v=2.0.7",null,handleGetCancelTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getcanceltemplate&v=2.0.8",null,handleGetCancelTemplate,null);
}); });
$("#samplepickuptemplate").off("click").on("click", function (e) { $("#samplepickuptemplate").off("click").on("click", function (e) {
e.stopImmediatePropagation(); e.stopImmediatePropagation();
e.preventDefault(); e.preventDefault();
doAjax("GET","php/contenthandler.php?module=admin&command=getpickuptemplate&v=2.0.7",null,handleGetPickupTemplate,null); doAjax("GET","php/contenthandler.php?module=admin&command=getpickuptemplate&v=2.0.8",null,handleGetPickupTemplate,null);
}); });
$("#changeConfig").off("click").on("click", function (e) { $("#changeConfig").off("click").on("click", function (e) {
@ -2266,38 +2273,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=2.0.7"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=2.0.8";
}); });
$("#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=2.0.7"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=2.0.8";
}); });
$("#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=2.0.7"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=2.0.8";
}); });
$("#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=2.0.7",null,handleFtpResult,null); doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=2.0.8",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=2.0.7",'_blank'); window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=2.0.8",'_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=2.0.7"; window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=2.0.8";
}); });
$("#golive").off("click").on("click", function (e) { $("#golive").off("click").on("click", function (e) {
@ -2495,7 +2502,7 @@ function updateOneSingleFile() {
setTimeout(function(){ setTimeout(function(){
$("#sliderarea").hide(); $("#sliderarea").hide();
var millis=getMillis(); var millis=getMillis();
document.location.href = "install.html?v=2.0.7&mode=onlyupdate&n=" + millis; document.location.href = "install.html?v=2.0.8&mode=onlyupdate&n=" + millis;
},250); },250);
} }
} }
@ -4558,6 +4565,8 @@ $(document).on("pageinit", "#admin-page", function () {
<div id="partOfGuestjobprint"></div> <div id="partOfGuestjobprint"></div>
<i id="guestjobprinthint" style="padding-left: 50px;padding-right: 50px;">Hinweis: Nicht drucken heißt digitalen Workflow.</i> <i id="guestjobprinthint" style="padding-left: 50px;padding-right: 50px;">Hinweis: Nicht drucken heißt digitalen Workflow.</i>
<div id="partOfGuestTheme"></div>
<div id="partOfAskdaycode"></div> <div id="partOfAskdaycode"></div>
<div id="partOfAsktablecode"></div> <div id="partOfAsktablecode"></div>
<div id="partOfShowdaycode"></div> <div id="partOfShowdaycode"></div>

8
webapp/paydesk.html
View File

File diff suppressed because one or more lines are too long

44
webapp/php/admin.php
View File

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

2
webapp/php/customers.php
View File

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

2
webapp/php/debug.php
View File

@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
if (strlen($status) > 150) { if (strlen($status) > 150) {
$status = substr($status, 0,149); $status = substr($status, 0,149);
} }
$version = "2.0.7"; $version = "2.0.8";
$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 {

5
webapp/php/guestsync.php
View File

@ -45,6 +45,7 @@ class Guestsync {
$products = json_encode($prodTypes["products"]); $products = json_encode($prodTypes["products"]);
$currency = CommonUtils::getConfigValue($pdo, 'currency', 'Euro'); $currency = CommonUtils::getConfigValue($pdo, 'currency', 'Euro');
$guesttheme = CommonUtils::getConfigValue($pdo, 'guesttheme', 8);
$decpoint = CommonUtils::getConfigValue($pdo, 'decpoint', '.'); $decpoint = CommonUtils::getConfigValue($pdo, 'decpoint', '.');
$askdaycode = CommonUtils::getConfigValue($pdo, 'askdaycode', "1"); $askdaycode = CommonUtils::getConfigValue($pdo, 'askdaycode', "1");
@ -69,6 +70,7 @@ class Guestsync {
"types" => $types, "types" => $types,
"products" => $products, "products" => $products,
"currency" => $currency, "currency" => $currency,
"guesttheme" => $guesttheme,
"decpoint" => $decpoint, "decpoint" => $decpoint,
"askdaycode" => $askdaycode, "askdaycode" => $askdaycode,
"asktablecode" => $asktablecode, "asktablecode" => $asktablecode,
@ -318,5 +320,4 @@ class Guestsync {
} }
return true; return true;
} }
} }

2
webapp/php/reservation.php
View File

@ -236,7 +236,7 @@ class Reservation {
$txt = "<html><head>"; $txt = "<html><head>";
$txt .= "<title>Reservierungsübersicht</title>"; $txt .= "<title>Reservierungsübersicht</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/bestformat.css?v=2.0.7">'; $txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=2.0.8">';
$txt .= "</head>"; $txt .= "</head>";
$txt .= "<body>"; $txt .= "<body>";
$txt .= "<h1>Reservierungsübersicht für $day.$month.$year</h1><p>"; $txt .= "<h1>Reservierungsübersicht für $day.$month.$year</h1><p>";

2
webapp/php/roomtables.php
View File

@ -638,7 +638,7 @@ class Roomtables {
$txt = "<html><head>"; $txt = "<html><head>";
$txt .= "<title>Tisch QR-Codes für die Gastbestellung</title>"; $txt .= "<title>Tisch QR-Codes für die Gastbestellung</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/bestformat.css?v=2.0.7">'; $txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=2.0.8">';
$txt .= "</head>"; $txt .= "</head>";
$txt .= "<body>"; $txt .= "<body>";
$txt .= "<h1>Tisch QR-Codes für die Gastbestellung</h1><p>"; $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'); readfile(__DIR__. '/../../img/oops.png');
return; return;
} else { } else {
$text = $serverurl . "/nfclogin.php?a=" . $passhash . "_" . $userid . "&v=2.0.7"; $text = $serverurl . "/nfclogin.php?a=" . $passhash . "_" . $userid . "&v=2.0.8";
QRcode::png($text); QRcode::png($text);
} }
} }

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

@ -1585,6 +1585,15 @@ class Version {
public static function upd_2006_2007($pdo, $prefix, $dbname) { public static function upd_2006_2007($pdo, $prefix, $dbname) {
return array(true); return array(true);
} }
public static function upd_2007_2008($pdo, $prefix, $dbname) {
try {
self::insertOrUpdateConfigItem($pdo, 'guesttheme', 8);
return array(true);
} catch (PDOException $e) {
return array(false,$e);
}
}
public static $updateOrder = array( public static $updateOrder = array(
"1.3.0" => array("upd_1300_1301","1.3.1"), "1.3.0" => array("upd_1300_1301","1.3.1"),
@ -1685,7 +1694,8 @@ class Version {
"2.0.3" => array("upd_2003_2004","2.0.4"), "2.0.3" => array("upd_2003_2004","2.0.4"),
"2.0.4" => array("upd_2004_2005","2.0.5"), "2.0.4" => array("upd_2004_2005","2.0.5"),
"2.0.5" => array("upd_2005_2006","2.0.6"), "2.0.5" => array("upd_2005_2006","2.0.6"),
"2.0.6" => array("upd_2006_2007","2.0.7") "2.0.6" => array("upd_2006_2007","2.0.7"),
"2.0.7" => array("upd_2007_2008","2.0.8")
); );
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=2.0.7"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.8">
<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=2.0.7"></script> <script src="utilities.js?v=2.0.8"></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>

42
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=2.0.7"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.8">
<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=2.0.7"></script> <script src="utilities.js?v=2.0.8"></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>
@ -75,14 +75,6 @@ var PREF_TABLES_AFTER_SEND_ROOMS = ["Raumauswahl","Room selection","Seleccion de
var PREF_THEME_TITEL = ["Design","Appearance","Design"]; var PREF_THEME_TITEL = ["Design","Appearance","Design"];
var PREF_THEME = ["Mobil-Ansicht","Mobile view","Vista movíl"]; var PREF_THEME = ["Mobil-Ansicht","Mobile view","Vista movíl"];
var PREF_THEME_COLORFUL = ["Active Colors","Active Colors","Active Colors"];
var PREF_THEME_PALE = ["Power Pale","Power Pale","Power Pale"];
var PREF_THEME_DARK_SOUL = ["Dark Soul","Dark Soul","Dark Soul"];
var PREF_THEME_STYLISH = ["Stylish","Stylish","Stylish"];
var PREF_THEME_BLUETHUNDER = ["Blue Thunder","Blue Thunder","Blue Thunder"];
var PREF_THEME_COOL = ["Cool","Cool","Cool"];
var PREF_THEME_PINKLADY = ["Pink Lady","Pink Lady","Pink Lady"];
var PREF_THEME_GREENFIELD = ["Green Field","Green Field","Green Field"];
var PREF_THEME_HINT = ["Bitte beachten: Möglicherweise wirkt eine Änderung erst, wenn die jeweilige Ansicht im Internetbrowser erneut geladen wird (Reload-Button).", var PREF_THEME_HINT = ["Bitte beachten: Möglicherweise wirkt eine Änderung erst, wenn die jeweilige Ansicht im Internetbrowser erneut geladen wird (Reload-Button).",
"It may be necessary to press the reload button of a view to get the changed design to be applied.", "It may be necessary to press the reload button of a view to get the changed design to be applied.",
"Quizás es necesario reload las paginas despues de un cambio."]; "Quizás es necesario reload las paginas despues de un cambio."];
@ -155,14 +147,6 @@ function createLanguagePart(language) {
return html; return html;
} }
function isSelected(currentIndex,searchIndex) {
if (currentIndex == searchIndex) {
return " selected";
} else {
return "";
}
}
function createReceiptPrinterPart(language) { function createReceiptPrinterPart(language) {
var printer = $("#pref-page").data("receiptprinter"); var printer = $("#pref-page").data("receiptprinter");
var quickcash = $("#pref-page").data("quickcash"); var quickcash = $("#pref-page").data("quickcash");
@ -382,24 +366,6 @@ function createPreferKTLPart(prefervalue,label,labeltxt) {
return html; return html;
} }
function createPreferMobileThemePart(prefervalue,label,labeltxt) {
var html = '<div class="ui-field-contain">';
html += '<label for="' + label + '"><span id="' + label + 'txt">' + labeltxt + '</span>:</label>';
html += '<select name="' + label + '" id="' + label + '" data-theme="e">';
html += '<option value="0"' + isSelected(0,prefervalue) + '>' + PREF_THEME_COLORFUL[l] + '</option>';
html += '<option value="1"' + isSelected(1,prefervalue) + '>' + PREF_THEME_PALE[l] + '</option>';
html += '<option value="2"' + isSelected(2,prefervalue) + '>' + PREF_THEME_DARK_SOUL[l] + '</option>';
html += '<option value="3"' + isSelected(3,prefervalue) + '>' + PREF_THEME_STYLISH[l] + '</option>';
html += '<option value="4"' + isSelected(4,prefervalue) + '>' + PREF_THEME_BLUETHUNDER[l] + '</option>';
html += '<option value="5"' + isSelected(5,prefervalue) + '>' + PREF_THEME_COOL[l] + '</option>';
html += '<option value="6"' + isSelected(6,prefervalue) + '>' + PREF_THEME_PINKLADY[l] + '</option>';
html += '<option value="7"' + isSelected(7,prefervalue) + '>' + PREF_THEME_GREENFIELD[l] + '</option>';
html += '<option value="8"' + isSelected(8,prefervalue) + '>Bright Energy</option>';
html += '</select></div>';
return html;
}
function createPreferExtrasApplyBtnPosPart(prefervalue,label,labeltxt) { function createPreferExtrasApplyBtnPosPart(prefervalue,label,labeltxt) {
var html = '<div class="ui-field-contain">'; var html = '<div class="ui-field-contain">';
@ -473,7 +439,7 @@ function fillKeepTypeLevel(preferKeepTypeLevel) {
} }
function fillMobileTheme(mobileTheme) { function fillMobileTheme(mobileTheme) {
$("#preferthemebtnpart").html(createPreferMobileThemePart(mobileTheme, "preferthemelabel", PREF_THEME[l])); $("#preferthemebtnpart").html(createPreferMobileThemePart(mobileTheme, "preferthemelabel", PREF_THEME[l],l));
$("#preferthemepartbox").trigger("create"); $("#preferthemepartbox").trigger("create");
} }
function fillExtrasApplyBtnPosPart(applyPos) { function fillExtrasApplyBtnPosPart(applyPos) {
@ -628,7 +594,7 @@ function binding() {
$("#preferthemelabel").off('change').on('change', function(e) { $("#preferthemelabel").off('change').on('change', function(e) {
var newVal = $("#preferthemelabel").find(":selected").val(); var newVal = $("#preferthemelabel").find(":selected").val();
$("#preferthemebtnpart").html(createPreferMobileThemePart(newVal, "preferthemelabel", PREF_THEME[l])); $("#preferthemebtnpart").html(createPreferMobileThemePart(newVal, "preferthemelabel", PREF_THEME[l],l));
$("#preferthemepartbox").trigger("create"); $("#preferthemepartbox").trigger("create");
doAjax("POST","php/contenthandler.php?module=admin&command=setMobileTheme",{mobiletheme:newVal},reloadPageWithTimeout,"Mobile Theme"); doAjax("POST","php/contenthandler.php?module=admin&command=setMobileTheme",{mobiletheme:newVal},reloadPageWithTimeout,"Mobile Theme");
binding(); binding();

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=2.0.7"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.8">
<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=2.0.7"></script> <script src="utilities.js?v=2.0.8"></script>
<script src="elements/product.js?v=2.0.7"></script> <script src="elements/product.js?v=2.0.8"></script>
<script src="elements/extra.js?v=2.0.7"></script> <script src="elements/extra.js?v=2.0.8"></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=2.0.7"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.8">
<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=2.0.7"></script> <script src="utilities.js?v=2.0.8"></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=2.0.7"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.8">
<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=2.0.7"></script> <script src="utilities.js?v=2.0.8"></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=2.0.7"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.8">
<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=2.0.7"></script> <script src="utilities.js?v=2.0.8"></script>
<script src="elements/rating.js"></script> <script src="elements/rating.js"></script>
</head> </head>

12
webapp/reservation.html
View File

@ -5,8 +5,8 @@
<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=2.0.7"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.8">
<link rel="stylesheet" type="text/css" href="css/osdatepicker.css?v=2.0.7"> <link rel="stylesheet" type="text/css" href="css/osdatepicker.css?v=2.0.8">
<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,10 +14,10 @@
<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="elements/tablemap.js"></script> <script src="elements/tablemap.js"></script>
<script src="elements/reservation.js?v=2.0.7"></script> <script src="elements/reservation.js?v=2.0.8"></script>
<script src="elements/osdatepicker.js?v=2.0.7"></script> <script src="elements/osdatepicker.js?v=2.0.8"></script>
<script src="utilities.js?v=2.0.7"></script> <script src="utilities.js?v=2.0.8"></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>
@ -627,7 +627,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=2.0.7&date=" + dateStr;},500); setTimeout(function(){document.location.href = "reservation.html?v=2.0.8&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" /> <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=2.0.7"></script> <script src="utilities.js?v=2.0.8"></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=2.0.7"; var nextpage = "paydesk.html?version=2.0.8";
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=2.0.7"; nextpage = "paydesk.html?t=" + tableid + "&version=2.0.8";
} else { } else {
$("#nextpagebtntxt").html(SUM_TO_ORDER[lang]); $("#nextpagebtntxt").html(SUM_TO_ORDER[lang]);
nextpage = "waiter.html?version=2.0.7"; nextpage = "waiter.html?version=2.0.8";
} }
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=2.0.7"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.8">
<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=2.0.7"></script> <script src="utilities.js?v=2.0.8"></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=2.0.7"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.8">
<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=2.0.7"></script> <script src="utilities.js?v=2.0.8"></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=2.0.7"> <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.8">
<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=2.0.7"></script> <script src="utilities.js?v=2.0.8"></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>

37
webapp/utilities.js
View File

@ -398,4 +398,39 @@ var taxesDefs = [
{ key: 12, value: 7.0, name: "Historischer ermäßigter Steuersatz (§ 12 Abs. 2 UStG)"}, { key: 12, value: 7.0, name: "Historischer ermäßigter Steuersatz (§ 12 Abs. 2 UStG)"},
{ key: 21, value: 16.0, name: "Historischer allgemeiner Steuersatz (§ 12 Abs. 1 UStG)"}, { key: 21, value: 16.0, name: "Historischer allgemeiner Steuersatz (§ 12 Abs. 1 UStG)"},
{ key: 22, value: 5.0, name: "Historischer ermäßigter Steuersatz (§ 12 Abs. 2 UStG)"} { key: 22, value: 5.0, name: "Historischer ermäßigter Steuersatz (§ 12 Abs. 2 UStG)"}
]; ];
function isSelected(currentIndex,searchIndex) {
if (currentIndex == searchIndex) {
return " selected";
} else {
return "";
}
}
function createPreferMobileThemePart(prefervalue,label,labeltxt,l) {
var PREF_THEME_COLORFUL = ["Active Colors","Active Colors","Active Colors"];
var PREF_THEME_PALE = ["Power Pale","Power Pale","Power Pale"];
var PREF_THEME_DARK_SOUL = ["Dark Soul","Dark Soul","Dark Soul"];
var PREF_THEME_STYLISH = ["Stylish","Stylish","Stylish"];
var PREF_THEME_BLUETHUNDER = ["Blue Thunder","Blue Thunder","Blue Thunder"];
var PREF_THEME_COOL = ["Cool","Cool","Cool"];
var PREF_THEME_PINKLADY = ["Pink Lady","Pink Lady","Pink Lady"];
var PREF_THEME_GREENFIELD = ["Green Field","Green Field","Green Field"];
var html = '<div class="ui-field-contain">';
html += '<label for="' + label + '"><span id="' + label + 'txt">' + labeltxt + '</span>:</label>';
html += '<select name="' + label + '" id="' + label + '" data-theme="e">';
html += '<option value="0"' + isSelected(0,prefervalue) + '>' + PREF_THEME_COLORFUL[l] + '</option>';
html += '<option value="1"' + isSelected(1,prefervalue) + '>' + PREF_THEME_PALE[l] + '</option>';
html += '<option value="2"' + isSelected(2,prefervalue) + '>' + PREF_THEME_DARK_SOUL[l] + '</option>';
html += '<option value="3"' + isSelected(3,prefervalue) + '>' + PREF_THEME_STYLISH[l] + '</option>';
html += '<option value="4"' + isSelected(4,prefervalue) + '>' + PREF_THEME_BLUETHUNDER[l] + '</option>';
html += '<option value="5"' + isSelected(5,prefervalue) + '>' + PREF_THEME_COOL[l] + '</option>';
html += '<option value="6"' + isSelected(6,prefervalue) + '>' + PREF_THEME_PINKLADY[l] + '</option>';
html += '<option value="7"' + isSelected(7,prefervalue) + '>' + PREF_THEME_GREENFIELD[l] + '</option>';
html += '<option value="8"' + isSelected(8,prefervalue) + '>Bright Energy</option>';
html += '</select></div>';
return html;
}

6
webapp/waiter.html
View File

File diff suppressed because one or more lines are too long

26
webapp/waiterdesktop.php
View File

File diff suppressed because one or more lines are too long