OrderSprinter 1.5.12
This commit is contained in:
parent
b811f831f7
commit
66d43f2b42
|
|
@ -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.11" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.11" />
|
||||
<link rel="stylesheet" href="css/gueststyle.css?v=1.5.12" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css?v=1.5.12" />
|
||||
<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.11 </div>
|
||||
<div class="ui-block-b grid_right" id="versioninfo">1.5.12 </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.11">';
|
||||
echo '<link rel="stylesheet" type="text/css" href="css/gueststyle.css?v=1.5.12">';
|
||||
echo "</head>";
|
||||
echo "<body><div class=surround>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.11</span><br><br>";
|
||||
echo "<span class=headerline>Installation OrderSprinter-Gastsystem 1.5.12</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.
|
|
@ -0,0 +1 @@
|
|||
see https://en.wikipedia.org/wiki/Common_Public_License
|
||||
Binary file not shown.
|
|
@ -85,7 +85,7 @@ class Installer {
|
|||
}
|
||||
Database::dropTables($pdo);
|
||||
Database::createEmptyTables($pdo, $prefix);
|
||||
Database::setVersion($pdo,$prefix,"1.5.11");
|
||||
Database::setVersion($pdo,$prefix,"1.5.12");
|
||||
Database::setAccessPassword($pdo,$prefix,$adminpass);
|
||||
Database::setRefreshRate($pdo,$prefix,"5"); // default: 5 times per hour
|
||||
return array("status" => "OK","msg" => "Installation successful");
|
||||
|
|
|
|||
|
|
@ -19,6 +19,11 @@
|
|||
|
||||
<body>
|
||||
|
||||
<p><b><span style="font-size:20px;line-height: 30px;">OrderSprinter unterliegt der Creative Commons Lizenz BY-NC-ND (siehe unten). Allerdings werden bestimmte Bibliotheken verwendet, die anderen (freien) Lizenzen unterliegen. Die eingebundenen Bibliotheken und deren Lizenzen befinden sich in den Unterordnern 3rdParty der jeweiligen Webkomponente bzw. dem Unterordner javaprinter_lib des Javaprinters.</span></b>
|
||||
|
||||
<hr>
|
||||
|
||||
|
||||
<p id="header" align="center"><a href="http://creativecommons.org/">Creative Commons</a></p>
|
||||
|
||||
<div id="deed" class="yellow">
|
||||
|
|
|
|||
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.11">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12">
|
||||
|
||||
<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.11"></script>
|
||||
<script src="kitchenbar.js?v=1.5.11"></script>
|
||||
<script src="utilities.js?v=1.5.12"></script>
|
||||
<script src="kitchenbar.js?v=1.5.12"></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.11">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
|
|||
|
|
@ -1,346 +0,0 @@
|
|||
/* W3.CSS 2.74 by Jan Egil and Borge Refsnes */
|
||||
*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}
|
||||
/* Extract from normalize.css by Nicolas Gallagher and Jonathan Neal git.io/normalize */
|
||||
html{-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}
|
||||
article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}
|
||||
audio,canvas,video{display:inline-block;vertical-align:baseline}
|
||||
audio:not([controls]){display:none;height:0}[hidden],template{display:none}
|
||||
a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}
|
||||
dfn{font-style:italic}mark{background:#ff0;color:#000}
|
||||
small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}
|
||||
sup{top:-0.5em}sub{bottom:-0.25em}
|
||||
img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}
|
||||
hr{-moz-box-sizing:content-box;box-sizing:content-box}
|
||||
code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}
|
||||
button,input,select,textarea{font:inherit;margin:0}
|
||||
button{overflow:visible}button,select{text-transform:none}
|
||||
button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}
|
||||
button[disabled],html input[disabled]{cursor:default}
|
||||
button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}
|
||||
input[type=checkbox],input[type=radio]{padding:0}
|
||||
input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}
|
||||
input[type=search]{box-sizing:content-box;-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box}
|
||||
input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}
|
||||
fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:.35em .625em .75em}
|
||||
legend{border:0;padding:0}pre,textarea{overflow:auto}
|
||||
/* End extract from normalize.css */
|
||||
html,body{font-family:Verdana,sans-serif;font-size:15px;line-height:1.5}html{overflow-x:hidden}
|
||||
h1,h2,h3,h4,h5,h6,.w3-slim,.w3-wide{font-family:"Segoe UI",Arial,sans-serif}
|
||||
h1{font-size:36px}h2{font-size:30px}h3{font-size:24px}h4{font-size:20px}h5{font-size:18px}h6{font-size:16px}
|
||||
.w3-serif{font-family:"Times New Roman",Times,serif}
|
||||
h1,h2,h3,h4,h5,h6{font-weight:400;margin:10px 0}.w3-wide{letter-spacing:4px}
|
||||
h1 a,h2 a,h3 a,h4 a,h5 a,h6 a{font-weight:inherit}
|
||||
hr{height:0;border:0;border-top:1px solid #eee;margin:20px 0}
|
||||
img{margin-bottom:-5px}a{color:inherit}
|
||||
table{border-collapse:collapse;border-spacing:0;width:100%;display:table}
|
||||
table,th,td{border:none}.w3-table-all{border:1px solid #ccc}
|
||||
.w3-bordered tr,.w3-table-all tr{border-bottom:1px solid #ddd}
|
||||
.w3-striped tbody tr:nth-child(even){background-color:#f1f1f1}
|
||||
.w3-table-all tr:nth-child(odd){background-color:#fff}
|
||||
.w3-table-all tr:nth-child(even){background-color:#f1f1f1}
|
||||
.w3-hoverable tbody tr:hover,.w3-ul.w3-hoverable li:hover{background-color:#ccc}
|
||||
.w3-centered tr th,.w3-centered tr td{text-align:center}
|
||||
.w3-table td,.w3-table th,.w3-table-all td,.w3-table-all th{padding:6px 8px;display:table-cell;text-align:left;vertical-align:top}
|
||||
.w3-table th:first-child,.w3-table td:first-child,.w3-table-all th:first-child,.w3-table-all td:first-child{padding-left:16px}
|
||||
.w3-btn,.w3-btn-block{border:none;display:inline-block;outline:0;padding:6px 16px;vertical-align:middle;overflow:hidden;text-decoration:none!important;color:#fff;background-color:#000;text-align:center;cursor:pointer;white-space:nowrap}
|
||||
.w3-disabled,.w3-btn:disabled,.w3-btn-floating:disabled,.w3-btn-floating-large:disabled{cursor:not-allowed;opacity:0.3}
|
||||
.w3-btn.w3-disabled *,.w3-btn-block.w3-disabled,.w3-btn-floating.w3-disabled *,.w3-btn:disabled *,.w3-btn-floating:disabled *{pointer-events:none}
|
||||
.w3-btn.w3-disabled:hover,.w3-btn-block.w3-disabled:hover,.w3-btn:disabled:hover,.w3-btn-floating.w3-disabled:hover,.w3-btn-floating:disabled:hover,
|
||||
.w3-btn-floating-large.w3-disabled:hover,.w3-btn-floating-large:disabled:hover{box-shadow:none}
|
||||
.w3-btn:hover,.w3-btn-block:hover,.w3-btn-floating:hover,.w3-btn-floating-large:hover{box-shadow:0 8px 16px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19)}
|
||||
.w3-btn-block{width:100%}
|
||||
.w3-btn,.w3-btn-floating,.w3-btn-floating-large,.w3-closenav,.w3-opennav{-webkit-touch-callout:none;-webkit-user-select:none;-khtml-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
|
||||
.w3-btn-floating,.w3-btn-floating-large{display:inline-block;text-align:center;color:#fff;background-color:#000;position:relative;overflow:hidden;z-index:1;padding:0;border-radius:50%;cursor:pointer;font-size:24px}
|
||||
.w3-btn-floating{width:40px;height:40px;line-height:40px}
|
||||
.w3-btn-floating-large{width:56px;height:56px;line-height:56px}
|
||||
.w3-btn-group .w3-btn{float:left}
|
||||
.w3-btn-bar .w3-btn{box-shadow:none;background-color:inherit;color:inherit;float:left}
|
||||
.w3-btn-bar .w3-btn:hover{background-color:#ccc}
|
||||
.w3-ripple{position:relative;overflow:hidden}
|
||||
.w3-ripple:after{content:"";background:#ccc;position:absolute;padding:300%;bottom:0;left:0;opacity:0;transition:0.8s}
|
||||
.w3-ripple:active:after{padding:0;opacity:1;transition:0s}
|
||||
.w3-badge,.w3-tag,.w3-sign{background-color:#000;color:#fff;display:inline-block;padding-left:8px;padding-right:8px;text-align:center}
|
||||
.w3-badge{border-radius:50%}
|
||||
ul.w3-ul{list-style-type:none;padding:0;margin:0}
|
||||
ul.w3-ul li{padding:6px 2px 6px 16px;border-bottom:1px solid #ddd}
|
||||
ul.w3-ul li:last-child{border-bottom:none}
|
||||
.w3-tooltip,.w3-display-container{position:relative}
|
||||
.w3-fluid{max-width:100%;height:auto}
|
||||
.w3-tooltip .w3-text{display:none}
|
||||
.w3-tooltip:hover .w3-text{display:inline-block}
|
||||
.w3-navbar{list-style-type:none;margin:0;padding:0;overflow:hidden}
|
||||
.w3-navbar li{float:left}.w3-navbar li a,.w3-navitem{display:block;padding:8px 16px}.w3-navbar li a:hover{color:#000;background-color:#ccc}
|
||||
.w3-navbar .w3-dropdown-hover,.w3-navbar .w3-dropdown-click{position:static}
|
||||
.w3-navbar .w3-dropdown-hover:hover,.w3-navbar .w3-dropdown-hover:first-child,.w3-navbar .w3-dropdown-click:hover{background-color:#ccc;color:#000}
|
||||
.w3-navbar a,.w3-topnav a,.w3-sidenav a,.w3-dropdown-content a,.w3-accordion-content a,.w3-dropnav a{text-decoration:none!important}
|
||||
.w3-navbar .w3-opennav.w3-right{float:right!important}.w3-topnav{padding:8px 8px}
|
||||
.w3-topnav a{padding:0 8px;border-bottom:3px solid transparent;-webkit-transition:border-bottom .3s;transition:border-bottom .3s}
|
||||
.w3-topnav a:hover{border-bottom:3px solid #fff}.w3-topnav .w3-dropdown-hover a{border-bottom:0}
|
||||
.w3-opennav,.w3-closenav{color:inherit}.w3-opennav:hover,.w3-closenav:hover{cursor:pointer;opacity:0.8}
|
||||
.w3-btn,.w3-btn-floating,.w3-dropnav a,.w3-btn-floating-large,.w3-btn-block,.w3-hover-shadow,.w3-hover-opacity,
|
||||
.w3-navbar a,.w3-sidenav a,.w3-pagination li a,.w3-hoverable tbody tr,.w3-hoverable li,.w3-accordion-content a,.w3-dropdown-content a,.w3-dropdown-click:hover,.w3-dropdown-hover:hover,.w3-opennav,.w3-closenav,.w3-closebtn,
|
||||
.w3-hover-amber,.w3-hover-aqua,.w3-hover-blue,.w3-hover-light-blue,.w3-hover-brown,.w3-hover-cyan,.w3-hover-blue-grey,.w3-hover-green,.w3-hover-light-green,.w3-hover-indigo,.w3-hover-khaki,.w3-hover-lime,.w3-hover-orange,.w3-hover-deep-orange,.w3-hover-pink,
|
||||
.w3-hover-purple,.w3-hover-deep-purple,.w3-hover-red,.w3-hover-sand,.w3-hover-teal,.w3-hover-yellow,.w3-hover-white,.w3-hover-black,.w3-hover-grey,.w3-hover-light-grey,.w3-hover-dark-grey,.w3-hover-text-amber,.w3-hover-text-aqua,.w3-hover-text-blue,.w3-hover-text-light-blue,
|
||||
.w3-hover-text-brown,.w3-hover-text-cyan,.w3-hover-text-blue-grey,.w3-hover-text-green,.w3-hover-text-light-green,.w3-hover-text-indigo,.w3-hover-text-khaki,.w3-hover-text-lime,.w3-hover-text-orange,.w3-hover-text-deep-orange,.w3-hover-text-pink,.w3-hover-text-purple,
|
||||
.w3-hover-text-deep-purple,.w3-hover-text-red,.w3-hover-text-sand,.w3-hover-text-teal,.w3-hover-text-yellow,.w3-hover-text-white,.w3-hover-text-black,.w3-hover-text-grey,.w3-hover-text-light-grey,.w3-hover-text-dark-grey
|
||||
{-webkit-transition:background-color .3s,color .15s,box-shadow .3s,opacity 0.3s;transition:background-color .3s,color .15s,box-shadow .3s,opacity 0.3s}
|
||||
.w3-sidenav{height:100%;width:200px;background-color:#fff;position:fixed!important;z-index:1;overflow:auto}
|
||||
.w3-sidenav a{padding:4px 2px 4px 16px}.w3-sidenav a:hover{background-color:#ccc}.w3-sidenav a,.w3-dropnav a{display:block}
|
||||
.w3-sidenav .w3-dropdown-hover:hover,.w3-sidenav .w3-dropdown-hover:first-child,.w3-sidenav .w3-dropdown-click:hover,.w3-dropnav a:hover{background-color:#ccc;color:#000}
|
||||
.w3-sidenav .w3-dropdown-hover,.w3-sidenav .w3-dropdown-click {width:100%}.w3-sidenav .w3-dropdown-hover .w3-dropdown-content,.w3-sidenav .w3-dropdown-click .w3-dropdown-content{min-width:100%}
|
||||
.w3-main,#main{transition:margin-left .4s}
|
||||
.w3-modal{z-index:3;display:none;padding-top:100px;position:fixed;left:0;top:0;width:100%;height:100%;overflow:auto;background-color:rgb(0,0,0);background-color:rgba(0,0,0,0.4)}
|
||||
.w3-modal-content{margin:auto;background-color:#fff;position:relative;padding:0;outline:0;width:600px}.w3-closebtn{text-decoration:none;float:right;font-size:24px;font-weight:bold;color:inherit}
|
||||
.w3-closebtn:hover,.w3-closebtn:focus{color:#000;text-decoration:none;cursor:pointer}
|
||||
.w3-pagination{display:inline-block;padding:0;margin:0}.w3-pagination li{display:inline}
|
||||
.w3-pagination li a{text-decoration:none;color:#000;float:left;padding:8px 16px}
|
||||
.w3-pagination li a:hover{background-color:#ccc}
|
||||
.w3-input-group,.w3-group{margin-top:24px;margin-bottom:24px}
|
||||
.w3-input{padding:8px;display:block;border:none;border-bottom:1px solid #808080;width:100%}
|
||||
.w3-label{color:#009688}.w3-input:not(:valid)~.w3-validate{color:#f44336}
|
||||
.w3-select{padding:9px 0;width:100%;color:#000;border:1px solid transparent;border-bottom:1px solid #009688}
|
||||
.w3-select select:focus{color:#000;border:1px solid #009688}.w3-select option[disabled]{color:#009688}
|
||||
.w3-dropdown-click,.w3-dropdown-hover{position:relative;display:inline-block;cursor:pointer}
|
||||
.w3-dropdown-hover:hover .w3-dropdown-content{display:block;z-index:1}
|
||||
.w3-dropdown-content{cursor:auto;color:#000;background-color:#fff;display:none;position:absolute;min-width:160px;margin:0;padding:0}
|
||||
.w3-dropdown-content a{padding:6px 16px;display:block}
|
||||
.w3-dropdown-content a:hover{background-color:#ccc}
|
||||
.w3-accordion {width:100%;cursor:pointer}
|
||||
.w3-accordion-content{cursor:auto;display:none;position:relative;width:100%;margin:0;padding:0}
|
||||
.w3-accordion-content a{padding:6px 16px;display:block}.w3-accordion-content a:hover{background-color:#ccc}
|
||||
.w3-progress-container{width:100%;height:1.5em;position:relative;background-color:#f1f1f1}
|
||||
.w3-progressbar{background-color:#757575;height:100%;position:absolute;line-height:inherit}
|
||||
input[type=checkbox].w3-check,input[type=radio].w3-radio{width:24px;height:24px;position:relative;top:6px}
|
||||
input[type=checkbox].w3-check:checked+.w3-validate,input[type=radio].w3-radio:checked+.w3-validate{color:#009688}
|
||||
input[type=checkbox].w3-check:disabled+.w3-validate,input[type=radio].w3-radio:disabled+.w3-validate{color:#aaa}
|
||||
.w3-responsive{overflow-x:auto}
|
||||
.w3-container:after,.w3-panel:after,.w3-row:after,.w3-row-padding:after,.w3-topnav:after,.w3-clear:after,.w3-btn-group:before,.w3-btn-group:after,.w3-btn-bar:before,.w3-btn-bar:after
|
||||
{content:"";display:table;clear:both}
|
||||
.w3-col,.w3-half,.w3-third,.w3-twothird,.w3-threequarter,.w3-quarter{float:left;width:100%}
|
||||
.w3-col.s1{width:8.33333%}
|
||||
.w3-col.s2{width:16.66666%}
|
||||
.w3-col.s3{width:24.99999%}
|
||||
.w3-col.s4{width:33.33333%}
|
||||
.w3-col.s5{width:41.66666%}
|
||||
.w3-col.s6{width:49.99999%}
|
||||
.w3-col.s7{width:58.33333%}
|
||||
.w3-col.s8{width:66.66666%}
|
||||
.w3-col.s9{width:74.99999%}
|
||||
.w3-col.s10{width:83.33333%}
|
||||
.w3-col.s11{width:91.66666%}
|
||||
.w3-col.s12,.w3-half,.w3-third,.w3-twothird,.w3-threequarter,.w3-quarter{width:99.99999%}
|
||||
@media only screen and (min-width:601px){
|
||||
.w3-col.m1{width:8.33333%}
|
||||
.w3-col.m2{width:16.66666%}
|
||||
.w3-col.m3,.w3-quarter{width:24.99999%}
|
||||
.w3-col.m4,.w3-third{width:33.33333%}
|
||||
.w3-col.m5{width:41.66666%}
|
||||
.w3-col.m6,.w3-half{width:49.99999%}
|
||||
.w3-col.m7{width:58.33333%}
|
||||
.w3-col.m8,.w3-twothird{width:66.66666%}
|
||||
.w3-col.m9,.w3-threequarter{width:74.99999%}
|
||||
.w3-col.m10{width:83.33333%}
|
||||
.w3-col.m11{width:91.66666%}
|
||||
.w3-col.m12{width:99.99999%}}
|
||||
@media only screen and (min-width:993px){
|
||||
.w3-col.l1{width:8.33333%}
|
||||
.w3-col.l2{width:16.66666%}
|
||||
.w3-col.l3,.w3-quarter{width:24.99999%}
|
||||
.w3-col.l4,.w3-third{width:33.33333%}
|
||||
.w3-col.l5{width:41.66666%}
|
||||
.w3-col.l6,.w3-half{width:49.99999%}
|
||||
.w3-col.l7{width:58.33333%}
|
||||
.w3-col.l8,.w3-twothird{width:66.66666%}
|
||||
.w3-col.l9,.w3-threequarter{width:74.99999%}
|
||||
.w3-col.l10{width:83.33333%}
|
||||
.w3-col.l11{width:91.66666%}
|
||||
.w3-col.l12{width:99.99999%}}
|
||||
.w3-content{max-width:980px;margin:auto}
|
||||
.w3-rest{overflow:hidden}
|
||||
.w3-hide{display:none!important}.w3-show-block,.w3-show{display:block!important}.w3-show-inline-block{display:inline-block!important}
|
||||
@media (max-width:600px){.w3-modal-content{margin:0 10px;width:auto!important}.w3-modal{padding-top:30px}}
|
||||
@media (max-width:768px){.w3-modal-content{width:500px}.w3-modal{padding-top:50px}}
|
||||
@media (min-width:993px){.w3-modal-content{width:900px}}
|
||||
@media screen and (max-width:600px){.w3-topnav a{display:block}.w3-navbar li:not(.w3-opennav){float:none;width:100%!important}.w3-navbar li.w3-right{float:none!important}}
|
||||
@media screen and (max-width:600px){.w3-topnav .w3-dropdown-hover .w3-dropdown-content,.w3-navbar .w3-dropdown-click .w3-dropdown-content,.w3-navbar .w3-dropdown-hover .w3-dropdown-content{position:relative}}
|
||||
@media screen and (max-width:600px){.w3-topnav,.w3-navbar{text-align:center}}
|
||||
@media (max-width:600px){.w3-hide-small{display:none!important}}
|
||||
@media (max-width:992px) and (min-width:601px){.w3-hide-medium{display:none!important}}
|
||||
@media (min-width:993px){.w3-hide-large{display:none!important}}
|
||||
@media screen and (max-width:992px){.w3-sidenav.w3-collapse{display:none}.w3-main{margin-left:0!important;margin-right:0!important}}
|
||||
@media screen and (min-width:993px){.w3-sidenav.w3-collapse{display:block!important}}
|
||||
.w3-top,.w3-bottom{position:fixed;width:100%;z-index:1}.w3-top{top:0}.w3-bottom{bottom:0}
|
||||
.w3-overlay{position:fixed;display:none;width:100%;height:100%;top:0;left:0;right:0;bottom:0;background-color:rgba(0,0,0,0.5);z-index:2}
|
||||
.w3-left{float:left!important}.w3-right{float:right!important}
|
||||
.w3-tiny{font-size:10px!important}.w3-small{font-size:12px!important}
|
||||
.w3-medium{font-size:15px!important}.w3-large{font-size:18px!important}
|
||||
.w3-xlarge{font-size:24px!important}.w3-xxlarge{font-size:36px!important}
|
||||
.w3-xxxlarge{font-size:48px!important}.w3-jumbo{font-size:64px!important}
|
||||
.w3-vertical{word-break:break-all;line-height:1;text-align:center;width:0.6em}
|
||||
.w3-left-align{text-align:left!important}.w3-right-align{text-align:right!important}
|
||||
.w3-justify{text-align:justify!important}.w3-center{text-align:center!important}
|
||||
.w3-display-topleft{position:absolute;left:0;top:0}.w3-display-topright{position:absolute;right:0;top:0}
|
||||
.w3-display-bottomleft{position:absolute;left:0;bottom:0}.w3-display-bottomright{position:absolute;right:0;bottom:0}
|
||||
.w3-display-middle{position:absolute;top:50%;left:50%;transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%)}
|
||||
.w3-display-topmiddle{position:absolute;left:0;top:0;width:100%;text-align:center}.w3-display-bottommiddle{position:absolute;left:0;bottom:0;width:100%;text-align:center}
|
||||
.w3-circle{border-radius:50%!important}
|
||||
.w3-round-small{border-radius:2px!important}.w3-round,.w3-round-medium{border-radius:4px!important}
|
||||
.w3-round-large{border-radius:8px!important}.w3-round-xlarge{border-radius:16px!important}
|
||||
.w3-round-xxlarge{border-radius:32px!important}.w3-round-jumbo{border-radius:64px!important}
|
||||
.w3-border-0{border:0!important}
|
||||
.w3-border{border:1px solid #ccc!important}
|
||||
.w3-border-top{border-top:1px solid #ccc!important}.w3-border-bottom{border-bottom:1px solid #ccc!important}
|
||||
.w3-border-left{border-left:1px solid #ccc!important}.w3-border-right{border-right:1px solid #ccc!important}
|
||||
.w3-margin{margin:16px!important}.w3-margin-0{margin:0!important}
|
||||
.w3-margin-top{margin-top:16px!important}.w3-margin-bottom{margin-bottom:16px!important}
|
||||
.w3-margin-left{margin-left:16px!important}.w3-margin-right{margin-right:16px!important}
|
||||
.w3-section{margin-top:16px!important;margin-bottom:16px!important}
|
||||
.w3-padding-tiny{padding:2px 4px!important}.w3-padding-small{padding:4px 8px!important}
|
||||
.w3-padding-medium,.w3-padding,.w3-form{padding:8px 16px!important}
|
||||
.w3-padding-large{padding:12px 24px!important}.w3-padding-xlarge{padding:16px 32px!important}
|
||||
.w3-padding-xxlarge{padding:24px 48px!important}.w3-padding-jumbo{padding:32px 64px!important}
|
||||
.w3-padding-4{padding-top:4px!important;padding-bottom:4px!important}
|
||||
.w3-padding-8{padding-top:8px!important;padding-bottom:8px!important}
|
||||
.w3-padding-12{padding-top:12px!important;padding-bottom:12px!important}
|
||||
.w3-padding-16{padding-top:16px!important;padding-bottom:16px!important}
|
||||
.w3-padding-24{padding-top:24px!important;padding-bottom:24px!important}
|
||||
.w3-padding-32{padding-top:32px!important;padding-bottom:32px!important}
|
||||
.w3-padding-48{padding-top:48px!important;padding-bottom:48px!important}
|
||||
.w3-padding-64{padding-top:64px!important;padding-bottom:64px!important}
|
||||
.w3-padding-128{padding-top:128px!important;padding-bottom:128px!important}
|
||||
.w3-padding-0{padding:0!important}
|
||||
.w3-padding-top{padding-top:8px!important}.w3-padding-bottom{padding-bottom:8px!important}
|
||||
.w3-padding-left{padding-left:16px!important}.w3-padding-right{padding-right:16px!important}
|
||||
.w3-topbar{border-top:6px solid #ccc!important}.w3-bottombar{border-bottom:6px solid #ccc!important}
|
||||
.w3-leftbar{border-left:6px solid #ccc!important}.w3-rightbar{border-right:6px solid #ccc!important}
|
||||
.w3-row-padding,.w3-row-padding>.w3-half,.w3-row-padding>.w3-third,.w3-row-padding>.w3-twothird,.w3-row-padding>.w3-threequarter,.w3-row-padding>.w3-quarter,.w3-row-padding>.w3-col{padding:0 8px}
|
||||
.w3-spin{animation:w3-spin 2s infinite linear;-webkit-animation:w3-spin 2s infinite linear}
|
||||
@-webkit-keyframes w3-spin{
|
||||
0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}
|
||||
@keyframes w3-spin{
|
||||
0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}
|
||||
.w3-container{padding:0.01em 16px}
|
||||
.w3-panel{padding:0.01em 16px;margin-top:16px!important;margin-bottom:16px!important}
|
||||
.w3-example{background-color:#f1f1f1;padding:0.01em 16px}
|
||||
.w3-code,.w3-codespan{font-family:Consolas,"courier new";font-size:16px}
|
||||
.w3-code{line-height:1.4;width:auto;background-color:#fff;padding:8px 12px;border-left:4px solid #009688;word-wrap:break-word}
|
||||
.w3-codespan{color:crimson;background-color:#f1f1f1;padding-left:4px;padding-right:4px;font-size:110%}
|
||||
.w3-example,.w3-code,.w3-reference{margin:20px 0}
|
||||
.w3-card{border:1px solid #ccc}
|
||||
.w3-card-2,.w3-example{box-shadow:0 2px 4px 0 rgba(0,0,0,0.16),0 2px 10px 0 rgba(0,0,0,0.12)!important}
|
||||
.w3-card-4,.w3-hover-shadow:hover{box-shadow:0 4px 8px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19)!important}
|
||||
.w3-card-8{box-shadow:0 8px 16px 0 rgba(0,0,0,0.2),0 6px 20px 0 rgba(0,0,0,0.19)!important}
|
||||
.w3-card-12{box-shadow:0 12px 16px 0 rgba(0,0,0,0.24),0 17px 50px 0 rgba(0,0,0,0.19)!important}
|
||||
.w3-card-16{box-shadow:0 16px 24px 0 rgba(0,0,0,0.22),0 25px 55px 0 rgba(0,0,0,0.21)!important}
|
||||
.w3-card-24{box-shadow:0 24px 24px 0 rgba(0,0,0,0.2),0 40px 77px 0 rgba(0,0,0,0.22)!important}
|
||||
.w3-animate-fading{-webkit-animation:fading 10s infinite;animation:fading 10s infinite}
|
||||
@-webkit-keyframes fading{0%{opacity:0}50%{opacity:1}100%{opacity:0}}
|
||||
@keyframes fading{0%{opacity:0}50%{opacity:1}100%{opacity:0}}
|
||||
.w3-animate-opacity{-webkit-animation:opac 1.5s;animation:opac 1.5s}
|
||||
@-webkit-keyframes opac{from{opacity:0} to{opacity:1}}
|
||||
@keyframes opac{from{opacity:0} to{opacity:1}}
|
||||
.w3-animate-top{position:relative;-webkit-animation:animatetop 0.4s;animation:animatetop 0.4s}
|
||||
@-webkit-keyframes animatetop{from{top:-300px;opacity:0} to{top:0;opacity:1}}
|
||||
@keyframes animatetop{from{top:-300px;opacity:0} to{top:0;opacity:1}}
|
||||
.w3-animate-left{position:relative;-webkit-animation:animateleft 0.4s;animation:animateleft 0.4s}
|
||||
@-webkit-keyframes animateleft{from{left:-300px;opacity:0} to{left:0;opacity:1}}
|
||||
@keyframes animateleft{from{left:-300px;opacity:0} to{left:0;opacity:1}}
|
||||
.w3-animate-right{position:relative;-webkit-animation:animateright 0.4s;animation:animateright 0.4s}
|
||||
@-webkit-keyframes animateright{from{right:-300px;opacity:0} to{right:0;opacity:1}}
|
||||
@keyframes animateright{from{right:-300px;opacity:0} to{right:0;opacity:1}}
|
||||
.w3-animate-bottom{position:relative;-webkit-animation:animatebottom 0.4s;animation:animatebottom 0.4s}
|
||||
@-webkit-keyframes animatebottom{from{bottom:-300px;opacity:0} to{bottom:0px;opacity:1}}
|
||||
@keyframes animatebottom{from{bottom:-300px;opacity:0} to{bottom:0;opacity:1}}
|
||||
.w3-animate-zoom {-webkit-animation:animatezoom 0.6s;animation:animatezoom 0.6s}
|
||||
@-webkit-keyframes animatezoom{from{-webkit-transform:scale(0)} to{-webkit-transform:scale(1)}}
|
||||
@keyframes animatezoom{from{transform:scale(0)} to{transform:scale(1)}}
|
||||
.w3-animate-input{-webkit-transition:width 0.4s ease-in-out;transition:width 0.4s ease-in-out}.w3-animate-input:focus{width:100%!important}
|
||||
.w3-opacity,.w3-hover-opacity:hover{opacity:0.60;filter:alpha(opacity=60)}
|
||||
.w3-text-shadow{text-shadow:1px 1px 0 #444}.w3-text-shadow-white{text-shadow:1px 1px 0 #ddd}
|
||||
.w3-transparent{background-color:transparent!important}
|
||||
.w3-hover-none:hover{box-shadow:none!important;background-color:transparent!important}
|
||||
/* Start of colors */
|
||||
.w3-amber,.w3-hover-amber:hover{color:#000!important;background-color:#ffc107!important}
|
||||
.w3-aqua,.w3-hover-aqua:hover{color:#000!important;background-color:#00ffff!important}
|
||||
.w3-blue,.w3-hover-blue:hover{color:#fff!important;background-color:#2196F3!important}
|
||||
.w3-light-blue,.w3-hover-light-blue:hover{color:#000!important;background-color:#87CEEB!important}
|
||||
.w3-brown,.w3-hover-brown:hover{color:#fff!important;background-color:#795548!important}
|
||||
.w3-cyan,.w3-hover-cyan:hover{color:#000!important;background-color:#00bcd4!important}
|
||||
.w3-blue-grey,.w3-hover-blue-grey:hover{color:#fff!important;background-color:#607d8b!important}
|
||||
.w3-green,.w3-hover-green:hover{color:#fff!important;background-color:#4CAF50!important}
|
||||
.w3-light-green,.w3-hover-light-green:hover{color:#000!important;background-color:#8bc34a!important}
|
||||
.w3-indigo,.w3-hover-indigo:hover{color:#fff!important;background-color:#3f51b5!important}
|
||||
.w3-khaki,.w3-hover-khaki:hover{color:#000!important;background-color:#f0e68c!important}
|
||||
.w3-lime,.w3-hover-lime:hover{color:#000!important;background-color:#cddc39!important}
|
||||
.w3-orange,.w3-hover-orange:hover{color:#000!important;background-color:#ff9800!important}
|
||||
.w3-deep-orange,.w3-hover-deep-orange:hover{color:#fff!important;background-color:#ff5722!important}
|
||||
.w3-pink,.w3-hover-pink:hover{color:#fff!important;background-color:#e91e63!important}
|
||||
.w3-purple,.w3-hover-purple:hover{color:#fff!important;background-color:#9c27b0!important}
|
||||
.w3-deep-purple,.w3-hover-deep-purple:hover{color:#fff!important;background-color:#673ab7!important}
|
||||
.w3-red,.w3-hover-red:hover{color:#fff!important;background-color:#f44336!important}
|
||||
.w3-sand,.w3-hover-sand:hover{color:#000!important;background-color:#fdf5e6!important}
|
||||
.w3-teal,.w3-hover-teal:hover{color:#fff!important;background-color:#009688!important}
|
||||
.w3-yellow,.w3-hover-yellow:hover{color:#000!important;background-color:#ffeb3b!important}
|
||||
.w3-white,.w3-hover-white:hover{color:#000!important;background-color:#fff!important}
|
||||
.w3-black,.w3-hover-black:hover{color:#fff!important;background-color:#000!important}
|
||||
.w3-grey,.w3-hover-grey:hover{color:#000!important;background-color:#9e9e9e!important}
|
||||
.w3-light-grey,.w3-hover-light-grey:hover{color:#000!important;background-color:#f1f1f1!important}
|
||||
.w3-dark-grey,.w3-hover-dark-grey:hover{color:#fff!important;background-color:#616161!important}
|
||||
.w3-pale-red,.w3-hover-pale-red:hover{color:#000!important;background-color:#ffdddd!important}
|
||||
.w3-pale-green,.w3-hover-pale-green:hover{color:#000!important;background-color:#ddffdd!important}
|
||||
.w3-pale-yellow,.w3-hover-pale-yellow:hover{color:#000!important;background-color:#ffffcc!important}
|
||||
.w3-pale-blue,.w3-hover-pale-blue:hover{color:#000!important;background-color:#ddffff!important}
|
||||
.w3-text-amber,.w3-hover-text-amber:hover{color:#ffc107!important}
|
||||
.w3-text-aqua,.w3-hover-text-aqua:hover{color:#00ffff!important}
|
||||
.w3-text-blue,.w3-hover-text-blue:hover{color:#2196F3!important}
|
||||
.w3-text-light-blue,.w3-hover-text-light-blue:hover{color:#87CEEB!important}
|
||||
.w3-text-brown,.w3-hover-text-brown:hover{color:#795548!important}
|
||||
.w3-text-cyan,.w3-hover-text-cyan:hover{color:#00bcd4!important}
|
||||
.w3-text-blue-grey,.w3-hover-text-blue-grey:hover{color:#607d8b!important}
|
||||
.w3-text-green,.w3-hover-text-green:hover{color:#4CAF50!important}
|
||||
.w3-text-light-green,.w3-hover-text-light-green:hover{color:#8bc34a!important}
|
||||
.w3-text-indigo,.w3-hover-text-indigo:hover{color:#3f51b5!important}
|
||||
.w3-text-khaki,.w3-hover-text-khaki:hover{color:#b4aa50!important}
|
||||
.w3-text-lime,.w3-hover-text-lime:hover{color:#cddc39!important}
|
||||
.w3-text-orange,.w3-hover-text-orange:hover{color:#ff9800!important}
|
||||
.w3-text-deep-orange,.w3-hover-text-deep-orange:hover{color:#ff5722!important}
|
||||
.w3-text-pink,.w3-hover-text-pink:hover{color:#e91e63!important}
|
||||
.w3-text-purple,.w3-hover-text-purple:hover{color:#9c27b0!important}
|
||||
.w3-text-deep-purple,.w3-hover-text-deep-purple:hover{color:#673ab7!important}
|
||||
.w3-text-red,.w3-hover-text-red:hover{color:#f44336!important}
|
||||
.w3-text-sand,.w3-hover-text-sand:hover{color:#fdf5e6!important}
|
||||
.w3-text-teal,.w3-hover-text-teal:hover{color:#009688!important}
|
||||
.w3-text-yellow,.w3-hover-text-yellow:hover{color:#d2be0e!important}
|
||||
.w3-text-white,.w3-hover-text-white:hover{color:#fff!important}
|
||||
.w3-text-black,.w3-hover-text-black:hover{color:#000!important}
|
||||
.w3-text-grey,.w3-hover-text-grey:hover{color:#757575!important}
|
||||
.w3-text-light-grey,.w3-hover-text-light-grey:hover{color:#f1f1f1!important}
|
||||
.w3-text-dark-grey,.w3-hover-text-dark-grey:hover{color:#3a3a3a!important}
|
||||
.w3-border-amber,.w3-hover-border-amber:hover{border-color:#ffc107!important}
|
||||
.w3-border-aqua,.w3-hover-border-aqua:hover{border-color:#00ffff!important}
|
||||
.w3-border-blue,.w3-hover-border-blue:hover{border-color:#2196F3!important}
|
||||
.w3-border-light-blue,.w3-hover-border-light-blue:hover{border-color:#87CEEB!important}
|
||||
.w3-border-brown,.w3-hover-border-brown:hover{border-color:#795548!important}
|
||||
.w3-border-cyan,.w3-hover-border-cyan:hover{border-color:#00bcd4!important}
|
||||
.w3-border-blue-grey,.w3-hover-blue-grey:hover{border-color:#607d8b!important}
|
||||
.w3-border-green,.w3-hover-border-green:hover{border-color:#4CAF50!important}
|
||||
.w3-border-light-green,.w3-hover-border-light-green:hover{border-color:#8bc34a!important}
|
||||
.w3-border-indigo,.w3-hover-border-indigo:hover{border-color:#3f51b5!important}
|
||||
.w3-border-khaki,.w3-hover-border-khaki:hover{border-color:#f0e68c!important}
|
||||
.w3-border-lime,.w3-hover-border-lime:hover{border-color:#cddc39!important}
|
||||
.w3-border-orange,.w3-hover-border-orange:hover{border-color:#ff9800!important}
|
||||
.w3-border-deep-orange,.w3-hover-border-deep-orange:hover{border-color:#ff5722!important}
|
||||
.w3-border-pink,.w3-hover-border-pink:hover{border-color:#e91e63!important}
|
||||
.w3-border-purple,.w3-hover-border-purple:hover{border-color:#9c27b0!important}
|
||||
.w3-border-deep-purple,.w3-hover-border-deep-purple:hover{border-color:#673ab7!important}
|
||||
.w3-border-red,.w3-hover-border-red:hover{border-color:#f44336!important}
|
||||
.w3-border-sand,.w3-hover-border-sand:hover{border-color:#fdf5e6!important}
|
||||
.w3-border-teal,.w3-hover-border-teal:hover{border-color:#009688!important}
|
||||
.w3-border-yellow,.w3-hover-border-yellow:hover{border-color:#ffeb3b!important}
|
||||
.w3-border-white,.w3-hover-border-white:hover{border-color:#fff!important}
|
||||
.w3-border-black,.w3-hover-border-black:hover{border-color:#000!important}
|
||||
.w3-border-grey,.w3-hover-border-grey:hover{border-color:#9e9e9e!important}
|
||||
.w3-border-light-grey,.w3-hover-border-light-grey:hover{border-color:#f1f1f1!important}
|
||||
.w3-border-dark-grey,.w3-hover-border-dark-grey:hover{border-color:#616161!important}
|
||||
.w3-border-pale-red,.w3-hover-border-pale-red:hover{border-color:#ffe7e7!important}.w3-border-pale-green,.w3-hover-border-pale-green:hover{border-color:#e7ffe7!important}
|
||||
.w3-border-pale-yellow,.w3-hover-border-pale-yellow:hover{border-color:#ffffcc!important}.w3-border-pale-blue,.w3-hover-border-pale-blue:hover{border-color:#e7ffff!important}
|
||||
|
|
@ -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.11">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12">
|
||||
|
||||
<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.11">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.11">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.12">
|
||||
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -229,7 +229,7 @@ function handleResultOfInstallCheck(is_installed) {
|
|||
if (is_installed == "Yes") {
|
||||
useInstallation();
|
||||
} else {
|
||||
setTimeout(function(){document.location.href = "install.html?v=1.5.11"},500);
|
||||
setTimeout(function(){document.location.href = "install.html?v=1.5.12"},500);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -794,7 +794,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.11</button>
|
||||
<button id="updatebtn">Update -> 1.5.12</button>
|
||||
<span id="updateinprogresstxt" style="display:none;">Update... bitte warten.</span>
|
||||
</td>
|
||||
<td> </td>
|
||||
|
|
|
|||
|
|
@ -414,7 +414,7 @@ $zones[] = $timezone_identifiers[$i];
|
|||
echo json_encode($zones);
|
||||
} else if ($command == 'update') {
|
||||
set_time_limit(60*30);
|
||||
$installerVersion = "1.5.11";
|
||||
$installerVersion = "1.5.12";
|
||||
|
||||
$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.11">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12">
|
||||
|
||||
<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.11"></script>
|
||||
<script src="kitchenbar.js?v=1.5.11"></script>
|
||||
<script src="utilities.js?v=1.5.12"></script>
|
||||
<script src="kitchenbar.js?v=1.5.12"></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.11">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12">
|
||||
|
||||
<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.11"></script>
|
||||
<script src="elements/tablemap.js?v=1.5.11"></script>
|
||||
<script src="elements/roommap.js?v=1.5.11"></script>
|
||||
<script src="elements/groundplan.js?v=1.5.11"></script>
|
||||
<script src="utilities.js?v=1.5.12"></script>
|
||||
<script src="elements/tablemap.js?v=1.5.12"></script>
|
||||
<script src="elements/roommap.js?v=1.5.12"></script>
|
||||
<script src="elements/groundplan.js?v=1.5.12"></script>
|
||||
|
||||
<link href="php/3rdparty/hayageek_uploadfile.css" rel="stylesheet">
|
||||
<script src="php/3rdparty/hayageek_jquery_uploadfile.js"></script>
|
||||
|
|
@ -368,12 +368,13 @@ var MAN_UNPAID1 = ["Es wurden folgende Tische noch nicht abgerechnet: ",
|
|||
var MAN_UNPAID2 = ["Soll die Tageserfassung vorgenommen werden? In diesem Fall wird die Tisch-Zuweisung der unbezahlten Artikel gelöscht!",
|
||||
"Do you want to continue create the closing? In this case these products will be unassigned from the tables!",
|
||||
"Quieres continuar y removar estos productos?"];
|
||||
var MAN_AUSTRIA_INCOMPLETE = ["Aktuell ist OrderSprinter noch nicht kompatibel mit der RKSV in Österreich!","Currently OrderSprinter is still incompatible with the RKSV in Austria!","De momento OrderSprinter no esta acuerdo con la RKSV en Austria!"];
|
||||
var MAN_AUSTRIA_INCOMPLETE = ["OrderSprinter ist nicht kompatibel mit der RKSV in Österreich, erlaubt aber die Anbindung an die RKSV-konforme Software cbird.","Currently OrderSprinter is incompatible with the RKSV in Austria, but allows interfacing to cbird which is RKSV compatible!","De momento OrderSprinter no esta acuerdo con la RKSV en Austria!"];
|
||||
var MAN_PAYDESKID = ["Kassenidentifikationsnummer","Paydesk ID","Caja identificación"];
|
||||
var MAN_AESKEY = ["AES256 Schlüssel","AES256 Key","AES256 LLave"];
|
||||
var MAN_AESKEY_WRONG_LENGTH = ["Ein AES256-Schlüssel muss in Hex-Darstellung 64 Zeichen haben.","An AES256 key requires to have 64 characters in a hex string.", "Una llave de AES256 tiene que contener 64 characteres en forma hex."];
|
||||
var MAN_AESKEY_NO_HEX = ["Der AES-Schlüssel muss als Hex-Zahl angegeben werden.","The AES key must be specified as hex number","La llava AES tiene que especificado en formato hex."];
|
||||
var MAN_CERTIFICATE_SN = ["Zertifikatsseriennummer", "Certificate Serial No","Certificado ID"];
|
||||
var MAN_CBIRD_FOLDER = ["cbird Importverzeichnis","cbird import folder","cbird fichero"];
|
||||
var MAN_RKSVSERVER = ["RKSV-Server-URL","RKSV server URL","RKSV-Server URL"];
|
||||
var MAN_TAX = ["Steuersatz (%)","Tax (%)","Impuesto (%)"];
|
||||
var MAN_CONFIRM_GO_LIVE = ["Die Umsatz- und Logdaten wurden gelöscht und nur die Konfiguration übernommen. Deswegen ist nun ein erneutes Einloggen erforderlich.",
|
||||
|
|
@ -621,7 +622,8 @@ var generalValuesSettings = [
|
|||
["oneclickcooked",MAN_ONECLICKCOOKED[lang],"s",57],
|
||||
["showpickupdelbtn",MAN_SHOWPICKDELBTN[lang],"s",58],
|
||||
["showpickhelp",MAN_SHOWPICKHELP[lang],"s",59],
|
||||
["showpayments",MAN_SHOWPAYMENTS[lang],"s",60]
|
||||
["showpayments",MAN_SHOWPAYMENTS[lang],"s",60],
|
||||
["cbirdfolder",MAN_CBIRD_FOLDER[lang],"i",0,""]
|
||||
];
|
||||
|
||||
var predef = "";
|
||||
|
|
@ -657,7 +659,7 @@ function setLanguage(l) {
|
|||
$("#createclosing").html(MAN_CREATE_WITH_REC[l]);
|
||||
$("#createclosingnoprint").html(MAN_CREATE_WITHOUT_REC[l]);
|
||||
|
||||
$("#changeConfig").html(MAN_CHANGE[l]);
|
||||
$("#changeConfigtxt").html(MAN_CHANGE[l]);
|
||||
$("#dataexportdettxt").html(MAN_DATEXPDETTXT[l]);
|
||||
|
||||
$("#readspeisekarte").html(MAN_APPLY[l]);
|
||||
|
|
@ -696,6 +698,7 @@ function setLanguage(l) {
|
|||
$("#addrecprinterhint").html("<p style='padding-left: 50px;padding-right: 50px;'><i>" + MAN_ADD_RECPRINTER_DESCR[l] + "</i></p>");
|
||||
$("#aeskeytxt").html(MAN_AESKEY[l]);
|
||||
$("#certificatesntxt").html(MAN_CERTIFICATE_SN[l]);
|
||||
$("#cbirdfoldertxt").html(MAN_CBIRD_FOLDER[l]);
|
||||
$("#rksvservertxt").html(MAN_RKSVSERVER[l]);
|
||||
|
||||
$("#emailbadratingtxt").html(MAN_EMAIL_BAD_RATING[l]);
|
||||
|
|
@ -1498,7 +1501,7 @@ function initRestoreFileUpload() {
|
|||
} else {
|
||||
alert("Import war erfolgreich.");
|
||||
setTimeout(function(){
|
||||
document.location.href = "index.html?v=1.5.11";
|
||||
document.location.href = "index.html?v=1.5.12";
|
||||
},250);
|
||||
}
|
||||
},
|
||||
|
|
@ -2052,9 +2055,9 @@ function handleUpdateCheckResult(answer) {
|
|||
|
||||
var millis=getMillis();
|
||||
setTimeout(function(){
|
||||
document.location.href = "install.html?v=1.5.11&mode=onlyupdate&n=" + millis;
|
||||
document.location.href = "install.html?v=1.5.12&mode=onlyupdate&n=" + millis;
|
||||
},250);
|
||||
document.location.href = "install.html?v=1.5.11&mode=onlyupdate&n=" + millis;
|
||||
document.location.href = "install.html?v=1.5.12&mode=onlyupdate&n=" + millis;
|
||||
}
|
||||
|
||||
function handleUpdateReplace(answer) {
|
||||
|
|
@ -3542,19 +3545,19 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
|
||||
<div id="partIfAustriaEnabled">
|
||||
<i><b><span id=austriahint></span></b></i>
|
||||
<div data-role="fieldcontain">
|
||||
<div data-role="fieldcontain" style="display:none;">
|
||||
<label for="paydeskid"><span id="paydeskidtxt">Kassenid:</span></label>
|
||||
<input type="text" value="" data-mini="true" placeholder="OrderSprinter-1" id="paydeskid" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
<div data-role="fieldcontain">
|
||||
<div data-role="fieldcontain" style="display:none;">
|
||||
<label for="aeskey"><span id="aeskeytxt">AES-Schlüssel:</span></label>
|
||||
<input type="text" value="" data-mini="true" placeholder="" id="aeskey" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
<div data-role="fieldcontain">
|
||||
<div data-role="fieldcontain" style="display:none;">
|
||||
<label for="rksvserver"><span id="rksvservertxt">RKSV-Modul:</span></label>
|
||||
<input type="text" value="" data-mini="true" placeholder="http://localhost/rksv:8099" id="rksvserver" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
<div data-role="fieldcontain">
|
||||
<div data-role="fieldcontain" style="display:none;">
|
||||
<label for="certificatesn"><span id="certificatesntxt">Zert.Seriennummer:</span></label>
|
||||
<input type="text" value="" data-mini="true" placeholder="1234567" id="certificatesn" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
|
|
@ -3578,6 +3581,11 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
<label for="taxaustriaspecialval">Steuersatz 'Besonders':</label>
|
||||
<input type="text" value="" data-mini="true" placeholder="7,0" id="taxaustriaspecialval" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
|
||||
<div data-role="fieldcontain">
|
||||
<label for="cbirdfolder"><span id="cbirdfoldertxt">CBird Imporfolder:</span></label>
|
||||
<input type="text" value="" data-mini="true" placeholder="7,0" id="cbirdfolder" data-theme="c" class="genConfigEl"/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<br><b><u><span id="transfersectiontxt">Datentransfer</span></u></b><br><br>
|
||||
|
|
@ -3927,7 +3935,8 @@ $(document).on("pageinit", "#admin-page", function () {
|
|||
|
||||
<br><b><u><span id="applysectiontxt">Ändern</span></u></b><br><br>
|
||||
<div style="margin-left:30px;margin-right:30px;">
|
||||
<button type="submit" data-theme="f" data-icon="check" id="changeConfig" style="height:150px;font-size:3em;">Ändern</button>
|
||||
<button type="submit" data-theme="f" data-icon="check" id="changeConfig" style="height:150px;">
|
||||
<span id="changeConfigtxt" >Ändern</span></button>
|
||||
</div>
|
||||
</form><!-- Konfiguration -->
|
||||
|
||||
|
|
|
|||
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
|
|
@ -1,32 +0,0 @@
|
|||
##
|
||||
## PHPExcel
|
||||
##
|
||||
## Copyright (c) 2006 - 2013 PHPExcel
|
||||
##
|
||||
## This library is free software; you can redistribute it and/or
|
||||
## modify it under the terms of the GNU Lesser General Public
|
||||
## License as published by the Free Software Foundation; either
|
||||
## version 2.1 of the License, or (at your option) any later version.
|
||||
##
|
||||
## This library is distributed in the hope that it will be useful,
|
||||
## but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
## Lesser General Public License for more details.
|
||||
##
|
||||
## You should have received a copy of the GNU Lesser General Public
|
||||
## License along with this library; if not, write to the Free Software
|
||||
## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
##
|
||||
## @category PHPExcel
|
||||
## @package PHPExcel_Settings
|
||||
## @copyright Copyright (c) 2006 - 2013 PHPExcel (http://www.codeplex.com/PHPExcel)
|
||||
## @license http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt LGPL
|
||||
## @version 1.8.0, 2014-03-02
|
||||
##
|
||||
##
|
||||
|
||||
|
||||
##
|
||||
## (For future use)
|
||||
##
|
||||
currencySymbol = £
|
||||
|
|
@ -84,6 +84,7 @@ class Admin {
|
|||
"setPreferimgmobile" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
"setPrefershowplusminus" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
"setPreferfixbtns" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
"setPreferCalc" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
"getOrderVolume" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
"getButtonSizes" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
"getPreferTableMap" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
|
|
@ -91,6 +92,7 @@ class Admin {
|
|||
"getMobileTheme" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
"getApplyExtrasBtnPos" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
"getTablesAfterSend" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
"getPreferCalc" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
"getPreferimgdesk" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
"getPreferimgmobile" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
"getPrefershowplusminus" => array("loggedin" => 1, "isadmin" => 0, "rights" => null),
|
||||
|
|
@ -304,6 +306,10 @@ class Admin {
|
|||
if ($this->isUserAlreadyLoggedInForPhp()) {
|
||||
$this->setPreferfixbtns($_POST['preferredvalue']);
|
||||
}
|
||||
} else if ($command == 'setPreferCalc') {
|
||||
if ($this->isUserAlreadyLoggedInForPhp()) {
|
||||
$this->setPreferCalc($_POST['preferredvalue']);
|
||||
}
|
||||
} else if ($command == 'setKeepTypeLevel') {
|
||||
if ($this->isUserAlreadyLoggedInForPhp()) {
|
||||
$this->setKeepTypeLevel($_POST['keeptypelevel']);
|
||||
|
|
@ -366,6 +372,10 @@ class Admin {
|
|||
if ($this->isUserAlreadyLoggedInForPhp()) {
|
||||
$this->getTablesAfterSend();
|
||||
}
|
||||
} else if ($command == 'getPreferCalc') {
|
||||
if ($this->isUserAlreadyLoggedInForPhp()) {
|
||||
$this->getPreferCalc();
|
||||
}
|
||||
} else if ($command == 'isInstalled') {
|
||||
$this->isInstalled();
|
||||
} else if ($command == 'isPrinterServerActive') {
|
||||
|
|
@ -871,6 +881,9 @@ class Admin {
|
|||
function getTablesAfterSend() {
|
||||
self::getUserValue('tablesaftersend', 1);
|
||||
}
|
||||
function getPreferCalc() {
|
||||
self::getUserValue('calcpref', 1);
|
||||
}
|
||||
function getOrderVolume() {
|
||||
self::getUserValue('ordervolume',0);
|
||||
}
|
||||
|
|
@ -917,6 +930,9 @@ class Admin {
|
|||
}
|
||||
self::setUserValue('preferfixbtns',$preferValue);
|
||||
}
|
||||
function setPreferCalc($preferValue) {
|
||||
self::setUserValue('calcpref',$preferValue);
|
||||
}
|
||||
function setKeepTypeLevel($preferValue) {
|
||||
self::setUserValue('keeptypelevel',$preferValue);
|
||||
}
|
||||
|
|
@ -1170,6 +1186,7 @@ class Admin {
|
|||
array("hs3refresh",60,false),
|
||||
array("paydeskid","",false),
|
||||
array("aeskey","",false),
|
||||
array("cbirdfolder","",false),
|
||||
|
||||
array("certificatesn","",false),
|
||||
array("rksvserver","",false),
|
||||
|
|
@ -1380,7 +1397,7 @@ class Admin {
|
|||
$view = "preferences.html";
|
||||
}
|
||||
|
||||
echo json_encode($view . "?v=1.5.11");
|
||||
echo json_encode($view . "?v=1.5.12");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1596,31 +1613,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.11"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.5.12"); }
|
||||
} else {
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.11"); }
|
||||
if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.5.12"); }
|
||||
}
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.11"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.11"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.11"); }
|
||||
if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.5.12"); }
|
||||
if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.5.12"); }
|
||||
if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.5.12"); }
|
||||
if ($_SESSION['modus'] == 0) {
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.11"); }
|
||||
if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.5.12"); }
|
||||
}
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.11"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.11"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.11"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.11"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.11"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.11"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.11"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.11"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.11"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.11"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.11");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.11"); }
|
||||
if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.5.12"); }
|
||||
if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.5.12"); }
|
||||
if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.5.12"); }
|
||||
if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.5.12"); }
|
||||
if ($_SESSION['right_tasks'] || $_SESSION['right_tasksmanagement']) { $mainMenu[] = array("name" => $taskstxt[$lang], "link" => "tasks.html?v=1.5.12"); }
|
||||
if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.5.12"); }
|
||||
if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.5.12"); }
|
||||
if ($_SESSION['right_pickups']) { $mainMenu[] = array("name" => $pickupstxt[$lang], "link" => "pickups.html?v=1.5.12"); }
|
||||
if ($_SESSION['right_dash']) { $mainMenu[] = array("name" => $dashtxt[$lang], "link" => "dash.php?v=1.5.12"); }
|
||||
if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.5.12"); }
|
||||
$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.5.12");
|
||||
if ($_SESSION['right_timetracking'] || $_SESSION['right_timemanager']) { $mainMenu[] = array("name" => $timetrackingtxt[$lang], "link" => "timetracking.html?v=1.5.12"); }
|
||||
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.11");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.11");
|
||||
$mainMenu[] = array("name" => "Hilfe", "link" => "help.php?v=1.5.12");
|
||||
$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.5.12");
|
||||
}
|
||||
|
||||
$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
|
||||
|
|
@ -2205,7 +2222,8 @@ class Admin {
|
|||
"aeskey" => array("dbcol" => "aeskey","checknum" => 0),
|
||||
"certificatesn" => array("dbcol" => "certificatesn","checksum" => 0),
|
||||
"rksvserver" => array("dbcol" => "rksvserver","checksum" => 0),
|
||||
"showprepinwaiter" => array("dbcol" => "showprepinwaiter","checksum" => 0)
|
||||
"showprepinwaiter" => array("dbcol" => "showprepinwaiter","checksum" => 0),
|
||||
"cbirdfolder" => array("dbcol" => "cbirdfolder","checknum" => 0),
|
||||
);
|
||||
$problem = false;
|
||||
foreach ($changedValues as $aChangeSet) {
|
||||
|
|
|
|||
|
|
@ -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.11">';
|
||||
$txt .= '<link rel="stylesheet" type="text/css" href="../css/guestreport.css?v=1.5.12">';
|
||||
$txt .= "</head>";
|
||||
return $txt;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ if (isset($_POST["cmd"])) {
|
|||
if (strlen($status) > 150) {
|
||||
$status = substr($status, 0,149);
|
||||
}
|
||||
$version = "1.5.11";
|
||||
$version = "1.5.12";
|
||||
|
||||
$arr = array("cmd" => $cmd,"fct" => $fct, "xhr" => $xhr,"errormsg" => $errormsg,"status" => $status,"version" => $version,"phpversion" => $phpversion);
|
||||
} else {
|
||||
|
|
|
|||
|
|
@ -1915,28 +1915,16 @@ class QueueContent {
|
|||
if ($allNotPaid == true) {
|
||||
$billid = -1;
|
||||
|
||||
$sql = "SELECT id from %bill% ORDER BY id DESC";
|
||||
$stmt = $pdo->prepare($this->dbutils->resolveTablenamesInSqlString($sql));
|
||||
$stmt->execute();
|
||||
$numberOfIds = $stmt->rowCount();
|
||||
$sql = "SELECT MAX(id) as maxid FROM %bill%";
|
||||
$maxIdRes = CommonUtils::fetchSqlAll($pdo, $sql);
|
||||
$maxId = $maxIdRes[0]["maxid"];
|
||||
|
||||
$newprevbrutto = 0;
|
||||
$newprevnetto = 0;
|
||||
if ($numberOfIds > 0) {
|
||||
$row =$stmt->fetchObject();
|
||||
if ($row != null) {
|
||||
$billid = intval($row->id)+1;
|
||||
$sql = "SELECT brutto,ROUND(netto,2) as netto,prevbrutto,prevnetto FROM %bill% WHERE id=?";
|
||||
$row = CommonUtils::getRowSqlObject($pdo, $sql, array($row->id));
|
||||
$newprevbrutto = $row->prevbrutto + $row->brutto;
|
||||
$newprevnetto = $row->prevnetto + $row->netto;
|
||||
} else {
|
||||
if (!$calledInternally) {
|
||||
echo " - row ist null - ";
|
||||
$pdo->rollBack();
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (!is_null($maxId) && ($maxId > 0)) {
|
||||
$billid = intval($maxId) + 1;
|
||||
|
||||
|
||||
} else {
|
||||
$billid = 1;
|
||||
}
|
||||
|
|
@ -2006,6 +1994,40 @@ class QueueContent {
|
|||
|
||||
// Rksv::signBill($pdo, $billid);
|
||||
|
||||
$austriaEnabled = CommonUtils::getConfigValue($pdo, "austria", 0);
|
||||
if ($austriaEnabled == 1) {
|
||||
|
||||
$idlist = join(",",$ids_array);
|
||||
$sql = "SELECT count(productname) as mycount,productname,tax,price FROM %queue% WHERE id in ($idlist) GROUP BY productname, price, tax";
|
||||
$cbirdEntries = CommonUtils::fetchSqlAll($pdo, $sql);
|
||||
if ($paymentId == 1) {
|
||||
$paymentText = "Bar";
|
||||
} else {
|
||||
$sql = "SELECT name from %payment% WHERE id=?";
|
||||
$r = CommonUtils::fetchSqlAll($pdo, $sql, array($paymentId));
|
||||
$paymentText = $r[0]["name"];
|
||||
}
|
||||
$positionen = array();
|
||||
foreach ($cbirdEntries as $aPosition) {
|
||||
$priceInCent = $aPosition["price"] * 100;
|
||||
$aPos = array("bezeichnung" => $aPosition["productname"],
|
||||
"menge" => intval($aPosition["mycount"]),
|
||||
"einzelpreis" => intval($priceInCent),
|
||||
"ust" => intval($aPosition["tax"]));
|
||||
$positionen[] = $aPos;
|
||||
}
|
||||
$cbirdEntry = array("zahlungsmittel" => $paymentText, "positionen" => $positionen);
|
||||
$cbirdEntryJson = json_encode($cbirdEntry);
|
||||
$currentTime = date('Y-m-d');
|
||||
$longid = str_pad($billid, 10, '0', STR_PAD_LEFT);
|
||||
$cbirdFolder = trim(CommonUtils::getConfigValue($pdo, 'cbirdfolder', ''));
|
||||
|
||||
if ($cbirdFolder != "") {
|
||||
$filename = $cbirdFolder . "/" . $currentTime . "-" . $longid . ".json";
|
||||
file_put_contents($filename, $cbirdEntryJson);
|
||||
}
|
||||
}
|
||||
|
||||
CommonUtils::callPlugin($pdo, "createBill", "after");
|
||||
|
||||
CommonUtils::log($pdo, "QUEUE", "Created bill with id=$billid from user $userid");
|
||||
|
|
|
|||
|
|
@ -1055,6 +1055,16 @@ class Version {
|
|||
}
|
||||
}
|
||||
|
||||
public static function upd_1511_1512($pdo, $prefix, $dbname) {
|
||||
try {
|
||||
self::insertOrUpdateConfigItem($pdo, 'cbirdfolder', '');
|
||||
self::execSql($pdo, "ALTER TABLE %user% ADD calcpref INT(2) NULL AFTER extrasapplybtnpos");
|
||||
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"),
|
||||
|
|
@ -1113,7 +1123,8 @@ class Version {
|
|||
"1.5.7" => array("upd_1507_1508","1.5.8"),
|
||||
"1.5.8" => array("upd_1508_1509","1.5.9"),
|
||||
"1.5.9" => array("upd_1509_1510","1.5.10"),
|
||||
"1.5.10" => array("upd_1510_1511","1.5.11")
|
||||
"1.5.10" => array("upd_1510_1511","1.5.11"),
|
||||
"1.5.11" => array("upd_1511_1512","1.5.12")
|
||||
);
|
||||
|
||||
// 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.11">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12">
|
||||
<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.11"></script>
|
||||
<script src="utilities.js?v=1.5.12"></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.11">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12">
|
||||
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
|
@ -80,6 +80,11 @@ var PREF_THEME_HINT = ["Bitte beachten: Möglicherweise wirkt eine Änderung ers
|
|||
"It may be necessary to press the reload button of a view to get the changed design to be applied.",
|
||||
"Quizás es necesario reload las paginas despues de un cambio."];
|
||||
var PREF_IMG_ICON_DISPLAY = ["Bild-/Iconanzeige","Display of images/icons","Icons/Imagenes en las vistas"];
|
||||
var PREF_MISC = ["Verschiedenes","Misc","Otros temas"];
|
||||
var PREF_CALC_PREF = ["Bevorzugter Wechselgeldrechnermodus","Preferred change money calculation mode","Modus para calcular de cambio"];
|
||||
var PREF_CALC_NONE_TXT = ["Kein Wechselgeldrechner","No calculator","Ningún calculador de cambio"];
|
||||
var PREF_CALC_TIP_TXT = ["Angabe extra Trinkg.","Do Tip separate","Propina individual"];
|
||||
var PREF_CALC_TOTAL_TXT = ["Angabe inkl.Trinkg.","Do Tip incl.","Propina incl."];
|
||||
|
||||
var l=0;
|
||||
|
||||
|
|
@ -206,6 +211,8 @@ function setLanguage(lang) {
|
|||
|
||||
$("#preferimgtxt").html(PREF_IMG_ICON_DISPLAY[lang]);
|
||||
|
||||
$("#prefermisctxt").html(PREF_MISC[lang]);
|
||||
|
||||
initializeMainMenu("#modulemenu");
|
||||
binding();
|
||||
}
|
||||
|
|
@ -261,6 +268,9 @@ function setApplyBtnPos() {
|
|||
function setTablesAfterSend() {
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getTablesAfterSend",null,fillTablesAfterSendPart,"Keine Information über Navigation nach Bestellübermittlung");
|
||||
}
|
||||
function setCalcMode() {
|
||||
doAjax("GET","php/contenthandler.php?module=admin&command=getPreferCalc",null,fillCalcPref,null);
|
||||
}
|
||||
|
||||
function fillOrderVolume(volume) {
|
||||
$("#slidervolume").val(volume);
|
||||
|
|
@ -357,6 +367,19 @@ function createPreferTablesAfterSendPart(prefervalue,label,labeltxt) {
|
|||
return html;
|
||||
}
|
||||
|
||||
function createPreferCalcPart(prefervalue,label,labeltxt) {
|
||||
var html = '<div class="ui-field-contain">';
|
||||
html += '<label for="' + label + '"><span id="' + label + 'txt">' + labeltxt + '</span>:</label>';
|
||||
html += '<select name="' + label + '" id="' + label + '" data-theme="e">';
|
||||
|
||||
html += '<option value="0"' + isSelected(0,prefervalue) + '>' + PREF_CALC_NONE_TXT[l] + '</option>';
|
||||
html += '<option value="1"' + isSelected(1,prefervalue) + '>' + PREF_CALC_TOTAL_TXT[l] + '</option>';
|
||||
html += '<option value="2"' + isSelected(2,prefervalue) + '>' + PREF_CALC_TIP_TXT[l] + '</option>';
|
||||
|
||||
html += '</select></div>';
|
||||
return html;
|
||||
}
|
||||
|
||||
function fillButtonSizes(buttonsizes) {
|
||||
$("#roombtnpart").html(createBtnSizePart(buttonsizes.roombtnsize, "roombtnsize", PREF_ROOM_BTN_SIZE[l]));
|
||||
$("#tablebtnpart").html(createBtnSizePart(buttonsizes.tablebtnsize, "tablebtnsize", PREF_TABLE_BTN_SIZE[l]));
|
||||
|
|
@ -403,6 +426,11 @@ function fillTablesAfterSendPart(thevalue) {
|
|||
$("#preferktlpartbox").trigger("create");
|
||||
}
|
||||
|
||||
function fillCalcPref(calcPref) {
|
||||
$("#prefercalcpart").html(createPreferCalcPart(calcPref, "prefercalclabel", PREF_CALC_PREF[l]));
|
||||
$("#prefermiscpartbox").trigger("create");
|
||||
}
|
||||
|
||||
function handleBtnSize(jsonResult) {
|
||||
if (jsonResult != "OK") {
|
||||
alert("Fehler");
|
||||
|
|
@ -536,6 +564,15 @@ function binding() {
|
|||
doAjax("POST","php/contenthandler.php?module=admin&command=setTablesAfterSend",{tablesaftersend:newVal},handleGeneralAnswer,"Anwenden Auswahl nach Bestellübvermittlung");
|
||||
binding();
|
||||
});
|
||||
|
||||
$("#prefercalclabel").off('change').on('change', function(e) {
|
||||
var newVal = $("#prefercalclabel").find(":selected").val();
|
||||
$("#prefercalcpart").html(createPreferCalcPart(newVal, "prefercalclabel", PREF_CALC_PREF[l]));
|
||||
$("#prefermiscpartbox").trigger("create");
|
||||
doAjax("POST","php/contenthandler.php?module=admin&command=setPreferCalc",{preferredvalue:newVal},handleGeneralAnswer,"Anwenden Auswahl nach Bestellübvermittlung");
|
||||
binding();
|
||||
});
|
||||
// prefercalclabel
|
||||
}
|
||||
|
||||
$(document).on("pageinit", "#pref-page", function () {
|
||||
|
|
@ -554,6 +591,7 @@ $(document).on("pageinit", "#pref-page", function () {
|
|||
setPreferimgmobile();
|
||||
setShowplusminus();
|
||||
setPreferfixbtns();
|
||||
setCalcMode();
|
||||
binding();
|
||||
});
|
||||
|
||||
|
|
@ -636,6 +674,11 @@ $(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">
|
||||
<h3><span id="prefermisctxt">Versch.</span></h3>
|
||||
<p><div id="prefercalcpart"></div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div data-role="footer" data-theme="b" id="thefooterr" style="background-color:black;">
|
||||
<div class="ui-grid-a">
|
||||
|
|
@ -644,7 +687,7 @@ $(document).on("pageinit", "#pref-page", function () {
|
|||
</div><!-- /grid-a -->
|
||||
</div> <!-- footer -->
|
||||
|
||||
<div data-role="popup" id="passwordchangedpopup" name="passwordchangedpopup" data-overlay-theme="a" style="max-width:70%;" class="ui-corner-all">
|
||||
<div data-role="popup" id="passwordchangedpopup" data-overlay-theme="a" style="max-width:70%;" class="ui-corner-all">
|
||||
<div data-role="header" class="ui-corner-top">
|
||||
<h1>Passwortänderung</h1>
|
||||
</div>
|
||||
|
|
@ -654,7 +697,7 @@ $(document).on("pageinit", "#pref-page", function () {
|
|||
</div>
|
||||
</div> <!-- popup for changed password -->
|
||||
|
||||
<div data-role="popup" id="passwordnotchangedpopup" name="passwordnotchangedpopup" data-overlay-theme="a" style="max-width:70%;" class="ui-corner-all">
|
||||
<div data-role="popup" id="passwordnotchangedpopup" data-overlay-theme="a" style="max-width:70%;" class="ui-corner-all">
|
||||
<div data-role="header" class="ui-corner-top">
|
||||
<h1>Passwortänderung</h1>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -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.11">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12">
|
||||
<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.11">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12">
|
||||
<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.11">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12">
|
||||
<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.11">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12">
|
||||
<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.11">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12">
|
||||
|
||||
<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.11">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12">
|
||||
<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.11"></script>
|
||||
<script src="utilities.js?v=1.5.12"></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.11">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12">
|
||||
<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.11">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.11">
|
||||
<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.5.12">
|
||||
<link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.5.12">
|
||||
<link rel="stylesheet" href="php/contenthandler.php?module=admin&command=getmobilecss" />
|
||||
<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue