OrderSprinter 1.6.8
This commit is contained in:
parent
46b9bd0301
commit
033e25d8f0
|
|
@ -9,8 +9,8 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" href="css/gueststyle.css?v=1.6.7" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.6.7" />
|
||||
<link rel="stylesheet" href="css/gueststyle.css?v=1.6.8" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.6.8" />
|
||||
<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">1.6.7 </div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo">1.6.8 </div>
|
||||
</div><!-- /grid-a -->
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -114,10 +114,10 @@ if (isset($_POST['code'])) {
|
|||
} else {
|
||||
echo "<html>";
|
||||
echo "<head><title>Installation Gastsystem</title>";
|
||||
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.6.7">';
|
||||
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.6.8">';
|
||||
echo "</head>";
|
||||
echo "<body><div class=surround>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.6.7</span><br><br>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.6.8</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>";
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -85,7 +85,7 @@ class Installer {
|
|||
}
|
||||
Database::dropTables($pdo);
|
||||
Database::createEmptyTables($pdo, $prefix);
|
||||
Database::setVersion($pdo,$prefix,"1.6.7");
|
||||
Database::setVersion($pdo,$prefix,"1.6.8");
|
||||
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.
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.8">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -13,8 +13,8 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=1.6.7"></script>
|
||||
<script src="kitchenbar.js?v=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></script>
|
||||
<script src="kitchenbar.js?v=1.6.8"></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=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.8">
|
||||
|
||||
<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=1.6.7"></script>
|
||||
<script src="elements/customers.js?v=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></script>
|
||||
<script src="elements/customers.js?v=1.6.8"></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=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.8">
|
||||
|
||||
<link rel="stylesheet" href="css/ospage.css" />
|
||||
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></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=1.6.7",'_blank');
|
||||
window.open("php/contenthandler.php?module=roomtables&command=tableqrcodes&v=1.6.8",'_blank');
|
||||
});
|
||||
|
||||
this.bindRoomChanges();
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.8">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></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=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.8">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.6.8">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.8">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.6.8">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
@ -132,7 +132,7 @@ function displayLoginOrLogoutMask(jsonContent) {
|
|||
// user needs to log in!
|
||||
$("#passwordfield").val("");
|
||||
$("#logoutarea").hide();
|
||||
setTimeout(function(){document.location.href = "index.html?v=1.6.7"},250);
|
||||
setTimeout(function(){document.location.href = "index.html?v=1.6.8"},250);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -232,7 +232,7 @@ function handleResultOfInstallCheck(is_installed) {
|
|||
if (is_installed == "Yes") {
|
||||
useInstallation();
|
||||
} else {
|
||||
setTimeout(function(){document.location.href = "install.html?v=1.6.7"},500);
|
||||
setTimeout(function(){document.location.href = "install.html?v=1.6.8"},500);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -295,11 +295,11 @@ $(document).on("pageinit", "#index-page", function () {
|
|||
|
||||
<div data-role="content">
|
||||
|
||||
<p><div id="toplogolocation" style="text-align: center;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=1.6.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=1.6.8&style=always" style="max-height:150px;"/></div>
|
||||
<div data-role="collapsible" data-content-theme="c" data-collapsed="false" data-theme="e" id="loginmask">
|
||||
<H2>Anmelden</H2>
|
||||
|
||||
<p><div id="middlelogolocation" style="text-align: left;padding-left: 80px;padding-right:80px;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=1.6.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=1.6.8&style=always" style="max-height:150px;"/></div>
|
||||
|
||||
<form method="post">
|
||||
<table border=0>
|
||||
|
|
|
|||
|
|
@ -225,14 +225,13 @@ function fillDbVals(dbVals) {
|
|||
}
|
||||
}
|
||||
|
||||
function answerOfTestDb(jsonText) {
|
||||
if (jsonText.toLowerCase() == 'error') {
|
||||
var wrongtxt = WRONG[lang];
|
||||
$("#testdbstatus").html("<b style='color:red;'>" + wrongtxt + "</b>");
|
||||
$("#testdbstatus").data("status",false);
|
||||
} else {
|
||||
function answerOfTestDb(answer) {
|
||||
if ((answer.status == "OK") && (answer.ok == 1)) {
|
||||
$("#testdbstatus").html("<b style='color:green;'>OK</b>");
|
||||
$("#testdbstatus").data("status",true);
|
||||
} else {
|
||||
$("#testdbstatus").html("<b style='color:red;'>" + answer.msg + "</b>");
|
||||
$("#testdbstatus").data("status",false);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -915,7 +914,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">Update -> 1.6.7</button>
|
||||
<button id="updatebtn">Update -> 1.6.8</button>
|
||||
<span id="updateinprogresstxt" style="display:none;"><img id="installprogressindicator" src="php/3rdparty/images/ajax-loader.gif" alt="Progress indication" style="display:none;"/> Update... bitte warten.</span>
|
||||
</td>
|
||||
<td> </td>
|
||||
|
|
|
|||
|
|
@ -61,7 +61,6 @@ $pdo = new PDO($dsn, $user, $password);
|
|||
$pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
|
||||
}
|
||||
catch (PDOException $e) {
|
||||
echo 'Verbindungsproblem: ' . $e->getMessage();
|
||||
$pdo = null;
|
||||
}
|
||||
return $pdo;
|
||||
|
|
@ -175,11 +174,17 @@ HistFiller::createUserInHist($pdo, $newUserIdForHist);
|
|||
|
||||
function testDbConnection($host,$dbname,$user,$pass) {
|
||||
$pdo = $this->openDbAndReturnPdo($host,$dbname,$user,$pass);
|
||||
if (!is_null($pdo)) {
|
||||
echo json_encode("OK");
|
||||
} else {
|
||||
echo json_encode("ERROR");
|
||||
if (is_null($pdo)) {
|
||||
echo json_encode(array("status" => "ERROR","msg" => "ERROR: DB-Zugriff"));
|
||||
return;
|
||||
}
|
||||
$privileges = DbUtils::checkForInstallUpdateDbRights($pdo);
|
||||
if ($privileges["status"] != "OK") {
|
||||
echo json_encode(array("status" => "ERROR","msg" => "ERROR: Rechteabfrage"));
|
||||
return;
|
||||
}
|
||||
$missingRights = "Fehlende Rechte:" . join(',',$privileges["msg"]);
|
||||
echo json_encode(array("status" => "OK","msg" => $missingRights, "ok" => $privileges["ok"]));
|
||||
}
|
||||
|
||||
function writeConfigFile($host,$db,$user,$password,$prefix) {
|
||||
|
|
@ -311,10 +316,10 @@ try {
|
|||
if (isset($_POST['host']) && isset($_POST['dbname']) && isset($_POST['user']) && isset($_POST['pass'])) {
|
||||
$admin->testDbConnection($_POST['host'],$_POST['dbname'],$_POST['user'],$_POST['pass']);
|
||||
} else {
|
||||
echo json_encode("ERROR");
|
||||
echo json_encode(array("status" => "ERROR","msg" => "ERROR"));
|
||||
}
|
||||
} catch (Exception $e) {
|
||||
echo json_encode("ERROR");
|
||||
echo json_encode(array("status" => "ERROR","msg" => "ERROR"));
|
||||
}
|
||||
} else if ($command == 'getConfig') {
|
||||
$configWriter = new ConfigWriter();
|
||||
|
|
@ -455,7 +460,7 @@ return;
|
|||
}
|
||||
|
||||
set_time_limit(60*30);
|
||||
$installerVersion = "1.6.7";
|
||||
$installerVersion = "1.6.8";
|
||||
|
||||
$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=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.8">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -13,8 +13,8 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=1.6.7"></script>
|
||||
<script src="kitchenbar.js?v=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></script>
|
||||
<script src="kitchenbar.js?v=1.6.8"></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=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.8">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -13,10 +13,10 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
<script src="utilities.js?v=1.6.7"></script>
|
||||
<script src="elements/tablemap.js?v=1.6.7"></script>
|
||||
<script src="elements/roommap.js?v=1.6.7"></script>
|
||||
<script src="elements/groundplan.js?v=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></script>
|
||||
<script src="elements/tablemap.js?v=1.6.8"></script>
|
||||
<script src="elements/roommap.js?v=1.6.8"></script>
|
||||
<script src="elements/groundplan.js?v=1.6.8"></script>
|
||||
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
|
|
@ -1772,7 +1772,7 @@ function initRestoreFileUpload() {
|
|||
} else {
|
||||
alert("Import war erfolgreich.");
|
||||
setTimeout(function(){
|
||||
document.location.href = "index.html?v=1.6.7";
|
||||
document.location.href = "index.html?v=1.6.8";
|
||||
},250);
|
||||
}
|
||||
},
|
||||
|
|
@ -2135,7 +2135,7 @@ function bindConfig() {
|
|||
$("#samplerectemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getrectemplate&v=1.6.7",null,handleGetRecTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getrectemplate&v=1.6.8",null,handleGetRecTemplate,null);
|
||||
})
|
||||
|
||||
$("#changeConfig").off("click").on("click", function (e) {
|
||||
|
|
@ -2261,38 +2261,38 @@ function binding() {
|
|||
$("#backup_btn").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=1.6.7";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=1.6.8";
|
||||
});
|
||||
|
||||
$("#backup_btnall").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=1.6.7";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=1.6.8";
|
||||
});
|
||||
|
||||
$("#backup_btnalllogs").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=1.6.7";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=1.6.8";
|
||||
});
|
||||
|
||||
$("#backup_btnftpall").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
showProgressPopup();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=1.6.7",null,handleFtpResult,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=1.6.8",null,handleFtpResult,null);
|
||||
});
|
||||
|
||||
$("#backup_debugdata").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=1.6.7",'_blank');
|
||||
window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=1.6.8",'_blank');
|
||||
});
|
||||
|
||||
$("#backupguests_btn").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=1.6.7";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=1.6.8";
|
||||
});
|
||||
|
||||
$("#golive").off("click").on("click", function (e) {
|
||||
|
|
@ -2473,7 +2473,7 @@ function updateOneSingleFile() {
|
|||
setTimeout(function(){
|
||||
$("#sliderarea").hide();
|
||||
var millis=getMillis();
|
||||
document.location.href = "install.html?v=1.6.7&mode=onlyupdate&n=" + millis;
|
||||
document.location.href = "install.html?v=1.6.8&mode=onlyupdate&n=" + millis;
|
||||
},250);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1457,7 +1457,7 @@ class Admin {
|
|||
$view = "preferences.html";
|
||||
}
|
||||
|
||||
echo json_encode($view . "?v=1.6.7");
|
||||
echo json_encode($view . "?v=1.6.8");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1684,31 +1684,31 @@ class Admin {
|
|||
|
||||
if (!self::isOnlyRatingUser($rights, $right_rating, true)) {
|
||||
if ($_SESSION['modus'] == 0) {
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.6.7"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.6.8"); }
|
||||
} else {
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.6.7"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.6.8"); }
|
||||
}
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.6.7"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.6.7"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.6.7"); }
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.6.8"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.6.8"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.6.8"); }
|
||||
if ($_SESSION['modus'] == 0) {
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.6.7"); }
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.6.8"); }
|
||||
}
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.6.7"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.6.7"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.6.7"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.6.7"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.6.7"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.6.7"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.6.7"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.6.7"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.6.7"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.6.7"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.6.7");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.6.7"); }
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.6.8"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.6.8"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.6.8"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.6.8"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.6.8"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.6.8"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.6.8"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.6.8"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.6.8"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.6.8"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.6.8");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.6.8"); }
|
||||
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.6.7");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.6.7");
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.6.8");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.6.8");
|
||||
}
|
||||
|
||||
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
||||
|
|
@ -2215,7 +2215,7 @@ class Admin {
|
|||
"printpass" => array("dbcol" => "printpass","checknum" => 0),
|
||||
"companyinfo" => array("dbcol" => "companyinfo","checknum" => 0,"ismasterdata" => 1),
|
||||
"hosttext" => array("dbcol" => "hosttext","checknum" => 0),
|
||||
"rectemplate" => array("dbcol" => "rectemplate","checknum" => 0,"ismasterdata" => 1),
|
||||
"rectemplate" => array("dbcol" => "rectemplate","checknum" => 0),
|
||||
"foodtemplate" => array("dbcol" => "foodtemplate","checknum" => 0),
|
||||
"drinktemplate" => array("dbcol" => "drinktemplate","checknum" => 0),
|
||||
"canceltemplate" => array("dbcol" => "canceltemplate","checknum" => 0),
|
||||
|
|
@ -2250,19 +2250,19 @@ class Admin {
|
|||
"digiprintwork" => array("dbcol" => "digiprintwork","checknum" => 0),
|
||||
"groupworkitemsf" => array("dbcol" => "groupworkitemsf","checknum" => 0),
|
||||
"groupworkitemsd" => array("dbcol" => "groupworkitemsd","checknum" => 0),
|
||||
"workflowconfig" => array("dbcol" => "workflowconfig","checknum" => 0,"ismasterdata" => 1),
|
||||
"workflowconfig" => array("dbcol" => "workflowconfig","checknum" => 0),
|
||||
"dashslot1" => array("dbcol" => "dashslot1","checknum" => 0),
|
||||
"dashslot2" => array("dbcol" => "dashslot2","checknum" => 0),
|
||||
"dashslot3" => array("dbcol" => "dashslot3","checknum" => 0),
|
||||
"receiptfontsize" => array("dbcol" => "receiptfontsize","checknum" => 0),
|
||||
"billlanguage" => array("dbcol" => "billlanguage","checknum" => 0,"ismasterdata" => 1),
|
||||
"hotelinterface" => array("dbcol" => "hotelinterface","checknum" => 0,"ismasterdata" => 1),
|
||||
"billlanguage" => array("dbcol" => "billlanguage","checknum" => 0),
|
||||
"hotelinterface" => array("dbcol" => "hotelinterface","checknum" => 0),
|
||||
"hsinfile" => array("dbcol" => "hsinfile","checknum" => 0),
|
||||
"hsoutfile" => array("dbcol" => "hsoutfile","checknum" => 0),
|
||||
"hscurrency" => array("dbcol" => "hscurrency","checknum" => 0),
|
||||
"reservationnote" => array("dbcol" => "reservationnote","checknum" => 0),
|
||||
"remoteaccesscode" => array("dbcol" => "remoteaccesscode","checknum" => 0),
|
||||
"webimpressum" => array("dbcol" => "webimpressum","checknum" => 0,"ismasterdata" => 1),
|
||||
"webimpressum" => array("dbcol" => "webimpressum","checknum" => 0),
|
||||
"cancelunpaidcode" => array("dbcol" => "cancelunpaidcode","checknum" => 0),
|
||||
"cancelguestcode" => array("dbcol" => "cancelguestcode","checknum" => 0),
|
||||
"printandqueuejobs" => array("dbcol" => "printandqueuejobs","checknum" => 0),
|
||||
|
|
@ -3289,7 +3289,6 @@ class Admin {
|
|||
}
|
||||
$_SESSION = array();
|
||||
|
||||
session_destroy();
|
||||
|
||||
// Swipe via memory
|
||||
if (ini_get("session.use_cookies")) {
|
||||
|
|
|
|||
|
|
@ -891,7 +891,7 @@ class Customers {
|
|||
$txt = "<head>";
|
||||
$txt .= "<title>" . self::$CUS_OVERVIEW[$lang] . "</title>";
|
||||
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.6.7">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.6.8">';
|
||||
$txt .= "</head>";
|
||||
return $txt;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -139,6 +139,8 @@ class DbUtils {
|
|||
$out = str_replace("%tasks%",$prefix . 'tasks', $out);
|
||||
$out = str_replace("%taskhist%",$prefix . 'taskhist', $out);
|
||||
|
||||
$out = str_replace("%testchk%",$prefix . 'testchk',$out);
|
||||
|
||||
return (str_replace("%prodtype%",$prefix . 'prodtype',$out));
|
||||
}
|
||||
|
||||
|
|
@ -238,4 +240,71 @@ class DbUtils {
|
|||
array("col" => 'display', "hist" => 1, "property" => "display"),
|
||||
array("col" => 'removed', "hist" => 0)
|
||||
);
|
||||
|
||||
private static function dropDBTable($pdo,$tablename) {
|
||||
try {
|
||||
CommonUtils::execSql($pdo, "DROP TABLE $tablename", null);
|
||||
return true;
|
||||
} catch (Exception $ex) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
public static function checkForInstallUpdateDbRights($pdo) {
|
||||
try {
|
||||
$result = CommonUtils::fetchSqlAll($pdo, "SELECT * from %config% LIMIT 4", null);
|
||||
} catch (Exception $ex) {
|
||||
return array("status" => "OK","msg" => array("SELECT"),"ok" => 0);
|
||||
}
|
||||
|
||||
$tableexists = false;
|
||||
try {
|
||||
$result = CommonUtils::fetchSqlAll($pdo, "SELECT 1 from %testchk% LIMIT 1", null);
|
||||
if (count($result) >= 0) {
|
||||
$tableexists = true;
|
||||
}
|
||||
} catch (Exception $ex) {
|
||||
$tableexists = false;
|
||||
}
|
||||
|
||||
if ($tableexists) {
|
||||
$ok = self::dropDBTable($pdo, '%testchk%');
|
||||
if (!$ok) {
|
||||
return array("status" => "OK","msg" => array("DROP"),"ok" => 0);
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
$sql = "CREATE TABLE `%testchk%` (`id` INT (3)) CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE = InnoDb";
|
||||
CommonUtils::execSql($pdo, $sql, null);
|
||||
} catch (Exception $ex) {
|
||||
return array("status" => "OK","msg" => array("CREATE"),"ok" => 0);
|
||||
}
|
||||
$missingRights = array();
|
||||
try {
|
||||
CommonUtils::execSql($pdo, "ALTER TABLE %testchk% ADD testfield INT(1) NULL DEFAULT '0' AFTER id", null);
|
||||
} catch (Exception $ex) {
|
||||
$missingRights[] = "ALTER";
|
||||
}
|
||||
try {
|
||||
CommonUtils::execSql($pdo, "INSERT INTO %testchk% (id,testfield) VALUES(?,?)", array(1,2));
|
||||
} catch (Exception $ex) {
|
||||
$missingRights[] = "INSERT";
|
||||
}
|
||||
try {
|
||||
CommonUtils::execSql($pdo, "UPDATE %testchk% SET testfield=? WHERE id=?", array(10,1));
|
||||
} catch (Exception $ex) {
|
||||
$missingRights[] = "UPDATE";
|
||||
}
|
||||
$ok = self::dropDBTable($pdo, '%testchk%');
|
||||
if (!$ok) {
|
||||
$missingRights[] = "DROP";
|
||||
}
|
||||
|
||||
if (count($missingRights) == 0) {
|
||||
return array("status" => "OK","msg" => $missingRights,"ok" => 1);
|
||||
} else {
|
||||
return array("status" => "OK","msg" => $missingRights,"ok" => 0);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
|
|||
if (strlen($status) > 150) {
|
||||
$status = substr($status, 0,149);
|
||||
}
|
||||
$version = "1.6.7";
|
||||
$version = "1.6.8";
|
||||
|
||||
$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -54,7 +54,8 @@ class Products {
|
|||
}
|
||||
}
|
||||
|
||||
$cmdsForMasterDataChange = array('applySingleProdData', 'createExtra', 'applyExtra', 'delExtra','delproduct', 'reassign', 'applyType', 'delType', 'createProduct','createProdType','changesetofproducts');
|
||||
//$cmdsForMasterDataChange = array('applySingleProdData', 'createExtra', 'applyExtra', 'delExtra','delproduct', 'reassign', 'applyType', 'delType', 'createProduct','createProdType','changesetofproducts');
|
||||
$cmdsForMasterDataChange = array();
|
||||
if (in_array($command, $cmdsForMasterDataChange)) {
|
||||
$pdo = DbUtils::openDbAndReturnPdoStatic();
|
||||
if (!CommonUtils::canMasterDataBeChanged($pdo)) {
|
||||
|
|
|
|||
|
|
@ -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=1.6.7">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=1.6.8">';
|
||||
$txt .= "</head>";
|
||||
$txt .= "<body>";
|
||||
$txt .= "<h1>Reservierungsübersicht für $day.$month.$year</h1><p>";
|
||||
|
|
|
|||
|
|
@ -598,7 +598,7 @@ class Roomtables {
|
|||
$txt = "<html><head>";
|
||||
$txt .= "<title>Tisch QR-Codes für die Gastbestellung</title>";
|
||||
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=1.6.7">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=1.6.8">';
|
||||
$txt .= "</head>";
|
||||
$txt .= "<body>";
|
||||
$txt .= "<h1>Tisch QR-Codes für die Gastbestellung</h1><p>";
|
||||
|
|
|
|||
|
|
@ -200,7 +200,7 @@ class Updater {
|
|||
}
|
||||
|
||||
private static function createSubDir($dirname) {
|
||||
if (!is_writable("/..")) {
|
||||
if (!is_writable("..")) {
|
||||
return array("status" => "ERROR","msg" => "Root directory not writable. But this is necessary to create and delete install directory.");
|
||||
}
|
||||
|
||||
|
|
@ -217,6 +217,14 @@ class Updater {
|
|||
}
|
||||
|
||||
public static function updatecheck($pdo) {
|
||||
$res = DbUtils::checkForInstallUpdateDbRights($pdo);
|
||||
if ($res["status"] != "OK") {
|
||||
return array("status" => "ERROR","msg" => $res["msg"]);
|
||||
}
|
||||
if ($res["ok"] == 0) {
|
||||
return array("status" => "ERROR","msg" => "Fehlende DB-Rechte: " . join(",",$res["msg"]));
|
||||
}
|
||||
|
||||
$url = CommonUtils::getConfigValue($pdo, "updateurl", '');
|
||||
|
||||
$infoFile = self::getInfoFile($url,'updateinfo.txt',true,3);
|
||||
|
|
|
|||
|
|
@ -1267,7 +1267,7 @@ class Basedb {
|
|||
if (is_null($version)) {
|
||||
$version = CommonUtils::getConfigValue($pdo, 'version', '0.0.0');
|
||||
}
|
||||
$r = random_int(1000,9999);
|
||||
$r = rand(1000,9999);
|
||||
$sn = $version . '-' . $timestamp . '-' . $r;
|
||||
$hist = new HistFiller();
|
||||
$hist->updateConfigInHist($pdo,'uid', $sn);
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ class OsQrcode {
|
|||
readfile(__DIR__. '/../../img/oops.png');
|
||||
return;
|
||||
} else {
|
||||
$text = $serverurl . "/nfclogin.php?a=" . $passhash . "_" . $userid . "v=1.6.7";
|
||||
$text = $serverurl . "/nfclogin.php?a=" . $passhash . "_" . $userid . "v=1.6.8";
|
||||
QRcode::png($text);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1379,6 +1379,10 @@ class Version {
|
|||
}
|
||||
}
|
||||
|
||||
public static function upd_1607_1608($pdo, $prefix, $dbname) {
|
||||
return array(true);
|
||||
}
|
||||
|
||||
public static $updateOrder = array(
|
||||
"1.3.0" => array("upd_1300_1301","1.3.1"),
|
||||
"1.3.1" => array("upd_1301_1302","1.3.2"),
|
||||
|
|
@ -1467,7 +1471,8 @@ class Version {
|
|||
"1.6.3" => array("upd_1603_1604","1.6.4"),
|
||||
"1.6.4" => array("upd_1604_1605","1.6.5"),
|
||||
"1.6.5" => array("upd_1605_1606","1.6.6"),
|
||||
"1.6.6" => array("upd_1606_1607","1.6.7")
|
||||
"1.6.6" => array("upd_1606_1607","1.6.7"),
|
||||
"1.6.7" => array("upd_1607_1608","1.6.8")
|
||||
);
|
||||
|
||||
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=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.8">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></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=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.8">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
<script src="utilities.js?v=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></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=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.8">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=1.6.7"></script>
|
||||
<script src="elements/product.js?v=1.6.7"></script>
|
||||
<script src="elements/extra.js?v=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></script>
|
||||
<script src="elements/product.js?v=1.6.8"></script>
|
||||
<script src="elements/extra.js?v=1.6.8"></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=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.8">
|
||||
|
||||
<link rel="stylesheet" href="css/ospage.css" />
|
||||
<link rel="stylesheet" href="css/tablepanel.css" />
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
<script src="php/3rdparty/jquery-2.2.4.min.js"></script>
|
||||
<script src="php/3rdparty/jqueryui1-12-0/jquery-ui.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></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=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.8">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></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=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.8">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></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=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/osdatepicker.css?v=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.8">
|
||||
<link rel="stylesheet" type="text/css" href="css/osdatepicker.css?v=1.6.8">
|
||||
<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=1.6.7"></script>
|
||||
<script src="elements/osdatepicker.js?v=1.6.7"></script>
|
||||
<script src="elements/reservation.js?v=1.6.8"></script>
|
||||
<script src="elements/osdatepicker.js?v=1.6.8"></script>
|
||||
|
||||
<script src="utilities.js?v=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></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=1.6.7&date=" + dateStr;},500);
|
||||
setTimeout(function(){document.location.href = "reservation.html?v=1.6.8&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=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
@ -30,7 +30,7 @@ var SUM_REASON = ["Grund","Reason","Razón"];
|
|||
var SUM_CANCEL_ITEM = ["Stornierung","Cancellation","Revocación"];
|
||||
var SUM_CANCELLATION_OK = ["Die Zahlung wurde in OrderSprinter storniert.","The payment was cancelled in OrderSprinter.","El pago se canceló en OrderSprinter."];
|
||||
|
||||
var nextpage = "paydesk.html?version=1.6.7";
|
||||
var nextpage = "paydesk.html?version=1.6.8";
|
||||
|
||||
var lang;
|
||||
|
||||
|
|
@ -84,10 +84,10 @@ function setLanguage(language) {
|
|||
|
||||
if (nextPage == "p") {
|
||||
$("#nextpagebtntxt").html(SUM_TO_PAYMENT[lang]);
|
||||
nextpage = "paydesk.html?t=" + tableid + "&version=1.6.7";
|
||||
nextpage = "paydesk.html?t=" + tableid + "&version=1.6.8";
|
||||
} else {
|
||||
$("#nextpagebtntxt").html(SUM_TO_ORDER[lang]);
|
||||
nextpage = "waiter.html?version=1.6.7";
|
||||
nextpage = "waiter.html?version=1.6.8";
|
||||
}
|
||||
|
||||
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=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.8">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></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=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.8">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></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=1.6.7">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.6.8">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=1.6.7"></script>
|
||||
<script src="utilities.js?v=1.6.8"></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