OrderSprinter 1.5.17
This commit is contained in:
parent
7880581c22
commit
09b4fb7110
|
|
@ -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.16" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.16" />
|
||||
<link rel="stylesheet" href="css/gueststyle.css?v=1.5.17" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.17" />
|
||||
<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>
|
||||
|
|
@ -105,7 +105,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.16 </div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo">1.5.17 </div>
|
||||
</div><!-- /grid-a -->
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -90,10 +90,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.16">';
|
||||
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.17">';
|
||||
echo "</head>";
|
||||
echo "<body><div class=surround>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.16</span><br><br>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.17</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.16");
|
||||
Database::setVersion($pdo,$prefix,"1.5.17");
|
||||
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.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.17">
|
||||
|
||||
<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.16"></script>
|
||||
<script src="kitchenbar.js?v=1.5.16"></script>
|
||||
<script src="utilities.js?v=1.5.17"></script>
|
||||
<script src="kitchenbar.js?v=1.5.17"></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.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.17">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
.groupitem{display:-webkit-flex;display:flex;-webkit-flex-flow:row wrap;flex-flow:row wrap;text-align:center;color:white;background-color:Gray;width:100px;height:30px;margin:10px;border:2px solid;border-top-right-radius:2em;border-bottom-right-radius:2em;padding:20px;color:black;font-weight:bold;text-align:center;box-shadow:10px 10px 5px #888;word-wrap:break-word;white-space:pre-line;overflow:hidden}.groupitemchoice{background-color:#ffece4;width:100px;height:30px;margin:10px;border-radius:2px;border:2px solid #73ad21;padding:20px;color:black;font-weight:bold;text-align:center;box-shadow:10px 10px 5px #888;word-wrap:break-word;white-space:pre-line;overflow:hidden}.groupitemchoiceselected{background-color:#ddece4;width:100px;height:30px;margin:10px;border-radius:2px;border:2px solid red;padding:20px;color:black;font-weight:bold;text-align:center;box-shadow:10px 10px 5px #888;word-wrap:break-word;white-space:pre-line;overflow:hidden}
|
||||
.groupitem{text-align:center;color:white;background-color:Gray;width:100px;height:30px;margin:10px;border:2px solid;border-top-right-radius:2em;border-bottom-right-radius:2em;padding:20px;color:black;font-weight:bold;text-align:center;box-shadow:10px 10px 5px #888;word-wrap:break-word;white-space:pre-line;overflow:hidden}.groupitemchoice{background-color:#ffece4;width:100px;height:30px;margin:10px;border-radius:2px;border:2px solid #73ad21;padding:20px;color:black;font-weight:bold;text-align:center;box-shadow:10px 10px 5px #888;word-wrap:break-word;white-space:pre-line;overflow:hidden}.groupitemchoiceselected{background-color:#ddece4;width:100px;height:30px;margin:10px;border-radius:2px;border:2px solid red;padding:20px;color:black;font-weight:bold;text-align:center;box-shadow:10px 10px 5px #888;word-wrap:break-word;white-space:pre-line;overflow:hidden}
|
||||
|
|
@ -1 +1 @@
|
|||
.grouppanel{display:-webkit-flex;display:flex;-webkit-justify-content:flex-start;justify-content:flex-start;-webkit-flex-wrap:wrap;flex-flow:wrap;background-color:lightgrey}
|
||||
.grouppanel{display:-webkit-flex;display:flex;-webkit-justify-content:left;justify-content:left;-webkit-flex-wrap:row wrap;flex-flow:row wrap;background-color:lightgrey}
|
||||
|
|
@ -1 +1 @@
|
|||
html{overflow-y:scroll}.ospage{font-family:Helvetica,Arial,Verdana,sans-serif;display:-webkit-flex;display:flex;-webkit-flex-flow:row wrap;flex-flow:row wrap;text-align:center;color:white}.ospage>*{padding:10px;flex:100%}.tableospage{width:100%;height:40px;background-color:black;color:white;text-align:center;vertical-align:middle;display:inline-table}.main{text-align:left;background:cornflowerblue;-webkit-flex:5;flex:5;-webkit-flex-flow:nowrap;flex-flow:nowrap}.tablemain{text-align:left;background:cornflowerblue;vertical-align:top;width:65%}#rightsidearea{vertical-align:top;background:violet;color:black;width:15%}.header{background:black;font-weight:bold;display:inline-table;vertical-align:middle;padding:10px}.footer{display:-webkit-flex;display:flex;-webkit-justify-content:center;justify-content:center;-webkit-flex-wrap:row nowrap;flex-flow:row nowrap;background:black;-webkit-align-items:stretch;align-items:stretch}.tablefooter{padding:10px;background-color:black;vertical-align:middle;display:inline-table;width:100%;height:15px;box-sizing:border-box}.tabledashheader{padding:10px;background-color:black;vertical-align:middle;display:inline-table;width:100%;height:15px;text-align:center}.dashheader{color:white;text-align:center;font-weight:bold}#loggedinuser{float:left;color:white;background-color:black}#versioninfo{color:white;float:right;background-color:black}.floatright{float:right}.aside1{background:moccasin;color:black;width:0;-webkit-flex:2;flex:2}.tableaside1{background:moccasin;color:black;width:20%;vertical-align:top}.tablepanelheader{width:100%;height:40px;color:white;background-color:black;text-align:center;vertical-align:middle}.aside2{background:violet;-webkit-flex:1;flex:1}@media all and (min-width:400px){.aside1{order:1}.main{order:2}.aside2{order:3}.ordereditem-sentcontainer{order:4}.waitermsg{order:5}.footer{order:6}}.input100{width:100%;height:50px;font-weight:bold;text-align:center}.input90{width:89%;height:50px;font-weight:bold;text-align:center}.input50{width:49%;height:50px;font-weight:bold;text-align:center}.area10{width:9%;height:50px;text-align:center}.inputwhite[type="text"]{background-color:white}.inputwhite[type="submit"]{background-color:white}.inputgreen[type="text"]{background-color:#0f0}.inputgreen[type="submit"]{background-color:#0f0}.inputblue[type="text"]{background-color:#8ee5ee}.inputblue[type="submit"]{background-color:#8ee5ee}.infoarea{width:49%;background-color:#afa;color:black;font-weight:bold;font-size:20px;display:-webkit-flex;display:flex;-webkit-justify-content:center;justify-content:center;-webkit-align-items:center;align-items:center;border:2px solid red}.mainmenuchoice{list-style-type:none;padding:0;border:1px solid #ddd}.mainmenuitem{padding:8px 16px;border-bottom:1px solid #ddd;background-color:#fff6b5;height:40px;font-size:16px;font-weight:bold}.mainmenuitem:hover{background-color:#eed33f}.commentitem:last-child{border-bottom:0}.commentitem{padding:8px 16px;border-bottom:1px solid #ddd;background-color:#fff6b5;height:40px;font-size:16px;font-weight:bold}.commentitem:last-child{border-bottom:0}.buttonarea{box-shadow:10px 10px 5px #888}
|
||||
html{overflow-y:scroll}*{margin:0;padding:0}body{position:relative}#allwithoutheaderfooter{width:100%;background:silver;margin:0 auto;display:table;border-spacing:8px}.tableospage{width:100%;height:40px;background-color:black;color:white;text-align:center;vertical-align:middle;display:inline-table}#tablepanel{width:250px;display:table-cell;background:#5d6d7e;vertical-align:top;border-radius:25px;border:3px solid #17202a;padding:15px}#main{background:lightgrey;display:table-cell;vertical-align:top;border-radius:25px;border:3px solid #17202a;padding:10px;margin:2px}#rightsidearea{width:250px;display:table-cell;background:silver;vertical-align:top}.ospage{font-family:Helvetica,Arial,Verdana,sans-serif;text-align:center;color:white}.main{text-align:left;background:cornflowerblue;display:table-cell;vertical-align:top}.tablemain{text-align:left;background:cornflowerblue;vertical-align:top;width:65%}#rightsidearea{vertical-align:top;background:silver;color:black;width:15%;display:table-cell;vertical-align:top}.header{background:black;font-weight:bold;display:inline-table;vertical-align:middle;padding:10px}.footer{-webkit-justify-content:center;justify-content:center;background:black;-webkit-align-items:stretch;align-items:stretch}.tablefooter{padding:10px;background-color:black;vertical-align:middle;display:inline-table;width:100%;height:15px;box-sizing:border-box}.tabledashheader{padding:10px;background-color:black;vertical-align:middle;display:inline-table;width:100%;height:15px;text-align:center}.dashheader{color:white;text-align:center;font-weight:bold}#loggedinuser{float:left;color:white;background-color:black}#versioninfo{color:white;float:right;background-color:black}.floatright{float:right}.tablepanelheader{color:white}.input100{width:100%;height:50px;font-weight:bold;text-align:center}.input90{width:89%;height:50px;font-weight:bold;text-align:center}.input50{width:49%;height:50px;font-weight:bold;text-align:center}.area10{width:9%;height:50px;text-align:center}.inputwhite[type="text"]{background-color:white}.inputwhite[type="submit"]{background-color:white}.inputgreen[type="text"]{background-color:#0f0}.inputgreen[type="submit"]{background-color:#0f0}.inputblue[type="text"]{background-color:#8ee5ee}.inputblue[type="submit"]{background-color:#8ee5ee}.infoarea{width:49%;background-color:#afa;color:black;font-weight:bold;font-size:20px;display:-webkit-flex;display:flex;-webkit-justify-content:center;justify-content:center;-webkit-align-items:center;align-items:center;border:2px solid red}.mainmenuchoice{list-style-type:none;padding:0;border:1px solid #ddd}.mainmenuitem{padding:8px 16px;border-bottom:1px solid #ddd;background-color:#fff6b5;height:40px;font-size:16px;font-weight:bold}.mainmenuitem:hover{background-color:#eed33f}.commentitem:last-child{border-bottom:0}.commentitem{padding:8px 16px;border-bottom:1px solid #ddd;background-color:#fff6b5;height:40px;font-size:16px;font-weight:bold}.commentitem:last-child{border-bottom:0}.buttonarea{box-shadow:10px 10px 5px #888}.ui-widget-content{background-color:#85929e !important}.ui-draggable{background-color:black !important}
|
||||
|
|
@ -1 +1 @@
|
|||
.roompanel{display:-webkit-flex;display:flex;-webkit-justify-content:center;justify-content:center;-webkit-flex-wrap:row nowrap;flex-flow:row nowrap;background-color:lightgrey;width:100%;-webkit-align-items:stretch;align-items:stretch}.roomitem{background-color:#fff6b5;padding:10px;color:black;font-weight:bold;text-align:center;border:2px solid #aaa;-webkit-flex:1;flex:10;box-shadow:10px 10px 5px #888;word-wrap:break-word}.roomitemselected{background-color:#eee6b5;height:65px;padding:10px;color:black;font-weight:bold;text-align:center;border:2px solid red;-webkit-flex:1;flex:15;box-shadow:10px 10px 5px #888}.roomtogo{display:-webkit-flex;display:flex;-webkit-justify-content:center;justify-content:center;-webkit-flex-wrap:row wrap;flex-flow:row wrap}.osroom-desk-0{height:40px}.osroom-desk-1{height:60px}.osroom-desk-2{height:80px}.osroom-desk-sel-0{height:45px}.osroom-desk-sel-1{height:65px}.osroom-desk-sel-2{height:85px}.roomname{width:100%}.roomtogoaccounted{background:white;color:black;-webkit-flex:1;flex:1;order:2;font-weight:normal}.roomchangeitem{padding:8px 16px;border-bottom:1px solid #ddd;background-color:#dd0;height:40px;font-size:16px;font-weight:bold}
|
||||
.roompanel{display:-webkit-flex;display:flex;-webkit-justify-content:center;justify-content:center;-webkit-flex-wrap:row nowrap;flex-flow:row nowrap;background-color:#5d6d7e;width:100%;-webkit-align-items:stretch;align-items:stretch}.roomitem{background-color:#fff6b5;padding:10px;color:black;font-weight:bold;text-align:center;border:2px solid #aaa;-webkit-flex:1;flex:10;box-shadow:10px 10px 5px #888;word-wrap:break-word}.roomitemselected{background-color:#eee6b5;height:65px;padding:10px;color:black;font-weight:bold;text-align:center;border:2px solid red;-webkit-flex:1;flex:15;box-shadow:10px 10px 5px #888}.roomtogo{display:-webkit-flex;display:flex;-webkit-justify-content:center;justify-content:center;-webkit-flex-wrap:row wrap;flex-flow:row wrap}.osroom-desk-0{height:40px}.osroom-desk-1{height:60px}.osroom-desk-2{height:80px}.osroom-desk-sel-0{height:45px}.osroom-desk-sel-1{height:65px}.osroom-desk-sel-2{height:85px}.roomname{width:100%}.roomtogoaccounted{background:white;color:black;-webkit-flex:1;flex:1;order:2;font-weight:normal}.roomchangeitem{padding:8px 16px;border-bottom:1px solid #ddd;background-color:#dd0;height:40px;font-size:16px;font-weight:bold}
|
||||
|
|
@ -1 +1 @@
|
|||
.tablepanel{display:-webkit-flex;display:flex;-webkit-flex-flow:row wrap;flex-flow:row wrap;text-align:center;color:white}.tablepanel>*{padding:10px;-webkit-flex-wrap:wrap;flex-flow:wrap}.tablepanelcontent{display:-webkit-flex;display:flex;-webkit-flex-flow:row wrap;flex-flow:row wrap;text-align:center;color:white;-webkit-justify-content:center;justify-content:center}.tablepanelheader{background:black;flex:100%}.tableelement{display:-webkit-flex;display:flex;-webkit-flex-flow:row wrap;flex-flow:row wrap;font-weight:bold;text-align:center;width:100px;padding:5px;box-shadow:10px 10px 5px #888}.tableelement>*{flex:1 100%}.tableitem{background-color:LightGreen;color:black;margin:5px;border-radius:15px;border:2px solid #73ad21;font-weight:bold;text-align:center}.tableitemselected{background-color:LightGreen;color:black;border-radius:15px;border:4px solid red;font-weight:bold;text-align:center}.ostable-desk-0{height:30px}.ostable-desk-1{height:50px}.ostable-desk-2{height:70px}.tablename{order:1;padding:0;width:100%}.tableopen{background:white;color:black;-webkit-flex:1;flex:1;order:2;font-weight:normal}.tableready{background:white;color:black;-webkit-flex:1;flex:1;order:3}.tablechangeitem{padding:8px 16px;border-bottom:1px solid #ddd;background-color:#ff0;height:40px;font-size:16px;font-weight:bold}
|
||||
.tablepanel{width:250px;display:table-cell;background:red;vertical-align:top}.tablepanelcontent{display:-webkit-flex;display:flex;-webkit-flex-flow:row wrap;flex-flow:row wrap;text-align:center;color:white;-webkit-justify-content:center;justify-content:center}.tablepanelheader{background:black}.tableelement{display:-webkit-flex;display:flex;-webkit-flex-flow:row wrap;flex-flow:row wrap;font-weight:bold;text-align:center;width:100px;padding:5px;box-shadow:10px 10px 5px #888}.tableelement>*{flex:1 100%}.tableitem{background-color:LightGreen;color:black;margin:5px;border-radius:15px;border:2px solid #73ad21;font-weight:bold;text-align:center}.tableitemselected{background-color:LightGreen;color:black;border-radius:15px;border:4px solid red;font-weight:bold;text-align:center}.ostable-desk-0{height:30px}.ostable-desk-1{height:50px}.ostable-desk-2{height:70px}.tablename{order:1;padding:0;width:100%}.tableopen{background:white;color:black;-webkit-flex:1;flex:1;order:2;font-weight:normal}.tableready{background:white;color:black;-webkit-flex:1;flex:1;order:3}.tablechangeitem{padding:8px 16px;border-bottom:1px solid #ddd;background-color:#ff0;height:40px;font-size:16px;font-weight:bold}
|
||||
|
|
@ -202,7 +202,7 @@ function newProduct(id, longname, shortname,priceA,priceB,priceC,unit,display,da
|
|||
|
||||
|
||||
createMobileAudioSel:function(audiofiles,id) {
|
||||
var txt = '<p><div data-role="fieldcontain">'
|
||||
var txt = '<p><div data-role="fieldcontain" style="display:none;">'
|
||||
+ '<label for="' + id + '">Audiofile:</label>'
|
||||
+ this.createAudioSelection(audiofiles,id)
|
||||
+ '</div></p>';
|
||||
|
|
@ -344,7 +344,7 @@ function newProduct(id, longname, shortname,priceA,priceB,priceC,unit,display,da
|
|||
|
||||
$("#availcont_" + this.id).html(this.createMobileAvail("prodavail_" + this.id,PROD_AVAILABLE[lang]));
|
||||
$("#favcont_" + this.id).html(this.createMobileFavorite("prodfav_" + this.id,PROD_FAVORITE[lang]));
|
||||
$("#audiocont_" + this.id).html(this.createMobileAudioSel(audiofiles,"audiosel_" + this.id));
|
||||
$("#audiocont_" + this.id).html(this.createMobileAudioSel(audiofiles,"audiosel_" + this.id));
|
||||
|
||||
$("#prodextra_" + this.id).html(PROD_ASS_EXTRAS[lang]);
|
||||
|
||||
|
|
|
|||
|
|
@ -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.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.17">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
|
|||
|
|
@ -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.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.17">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.17">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -47,9 +47,9 @@ function fillUserList(userinfo) {
|
|||
function createViewSelBox(preselection) {
|
||||
var txt = '<select name="modus" id="modus" data-theme="e">';
|
||||
if (preselection == 0) {
|
||||
txt += '<option value="0" selected>Mobil</option><option value="1">Desktop (Firefox)</option>';
|
||||
txt += '<option value="0" selected>Mobil</option><option value="1">Desktop</option>';
|
||||
} else {
|
||||
txt += '<option value="0">Mobil</option><option value="1" selected>Desktop (Firefox)</option>';
|
||||
txt += '<option value="0">Mobil</option><option value="1" selected>Desktop</option>';
|
||||
}
|
||||
txt += '</select>';
|
||||
$("#moduscell").html(txt);
|
||||
|
|
@ -229,7 +229,7 @@ function handleResultOfInstallCheck(is_installed) {
|
|||
if (is_installed == "Yes") {
|
||||
useInstallation();
|
||||
} else {
|
||||
setTimeout(function(){document.location.href = "install.html?v=1.5.16"},500);
|
||||
setTimeout(function(){document.location.href = "install.html?v=1.5.17"},500);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -101,12 +101,28 @@ var SESSION_LIFETIME_TOO_SHORT = ["Die maximale Sessionlebenszeit <i>session.gc_
|
|||
var NOT_ALL_PHP_OK = ["Die Installation kann trotzdem fortgesetzt werden. Bitte beachten Sie die jedoch die obigen Hinweise!",
|
||||
"You can continue the installation but please consider the notes!",
|
||||
"Se puede continuar la instalación pero leer las recomendaciones!"];
|
||||
var NEXT_NXT = ["Weiter","Continue","Continuar"];
|
||||
var RESTMODE_TXT = ["Restaurantmodus","Restaurant mode","Restaurante"];
|
||||
var COMPANY_INFO_TXT = ["Betriebsinfo","Company information","Información general"];
|
||||
var COMPANY_INFO_DEFAULT = ["Musterrestaurant\nBeispielstraße 123\n12345 Musterstadt","Example company\nA Street 123\n12345 Town","Restaurante Ejemplo\n123, Calle Ejemplo\nUna Ciudad"];
|
||||
var DEFAULT_VIEW = ["Standard-Kellneransicht","Defaut waiter's view","Vista estandardo"];
|
||||
var CANCEL_CODE_TXT = ["Bon-Stornocode","Receipt cancel code","Codigo de revocar"];
|
||||
var PRINT_CODE = ["Printcode","Printcode","Printcode"];
|
||||
var GEN_SETTINGS_TXT = ["Allgemeine Einstellungen","General settings","Parametrizaciones generales"];
|
||||
var GEN_SETTINGS_CHANGEABLE_TXT = ["Alle Einstellungen können jederzeit später wieder in der Verwaltungsansicht geändert werden.<br><br>Soll nur ein Versionsupdate vorgenommen werden, so sind diese Angaben irrelevant.","All these settings can be changed at any time later in the administration view.<br><br>If you only intend to update the version these settings are of no interest.","Todos los ajustes se pueden cambiar en cualquier momento en la vista de administración.<br><br>Si sólo quiere update la versión estas parameters no estan importantes."];
|
||||
|
||||
var lang = 0;
|
||||
var workflow = 1;
|
||||
var timezone = "Europe/Berlin";
|
||||
var doOnlyUpdate = false;
|
||||
|
||||
// generalsettings
|
||||
var gen_restaurantmode = 1;
|
||||
var gen_companyinfo = "";
|
||||
var gen_defaultview = 0;
|
||||
var gen_stornocode = 123;
|
||||
var gen_printpass = 123;
|
||||
|
||||
function setLanguage(langIndex) {
|
||||
lang = langIndex;
|
||||
|
||||
|
|
@ -159,6 +175,15 @@ function setLanguage(langIndex) {
|
|||
$("#timezoneheader").html(SEL_TIMEZONE[lang]);
|
||||
$("#ignoretimezonehint").html(IGNORE_TIMEZONE[lang]);
|
||||
|
||||
$("#setgeneralsettingsbtntxt").html(NEXT_NXT[lang]);
|
||||
$("#restmodetxt").html(RESTMODE_TXT[lang]);
|
||||
$("#companyinfotxt").html(COMPANY_INFO_TXT[lang]);
|
||||
$("#defaultviewtxt").html(DEFAULT_VIEW[lang]);
|
||||
$("#cancelcodetxt").html(CANCEL_CODE_TXT[lang]);
|
||||
$("#printcodetxt").html(PRINT_CODE[lang]);
|
||||
$("#gensettingstxt").html(GEN_SETTINGS_TXT[lang]);
|
||||
$("#gensettingschangeabletxt").html(GEN_SETTINGS_CHANGEABLE_TXT[lang]);
|
||||
|
||||
checkWriteAccess();
|
||||
testdb();
|
||||
checkPhpStatus();
|
||||
|
|
@ -346,7 +371,12 @@ function startinstall() {
|
|||
currency: currencytxt,
|
||||
lang: langid,
|
||||
point: point,
|
||||
timezone:timezone
|
||||
timezone:timezone,
|
||||
companyinfo: gen_companyinfo,
|
||||
restaurantmode: gen_restaurantmode,
|
||||
cancelcode: gen_stornocode,
|
||||
printpass: gen_printpass,
|
||||
defaultview: gen_defaultview
|
||||
}
|
||||
$("#progress").html("<b style='color:red;'>" + WORKING[langid] + "</b>");
|
||||
//$("#startinstall").attr("disabled", "disabled");
|
||||
|
|
@ -364,10 +394,8 @@ function resultOfUpdate(jsonAnswer) {
|
|||
$("#updateinprogresstxt").hide();
|
||||
if (jsonAnswer == "OK") {
|
||||
if (!doOnlyUpdate) {
|
||||
// REM* update the normal way
|
||||
alert(UPDATE_OK[lang]);
|
||||
} else {
|
||||
// REM* auto update
|
||||
alert(AUTO_UPDATE_OK[lang]);
|
||||
}
|
||||
|
||||
|
|
@ -414,6 +442,7 @@ function resultOfInstall(jsonAnswer) {
|
|||
if (jsonAnswer == "OK") {
|
||||
$("#languagesettings").hide();
|
||||
$("#timezones").hide();
|
||||
$("#generalsettings").hide();
|
||||
$("#installsettings").hide();
|
||||
$("#samplesettings").hide();
|
||||
$("#workflowsettings").show();
|
||||
|
|
@ -494,6 +523,21 @@ function binding() {
|
|||
e.preventDefault();
|
||||
timezone = $("#zoneselection").find(":selected").text();
|
||||
$("#timezones").hide();
|
||||
$("#generalsettings").show();
|
||||
});
|
||||
|
||||
$("#setgeneralsettingsbtn").off("click").on("click", function(e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
$("#generalsettings").hide();
|
||||
|
||||
// save the general settings that the user wants to have
|
||||
gen_restaurantmode = $("#restmodeselection").val();
|
||||
gen_defaultview = $("#defaultmodeselection").val();
|
||||
gen_stornocode = $("#cancelcode").val();
|
||||
gen_printpass = $("#printcode").val();
|
||||
gen_companyinfo = $("#companyinfo").val();
|
||||
|
||||
$("#installsettings").show();
|
||||
});
|
||||
}
|
||||
|
|
@ -504,6 +548,7 @@ function setWorkflowMode(e,mode) {
|
|||
workflow = mode;
|
||||
$("#languagesettings").hide();
|
||||
$("#timezones").hide();
|
||||
$("#generalsettings").hide();
|
||||
$("#installsettings").hide();
|
||||
$("#samplesettings").show();
|
||||
$("#workflowsettings").hide();
|
||||
|
|
@ -538,6 +583,7 @@ function setSelectedLanguage(e,l) {
|
|||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
setLanguage(l);
|
||||
$("#companyinfo").val(COMPANY_INFO_DEFAULT[lang]);
|
||||
|
||||
$("#languagesettings").hide();
|
||||
$("#timezones").hide();
|
||||
|
|
@ -585,6 +631,10 @@ function checkDoOnlyUpdate() {
|
|||
}
|
||||
|
||||
$(document).ready(function() {
|
||||
$("#printcode").val("123");
|
||||
$("#cancelcode").val("123");
|
||||
$("#restmodeselection").val(1);
|
||||
$("#defaultmodeselection").val(0);
|
||||
setLanguage(0);
|
||||
binding();
|
||||
getDbVals();
|
||||
|
|
@ -597,6 +647,7 @@ $(document).ready(function() {
|
|||
if (doOnlyUpdate) {
|
||||
$("#languagesettings").hide();
|
||||
$("#timezones").hide();
|
||||
$("#generalsettings").hide();
|
||||
$("#installsettings").show();
|
||||
$("#samplesettings").hide();
|
||||
$("#workflowsettings").hide();
|
||||
|
|
@ -616,6 +667,7 @@ $(document).ready(function() {
|
|||
} else {
|
||||
$("#languagesettings").show();
|
||||
$("#timezones").hide();
|
||||
$("#generalsettings").hide();
|
||||
$("#installsettings").hide();
|
||||
$("#samplesettings").hide();
|
||||
$("#workflowsettings").hide();
|
||||
|
|
@ -626,7 +678,33 @@ $(document).ready(function() {
|
|||
|
||||
<style>
|
||||
img.Hover { border: 1px solid #000; }
|
||||
|
||||
|
||||
.generalsettingtxt {
|
||||
font-size:15px;
|
||||
}
|
||||
#companyinfo {
|
||||
width: 100%;
|
||||
height: 80px;
|
||||
font-size:16px;
|
||||
color: black;
|
||||
}
|
||||
#printcode[type="text"],#cancelcode[type="text"] {
|
||||
width:100%;
|
||||
color:black;
|
||||
background-color:white;
|
||||
font-size: 16px;
|
||||
}
|
||||
#gensettingstxt {
|
||||
background-color: #1e8449;
|
||||
font-size: 20px;
|
||||
}
|
||||
#gensettingschangeabletxt {
|
||||
background-color: #85c1e9;
|
||||
font-size: 16px;
|
||||
font-style: italic;
|
||||
text-align: left;
|
||||
}
|
||||
|
||||
</style>
|
||||
|
||||
</head>
|
||||
|
|
@ -724,6 +802,43 @@ El servicio web OrderSprinter no requiere una conexión a Internet. Sin embargo,
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<div id="generalsettings" style="display:none;">
|
||||
<form id="generalsettingsform" >
|
||||
<center>
|
||||
<p><table border="0" cellpadding="5" cellspacing="0" class="viewtable">
|
||||
<tr><th id="gensettingstxt" colspan="2">Gen. Einst.</tr>
|
||||
<tr><th id="category" width="200px" style="padding-top: 20px;" >Kategorie<th id="setting" style="padding-top: 20px;" width="300px">Einstellung</tr>
|
||||
<tr><td><span id="restmodetxt" class="generalsettingtxt">Restmode</span>
|
||||
<td><select id="restmodeselection" style="height:50px;font-family : monospace;font-size : 17pt;width:100%;">
|
||||
<option value="1" selected>Ein (Tischauswahl)</option>
|
||||
<option value="0">Aus</option>
|
||||
</select>
|
||||
</tr>
|
||||
<tr><td><span id="companyinfotxt" class="generalsettingtxt">Betriebsinformation</span>
|
||||
<td><textarea id="companyinfo"></textarea>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><span id="defaultviewtxt" class="generalsettingtxt">Standardview</span>
|
||||
<td><select id="defaultmodeselection" style="height:50px;font-family : monospace;font-size : 17pt;width:100%;">
|
||||
<option value="0" selected>Mobil</option>
|
||||
<option value="1">Desktop</option>
|
||||
</select>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><span id="cancelcodetxt" class="generalsettingtxt">Stornocode</span>
|
||||
<td><input id="cancelcode" type="text" />
|
||||
</tr>
|
||||
<tr>
|
||||
<td><span id="printcodetxt" class="generalsettingtxt">P.code</span>
|
||||
<td><input id="printcode" type="text" />
|
||||
</tr>
|
||||
<tr><td id="gensettingschangeabletxt" colspan="2"></tr>
|
||||
</table>
|
||||
<p><button id="setgeneralsettingsbtn" style="width:600px;height:60px;background-color: #239b56;color:black;font-weight:bold;"><span id="setgeneralsettingsbtntxt">Weiter</span></button>
|
||||
</center>
|
||||
</form>
|
||||
</div> <!-- generalsettings -->
|
||||
|
||||
<div id=installsettings style="display:none;">
|
||||
<form id="formid">
|
||||
<center>
|
||||
|
|
@ -794,7 +909,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.16</button>
|
||||
<button id="updatebtn">Update -> 1.5.17</button>
|
||||
<span id="updateinprogresstxt" style="display:none;">Update... bitte warten.</span>
|
||||
</td>
|
||||
<td> </td>
|
||||
|
|
|
|||
|
|
@ -332,6 +332,7 @@ DbUtils::overruleTimeZone($_POST['timezone']);
|
|||
DbUtils::overrulePrefix($_POST['prefix']);
|
||||
|
||||
set_time_limit(60*10);
|
||||
|
||||
$basedb = new Basedb();
|
||||
$basedb->createAndIntializeTables($pdo,$_POST['point'],$_POST['lang'],$_POST['currency'],$_POST['timezone']);
|
||||
|
||||
|
|
@ -341,6 +342,13 @@ echo json_encode("Fehler beim Update: " . $updResult["msg"]);
|
|||
return;
|
||||
}
|
||||
|
||||
$companyinfo = $_POST["companyinfo"];
|
||||
$restaurantmode = $_POST["restaurantmode"];
|
||||
$cancelcode = $_POST["cancelcode"];
|
||||
$printpass = $_POST["printpass"];
|
||||
$defaultview = $_POST["defaultview"];
|
||||
$basedb->changeInitialConfig($pdo,$restaurantmode,$companyinfo,$defaultview,$cancelcode,$printpass);
|
||||
|
||||
$admin->signLastBillId();
|
||||
|
||||
$roleid = Roles::insertAdminRole($pdo);
|
||||
|
|
@ -381,7 +389,7 @@ $zones[] = $timezone_identifiers[$i];
|
|||
echo json_encode($zones);
|
||||
} else if ($command == 'update') {
|
||||
set_time_limit(60*30);
|
||||
$installerVersion = "1.5.16";
|
||||
$installerVersion = "1.5.17";
|
||||
|
||||
$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.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.17">
|
||||
|
||||
<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.16"></script>
|
||||
<script src="kitchenbar.js?v=1.5.16"></script>
|
||||
<script src="utilities.js?v=1.5.17"></script>
|
||||
<script src="kitchenbar.js?v=1.5.17"></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.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.17">
|
||||
|
||||
<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.16"></script>
|
||||
<script src="elements/tablemap.js?v=1.5.16"></script>
|
||||
<script src="elements/roommap.js?v=1.5.16"></script>
|
||||
<script src="elements/groundplan.js?v=1.5.16"></script>
|
||||
<script src="utilities.js?v=1.5.17"></script>
|
||||
<script src="elements/tablemap.js?v=1.5.17"></script>
|
||||
<script src="elements/roommap.js?v=1.5.17"></script>
|
||||
<script src="elements/groundplan.js?v=1.5.17"></script>
|
||||
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
|
|
@ -194,18 +194,6 @@ var MAN_HOSTTEXT_TXT = ["Vorlage Bewirtungsbeleg","Template hospitality receipt"
|
|||
var MAN_EMAIL_SENDER_TXT = ["Email-Absender:","Email sender:","Remitente de email:"];
|
||||
var MAN_DEFAULT_EMAIL_TO = ["Standard-Email-Empfänger:","Standard email receiver","Destinario estandard de emails"];
|
||||
var MAN_NEW_VERSION_AVAIL = ["Neue Version verfügbar", "New version available", "Hay una versión nueva"];
|
||||
var MAN_BAK_REST_INFO = ['Die Datensicherung sichert die aktuelle Konfiguration. Beim Import kann diese wieder zurückimportiert '
|
||||
+ 'werden. Dabei werden alle anderen Daten gelöscht.<br><br>',
|
||||
'The backup functionality saves the current configuration. With the import functionality the configuration can be re-imported. '
|
||||
+ 'During the import all other data is deleted.<br><br>',
|
||||
'Exportar guarda la configuración. Con "Importar" la configuración se puede re-importado. '
|
||||
+ 'Durante la importación todo el resto de los datos va a ser borrado.'];
|
||||
var MAN_BAK_REST_INFO_ALL = ['Die Datensicherung kann auch die gesamte Datenbank sichern. Beim Import kann diese wieder zurückimportiert '
|
||||
+ 'werden. Die Aktionen werden protokolliert und sind für Betriebsprüfer einsehbar.<br><br>',
|
||||
'The backup functionality can also save the complete data base. With the import functionality the data can be re-imported. '
|
||||
+ 'All actions are logged and can be controlled by authorized people.<br><br>',
|
||||
'Exportar puede guarda la base de datos completamente. Con "Importar" este data se puede re-importado. '
|
||||
+ 'Las acciones estan escritos en un log.'];
|
||||
var MAN_REST_INFO = ["Der Import dauert eine Weile...","The import takes a while...","Importar necesita un rato..."];
|
||||
var MAN_BAK_REST_HEAD = ["Sicherung und Import","Backup and Restore","Exportar y Importar"];
|
||||
var MAN_BAK_BTN = ["Sicherung (Konfiguration)","Backup (Configuration)","Exportar (configuración)"];
|
||||
|
|
@ -480,6 +468,8 @@ var MAN_SHOWHOSTPRINT = ["Bewirtungsbeleg auswählbar","Hospitality receipt sele
|
|||
var MAN_ONECLICKCOOKED = ["1-Klick Zubereitung (Küchen-/Baransicht)","1-click cooked (Kitchen/Bar view)","1-click cocido (Cocina/Bar)"];
|
||||
var MAN_SHOWPICKDELBTN = ["Zeige Entfernen-Button in Abholansicht","Show remove button in pickup view","Boton <i>eliminar</i> en vista de recogidos"];
|
||||
var MAN_SHOWPICKHELP = ["Zeige Hilfebereich","Show help area","Mostrar area de ayuda"];
|
||||
var MAN_NO_NEW_UPD_VERSION = ["Update nicht möglich (Version auf dem Server ist unbekannt oder nicht neuer). Installierte Version: ","Update not possible (version on server unknown or not newer). Installed version: ","Actualización no posible (versión en servidor desconocida o no más nueva). Versión instalada: "];
|
||||
var MAN_UPDATE_BTN_CLICK = ["Das Update startet und kann einige Minuten dauern. Bitte bestätigen diese Meldung und warten Sie, bis dass ein Hinweistext über den Abschluss des Updates informiert.","The update will start and may take a few minutes. Please confirm this message and wait until a message informs you that the update is complete.","La actualización se iniciará y puede tardar unos minutos. Confirme este mensaje y espere a que un mensaje le informe de que la actualización ha finalizado."];
|
||||
|
||||
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];
|
||||
|
|
@ -707,8 +697,6 @@ function setLanguage(l) {
|
|||
$("#emailbadratingtxt").html(MAN_EMAIL_BAD_RATING[l]);
|
||||
$("#emailratingcontacttxt").html(MAN_EMAIL_RATING_CONTACT[l]);
|
||||
|
||||
$("#bakresinfotxt").html(MAN_BAK_REST_INFO[l]);
|
||||
$("#bakresinfotxtall").html(MAN_BAK_REST_INFO_ALL[l]);
|
||||
$("#bakrestxt").html(MAN_BAK_REST_HEAD[l]);
|
||||
$("#updatetxt").html(MAN_UPDATE_HEAD[l]);
|
||||
$('#dbproptxt').html(MAN_DB_PROPERTIES[l]);
|
||||
|
|
@ -844,6 +832,7 @@ function showPanelsDueToUserStatus(jsonAnswer) {
|
|||
if (jsonAnswer == "admin") {
|
||||
$("#dbactionui").show();
|
||||
adminIsLoggedIn = true;
|
||||
binddbactionuiexpand();
|
||||
}
|
||||
if (jsonAnswer == "manager" || (jsonAnswer == 'admin')) {
|
||||
managerIsLoggedIn = true;
|
||||
|
|
@ -861,6 +850,23 @@ function showPanelsDueToUserStatus(jsonAnswer) {
|
|||
}
|
||||
}
|
||||
|
||||
function binddbactionuiexpand() {
|
||||
$("#dbactionui").off("collapsibleexpand").on("collapsibleexpand", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
if (lang == 0) {
|
||||
$("#backuphinttxt_de").show();
|
||||
$("#golivehinttxt_de").show();
|
||||
} else if (lang == 1) {
|
||||
$("#backuphinttxt_en").show();
|
||||
$("#golivehinttxt_en").show();
|
||||
} else if (lang == 2) {
|
||||
$("#backuphinttxt_es").show();
|
||||
$("#golivehinttxt_es").show();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
function getSpeisekarte() {
|
||||
doAjax("GET", "php/contenthandler.php?module=products&command=getSpeisekarte", null, insertSpeisekarte, "Fehler Insert Speisekarte",true);
|
||||
}
|
||||
|
|
@ -1530,7 +1536,7 @@ function initRestoreFileUpload() {
|
|||
} else {
|
||||
alert("Import war erfolgreich.");
|
||||
setTimeout(function(){
|
||||
document.location.href = "index.html?v=1.5.16";
|
||||
document.location.href = "index.html?v=1.5.17";
|
||||
},250);
|
||||
}
|
||||
},
|
||||
|
|
@ -1602,22 +1608,25 @@ function startCreateClosing(remark,doPrint) {
|
|||
}
|
||||
|
||||
function hideClosingBtn() {
|
||||
$("#closingwaiticon").show();
|
||||
$("#createclosing").hide();
|
||||
$("#createclosingnoprint").hide();
|
||||
$("#closingwaiticon").show();
|
||||
$("#createclosing").hide();
|
||||
$("#createclosingnoprint").hide();
|
||||
$("#createclosing").off();
|
||||
$("#createclosingnoprint").off();
|
||||
}
|
||||
|
||||
function showClosingBtn() {
|
||||
$("#closingwaiticon").hide();
|
||||
$("#createclosing").show();
|
||||
$("#createclosingnoprint").show();
|
||||
$("#closingwaiticon").hide();
|
||||
$("#createclosing").show();
|
||||
$("#createclosingnoprint").show();
|
||||
bindingClosing();
|
||||
}
|
||||
|
||||
function bindingClosing() {
|
||||
$("#createclosing").off("click").on("click", function (e) {
|
||||
var remarkText =$('#remarkfield').val();
|
||||
$('#remarkfield').val("");
|
||||
|
||||
|
||||
var filteredRemark = remarkText.replace(/\f/g,"").replace(/\n/g,"").replace(/\r/g,"").replace(/\t/g,"").replace(/\v/g,"");
|
||||
startCreateClosing(filteredRemark,true);
|
||||
});
|
||||
|
|
@ -1625,7 +1634,7 @@ function bindingClosing() {
|
|||
$("#createclosingnoprint").off("click").on("click", function (e) {
|
||||
var remarkText =$('#remarkfield').val();
|
||||
$('#remarkfield').val("");
|
||||
|
||||
|
||||
var filteredRemark = remarkText.replace(/\f/g,"").replace(/\n/g,"").replace(/\r/g,"").replace(/\t/g,"").replace(/\v/g,"");
|
||||
startCreateClosing(filteredRemark,false);
|
||||
});
|
||||
|
|
@ -1905,7 +1914,7 @@ function binding() {
|
|||
e.preventDefault();
|
||||
window.location.href = "php/contenthandler.php?module=admin&command=backup&type=all";
|
||||
});
|
||||
|
||||
|
||||
$("#backup_btnalllogs").off("click").on("click", function (e) {
|
||||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
|
|
@ -1937,8 +1946,9 @@ function binding() {
|
|||
e.stopImmediatePropagation();
|
||||
e.preventDefault();
|
||||
if (newerversionavailable == 0) {
|
||||
alert("Update not possible (version on server unknown or not newer): " + version);
|
||||
alert(MAN_NO_NEW_UPD_VERSION[lang] + version);
|
||||
} else {
|
||||
alert(MAN_UPDATE_BTN_CLICK[lang]);
|
||||
doAjax("GET","php/updatehandler.php?command=updatecheck",null,handleUpdateCheckResult,"Skriptproblem");
|
||||
}
|
||||
});
|
||||
|
|
@ -2084,9 +2094,9 @@ function handleUpdateCheckResult(answer) {
|
|||
|
||||
var millis=getMillis();
|
||||
setTimeout(function(){
|
||||
document.location.href = "install.html?v=1.5.16&mode=onlyupdate&n=" + millis;
|
||||
document.location.href = "install.html?v=1.5.17&mode=onlyupdate&n=" + millis;
|
||||
},250);
|
||||
document.location.href = "install.html?v=1.5.16&mode=onlyupdate&n=" + millis;
|
||||
document.location.href = "install.html?v=1.5.17&mode=onlyupdate&n=" + millis;
|
||||
}
|
||||
|
||||
function handleUpdateReplace(answer) {
|
||||
|
|
@ -4238,7 +4248,82 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
<p>
|
||||
<div data-role="collapsible" data-collapsed="true" data-theme="f" data-content-theme="c" class="noprint" id="dbactionbakrest">
|
||||
<p><h3><span id="bakrestxt">Sicherung und Import</span></h3>
|
||||
<span id='bakresinfotxt'>Die Datensicherung und -wiederherstellung erfordert...</span>
|
||||
|
||||
<div id="backuphinttxt_de" style="display:none;">
|
||||
<b>Hinweis:</b>
|
||||
|
||||
<p>Es gibt verschiedene Möglichkeiten, den Inhalt der Datenbank zu sichern:
|
||||
|
||||
<ul>
|
||||
<li><i>Konfiguration:</i> Nur die Konfiguration (Speisekarte, Benutzer, Einstellungen, Raumplan usw.) werden gesichert.
|
||||
<li><i>Konfiguration + Gäste:</i> Die Sicherung enthält zusätzlich zur Konfiguration auch die Informationen über die Gäste (Personen, Gruppen, Aufenthalte)
|
||||
</ul>
|
||||
|
||||
<p>Möchte man auch die Umsatzdaten sichern, so muss man eine "Alles"-Sicherungsart auswählen. Dabei stehen folgende Möglichkeiten zur Verfügung:
|
||||
<ul>
|
||||
<li><i>Alles ohne Logs:</i> Die Konfiguration und Gästeinformation werden gesichert. Die Protokolldaten (hauptsächlich Informationen über die Abarbeitung von Druckjobs) werden nicht abgespeichert. Dies ist die Sicherung, die man durchführen sollte, wenn man zu einem anderen Zeitpunkt eine komplette Wiederherstellung vornehmen möchte. Diese Sicherungsart wird auch standardmäßig verwendet, wenn man über ein Skript eine Sicherung veranlasst.
|
||||
<li><i>Alles mit Logs:</i> Diese Sicherung enthält alle Daten inklusive der Protokolle. Die Protokolle werden nur benötigt, wenn man bestimmte Fehler erkennen möchte, z.B. fehlgeschlagene Druckjobs. Dieser Export kann vom Entwickler angefragt werden, für den typischen Benutzer ist diese Sicherungsart nicht von Interesse.
|
||||
</ul>
|
||||
|
||||
<p>Üblicherweise wird die Sicherungsdatei zum Download an den Browser übermittelt. Zusätzlich kann man jedoch auch über die Sicherungsart "Alles ohne Logs" auf einen ftp-Server hochladen, wenn der Zugang zum ftp-Server zuvor in der Konfiguration festgelegt wurde.
|
||||
|
||||
<p>Die Sicherung besteht standardmäßig aus einer textbasierten Datei (json-Format). Wurde in der Konfiguration ein tmp-Verzeichnis eingetragen, so werden die Sicherungsdaten als zip-File erstellt.
|
||||
|
||||
<p>Wenn der Download der Sicherungsdatei nicht funktioniert, wurde wahrscheinlich der Wert memory_limit in der PHP-Konfiguration des Servers nicht genügend groß konfiguriert.
|
||||
|
||||
<p>Beim Import kann eine Sicherung, egal welcher Art, wieder zurückimportiert werden. Import-Aktionen werden protokolliert und sind für Betriebsprüfer einsehbar.
|
||||
|
||||
</div>
|
||||
|
||||
<div id="backuphinttxt_en" style="display:none;">
|
||||
<b>Note:</b>
|
||||
|
||||
<p>There are several ways to save the contents of the database:
|
||||
|
||||
<p><ul>
|
||||
<li><i>Configuration:</i> Only the configuration (menu, users, settings, room map, etc.) is saved.
|
||||
<li><i>Configuration + Guests:</i> In addition to the configuration, the backup also contains the information about the guests (persons, groups, stays).
|
||||
</ul>
|
||||
|
||||
<p>If you also want to save the sales data, you must select an "All" backup type. The following options are available:
|
||||
<ul>
|
||||
<li><i>All without logs:</i> The configuration and guest information are saved. The log data (mainly information about the processing of print jobs) is not saved. This is the type of backup you should perform if you want to perform a complete recovery at another time. This type of backup is also used by default if you initiate a backup using a script.
|
||||
<li><i>All with logs:</i> This backup contains all data including the logs. The logs are only needed if you want to detect certain errors, e.g. failed print jobs. This export can be requested by the developer, for the typical user this type of backup is not of interest.
|
||||
</ul>
|
||||
|
||||
<p>Usually the backup file is sent to the browser for download. In addition, you can use the backup type "All without logs" to upload to an ftp server, if the access to the ftp server was previously defined in the configuration.
|
||||
|
||||
<p>By default, the backup consists of a text-based file (json format). If a tmp directory was specified in the configuration, the backup data is created as a zip file.
|
||||
|
||||
<p>If the download of the backup file does not work, the value memory_limit in the PHP configuration of the server was probably not configured large enough.
|
||||
|
||||
<p>A backup of any kind can be re-imported. Import actions are logged and can be viewed by auditors.
|
||||
</div>
|
||||
<div id="backuphinttxt_es" style="display:none;">
|
||||
<b>Pista:</b>
|
||||
|
||||
<p>Existen varias formas de realizar copias de seguridad de los contenidos de la base de datos:
|
||||
|
||||
<ul>
|
||||
<li><i>Configuración:</i> Sólo se guarda la configuración (menú, usuarios, ajustes, plano de la sala, etc.).
|
||||
<li><i>Configuración + Clientes</i> Además de la configuración, la copia de seguridad también contiene la información sobre los huespedes (personas, grupos, estancias).
|
||||
</ul>
|
||||
|
||||
<p>Si también desea guardar los datos de ventas, debe seleccionar un tipo de copia de seguridad "Todos". Las siguientes opciones están disponibles:
|
||||
<p><ul>
|
||||
<li><i>Todo sin protocolo</i> Se guardan la configuración y la información del huésped. Los datos de log (principalmente la información sobre el tratamiento de las acciones de impresión) no se graban. Esta es la copia de seguridad que debe realizar si desea realizar una recuperación completa en otro momento. Este tipo de copia de seguridad también se utiliza de forma predeterminada cuando se inicia una copia de seguridad a través de un script.
|
||||
<li><i>Todo y protocolo</i> Esta copia de seguridad contiene todos los datos, incluidos los registros. Los logs sólo son necesarios si desea detectar ciertos errores, por ejemplo, trabajos de impresión fallidos. Esta exportación puede ser solicitada por el desarrollador, para el usuario típico este tipo de backup no es de su interés.
|
||||
</ul>
|
||||
|
||||
<p>Por lo general, el archivo de copia de seguridad se envía al navegador para download. Además, también puede upload en un servidor ftp utilizando el tipo de copia de seguridad "All without logs" si el acceso al servidor ftp se ha especificado previamente en la configuración.
|
||||
|
||||
<p>Por defecto, la copia de seguridad consiste en un archivo basado en texto (formato json). Si se introdujo un directorio tmp en la configuración, los datos de la copia de seguridad se crean como un archivo zip.
|
||||
|
||||
<p>Si el download del archivo de copia de seguridad no funciona, el valor memory_limit en la configuración PHP del servidor probablemente no estaba configurado lo suficientemente grande.
|
||||
|
||||
<p>Durante la importación, se puede volver a importar una copia de seguridad de cualquier tipo. Las acciones de importación se registran y pueden ser vistas por los auditores.
|
||||
</div>
|
||||
|
||||
<div id=backuparea1>
|
||||
<form action='dummy'>
|
||||
<button type="submit" data-theme="f" id="backup_btn"><span id="backupbtntxt">Sicherung</span></button>
|
||||
|
|
@ -4249,8 +4334,7 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
<button type="submit" data-theme="f" id="backupguests_btn"><span id="backupguestsbtntxt">Sicherung</span></button>
|
||||
</form>
|
||||
</div>
|
||||
<span id='bakresinfotxtall'>Die Datensicherung und -wiederherstellung erfordert...</span>
|
||||
<div id=backuparea3>
|
||||
<p><div id=backuparea3>
|
||||
<form action='dummy'>
|
||||
<button type="submit" data-theme="f" id="backup_btnall"><span id="backupbtntxtall">Sicherung</span></button>
|
||||
<button type="submit" data-theme="f" id="backup_btnalllogs"><span id="backupbtntxtalllogs">Sicherung</span></button>
|
||||
|
|
@ -4265,6 +4349,15 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
<div id="waitimportinprogress" style="display:none;">Warten...</div>
|
||||
</div>
|
||||
|
||||
<p><span id="golivehinttxt_de" style="display:none;">
|
||||
Der Button "Starte Produktivbetrieb" behält die Konfiguration bei, löscht jedoch alle Umsatzdaten, so dass man anschließend wieder mit einem frischen System beginnen kann.
|
||||
</span>
|
||||
<span id="golivehinttxt_en" style="display:none;">
|
||||
The button "Start productive mode" keeps the configuration, but deletes all sales data, so that you can start again with a fresh system.
|
||||
</span>
|
||||
<span id="golivehinttxt_es" style="display:none;">
|
||||
El botón "Empezar trabajar realmente" mantiene la configuración, pero borra todos los datos de ventas, para que pueda empezar de nuevo con un nuevo sistema.
|
||||
</span>
|
||||
<p><button type="submit" data-theme="d" id="golive"><span id="golivetxt">Starte Produktivbetrieb</span></button>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -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.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.17">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
|
|||
|
|
@ -237,7 +237,7 @@ class Admin {
|
|||
} else if ($command == 'getPayments') {
|
||||
$this->getPayments();
|
||||
} else if ($command == 'autobackup') {
|
||||
$this->backup('auto',$_POST['remoteaccesscode']);
|
||||
$this->backup('auto',$_POST['remoteaccesscode'],false);
|
||||
} else if ($command == 'autoftpbackup') {
|
||||
$this->ftpbackup('auto',$_POST['remoteaccesscode']);
|
||||
} else if ($command == 'fill') {
|
||||
|
|
@ -246,7 +246,7 @@ class Admin {
|
|||
} else if ($command == 'fillSpeisekarte') {
|
||||
$this->fillSpeisekarte($_POST['speisekarte']);
|
||||
} else if ($command == 'backup') {
|
||||
$this->backup($_GET['type'],null);
|
||||
$this->backup($_GET['type'],null,false);
|
||||
return;
|
||||
} else if ($command == 'ftpbackup') {
|
||||
$this->ftpbackup($_GET['type'],null);
|
||||
|
|
@ -1399,7 +1399,7 @@ class Admin {
|
|||
$view = "preferences.html";
|
||||
}
|
||||
|
||||
echo json_encode($view . "?v=1.5.16");
|
||||
echo json_encode($view . "?v=1.5.17");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1615,31 +1615,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.16"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.17"); }
|
||||
} else {
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.16"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.17"); }
|
||||
}
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.16"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.16"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.16"); }
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.17"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.17"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.17"); }
|
||||
if ($_SESSION['modus'] == 0) {
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.16"); }
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.17"); }
|
||||
}
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.16"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.16"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.16"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.16"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.16"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.16"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.16"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.16"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.16"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.16"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.16");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.16"); }
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.17"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.17"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.17"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.17"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.17"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.17"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.17"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.17"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.17"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.17"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.17");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.17"); }
|
||||
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.16");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.16");
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.17");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.17");
|
||||
}
|
||||
|
||||
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
||||
|
|
|
|||
|
|
@ -853,7 +853,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.16">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.17">';
|
||||
$txt .= "</head>";
|
||||
return $txt;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
|
|||
if (strlen($status) > 150) {
|
||||
$status = substr($status, 0,149);
|
||||
}
|
||||
$version = "1.5.16";
|
||||
$version = "1.5.17";
|
||||
|
||||
$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1176,6 +1176,26 @@ class Basedb {
|
|||
return;
|
||||
}
|
||||
|
||||
public static function changeInitialConfig($pdo,$restaurantmode,$companyinfo,$defaultview,$stornocode,$printpass) {
|
||||
$sql = "UPDATE `%config%` SET setting=? WHERE name=?";
|
||||
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
|
||||
$stmt->execute(array($restaurantmode,"restaurantmode"));
|
||||
$stmt->execute(array($companyinfo,"companyinfo"));
|
||||
$stmt->execute(array($companyinfo,"webimpressum"));
|
||||
$stmt->execute(array($defaultview,"defaultview"));
|
||||
$stmt->execute(array($stornocode,"stornocode"));
|
||||
$stmt->execute(array($printpass,"printpass"));
|
||||
|
||||
$sql = "UPDATE %histconfig% H,%config% C SET H.setting=? where C.name=? and C.id=H.configid";
|
||||
$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
|
||||
$stmt->execute(array($restaurantmode,"restaurantmode"));
|
||||
$stmt->execute(array($companyinfo,"companyinfo"));
|
||||
$stmt->execute(array($companyinfo,"webimpressum"));
|
||||
$stmt->execute(array($defaultview,"defaultview"));
|
||||
$stmt->execute(array($stornocode,"stornocode"));
|
||||
$stmt->execute(array($printpass,"printpass"));
|
||||
}
|
||||
|
||||
public static function loadSampleCusHtmlTemplate($pdo) {
|
||||
$file = "../customer/closingtemplate.txt";
|
||||
$content = file_get_contents($file);
|
||||
|
|
|
|||
|
|
@ -971,11 +971,7 @@ class Version {
|
|||
}
|
||||
|
||||
public static function upd_1504_1505($pdo, $prefix, $dbname) {
|
||||
try {
|
||||
return array(true);
|
||||
} catch (PDOException $e) {
|
||||
return array(false,$e);
|
||||
}
|
||||
return array(true);
|
||||
}
|
||||
|
||||
public static function upd_1505_1506($pdo, $prefix, $dbname) {
|
||||
|
|
@ -1026,11 +1022,7 @@ class Version {
|
|||
}
|
||||
|
||||
public static function upd_1508_1509($pdo, $prefix, $dbname) {
|
||||
try {
|
||||
return array(true);
|
||||
} catch (PDOException $e) {
|
||||
return array(false,$e);
|
||||
}
|
||||
return array(true);
|
||||
}
|
||||
|
||||
public static function upd_1509_1510($pdo, $prefix, $dbname) {
|
||||
|
|
@ -1105,19 +1097,15 @@ class Version {
|
|||
}
|
||||
|
||||
public static function upd_1514_1515($pdo, $prefix, $dbname) {
|
||||
try {
|
||||
return array(true);
|
||||
} catch (PDOException $e) {
|
||||
return array(false,$e);
|
||||
}
|
||||
return array(true);
|
||||
}
|
||||
|
||||
public static function upd_1515_1516($pdo, $prefix, $dbname) {
|
||||
try {
|
||||
return array(true);
|
||||
} catch (PDOException $e) {
|
||||
return array(false,$e);
|
||||
}
|
||||
return array(true);
|
||||
}
|
||||
|
||||
public static function upd_1516_1517($pdo, $prefix, $dbname) {
|
||||
return array(true);
|
||||
}
|
||||
|
||||
public static $updateOrder = array(
|
||||
|
|
@ -1183,7 +1171,8 @@ class Version {
|
|||
"1.5.12" => array("upd_1512_1513","1.5.13"),
|
||||
"1.5.13" => array("upd_1513_1514","1.5.14"),
|
||||
"1.5.14" => array("upd_1514_1515","1.5.15"),
|
||||
"1.5.15" => array("upd_1515_1516","1.5.16")
|
||||
"1.5.15" => array("upd_1515_1516","1.5.16"),
|
||||
"1.5.16" => array("upd_1516_1517","1.5.17")
|
||||
);
|
||||
|
||||
// RE;* also for install process no check is required
|
||||
|
|
|
|||
|
|
@ -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.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.17">
|
||||
<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.16"></script>
|
||||
<script src="utilities.js?v=1.5.17"></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.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.17">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
|
|||
|
|
@ -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.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.17">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
@ -15,8 +15,8 @@
|
|||
<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"></script>
|
||||
<script src="elements/product.js"></script>
|
||||
<script src="elements/extra.js"></script>
|
||||
<script src="elements/product.js?v=1.5.17"></script>
|
||||
<script src="elements/extra.js?v=1.5.17"></script>
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
</head>
|
||||
|
|
@ -426,7 +426,12 @@ function setLanguage(language) {
|
|||
var prod = prodleafs[i];
|
||||
if (prod.id == id) {
|
||||
prod.createProdContentStructure(audiofiles);
|
||||
prodcancel(id);
|
||||
if (id.indexOf("n") == 0) {
|
||||
prod.insertValuesIntoMenuList();
|
||||
$("#cont_" + id).trigger("create");
|
||||
} else {
|
||||
prodcancel(id);
|
||||
}
|
||||
cmdBinding();
|
||||
}
|
||||
}
|
||||
|
|
@ -633,10 +638,10 @@ function setLanguage(language) {
|
|||
}
|
||||
|
||||
function prodcancel(prodid) {
|
||||
var url = "php/contenthandler.php?module=products&command=getSingleProdData&id=" + prodid;
|
||||
$("#assextralist_" + prodid).html("");
|
||||
$("#assextralist_" + prodid).trigger("create");
|
||||
actionOnProd(url,prodid,null,false);
|
||||
var url = "php/contenthandler.php?module=products&command=getSingleProdData&id=" + prodid;
|
||||
$("#assextralist_" + prodid).html("");
|
||||
$("#assextralist_" + prodid).trigger("create");
|
||||
actionOnProd(url,prodid,null,false);
|
||||
}
|
||||
|
||||
function toggleProdType(typeid) {
|
||||
|
|
|
|||
|
|
@ -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.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.17">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
|
|||
|
|
@ -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.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.17">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
|
|||
|
|
@ -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.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.17">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
|
|||
|
|
@ -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.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.17">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
|
|||
|
|
@ -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.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.17">
|
||||
<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.16"></script>
|
||||
<script src="utilities.js?v=1.5.17"></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.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.17">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
|
|||
|
|
@ -4,8 +4,8 @@
|
|||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<meta http-equiv="content-type" content="text/html; charset=utf-8">
|
||||
<meta name="author" content="Stefan Pichel">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.16">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.17">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.17">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,67 +1,65 @@
|
|||
<table>
|
||||
<tr>
|
||||
<td id="tablepanel" class="tableaside1">
|
||||
<div id="location" class="tablepanelheader">Raum: Raum xyz</div>
|
||||
<div id="roompanel" class="roompanel"></div>
|
||||
<div id="allwithoutheaderfooter">
|
||||
<div id="tablepanel" class="tableaside1">
|
||||
<div id="location" class="tablepanelheader">Raum: Raum xyz</div>
|
||||
<div id="roompanel" class="roompanel"></div>
|
||||
<div id="tablepanelcontent" class="tablepanelcontent"></div>
|
||||
<div id=tablemapcontent style="position: relative;width:100%;display:none;">
|
||||
<img id="mapimgpart" style="width:100%;position: relative;left: 0;top: 0;" src=img/empty-room.png />
|
||||
<div id=tableoverlay></div>
|
||||
</div>
|
||||
<div class="daycodeareamobile" style="display:none;"><span class="daycodetxt">Tageslosung</span>: <span class="daycodefield"></span></div>
|
||||
<div id="receiptpanel" style="display:none;"></div>
|
||||
</div>
|
||||
|
||||
<div id="main">
|
||||
<div id="groupchain" class="grouppanel"></div>
|
||||
|
||||
<div id="tablepanelcontent" class="tablepanelcontent"></div>
|
||||
<div id="groupchoice" class="grouppanel"></div>
|
||||
|
||||
<div id=tablemapcontent style="position: relative;width:100%;display:none;">
|
||||
<img id="mapimgpart" style="width:100%;position: relative;left: 0;top: 0;" src=img/empty-room.png />
|
||||
<div id=tableoverlay></div>
|
||||
</div>
|
||||
<div id="paybuttonpanel" style="display:none;">
|
||||
<input id="payall" class="input50 inputwhite" type="submit" value="Alles" />
|
||||
<div class="infoarea"><span id="priceinreceipt"></span></div>
|
||||
</div>
|
||||
<div id="billprintjobspanel" style="display:none;"></div>
|
||||
<div id="oben" class="paypanel" style="display:none;"></div>
|
||||
<hr>
|
||||
<div id="unten" class="paypanel" style="display:none;"></div>
|
||||
|
||||
<div class="daycodeareamobile" style="display:none;"><span class="daycodetxt">Tageslosung</span>: <span class="daycodefield"></span></div>
|
||||
<!-- a hack: info-page is for compatibility to mobile view at which data is stored -->
|
||||
<div id="info-page" style='display:none;'></div>
|
||||
|
||||
<div id="receiptpanel" style="display:none;"></div>
|
||||
<div id="searchpanel" style="display:none;"><input id="search" class="input100 inputwhite" type="text" placeholder="Suchen..." /></div>
|
||||
|
||||
<td id="main" class="tablemain">
|
||||
<div id="groupchain" class="grouppanel"></div>
|
||||
<div id="productspanel" class="productspanel" style="display:none;"></div>
|
||||
|
||||
<div id="groupchoice" class="grouppanel"></div>
|
||||
|
||||
<div id="paybuttonpanel" style="display:none;">
|
||||
<input id="payall" class="input50 inputwhite" type="submit" value="Alles" />
|
||||
<div class="infoarea"><span id="priceinreceipt"></span></div>
|
||||
</div>
|
||||
<div id="billprintjobspanel" style="display:none;"></div>
|
||||
<div id="oben" class="paypanel" style="display:none;"></div>
|
||||
<hr>
|
||||
<div id="unten" class="paypanel" style="display:none;"></div>
|
||||
|
||||
<!-- a hack: info-page is for compatibility to mobile view at which data is stored -->
|
||||
<div id="info-page" style='display:none;'></div>
|
||||
|
||||
<div id="searchpanel" style="display:none;"><input id="search" class="input100 inputwhite" type="text" placeholder="Suchen..." /></div>
|
||||
|
||||
<div id="productspanel" class="productspanel" style="display:none;"></div>
|
||||
|
||||
<div id="remarkpanel" style="display:none;">
|
||||
<div id="remarkpanel" style="display:none;">
|
||||
<input id="remark" class="input100 inputwhite" type="text" placeholder="Produktbemerkung" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="rightsidearea">
|
||||
|
||||
<td id="rightsidearea" >
|
||||
<div class="buttonarea">
|
||||
<input id="mainmenubtn" class="input100 inputwhite"type="submit" value="Hauptmenü" />
|
||||
<input id="paydeskbtn" class="input100 inputwhite"type="submit" value="Kasse" style="display:none;"/><br>
|
||||
<input id="goorderbtn" class="input100 inputwhite"type="submit" value="Bestellung" style="display:none;"/>
|
||||
<input id="cashbutton" class="input100 inputwhite"type="submit" style="display:none;" value="Ein-/Auslage" />
|
||||
<input id="hostbutton" class="input100 inputwhite btnswitchoff"type="submit" style="display:none;" value="Bewirtungsbeleg" />
|
||||
<input id="paydeskcash" class="input100 inputwhite"type="submit" style="display:none;" value="Zahlung" />
|
||||
<input id="paydeskprint" class="input100 inputwhite"type="submit" style="display:none;" value="Bondruck" />
|
||||
<input id="workbtn" class="input100 inputwhite" type="submit" value="Arbeitsbon" style="display:none;" />
|
||||
<input id="sendNewOrders" class="input100 inputwhite" type="submit" value="Bestellung abschließen" style="display:none;" />
|
||||
<input id="changetablebtn" class="input100 inputwhite" type="submit" value="Tischwechsel" style="display:none;" />
|
||||
<input id="tablerecordsbtn" class="input100 inputwhite" type="submit" value="Tischprotokoll" style="display:none;" />
|
||||
</div>
|
||||
<div class="buttonarea">
|
||||
<input id="mainmenubtn" class="input100 inputwhite"type="submit" value="Hauptmenü" />
|
||||
<input id="paydeskbtn" class="input100 inputwhite"type="submit" value="Kasse" style="display:none;"/><br>
|
||||
<input id="goorderbtn" class="input100 inputwhite"type="submit" value="Bestellung" style="display:none;"/>
|
||||
<input id="cashbutton" class="input100 inputwhite"type="submit" value="Ein-/Auslage" />
|
||||
<input id="hostbutton" class="input100 inputwhite btnswitchoff"type="submit" style="display:none;" value="Bewirtungsbeleg" />
|
||||
<input id="paydeskcash" class="input100 inputwhite"type="submit" style="display:none;" value="Zahlung" />
|
||||
<input id="paydeskprint" class="input100 inputwhite"type="submit" style="display:none;" value="Bondruck" />
|
||||
<input id="workbtn" class="input100 inputwhite" type="submit" value="Arbeitsbon" style="display:none;" />
|
||||
<input id="sendNewOrders" class="input100 inputwhite" type="submit" value="Bestellung abschließen" style="display:none;" />
|
||||
<input id="changetablebtn" class="input100 inputwhite" type="submit" value="Tischwechsel" style="display:none;" />
|
||||
<input id="tablerecordsbtn" class="input100 inputwhite" type="submit" value="Tischprotokoll" style="display:none;" />
|
||||
</div>
|
||||
|
||||
<div id="neworders" class="ordereditem-container"></div>
|
||||
</tr>
|
||||
<div id="neworders" class="ordereditem-container"></div>
|
||||
|
||||
<tr><td colspan=3>
|
||||
<div id="ordered" class="ordereditem-sentcontainer"></div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div id="osbottom">
|
||||
<div id="ordered" class="ordereditem-sentcontainer">ORDERED</div>
|
||||
<div id="waitermessagearea" class="waitermsg" style="display:none;">Waiter Message</div>
|
||||
</tr>
|
||||
|
||||
</table>
|
||||
</div>
|
||||
Loading…
Reference in New Issue