OrderSprinter 2.0.1
This commit is contained in:
parent
8fb71ae374
commit
06a0e9de9b
|
|
@ -9,8 +9,8 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" href="css/gueststyle.css?v=2.0.0" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=2.0.0" />
|
||||
<link rel="stylesheet" href="css/gueststyle.css?v=2.0.1" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=2.0.1" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
|
|
@ -115,7 +115,7 @@
|
|||
<div data-role="footer" data-theme="b" id="thefooter1">
|
||||
<div class="ui-grid-a">
|
||||
<div class="ui-block-a"> OrderSprinter</div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo">2.0.0 </div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo">2.0.1 </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=2.0.0">';
|
||||
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=2.0.1">';
|
||||
echo "</head>";
|
||||
echo "<body><div class=surround>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 2.0.0</span><br><br>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 2.0.1</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.
Binary file not shown.
|
|
@ -85,7 +85,7 @@ class Installer {
|
|||
}
|
||||
Database::dropTables($pdo);
|
||||
Database::createEmptyTables($pdo, $prefix);
|
||||
Database::setVersion($pdo,$prefix,"2.0.0");
|
||||
Database::setVersion($pdo,$prefix,"2.0.1");
|
||||
Database::setAccessPassword($pdo,$prefix,$adminpass);
|
||||
Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour
|
||||
return array("status" => "OK","msg" => "Installation successful");
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -13,8 +13,8 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="kitchenbar.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></script>
|
||||
<script src="kitchenbar.js?v=2.0.1"></script>
|
||||
<style>
|
||||
|
||||
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,30 @@
|
|||
.closingsums {
|
||||
border: solid black 3px;
|
||||
background-color: rgb(255, 232, 188);
|
||||
}
|
||||
.closingsums td {
|
||||
border: solid black 1px;
|
||||
padding: 3px;
|
||||
text-align:right;
|
||||
vertical-align:bottom;
|
||||
}
|
||||
.opentable { color:black;} .timeline { color:black;}
|
||||
#tmpdirtxt,#tmpdirhint,#closingcreationtxt,#urlpath { color:black;}
|
||||
.groundplan input[type=text] {color:black;}
|
||||
a.genconflink {color: black !important;}
|
||||
|
||||
.grouparea {
|
||||
border: 1px solid #666666;
|
||||
border-radius: 25px;
|
||||
background-color: #ffffb3;
|
||||
padding: 10px;
|
||||
}
|
||||
#searchfield,#barcode,#optionfield {
|
||||
color:black !important;
|
||||
}
|
||||
#searchfield::placeholder,#barcode::placeholder,#optionfield::placeholder {
|
||||
color:#222222 !important;
|
||||
}
|
||||
.prodcount {
|
||||
color: black;
|
||||
}
|
||||
|
|
@ -1 +1 @@
|
|||
@charset "UTF-8";.numfield td:hover{background:#999}.numfield td.numnav{color:red}.numfield td.keyboardapply{color:green}.numfield{background:#bbb;border-style:solid;border-color:green}.numfield td{background:#eee;border-style:solid;border-color:black;text-align:center;color:black}@media(min-width:50px){.numfield{border-radius:10px;padding:5px;width:200px;border-spacing:2px;margin-left:20px}.numfield td{border-radius:3px;padding:4px;font-size:15px;text-align:center}}@media(min-width:500px){.numfield{border-radius:20px;padding:10px;width:280px;border-spacing:5px;margin-left:80px}.numfield td{border-radius:10px;padding:8px;font-size:20px;text-align:center}}@media(min-width:900px){.numfield{border-radius:25px;padding:10px;width:280px;border-spacing:5px;margin-left:80px}.numfield td{border-radius:15px;padding:10px;font-size:30px;text-align:center}}
|
||||
@charset "UTF-8";.numfield td:hover{background:#999}.numfield td.numnav{color:red}.numfield td.keyboardapply{color:green}.numfield{background:#bbb;border-style:solid;border-color:green}.numfield td{background:#eee;border-style:solid;border-color:black;text-align:center;color:black}@media(min-width:50px){.numfield{border-radius:10px;padding:5px;width:200px;border-spacing:2px;margin-left:20px}.numfield td{border-radius:3px;padding:4px;font-size:15px;text-align:center}}@media(min-width:450px){.numfield{border-radius:20px;padding:10px;width:280px;border-spacing:5px;margin-left:80px}.numfield td{border-radius:10px;padding:8px;font-size:20px;text-align:center}}@media(min-width:900px){.numfield{border-radius:25px;padding:10px;width:280px;border-spacing:5px;margin-left:80px}.numfield td{border-radius:15px;padding:10px;font-size:30px;text-align:center}}
|
||||
|
|
@ -62,7 +62,7 @@ IF:counting:1
|
|||
FI:counting
|
||||
#
|
||||
# Produktverkaeufe
|
||||
{TAB:3:1:9:8:6:}
|
||||
{TAB:3:1::8:6:8}
|
||||
{-::Anz}{-:: }{-::Produkt}{-:rechts:Preis}{-:rechts:%}{-:rechts:G.Preis}
|
||||
START:details
|
||||
{count:rechts}{-:: }{productname}{price:rechts}{tax:rechts}{sumprice:rechts}
|
||||
|
|
|
|||
|
|
@ -63,33 +63,33 @@ Speisen = KBF = 1
|
|||
Tischzubereitung Fleischmenü; 1,00 # Normal-Steuersatz: 2; Bildnr: 1
|
||||
Getränke = KBD = 1
|
||||
Kaffee = KBD = 1
|
||||
Cappuchino; 2,50 # Bildnr: 9
|
||||
Tasse Kaffee; 3,00 # Bildnr: 9
|
||||
Becher Kaffee; 3,50 # Bildnr: 2
|
||||
Latte Macchiato; 3,00 # Bildnr: 18
|
||||
Cappuchino; 2,50 # To-Go-Steuersatz:1; Bildnr: 9
|
||||
Tasse Kaffee; 3,00 # To-Go-Steuersatz:1; Bildnr: 9
|
||||
Becher Kaffee; 3,50 # To-Go-Steuersatz:1; Bildnr: 2
|
||||
Latte Macchiato; 3,00 # To-Go-Steuersatz:1; Bildnr: 18
|
||||
Biere = KBD = 1
|
||||
Holsten; 1,00 # PreisB:1,00; PreisC:0,00 ; Bildnr: 16
|
||||
Warsteiner; 1,00 # Bildnr: 16
|
||||
Becks Gold; 1,00 # Bildnr: 16
|
||||
Alsterwasser; 1,00 # Bildnr: 1
|
||||
Holsten; 1,00 # To-Go-Steuersatz:1; PreisB:1,00; PreisC:0,00 ; Bildnr: 16
|
||||
Warsteiner; 1,00 # To-Go-Steuersatz:1; Bildnr: 16
|
||||
Becks Gold; 1,00 # To-Go-Steuersatz:1; Bildnr: 16
|
||||
Alsterwasser; 1,00 # To-Go-Steuersatz:1; Bildnr: 1
|
||||
Softdrinks = KBD = 1
|
||||
Coca-Cola; 2,00 # Bildnr: 15
|
||||
Fanta; 2,00 # Bildnr: 12
|
||||
Sprite; 2,00 # Bildnr: 13
|
||||
Eistee; 1,00 # Bildnr: 1
|
||||
Kirschsaft; 1,00 # Bildnr: 14
|
||||
Coca-Cola; 2,00 # To-Go-Steuersatz:1; Bildnr: 15
|
||||
Fanta; 2,00 # To-Go-Steuersatz:1; Bildnr: 12
|
||||
Sprite; 2,00 # To-Go-Steuersatz:1; Bildnr: 13
|
||||
Eistee; 1,00 # To-Go-Steuersatz:1; Bildnr: 1
|
||||
Kirschsaft; 1,00 # To-Go-Steuersatz:1; Bildnr: 14
|
||||
Ohne Zucker = BD = 1
|
||||
Cola Zero; 2,00 # Bildnr: 1
|
||||
Cola Zero; 2,00 # To-Go-Steuersatz:1; Bildnr: 1
|
||||
Alkohol = KBD = 1
|
||||
Schnaps; 10,00 # Bildnr: 11
|
||||
Sekt ; 10,00 # Bildnr: 1
|
||||
Schnaps; 10,00 # To-Go-Steuersatz:1; Bildnr: 11
|
||||
Sekt ; 10,00 # To-Go-Steuersatz:1; Bildnr: 1
|
||||
Wasser = KBD = 1
|
||||
Apollinaris; 2,00 # Bildnr: 1
|
||||
Stilles Wasser; 1,00 # Kurzname:still ; Bildnr: 1
|
||||
Apollinaris; 2,00 # To-Go-Steuersatz:1; Bildnr: 1
|
||||
Stilles Wasser; 1,00 # To-Go-Steuersatz:1; Kurzname:still ; Bildnr: 1
|
||||
Weine = KBD = 1
|
||||
Wein Lambrusco; 7,00 # Kurzname:Lambrusco ; Bildnr: 10
|
||||
Wein trocken; 7,00 # Bildnr: 10
|
||||
Wein lieblich; 6,00 # Bildnr: 1
|
||||
Wein Lambrusco; 7,00 # To-Go-Steuersatz:1; Kurzname:Lambrusco ; Bildnr: 10
|
||||
Wein trocken; 7,00 # To-Go-Steuersatz:1; Bildnr: 10
|
||||
Wein lieblich; 6,00 # To-Go-Steuersatz:1; Bildnr: 1
|
||||
Gutscheine = F = 1
|
||||
Brunchgutschein; 9,90 # Normal-Steuersatz:1; Einheit:EinzweckgutscheinKauf
|
||||
Brunchgutschein Einl.; 0,00 # Normal-Steuersatz:5; Einheit:EinzweckgutscheinEinl
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -23,8 +23,8 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui-i18n.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="elements/customers.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></script>
|
||||
<script src="elements/customers.js?v=2.0.1"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1">
|
||||
|
||||
<link rel="stylesheet" href="css/ospage.css" />
|
||||
|
||||
|
|
@ -17,7 +17,7 @@
|
|||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></script>
|
||||
<script src="receiptutils.js"></script>
|
||||
<script src="elements/dash.js"></script>
|
||||
<script src="php/3rdparty/Chart.bundle.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -163,7 +163,7 @@ function Groundplan() {
|
|||
$("#createtableqrcodesbtn").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.open("php/contenthandler.php?module=roomtables&command=tableqrcodes&v=2.0.0",'_blank');
|
||||
window.open("php/contenthandler.php?module=roomtables&command=tableqrcodes&v=2.0.1",'_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=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -12,7 +12,7 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></script>
|
||||
<script src="kitchenbar.js"></script>
|
||||
<style>
|
||||
|
||||
|
|
|
|||
|
|
@ -9,8 +9,8 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.1">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -10,16 +10,16 @@
|
|||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="manifest" href="manifest.webmanifest">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=2.0.1">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle-cool.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle-brightenergy.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
@ -133,7 +133,7 @@ function displayLoginOrLogoutMask(jsonContent) {
|
|||
// user needs to log in!
|
||||
$("#passwordfield").val("");
|
||||
$("#logoutarea").hide();
|
||||
setTimeout(function(){document.location.href = "index.html?v=2.0.0"},250);
|
||||
setTimeout(function(){document.location.href = "index.html?v=2.0.1"},250);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -233,7 +233,7 @@ function handleResultOfInstallCheck(is_installed) {
|
|||
if (is_installed == "Yes") {
|
||||
useInstallation();
|
||||
} else {
|
||||
setTimeout(function(){document.location.href = "install.html?v=2.0.0"},500);
|
||||
setTimeout(function(){document.location.href = "install.html?v=2.0.1"},500);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -296,11 +296,11 @@ $(document).on("pageinit", "#index-page", function () {
|
|||
|
||||
<div data-role="content">
|
||||
|
||||
<p><div id="toplogolocation" style="text-align: center;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=2.0.0&style=always" style="max-height:150px;"/></div>
|
||||
<p><div id="toplogolocation" style="text-align: center;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=2.0.1&style=always" style="max-height:150px;"/></div>
|
||||
<div data-role="collapsible" data-content-theme="c" data-collapsed="false" data-theme="e" id="loginmask">
|
||||
<H2>Anmelden</H2>
|
||||
|
||||
<p><div id="middlelogolocation" style="text-align: left;padding-left: 80px;padding-right:80px;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=2.0.0&style=always" style="max-height:150px;"/></div>
|
||||
<p><div id="middlelogolocation" style="text-align: left;padding-left: 80px;padding-right:80px;display:none;"><img src="php/contenthandler.php?module=printqueue&command=getLogoAsPngWithAlphaChannel&v=2.0.1&style=always" style="max-height:150px;"/></div>
|
||||
|
||||
<div class="loginarea">
|
||||
<form method="post">
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<meta charset="UTF-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<title>Setup</title>
|
||||
<link rel="stylesheet" type="text/css" href="css/installstyle.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/installstyle.css?v=2.0.1">
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="utilities.js"></script>
|
||||
|
||||
|
|
@ -970,7 +970,7 @@ El servicio web OrderSprinter no requiere una conexión a Internet. Sin embargo,
|
|||
<tr id=updateline>
|
||||
<td> </td>
|
||||
<td align=center>
|
||||
<button id="updatebtn" class="updatebtn">Update -> 2.0.0</button>
|
||||
<button id="updatebtn" class="updatebtn">Update -> 2.0.1</button>
|
||||
<span id="updateinprogresstxt" style="display:none;"><img id="installprogressindicator" src="php/3rdparty/images/ajax-loader.gif" alt="Progress indication" /> Update... bitte warten.</span>
|
||||
</td>
|
||||
<td> </td>
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ return $pdo;
|
|||
}
|
||||
|
||||
function checkPhpStatus() {
|
||||
$extensions = array("gd","mysqli","openssl","pdo_mysql","PDO","session","zlib","curl","zip","ftp","xml");
|
||||
$extensions = array("gd","mysqli","openssl","pdo_mysql","PDO","session","zlib","curl","zip","ftp","xml","iconv");
|
||||
$missing = array();
|
||||
|
||||
$extensions_status = 1;
|
||||
|
|
@ -163,7 +163,7 @@ $md5adminpass = md5($adminpass);
|
|||
$pdo = $this->pdo;
|
||||
|
||||
$userInsertSql = "INSERT INTO `%user%` (`username` , `userpassword`, `roleid`,`language`,`prefertablemap`,`keeptypelevel`,`extrasapplybtnpos`,`showplusminus`,`preferimgdesk`,`preferimgmobile`,`mobiletheme`,`active`) "
|
||||
. "VALUES (?,?,?,?,?,?,'1','1','1','1','5','1')";
|
||||
. "VALUES (?,?,?,?,?,?,'1','1','1','1','8','1')";
|
||||
$stmt = $pdo->prepare(DbUtils::substTableAlias($userInsertSql));
|
||||
$stmt->execute(array($username,$md5adminpass,$roleid,$lang,$prefertablemap,1));
|
||||
|
||||
|
|
@ -480,7 +480,7 @@ return;
|
|||
}
|
||||
|
||||
set_time_limit(60*30);
|
||||
$installerVersion = "2.0.0";
|
||||
$installerVersion = "2.0.1";
|
||||
|
||||
$admin = new InstallAdmin();
|
||||
$pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']);
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -13,8 +13,8 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="kitchenbar.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></script>
|
||||
<script src="kitchenbar.js?v=2.0.1"></script>
|
||||
<style>
|
||||
|
||||
#tableWithEntriesToCook,#tableWithCookedEntries,#headertableToCook
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -14,12 +14,12 @@
|
|||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
<!-- <script src="https://code.jquery.com/jquery-1.11.3.js"></script> -->
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="elements/tablemap.js?v=2.0.0"></script>
|
||||
<script src="elements/roommap.js?v=2.0.0"></script>
|
||||
<script src="elements/groundplan.js?v=2.0.0"></script>
|
||||
<script src="elements/tse.js?v=2.0.0"></script>
|
||||
<script src="elements/closing.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></script>
|
||||
<script src="elements/tablemap.js?v=2.0.1"></script>
|
||||
<script src="elements/roommap.js?v=2.0.1"></script>
|
||||
<script src="elements/groundplan.js?v=2.0.1"></script>
|
||||
<script src="elements/tse.js?v=2.0.1"></script>
|
||||
<script src="elements/closing.js?v=2.0.1"></script>
|
||||
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
|
|
@ -539,6 +539,9 @@ var MAN_NOTES = ["Banknoten","Notes","Billetes"];
|
|||
var MAN_COIN_VALNAME = ["Währungseinheit Münzen","Currency unit coins","Unidad monetaria Monedas"];
|
||||
var MAN_NOTE_VALNAME = ["Währungseinheit Banknoten","Currency unit notes","Unidad monetaria Billetes"];
|
||||
var MAN_COINS_HINT = ["Münzenwertangaben in kleinster Einheit, z.B. Eurocents. Banknoten per Faktor 100 der kleinsten Einheit. Werte durch Komma getrennt.","Coin denominations in the smallest unit, e.g. Eurocents. Banknotes per factor 100 of the smallest unit. Values separated by commas.","Las denominaciones de las monedas en la unidad más pequeña, por ejemplo, céntimos de euro. Billetes por factor 100 de la unidad más pequeña. Valores separados por comas."];
|
||||
var MAN_EXPECTED_CASH = ["Barumsätze, die noch nicht in einem Kassenabschluss erfasst wurden","Cash sums that are still not in a closing","Las ventas en efectivo que aún no se han registrado en un saldo de caja"];
|
||||
var MAN_EXPECTED_CASH_IN_PAYDESK = ["Bargeld, das sich aktuell in der Kasse befinden sollte","Cash that should currently be in the cash register","El efectivo que debería estar actualmente en la caja registradora"];
|
||||
var MAN_EXPECTED_CASH_HEADER = ["Bargeldumsätze","Cash sales","Moneda"];
|
||||
|
||||
var lang = 0;
|
||||
var generalVals = [12,2,0,3,0,1,1,0,0,1, 0,50,20,10,1,0,0,0,1,0,1,0,0,1,1, 1,1,1,1,1,1,1,1,1,1, 1,2,3, 1,0, 1,0,1, 1,1,0,0, 0,0,0, 0,0,0,1,1, 0,1,0,1,1, 1,2,0, 0,0,1,1,1, 0,0,1,0];
|
||||
|
|
@ -960,6 +963,10 @@ function setLanguage(l) {
|
|||
|
||||
$("#paymenthint").html(MAN_HINT_PAYMENTS[l]);
|
||||
|
||||
$("#cashexpectedheader").html(MAN_EXPECTED_CASH_HEADER[l]);
|
||||
$("#cashinpaydesk").html(MAN_EXPECTED_CASH_IN_PAYDESK[l]);
|
||||
$("#unenclosedsales").html(MAN_EXPECTED_CASH[l]);
|
||||
|
||||
tse = new TSE();
|
||||
}
|
||||
|
||||
|
|
@ -993,6 +1000,15 @@ function createMonthSelection(label) {
|
|||
return monthHtml;
|
||||
}
|
||||
|
||||
function getExpectedCashSumsForNextClosing() {
|
||||
doAjax("GET","php/contenthandler.php?module=closing&command=getCashSumsForNextClosing",null,insertExpectedClosingCashSums,null,true);
|
||||
}
|
||||
function insertExpectedClosingCashSums(answer) {
|
||||
if (answer.status == "OK") {
|
||||
$("#cashinpaydeskfield").html(answer.msg.cashindesk);
|
||||
$("#unenclosedsalesfield").html(answer.msg.unclosedsalesincash);
|
||||
}
|
||||
}
|
||||
function checkForFirstAndLastClosing() {
|
||||
doAjax("GET","php/contenthandler.php?module=closing&command=getFirstAndLastClosing",null,insertFirstAndLastClosingInfo,null,true);
|
||||
}
|
||||
|
|
@ -1687,7 +1703,7 @@ function initRestoreFileUpload() {
|
|||
} else {
|
||||
alert("Import war erfolgreich.");
|
||||
setTimeout(function(){
|
||||
document.location.href = "index.html?v=2.0.0";
|
||||
document.location.href = "index.html?v=2.0.1";
|
||||
},250);
|
||||
}
|
||||
},
|
||||
|
|
@ -2083,37 +2099,37 @@ function bindConfig() {
|
|||
$("#samplerectemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getrectemplate&v=2.0.0",null,handleGetRecTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getrectemplate&v=2.0.1",null,handleGetRecTemplate,null);
|
||||
});
|
||||
$("#sampleclstemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getclstemplate&v=2.0.0",null,handleGetClsTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getclstemplate&v=2.0.1",null,handleGetClsTemplate,null);
|
||||
});
|
||||
$("#samplecashtemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getcashtemplate&v=2.0.0",null,handleGetCashTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getcashtemplate&v=2.0.1",null,handleGetCashTemplate,null);
|
||||
});
|
||||
$("#samplefoodworktemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getfoodworktemplate&v=2.0.0",null,handleGetFoodTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getfoodworktemplate&v=2.0.1",null,handleGetFoodTemplate,null);
|
||||
});
|
||||
$("#sampledrinkworktemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getdrinkworktemplate&v=2.0.0",null,handleGetDrinkTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getdrinkworktemplate&v=2.0.1",null,handleGetDrinkTemplate,null);
|
||||
});
|
||||
$("#samplecanceltemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getcanceltemplate&v=2.0.0",null,handleGetCancelTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getcanceltemplate&v=2.0.1",null,handleGetCancelTemplate,null);
|
||||
});
|
||||
$("#samplepickuptemplate").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getpickuptemplate&v=2.0.0",null,handleGetPickupTemplate,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getpickuptemplate&v=2.0.1",null,handleGetPickupTemplate,null);
|
||||
});
|
||||
|
||||
$("#changeConfig").off("click").on("click", function (e) {
|
||||
|
|
@ -2241,38 +2257,38 @@ function binding() {
|
|||
$("#backup_btn").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=2.0.0";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=configuration&v=2.0.1";
|
||||
});
|
||||
|
||||
$("#backup_btnall").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=2.0.0";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all&v=2.0.1";
|
||||
});
|
||||
|
||||
$("#backup_btnalllogs").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=2.0.0";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=alllogs&v=2.0.1";
|
||||
});
|
||||
|
||||
$("#backup_btnftpall").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
showProgressPopup();
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=2.0.0",null,handleFtpResult,null);
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=ftpbackup&type=all&v=2.0.1",null,handleFtpResult,null);
|
||||
});
|
||||
|
||||
$("#backup_debugdata").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=2.0.0",'_blank');
|
||||
window.open("php/contenthandler.php?module=admin&command=backup&type=debugdata&v=2.0.1",'_blank');
|
||||
});
|
||||
|
||||
$("#backupguests_btn").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=2.0.0";
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=confandguests&v=2.0.1";
|
||||
});
|
||||
|
||||
$("#golive").off("click").on("click", function (e) {
|
||||
|
|
@ -2470,7 +2486,7 @@ function updateOneSingleFile() {
|
|||
setTimeout(function(){
|
||||
$("#sliderarea").hide();
|
||||
var millis=getMillis();
|
||||
document.location.href = "install.html?v=2.0.0&mode=onlyupdate&n=" + millis;
|
||||
document.location.href = "install.html?v=2.0.1&mode=onlyupdate&n=" + millis;
|
||||
},250);
|
||||
}
|
||||
}
|
||||
|
|
@ -2853,6 +2869,7 @@ function createClosing(closingresult) {
|
|||
var doPrint = closingresult.print;
|
||||
alert("Errechnete Summe des Tagesabschlusses (" + $("#admin-page").data("currency") + "): " + (msg.result.toString()).replace(".", decpoint));
|
||||
checkForFirstAndLastClosing();
|
||||
getExpectedCashSumsForNextClosing();
|
||||
|
||||
if (doPrint == 1) {
|
||||
if (generalVals[1] == 2) {
|
||||
|
|
@ -3720,6 +3737,7 @@ function continueInitialization() {
|
|||
doAjax("GET","php/contenthandler.php?module=admin&command=isLoggedinUserAdminOrManagerOrTE",null,showPanelsDueToUserStatus,"Fehler",false);
|
||||
|
||||
checkForFirstAndLastClosing();
|
||||
getExpectedCashSumsForNextClosing();
|
||||
|
||||
askAndFillUserList();
|
||||
hideMenu();
|
||||
|
|
@ -3805,8 +3823,17 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
|
||||
<div class="grouparea">
|
||||
<b><span id="closingcreationtxt">TE erstellen</span></b>
|
||||
|
||||
<input type="text" id="remarkfield" value="" data-mini="true" placeholder="Bemerkung" />
|
||||
|
||||
|
||||
<div id="expectedclosingsums">
|
||||
<p /><span id="cashexpectedheader">Bargeld</span>
|
||||
<ul>
|
||||
<li><span id="cashinpaydesk">In Kassse</span>: <span id="cashinpaydeskfield">?</span>
|
||||
<li><span id="unenclosedsales">Nicht abgeschl. Cash</span>: <span id="unenclosedsalesfield" >?</span>
|
||||
</ul>
|
||||
</div>
|
||||
<div id="countingprotocol"></div>
|
||||
<button type="submit" data-theme="f" class="cancelButton" data-icon="plus" id="createclosing">Erstellen/Bon</button>
|
||||
<button type="submit" data-theme="f" class="cancelButton" data-icon="plus" id="createclosingnoprint">Erstellen/kein Bon</button>
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
File diff suppressed because it is too large
Load Diff
File diff suppressed because one or more lines are too long
|
|
@ -964,9 +964,13 @@ class Admin {
|
|||
$cssFile = "orderstyle-greenfield.min.css";
|
||||
$mod = "greenfieldmod.css";
|
||||
break;
|
||||
case 8:
|
||||
$cssFile = "orderstyle-brightenergy.min.css";
|
||||
$mod = "brightenergymod.css";
|
||||
break;
|
||||
default:
|
||||
$cssFile = "orderstyle-cool.min.css";
|
||||
$mod = "coolmod.css";
|
||||
$cssFile = "orderstyle-brightenergy.min.css";
|
||||
$mod = "brightenergymod.css";
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -1549,7 +1553,7 @@ class Admin {
|
|||
$view = "preferences.html";
|
||||
}
|
||||
|
||||
echo json_encode($view . "?v=2.0.0");
|
||||
echo json_encode($view . "?v=2.0.1");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1764,31 +1768,31 @@ class Admin {
|
|||
|
||||
if (!self::isOnlyRatingUser($rights, $right_rating, true)) {
|
||||
if ($_SESSION['modus'] == 0) {
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=2.0.0"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=2.0.1"); }
|
||||
} else {
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=2.0.0"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=2.0.1"); }
|
||||
}
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=2.0.0"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=2.0.0"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=2.0.0"); }
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=2.0.1"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=2.0.1"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=2.0.1"); }
|
||||
if ($_SESSION['modus'] == 0) {
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=2.0.0"); }
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=2.0.1"); }
|
||||
}
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=2.0.0"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=2.0.0"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=2.0.0"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=2.0.0"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=2.0.0"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=2.0.0"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=2.0.0"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=2.0.0"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=2.0.0"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=2.0.0"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=2.0.0");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=2.0.0"); }
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=2.0.1"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=2.0.1"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=2.0.1"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=2.0.1"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=2.0.1"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=2.0.1"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=2.0.1"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=2.0.1"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=2.0.1"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=2.0.1"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=2.0.1");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=2.0.1"); }
|
||||
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=2.0.0");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=2.0.0");
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=2.0.1");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=2.0.1");
|
||||
}
|
||||
|
||||
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
||||
|
|
|
|||
|
|
@ -60,6 +60,9 @@ $this->htmlreport($_GET["closid"]);
|
|||
$this->getClosingsListOfMonthYear($_GET["month"],$_GET["year"]);
|
||||
} else if ($command == 'getFirstAndLastClosing') {
|
||||
self::getFirstAndLastClosing();
|
||||
} else if ($command == 'getCashSumsForNextClosing') {
|
||||
$pdo = DbUtils::openDbAndReturnPdoStatic();
|
||||
self::getCashSumsForNextClosing($pdo);
|
||||
} else {
|
||||
echo "Command not supported.";
|
||||
}
|
||||
|
|
@ -987,6 +990,31 @@ $clsdate = $res[0]["closingdate"];
|
|||
return CommonUtils::getMasterDataAtCertainDateTime($pdo, $clsdate, "clstemplate");
|
||||
}
|
||||
|
||||
public static function getCashSumsForNextClosing($pdo) {
|
||||
$decpoint = CommonUtils::getConfigValue($pdo, "decpoint", ".");
|
||||
|
||||
$sql = "SELECT MAX(id) as maxid FROM %closing%";
|
||||
$result = CommonUtils::fetchSqlAll($pdo, $sql);
|
||||
$maxid = $result[0]["maxid"];
|
||||
if (is_null($maxid)) {
|
||||
$origCashInDeskFloat = 0.00;
|
||||
} else {
|
||||
$sql = "SELECT counted FROM %closing% WHERE id=?";
|
||||
$result = CommonUtils::fetchSqlAll($pdo, $sql, array($maxid));
|
||||
$origCashInDeskFloat = doubleval($result[0]["counted"]);
|
||||
}
|
||||
|
||||
$sql = "SELECT ROUND(COALESCE(SUM(brutto),0.00),2) as sumbrutto FROM %bill% WHERE (status is null OR (status='x' OR status='s' OR status='c')) AND paymentid=? AND closingid is null";
|
||||
$result = CommonUtils::fetchSqlAll($pdo, $sql, array(1));
|
||||
$cashedNotInClosing = doubleval($result[0]["sumbrutto"]);
|
||||
|
||||
$cashInDeskFloat = $origCashInDeskFloat + $cashedNotInClosing;
|
||||
|
||||
$cashInDesk = number_format($cashInDeskFloat,2,$decpoint,'');
|
||||
$cashedNotInClosing = number_format($cashedNotInClosing,2,$decpoint,'');
|
||||
echo json_encode (array("status" => "OK","msg" => array("cashindesk" => $cashInDesk,"unclosedsalesincash" => $cashedNotInClosing)));
|
||||
}
|
||||
|
||||
public function getClosingSummaryCore($closingid,$pdo,$fromWeb,$exportSignature,$replacedecpoint,$fl=0) {
|
||||
if(is_null($pdo)) {
|
||||
$pdo = DbUtils::openDbAndReturnPdoStatic();
|
||||
|
|
|
|||
|
|
@ -892,7 +892,7 @@ class Customers {
|
|||
$txt = "<head>";
|
||||
$txt .= "<title>" . self::$CUS_OVERVIEW[$lang] . "</title>";
|
||||
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=2.0.0">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=2.0.1">';
|
||||
$txt .= "</head>";
|
||||
return $txt;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
|
|||
if (strlen($status) > 150) {
|
||||
$status = substr($status, 0,149);
|
||||
}
|
||||
$version = "2.0.0";
|
||||
$version = "2.0.1";
|
||||
|
||||
$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -236,7 +236,7 @@ class Reservation {
|
|||
$txt = "<html><head>";
|
||||
$txt .= "<title>Reservierungsübersicht</title>";
|
||||
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=2.0.0">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=2.0.1">';
|
||||
$txt .= "</head>";
|
||||
$txt .= "<body>";
|
||||
$txt .= "<h1>Reservierungsübersicht für $day.$month.$year</h1><p>";
|
||||
|
|
|
|||
|
|
@ -638,7 +638,7 @@ class Roomtables {
|
|||
$txt = "<html><head>";
|
||||
$txt .= "<title>Tisch QR-Codes für die Gastbestellung</title>";
|
||||
$txt .= '<meta http-equiv="content-type" content="text/html; charset=utf-8">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=2.0.0">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/bestformat.css?v=2.0.1">';
|
||||
$txt .= "</head>";
|
||||
$txt .= "<body>";
|
||||
$txt .= "<h1>Tisch QR-Codes für die Gastbestellung</h1><p>";
|
||||
|
|
|
|||
|
|
@ -269,4 +269,4 @@ class Updater {
|
|||
|
||||
return array("status" => "OK","msg" => array("index" => $fileindex,"file" => $fileToRead,"totalLines" => $totallines));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -179,8 +179,9 @@ class Dsfinvk {
|
|||
$sql .= " LEFT JOIN %vouchers% V ON Q.voucherid=V.id ";
|
||||
|
||||
|
||||
$sql = "SELECT * FROM ($sql) a ORDER BY CAST(SUBSTRING_INDEX(a.oid,'-',-1) AS INT),a.clsid";
|
||||
|
||||
$sql = "SELECT * FROM ($sql) a ORDER BY CAST(SUBSTRING_INDEX(a.oid,'-',-1) AS UNSIGNED),a.clsid";
|
||||
|
||||
$dataPart = self::createCsvDataPartByCursor($pdo, $sql, $colsPaidUnpaid, $fileToSave, 'bonpos');
|
||||
return $dataPart;
|
||||
}
|
||||
|
|
@ -231,7 +232,7 @@ class Dsfinvk {
|
|||
$sql .= " INNER JOIN %queue% Q ON Q.opidcancel = O.id ";
|
||||
$sql .= " LEFT JOIN %closing% C ON Q.clsid=C.id ";
|
||||
|
||||
$sql = "SELECT * FROM ($sql) a ORDER BY CAST(SUBSTRING_INDEX(a.oid,'-',-1) AS INT),a.clsid,a.position";
|
||||
$sql = "SELECT * FROM ($sql) a ORDER BY CAST(SUBSTRING_INDEX(a.oid,'-',-1) AS UNSIGNED),a.clsid,a.position";
|
||||
$dataPart = self::createCsvDataPartByCursor($pdo, $sql, $cols, $fileToSave, 'bonposust');
|
||||
return $dataPart;
|
||||
}
|
||||
|
|
@ -289,7 +290,7 @@ class Dsfinvk {
|
|||
$sql .= " INNER JOIN %queue% Q ON Q.opidcancel = O.id ";
|
||||
$sql .= " LEFT JOIN %closing% C ON Q.clsid=C.id ";
|
||||
|
||||
$sql = "SELECT * FROM ($sql) a ORDER BY CAST(SUBSTRING_INDEX(a.oid,'-',-1) AS INT),a.clsid,a.position";
|
||||
$sql = "SELECT * FROM ($sql) a ORDER BY CAST(SUBSTRING_INDEX(a.oid,'-',-1) AS UNSIGNED),a.clsid,a.position";
|
||||
$dataPart = self::createCsvDataPartByCursor($pdo, $sql, $cols, $fileToSave, 'bonpospreisfindung');
|
||||
return $dataPart;
|
||||
}
|
||||
|
|
@ -342,7 +343,7 @@ class Dsfinvk {
|
|||
$sql .= " LEFT JOIN %user% U ON B.userid = U.id ";
|
||||
$sql .= " LEFT JOIN %closing% C ON B.closingid=C.id ";
|
||||
|
||||
$sql = "SELECT * FROM ($sql) a ORDER BY CAST(SUBSTRING_INDEX(a.oid,'-',-1) AS INT),a.clsid";
|
||||
$sql = "SELECT * FROM ($sql) a ORDER BY CAST(SUBSTRING_INDEX(a.oid,'-',-1) AS UNSIGNED),a.clsid";
|
||||
$dataPart = self::createCsvDataPartByCursor($pdo, $sql, $cols, $fileToSave, 'bonkopf');
|
||||
return $dataPart;
|
||||
}
|
||||
|
|
@ -396,7 +397,7 @@ class Dsfinvk {
|
|||
$sql .= " LEFT JOIN %closing% C ON B.closingid=C.id ";
|
||||
$sql .= " WHERE B.status is not null AND B.status = 'c' ";
|
||||
|
||||
$sql = "SELECT * FROM ($sql) a ORDER BY CAST(SUBSTRING_INDEX(a.oid,'-',-1) AS INT),a.clsid";
|
||||
$sql = "SELECT * FROM ($sql) a ORDER BY CAST(SUBSTRING_INDEX(a.oid,'-',-1) AS UNSIGNED),a.clsid";
|
||||
|
||||
$dataPart = self::createCsvDataPartByCursor($pdo, $sql, $cols, $fileToSave, 'bonkopfust');
|
||||
return $dataPart;
|
||||
|
|
@ -421,7 +422,7 @@ class Dsfinvk {
|
|||
$sql .= " INNER JOIN %bill% B ON B.opid = O.id ";
|
||||
$sql .= " LEFT JOIN %closing% C ON B.closingid=C.id ";
|
||||
$sql .= " LEFT JOIN %resttables% R ON B.tableid=R.id ";
|
||||
$sql = "SELECT * FROM ($sql) a ORDER BY CAST(SUBSTRING_INDEX(a.oid,'-',-1) AS INT),a.clsid";
|
||||
$sql = "SELECT * FROM ($sql) a ORDER BY CAST(SUBSTRING_INDEX(a.oid,'-',-1) AS UNSIGNED),a.clsid";
|
||||
|
||||
$dataPart = self::createCsvDataPartByCursor($pdo, $sql, $cols, $fileToSave, 'bonkopfabrkreis');
|
||||
return $dataPart;
|
||||
|
|
@ -458,7 +459,7 @@ class Dsfinvk {
|
|||
$sql .= " INNER JOIN %payment% PA ON PA.id=B.paymentid ";
|
||||
$sql .= " LEFT JOIN %closing% C ON B.closingid=C.id ";
|
||||
$sql .= " LEFT JOIN %resttables% R ON B.tableid=R.id ";
|
||||
$sql = "SELECT * FROM ($sql) a ORDER BY CAST(SUBSTRING_INDEX(a.oid,'-',-1) AS INT),a.clsid";
|
||||
$sql = "SELECT * FROM ($sql) a ORDER BY CAST(SUBSTRING_INDEX(a.oid,'-',-1) AS UNSIGNED),a.clsid";
|
||||
|
||||
$dataPart = self::createCsvDataPartByCursor($pdo, $sql, $cols, $fileToSave, 'bonkopfzahlarten');
|
||||
return $dataPart;
|
||||
|
|
@ -511,7 +512,7 @@ class Dsfinvk {
|
|||
|
||||
|
||||
|
||||
$sql = "SELECT * FROM ($sql) a ORDER BY CAST(SUBSTRING_INDEX(a.oid,'-',-1) AS INT),a.clsid";
|
||||
$sql = "SELECT * FROM ($sql) a ORDER BY CAST(SUBSTRING_INDEX(a.oid,'-',-1) AS UNSIGNED),a.clsid";
|
||||
|
||||
$dataPart = self::createCsvDataPartByCursor($pdo, $sql, $colsPaidUnpaid, $fileToSave, 'bonreferences');
|
||||
return $dataPart;
|
||||
|
|
@ -641,7 +642,7 @@ class Dsfinvk {
|
|||
$sql .= " AND Q.toremove='1' ";
|
||||
|
||||
$sql .= " ) AS i ";
|
||||
$sql .= " ORDER BY SUBSTRING_INDEX(i.opid,'-',1),CAST(SUBSTRING_INDEX(i.opid,'-',-1) AS INT)";
|
||||
$sql .= " ORDER BY SUBSTRING_INDEX(i.opid,'-',1),CAST(SUBSTRING_INDEX(i.opid,'-',-1) AS UNSIGNED)";
|
||||
|
||||
$dataPart = self::createCsvDataPartByCursor($pdo, $sql, $colsBills, $fileToSave, 'tsetransactions');
|
||||
return $dataPart;
|
||||
|
|
@ -836,7 +837,7 @@ class Dsfinvk {
|
|||
$sql = "SELECT * FROM (";
|
||||
$sql .= $ustkeys;
|
||||
$sql .= " ) AS i ";
|
||||
$sql .= " ORDER BY (CAST(i.clsid AS INT)),(CAST(i.akey AS INT))";
|
||||
$sql .= " ORDER BY (CAST(i.clsid AS UNSIGNED)),(CAST(i.akey AS UNSIGNED))";
|
||||
$dataPart = self::createCsvDataPartByCursor($pdo, $sql, $colsTaxSet1, $fileToSave, 'stammust');
|
||||
return $dataPart;
|
||||
}
|
||||
|
|
@ -997,7 +998,7 @@ class Dsfinvk {
|
|||
$sql = "SELECT * FROM (";
|
||||
$sql .= $allCols;
|
||||
$sql .= " ) AS i ";
|
||||
$sql .= " ORDER BY (CAST(i.clsid AS INT)),(CAST(i.gvtyp AS INT)),(CAST(i.ustkey AS INT))";
|
||||
$sql .= " ORDER BY (CAST(i.clsid AS UNSIGNED)),(CAST(i.gvtyp AS UNSIGNED)),(CAST(i.ustkey AS UNSIGNED))";
|
||||
|
||||
$dataPart = self::createCsvDataPartByCursor($pdo, $sql, self::_zgvtyp_helper_getonlycols(), $fileToSave, 'zgvtyp');
|
||||
return $dataPart;
|
||||
|
|
@ -1025,7 +1026,7 @@ class Dsfinvk {
|
|||
$sql = "SELECT * FROM (";
|
||||
$sql .= $allCols;
|
||||
$sql .= " ) AS i ";
|
||||
$sql .= " ORDER BY (CAST(i.clsid AS INT)),paymenttype";
|
||||
$sql .= " ORDER BY (CAST(i.clsid AS UNSIGNED)),paymenttype";
|
||||
|
||||
$dataPart = self::createCsvDataPartByCursor($pdo, $sql, $cols, $fileToSave, 'zzahlart');
|
||||
return $dataPart;
|
||||
|
|
@ -1052,7 +1053,7 @@ class Dsfinvk {
|
|||
$sql = "SELECT * FROM (";
|
||||
$sql .= $allCols;
|
||||
$sql .= " ) AS i ";
|
||||
$sql .= " ORDER BY (CAST(i.clsid AS INT)),paymentcurrency";
|
||||
$sql .= " ORDER BY (CAST(i.clsid AS UNSIGNED)),paymentcurrency";
|
||||
|
||||
$dataPart = self::createCsvDataPartByCursor($pdo, $sql, $cols, $fileToSave, 'zwaehrungen');
|
||||
return $dataPart;
|
||||
|
|
|
|||
|
|
@ -568,5 +568,3 @@ class Layouter {
|
|||
}
|
||||
}
|
||||
|
||||
//$out = Layouter::Doit();
|
||||
//echo "<pre>" . $out["html"] . "</pre>";
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ class OsQrcode {
|
|||
readfile(__DIR__. '/../../img/oops.png');
|
||||
return;
|
||||
} else {
|
||||
$text = $serverurl . "/nfclogin.php?a=" . $passhash . "_" . $userid . "v=2.0.0";
|
||||
$text = $serverurl . "/nfclogin.php?a=" . $passhash . "_" . $userid . "v=2.0.1";
|
||||
QRcode::png($text);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1487,7 +1487,7 @@ class Version {
|
|||
// Food: erm. Steuersatz -> needs to be put 5%, Drinks: allg. Steuersatz -> needs to be put to 16%
|
||||
self::execSql($pdo, "ALTER TABLE %products% MODIFY tax INT NULL DEFAULT NULL");
|
||||
self::execSql($pdo, "UPDATE %products% P, %prodtype% T SET P.tax='2' WHERE P.category=T.id AND T.kind='0'");
|
||||
self::execSql($pdo, "UPDATE %products% P, %prodtype% T SET P.tax='1' WHERE P.category=T.id AND T.kind='1'");
|
||||
self::execSql($pdo, "UPDATE %products% P, %prodtype% T SET P.tax='1',P.togotax='1' WHERE P.category=T.id AND T.kind='1'");
|
||||
self::execSql($pdo, "ALTER TABLE %products% ADD togotax INT NULL DEFAULT NULL AFTER tax");
|
||||
self::execSql($pdo, "UPDATE %products% SET togotax='2'");
|
||||
self::execSql($pdo, "ALTER TABLE %histprod% MODIFY tax INT NULL DEFAULT NULL");
|
||||
|
|
@ -1529,6 +1529,16 @@ class Version {
|
|||
}
|
||||
}
|
||||
|
||||
public static function upd_2000_2001($pdo, $prefix, $dbname) {
|
||||
try {
|
||||
self::execSql($pdo, "ALTER TABLE %user% MODIFY mobiletheme INT(2) NULL DEFAULT '8'");
|
||||
|
||||
return array(true);
|
||||
} catch (PDOException $e) {
|
||||
return array(false,$e);
|
||||
}
|
||||
}
|
||||
|
||||
public static $updateOrder = array(
|
||||
"1.3.0" => array("upd_1300_1301","1.3.1"),
|
||||
"1.3.1" => array("upd_1301_1302","1.3.2"),
|
||||
|
|
@ -1621,7 +1631,8 @@ class Version {
|
|||
"1.6.7" => array("upd_1607_1608","1.6.8"),
|
||||
"1.6.8" => array("upd_1608_1609","1.6.9"),
|
||||
"1.6.9" => array("upd_1609_1610","1.6.10"),
|
||||
"1.6.10" => array("upd_1610_2000","2.0.0")
|
||||
"1.6.10" => array("upd_1610_2000","2.0.0"),
|
||||
"2.0.0" => array("upd_2000_2001","2.0.1")
|
||||
);
|
||||
|
||||
public static function runUpdateProcess($pdo,$prefix, $dbname, $untilVersion,$checkValidVersion) {
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></script>
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></script>
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
</head>
|
||||
|
|
@ -395,6 +395,7 @@ function createPreferMobileThemePart(prefervalue,label,labeltxt) {
|
|||
html += '<option value="5"' + isSelected(5,prefervalue) + '>' + PREF_THEME_COOL[l] + '</option>';
|
||||
html += '<option value="6"' + isSelected(6,prefervalue) + '>' + PREF_THEME_PINKLADY[l] + '</option>';
|
||||
html += '<option value="7"' + isSelected(7,prefervalue) + '>' + PREF_THEME_GREENFIELD[l] + '</option>';
|
||||
html += '<option value="8"' + isSelected(8,prefervalue) + '>Bright Energy</option>';
|
||||
|
||||
html += '</select></div>';
|
||||
return html;
|
||||
|
|
@ -734,7 +735,7 @@ $(document).on("pageinit", "#pref-page", function () {
|
|||
</div>
|
||||
<div data-role="content">
|
||||
|
||||
<div id="userpart" data-role="collapsible" data-collapsed="false" data-theme="e" data-content-theme="c" class="noprint">
|
||||
<div id="userpart" data-role="collapsible" data-collapsed="false" data-theme="f" data-content-theme="e" class="noprint">
|
||||
<h3><span id=passwordgen>Passwort</span></h3>
|
||||
<form>
|
||||
<span id=oldpassword>Altes Passwort:</span><input type="password" name="oldpassword" id="oldpass"/><br />
|
||||
|
|
@ -749,42 +750,42 @@ $(document).on("pageinit", "#pref-page", function () {
|
|||
</form>
|
||||
</div> <!-- Benutzerpasswort -->
|
||||
|
||||
<div id="volume" data-role="collapsible" data-collapsed="false" data-theme="e" data-content-theme="c" class="noprint">
|
||||
<div id="volume" data-role="collapsible" data-collapsed="false" data-theme="f" data-content-theme="e" class="noprint">
|
||||
<h3><span id="ordertonetxt">Orderton</span></h3>
|
||||
<label for="slidervolume"><span id="voltxt">Lautstärke:</span></label>
|
||||
<input type="range" name="slidervolume" id="slidervolume" value="0" min="0" max="10" />
|
||||
</div>
|
||||
|
||||
<div id="languagebox" data-role="collapsible" data-collapsed="false" data-theme="e" data-content-theme="c" class="noprint">
|
||||
<div id="languagebox" data-role="collapsible" data-collapsed="false" data-theme="c" data-content-theme="e" class="noprint">
|
||||
<h3><span id="languagetxt">Sprache</span></h3>
|
||||
<div id="languagepart"></div>
|
||||
</div>
|
||||
|
||||
<div id="receiptprinterpartbox" data-role="collapsible" data-collapsed="false" data-theme="e" data-content-theme="c" class="noprint">
|
||||
<div id="receiptprinterpartbox" data-role="collapsible" data-collapsed="false" data-theme="f" data-content-theme="e" class="noprint">
|
||||
<h3><span id="printertxt">Kassendrucker</span></h3>
|
||||
<div id="receiptprinterpart"></div>
|
||||
</div>
|
||||
|
||||
<div id="btnsizepartbox" data-role="collapsible" data-collapsed="false" data-theme="e" data-content-theme="c" class="noprint">
|
||||
<div id="btnsizepartbox" data-role="collapsible" data-collapsed="false" data-theme="f" data-content-theme="e" class="noprint">
|
||||
<h3><span id="btnsizetxt">Buttongrößen</span></h3>
|
||||
<div id="roombtnpart"></div>
|
||||
<div id="tablebtnpart"></div>
|
||||
<div id="prodbtnpart"></div>
|
||||
</div>
|
||||
|
||||
<div id="prefertmpartbox" data-role="collapsible" data-collapsed="false" data-theme="e" data-content-theme="c" class="noprint">
|
||||
<div id="prefertmpartbox" data-role="collapsible" data-collapsed="false" data-theme="f" data-content-theme="e" class="noprint">
|
||||
<h3><span id="prefertmtxt">Tischplan</span></h3>
|
||||
<div id="prefertmbtnpart"></div>
|
||||
</div>
|
||||
|
||||
<div id="preferimgpartbox" data-role="collapsible" data-collapsed="false" data-theme="e" data-content-theme="c" class="noprint">
|
||||
<div id="preferimgpartbox" data-role="collapsible" data-collapsed="false" data-theme="f" data-content-theme="e" class="noprint">
|
||||
<h3><span id="preferimgtxt">Bildanzeige</span></h3>
|
||||
<div id="preferimgdeskbtnpart"></div>
|
||||
<div id="preferimgmobilebtnpart"></div>
|
||||
<div id="prefershowplusminusbtnpart"></div>
|
||||
</div>
|
||||
|
||||
<div id="preferktlpartbox" data-role="collapsible" data-collapsed="false" data-theme="e" data-content-theme="c" class="noprint">
|
||||
<div id="preferktlpartbox" data-role="collapsible" data-collapsed="false" data-theme="f" data-content-theme="e" class="noprint">
|
||||
<h3><span id="preferktltxt">Bestellnavigation</span></h3>
|
||||
<p><span id="preferktldesc">Beschreibung</span></p>
|
||||
<div id="preferktlbtnpart"></div>
|
||||
|
|
@ -792,7 +793,7 @@ $(document).on("pageinit", "#pref-page", function () {
|
|||
<div id="prefertablesaftersendpart"></div>
|
||||
</div>
|
||||
|
||||
<div id="preferthemepartbox" data-role="collapsible" data-collapsed="false" data-theme="e" data-content-theme="c" class="noprint">
|
||||
<div id="preferthemepartbox" data-role="collapsible" data-collapsed="false" data-theme="f" data-content-theme="e" class="noprint">
|
||||
<h3><span id="preferthemetxt">Mobil-Design</span></h3>
|
||||
<p><div id="preferthemebtnpart"></div>
|
||||
<div id="preferapplythemepart"></div>
|
||||
|
|
@ -800,7 +801,7 @@ $(document).on("pageinit", "#pref-page", function () {
|
|||
<div id="preferthemehint">Reload nach einer Änderung drücken!</div>
|
||||
</div>
|
||||
|
||||
<div id="prefermiscpartbox" data-role="collapsible" data-collapsed="false" data-theme="e" data-content-theme="c" class="noprint">
|
||||
<div id="prefermiscpartbox" data-role="collapsible" data-collapsed="false" data-theme="f" data-content-theme="e" class="noprint">
|
||||
<h3><span id="prefermisctxt">Versch.</span></h3>
|
||||
<p><div id="prefercalcpart"></div>
|
||||
<hr>
|
||||
|
|
|
|||
|
|
@ -7,16 +7,16 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="elements/product.js?v=2.0.0"></script>
|
||||
<script src="elements/extra.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></script>
|
||||
<script src="elements/product.js?v=2.0.1"></script>
|
||||
<script src="elements/extra.js?v=2.0.1"></script>
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
</head>
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1">
|
||||
|
||||
<link rel="stylesheet" href="css/ospage.css" />
|
||||
<link rel="stylesheet" href="css/tablepanel.css" />
|
||||
|
|
@ -15,7 +15,7 @@
|
|||
<script src="php/3rdparty/jquery-2.2.4.min.js"></script>
|
||||
<script src="php/3rdparty/jqueryui1-12-0/jquery-ui.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></script>
|
||||
|
||||
|
||||
<script>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
|
|||
|
|
@ -7,14 +7,14 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></script>
|
||||
<script src="elements/rating.js"></script>
|
||||
</head>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/osdatepicker.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1">
|
||||
<link rel="stylesheet" type="text/css" href="css/osdatepicker.css?v=2.0.1">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -14,10 +14,10 @@
|
|||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
<script src="elements/tablemap.js"></script>
|
||||
<script src="elements/reservation.js?v=2.0.0"></script>
|
||||
<script src="elements/osdatepicker.js?v=2.0.0"></script>
|
||||
<script src="elements/reservation.js?v=2.0.1"></script>
|
||||
<script src="elements/osdatepicker.js?v=2.0.1"></script>
|
||||
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></script>
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
|
||||
|
|
@ -627,7 +627,7 @@ function bindCancelButtn() {
|
|||
var year = date.getFullYear();
|
||||
var dateStr = year + "-" + month + "-" + day;
|
||||
|
||||
setTimeout(function(){document.location.href = "reservation.html?v=2.0.0&date=" + dateStr;},500);
|
||||
setTimeout(function(){document.location.href = "reservation.html?v=2.0.1&date=" + dateStr;},500);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></script>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
|
@ -30,7 +30,7 @@ var SUM_REASON = ["Grund","Reason","Razón"];
|
|||
var SUM_CANCEL_ITEM = ["Stornierung","Cancellation","Revocación"];
|
||||
var SUM_CANCELLATION_OK = ["Die Zahlung wurde in OrderSprinter storniert.","The payment was cancelled in OrderSprinter.","El pago se canceló en OrderSprinter."];
|
||||
|
||||
var nextpage = "paydesk.html?version=2.0.0";
|
||||
var nextpage = "paydesk.html?version=2.0.1";
|
||||
|
||||
var lang;
|
||||
|
||||
|
|
@ -84,10 +84,10 @@ function setLanguage(language) {
|
|||
|
||||
if (nextPage == "p") {
|
||||
$("#nextpagebtntxt").html(SUM_TO_PAYMENT[lang]);
|
||||
nextpage = "paydesk.html?t=" + tableid + "&version=2.0.0";
|
||||
nextpage = "paydesk.html?t=" + tableid + "&version=2.0.1";
|
||||
} else {
|
||||
$("#nextpagebtntxt").html(SUM_TO_ORDER[lang]);
|
||||
nextpage = "waiter.html?version=2.0.0";
|
||||
nextpage = "waiter.html?version=2.0.1";
|
||||
}
|
||||
|
||||
var txt = "<table class='viewtable'>";
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<link rel="stylesheet" href="php/3rdparty/jquery.mobile-1.4.0.min.css" type="text/css" />
|
||||
<script src="php/3rdparty/jquery-2.0.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.0.min.js"></script>
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></script>
|
||||
<style>
|
||||
|
||||
#tableWithPreparedProds,#tableWithDeliveredEntries,#headertableToCook
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></script>
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/jqueryui1-11-4/jquery-ui.min.css" />
|
||||
<script src="php/3rdparty/jqueryui1-11-4/jquery-ui.min.js"></script>
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.0">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=2.0.1">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
<script src="php/3rdparty/jquery-1.11.3.min.js"></script>
|
||||
<script src="php/3rdparty/jquery.mobile-1.4.5.min.js"></script>
|
||||
|
||||
<script src="utilities.js?v=2.0.0"></script>
|
||||
<script src="utilities.js?v=2.0.1"></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