From d078a57b904ae1d71768d55d3cbda02732a3ff60 Mon Sep 17 00:00:00 2001 From: Geno Date: Thu, 19 Nov 2020 22:52:43 +0100 Subject: [PATCH] OrderSprinter 1.1.6 --- javaprinter/config.json | 2 +- javaprinter/javaprinter.jar | Bin 42351 -> 42350 bytes printserver/OrderSprinterPrintserver.exe | Bin 252928 -> 253440 bytes webapp/OrderSprinterPrintserver.exe | Bin 252928 -> 253440 bytes webapp/bar.html | 2 +- webapp/bill.html | 2 +- webapp/css/numfield.css | 30 +++++++ webapp/elements/product.js | 4 +- webapp/elements/tablemap.js | 2 +- webapp/feedback.html | 2 +- webapp/index.html | 99 ++++++++++++++++++++++- webapp/install.html | 2 +- webapp/install/installer.php | 41 +++++++++- webapp/kitchen.html | 2 +- webapp/kitchenbar.js | 24 ++---- webapp/manager.html | 2 +- webapp/paydesk.html | 2 +- webapp/php/admin.php | 26 +++--- 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 +- 25 files changed, 203 insertions(+), 53 deletions(-) mode change 100644 => 100755 printserver/OrderSprinterPrintserver.exe mode change 100644 => 100755 webapp/OrderSprinterPrintserver.exe create mode 100644 webapp/css/numfield.css diff --git a/javaprinter/config.json b/javaprinter/config.json index cb8a75b..ad87635 100644 --- a/javaprinter/config.json +++ b/javaprinter/config.json @@ -14,7 +14,7 @@ "printfoodtickets2" : 1, "printdrinktickets2" : 1, "escinits" : [ 27, 64, 27, 116, 0 ], - "escposts" : [ 27,64,29,86,65,10], + "escposts" : [ 29, 86, 66, 10, 27, 64], "useeveryprintdevice" : 1, "verbose_closing_summary" : 1, "smallformat" : 0, diff --git a/javaprinter/javaprinter.jar b/javaprinter/javaprinter.jar index db96110f02867e9fd7ab11b864d6effcde66e132..865e6ff8cccc0be48bb5d654b50c81e05812c056 100644 GIT binary patch delta 1964 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 E50iwurvLx| diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe old mode 100644 new mode 100755 index 90469ad6250ede0f6577d7dbf13e04967f128785..c7ee344c6379fe18c1b0fc834fd2cb103de31b43 GIT binary patch delta 2666 zcmchZZERFk8pogKoIBIbrF8l>oq?8i3e>9iPU*CrzU)S&w$(NbNwLmQ)@&7bfg%Nw zmX|7JhDe|R3B?QCRw+od67_?GQ3sP6w#X{58>PF5MF}a1M0QCPgqkH;)aRZ%9cL0h zdz15j&hLL-=A7r=d*+6Y+e5?lzTVjxd}jcn*EleohRFaIIDpkOS5NMFJCN$0+$yVm`ykD*WRfydm!Gn$Lv?) z?KHB3=5M|l@2AJQABeXzV)kIXof)$a#@ksj`;cMhM7QaP*{_M-`B6VR<{vivyr}Ke zW^_D3Pa|Yf;$|=aHQdut#LyESTKy$rakytqKH|La;By?YL_56pAL!Lqb?(Gc?M|nH zWm;j^>sYRx=_*5C_-@xC#0t&7UdKvpV*Qg?r7hTS3#-F58&~3sN4vKl?Z(K_ZdU&F z1Iq?JIfAK!^5#71Z>*zuoA@QYz|R%S zTtcV5(9fL~iK^B5DnHLjpGj4uLT|Qs0j-e%KdCL?h<-Xjr_lr{}UA#z6F$g@ZJZo5U0p_e>{~af+AP{#A~cg<@f)^mWho*+k|!s z?G-vG^qA03gayGqp>-PF~b6-Ju+_zZ?XoVm-YeMTmhB|Cm?(06ft%J%1nZM zhmD1)HAe8%mTxXOgIItyA9d`BZ4;enRHRmCS{L_Hys{! z3UXgIXdC=Yjc1|AB(b!!Fz;o3ZaZHcY!L2#*pa=IU4-*d8qDrsmjERwn+$?By#a1^!6Wl{24xtJ+0`0b$otsyAt3v(kn`mTq6xDDRQF} zU^m%9(l+Qui#p5~N_I6vUM%IR4$@+^fV57%hx9SEgmkg$BVDHcfpjJLOK5DP{2>Hb zC+SzSzDP2(o9g{)CfL|sw~aj~{dHEKJOT%T?g1Quchvo|7mUSw!Pwpi4Q_)1cu##> zzQaCJkCA>X^bF|;e6D^V7sE>Uo^&TXJ*}7?zLlg;2&WS~RDTf`kt#4seaeLYN1?Sa zNlugSTL6o4>b`BjbZi;jD#%{hSXN|4LcEt9X?UrqZtjM);vmB5&%RA&( zt^e2>ly1g>qOEj+acR0w(GW9&T(8psNohYr8Byg zC*g#mKlMD{)O2GTz;sOB4v>m&Qae_WreQN_I<}K$V2Csm`$@C#D5(QalV;;MsS~A; zaTp?4^{dbG_q}5(z;RlaBy=EviLzx+(Z9bDK%us2DDl=5;HOBA~5%l>(+<~Qf8cnR<^Cow& z(z3_{Z}KiTRz!|{!XIO4+wQg=Jjd$m4=*kH>A}&(d6BF$yxm6GPY?A)_Wg_hK>tyC z?|H6fG(_vd)ZKduvN?Uu>DSNmkM-0GJY=&{hKzh!Bl-nS-)0q&$uId4V~W9x Syo|!=MPA9)_`=?;KjJSmUOaXH delta 2196 zcmZve3vf(V7{|YJ&b_;PZ&tWnktLFBM5w)4wRw589b!Xew2H786{YDA&p`-bB`MU5Y{x-m^lGGXd5CG{pXbePhP4iTozsDAhCs_abf&i&u>`+xU4`<-*o zp1URW9ZTvuR;=q$)N`#DLdPwjB!XA~E;0a9(2RUsdB7WaxRt>KZU}IdRVLW91Tt0b zd;#xspnXx>KvZ&B`;PP`*R`9ZNAHK2U>qaxq#(lag$&w?0SvbUJ3piYbh<$`WlbOd zX!=LDNO`jrfcTOC1R5`EBVwD0taXc9O=SPBxG4nTMf~pwcOA_FZ6f}P z0>Ya!0A%0pb~&;l^BQGdqwM?Ah{c6ctlINAlOr1d+B2`$e*-qHW6@Hz^aO(wG~AqP*FtFZoGTA7eL}lTwlEbKEkJ(m{YJYf8LBm z#+@s20Df|yH$Dfl3UDQ%m-ycJ>@2*FL*A_uFH^-tM62%hvS`s*cZ2i~yevlPh)seg zu5-Q|#lSKz>(7$&oGm003Y`urL%lPnn+(sAatd6S%rZ?xON zvr^cJ*nDus!xoZbOz6(0;Q{~mM>qwZnU zGmMhMC@qZMslwlJ@Npfa_u&0t5N<~wq4(i74mWSL9%4nPt(V+AVh=h=a7nY7{-Gm>@}nfJ_`kN z?77ee8$*~>>SasVkm6NNFUu6FoiTEzQ0H{W z*@BloqGM2VVHqK6JsTrLsJ-M#f?e%{>QvKFhp2;4N2yt;FOxd8R$>L+$r)= z@Y1!Y*JCf44c(0GD%A!Ot#U|ofshxwM{a=HVn+>WfPLx#*$qbVZZL+|fXTU#0Eg5c z**Au7>a7H~X_l4QOBKpEcSc0lSG3sRQEP_mIuY%dAD%{08Q@Q^(R}V<& zkK}$1knVvKh3p^|9XPj%dT9}x5Ia*^Emcb2OTS5G*(DE_C&+p7EP0E(Q$8r4*B=+L zxf$o2qlNjxTEQjei-KvTsoZqRbl&v9Tq^mc>(Wcf!x(9C63ApCN$Ens!_4HqQ?Fjm zR!BmLvFQ*H^(iaZ5!Xc(pbo#>*oO#iZWFIl-gX+VFWk=JAQorB0X^_c40wF(Swf=6 zlQM94N>+xe|ImIOS6W8qP}jhr?o^jM)svDo+>?<$tY2X2F4ozi|FW08LEUbB(_R*% z@7>R$s5>R_!+uuaAnAdWQ*12lbh)+9S?ls|hHtmo8b3Ul8yToN!)8id?dFJB%l~}> zEEO-!H&}n#Db=s6c}o5ThL-(N diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe old mode 100644 new mode 100755 index 90469ad6250ede0f6577d7dbf13e04967f128785..c7ee344c6379fe18c1b0fc834fd2cb103de31b43 GIT binary patch delta 2666 zcmchZZERFk8pogKoIBIbrF8l>oq?8i3e>9iPU*CrzU)S&w$(NbNwLmQ)@&7bfg%Nw zmX|7JhDe|R3B?QCRw+od67_?GQ3sP6w#X{58>PF5MF}a1M0QCPgqkH;)aRZ%9cL0h zdz15j&hLL-=A7r=d*+6Y+e5?lzTVjxd}jcn*EleohRFaIIDpkOS5NMFJCN$0+$yVm`ykD*WRfydm!Gn$Lv?) z?KHB3=5M|l@2AJQABeXzV)kIXof)$a#@ksj`;cMhM7QaP*{_M-`B6VR<{vivyr}Ke zW^_D3Pa|Yf;$|=aHQdut#LyESTKy$rakytqKH|La;By?YL_56pAL!Lqb?(Gc?M|nH zWm;j^>sYRx=_*5C_-@xC#0t&7UdKvpV*Qg?r7hTS3#-F58&~3sN4vKl?Z(K_ZdU&F z1Iq?JIfAK!^5#71Z>*zuoA@QYz|R%S zTtcV5(9fL~iK^B5DnHLjpGj4uLT|Qs0j-e%KdCL?h<-Xjr_lr{}UA#z6F$g@ZJZo5U0p_e>{~af+AP{#A~cg<@f)^mWho*+k|!s z?G-vG^qA03gayGqp>-PF~b6-Ju+_zZ?XoVm-YeMTmhB|Cm?(06ft%J%1nZM zhmD1)HAe8%mTxXOgIItyA9d`BZ4;enRHRmCS{L_Hys{! z3UXgIXdC=Yjc1|AB(b!!Fz;o3ZaZHcY!L2#*pa=IU4-*d8qDrsmjERwn+$?By#a1^!6Wl{24xtJ+0`0b$otsyAt3v(kn`mTq6xDDRQF} zU^m%9(l+Qui#p5~N_I6vUM%IR4$@+^fV57%hx9SEgmkg$BVDHcfpjJLOK5DP{2>Hb zC+SzSzDP2(o9g{)CfL|sw~aj~{dHEKJOT%T?g1Quchvo|7mUSw!Pwpi4Q_)1cu##> zzQaCJkCA>X^bF|;e6D^V7sE>Uo^&TXJ*}7?zLlg;2&WS~RDTf`kt#4seaeLYN1?Sa zNlugSTL6o4>b`BjbZi;jD#%{hSXN|4LcEt9X?UrqZtjM);vmB5&%RA&( zt^e2>ly1g>qOEj+acR0w(GW9&T(8psNohYr8Byg zC*g#mKlMD{)O2GTz;sOB4v>m&Qae_WreQN_I<}K$V2Csm`$@C#D5(QalV;;MsS~A; zaTp?4^{dbG_q}5(z;RlaBy=EviLzx+(Z9bDK%us2DDl=5;HOBA~5%l>(+<~Qf8cnR<^Cow& z(z3_{Z}KiTRz!|{!XIO4+wQg=Jjd$m4=*kH>A}&(d6BF$yxm6GPY?A)_Wg_hK>tyC z?|H6fG(_vd)ZKduvN?Uu>DSNmkM-0GJY=&{hKzh!Bl-nS-)0q&$uId4V~W9x Syo|!=MPA9)_`=?;KjJSmUOaXH delta 2196 zcmZve3vf(V7{|YJ&b_;PZ&tWnktLFBM5w)4wRw589b!Xew2H786{YDA&p`-bB`MU5Y{x-m^lGGXd5CG{pXbePhP4iTozsDAhCs_abf&i&u>`+xU4`<-*o zp1URW9ZTvuR;=q$)N`#DLdPwjB!XA~E;0a9(2RUsdB7WaxRt>KZU}IdRVLW91Tt0b zd;#xspnXx>KvZ&B`;PP`*R`9ZNAHK2U>qaxq#(lag$&w?0SvbUJ3piYbh<$`WlbOd zX!=LDNO`jrfcTOC1R5`EBVwD0taXc9O=SPBxG4nTMf~pwcOA_FZ6f}P z0>Ya!0A%0pb~&;l^BQGdqwM?Ah{c6ctlINAlOr1d+B2`$e*-qHW6@Hz^aO(wG~AqP*FtFZoGTA7eL}lTwlEbKEkJ(m{YJYf8LBm z#+@s20Df|yH$Dfl3UDQ%m-ycJ>@2*FL*A_uFH^-tM62%hvS`s*cZ2i~yevlPh)seg zu5-Q|#lSKz>(7$&oGm003Y`urL%lPnn+(sAatd6S%rZ?xON zvr^cJ*nDus!xoZbOz6(0;Q{~mM>qwZnU zGmMhMC@qZMslwlJ@Npfa_u&0t5N<~wq4(i74mWSL9%4nPt(V+AVh=h=a7nY7{-Gm>@}nfJ_`kN z?77ee8$*~>>SasVkm6NNFUu6FoiTEzQ0H{W z*@BloqGM2VVHqK6JsTrLsJ-M#f?e%{>QvKFhp2;4N2yt;FOxd8R$>L+$r)= z@Y1!Y*JCf44c(0GD%A!Ot#U|ofshxwM{a=HVn+>WfPLx#*$qbVZZL+|fXTU#0Eg5c z**Au7>a7H~X_l4QOBKpEcSc0lSG3sRQEP_mIuY%dAD%{08Q@Q^(R}V<& zkK}$1knVvKh3p^|9XPj%dT9}x5Ia*^Emcb2OTS5G*(DE_C&+p7EP0E(Q$8r4*B=+L zxf$o2qlNjxTEQjei-KvTsoZqRbl&v9Tq^mc>(Wcf!x(9C63ApCN$Ens!_4HqQ?Fjm zR!BmLvFQ*H^(iaZ5!Xc(pbo#>*oO#iZWFIl-gX+VFWk=JAQorB0X^_c40wF(Swf=6 zlQM94N>+xe|ImIOS6W8qP}jhr?o^jM)svDo+>?<$tY2X2F4ozi|FW08LEUbB(_R*% z@7>R$s5>R_!+uuaAnAdWQ*12lbh)+9S?ls|hHtmo8b3Ul8yToN!)8id?dFJB%l~}> zEEO-!H&}n#Db=s6c}o5ThL-(N diff --git a/webapp/bar.html b/webapp/bar.html index 402e74e..4eed33a 100644 --- a/webapp/bar.html +++ b/webapp/bar.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/bill.html b/webapp/bill.html index 61a29ea..b01891d 100644 --- a/webapp/bill.html +++ b/webapp/bill.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/css/numfield.css b/webapp/css/numfield.css new file mode 100644 index 0000000..71f468f --- /dev/null +++ b/webapp/css/numfield.css @@ -0,0 +1,30 @@ +@CHARSET "UTF-8"; + +.numfield { + border-radius:25px; + background: #bbbbbb; + padding: 10px; + border-style: solid; + border-color: green; + width: 280px; + border-spacing: 5px; +} + +.numfield td { + border-radius: 15px; + background: #eeeeee; + padding: 10px; + border-style: solid; + border-color: black; + font-size: 30px; + text-align: center; + color: black; +} + +.numfield td:hover { + background: #999999; +} + +.numfield td.numnav { + color:red; +} \ No newline at end of file diff --git a/webapp/elements/product.js b/webapp/elements/product.js index 81cceac..c79a6ce 100644 --- a/webapp/elements/product.js +++ b/webapp/elements/product.js @@ -5,7 +5,7 @@ function createProdTableHeaderLine() { var txt = "Name" + "Typ  " - + "Durchlauf Küche" + + "Durchlauf Küche" + "Durchlauf Bereitst." + + "Drucker" + "KurznamePreis (A)" + @@ -13,7 +13,7 @@ function createProdTableHeaderLine() { "Preis (C)" + "Steuersatz" + "Audio" + - "Verfügbar"; + "Verfügbar"; return txt; } diff --git a/webapp/elements/tablemap.js b/webapp/elements/tablemap.js index 9ba257d..6b0d695 100644 --- a/webapp/elements/tablemap.js +++ b/webapp/elements/tablemap.js @@ -263,5 +263,5 @@ Tablemap.prototype.imgUploaded = function(text,instance) { } Tablemap.prototype.imgNotUploaded = function(text) { - alert("Bild konnte nicht hichgeladen werden. Ist es zu groß (> 1 MB)? Oder wurde der Dateiname nicht angegeben?"); + alert("Bild konnte nicht hochgeladen werden. Ist es zu groß (> 1 MB)? Oder wurde der Dateiname nicht angegeben?"); } \ No newline at end of file diff --git a/webapp/feedback.html b/webapp/feedback.html index 0a2c50d..ec9f0c7 100644 --- a/webapp/feedback.html +++ b/webapp/feedback.html @@ -4,7 +4,7 @@ - + diff --git a/webapp/index.html b/webapp/index.html index 8e75b97..297e722 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -7,7 +7,8 @@ - + + @@ -35,6 +36,7 @@ function fillUserList(userinfo) { }); text += ''; $("#userlist").html(text); + $("#passwordfield").val(""); $("#loginmask").trigger("create"); } @@ -106,6 +108,7 @@ function displayLoginOrLogoutMask(jsonContent) { } else { alert("Falsches Passwort?"); // user needs to log in! + $("#passwordfield").val(""); $("#logoutarea").hide(); $("#invalidusercredentials").popup( "open", {transition: 'flip'} ); } @@ -137,6 +140,57 @@ function binding() { e.preventDefault(); doLogout(); }); + + + $(".numfield td").off("click").on("click", function (e) { + e.stopImmediatePropagation(); + e.preventDefault(); + + var val=$(this).html(); + var classes = $(this).attr("class") + if (classes == "numnav") { + if (val == "1") { + showNumPanel(); + } else if (val == "a") { + showCharPanelLower(); + } else if (val == "#") { + showSpecialsPanel(); + } else if (val == "abc") { + showCharPanelLower(); + } else if (val == "ABC") { + showCharPanelUpper(); + } + } else { + // REM* char input + var password = String($("#passwordfield").val()); + $("#passwordfield").val(password + val); + } + }); +} + +function showNumPanel() { + $("#numfield_num").show(); + $("#numfield_char_lower").hide(); + $("#numfield_char_upper").hide(); + $("#numfield_specials").hide(); +} +function showCharPanelLower() { + $("#numfield_num").hide(); + $("#numfield_char_lower").show(); + $("#numfield_char_upper").hide(); + $("#numfield_specials").hide(); +} +function showCharPanelUpper() { + $("#numfield_num").hide(); + $("#numfield_char_lower").hide(); + $("#numfield_char_upper").show(); + $("#numfield_specials").hide(); +} +function showSpecialsPanel() { + $("#numfield_num").hide(); + $("#numfield_char_lower").hide(); + $("#numfield_char_upper").hide(); + $("#numfield_specials").show(); } function startInstallationOrUseIt() { @@ -188,8 +242,49 @@ $(document).on("pageinit", "#index-page", function () { - +
Username:
Passwort:
+ + + + + + +
123
456
789
0a#
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ diff --git a/webapp/install.html b/webapp/install.html index c347e01..d266165 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 613c9f7..be1e79c 100644 --- a/webapp/install/installer.php +++ b/webapp/install/installer.php @@ -617,6 +617,10 @@ return true; return false; } } +function updateUserTable1105_1106($prefix) { +return $this->setVersion($prefix, '1.1.6'); +} + function setVersion($prefix,$theVersion) { $pdo = $this->pdo; try { @@ -688,7 +692,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.1.5')"); +$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.1.6')"); $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')"); @@ -1090,6 +1094,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if ($version == "1.0.14") { $ret &= $admin->updateUserTable1014_1015(); $ret &= $admin->updateUserTable1015_1016(); @@ -1122,6 +1127,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if ($version == "1.0.15") { $ret &= $admin->updateUserTable1015_1016(); $ret &= $admin->updateUserTable1016_1017(); @@ -1154,6 +1160,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if ($version == "1.0.16") { $ret &= $admin->updateUserTable1016_1017(); $ret &= $admin->updateUserTable1017_1018(); @@ -1185,6 +1192,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.17") || ($version == "1.0.18")) { $ret &= $admin->updateUserTable1018_1019(); $ret &= $admin->updateUserTable1019_1020(); @@ -1215,6 +1223,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if ($version == "1.0.19") { $ret &= $admin->updateUserTable1019_1020(); $ret &= $admin->updateUserTable1022_1023($_POST['prefix']); @@ -1244,6 +1253,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.20") || ($version == "1.0.21")) { // nothing to do... :) (but maybe user has pressed though) } else if (($version == "1.0.22")) { @@ -1274,6 +1284,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.23")) { $ret &= $admin->updateUserTable1023_1024($_POST['prefix']); $ret &= $admin->updateUserTable1024_1025($_POST['prefix']); @@ -1301,6 +1312,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.24")) { $ret &= $admin->updateUserTable1024_1025($_POST['prefix']); $ret &= $admin->updateUserTable1025_1026($_POST['prefix']); @@ -1327,6 +1339,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.25")) { $ret &= $admin->updateUserTable1025_1026($_POST['prefix']); $ret &= $admin->updateUserTable1026_1027($_POST['prefix']); @@ -1352,6 +1365,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.26")) { $ret &= $admin->updateUserTable1026_1027($_POST['prefix']); $ret &= $admin->updateUserTable1027_1028($_POST['prefix']); @@ -1376,6 +1390,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.27")) { $ret &= $admin->updateUserTable1027_1028($_POST['prefix']); $ret &= $admin->updateUserTable1028_1029($_POST['prefix']); @@ -1399,6 +1414,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.28")) { $ret &= $admin->updateUserTable1028_1029($_POST['prefix']); $ret &= $admin->updateUserTable1029_1030($_POST['prefix']); @@ -1421,6 +1437,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.29")) { $ret &= $admin->updateUserTable1029_1030($_POST['prefix']); $ret &= $admin->updateUserTable1030_1031($_POST['prefix']); @@ -1442,6 +1459,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.30")) { $ret &= $admin->updateUserTable1030_1031($_POST['prefix']); $ret &= $admin->updateUserTable1031_1032($_POST['prefix']); @@ -1462,6 +1480,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.31")) { $ret &= $admin->updateUserTable1031_1032($_POST['prefix']); $ret &= $admin->updateUserTable1032_1033($_POST['prefix']); @@ -1481,6 +1500,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.32")) { $ret &= $admin->updateUserTable1032_1033($_POST['prefix']); $ret &= $admin->updateUserTable1033_1034($_POST['prefix']); @@ -1499,6 +1519,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.33")) { $ret &= $admin->updateUserTable1033_1034($_POST['prefix']); $ret &= $admin->updateUserTable1034_1035($_POST['prefix']); @@ -1516,6 +1537,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.34")) { $ret &= $admin->updateUserTable1034_1035($_POST['prefix']); $ret &= $admin->updateUserTable1035_1036($_POST['prefix']); @@ -1532,6 +1554,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.35")) { $ret &= $admin->updateUserTable1035_1036($_POST['prefix']); $ret &= $admin->updateUserTable1036_1037($_POST['prefix']); @@ -1547,6 +1570,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.36")) { $ret &= $admin->updateUserTable1036_1037($_POST['prefix']); $ret &= $admin->updateUserTable1037_1038($_POST['prefix']); @@ -1561,6 +1585,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.37")) { $ret &= $admin->updateUserTable1037_1038($_POST['prefix']); $ret &= $admin->updateUserTable1038_1039($_POST['prefix']); @@ -1574,6 +1599,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.38")) { $ret &= $admin->updateUserTable1038_1039($_POST['prefix']); $ret &= $admin->updateUserTable1039_1040($_POST['prefix']); @@ -1586,6 +1612,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.39")) { $ret &= $admin->updateUserTable1039_1040($_POST['prefix']); $ret &= $admin->updateUserTable1040_1041($_POST['prefix']); @@ -1597,6 +1624,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.40")) { $ret &= $admin->updateUserTable1040_1041($_POST['prefix']); $ret &= $admin->updateUserTable1041_1042($_POST['prefix']); @@ -1607,6 +1635,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.41")) { $ret &= $admin->updateUserTable1041_1042($_POST['prefix']); $ret &= $admin->updateUserTable1042_1043($_POST['prefix']); @@ -1616,6 +1645,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.42")) { $ret &= $admin->updateUserTable1042_1043($_POST['prefix']); $ret &= $admin->updateUserTable1043_1100($_POST['prefix']); @@ -1624,6 +1654,7 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.0.43")) { $ret &= $admin->updateUserTable1043_1100($_POST['prefix']); $ret &= $admin->updateUserTable1100_1101($_POST['prefix']); @@ -1631,26 +1662,34 @@ $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.1.0")) { $ret &= $admin->updateUserTable1100_1101($_POST['prefix']); $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.1.1")) { $ret &= $admin->updateUserTable1101_1102($_POST['prefix']); $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.1.2")) { $ret &= $admin->updateUserTable1102_1103($_POST['prefix']); $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.1.3")) { $ret &= $admin->updateUserTable1103_1104($_POST['prefix']); $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else if (($version == "1.1.4")) { $ret &= $admin->updateUserTable1104_1105($_POST['prefix']); +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); +} else if (($version == "1.1.5")) { +$ret &= $admin->updateUserTable1105_1106($_POST['prefix']); } else { echo json_encode("Quellversion nicht unterstützt"); return; diff --git a/webapp/kitchen.html b/webapp/kitchen.html index b746d00..87679d1 100644 --- a/webapp/kitchen.html +++ b/webapp/kitchen.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/kitchenbar.js b/webapp/kitchenbar.js index 7ab3f2d..c4767b2 100644 --- a/webapp/kitchenbar.js +++ b/webapp/kitchenbar.js @@ -322,7 +322,7 @@ function getAndDisplayAllEntries() function getGeneralConfigItems() { doAjax("GET", "php/contenthandler.php?module=admin&command=getGeneralConfigItems", null, insertGeneralConfigItems, "Fehler Konfigurationsdaten"); - doAjax("GET","php/contenthandler.php?module=admin&command=getJsonMenuItemsAndVersion",null,setUser,"Benutzerdaten nicht übermittelt"); + doAjax("GET","php/contenthandler.php?module=admin&command=getJsonMenuItemsAndVersion",null,setUser,"Benutzerdaten nicht übermittelt"); } function setUser(userAndVersion) { @@ -351,24 +351,10 @@ function insertGeneralConfigItems(configResult) { } function setWorkMode(urlsuffix) { - if (urlsuffix.length<=1) { - // no limitations - display all - displayWorkToDo = true; - displayFinished = true; - displayHeaderFooter = true; - } else { - var modes = (urlsuffix.replace("?","")).split(","); - $("#hrline").hide(); - if (modes.indexOf("toprepare") >= 0) { - displayWorkToDo = true; - } - if (modes.indexOf("finished") >= 0) { - displayFinished = true; - } - if (modes.indexOf("headerfooter") >= 0) { - displayHeaderFooter = true; - } - } + displayWorkToDo = true; + displayFinished = true; + displayHeaderFooter = true; + return; } /** diff --git a/webapp/manager.html b/webapp/manager.html index a92c4e3..98464c1 100644 --- a/webapp/manager.html +++ b/webapp/manager.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/paydesk.html b/webapp/paydesk.html index 6e4cddd..bcdff22 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 45017c73..f1c9d0b 100644 --- a/webapp/php/admin.php +++ b/webapp/php/admin.php @@ -1074,19 +1074,19 @@ class Admin { $right_rating = $_SESSION['right_rating']; if (!self::isOnlyRatingUser($rights, $right_rating, true)) { - if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html"); }; - if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html"); }; - if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html"); }; - if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.1.6"); }; + if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.6"); }; + if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.6"); }; + if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.6"); }; if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html"); }; - if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html"); }; - if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html"); }; - if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html"); }; - if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html"); }; - if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html"); }; - if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html"); }; - $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html"); - $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html"); + if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.1.6"); }; + if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.6"); }; + if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.6"); }; + if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.6"); }; + if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.6"); }; + if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.6"); }; + $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.6"); + $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.6"); } $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); @@ -1095,7 +1095,7 @@ class Admin { $waiterMessage = $this->getMessage(null, "waitermessage"); } // CAUTION: change version also in config.txt!!! - $mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.5", + $mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.6", "user" => $currentUser, "menu" => $mainMenu, "waitermessage" => $waiterMessage, diff --git a/webapp/preferences.html b/webapp/preferences.html index 966c446..9a8890b 100644 --- a/webapp/preferences.html +++ b/webapp/preferences.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/products.html b/webapp/products.html index 0fc6812..25a4407 100644 --- a/webapp/products.html +++ b/webapp/products.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/rating.html b/webapp/rating.html index 98b81df..fde3bae 100644 --- a/webapp/rating.html +++ b/webapp/rating.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reports.html b/webapp/reports.html index dd79d83..8d43bb6 100644 --- a/webapp/reports.html +++ b/webapp/reports.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reservation.html b/webapp/reservation.html index ff715fb..6e95cba 100644 --- a/webapp/reservation.html +++ b/webapp/reservation.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html index 4ade8bb..a18e501 100644 --- a/webapp/supplydesk.html +++ b/webapp/supplydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/waiter.html b/webapp/waiter.html index 1c6365c..9cfc50d 100644 --- a/webapp/waiter.html +++ b/webapp/waiter.html @@ -4,7 +4,7 @@ - +