OrderSprinter 1.5.32
This commit is contained in:
parent
75aa6dcfa1
commit
c3798751cd
|
|
@ -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.5.31" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.31" />
|
||||
<link rel="stylesheet" href="css/gueststyle.css?v=1.5.32" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.32" />
|
||||
<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>
|
||||
|
|
@ -113,7 +113,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.5.31 </div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo">1.5.32 </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.5.31">';
|
||||
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.32">';
|
||||
echo "</head>";
|
||||
echo "<body><div class=surround>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.31</span><br><br>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.32</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.5.31");
|
||||
Database::setVersion($pdo,$prefix,"1.5.32");
|
||||
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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
|
||||
<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.5.31"></script>
|
||||
<script src="kitchenbar.js?v=1.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></script>
|
||||
<script src="kitchenbar.js?v=1.5.32"></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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -21,7 +21,7 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui-i18n.min.js"></script>
|
||||
<script src="utilities.js?v=1.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></script>
|
||||
<script src="receiptutils.js"></script>
|
||||
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -23,7 +23,7 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui-i18n.min.js"></script>
|
||||
<script src="utilities.js?v=1.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></script>
|
||||
<script src="elements/customers.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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
|
||||
<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.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></script>
|
||||
<script src="receiptutils.js"></script>
|
||||
<script src="elements/dash.js"></script>
|
||||
<script src="php/3rdparty/Chart.bundle.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
|
||||
<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.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.32">
|
||||
|
||||
<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.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.32">
|
||||
|
||||
<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.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
@ -231,7 +231,7 @@ function handleResultOfInstallCheck(is_installed) {
|
|||
if (is_installed == "Yes") {
|
||||
useInstallation();
|
||||
} else {
|
||||
setTimeout(function(){document.location.href = "install.html?v=1.5.31"},500);
|
||||
setTimeout(function(){document.location.href = "install.html?v=1.5.32"},500);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -285,11 +285,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.5.31&style=always" style="max-height:150px;"/></div>
|
||||
<p><div id="toplogolocation" style="text-align: center;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=1.5.32&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.5.31&style=always" style="max-height:150px;"/></div>
|
||||
<p><div id="middlelogolocation" style="text-align: left;padding-left: 80px;padding-right:80px;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=1.5.32&style=always" style="max-height:150px;"/></div>
|
||||
|
||||
<form method="post">
|
||||
<table border=0>
|
||||
|
|
|
|||
|
|
@ -916,7 +916,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.5.31</button>
|
||||
<button id="updatebtn">Update -> 1.5.32</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>
|
||||
|
|
|
|||
|
|
@ -455,7 +455,7 @@ return;
|
|||
}
|
||||
|
||||
set_time_limit(60*30);
|
||||
$installerVersion = "1.5.31";
|
||||
$installerVersion = "1.5.32";
|
||||
|
||||
$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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
|
||||
<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.5.31"></script>
|
||||
<script src="kitchenbar.js?v=1.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></script>
|
||||
<script src="kitchenbar.js?v=1.5.32"></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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
|
||||
<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.5.31"></script>
|
||||
<script src="elements/tablemap.js?v=1.5.31"></script>
|
||||
<script src="elements/roommap.js?v=1.5.31"></script>
|
||||
<script src="elements/groundplan.js?v=1.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></script>
|
||||
<script src="elements/tablemap.js?v=1.5.32"></script>
|
||||
<script src="elements/roommap.js?v=1.5.32"></script>
|
||||
<script src="elements/groundplan.js?v=1.5.32"></script>
|
||||
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
|
|
@ -1673,7 +1673,7 @@ function initRestoreFileUpload() {
|
|||
} else {
|
||||
alert("Import war erfolgreich.");
|
||||
setTimeout(function(){
|
||||
document.location.href = "index.html?v=1.5.31";
|
||||
document.location.href = "index.html?v=1.5.32";
|
||||
},250);
|
||||
}
|
||||
},
|
||||
|
|
@ -2155,38 +2155,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.5.31";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=1.5.32";
|
||||
});
|
||||
|
||||
$("#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.5.31";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=1.5.32";
|
||||
});
|
||||
|
||||
$("#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.5.31";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=1.5.32";
|
||||
});
|
||||
|
||||
$("#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.5.31",null,handleFtpResult,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=1.5.32",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.5.31",'_blank');
|
||||
window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=1.5.32",'_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.5.31";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=1.5.32";
|
||||
});
|
||||
|
||||
$("#golive").off("click").on("click", function (e) {
|
||||
|
|
@ -2367,7 +2367,7 @@ function updateOneSingleFile() {
|
|||
setTimeout(function(){
|
||||
$("#sliderarea").hide();
|
||||
var millis=getMillis();
|
||||
document.location.href = "install.html?v=1.5.31&mode=onlyupdate&n=" + millis;
|
||||
document.location.href = "install.html?v=1.5.32&mode=onlyupdate&n=" + millis;
|
||||
},250);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1423,7 +1423,7 @@ class Admin {
|
|||
$view = "preferences.html";
|
||||
}
|
||||
|
||||
echo json_encode($view . "?v=1.5.31");
|
||||
echo json_encode($view . "?v=1.5.32");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1644,31 +1644,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.5.31"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.32"); }
|
||||
} else {
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.31"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.32"); }
|
||||
}
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.31"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.31"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.31"); }
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.32"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.32"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.32"); }
|
||||
if ($_SESSION['modus'] == 0) {
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.31"); }
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.32"); }
|
||||
}
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.31"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.31"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.31"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.31"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.31"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.31"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.31"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.31"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.31"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.31"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.31");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.31"); }
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.32"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.32"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.32"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.32"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.32"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.32"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.32"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.32"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.32"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.32"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.32");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.32"); }
|
||||
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.31");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.31");
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.32");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.32");
|
||||
}
|
||||
|
||||
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
||||
|
|
@ -2965,21 +2965,23 @@ class Admin {
|
|||
$fieldContent = array();
|
||||
foreach($fields as $field) {
|
||||
if (in_array($field,$binaryFields) && (!is_null($row[$field]))) {
|
||||
$aFieldEntry = array("f" => $field,"v" => base64_encode($row[$field]));
|
||||
$aFieldEntry = base64_encode($row[$field]);
|
||||
} else {
|
||||
$aFieldEntry = array("f" => $field,"v" => $row[$field]);
|
||||
$aFieldEntry = $row[$field];
|
||||
}
|
||||
$fieldContent[] = $aFieldEntry;
|
||||
};
|
||||
$tableContent[] = $fieldContent;
|
||||
}
|
||||
|
||||
$tableStructureAndContent = array("fields" => $fields,"content" => $tableContent);
|
||||
|
||||
if (($tmpdir == '') || !$zipExtension) {
|
||||
$dbcontent[] = array("t" => $table, "c" => $tableContent);
|
||||
$dbcontent[] = array("t" => $table, "w" => $tableStructureAndContent);
|
||||
} else {
|
||||
try {
|
||||
$tempfile=tempnam($tmpdir,"$table");
|
||||
$contentToWrite = json_encode($tableContent);
|
||||
$contentToWrite = json_encode($tableStructureAndContent);
|
||||
$success = file_put_contents($tempfile, $contentToWrite);
|
||||
if ($success == FALSE) {
|
||||
echo "Fehler: Ist das PHP-Tmp-Verzeichnis richtig gesetzt?";
|
||||
|
|
@ -3134,6 +3136,7 @@ class Admin {
|
|||
$fieldKey = 'fieldname';
|
||||
$contentKey = 'content';
|
||||
$valueKey = 'value';
|
||||
$isolatedDataFormat = false;
|
||||
if (count($dbContent) > 0) {
|
||||
$sampleTable = $dbContent[0];
|
||||
if (isset($sampleTable['t'])) {
|
||||
|
|
@ -3148,26 +3151,40 @@ class Admin {
|
|||
if ($table[$tableKey] == 'config') {
|
||||
|
||||
$foundConfigItem = null;
|
||||
|
||||
|
||||
if (isset($table["w"])) {
|
||||
$isolatedDataFormat = true;
|
||||
$content = $table["w"]["content"];
|
||||
foreach($content as $aTableRow) {
|
||||
if ($aTableRow[1] == "version") {
|
||||
$bakVersion = base64_decode($aTableRow[2]);
|
||||
return array($bakVersion,$tableKey,$fieldKey,$contentKey,$valueKey,$isolatedDataFormat);
|
||||
}
|
||||
}
|
||||
}
|
||||
foreach($table[$contentKey] as $aConfigItem) {
|
||||
|
||||
foreach($aConfigItem as $aConfigDbPart) {
|
||||
if (($aConfigDbPart[$fieldKey] == 'name') && ($aConfigDbPart[$valueKey] == 'version')) {
|
||||
$foundConfigItem = $aConfigItem;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
if (!is_null($foundConfigItem)) {
|
||||
foreach($foundConfigItem as $aConfigDbPart) {
|
||||
if ($aConfigDbPart[$fieldKey] == 'setting') {
|
||||
$bakVersion = base64_decode($aConfigDbPart[$valueKey]);
|
||||
return array($bakVersion,$tableKey,$fieldKey,$contentKey,$valueKey);
|
||||
return array($bakVersion,$tableKey,$fieldKey,$contentKey,$valueKey,$isolatedDataFormat);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
return array("0",$tableKey,$fieldKey,$contentKey,$valueKey);
|
||||
return array("0",$tableKey,$fieldKey,$contentKey,$valueKey,$isolatedDataFormat);
|
||||
}
|
||||
|
||||
private function completeImportProcess($pdo) {
|
||||
|
|
@ -3242,6 +3259,7 @@ class Admin {
|
|||
$fieldKey = $context[2];
|
||||
$contentKey = $context[3];
|
||||
$valueKey = $context[4];
|
||||
$isolatedDataFormat = $context[5];
|
||||
|
||||
if ((CommonUtils::startsWith($bakVersion, "1.0")) || (CommonUtils::startsWith($bakVersion, "1.1")) || (CommonUtils::startsWith($bakVersion, "1.2"))) {
|
||||
echo json_encode(array("status" => "ERROR","msg" => "Backup hat eine zu frühe Version zum Import ($bakVersion)."));
|
||||
|
|
@ -3260,7 +3278,13 @@ class Admin {
|
|||
$sql = "DELETE FROM $tablename";
|
||||
CommonUtils::execSql($pdo, $sql, null);
|
||||
|
||||
$tablecontent = $table[$contentKey];
|
||||
if ($isolatedDataFormat) {
|
||||
$fields = $table["w"]["fields"];
|
||||
$colstr = implode(",",$fields);
|
||||
$tablecontent = $table["w"]["content"];
|
||||
} else {
|
||||
$tablecontent = $table[$contentKey];
|
||||
}
|
||||
|
||||
if ($table[$tableKey] == "queue") {
|
||||
$typeIsOnlyConfig = false;
|
||||
|
|
@ -3274,8 +3298,20 @@ class Admin {
|
|||
$indexEnd = MIN(count($tablecontent)-1,$chunkSize);
|
||||
$chunkCount = intdiv(count($tablecontent),$chunkSize) + 1;
|
||||
|
||||
if ($isolatedDataFormat) {
|
||||
$binColIndices = array();
|
||||
foreach($fields as $f) {
|
||||
if (in_array($f, $binaryFields)) {
|
||||
$binColIndices[] = true;
|
||||
} else {
|
||||
$binColIndices[] = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (count($tablecontent)>0) {
|
||||
$colstr = self::createColsForRestoreInsert($tablecontent[0], $fieldKey);
|
||||
if (!$isolatedDataFormat) {
|
||||
$colstr = self::createColsForRestoreInsert($tablecontent[0], $fieldKey);
|
||||
}
|
||||
|
||||
for ($chunkNo=0;$chunkNo<$chunkCount;$chunkNo++) {
|
||||
set_time_limit(60*60);
|
||||
|
|
@ -3284,12 +3320,22 @@ class Admin {
|
|||
$vals = array();
|
||||
for($i=$indexStart;$i<=$indexEnd;$i++) {
|
||||
$row = $tablecontent[$i];
|
||||
foreach ($row as $field) {
|
||||
$fieldname = $field[$fieldKey];
|
||||
if (in_array($fieldname, $binaryFields) && (!is_null($field[$valueKey])) ) {
|
||||
$vals[] = base64_decode($field[$valueKey]);
|
||||
} else {
|
||||
$vals[] = $field[$valueKey];
|
||||
if (!$isolatedDataFormat) {
|
||||
foreach ($row as $field) {
|
||||
$fieldname = $field[$fieldKey];
|
||||
if (in_array($fieldname, $binaryFields) && (!is_null($field[$valueKey])) ) {
|
||||
$vals[] = base64_decode($field[$valueKey]);
|
||||
} else {
|
||||
$vals[] = $field[$valueKey];
|
||||
}
|
||||
}
|
||||
} else {
|
||||
for ($colIndex = 0;$colIndex<count($binColIndices);$colIndex++) {
|
||||
$val = $row[$colIndex];
|
||||
if ($binColIndices[$colIndex] && (!is_null($val))) {
|
||||
$val = base64_decode($val);
|
||||
}
|
||||
$vals[] = $val;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -3397,6 +3443,22 @@ class Admin {
|
|||
CommonUtils::execSql($pdo, $sql, null);
|
||||
|
||||
$tablecontent = json_decode(file_get_contents($tmpdir . "/" . $table),true);
|
||||
$isolatedDataFormat = false;
|
||||
if (isset($tablecontent["fields"])) {
|
||||
$isolatedDataFormat = true;
|
||||
$fields = $tablecontent["fields"];
|
||||
$colstr = implode(",",$fields);
|
||||
$tablecontent = $tablecontent["content"];
|
||||
|
||||
$binColIndices = array();
|
||||
foreach($fields as $f) {
|
||||
if (in_array($f, $binaryFields)) {
|
||||
$binColIndices[] = true;
|
||||
} else {
|
||||
$binColIndices[] = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if ($table == "queue") {
|
||||
$typeIsOnlyConfig = false;
|
||||
|
|
@ -3411,7 +3473,9 @@ class Admin {
|
|||
$chunkCount = intdiv(count($tablecontent),$chunkSize) + 1;
|
||||
|
||||
if (count($tablecontent)>0) {
|
||||
$colstr = self::createColsForRestoreInsert($tablecontent[0], 'f');
|
||||
if (!$isolatedDataFormat) {
|
||||
$colstr = self::createColsForRestoreInsert($tablecontent[0], 'f');
|
||||
}
|
||||
for ($chunkNo=0;$chunkNo<$chunkCount;$chunkNo++) {
|
||||
set_time_limit(60*60);
|
||||
$indexStart = $chunkNo * $chunkSize;
|
||||
|
|
@ -3419,18 +3483,28 @@ class Admin {
|
|||
$vals = array();
|
||||
for($i=$indexStart;$i<=$indexEnd;$i++) {
|
||||
$row = $tablecontent[$i];
|
||||
foreach ($row as $field) {
|
||||
try {
|
||||
$fieldname = $field['f'];
|
||||
if (!$isolatedDataFormat) {
|
||||
foreach ($row as $field) {
|
||||
try {
|
||||
$fieldname = $field['f'];
|
||||
|
||||
if (in_array($fieldname, $binaryFields) && (!is_null($field['v']))) {
|
||||
$vals[] = base64_decode($field['v']);
|
||||
} else {
|
||||
$vals[] = $field['v'];
|
||||
if (in_array($fieldname, $binaryFields) && (!is_null($field['v']))) {
|
||||
$vals[] = base64_decode($field['v']);
|
||||
} else {
|
||||
$vals[] = $field['v'];
|
||||
}
|
||||
} catch (Exception $ex) {
|
||||
echo $ex->getMessage();
|
||||
exit;
|
||||
}
|
||||
} catch (Exception $ex) {
|
||||
echo $ex->getMessage();
|
||||
exit;
|
||||
}
|
||||
} else {
|
||||
for ($colIndex = 0;$colIndex<count($binColIndices);$colIndex++) {
|
||||
$val = $row[$colIndex];
|
||||
if ($binColIndices[$colIndex] && (!is_null($val))) {
|
||||
$val = base64_decode($val);
|
||||
}
|
||||
$vals[] = $val;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -878,7 +878,7 @@ class Customers {
|
|||
$txt = "<head>";
|
||||
$txt .= "<title>" . self::$CUS_OVERVIEW[$lang] . "</title>";
|
||||
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.31">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.32">';
|
||||
$txt .= "</head>";
|
||||
return $txt;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
|
|||
if (strlen($status) > 150) {
|
||||
$status = substr($status, 0,149);
|
||||
}
|
||||
$version = "1.5.31";
|
||||
$version = "1.5.32";
|
||||
|
||||
$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -80,8 +80,7 @@ class PdfExport extends FPDF {
|
|||
}
|
||||
|
||||
private function osInsertHeader($pdo,$lang,$startMonth,$startYear,$endMonth,$endYear) {
|
||||
$this->Image("utilities/salesheader.png",10,10,190,52,"PNG","http://www.ordersprinter.de");
|
||||
$this->Image("utilities/transparent.png",120,10,190-100,52,"PNG","http://www.ordersprinter.de");
|
||||
$this->Image("utilities/salesheader.png",30,10,70,40,"PNG","http://www.ordersprinter.de");
|
||||
|
||||
$companyInfo = utf8_decode(self::getConfigItem($pdo,"companyinfo"));
|
||||
if (is_null($companyInfo)) {
|
||||
|
|
|
|||
Binary file not shown.
|
Before Width: | Height: | Size: 573 KiB After Width: | Height: | Size: 476 KiB |
|
|
@ -1279,6 +1279,10 @@ class Version {
|
|||
return array(true);
|
||||
}
|
||||
|
||||
public static function upd_1531_1532($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"),
|
||||
|
|
@ -1357,7 +1361,8 @@ class Version {
|
|||
"1.5.27" => array("upd_1527_1528","1.5.28"),
|
||||
"1.5.28" => array("upd_1528_1529","1.5.29"),
|
||||
"1.5.29" => array("upd_1529_1530","1.5.30"),
|
||||
"1.5.30" => array("upd_1530_1531","1.5.31")
|
||||
"1.5.30" => array("upd_1530_1531","1.5.31"),
|
||||
"1.5.31" => array("upd_1531_1532","1.5.32")
|
||||
);
|
||||
|
||||
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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
<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.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
|
||||
<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.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
<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.5.31"></script>
|
||||
<script src="elements/product.js?v=1.5.31"></script>
|
||||
<script src="elements/extra.js?v=1.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></script>
|
||||
<script src="elements/product.js?v=1.5.32"></script>
|
||||
<script src="elements/extra.js?v=1.5.32"></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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
|
||||
<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.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
<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.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
<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.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></script>
|
||||
<script src="elements/rating.js"></script>
|
||||
</head>
|
||||
|
||||
|
|
|
|||
|
|
@ -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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
<script src="elements/tablemap.js"></script>
|
||||
|
||||
<script src="utilities.js?v=1.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></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>
|
||||
|
|
@ -623,7 +623,7 @@ function bindCancelButtn() {
|
|||
var year = date.getFullYear();
|
||||
var dateStr = year + "-" + month + "-" + day;
|
||||
|
||||
setTimeout(function(){document.location.href = "reservation.html?v=1.5.31&date=" + dateStr;},500);
|
||||
setTimeout(function(){document.location.href = "reservation.html?v=1.5.32&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.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></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.5.31";
|
||||
var nextpage = "paydesk.html?version=1.5.32";
|
||||
|
||||
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.5.31";
|
||||
nextpage = "paydesk.html?t=" + tableid + "&version=1.5.32";
|
||||
} else {
|
||||
$("#nextpagebtntxt").html(SUM_TO_ORDER[lang]);
|
||||
nextpage = "waiter.html?version=1.5.31";
|
||||
nextpage = "waiter.html?version=1.5.32";
|
||||
}
|
||||
|
||||
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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
|
||||
<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.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
<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.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
<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.5.31"></script>
|
||||
<script src="utilities.js?v=1.5.32"></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
|
|
@ -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.5.31">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.32">
|
||||
|
||||
<link rel="stylesheet" href="css/ospage.css" />
|
||||
<link rel="stylesheet" href="css/tablepanel.css" />
|
||||
|
|
@ -16,7 +16,7 @@
|
|||
<link rel="stylesheet" href="css/extraspanel.css" />
|
||||
<link rel="stylesheet" href="css/actpanel.css" />
|
||||
<link rel="stylesheet" href="css/paypanel.css" />
|
||||
<link rel="stylesheet" href="css/numfield.css?v=1.5.31" />
|
||||
<link rel="stylesheet" href="css/numfield.css?v=1.5.32" />
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jqueryui1-12-0/jquery-ui.min.css" />
|
||||
<script src="php/3rdparty/jquery-2.2.4.min.js"></script>
|
||||
|
|
|
|||
Loading…
Reference in New Issue