OrderSprinter 2.0.10
This commit is contained in:
parent
c7df2e2f2f
commit
0161b6d586
|
|
@ -9,8 +9,8 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" href="css/gueststyle.css?v=2.0.9" />
|
||||
<link rel="stylesheet" href="php/ossystem.php?command=getcss&v=2.0.9" />
|
||||
<link rel="stylesheet" href="css/gueststyle.css?v=2.0.10" />
|
||||
<link rel="stylesheet" href="php/ossystem.php?command=getcss&v=2.0.10" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
|
|
@ -115,7 +115,7 @@
|
|||
<div data-role="footer" data-theme="b" id="thefooter1">
|
||||
<div class="ui-grid-a">
|
||||
<div class="ui-block-a"> OrderSprinter</div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo">2.0.9 </div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo">2.0.10 </div>
|
||||
</div><!-- /grid-a -->
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -115,10 +115,10 @@ if (isset($_POST['code'])) {
|
|||
} else {
|
||||
echo "<html>";
|
||||
echo "<head><title>Installation Gastsystem</title>";
|
||||
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=2.0.9">';
|
||||
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=2.0.10">';
|
||||
echo "</head>";
|
||||
echo "<body><div class=surround>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 2.0.9</span><br><br>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 2.0.10</span><br><br>";
|
||||
echo "<form action='install.php' method='post'><input class=installfield name=code id=code type=text placeholder='Installationscode' />";
|
||||
echo "<br><input type=submit value='Installation starten' class=installbtn />";
|
||||
echo "</form></div></html>";
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
Binary file not shown.
Binary file not shown.
|
|
@ -5,11 +5,6 @@
|
|||
# einrichten.
|
||||
# Das Skript sollte auf einem frischen Ubuntu-System ausgeführt werden, da es bestehende Daten und Konfigurationen
|
||||
# ändert.
|
||||
# Da in diesem Skript feste Zugangsdaten verwendet werden (die in der aktuellen Version nicht im Skript geändert
|
||||
# werden dürfen!), sollte man das System (nach der Installation) vor einem produktiven Betrieb anpassen:
|
||||
# 1. Fernzugriffscode (im javaprinter.bat und in der Konfiguration)
|
||||
# 2. DB-Zugangsdaten in der MySQL-DB und in der config.json und config1.json
|
||||
# 3. Benutzerzugangspasswörter der Benuter innerhalb der Applikation
|
||||
|
||||
# Allgemeine Zugangsdaten zur Datenbank. Diese Werte können frei geändert werden. Allerdings darf das Passwort keine
|
||||
# Zeichen enthalten, die in der URL als Argumenttrenner verwendet werden (?,&). Die Passwörter werden dem Intaller
|
||||
|
|
@ -21,8 +16,22 @@ dbuserpassword="dbpass"
|
|||
tabprefix="os_"
|
||||
remoteaccesscode="please_change"
|
||||
|
||||
# Dies ist der Geräteadresse (USB-Port) des Speichermediums (z.B. USB-Stick, SD-Karte, SSD/HDD), auf den das
|
||||
# nächtliche Backup geschrieben werden soll. Um diese Adresse herauszufinden, kann man das Speichermedium anstecken
|
||||
# und über das Kommando "df" diese Adresse herausfinden. Wichtig ist, dass man nicht den Adresse der TSE eingibt,
|
||||
# denn die TSE sollte unter keinen Umständen direkt beschrieben werden.
|
||||
# ACHTUNG: Statt "/" muss ein "\/" eingetragen werden:
|
||||
backupdevice="\/dev\/sdb1"
|
||||
|
||||
|
||||
##########################################################################################
|
||||
#
|
||||
# Ende des Bereichs, in dem ein unerfahrener Anwender Anpassungen vornehmen sollte.
|
||||
#
|
||||
#########################################################################################
|
||||
|
||||
# OrderSprinter-Version
|
||||
version="2_0_9"
|
||||
version="2_0_10"
|
||||
|
||||
# Warnhinweis an den Anwender mit der Möglichkeit des Abbruchs
|
||||
echo "Dieses Skript ist für die Ausführung auf einem frisch aufgesetzten"
|
||||
|
|
@ -44,6 +53,8 @@ echo "Es können andere als die vordefinierten Zugangsdaten zur Datenbank"
|
|||
echo "verwendet werden. Dazu sind die Werte für die Variablen in diesem "
|
||||
echo "Skript anzupassen (dbadminpassword,db,dbuser,dbusertpassword,"
|
||||
echo "tabprefix)."
|
||||
echo "Außerdem ist vermutlich die Voreinstellung für die Geräteadresse des"
|
||||
echo "Backup-Mediums anzupassen."
|
||||
echo ""
|
||||
echo "Das Skript muss als root ausgeführt werden!"
|
||||
echo ""
|
||||
|
|
@ -224,7 +235,8 @@ then
|
|||
sed -i -e "s/DasPasswort/$dbuserpassword/" /usr/local/bin/backup-db-linux.sh
|
||||
sed -i -e "s/123/$remoteaccesscode/" /usr/local/bin/backup-db-linux.sh
|
||||
sed -i -e "s/localhost\/ordersprinter/localhost/" /usr/local/bin/backup-db-linux.sh
|
||||
mysql -uroot -p$dbadminpassword -e "UPDATE ${db}.${tabprefix}config SET setting='$remoteaccesscode' WHERE name='remoteaccesscode'";
|
||||
sed -i -e "s/mount=.*/mount=\"${backupdevice}\"/" /usr/local/bin/backup-db-linux.sh
|
||||
mysql -uroot -p$dbadminpassword -e "UPDATE ${db}.${tabprefix}config SET setting=MD5('$remoteaccesscode') WHERE name='remoteaccesscode'";
|
||||
|
||||
# Passe die Crontab an, damit der Job jede Nacht um 4 Uhr läuft
|
||||
cp /etc/crontab /tmp/crontab
|
||||
|
|
|
|||
|
|
@ -85,7 +85,7 @@ class Installer {
|
|||
}
|
||||
Database::dropTables($pdo);
|
||||
Database::createEmptyTables($pdo, $prefix);
|
||||
Database::setVersion($pdo,$prefix,"2.0.9");
|
||||
Database::setVersion($pdo,$prefix,"2.0.10");
|
||||
Database::setAccessPassword($pdo,$prefix,$adminpass);
|
||||
Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour
|
||||
return array("status" => "OK","msg" => "Installation successful");
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.10">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -13,8 +13,8 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="kitchenbar.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
<script src="kitchenbar.js?v=2.0.10"></script>
|
||||
<style>
|
||||
|
||||
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -7,7 +7,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.10">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<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" />
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui-i18n.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="elements/customers.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
<script src="elements/customers.js?v=2.0.10"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.10">
|
||||
|
||||
<link rel="stylesheet" href="css/ospage.css" />
|
||||
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
<script src="receiptutils.js"></script>
|
||||
<script src="elements/dash.js"></script>
|
||||
<script src="php/3rdparty/Chart.bundle.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ function Groundplan() {
|
|||
$("#createtableqrcodesbtn").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.open("php/contenthandler.php?module=roomtables&command=tableqrcodes&v=2.0.9",'_blank');
|
||||
window.open("php/contenthandler.php?module=roomtables&command=tableqrcodes&v=2.0.10",'_blank');
|
||||
});
|
||||
|
||||
this.bindRoomChanges();
|
||||
|
|
|
|||
|
|
@ -68,7 +68,6 @@ function TSE() {
|
|||
});
|
||||
// TODO: it always ends in the fail state (maybe wrong content sent?)
|
||||
alert("Nach Post");
|
||||
|
||||
} else {
|
||||
$(instance.outputelem).val('Command: ' + request);
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.10">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
<script src="kitchenbar.js"></script>
|
||||
<style>
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.10">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.10">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -10,8 +10,8 @@
|
|||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="manifest" href="manifest.webmanifest">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.10">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.10">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle-brightenergy.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" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
@ -140,7 +140,7 @@ function displayLoginOrLogoutMask(jsonContent) {
|
|||
// user needs to log in!
|
||||
$("#passwordfield").val("");
|
||||
$("#logoutarea").hide();
|
||||
setTimeout(function(){document.location.href = "index.html?v=2.0.9";},250);
|
||||
setTimeout(function(){document.location.href = "index.html?v=2.0.10";},250);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -240,7 +240,7 @@ function handleResultOfInstallCheck(is_installed) {
|
|||
if (is_installed == "Yes") {
|
||||
useInstallation();
|
||||
} else {
|
||||
setTimeout(function(){document.location.href = "install.html?v=2.0.9";},500);
|
||||
setTimeout(function(){document.location.href = "install.html?v=2.0.10";},500);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -312,11 +312,11 @@ $(document).on("pageinit", "#index-page", function () {
|
|||
|
||||
<div data-role="content">
|
||||
|
||||
<p><div id="toplogolocation" style="text-align: center;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=2.0.9&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.10&style=always" style="max-height:150px;"/></div>
|
||||
<div data-role="collapsible" data-content-theme="c" data-collapsed="false" data-theme="e" id="loginmask">
|
||||
<H2>Anmelden</H2>
|
||||
|
||||
<p><div id="middlelogolocation" style="text-align: left;padding-left: 80px;padding-right:80px;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=2.0.9&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.10&style=always" style="max-height:150px;"/></div>
|
||||
|
||||
<div class="loginarea">
|
||||
<form method="post">
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<meta charset="UTF-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<title>Setup</title>
|
||||
<link rel="stylesheet" type="text/css" href="css/installstyle.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/installstyle.css?v=2.0.10">
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="utilities.js"></script>
|
||||
|
||||
|
|
@ -48,7 +48,7 @@ var WORKING = ["Arbeitet...","Working...","Trabajando..."];
|
|||
var DB_SETTING_WRONG = ["Datenbank-Angaben falsch","Data base values wrong","Datos de la base de datos falsos"];
|
||||
var ERROR = ["Installation/Update nicht erfolgreich: ", "Install/Update not performed: ", "Problema con el update/instal: "];
|
||||
var UPDATE_OK = ["Update erfolgreich! Bitte install-Verzeichnis löschen. Bitte beachten Sie, dass die Software im Fehlerfall Debug-Daten an den Anbieter sendet. Mehr Infos dazu auf der Homepage.","Update successful! Please remove install directory. Please be aware that debug data will be sent to the provider in case of malfunctions.","Update completo. Esta recomendado removar el fichero 'install'. Por favor dar cuenta que debug data esta enviado fuera en caso de malfunctions."];
|
||||
var AUTO_UPDATE_OK = ["Update erfolgreich! Bitte vergessen Sie nicht, auch den Printserver zu updaten, wenn Sie von einer Version 1.x auf 2.x aktualisiert haben. Bitte beachten Sie, dass die Software im Fehlerfall Debug-Daten an den Anbieter sendet. Mehr Infos dazu auf der Homepage.","Update successful! Please do not forget to update the printservers if you have updated from version 1.x to 2.x. Please be aware that debug data will be sent to the provider in case of malfunctions.","Update completo. No olvide el printserver si quiere usa sus funciones nuevas. Por favor dar cuenta que debug data esta enviado fuera en caso de malfunctions."];
|
||||
var AUTO_UPDATE_OK = ["Update erfolgreich! Bitte vergessen Sie nicht, auch den TSEConnector zu updaten, und ebenso den Printserver, wenn Sie von einer Version 1.x auf 2.x aktualisiert haben. Bitte beachten Sie, dass die Software im Fehlerfall Debug-Daten an den Anbieter sendet. Mehr Infos dazu auf der Homepage.","Update successful! Please do not forget to update the printservers if you have updated from version 1.x to 2.x. Please be aware that debug data will be sent to the provider in case of malfunctions.","Update completo. No olvide el printserver si quiere usa sus funciones nuevas. Por favor dar cuenta que debug data esta enviado fuera en caso de malfunctions."];
|
||||
|
||||
var SAMPLE_HEADLINE = ["Sie können die Datenbank mit Beispieldaten füllen. Diese können später beliebig wieder in der Administrations- und Artikelansicht verändert werden.",
|
||||
"You can fill the data base with sample data. The content can later be changed in the manager and product view.",
|
||||
|
|
@ -970,7 +970,7 @@ El servicio web OrderSprinter no requiere una conexión a Internet. Sin embargo,
|
|||
<tr id=updateline>
|
||||
<td> </td>
|
||||
<td align=center>
|
||||
<button id="updatebtn" class="updatebtn">Update -> 2.0.9</button>
|
||||
<button id="updatebtn" class="updatebtn">Update -> 2.0.10</button>
|
||||
<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>
|
||||
|
|
|
|||
|
|
@ -513,7 +513,7 @@ return;
|
|||
}
|
||||
|
||||
set_time_limit(60*30);
|
||||
$installerVersion = "2.0.9";
|
||||
$installerVersion = "2.0.10";
|
||||
|
||||
$admin = new InstallAdmin();
|
||||
$pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.10">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -13,8 +13,8 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="kitchenbar.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
<script src="kitchenbar.js?v=2.0.10"></script>
|
||||
<style>
|
||||
|
||||
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.10">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<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="https://code.jquery.com/jquery-1.11.3.js"></script> -->
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="elements/tablemap.js?v=2.0.9"></script>
|
||||
<script src="elements/roommap.js?v=2.0.9"></script>
|
||||
<script src="elements/groundplan.js?v=2.0.9"></script>
|
||||
<script src="elements/tse.js?v=2.0.9"></script>
|
||||
<script src="elements/closing.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
<script src="elements/tablemap.js?v=2.0.10"></script>
|
||||
<script src="elements/roommap.js?v=2.0.10"></script>
|
||||
<script src="elements/groundplan.js?v=2.0.10"></script>
|
||||
<script src="elements/tse.js?v=2.0.10"></script>
|
||||
<script src="elements/closing.js?v=2.0.10"></script>
|
||||
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
|
|
@ -1719,7 +1719,7 @@ function initRestoreFileUpload() {
|
|||
} else {
|
||||
alert("Import war erfolgreich.");
|
||||
setTimeout(function(){
|
||||
document.location.href = "index.html?v=2.0.9";
|
||||
document.location.href = "index.html?v=2.0.10";
|
||||
},250);
|
||||
}
|
||||
},
|
||||
|
|
@ -2115,37 +2115,37 @@ function bindConfig() {
|
|||
$("#samplerectemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getrectemplate&v=2.0.9",null,handleGetRecTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getrectemplate&v=2.0.10",null,handleGetRecTemplate,null);
|
||||
});
|
||||
$("#sampleclstemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getclstemplate&v=2.0.9",null,handleGetClsTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getclstemplate&v=2.0.10",null,handleGetClsTemplate,null);
|
||||
});
|
||||
$("#samplecashtemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getcashtemplate&v=2.0.9",null,handleGetCashTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getcashtemplate&v=2.0.10",null,handleGetCashTemplate,null);
|
||||
});
|
||||
$("#samplefoodworktemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getfoodworktemplate&v=2.0.9",null,handleGetFoodTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getfoodworktemplate&v=2.0.10",null,handleGetFoodTemplate,null);
|
||||
});
|
||||
$("#sampledrinkworktemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getdrinkworktemplate&v=2.0.9",null,handleGetDrinkTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getdrinkworktemplate&v=2.0.10",null,handleGetDrinkTemplate,null);
|
||||
});
|
||||
$("#samplecanceltemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getcanceltemplate&v=2.0.9",null,handleGetCancelTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getcanceltemplate&v=2.0.10",null,handleGetCancelTemplate,null);
|
||||
});
|
||||
$("#samplepickuptemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getpickuptemplate&v=2.0.9",null,handleGetPickupTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getpickuptemplate&v=2.0.10",null,handleGetPickupTemplate,null);
|
||||
});
|
||||
|
||||
$("#changeConfig").off("click").on("click", function (e) {
|
||||
|
|
@ -2273,38 +2273,38 @@ function binding() {
|
|||
$("#backup_btn").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=2.0.9";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=2.0.10";
|
||||
});
|
||||
|
||||
$("#backup_btnall").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=2.0.9";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=2.0.10";
|
||||
});
|
||||
|
||||
$("#backup_btnalllogs").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=2.0.9";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=2.0.10";
|
||||
});
|
||||
|
||||
$("#backup_btnftpall").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
showProgressPopup();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=2.0.9",null,handleFtpResult,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=2.0.10",null,handleFtpResult,null);
|
||||
});
|
||||
|
||||
$("#backup_debugdata").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=2.0.9",'_blank');
|
||||
window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=2.0.10",'_blank');
|
||||
});
|
||||
|
||||
$("#backupguests_btn").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=2.0.9";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=2.0.10";
|
||||
});
|
||||
|
||||
$("#golive").off("click").on("click", function (e) {
|
||||
|
|
@ -2502,7 +2502,7 @@ function updateOneSingleFile() {
|
|||
setTimeout(function(){
|
||||
$("#sliderarea").hide();
|
||||
var millis=getMillis();
|
||||
document.location.href = "install.html?v=2.0.9&mode=onlyupdate&n=" + millis;
|
||||
document.location.href = "install.html?v=2.0.10&mode=onlyupdate&n=" + millis;
|
||||
},250);
|
||||
}
|
||||
}
|
||||
|
|
@ -4682,7 +4682,7 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
<select id="tsecmdsel" data-theme="e">
|
||||
<option value="factory_reset">Factory Reset</option>
|
||||
<option value="forceselftest" >Selbsttest</option>
|
||||
<option value="getinfo">Information auslesen</option>
|
||||
<option value="getinfo" selected>Information auslesen</option>
|
||||
<option value="getlog">Protokoll</option>
|
||||
<!-- <option value="exportdownload">TAR-Export Download</option>-->
|
||||
<option value="exportlocal">TAR-Export lokal</option>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1558,7 +1558,7 @@ class Admin {
|
|||
$view = "preferences.html";
|
||||
}
|
||||
|
||||
echo json_encode($view . "?v=2.0.9");
|
||||
echo json_encode($view . "?v=2.0.10");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1773,31 +1773,31 @@ class Admin {
|
|||
|
||||
if (!self::isOnlyRatingUser($rights, $right_rating, true)) {
|
||||
if ($_SESSION['modus'] == 0) {
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=2.0.9"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=2.0.10"); }
|
||||
} else {
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=2.0.9"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=2.0.10"); }
|
||||
}
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=2.0.9"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=2.0.9"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=2.0.9"); }
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=2.0.10"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=2.0.10"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=2.0.10"); }
|
||||
if ($_SESSION['modus'] == 0) {
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=2.0.9"); }
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=2.0.10"); }
|
||||
}
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=2.0.9"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=2.0.9"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=2.0.9"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=2.0.9"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=2.0.9"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=2.0.9"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=2.0.9"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=2.0.9"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=2.0.9"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=2.0.9"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=2.0.9");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=2.0.9"); }
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=2.0.10"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=2.0.10"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=2.0.10"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=2.0.10"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=2.0.10"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=2.0.10"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=2.0.10"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=2.0.10"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=2.0.10"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=2.0.10"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=2.0.10");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=2.0.10"); }
|
||||
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=2.0.9");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=2.0.9");
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=2.0.10");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=2.0.10");
|
||||
}
|
||||
|
||||
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
||||
|
|
|
|||
|
|
@ -892,7 +892,7 @@ class Customers {
|
|||
$txt = "<head>";
|
||||
$txt .= "<title>" . self::$CUS_OVERVIEW[$lang] . "</title>";
|
||||
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=2.0.9">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=2.0.10">';
|
||||
$txt .= "</head>";
|
||||
return $txt;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
|
|||
if (strlen($status) > 150) {
|
||||
$status = substr($status, 0,149);
|
||||
}
|
||||
$version = "2.0.9";
|
||||
$version = "2.0.10";
|
||||
|
||||
$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ class Reservation {
|
|||
$txt = "<html><head>";
|
||||
$txt .= "<title>Reservierungsübersicht</title>";
|
||||
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=2.0.9">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=2.0.10">';
|
||||
$txt .= "</head>";
|
||||
$txt .= "<body>";
|
||||
$txt .= "<h1>Reservierungsübersicht für $day.$month.$year</h1><p>";
|
||||
|
|
|
|||
|
|
@ -638,7 +638,7 @@ class Roomtables {
|
|||
$txt = "<html><head>";
|
||||
$txt .= "<title>Tisch QR-Codes für die Gastbestellung</title>";
|
||||
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=2.0.9">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=2.0.10">';
|
||||
$txt .= "</head>";
|
||||
$txt .= "<body>";
|
||||
$txt .= "<h1>Tisch QR-Codes für die Gastbestellung</h1><p>";
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ class OsQrcode {
|
|||
readfile(__DIR__. '/../../img/oops.png');
|
||||
return;
|
||||
} else {
|
||||
$text = $serverurl . "/nfclogin.php?a=" . $passhash . "_" . $userid . "&v=2.0.9";
|
||||
$text = $serverurl . "/nfclogin.php?a=" . $passhash . "_" . $userid . "&v=2.0.10";
|
||||
QRcode::png($text);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -78,6 +78,12 @@ class Tse {
|
|||
"cmd" => $request
|
||||
);
|
||||
|
||||
if (($request == "setup") || ($request == "factory_reset")) {
|
||||
$hist = new HistFiller();
|
||||
$hist->updateConfigInHist($pdo, 'tsepin', implode(',',$tseparams['pin']));
|
||||
$hist->updateConfigInHist($pdo, 'tsepuk', implode(',',$tseparams['puk']));
|
||||
}
|
||||
|
||||
$data = json_encode($transferdata);
|
||||
$transferdataBase64 = base64_encode($data);
|
||||
|
||||
|
|
|
|||
|
|
@ -1597,6 +1597,9 @@ class Version {
|
|||
public static function upd_2008_2009($pdo, $prefix, $dbname) {
|
||||
return array(true);
|
||||
}
|
||||
public static function upd_2009_2010($pdo, $prefix, $dbname) {
|
||||
return array(true);
|
||||
}
|
||||
|
||||
public static $updateOrder = array(
|
||||
"1.3.0" => array("upd_1300_1301","1.3.1"),
|
||||
|
|
@ -1699,7 +1702,8 @@ class Version {
|
|||
"2.0.5" => array("upd_2005_2006","2.0.6"),
|
||||
"2.0.6" => array("upd_2006_2007","2.0.7"),
|
||||
"2.0.7" => array("upd_2007_2008","2.0.8"),
|
||||
"2.0.8" => array("upd_2008_2009","2.0.9")
|
||||
"2.0.8" => array("upd_2008_2009","2.0.9"),
|
||||
"2.0.9" => array("upd_2009_2010","2.0.10")
|
||||
);
|
||||
|
||||
public static function runUpdateProcess($pdo,$prefix, $dbname, $untilVersion,$checkValidVersion) {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.10">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.10">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.10">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="elements/product.js?v=2.0.9"></script>
|
||||
<script src="elements/extra.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
<script src="elements/product.js?v=2.0.10"></script>
|
||||
<script src="elements/extra.js?v=2.0.10"></script>
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.10">
|
||||
|
||||
<link rel="stylesheet" href="css/ospage.css" />
|
||||
<link rel="stylesheet" href="css/tablepanel.css" />
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
<script src="php/3rdparty/jquery-2.2.4.min.js"></script>
|
||||
<script src="php/3rdparty/jqueryui1-12-0/jquery-ui.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
|
||||
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.10">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.10">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
<script src="elements/rating.js"></script>
|
||||
</head>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/osdatepicker.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.10">
|
||||
<link rel="stylesheet" type="text/css" href="css/osdatepicker.css?v=2.0.10">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<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.mobile-1.4.5.min.js"></script>
|
||||
<script src="elements/tablemap.js"></script>
|
||||
<script src="elements/reservation.js?v=2.0.9"></script>
|
||||
<script src="elements/osdatepicker.js?v=2.0.9"></script>
|
||||
<script src="elements/reservation.js?v=2.0.10"></script>
|
||||
<script src="elements/osdatepicker.js?v=2.0.10"></script>
|
||||
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
|
||||
|
|
@ -627,7 +627,7 @@ function bindCancelButtn() {
|
|||
var year = date.getFullYear();
|
||||
var dateStr = year + "-" + month + "-" + day;
|
||||
|
||||
setTimeout(function(){document.location.href = "reservation.html?v=2.0.9&date=" + dateStr;},500);
|
||||
setTimeout(function(){document.location.href = "reservation.html?v=2.0.10&date=" + dateStr;},500);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
@ -30,7 +30,7 @@ var SUM_REASON = ["Grund","Reason","Razón"];
|
|||
var SUM_CANCEL_ITEM = ["Stornierung","Cancellation","Revocación"];
|
||||
var SUM_CANCELLATION_OK = ["Die Zahlung wurde in OrderSprinter storniert.","The payment was cancelled in OrderSprinter.","El pago se canceló en OrderSprinter."];
|
||||
|
||||
var nextpage = "paydesk.html?version=2.0.9";
|
||||
var nextpage = "paydesk.html?version=2.0.10";
|
||||
|
||||
var lang;
|
||||
|
||||
|
|
@ -84,10 +84,10 @@ function setLanguage(language) {
|
|||
|
||||
if (nextPage == "p") {
|
||||
$("#nextpagebtntxt").html(SUM_TO_PAYMENT[lang]);
|
||||
nextpage = "paydesk.html?t=" + tableid + "&version=2.0.9";
|
||||
nextpage = "paydesk.html?t=" + tableid + "&version=2.0.10";
|
||||
} else {
|
||||
$("#nextpagebtntxt").html(SUM_TO_ORDER[lang]);
|
||||
nextpage = "waiter.html?version=2.0.9";
|
||||
nextpage = "waiter.html?version=2.0.10";
|
||||
}
|
||||
|
||||
var txt = "<table class='viewtable'>";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.10">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
<style>
|
||||
|
||||
#tableWithPreparedProds,#tableWithDeliveredEntries,#headertableToCook
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.10">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.9">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.10">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=2.0.9"></script>
|
||||
<script src="utilities.js?v=2.0.10"></script>
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue