From 93af22adb8f466ecbf88ccacfea6f0ddf3d9c912 Mon Sep 17 00:00:00 2001 From: Geno Date: Thu, 19 Nov 2020 23:00:39 +0100 Subject: [PATCH] OrderSprinter 1.2.13 --- javaprinter/javaprinter.jar | Bin 58949 -> 59101 bytes printserver/OrderSprinterPrintserver.exe | Bin 271872 -> 271872 bytes webapp/OrderSprinterPrintserver.exe | Bin 271872 -> 271872 bytes webapp/bar.html | 2 +- webapp/bill.html | 2 +- webapp/css/ospage.css | 2 +- webapp/css/w3.css | 346 +++++++++++++++++++++++ webapp/feedback.html | 2 +- webapp/img/choicearrow.png | Bin 0 -> 1586 bytes webapp/index.html | 4 +- webapp/install.html | 2 +- webapp/install/installer.php | 27 +- webapp/kitchen.html | 2 +- webapp/manager.html | 37 ++- webapp/paydesk.html | 2 +- webapp/php/admin.php | 32 +-- webapp/php/queuecontent.php | 2 +- webapp/preferences.html | 2 +- webapp/products.html | 2 +- webapp/rating.html | 2 +- webapp/reports.html | 2 +- webapp/reservation.html | 2 +- webapp/supplydesk.html | 2 +- webapp/waiter.html | 2 +- webapp/waiterdesktop.php | 13 +- 25 files changed, 437 insertions(+), 52 deletions(-) create mode 100644 webapp/css/w3.css create mode 100644 webapp/img/choicearrow.png diff --git a/javaprinter/javaprinter.jar b/javaprinter/javaprinter.jar index 7ee0d96b75a514b38b46cc2c430ac44d7e2ca65d..c437d8c41051f07b94e6e970b12b82581aa5560b 100644 GIT binary patch delta 5751 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 delta 5615 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 - + diff --git a/webapp/bill.html b/webapp/bill.html index 37ac69d..13efbd8 100644 --- a/webapp/bill.html +++ b/webapp/bill.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/css/ospage.css b/webapp/css/ospage.css index 99603fc..794a9b5 100644 --- a/webapp/css/ospage.css +++ b/webapp/css/ospage.css @@ -1 +1 @@ -html{overflow-y:scroll}.ospage{display:-webkit-flex;display:flex;-webkit-flex-flow:row wrap;flex-flow:row wrap;text-align:center;color:white}.ospage>*{padding:10px;flex:100%}.main{text-align:left;background:cornflowerblue;-webkit-flex:5;flex:5;-webkit-flex-flow:nowrap;flex-flow:nowrap}.header{background:black}.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}#loggedinuser{text-align:left;width:50%}#versioninfo{text-align:right;color:white;width:50%}.aside1{background:moccasin;color:black;width:0;-webkit-flex:2;flex:2}.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}.footer{order:5}}.input100{width:100%;height:50px;font-weight:bold;text-align:center}.input50{width:49%;height:50px;font-weight:bold;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}.extraitem:last-child{border-bottom:0}#loggedinuser{color:black}.buttonarea{box-shadow:10px 10px 5px #888} \ No newline at end of file +html{overflow-y:scroll}.ospage{display:-webkit-flex;display:flex;-webkit-flex-flow:row wrap;flex-flow:row wrap;text-align:center;color:white}.ospage>*{padding:10px;flex:100%}.main{text-align:left;background:cornflowerblue;-webkit-flex:5;flex:5;-webkit-flex-flow:nowrap;flex-flow:nowrap}.header{background:black}.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}#loggedinuser{text-align:left;width:50%}#versioninfo{text-align:right;color:white;width:50%}.aside1{background:moccasin;color:black;width:0;-webkit-flex:2;flex:2}.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}.footer{order:5}}.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}#loggedinuser{color:black}.buttonarea{box-shadow:10px 10px 5px #888} \ No newline at end of file diff --git a/webapp/css/w3.css b/webapp/css/w3.css new file mode 100644 index 0000000..689918f --- /dev/null +++ b/webapp/css/w3.css @@ -0,0 +1,346 @@ +/* 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} \ No newline at end of file diff --git a/webapp/feedback.html b/webapp/feedback.html index b37d4f9..e08a811 100644 --- a/webapp/feedback.html +++ b/webapp/feedback.html @@ -4,7 +4,7 @@ - + diff --git a/webapp/img/choicearrow.png b/webapp/img/choicearrow.png new file mode 100644 index 0000000000000000000000000000000000000000..eae59cc752b6abd7a2f78bed226023f3691f83c4 GIT binary patch literal 1586 zcmV-22F>}2P)WFU8GbZ8()Nlj2>E@cM*00ovwL_t(&-tC$DZ&PI$ z$G`1qH`aEo-RL&9flz`F6;046AVLTbhL;G5CWywUMEwEzL4*DY{=n@A1c{ucNxY@6=9uekFI&u}}`hJ0pxc&tb< zPl*-VR?a!#)(duk5U2{&A)eu0`}h63rjRw!f*4DzSL7-r_iwG>dPnCJ?5Jl5o@*ueKx5 zGcv1T2U-~TEncV!)I85{+wbQ)DKKlIqoR;_iBeL;akd^}JTWU_V`EV?S6e{kC??I@ zDIe*7X4y78QnLB+k+DJk6)_>AXvKnA2W&rUMzA-4{1V+~^pWO^Q~6Uo0X3vY$vcKI!Tp5**(GiG-c!8?#>+Bt+Ow)gkXO)d1OPp1c7e5>E^47#o7MvJToZ{e|wsj+5#76Vn3BnrJc+7=Kxe zC!+Q^QNeZ$-0B*pa89>-j6RUpOfmstxB7yOBQbLL)lg~ka08P~v zs15l;yr0{ZseL^ouNL|$-J{Ap<@O=h06aCWDgC3N2pUdYhg>0-Btcxun&^y`VpOJt zxdyhobenM@)7Z1>eyt%<5K(`;7GX97O_BBk`bcvvGH4lndBpp05craPMWK z#H2DkK*&B4HmomqaK6AUxk84*rA4=njjjPWs_LQ4%Ml5|)BTlh?tcLc09^f`yR5>v zl(G4qEi@Vc8DRdV7NQ_RU8vsaJ?b=PtBD}X)bKk$CG`(ji!2m3ppI|;}RNaUHmN_P+s kgO%@IQHDqM$TDJo0eZ8mo&wyZkN^Mx07*qoM6N<$f=cr76#xJL literal 0 HcmV?d00001 diff --git a/webapp/index.html b/webapp/index.html index 9d96a42..cb32404 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -6,8 +6,8 @@ - - + + diff --git a/webapp/install.html b/webapp/install.html index 664fe2e..183cbd9 100644 --- a/webapp/install.html +++ b/webapp/install.html @@ -679,7 +679,7 @@ $(document).ready(function() {   - +   diff --git a/webapp/install/installer.php b/webapp/install/installer.php index 21d3e3b..a289792 100644 --- a/webapp/install/installer.php +++ b/webapp/install/installer.php @@ -1497,6 +1497,25 @@ return false; } } +function updateUserTable1212_1213($prefix, $version, $dbname) { +$pdo = $this->pdo; +try { +if ($version != "1.2.12") { +$ret = $this->updateUserTable1211_1212($prefix, $version, $dbname); +if (!$ret) { +return false; +} +} + +DbUtils::overrulePrefix($prefix); + +$this->updateVersion($pdo, '1.2.13'); +return true; +} catch (PDOException $e) { +return false; +} +} + function setVersion($prefix,$theVersion) { $pdo = $this->pdo; try { @@ -1614,7 +1633,7 @@ $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VAL $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'billlanguage', $billlanguage)"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'currency', '$currency')"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'receiptfontsize', '12')"); -$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.2.12')"); +$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.2.13')"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'paymentconfig', '0')"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'remoteaccesscode', null)"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'decpoint', '$decpoint')"); @@ -1983,7 +2002,7 @@ $zones[] = $timezone_identifiers[$i]; echo json_encode($zones); } else if ($command == 'update') { -$installerVersion = "1.2.12"; +$installerVersion = "1.2.13"; $admin = new InstallAdmin(); $pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']); @@ -2013,7 +2032,7 @@ $supportedVersions = array("1.0.22","1.0.23","1.0.24","1.0.25","1.0.26","1.0.27" "1.0.40","1.0.41","1.0.42","1.0.43", "1.1.0","1.1.1","1.1.2","1.1.3","1.1.4","1.1.5","1.1.6","1.1.7","1.1.8", "1.1.9","1.1.10","1.1.11","1.1.12","1.1.13","1.1.14","1.1.15","1.1.16","1.1.17", "1.1.18","1.1.19","1.1.20","1.1.21","1.1.22","1.1.23","1.1.24","1.1.25","1.1.26","1.1.27","1.1.28","1.1.29","1.1.30", -"1.2.0","1.2.1","1.2.2", "1.2.3", "1.2.4","1.2.5","1.2.6","1.2.7","1.2.8","1.2.9","1.2.10","1.2.11" +"1.2.0","1.2.1","1.2.2", "1.2.3", "1.2.4","1.2.5","1.2.6","1.2.7","1.2.8","1.2.9","1.2.10","1.2.11","1.2.12" ); if (!in_array($version, $supportedVersions)) { @@ -2021,7 +2040,7 @@ echo json_encode("Quellversion nicht unterstützt"); return; } -$ret = $admin->updateUserTable1211_1212($_POST['prefix'], $version, $_POST['db']); +$ret = $admin->updateUserTable1212_1213($_POST['prefix'], $version, $_POST['db']); if(session_id() == '') { session_start(); diff --git a/webapp/kitchen.html b/webapp/kitchen.html index c9a902b..49736b0 100644 --- a/webapp/kitchen.html +++ b/webapp/kitchen.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/manager.html b/webapp/manager.html index 5acd26f..ca9b86b 100644 --- a/webapp/manager.html +++ b/webapp/manager.html @@ -5,7 +5,7 @@ - + @@ -159,7 +159,7 @@ var MAN_RES_NOTE = ["Reservierungsbestätigung","Confirmation reservation","Text var MAN_CHANGE_CONFIG_HEAD = ["Konfiguration ändern?","Change configuration?","Modificar configuración?"]; var MAN_CHANGE_CONFIG_CONTENT = ["Sollen folgende Werte geändert werden? ","Do you want to change these values? ","Debe ser cambiado estos datos? "]; -var MAN_RECEIPT_FONTSIZE = ["Schriftgröße Bon","Font size receipt","Tamaño de letra en tiques"]; +var MAN_RECEIPT_FONTSIZE = ["Schriftgröße Bon (Bildschirm)","Font size receipt (screen)","Tamaño de letra en tiques (pantalla)"]; var MAN_EMAIL_DATA = ["Email senden","Send email","Enviar email"]; var MAN_EMAIL_WRONG_FORMAT = ["Keine gültige Email-Adresse angegeben.","No valid email address.","Dirección de email invalida."]; var MAN_EMAIL_EMPTY = ["Keine Email-Adresse angegeben.","No email address given.","No hay ningún dirección de email."]; @@ -294,7 +294,9 @@ 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.", "The sales and log data is deleted and configuration is recreated. Therefore a log-in is required now.", "La configuración esta re-creado. Entonces es necesario registrar de nuevo."]; - +var MAN_GENSECTION_TXT = ["Allgemeine Einstellungen:","General settings:","Configuración general:"]; +var MAN_MOBILSECTION_TXT = ["Einstellungen für die Mobilansicht:","Settings for the mobil view:","Configuración para la vista mobil:"]; + var lang = 0; var generalVals = [12,2,0,3,0,1,1,0,0,1, 0,50,20,10,1,0,0,0,1]; @@ -457,6 +459,8 @@ function setLanguage(l) { $("#drinktemplatehint").html(MAN_DRINKTEMPLATE_HINT[l]); $("#digiprinthint").html(MAN_DIGI_PRINTWORK_HINT[l]); + $("#generalsectiontxt").html(MAN_GENSECTION_TXT[l]); + $("#mobilviewsectiontxt").html(MAN_MOBILSECTION_TXT[l]); } function createMonthSelection(label) { @@ -895,7 +899,7 @@ function areYouSure(text1, text2, button, callback) { function isNumeric(n) { return !isNaN(parseFloat(n)) && isFinite(n); } - + function startCreateClosing(remark) { if (unpaidTables.length == "") { hideClosingBtn(); @@ -2345,6 +2349,9 @@ $(document).on("pageinit", "#admin-page", function () { + +
MOBILANSICHT

+ +
+ +
+
+
diff --git a/webapp/paydesk.html b/webapp/paydesk.html index 12e9a2f..adec74f 100644 --- a/webapp/paydesk.html +++ b/webapp/paydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/php/admin.php b/webapp/php/admin.php index af33e06..70b2542 100644 --- a/webapp/php/admin.php +++ b/webapp/php/admin.php @@ -932,7 +932,7 @@ class Admin { $view = "preferences.html"; } - echo json_encode($view . "?v=1.2.12"); + echo json_encode($view . "?v=1.2.13"); } } @@ -1138,24 +1138,24 @@ 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.2.12"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.2.13"); }; } else { - if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.2.12"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.2.13"); }; } - if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.2.12"); }; - if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.2.12"); }; - if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.2.12"); }; + if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.2.13"); }; + if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.2.13"); }; + if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.2.13"); }; if ($_SESSION['modus'] == 0) { - if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.2.12"); }; + if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.2.13"); }; } - if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.2.12"); }; - if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.2.12"); }; - if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.2.12"); }; - if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.2.12"); }; - if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.2.12"); }; - if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.2.12"); }; - $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.2.12"); - $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.2.12"); + if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.2.13"); }; + if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.2.13"); }; + if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.2.13"); }; + if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.2.13"); }; + if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.2.13"); }; + if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.2.13"); }; + $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.2.13"); + $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.2.13"); } $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); @@ -1164,7 +1164,7 @@ class Admin { $waiterMessage = $this->getMessage(null, "waitermessage"); } // CAUTION: change version also in config.txt!!! - $mainMenuAndVersion = array ("version" => "OrderSprinter 1.2.12", + $mainMenuAndVersion = array ("version" => "OrderSprinter 1.2.13", "user" => $currentUser, "menu" => $mainMenu, "waitermessage" => $waiterMessage, diff --git a/webapp/php/queuecontent.php b/webapp/php/queuecontent.php index 88016bb..8769b4e 100644 --- a/webapp/php/queuecontent.php +++ b/webapp/php/queuecontent.php @@ -465,7 +465,7 @@ class QueueContent { $this->createAWorkReceiptAndQueueWorkPrint($pdo,$foodJobsPrinter1,$theTableid,0,1,$username,$lang); $this->createAWorkReceiptAndQueueWorkPrint($pdo,$foodJobsPrinter2,$theTableid,0,2,$username,$lang); $this->createAWorkReceiptAndQueueWorkPrint($pdo,$drinkJobsPrinter1,$theTableid,1,1,$username,$lang); - $this->createAWorkReceiptAndQueueWorkPrint($pdo,$drinkJobsPrinter2,$theTableid,1,1,$username,$lang); + $this->createAWorkReceiptAndQueueWorkPrint($pdo,$drinkJobsPrinter2,$theTableid,1,2,$username,$lang); } if ($declareReadyDelivered) { $this->declareReadyAndDelivered($pdo, $insertedQueueIds); diff --git a/webapp/preferences.html b/webapp/preferences.html index 8d8a7fb..fb54d2a 100644 --- a/webapp/preferences.html +++ b/webapp/preferences.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/products.html b/webapp/products.html index 40b40d4..5b7ca33 100644 --- a/webapp/products.html +++ b/webapp/products.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/rating.html b/webapp/rating.html index e078f56..7da10bc 100644 --- a/webapp/rating.html +++ b/webapp/rating.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reports.html b/webapp/reports.html index fbd09d3..c58939b 100644 --- a/webapp/reports.html +++ b/webapp/reports.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reservation.html b/webapp/reservation.html index 33f60dc..9754f1d 100644 --- a/webapp/reservation.html +++ b/webapp/reservation.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html index a0bb0ce..b573ba0 100644 --- a/webapp/supplydesk.html +++ b/webapp/supplydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/waiter.html b/webapp/waiter.html index d228719..015eb06 100644 --- a/webapp/waiter.html +++ b/webapp/waiter.html @@ -4,7 +4,7 @@ - + diff --git a/webapp/waiterdesktop.php b/webapp/waiterdesktop.php index be7018d..8eb7647 100644 --- a/webapp/waiterdesktop.php +++ b/webapp/waiterdesktop.php @@ -26,7 +26,7 @@ +function sendNewOrders(b){var a=getTableid();if(neworders.length!=0){var c={tableid:a,prods:neworders,print:(b?1:0),payprinttype:"s"};doAjax("POST","php/contenthandler.php?module=queue&command=addProductListToQueue",c,handleSentNewOrders,"Fehler bei Produktversand",false)}else{alert("Es sind keine Produkte ausgewählt worden.")}}function handleSentNewOrders(a){if(a.status!="OK"){alert("Es ist ein Fehler beim Versenden der Bestellung aufgetreten")}else{neworders=[];$("#search").val("");refreshGui()}}function refreshGui(){requestRoomInformation();clearProductsSelection();requestProdInformation();requestOrderedInformation();displayPanels()}function getTableid(){if(selectedroomindex!==null){if(selectedroomindex<0){return 0}else{if(selectedtableindex!==null){var a=roominfo.roomstables[selectedroomindex].tables[selectedtableindex];return a.id}else{return 0}}}}function enableSendButton(){}function disableSendButton(){}function moveItems(){$("#selectiondialog").dialog({autoOpen:false,modal:true,height:400,buttons:{Abbrechen:function(){$(this).dialog("close")}}});var a=getRoomsForDialog();$("#selectiondialog").html(a);$("#selectiondialog").dialog("open");$(".ui-dialog-buttonset .ui-button").css("background-color","#44ff44");$(".ui-widget-header").css("background-color","#ff4400");bindMoveItemsRoom()}function bindMoveItemsRoom(){$(".roomchangeitem").off("click").on("click",function(c){c.stopImmediatePropagation();c.preventDefault();var b=parseInt(this.id.split("_")[1]);var a=getTablesForDialog(b);$("#selectiondialog").dialog("open");$("#selectiondialog").html(a);bindMoveItemsTable(b)})}function bindRightButtons(){$("#sendNewOrders").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();sendNewOrders(false)});$("#paydeskbtn").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();if(neworders.length>0){if(waitergopayprint==1){sendNewOrders(true)}else{sendNewOrders(false)}}goPayDesk()});$("#workbtn").off("click").on("click",function(a){if(neworders.length>0){sendNewOrders(true)}});$("#goorderbtn").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();goOrderDesk()});$("#mainmenudlg").dialog({autoOpen:false,modal:true});$("#changetablebtn").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();moveItems()})}function bindMoveItemsTable(a){$(".tablechangeitem").off("click").on("click",function(c){c.stopImmediatePropagation();c.preventDefault();moveToRoomIndex=a;var b=parseInt(this.id.split("_")[1]);var d=roominfo.roomstables[a].tables[b];moveToTableId=d.id;if(selectedroomindex!="-1"){var d=roominfo.roomstables[selectedroomindex].tables[selectedtableindex];moveFromTableId=d.id;$("#selectiondialog").dialog("close");doAjax("GET","php/contenthandler.php?module=queue&command=getProdsForTableChange",{tableId:moveFromTableId},insertProductsToChangeTableDlg,null,true)}else{$("#selectiondialog").dialog("close")}})}function insertProductsToChangeTableDlg(a){if(a.status!="OK"){alert("Fehler");return}prodsToMove=a.msg;allselected=1;updateProdToMoveList();$("#selectallnothing").off("click").on("click",function(d){d.stopImmediatePropagation();d.preventDefault();allselected=1-allselected;for(var c=0;c"+c.productname+b+"";a+="
  • "+f+"
    • "}$("#productsToMoveList").html(a);$("#moveItemdslg").dialog({autoOpen:false,modal:true,height:600,width:800,buttons:{Abbrechen:function(){$(this).dialog("close")},Verschieben:function(){$(this).dialog("close");doMoveItems()}}});$("#moveItemdslg").dialog("open");handleClickOnMoveableProd()}function handleClickOnMoveableProd(){$(".prodToMoveEl").off("click").on("click",function(d){d.stopImmediatePropagation();d.preventDefault();var b=this.id.split("_")[1];var a=prodsToMove[b];var c=a["class"];if(c=="unselecteditem"){a["class"]="selecteditem"}else{a["class"]="unselecteditem"}updateProdToMoveList()})}function doMoveItems(){$("#moveItemdslg").dialog("close");var a=[];for(var e=0;e'+d.name+""}else{a+='
    '+d.name+"
    "}});var c=roominfo.takeawayprice.replace(".",decpoint)+" "+currency;if(c!=""){c='
    '+c+"
    "}if(selectedroomindex<0){a+='
    ';a+='
    Zum Mitnehmen
    ';a+=c;a+="
    "}else{a+='
    ';a+='
    Zum Mitnehmen
    ';a+=c;a+="
    "}$("#roompanel").html(a);$("#tablepanelcontent").html("");showRoomTableTextInfo();showTablesForRoomIndex();bindingRoom()}function getRoomsForDialog(){var b=roominfo.roomstables;var a="";$.each(b,function(d,c){a+='
    '+c.name+"
    "});return a}function bindingRoom(){$(".roomitem").off("click").on("click",function(b){b.stopImmediatePropagation();b.preventDefault();var a=parseInt(this.id.split("_")[1]);$("#changetablebtn").hide();if(panelMode=="waiter"){if(neworders.length>0){$("#unsentorderdlg").dialog({autoOpen:false,modal:true,height:400,buttons:{Nein:function(){$(this).dialog("close")},Ja:function(){$(this).dialog("close");discardChangeRoom(a)}}});$("#unsentorderdlg").dialog("open")}else{changeRoom(a);if(selectedroomindex=="-1"){startProductDisplay()}}}else{changeRoom(a);goPayDesk()}})}function discardChangeRoom(a){neworders=[];groupedNewOrders=null;showNewOrders();changeRoom(a)}function changeRoom(a){clearProductsSelection();selectedtableindex=null;selectedroomindex=a;showRooms()}function showRoomTableTextInfo(){var a="Keine Auswahl";if(selectedroomindex!==null){if(selectedroomindex<0){a="Zum Mitnehmen"}else{a="Raum: "+roominfo.roomstables[selectedroomindex].name;if(selectedtableindex!==null){var b=roominfo.roomstables[selectedroomindex].tables[selectedtableindex];a+=" - Tisch: "+b.name}}}$("#location").html(a)}function showTablesForRoomIndex(){if((selectedroomindex>=0)&&(selectedroomindex!==null)){var b=roominfo.roomstables[selectedroomindex].tables;var a="";$.each(b,function(d,e){if((selectedtableindex!=null)&&(b[selectedtableindex].id==e.id)){a+='
    '}else{a+='
    '}a+='
    '+e.name+"
    ";var f=e.pricesum;if(f!=0){var c=f.replace(".",decpoint)+" "+currency;a+='
    '+c+"
    "}a+="
    "});$("#tablepanelcontent").html(a)}else{$("#tablepanelcontent").html("")}bindingTable()}function getTablesForDialog(b){var c=roominfo.roomstables[b].tables;var a="";$.each(c,function(d,e){a+='
    '+e.name+"
    "});return a}function bindingTable(){$(".tableitem").off("click").on("click",function(b){b.stopImmediatePropagation();b.preventDefault();var a=parseInt(this.id.split("_")[1]);if(panelMode=="waiter"){$("#changetablebtn").show();if(neworders.length>0){$("#unsentorderdlg").dialog({autoOpen:false,modal:true,height:400,buttons:{Nein:function(){$(this).dialog("close")},Ja:function(){$(this).dialog("close");discardChangeTable(a)}}});$("#unsentorderdlg").dialog("open")}else{changeTable(a);startProductDisplay()}}else{changeTable(a);goPayDesk()}})}function discardChangeTable(a){neworders=[];groupedNewOrders=null;showNewOrders();changeTable(a)}function changeTable(a){selectedtableindex=a;showRoomTableTextInfo();showTablesForRoomIndex()}function startProductDisplay(){selectedtypeid=null;selectedprodid=null;clearProductsSelection();requestProdInformation();requestOrderedInformation();$("#search").val("");$("#searchpanel").show();$("#remarkpanel").show()}function clearProductsSelection(){neworders=[];groupedNewOrders=[];selectedtypeid=null;$("#groupchain").html("");$("#groupchoice").html("");$("#productspanel").html("");$("#remark").val("");$("#neworders").html("");$("#ordered").html("");$("#searchpanel").hide();$("#remarkpanel").hide()}var allOrderdItems=[];function requestOrderedInformation(){if(panelMode!="waiter"){return}var a=0;if(selectedroomindex!="-1"){var b=roominfo.roomstables[selectedroomindex].tables[selectedtableindex];a=b.id}doAjax("GET","php/contenthandler.php?module=queue&command=getJsonLongNamesOfProdsForTableNotDelivered&tableid="+a,null,insertOrderedInformation,true)}function insertOrderedInformation_old(b){var a="";$.each(b,function(c,d){a+='
    '+d.longname+"
    "});$("#ordered").html(a)}function insertOrderedInformation(b){allOrderdItems=b;var c=new Grouping(b,createTxtAssignedProd);c.group();var a="";a+=c.outputList(createListElOfAssignedProd);$("#ordered").html(a);bindOrderedItem()}function createTxtAssignedProd(d){var b="";if(d.option!=""){b="

    "+toHtml(d.option)+""}var e="";var c=toHtml(d.longname);if(d.togo==1){e="To-Go: "}c='

    '+e+''+c+"
    ";if(d.pricechanged==1){c+=" - "+d.price.replace(".",decpoint)}var a="";if(d.isready=="1"){a+=" ☞"}if(d.isCooking=="1"){a+=" ♨"}if(d.isPaid=="1"){a+=" ☑"}return c+'
    '+b+a+createExtraParagraphForOrderedEl(d.extras)+"
    "}function createListElOfAssignedProd(c){var b="";if("count" in c){if(c.count>1){b='
    '+c.count+"x
    "}}var a="
    "+b+createTxtAssignedProd(c)+"
    ";return a}function createExtraParagraphForOrderedEl(b){if((b==null)||(b=="")){return""}var d="";var c=[];for(var a=0;a"}return"

    "+c.join("
    ")}function bindOrderedItem(){$(".ordereditem-item-sent").off("click").on("click",function(f){f.stopImmediatePropagation();f.preventDefault();var b=this.id.split("_")[1];var g=allOrderdItems;for(var c=0;c=0){c[c.length]={id:g.id,name:g.name,amount:g.amount}}}}else{if(selectedtypeid!=null){var a=getType(selectedtypeid);for(var d=0;d'+c.name+"

    "}else{a+='
    '+c.name+"
    "}})}$("#groupchoice").html(a);showChain();bindType()}function bindType(){$(".groupitemchoice").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();$("#search").val("");selectedtypeid=parseInt(this.id.split("_")[1]);updateProductInfoDisplay()})}function showAllProdsToChoose(){var a="";if((selectedroomindex=="-1")||(selectedtableindex!=null)){var b=getAllProds(productFilter);$.each(b,function(c,d){a+='
    '+d.name;if((d.amount!="null")&&(d.amount<11)){a+=" ("+W_ONLY[lang]+" "+d.amount+")"}a+="
    "})}$("#productspanel").html(a);bindProduct();bindRemark()}function getTypeChain(){var b=getType(selectedtypeid);if(b==null){return[]}var d=[b];var c=false;while(!c){var a=b.ref;if((a==null)||(a==0)){c=true;break}else{b=getType(a);d[d.length]=b}}return d}function showChain(){var a="";if((selectedroomindex=="-1")||(selectedtableindex!=null)){var d=getTypeChain();a+='
    Auswahl
    ';for(var c=d.length-1;c>=0;c--){var b=d[c];a+='
    '+b.name+"
    "}}$("#groupchain").html(a);bindChain();bindSearch()}function bindChain(){$(".groupitem").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();selectedtypeid=parseInt(this.id.split("_")[1]);if(selectedtypeid=="-1"){selectedtypeid=null}updateProductInfoDisplay();$("#search").val("")})}function bindSearch(){$("#search").off("keyup").on("keyup",function(a){a.stopImmediatePropagation();a.preventDefault();productFilter=($("#search").val().trim().toLowerCase()).trim();if(productFilter==""){productFilter=null}showAllProdsToChoose()})}function bindProduct(){$(".productitem").off("click").on("click",function(d){d.stopImmediatePropagation();d.preventDefault();$("#search").val("");selectedprodid=parseInt(this.id.split("_")[1]);var c=$("#remark").val();var a=getProdEntry(selectedprodid);var b=a.extras;if((b!=null)&&(b.length>0)){showExtras(a,c)}else{addProductToNewOrders(selectedprodid,c,null,"NO",0)}})}function bindRemark(){$("#remark").off("click").on("click",function(c){if(genComments!=null){if(genComments.length>0){c.stopImmediatePropagation();c.preventDefault();var a="";for(var b=0;b"+toHtml(genComments[b].comment)+""}$("#commentschoice").html(a);$("#gencommentsdlg").dialog({autoOpen:false,modal:true,height:600,buttons:{Abbrechen:function(){$(this).dialog("close")},Anwenden:function(){$(this).dialog("close");applyComment()}}});$("#gencommentsdlg").dialog("open");$("#gencommentsdlg").css("height",genComments.length*52+150);$("#generalcommentfield").val("");$(".ui-dialog-buttonset .ui-button:nth-child(1)").css("background-color","#eeeeee");$(".ui-dialog-buttonset .ui-button:nth-child(1)").css("color","#ff0000");$(".ui-dialog-buttonset .ui-button:nth-child(2)").css("background-color","#00ff00");$(".ui-dialog-buttonset .ui-button:nth-child(2)").css("color","#000000");$(".ui-widget-header").css("background-color","#ff4400");bindCommentClick()}}})}function bindCommentClick(){$(".commentitem").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();$("#gencommentsdlg").dialog("close");$("#remark").val($(this).text())})}function applyComment(){$("#remark").val($("#generalcommentfield").val())}function getProdEntry(c){var a=productInformation.prods;for(var b=0;b0){b+="

    "+o.join("
    ")}else{b=""}var q=z+"-"+n+"-"+b;if(e!="NO"){q=z+"-"+n+"-"+b+e}if(k==1){q+=" - To-Go"}var h=y.joinedvals.indexOf(q);if(h>=0){y.count[h]=y.count[h]+1;idxarr=y.origidxs[h];idxarr[idxarr.length]=u;y.origidxs[h]=idxarr}else{var m=y.count.length;y.count[m]=1;y.joinedvals[m]=q;y.name[m]=z;y.price[m]=s;y.option[m]=n;y.extras[m]=b;y.prodids[m]=p;y.changedPrices[m]=e;y.togos[m]=k;y.origidxs[m]=[u]}}return y}function showNewOrders(){groupedNewOrders=group(neworders);var f="";var l=groupedNewOrders.count.length;for(i=0;i1){k=""+g.toString()+"x "+k}var e=groupedNewOrders.prodids[i];if(h!=""){h="

    "+toHtml(h)+"

    "}var b=groupedNewOrders.changedPrices[i];var c=groupedNewOrders.togos[i];var m="";var d=groupedNewOrders.extras[i];if((d!=null)&&(d!="")){m=""+d+""}var a="";if(b!="NO"){if(c!=0){a="
    ("+b.replace(".",decpoint)+" "+currency+" - To-Go)"}else{a="
    ("+b.replace(".",decpoint)+" "+currency+")"}}else{if(c!=0){a="
    (To-Go)"}}f+='
    '+k+h+m+a+"
    "}$("#neworders").html(f);$("#remark").val("");if(neworders.length>0){enableSendButton()}else{disableSendButton()}bindNewOrderItem();displayRightButtons()}var roominfo=null;var selectedroomindex=null;var selectedtableindex=null;var productInformation=null;var selectedtypeid=null;var selectedprodid=null;var neworders=[];var groupedNewOrders={count:[],joinedvals:[],name:[],prodids:[],extras:[],origidxs:[],changedPrices:[],togos:[]};var workflowconfig=0;var decpoint=".";var currency="";var rightchangeprice=0;var rightpaydesk=false;var supplyright=0;var prominentsearch=0;var discount1=50;var discount2=20;var discount3=10;var waitergopayprint=0;var mainmenu=[];var version="";var loggedinUser="";var lang=0;var payments="";var hostTemplate="";var cancelunpaidcode="";var WORKFLOW_DIGI_AND_WORK=0;var WORKFLOW_DIGI=1;var WORKFLOW_WORK=2;var WORKFLOW_WORK_TRANSFER=3;var productFilter=null;var prodsToMove=[];var allselected=0;var moveFromTableId=null;var moveToRoomIndex=null;var moveToTableId=null;var panelMode="waiter";var genComments=null;var W_SELALL=["Alles auswählen","Select all","Elegir todo"];var W_UNSELALL=["Alles abwählen","Unselect all","No elegir nada"];var W_NO_PRODS_SELECTED=["Es wurden keine Produkte ausgewählt!","You have not chosen any products!","No ha seleccionado ningún producto!"];var W_ONLY=["noch","only","sólo"];var P_CASHACTION_OK=["Kassenaktion abgeschlossen.","Action completed.","Acción terminado."];$(document).ready(function(){selectedroomindex=null;productFilter=null;doAjax("GET","php/contenthandler.php?module=admin&command=getWaiterSettings",null,insertWaiterConfig,"Fehler Konfigurationsdaten",true);doAjax("GET","php/contenthandler.php?module=admin&command=getJsonMenuItemsAndVersion",null,saveMenuInfo,null,true);getGeneralConfigItems();intervalGetItemsToPayAndRoomInfo(10);getMenuInBackground(60);getPayments(savePayments);getHostTemplate();intervalGetPrinterStatus(5);intervalGetGeneralComments(10)});function savePayments(a){payments=a}function intervalGetItemsToPayAndRoomInfo(b){var a=setInterval(function(){getAndShowPayItems();requestRoomInformation();requestOrderedInformation()},b*1000)}function intervalGetGeneralComments(b){doAjax("GET","php/contenthandler.php?module=products&command=getAllGeneralComments",null,fillGenCommentsList,null,true);var a=setInterval(function(){doAjax("GET","php/contenthandler.php?module=products&command=getAllGeneralComments",null,fillGenCommentsList,null,true)},b*1000)}function getMenuInBackground(b){var a=setInterval(function(){requestProdInformation()},b*1000)}function insertWaiterConfig(c){var a=c.isUserLoggedIn;if(a!=1){setTimeout(function(){document.location.href="index.html"},250)}else{var b=c.config;workflowconfig=b.workflowconfig;decpoint=b.decpoint;currency=b.currency;rightchangeprice=c.rightchangeprice;supplyright=c.supplyright;prominentsearch=b.prominentsearch;waitergopayprint=b.waitergopayprint;discount1=b.discount1;discount2=b.discount2;discount3=b.discount3;rightpaydesk=c.rightpaydesk;if((b.cancelunpaidcode!=null)&&(b.cancelunpaidcode!="")){cancelunpaidcode=b.cancelunpaidcode}else{cancelunpaidcode=""}initializeOrderView()}}function fillGenCommentsList(a){if(a.status!="OK"){alert("Fehler "+a.code+": "+a.msg);return}genComments=a.msg}function initializeOrderView(){panelMode="waiter";initGui();clearProductsSelection();requestRoomInformation();requestProdInformation();bindMainMenuButton();bindRightButtons()}function getHostTemplate(){$.ajax({url:"customer/bon-bewirtungsvorlage.html",async:false,success:function(a){hostTemplate=a},error:function(a){},cache:false})}function saveMenuInfo(a){if(a.loggedin==1){loggedinUser=a.user;$("#loggedinuser").html(" "+loggedinUser);$("#versioninfo").html(a.version);version=a.version;$.each(a.menu,function(d,c){var b=c.name;var e=c.link;mainmenu[mainmenu.length]={name:b,link:e}});$("#mainmenubtn").show()}else{$("#mainmenubtn").hide()}}function bindMainMenuButton(){$("#selectiondialog").dialog({autoOpen:false,modal:true,height:400,buttons:{Anwenden:function(){$(this).dialog("close");applyExtras()}}});$("#unsentorderdlg").dialog({autoOpen:false,modal:true,height:400,buttons:{Nein:function(){$(this).dialog("close")},Ja:function(){$(this).dialog("close")}}});$("#actmenudlg").dialog({autoOpen:false,modal:true,height:400});$("#mainmenudlg").dialog({autoOpen:false,modal:true,height:400,width:200,position:{my:"right top",at:"right top",of:"body"},buttons:{Abbrechen:function(){$(this).dialog("close")}}});$("#ordereditemdlg").dialog({autoOpen:false,modal:true,height:400,width:200});$("#moveItemdslg").dialog({autoOpen:false,modal:true,height:400,width:200});$("#mainmenubtn").off("click").on("click",function(d){d.stopImmediatePropagation();d.preventDefault();var b="
      ";for(var c=0;c"+toHtml(mainmenu[c].name)+""}b+="
    ";$("#mainmenudlg").html(b);var a=280+mainmenu.length*40;$("#mainmenudlg").dialog({autoOpen:false,modal:true,height:a,width:200,position:{my:"right top",at:"right top",of:"body"},buttons:{Abbrechen:function(){$(this).dialog("close")}}});$("#mainmenudlg").dialog("open");$(".mainmenuitem").off("click").on("click",function(h){h.stopImmediatePropagation();h.preventDefault();var g=parseInt(this.id.split("_")[1]);var f=mainmenu[g].link;$("#mainmenudlg").dialog("close");setTimeout(function(){document.location.href=f},250)})})}function goOrderDesk(){panelMode="waiter";initGui();clearProductsSelection();requestProdInformation();requestOrderedInformation()}function goPayDesk(){panelMode="paydesk";initGui();startCashProcess()}function initGui(){displayPanels();displayRightButtons()}function displayPanels(){if(panelMode==="waiter"){$("#panelmodetxt").html("Bestellung");$("#groupchain").show();$("#groupchoice").show();$("#searchpanel").show();$("#productspanel").show();$("#remarkpanel").show();$("#ordered").show();$("oben").html("");$("#oben").hide();$("#unten").html("");$("#unten").hide();$("#receiptpanel").hide();$("#paybuttonpanel").hide();$("#receiptpanel").hide()}else{$("#panelmodetxt").html("Kasse");$("#groupchain").hide();$("#groupchoice").hide();$("#searchpanel").hide();$("#productspanel").hide();$("#remarkpanel").hide();$("#ordered").hide();$("oben").html("");$("#oben").show();$("#unten").html("");$("#unten").show();$("#goorderbtn").show();$("#receiptpanel").show();$("#paybuttonpanel").show();$("#receiptpanel").show()}}function displayRightButtons(){$("#changetablebtn").hide();if(panelMode==="waiter"){if(rightpaydesk==1){$("#paydeskbtn").show()}$("#hostbutton").hide();$("#cashbutton").hide();$("#paydeskcash").hide();$("#paydeskprint").hide();$("#goorderbtn").hide();if(neworders.length>0){if((workflowconfig==WORKFLOW_DIGI_AND_WORK)||(workflowconfig==WORKFLOW_WORK)||(workflowconfig==WORKFLOW_WORK_TRANSFER)){$("#workbtn").show()}if((workflowconfig==WORKFLOW_DIGI_AND_WORK)||(workflowconfig==WORKFLOW_DIGI)||(workflowconfig==WORKFLOW_WORK_TRANSFER)){$("#sendNewOrders").show()}}if((selectedtableindex!=null)&&(neworders.length==0)){$("#changetablebtn").show()}}else{$("#paydeskbtn").hide();$("#hostbutton").show();$("#cashbutton").show();if(prodsaccounted.length>0){$("#paydeskcash").show();$("#paydeskprint").show();$("#goorderbtn").show()}$("#workbtn").hide();$("#sendNewOrders").hide()}}var e_extras=[];var e_extras_selection=[];var e_prod=null;var e_option=null;function showExtras(a,c){e_prod=a;e_option=c;e_extras=a.extras;e_extras_selection=[];for(var b=0;b"+toHtml(c)+""}else{a+="
  • "+toHtml(c)+"
    • "}}a+="";$("#selectiondialog").html(a);$(".ui-dialog-buttonset .ui-button").css("background-color","#44ff44");$(".ui-widget-header").css("background-color","#ff4400");bindExtra()}function bindExtra(){$(".extraitem").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();extraClicked(parseInt(this.id.split("_")[2]))});$(".extraitemselected").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();extraClicked(parseInt(this.id.split("_")[2]))})}function extraClicked(a){if(e_extras_selection[a]){e_extras_selection[a]=false}else{e_extras_selection[a]=true}displayExtras()}function applyExtras(){var b=[];for(var d=0;d0){actcount--}}else{if(b==="actplusbtn"){actcount++}else{if(b==="actdiscount1btn"){actprice=origprice-origprice*discount1/100;var a=actprice.toFixed(2).replace(".",decpoint);$("#actpricefield").val(a);$("#actpriceinfo").html(a+" "+currency)}else{if(b==="actdiscount2btn"){actprice=origprice-origprice*discount2/100;var a=actprice.toFixed(2).replace(".",decpoint);$("#actpricefield").val(a);$("#actpriceinfo").html(a+" "+currency)}else{if(b==="actdiscount3btn"){actprice=origprice-origprice*discount3/100;var a=actprice.toFixed(2).replace(".",decpoint);$("#actpricefield").val(a);$("#actpriceinfo").html(a+" "+currency)}}}}}insertDataIntoActDialog()})}function changeAllNewOrders(){actionNewOrderConfirm(CHANGE_ALL)}function changeOneNewOrder(){actionNewOrderConfirm(CHANGE_ONE)}function delNewOrderItem(){actcount=0;actionNewOrderConfirm(CHANGE_ALL)}function actionNewOrderConfirm(g){var c=selectedEntry;if(rightchangeprice==1){var e=$("#actpricefield").val().trim();e=e.replace(",",".");if(e>999.99){alert("Maximaler Preis für das Produkt überschritten");return}if(e==""){e="NO"}else{if(!$.isNumeric(e)){alert("Es wurde ein falsches Zahklenformat angegeben");return}else{actprice=e;$("#actpricefield").val("")}}}else{e="NO"}var f=$("#acttogocheckbox").prop("checked");if(f){f=1}else{f=0}if(g==CHANGE_ONE){var a=c.origidxs;neworders[a[0]].option=$("#actremarkfield").val();neworders[a[0]].changedPrice=e;neworders[a[0]].togo=f}else{var a=c.origidxs;for(l=0;l0){var a=c.origidxs;var p=a[0];var k=neworders[p].prodid;var e=neworders[p].changedPrice;var f=neworders[p].togo;var m=neworders[p].option;var h=neworders[p].extras;for(l=0;l=0){if(selectedtableindex!=null){var b=roominfo.roomstables[selectedroomindex].tables[selectedtableindex];a=b.id;taxtype="normal"}else{a=null}}else{tabeid=0;taxtype="togo"}}else{a=null}if(a!=null){doAjax("GET","php/contenthandler.php?module=queue&command=getJsonProductsOfTableToPay",{tableid:a},showProductsToPay,"Fehler bei der Datenübermittlung",true)}else{prodsToPayList=[];displayProdsToPayForTable();displayProdsOnReceipt()}}}function showProductsToPay(a){if(a.status!="OK"){alert("Fehler");return}prodsToPayList=a.msg;displayProdsToPayForTable();displayProdsOnReceipt()}function displayProdsToPayForTable(){bindHostButton("#hostbutton");bindCashButton();if(prodsToPayList.length==0){$("#oben").html("Keine weiteren Artikel vorhanden.")}else{prodsToPayListGrouping=new Grouping(prodsToPayList,createHashOfPayableItem);prodsToPayListGrouping.group();var a=prodsToPayListGrouping.outputList(createPayableItemListElement);$("#oben").html(a)}$(".payable").off("click").on("click",function(c){c.stopImmediatePropagation();c.preventDefault();var g=this.id;var f=$(".payable").index(this);var d=prodsToPayListGrouping.sortedset[f];var b=aProdToPayIsClicked(d);updateAccounted(g,b,d.count);displayProdsOnReceipt()});$("#payall").off("click").on("click",function(g){g.stopImmediatePropagation();g.preventDefault();for(var b=0;b'+e.name+"";if(!b){c+="

    ";b=true}}});c+='
    '+P_CANCEL[lang]+"
    ";$("#selectiondialog").html(c);var d=600;if(paymentconfig==1){d=380}$("#selectiondialog").dialog({autoOpen:false,modal:true,height:d,buttons:{Abbrechen:function(){$(this).dialog("close")}}});$("#selectiondialog").dialog("open");bindPayment()}function bindPayment(){$(".paymentcancel").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();$("#selectiondialog").dialog("close")});$(".paymentitem").off("click").on("click",function(a){a.stopImmediatePropagation();a.preventDefault();var b=this.id.split("_")[1];$("#selectiondialog").dialog("close");startPayProcess(b)})}function updateAccounted(c,a,b){if(a===b){$("#"+c).removeClass("paystillopen");$("#"+c).removeClass("payallaccounted");$("#"+c).addClass("payallaccounted")}else{$("#"+c).removeClass("paystillopen");$("#"+c).removeClass("payallaccounted");$("#"+c).addClass("paystillopen")}if(a===0){$("#"+c+" .payitemaccounted").html("")}else{$("#"+c+" .payitemaccounted").html(a)}}function getProdAccountedEntry(c){var e=createHashOfPayableItem(c);for(var a=0;a1){e=f.count+"x ";c=f.count}}var b=false;var a=getProdAccountedEntry(f);var g="";if(a!==null){if(a.count!=0){g=a.count}if(a.count==c){b=true}}var d="";if(b){d='
    '+e+createHashOfPayableItem(f)+"
    "+g+"
    "}else{d='
    '+e+createHashOfPayableItem(f)+"
    "+g+"
    "}return d}function createOnReceiptItemListElement(c){var b="";if("count" in c){if(c.count>1){b=c.count+"x "}}var a='
    '+b+createHashOfPayableItem(c)+"
    ";return a}function getProdOfAllProdsWithHash(d){var b=prodsToPayListGrouping.sortedset;for(var a=0;a";$("#receiptpanel").html(c);calcSum();var h=$("#receiptpart").html();$("#info-page").data("receipthtml",h);displayRightButtons()}function getTableName(){if(selectedtableindex!=null){var a=roominfo.roomstables[selectedroomindex].tables[selectedtableindex];return a.name}else{if(selectedroomindex=="-1"){return"Zum Mitnehmen"}else{return null}}}function createReceiptHeader(){var a=genCreateReceiptHeader(0,"",getTableName(),loggedinUser,currency);return a}function createReceiptFooter(b,c,a){var d=genCreateReceiptFooterNoSum(b,0,"",a);return d}function getQueueIdsDueToCountOfItem(f){var d=[];var g=f.hash;var e=f.count;for(var b=0;b=e){break}}}return d}function startPayProcess(p){var l=getTableName();var e=0;if(selectedroomindex!=-1){if(selectedtableindex!=null){var h=roominfo.roomstables[selectedroomindex].tables[selectedtableindex];e=h.id}else{e=0}}var g=$("#info-page").data("usst");if($("#info-page").data("taxtype")=="togo"){g=$("#info-page").data("togotax")}checkForLogIn();var d=[];var o=prodsOnReceiptList;var n=prodsaccounted;var m=prodsOnReceiptListGrouping;for(var k=0;k";printContent(s)}}startCashProcess()}}else{alert("Fehler: "+c)}},error:function(a){alert("Sorry, there was a problem! "+a)}})}var P_DESCR=["Beschreibung","Description","Descripción"];var P_PRICE=["Preis","Price","Precio"];var P_TOTAL=["Total","Total","Total"];var P_ID=["Id:","Id:","Id:"];var P_ROOMSEL=["Raumauswahl","Room selection","Selección de espacio"];var P_PAYDESK_ACTIONS=["Kassenaktionen","Paydesk actions","Acciones de caja"];var P_BAR_INPUT=["Bareinlage","Input money","Insertar dinero"];var P_BAR_GET=["Barentnahme","Take money","Sacar dinero"];var P_BAR_SUM=["Einnahmen","Revenue","Cobro"];var P_TITLE=["Kasse","Paydesk","Caja"];var P_TABLE=["Tisch","Table","Mesa"];var P_TABLE_SEL=["Tischauswahl","Select table","Qué mesa?"];var P_NOT_PAID=["Ausstehend für ","Not paid for ","Impagado para "];var P_ALL=["Alles","All","Todo"];var P_CONTENT_RECEIPT=["Inhalt Kassenbon","Content of receipt","Contenido del tique"];var P_ONLY_PAY=["Nur Zahlung","Only pay","Solo pagar"];var P_PAY_PRINT=["Bondruck","Pay+Print","Pagar+Imprimir"];var P_CHANGE_CALC=["Wechselgeldrechner:","Change Calculator:","Calculadora de Cambio:"];var P_CHOOSE_PAYWAY=["Auswahl der Zahlungsart:","Selection of method of payment:","Selección del modo de pago:"];var P_CANCEL=["Abbrechen","Cancel","Cancelar"];var P_CASHTAKEOUT=["Barentnahme aus der Kasse","Cash take-out","Sacar dinero"];var P_CASHTAKIN=["Bareinlage in die Kasse","Cash insert","Insertar dinero"];var P_AMOUNT=["Betrag:","Amount:","Valor:"];var P_OVERVIEW=["Übersicht Kellnerkasse","Overview waiter purse","Resumen cartera de bolsillo"];var P_PUT_IN=["Einlegen","Insert","Insertar"];var P_TAKE_OUT=["Entnehmen","Take out","Sacar"];var P_OVERV_DETAILS=["Diese Übersicht enthält die Bar-Bewirtungseinnahme durch den Kellner seit der letzten Tageslosung sowie als weiteren Wert den Kassenstand unter Berücksichtigung der eigenen Eingaben und Entnahmen.","This overview contains the cash amount of money of this waiter since the last closing as well as the total amount of money including the own cash insert and take-out actions.","Este resumen contiene todo el dinero al contado por cobro para el camarero, y también el dinero incluido con acciones de insertar y sacar."];var P_CASH_SUM=["Bewirtungseinnahmen:","Cash by payment:","Cobro:"];var P_INCLUDE_OWN=["inkl. eigener Kassen-Eingaben/Entnahmen:","incl. own cash insert/take-outs:","incl. tomas y entradas proprias:"];var P_NO_ELEM=["Keine Rechnungselemente","No items selected","Ningún producto selecionado"];var P_NO_ELEM_DETAILS=["Es wurden keine abrechenbaren Produkte festgelegt (der Bon ist leer!).","There are no selected items. The receipt is empty!","No hay ningún elemento seleccionado para pagar."];var P_CASHACTION_OK=["Kassenaktion abgeschlossen.","Action completed.","Acción terminado."];var P_NAV=["Navigation","Navigation","Navigación"];var P_ORDER_ACTION=["-> Bestellansicht","-> Order view","-> Vista de Orden"];var P_TO_PAY=["Zu zahlen: ","To pay: ","Pagar total: "];var P_PAY_RETURN=["Zurück: ","Return: ","Torna: "];var P_CALC_PAYBACK=["Berechne","Calculate","Calcular"];var P_HAS_PAID=["Bezahlt: ","Paid: ","Pagado: "];var P_TOGO=["Außer-Haus-Verkauf","Sale with Tax No 2","Venta IVA 2"];var P_TIP=["nur Trinkg.: ","Only tip: ","Solo prop.: "];var P_TOTAL_INCL_TIP=["Zielbetrag:","Target pay:","Quiere pagar:"];var CALC_TIP_TXT=["Angabe extra Trinkg.","Do Tip separate","Propina individual"];var CALC_TOTAL_TXT=["Angabe inkl.Trinkg.","Do Tip incl.","Propina incl."];var showHostTemplate=false;function getGeneralConfigItems(){doAjax("GET","php/contenthandler.php?module=admin&command=getGeneralConfigItems",null,insertGeneralConfigItems,"Fehler Konfigurationsdaten")}function getPayments(a){doAjax("GET","php/contenthandler.php?module=admin&command=getPayments",null,a,"Fehler Zahlungswege")}function insertGeneralConfigItems(b){if(b.status=="OK"){var a=b.msg;decpoint=a.decpoint;$("#info-page").data("decpoint",a.decpoint);currency=a.currency;var d=a.tax;var c=d.replace(".",decpoint);$("#info-page").data("usstGerVal",c);$("#info-page").data("usst",d);d=a.togotax;c=d.replace(".",decpoint);$("#info-page").data("togoTaxGerVal",c);$("#info-page").data("togotax",d);$("#info-page").data("companyinfo",a.companyinfo);$("#info-page").data("payPrintType",a.payprinttype);$("#info-page").data("currency",a.currency);$("#info-page").data("billlanguage",a.billlanguage);$("#info-page").data("userlanguage",a.userlanguage);receiptfontsize=parseInt(a.receiptfontsize);$("#receiptpart").css("font-size",receiptfontsize+"px");paymentconfig=a.paymentconfig;$("#curtopay2").html(" "+a.currency);workflowconfig=a.workflowconfig;digigopaysetready=a.digigopaysetready;setLanguage(a.userlanguage)}else{$("#contentpart").hide();setTimeout(function(){document.location.href="index.html"},250)}}function addEntryOrIncreaseCount(a,e){var c=0;var f=false;var d=e.prodid+"-"+e.extras.join("_")+e.price+"-"+e.pricelevelname+"#"+e.tax+"_"+e.togo;for(c=0;cID:"+d+"";f+=' ";f+=""+c+"";f+=" ";f+=""+P_NO[b]+""+P_DESCR[b]+""+P_PRICE[b]+""+P_TOTAL[b]+"";return f}function genCreateReceiptFooterNoSum(c,d,b,a){return genCreateReceiptFooter(c,d,b,"","","",a)}function genCreateReceiptFooter(a,e,b,h,d,l,m){var c='style="border: solid black 0px;padding: 3px;text-align:right;vertical-align:bottom;"';var o='style="text-align:center;vertical-align:bottom;"';var g=" ";var n=g;n+=""+P_MWST[e]+"% "+P_MWST[e]+""+P_NETTO[e]+""+P_BRUTTO[e]+"";for(var k=0;k"+h+'"+d+'"+l+""}n+=g;n+="   "+P_SUM[e]+'"+l+"";n+=g;n+="
     
    ";n+=toHtml(b).replace(/(?:\r\n|\r|\n)/g,"
    ");n+="
    ";return n}function generateOneProdLine(k,f,h,a,n,e){var b='style="border: solid black 0px;padding: 3px;text-align:right;vertical-align:bottom;"';var g='style="border: solid black 0px;padding: 3px;text-align:center;vertical-align:bottom;"';var c=(parseFloat(h)).toFixed(2).replace(".",n);if(a!="A"){f+=" ("+a+")"}if(e==1){f="To-Go: "+f}var m=k*h;var l="";var d='style="white-space: nowrap;overflow: hidden;text-overflow:ellipsis;width: 60%;"';l+="'+k+""+f;l=l+""+c;l+=""+m.toFixed(2).replace(".",n)+"";return l}function generateProdPartByDbContent(e,d){var c=0;tablecontent="";for(c=0;c