From 5afff34e698a36a143a3b21a27a20d2fc35d43f2 Mon Sep 17 00:00:00 2001
From: Geno <geno+dev@fireorbit.de>
Date: Thu, 19 Nov 2020 22:53:50 +0100
Subject: [PATCH] OrderSprinter 1.1.9

---
 printserver/OrderSprinterPrintserver.exe | Bin 260096 -> 260096 bytes
 webapp/OrderSprinterPrintserver.exe      | Bin 260096 -> 260096 bytes
 webapp/bar.html                          |   2 +-
 webapp/bill.html                         |   2 +-
 webapp/css/bestformat.css                |  13 ++++++
 webapp/elements/product.js               |   4 +-
 webapp/feedback.html                     |   2 +-
 webapp/index.html                        |   4 +-
 webapp/install.html                      |   2 +-
 webapp/install/installer.php             |  43 ++++++++++++++++--
 webapp/kitchen.html                      |   2 +-
 webapp/manager.html                      |  26 +++++++++--
 webapp/paydesk.html                      |   3 +-
 webapp/php/admin.php                     |  54 ++++++++++++++++-------
 webapp/php/products.php                  |   2 +-
 webapp/php/queuecontent.php              |  50 ++++++++++++++++++++-
 webapp/php/utilities/basedb.php          |   1 +
 webapp/preferences.html                  |  44 ++++++++++++++++--
 webapp/products.html                     |   3 +-
 webapp/rating.html                       |   2 +-
 webapp/reports.html                      |   2 +-
 webapp/reservation.html                  |   2 +-
 webapp/supplydesk.html                   |   2 +-
 webapp/waiter.html                       |  15 +++++--
 24 files changed, 236 insertions(+), 44 deletions(-)

diff --git a/printserver/OrderSprinterPrintserver.exe b/printserver/OrderSprinterPrintserver.exe
index c1383ab056a96f90cac03f43f10a85273d344713..06116c27e9a19a8aa9d75540501f211188b613c0 100644
GIT binary patch
delta 12254
zcmZvi31Ab|*2mACJDE(9Hf@qNO=wHgJ#C>2Yl|XOsDg-sqJY+?6)RLrQ_>>E0BP6+
zWvkIfget`q+`x(z_lOESH&A)PQ<OdsMMQ8HAHsL;nJI<u8DD>M{^#6#&Yih;W^Tf3
zJ`vY^B5u_Zp6q|5<(^dbP|Jpi)=^d&t_J*gWZ27F(jDP+b|ZT<9Ad%rW{io?DEyPa
z01t#XY+44uQ7-^cc6Fpn|CHnmjE2jVl(5BMVj1B?!;?-I1KIyPgL=MfBmnbX0ATjM
z*zt+su$i3*zZ~By=O+N!kmj81^<bh{W8i1h4%sI6G1+8aF*bL|#=wsqf5tz@*e~IY
z_H_1Z_<eh?q~EZe?9IbYsc9bHIMGls1%40zWlv^*gx!uk!4#}*=7BUkSPX%`uzidg
zIEjbAQADh6A4A(AOS<|2l|oq^2HkaBG*EQ$y%0tT$7VCw6r0iL&BqZqRP6t!=xSBG
z1;SyHR4MS^urHyZdl()u3?4|ugLgcRHpUS627AOxhQMJw2EIfX0$&UB6EexWzsLJ=
zkN1ln@25THdp+j+J?1|?=&?WSF+W1ns;J&{F<M#b9>rJacGFbo!#aSDgzo6)C{ife
z?b#cCBXNMK3;ne=W8hHuRAMGO6plJwz3>v)jB`Z9dm)}KM*o909u9`Da$c;^iS80D
z;~W<MMJA}%PkuN0Jc(KuJ9K-|oP4h{@#38B%KOmcUt)oJuM5-bqZLlw{CAHjhV9K1
zCyE#S+wj<=ZwJuD{S5uu`oL++67dAdXjPKDIl@kKF253&ti!1fVNXYm>vb#J(&5dW
zpt9<YxkV#ctPfK-eb3+sq(EKx#p2szr=R1g4LeIVCMQaGo8U(Z48T~K38fSmD9qCx
zpO+Z5BuQtJeAZ7(((S437~KC|i9H-XJ+L2Z>nIsC!4!Kh4$!R3Gvi|Ng*)yY_H&7)
z7utRXcs*VWubPp_9t%G{qc?jz{LYNEv2KjnOujxiOpMm~2eX9m<NgfxVtA+j8nn|I
zgne;?upc1%6|!xO!atz#cXlLvpfNFAK65aO3D2JCLGObz`xJbKCxQ3T5j;5Ld9h*y
z;$FAOG$-B{ag-))N&hSS<IJ`B*1u~};G7rtKmKs%9TQo6IBu33OXbb#lW|IvnrG{7
zXgc?Cf@Rde>F}&s3!V1AZ4kCKIh>Ba4-IL$>w?7YkTKxEIz6M8Rqt}l9&73|V4m}D
z8--6b^>!xxeW-YLmUijo?n_@aJKK^h8fz2P(K0)SS;Xx4e@mm8d+W}N;_u{r98zE#
z4y2Do9K$IKGJ|iUlp2CKgLB^@vssw$_L$py%pE=EPGNd$Xnl$lX)$T;hTBm3Za?cw
z@)?*|zasAM<$-!%!`YbIr%+6K8^UicaM3WFzFLZlaU}UdXKl=FIybk7`*V8o37ytI
zEw-T%yZC0F?U!^;K7XlbkM|IcN1UA3h~<6wj?r|U>}kQ<$Fl;j-?^nkQ~wn`rQU^b
z^TNb(;dbfSsmV>}XLtG*c4wBQ)5?7~)eVc#<6BJb?GUytP7R7Hn-=#!HHF*X*i%zz
zPY2%TX=&%4p>VtPF;JH!J!25Mdkn(HG2H+E#;^m@Fzp#k>%ke<;Khf2_eI$O;g&_N
zX=2L#FZB#YXiwY!3`V$n>4TvzJ9-8qboXF{je}|Ze}mac7evBC@nY9Rv9|nsduj^(
zHy1#-ll7X^<@=tRLU-2`Hr9-UA6|S(PzWDBT+NcVj^;v)=sbtGUgtT)1fS;+>+L*;
zSm2t&?Oi6a`g^D2T}P{(Ol{#gz01Q#bIiR5N#1ERf)>0C`FEas8*y)Ec=!BXsp0|b
z4U6y~?-o2rPEBP9Biv%lx;LQq1xK*~a&RsN0oeQ;pk8~zn7O}L)EDnBi)2&`R@wVd
zctT)TS_irv<}dSXDl*e%>|?YUeYnvuf8j9szex{|m~%Tj6Mk-v``V|ls9EVVp`lbH
zF*c}pyTqtz$vzVrYT9u9*sc5P+U3KMn<aezZ^Q&@npyMvEa)}*V#2-Wt{?g|Ml7Xx
znSuK@q3y-zyE#V2+@i0XmQQ`;v~*3Y&KBKBLL>aw-0Wo0>pIgUhw5~gY^u?RkAHKK
z*=SRJap9r!3W6e!O-`C5wtMb=_nML>#hSEQ{hF0D*CZ@rrko1*J&U=9^*wXu3|<CD
zu?*Sx1i;OtO$y+>A(!Dk6Vifar-f?{Up(fny}mX^m-yl^*Q(dm#GVt57Y<R|be+Rs
zGc?%4zt78>Akx`PHnR`k7iNdWZt*6FzM1{$^U1L5(1Y&_^mN^s@a&~s{~31OBy{21
z0bO~OE8qIn`zpF>95FV<Xp2!!%f6(rFPIU09?!rLYm2oh;#IHMx`)y|G~aXQdTIPP
zKHp~Y<|pL$mI8pwEk8rzbICvl>voWV4yoHgMsLZRgzF;TQY=BR8D~;_B>x{7P(K%+
z>#{`ep}F{s?KW}!;QK;!lDxR=&AzV?b7k@#5V}ifd|zNI+|QYP2L%oZJSid~>z6#|
zOOU)cCFZ$YwB(|KL6+pXYItpPdhit1mjWWR%q_kY+=xBRX{P1)WM?s|Q(3Pj`EkEi
zzg~4o0a2S?_Ul!*znHweq<|QK?oIZWk~c*Pi0bRrRR3^t;N=i!wqErP!vgp!6({Gr
z28M!}&f9k-y8GCT{!!Rmi+V2-Esgnw4fs+vH{(qt=U+BY93<X=&vwPvD?B^o2?~!7
zU*u+KvKPN*V3(MJ3~HzPaEEV>RZMg}yuDFSQnQ*gDMqCx)Un@gB_DV(gEweW@O5^!
zq6eRK&@3J;{&6_6X1pn7|4qV*5mtRB1nZk=v(+q|w5eJpEZRn`6Be!>*}q9xv}1Zx
zSa#vtB`n$r9S{~SZP|Z9ShNL#EVO8!6E7^<)_8<PU*n2}MVl4daADGpbDXe}S(r6D
z7WnSE%Xb&+^xY-peZf4PtEX@Wi{0Vcz|CNA|Ku`5d*{|$c&5aDitN9YKVrASdqo#W
zR`?oe25a%}EOPHu{!4H&#KJaMg^N5MGFbzd;GggSsUlLJ!D><$lIns7NsT1+HLM{u
zn$!_kOKJj}j9HFC8>uN2I|}Pa`AD6Bc2YssFb$jj0_#bxpx{Y(gj5@;Q}8IM$Ji!j
zf-~?KekYEH_wfm2!Ug;^#Xh5goOO^oK+43nkUBzHQrOFp={4NP`bPHG@YLWUP~cy3
z3i1H)Yk4W!$H@Mf_=mg<J+G3@3@vDz3`@ZVLk;&MZ!?IC@~oi~xs@0t?j-IZeu=cf
z(agch_~zrvQf&FB(u9u=gRv=yhj^n9sl-B~2$vEk8Rww?W@2ykakR&%_-!0+P&<%Q
zi8II(AbSznVd8q?X0;PrzOKH)6nIBX!OS13Z=mOxx()fKx}62_MlrpIBEclWTA4jo
zQJ~BEJMtH+C@IAW+Tw&Kn>d&}m&g4VJvWej8}Ux!3gVhLk>|O%Gsw4ypHur|L>`ZQ
zgODnIVSp@R0kI#kj5s`Al)RdFD{(e)8S&wGQDAetILmF+{zKyD<T*w>L$ujMn@r+B
z;-$pkbv7}&YMU6u9X3&Hp-m*ckN7C@1>)PpPl<<!zYq;}(LRajwTm(r60fw2Y`54&
z=0@TI@<i;S;$zrefu|!gYxy-nE-5h5A$TouDseV(DRDJ%192;HCvl%cEZ6@ynlRZf
zL}P-m-NZh`p~NeQHxlcKA>zFWxCj+^ltd?SC-Dp7G2&@rT%t(rA(kK)!^Om_$Ww?5
zc(J~8U&XtK0W*j-b#o%EcwB4@w%CQ|En<H>0Y;~di*OgY_7lZ5!1YaBmAD8ytWC6|
zM-*W2RH75@Es4p<*NNg9FxZ~xLC?v=EWC<-XC?9uVt^PDjCUpBjUJy)?2FVFd=LgF
ziFG_QNzBzHNn$>)Bu*w)Ar*L1bc4;rt;B7__lbLmR0gz?+B0N7`L(CVVY0ubC&^K=
zj}s$n>v-?ruVkMho*^1sVsb4mQ8$U0;Swk2b*)8~y4E58kRL@>xHcfQDq~#Fk}dk)
zNWE^SJTu9jOVp|doFel=@+=L~;oOoL<ndFZRb;Pry^N{bU9TfIy52ooX0_`>w8f*7
z!Sk-Z$jjV+;B4IF7M>>JMz;aC9vx)AMts*TX5d5O9(OPWpOJ^%4(@~>G3*3GuM}hw
zv4}W=IEmOuTt-|++(O(<{EjFmiwsU;5pf7{4Dkk}0*i<%l2d{x#E2AFL#{`W4t6wa
zyV1c0XA6!Y#`alla<FvbK;mfP4a6D5Ma0#_XNXba&wU=kzG`2=RAN8krN|-&t0Xal
zxR|(xxQX~qUs3qqWXBXf5{a9^bK_F*nl^dFUS_dthEx)%n8EYP%D@0!niD*H7%Kek
zho2B!#z&%BmaeHOd<+;NB|}pUe0<~y>>iv5X24Aheip-FeiOt1Zc9id$+v<P>UEVb
z*FzkfAQgh4asVfAbhg&=DpYo;)Kx7i2l#Y#7per9ud8-ciEzKB@EjbGEB$<MunlMK
zcXEc+6^8YwPV4GH!xN}f@y!m;=!oGJNP<4P`q>Z#7u4wLjNv`#1<krLD!U;Cyk4ze
zvT_jepg2!c`N|Ja1Uqz9ru-g+{xAx^^N13o6kvm)Nmt_(BO3xP{JB}gu2<sNP-xWE
zZAv1$2%gqelQJHL!2w+@R8m+u+|pO;*Q(^QOQ9HlXct+YRtB)k;6RB`iy^9%v*fYx
zX+KSVq+G?WhEanxwO^SMdANZm$MsWggj)P6rp<gPvJ;)bmF!k%8Y-M2SZQo!(_l4j
ztwqv@jcx2UXxCMTu^rV0UF{&XnN$e&W53(rRb3rJRSPw^l?Qkm^3;v24wjG#L5Yf!
z3V)2G3OIEirZ69TQ6Xdq(oCPSdPuoMQ>CVVM}mzw>{jLn&!w7kk?BBWLnE&We#7p7
zrm>nc*4&Efd;F3>Sx_}W>{Xg7Ms+6?=xQvgIdG+}Zbvl_rt4}ss%BWGs}A!~HXn}b
z>TQfI0Q=Qi&hO2wLAD46>N3&N%I<<my1EF}QV8g38mfEXAziIRwH%_l>O{2?4(aME
zR4rhfpp`Jjw6ZYd>#7LV{V+~f6Hx^tutS&CC|5(wHCo37sMf$ZU9Cse2KVVIit1t5
ztE(<l?T~V<*6$3eN8l!1rN*|h$KX+2U4ZHd_*PewQEdo9pNU$>Sty@^dR^U*>KRz2
ztCvtc2gQ@LmLH<p47+soHL4D%pRC1Bq1poR*J&!j+R8d%ldkenZG~~yYq8;|UV-2V
zU0#dwHCR=t1#3~g0mV0HYCftce59+VttZ$v*sH4@7<&i)BBd?T?U3>ht)Ez=J7Ch?
zLWyUjP<6|@l_KqcdxDyTsfn@Dd(ft<xruG;J$Ou4caz$5wqqW)+`E#};BRRT_y9a%
zp+aDCmPj8!t*(-s7f2t%OS<wpE2NKL!u?vy;iz`O-qxTdCpj;ZcEh2FP>bPKOu83N
zYl_Cb7nBD?tOb@hZ<O{56Plsbv)oxN?K`VhJEu!uoK=rI{nGxk>P3tlIIG@9g}*BR
z1S!oPl=#~Meniqk&O4=p;Gu%8@S}5q^bI_%D>><I={wkaHnvLo9>%Q}J+%w`157$k
z-9$>8m>-~-l=k#E4sW%I`g+IXunVO)``eQu(s4LWDg?8WTG<KsT~|v`{RHwuqGbrg
z4fG4xb@c$oeuHFE+F<^G%=1*id8)rqLB0GRaKU-Ok(z>WuIHscpovrn8u;_lDOmNe
zD6f?O_P}{+-FfQC^VFvE)Jvp--D%!D8~j)Two6m6)wNe*Y~(sB2>ba&;A|Qx?e%A1
zOLQe(e+t{7x7_3UN>bUY?OMM>u5TnWJGP#bYIPrzEbLcJ1=S??Pbg38L65tQ#W3X&
zt!aTfBE_&cT@AumEKAbWaE!$=kEUpmTABB(GI1+=o7B6o-yO%}ng3CdvlZ%+Q&7#*
z)sR`q9+da#a$a%{x3f1Mqw<v0!G57wi|h5Y6#R8#``K8eG{85pUn55XJaxq8Bmfn*
zB2BOjX@>Wa7TAM~0o>2w4;=d(_+tT_LXQMzkQ{f`_|qd~APsOlGI|crWJe>@=kT#3
z7bT0fugaqB?HK1UliJRuwzy%X&7x@2jvfj3lA?{M!*F}7c_OFhaHq7|75T?p?u?9^
z%aw=~A&t>Io#>gzjqg*RS0gh*d|+gFfcK7k-^}f?&tnos2_<+pVhQog;QOf}?`|Z6
zPl;d9D9`1GZqa5BQf#k#>{nBFgLnY$Ll*NRWdBG!iLAgyCTJqsh;Cv!F;6fkm5?Yy
zZe-<Tk0y>MPDVzgDx?Eyh%=BTKAU}<b{{uUF&i<&4yU#8rPQW{+N?%aNK2W+^9XNe
zeLT-12YOzC4Q#aM1-^mZ;CY1yH?ZlR3TXptA};Z~g@Fe>+j$v0<#`{u+2g<t+dK#P
zR`wP8OW;S(5x$e<;cH+wOHMz*yI4_r9N)(-NUxBNU`d1gBf9}TAvTrhOSj4=Sxb73
zY?5Y3rLqk<Om<6yGAiWqAyA%it(=Z$a6JVaPy(YfZkNm8ij21~#o@Hsa=IiIyRd_@
z;9bP0BIyfwQZUPKl6{(yZy1j$iVdSN_fSJSi_08qm@HkMS!u|Et21XID>LUCLhP2z
zHdZ4wX11c;l(`l;KXX0up3Ena_oJOIwPkKH?8Izako(<7S%^K7dAAf|n=`dRoWhnb
zW{!st+m>k$Dk6nj8Gs!|DU&68))mOg%sOQ<xU<&7QcM@ZHWgV*l?!2F)+@?LsLuKT
zIV0;Eb~$+_kY@sUCQEl_1&kY{-0b&_Zp`U`s5CX(0Xy-;zA{FoK=#+jCD{=vD&3!5
zAqAt-rtI&HyCsL`Ck(uXO{=I|75o#!QRx%pKD~2Swyajcci9$XY)-rym6CJf_z~&C
zoD{W^dR2nMlZUprT5g(qH|<epQ#7Oxs61yQJ1I@b8Kp*p(#<(nsEh~DW#Zx*M5RY_
zu2D})&tlkyo=VltKgqcnc`~O)b%P~WM&{?%WBJ#zH?pX7Q7+CpAD=r*E#uX>0c2C|
zQsmv}53!ZGD^)RBZoG<-T&rBpH|DNUL$Dd6EfD-D_X%}0-<SK0I-VcPjYy;UncOxu
znTsV;h2@`DZBXWYQw^bADu;N3w?bZuc7+t;%e)_{`<Phaqq)QLjM~CK@*YrE^NCr9
z)plN;^*#0#dD^*{tPR*}6#m*cLy}EP;V-Y48eW&T5jV7PdEej#NzNOE=bcR~L@tFv
zc@EgjM|&)$c2=49EZ@o-^K7OlCUU@RT-8Tel&{EhnOflfyzlWWAJ4m6n#|iW`<uq|
z=kwZ_8{W<<HSOe|=Z!G!7AFu%UyN&hl-dHG{IRAZ=$c@PN>}7pVTXzN8*z_3J^vcK
zu#1uVcxyh+ko0i=6*#PC&^{@>hTH(#vE@nW6SUi*i|qfRJ(^#gInBi6qyiDmDX24z
zhoXX6n7^#xdO0dhE|_C-LsP+mpvf(ZOW}qG3hqYN69w0(>F9Al9<hX2#?uSi@Y;9_
zU&6~Z1nqL^io(}S<x+j&HdC40T(}c|A{CP*?&*)P&9cG~=()F$nG<x1Xae0MwRDfv
z(mfK4p>8o0Xrw?R1yaZ}hdgu0Gn$4nUVgbSg^!m%D4b;;FCQ<QW1fuu3aJVi!8^OO
z2-k{yanXEpjeKR%B4kxj3vyObD{@iMI^?pV$B?UwHkxaK@<SMyft|OSL-J=u8}XaM
ziJ~{nC#5q*qtvaqK)y3?#mA=w?Wa5^&{m5bV8f?Etkfb8^cXEs5D%g#o@K111jH7g
z1jHsGihUzeIwTjTTTV(@#d*klVlgrbgNplFc0zDi@hHnex)&GH{ko8@M~!r8ajRh=
zUAmooOz|vLg*ni`3gLEGU@3%q;5TF#&LFQRPXk2JUI0gt1yGIbPyP#tBVZ|d#*qJN
zSZf)9|9UWlkAO8nDBz=^zckWNL)-=ysem5@2XPHX4`S1UaysMaDJNDDL&OD4v~MRn
zO6(#sNwiNVmJ_RpA!0l6pk$GP1w4yeu*@S|B#LrTa)d1GDYCFVir`K0PZ<k%Rl-rF
zfQN`tVpoDF!xE_&u{lw+Uq^hCcz_5_%0>(&iT3S+K^`U1MJ#uVKov1WY$ryET}0N4
ziV@3+Rm2dnofsu{5m_>|Czcbdh#_LIoeoiA7m=k<2Vyy~iWnlc6Qjf~B1@(A#ByR4
zF+^-9Mu}ZS)|=WB%Y$^NB8G_V#3-?g$kM0-v7A^%3=!LjQ6lq*i=0j@Cm!;M$qi+S
z4DG}yv5UyE=(0DnL3}>`EyTYL{Ck6yMk?;%>A_F=Z`>h|k*nked4>F-{F3~!TxytL
zSYmj?@P*+AgQUbNy_G^`j<Qk-D<3OXW1jIM<2}ZI8BZFM)FO4H+N!Qo-&H?TPpE&Y
zX{NrWi%g?TEvBbT|1ufP3FZsUH=CE5*O)uZ+sz-Ce>F4wxAp#(v6e~;e#HP|0qzv>
z|LTH!?O76ThoP_G8RX-J=aDPjrzC*;+>8UPK}O=2@m?dI#@#i8XNb???plIpiJNeD
zjsF;fREom#X8ApNhT$2*aODN%9p#Lo7&Fx;O)=&H=IhK8BGZ@gF+uMVfGjo~naw64
zb67nxmn}hh**at%dkLA(b|DMcx5z#Wmf|28{-O<qtQc9uMj?yYO~?|~gzU#wA^Wo@
zkptM9$boDxau7R#9L!YwEufTn67W#QN|8gD+${FW3`~(R%lS1dE7HCkzh)Fgwk+qf
za?_wUWI-lm<6jQ`<>DW{xbPqKYLu;b`~dDUegF$PuU^5^n0mQy>bR=9>e|SRm3&JY
zs*1Ws|7^JOYBZ--`{AnUDb+RgjU#+@x7JMUykZqEPmFxJfe(m8Ht?aHD<9)0S>%-`
zc((D5YJWqGudef}C-_S&|CZ`0^}d?AM!31AwzjsaZtBdcsnsxLrr%#(H)S?V@lCI<
zs+(O?cdM_{xRJ+78MRdnjhENdRX0Gxl&aclxTUJG3T~bS(`VK;*3{S5RQo#zJ<Z=z
zGW(SbDy}H$*SBPFaY^3+B?CtGEgN}BzrKUY2Uc8Cd`bU)6=mg}$sJs^MEtMwp^?nj
z`IVi|z0PaXSXpPvm;74Rx&A-g$vXXC@nRltw>qz4Nn^{~e!A@+Cw?w`FtXzyPxHu%
zy?KecY1oZH+aB`}uGnoxkIbz2F?aw&5yK%~WNEaTJyN1Qo7pQP!w&J6hD@`nF&>_3
zAYZLjjrS<225gRKOjT3Wa~+e&5vR9^6n>3c{K|-Wm|s;Tdl*x(=;in~PF7Ow69h_8
zO~PS_QCQKw#i&r7Y5K7ief0+HYPTsKDb-+7jrcE2_Br+&&}p9&E91zkC|=e1%3*vz
z6gS2j4OXi?WUz-!l&aAH%$k~_<*l?EmGh#Noy)%EKeDuGCJ!XqLSvZ&jC8b5!`u$&
zV~ocWofcX99Zw5ROHDQ4|Fl%Kdb`?Q#u(L#jcVy6Fs}8lMJvG=gVpL)6+_rn{FiFD
z(CD#RRlES2$38*CMA%-6SxQ9~EusqF1Qokr2oIe@j`EjT%1u@om`O~UEi_v;GJ6(k
zrV49R#CD9YU`>&A$N1oDD$|TH+Dzhf*(>dntSZ*UK}gyNEA=yIOf_1xOC{Ph;%Lup
z)u^{}B^bp5isb#kCm9u-65ITWNazRNkIjj^@B<&)dk#LpY}Ja9<M>mIl(4y3HOf|1
zwKq3Ma*pH3$|75i^8)<m3p|JJ&x**g<2>2Y+~exBoZw*=vHrxHP2xGnu&Jpt@)N&-
g;d=k|XZ{2pBW=I({&?8^D<3SayQt&GmfzU_0X*>gk^lez

delta 12070
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

diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe
index c1383ab056a96f90cac03f43f10a85273d344713..06116c27e9a19a8aa9d75540501f211188b613c0 100644
GIT binary patch
delta 12254
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

delta 12070
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

diff --git a/webapp/bar.html b/webapp/bar.html
index 2bdc979..7670e69 100644
--- a/webapp/bar.html
+++ b/webapp/bar.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.9">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
diff --git a/webapp/bill.html b/webapp/bill.html
index 17d0030..782f54b 100644
--- a/webapp/bill.html
+++ b/webapp/bill.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.9">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
diff --git a/webapp/css/bestformat.css b/webapp/css/bestformat.css
index e6903a7..f16af38 100644
--- a/webapp/css/bestformat.css
+++ b/webapp/css/bestformat.css
@@ -444,6 +444,19 @@ table.prodtable .prodpriceC {
     background-color: rgb(246, 246, 246, 0.0) !important;
 }
 
+@media all and (min-width: 0em){
+	.typetop img { width:100px; }
+	.typehigher img { width:100px; }
+}
+@media all and (min-width: 20em){
+	.typetop img { width:120px; }
+	.typehigher img { width:120px; }
+}
+@media all and (min-width: 40em){
+	.typetop img { width:160px; }
+	.typehigher img { width:160px; }
+}
+
 .prodminus,.srminus {
     position: absolute;
     top: 0px; bottom: 0px; right: 130px;
diff --git a/webapp/elements/product.js b/webapp/elements/product.js
index c79a6ce..7f44c9e 100644
--- a/webapp/elements/product.js
+++ b/webapp/elements/product.js
@@ -297,7 +297,9 @@ function createProdType(id,name,kind,usekitchen,usesupplydesk,printer) {
 		    	return txt;
 		    },
 		    createLowerMenuTypeStructure: function() {
-		    	var newTypeName = '<p><input type="text" name="newtypename" id="newtypename_' + this.id + '" /></p>';
+		    	var style = ' style="background-color: white;" ';
+		    	var newTypeName = '<p><input type="text" name="newtypename" id="newtypename_' + this.id + '" placeholder="' + PROD_PLACEHOLDER_NEW_PRODTYPE[lang] + '"' + style + '/></p>';
+		    	
 		    	var newTypeBtn = '<p><button id="newtype_' + this.id + '" type="submit" data-theme="c" class="oscmd">' + PROD_NEW_CAT[lang] + '</button></p>';
 		    	var assignBtn = '<p><button id="assignprod_' + this.id + '" type="submit" data-theme="c" class="oscmd">' + PROD_ASSIGN[lang] + ' &#10155;  </button></p>';
 		    	return newTypeName + newTypeBtn + assignBtn;
diff --git a/webapp/feedback.html b/webapp/feedback.html
index 47442e6..75ad487 100644
--- a/webapp/feedback.html
+++ b/webapp/feedback.html
@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"> 
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.9">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
diff --git a/webapp/index.html b/webapp/index.html
index 5d0fea5..f08d98c 100644
--- a/webapp/index.html
+++ b/webapp/index.html
@@ -7,8 +7,8 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
- <link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.1.8">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.9">
+ <link rel="stylesheet" type="text/css" href="css/numfield.css?v=1.1.9">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
diff --git a/webapp/install.html b/webapp/install.html
index 65b33e9..d2cb909 100644
--- a/webapp/install.html
+++ b/webapp/install.html
@@ -679,7 +679,7 @@ $(document).ready(function() {
     <tr id=updateline>
     	<td>&nbsp;</td>
     	<td align=center>
-      	<button id="updatebtn">Update -> 1.1.8</button>
+      	<button id="updatebtn">Update -> 1.1.9</button>
       	</td>
       	<td>&nbsp;</td>
     </tr>
diff --git a/webapp/install/installer.php b/webapp/install/installer.php
index 0c66a12..c3b11d4 100644
--- a/webapp/install/installer.php
+++ b/webapp/install/installer.php
@@ -718,6 +718,42 @@ $ret &= $this->setVersion($prefix, '1.1.8');
 return $ret;
 }
 
+function updateUserTable1108_1109($prefix,$version) {
+$pdo = $this->pdo;
+try {
+if ($version != "1.1.8") {
+$ret = $this->updateUserTable1107_1108($prefix,$version);
+if (!$ret) {
+return false;
+}
+}
+
+$adminCl = new Admin();
+DbUtils::overrulePrefix($prefix);
+
+$sql = "INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL,?,?)";
+$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
+$stmt->execute(array('groupworkitems','1'));
+
+$sql = "ALTER TABLE %user% ADD extrasapplybtnpos INT(1) NULL AFTER keeptypelevel";
+$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
+$stmt->execute();
+
+$sql = "UPDATE %user% SET extrasapplybtnpos=?";
+$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
+$stmt->execute(array(1));
+
+$sql = "ALTER TABLE %user% MODIFY extrasapplybtnpos INT(1) NOT NULL";
+$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
+$stmt->execute();
+
+$this->updateVersion($pdo, '1.1.9');
+return true;
+} catch (PDOException $e) {
+return false;
+}
+}
+
 function setVersion($prefix,$theVersion) {
 $pdo = $this->pdo;
 try {
@@ -789,7 +825,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.8')");
+$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.1.9')");
 $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')");
@@ -798,6 +834,7 @@ $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VAL
 $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'cancelunpaidcode', '')");
 $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'bigfontworkreceipt', '0')");
 $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'prominentsearch', '0')");
+$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'groupworkitems', '1')");
 
 $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'smtphost', '')");
 $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'smtpauth', '1')");
@@ -1161,7 +1198,7 @@ return;
 $supportedVersions = array("1.0.22","1.0.23","1.0.24","1.0.25","1.0.26","1.0.27","1.0.28","1.0.29",
 "1.0.30","1.0.31","1.0.32","1.0.33","1.0.34","1.0.35","1.0.36","1.0.37","1.0.38","1.0.39",
 "1.0.40",
-"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.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"
 );
 
 if (!in_array($version, $supportedVersions)) {
@@ -1169,7 +1206,7 @@ echo json_encode("Quellversion nicht unterstützt");
 return;
 }
 
-$ret = $admin->updateUserTable1107_1108($_POST['prefix'], $version);
+$ret = $admin->updateUserTable1108_1109($_POST['prefix'], $version);
 
 if(session_id() == '') {
 session_start();
diff --git a/webapp/kitchen.html b/webapp/kitchen.html
index 0ce4f15..39689c0 100644
--- a/webapp/kitchen.html
+++ b/webapp/kitchen.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.9">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
diff --git a/webapp/manager.html b/webapp/manager.html
index dd2bd42..5bed3d9 100644
--- a/webapp/manager.html
+++ b/webapp/manager.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.9">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@@ -132,6 +132,7 @@ var MAN_PRINT_CONCEPT = ["Druckkonzept","Print concept","Concepto de impresión"
 var MAN_PAYMENT_CONFIG = ["Menü Zahlungsweg","Menu Payment Type","Selección tipo de pagar"];
 var MAN_WORKFONT_CONFIG = ["Arbeitsbon Schriftgröße","Font size work receipt","Tamaño de letras en tiques de trabajo"];
 var MAN_PROMINENT_SEARCH = ["Prominente Produktsuche","Prominent Product search","Buscar de productos ariba"];
+var MAN_GROUP_WORK_ITEMS = ["Artikelzusammenfassung Arbeitsbon","Summary articels on work receipt", "Agrupación articulos tique d. tr." ];
 var MAN_RES_NOTE = ["Reservierungsbestätigung","Confirmation reservation","Text de email para reservación"];
 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? "];
@@ -238,7 +239,7 @@ var MAN_SIZE_NORMAL = ["normal","normal","normal"];
 var MAN_SIZE_BIG = ["groß","big","grande"];
 
 var lang = 0;
-var generalVals = [12,2,0,3,0,1,1,0,0];
+var generalVals = [12,2,0,3,0,1,1,0,0,1];
 
 var numberOfClosings = 0;
 
@@ -257,6 +258,7 @@ var generalValuesSettings = [
 	["paymentconfig",MAN_PAYMENT_CONFIG[lang],"s",3],
 	["bigfontworkreceipt",MAN_WORKFONT_CONFIG[lang],"s",7],
 	["prominentsearch",MAN_PROMINENT_SEARCH[lang],"s",8],
+	["groupworkitems",MAN_GROUP_WORK_ITEMS[lang],"s",9],
  	["workflowconfig",MAN_WORKFLOW[lang],"s",4],
 	["receiptfontsize",MAN_RECEIPT_FONTSIZE[lang],"s",0],
 	["billlanguage",MAN_LANG_OF_RECEIPT[lang],"s",2],
@@ -436,6 +438,7 @@ function insertGeneralConfigItems(configResult) {
  		$("#partOfWorkflowConfig").html(createWorkflowConfigPart(values.workflowconfig));
  		$("#partOfBigFontWorkReceipt").html(createBigFontWorkReceiptPart(values.bigfontworkreceipt));
  		$("#partOfProminentSearch").html(createProminentSearchPart(values.prominentsearch));
+ 		$("#partOfGroupWorkItems").html(createGroupWorkItemsPart(values.groupworkitems));
 		var language = values.billlanguage;
 		generalVals[2] = language;
 		$("#partOfBillLanguage").html(createBillLanguagePart(language));
@@ -460,6 +463,7 @@ function insertGeneralConfigItems(configResult) {
 		generalVals[6] = values.smtpsecure;
 		generalVals[7] = values.bigfontworkreceipt;
 		generalVals[8] = values.prominentsearch;
+		generalVals[9] = values.groupworkitems;
 		
 		$("#smtphost").val(values.smtphost);
 		$("#partOfSmtpauth").html(createSMTPAuth(values.smtpauth));
@@ -549,7 +553,22 @@ function createProminentSearchPart(theValue) {
     return html;
 }
 
- function createWorkflowConfigPart(workflow) {
+function createGroupWorkItemsPart(theValue) {
+	var html = '<div class="ui-field-contain">';
+    html += '<label for="groupworkitems">' + MAN_GROUP_WORK_ITEMS[lang] + ':</label>';
+    html += '<select name="groupworkitems" id="groupworkitems" data-theme="e">';
+    if (theValue == 0) {
+    	html += '<option value="0" selected>' + MAN_NO[lang] + '</option>';
+    	html += '<option value="1">' + MAN_YES[lang] + '</option>';
+    } else {
+    	html += '<option value="0">' + MAN_NO[lang] + '</option>';
+    	html += '<option value="1" selected>' + MAN_YES[lang] + '</option>';
+    }
+    html += '</select></div>';
+    return html;
+}
+
+function createWorkflowConfigPart(workflow) {
  	var html = '<div class="ui-field-contain">';
     html += '<label for="workflowconfig">' + MAN_WORKFLOW[lang] + ':</label>';
     html += '<select name="workflowconfig" id="workflowconfig" data-theme="e">';
@@ -2033,6 +2052,7 @@ $(document).on("pageinit", "#admin-page", function () {
 					<div id="partOfWorkflowConfig"></div>
 					<div id="partOfBigFontWorkReceipt"></div>
 					<div id="partOfProminentSearch"></div>
+					<div id="partOfGroupWorkItems"></div>
 				
 				<button type="submit" data-theme="f" data-icon="check" id="changeConfig">Ändern</button>
 			</form><!-- Konfiguration -->
diff --git a/webapp/paydesk.html b/webapp/paydesk.html
index b5e332c..9e82edd 100644
--- a/webapp/paydesk.html
+++ b/webapp/paydesk.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.9">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
@@ -546,6 +546,7 @@ function displayProdsToPayForTable(jsonContent,tablename) {
 	refreshList("#oben");
 	
 	addAllToUnten(jsonContent,tablename);
+	window.scrollTo(0,0);
 }
 
 function generateListItem(theme,icon,id,content) {
diff --git a/webapp/php/admin.php b/webapp/php/admin.php
index 6ec1cfe..8a2c73e 100644
--- a/webapp/php/admin.php
+++ b/webapp/php/admin.php
@@ -171,6 +171,10 @@ class Admin {
 			if ($this->isUserAlreadyLoggedInForPhp()) {
 				$this->setKeepTypeLevel($_POST['keeptypelevel']);
 			}
+		} else if ($command == 'setApplyExtrasBtnPos') {
+			if ($this->isUserAlreadyLoggedInForPhp()) {
+				$this->setExtrasApplyBtnPos($_POST['applyextrasbtnpos']);
+			}
 		} else if ($command == 'getOrderVolume') {
 			if ($this->isUserAlreadyLoggedInForPhp()) {
 				$this->getOrderVolume();
@@ -187,6 +191,10 @@ class Admin {
 			if ($this->isUserAlreadyLoggedInForPhp()) {
 				$this->getKeepTypeLevel();
 			}
+		} else if ($command == 'getApplyExtrasBtnPos') {
+			if ($this->isUserAlreadyLoggedInForPhp()) {
+				$this->getApplyExtrasBtnPos();
+			}
 		} else if ($command == 'isInstalled') {
 			$this->isInstalled();
 		}
@@ -478,6 +486,10 @@ class Admin {
 		self::getUserValue('keeptypelevel',1);
 	}
 	
+	function getApplyExtrasBtnPos() {
+		self::getUserValue('extrasapplybtnpos', 1);
+	}
+	
 	function getOrderVolume() {
 		self::getUserValue('ordervolume',0);
 	}
@@ -503,6 +515,9 @@ class Admin {
 	function setKeepTypeLevel($preferValue) {
 		self::setUserValue('keeptypelevel',$preferValue);
 	}
+	function setExtrasApplyBtnPos($preferValue) {
+		self::setUserValue('extrasapplybtnpos',$preferValue);
+	}
 	
 	function setLastModuleOfUser($view) {
 		if ($this->isUserAlreadyLoggedInForPhp()) {
@@ -595,7 +610,7 @@ class Admin {
 		$right_changeprice = 0;
 		$supplyRight = 0;
 		if ($userLoggedIn) {
-			$sql = "SELECT language,right_supply,right_changeprice,keeptypelevel FROM %user% WHERE id=?";
+			$sql = "SELECT language,right_supply,right_changeprice,keeptypelevel,extrasapplybtnpos FROM %user% WHERE id=?";
 			$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
 			$stmt->execute(array($_SESSION['userid']));
 			$row = $stmt->fetchObject();
@@ -611,6 +626,7 @@ class Admin {
 				"userlanguage" => $row->language,
 				"buttonsizes" => $buttonSizes,
 				"keeptypelevel" => $row->keeptypelevel,
+				"extrasapplybtnpos" => $row->extrasapplybtnpos,
 				"isUserLoggedIn" => 1,
 				"jsonMenuItemsAndVersion" => $jsonMenuItems
 		);
@@ -672,6 +688,13 @@ class Admin {
 			$row = $stmt->fetchObject();
 			$prominentsearch = $row->setting;
 			
+			$stmt->execute(array("groupworkitems"));
+			$row = $stmt->fetchObject();
+			$groupworkitems = $row->setting;
+			if (is_null($groupworkitems)) {
+				$groupworkitems = 1;
+			}
+			
 			// for update reasons check for null
 			$stmt->execute(array("receiveremail"));
 			$row = $stmt->fetchObject();
@@ -764,7 +787,7 @@ class Admin {
 					"userlanguage" => $userlang, "receiptprinter" => $receiptprinter,
 					"receiptfontsize" => $receiptfontsize, "reservationnote" => $reservationnote, "paymentconfig" => $paymentconfig,
 					"workflowconfig" => $workflowconfig, "emailratingcontact" => $emailratingcontact,"emailbadrating" => $emailbadrating,
-					"rightchangeprice" => $right_changeprice, "bigfontworkreceipt" => $bigfontworkreceipt, "prominentsearch" => $prominentsearch,
+					"rightchangeprice" => $right_changeprice, "bigfontworkreceipt" => $bigfontworkreceipt, "prominentsearch" => $prominentsearch,"groupworkitems" => $groupworkitems,
 					"sday" => $now["mday"],"smonth" => $now["mon"], "syear" => $now["year"], "shour" => $now["hours"], "smin" => $now["minutes"],
 					"smtphost" => $smtphost,"smtpauth" => $smtpauth,"smtpuser" => $smtpuser,"smtppass" => $smtppass,"smtpsecure" => $smtpsecure,"smtpport" => $smtpport,
 					"webimpressum" => $webimpressum, "cancelunpaidcode" => $cancelunpaidcode);
@@ -1079,19 +1102,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?v=1.1.8"); };
-				if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.8"); };
-				if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.8"); };
-				if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.8"); };
+				if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.1.9"); };
+				if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.1.9"); };
+				if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.1.9"); };
+				if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.1.9"); };
 				if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html"); };
-				if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.1.8"); };
-				if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.8"); };
-				if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.8");	};
-				if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.8"); };
-				if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.8"); };
-				if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.8"); };
-				$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.8");
-				$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.8");
+				if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.1.9"); };
+				if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.1.9"); };
+				if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.1.9");	};
+				if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.1.9"); };
+				if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.1.9"); };
+				if ($_SESSION['right_manager'] || $_SESSION['is_admin']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.1.9"); };
+				$mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.1.9");
+				$mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.1.9");
 			}
 			
 			$mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php");
@@ -1100,7 +1123,7 @@ class Admin {
 			$waiterMessage = $this->getMessage(null, "waitermessage");
 		}
 		// CAUTION: change version also in config.txt!!!
-		$mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.8", 
+		$mainMenuAndVersion = array ("version" => "OrderSprinter 1.1.9", 
 				"user" => $currentUser, 
 				"menu" => $mainMenu, 
 				"waitermessage" => $waiterMessage,
@@ -1311,6 +1334,7 @@ class Admin {
 				"paymentconfig" => array("dbcol" => "paymentconfig","checknum" => 0),
 				"bigfontworkreceipt" => array("dbcol" => "bigfontworkreceipt","checknum" => 0),
 				"prominentsearch" => array("dbcol" => "prominentsearch","checknum" => 0),
+				"groupworkitems" => array("dbcol" => "groupworkitems","checknum" => 0),
 				"workflowconfig" => array("dbcol" => "workflowconfig","checknum" => 0),
 				"receiptfontsize" => array("dbcol" => "receiptfontsize","checknum" => 0),
 				"billlanguage" => array("dbcol" => "billlanguage","checknum" => 0),
diff --git a/webapp/php/products.php b/webapp/php/products.php
index 3f8a256..6db0e02 100644
--- a/webapp/php/products.php
+++ b/webapp/php/products.php
@@ -651,7 +651,7 @@ class Products {
 			$pdo = $this->dbutils->openDbAndReturnPdo();
 			$pdo->beginTransaction();
 			
-			$ret = self::createExtraCore($pdo,$name,$price);
+			$ret = self::createExtraCore($pdo,$name,$price,array());
 			if ($ret == ERROR_NAME_EXISTS_ALREADY) {
 				echo json_encode(array("status" => "ERROR", "code" => ERROR_NAME_EXISTS_ALREADY, "msg" => ERROR_NAME_EXISTS_ALREADY_MSG));
 				$pdo->rollBack();
diff --git a/webapp/php/queuecontent.php b/webapp/php/queuecontent.php
index d8b950e..18b9db9 100644
--- a/webapp/php/queuecontent.php
+++ b/webapp/php/queuecontent.php
@@ -342,6 +342,16 @@ class QueueContent {
 		}
 		$queueStr = implode(',',$queueIds);
 
+		
+		$sql = "SELECT setting FROM %config% where name=?";
+		$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
+		$stmt->execute(array('groupworkitems'));
+		$row = $stmt->fetchObject();
+		$groupworkitems = $row->setting;
+		if (is_null($groupworkitems)) {
+			$groupworkitems = 1;
+		}
+		
 		$sql = "SELECT %queue%.id as id,%queue%.tablenr as tableid, %queue%.productid,%queue%.productname as longname,anoption,%prodtype%.kind as kind,%prodtype%.printer as printer FROM %queue%,%products%,%prodtype% WHERE %prodtype%.kind=? AND %queue%.id IN ($queueStr) AND productid=%products%.id AND %products%.category=%prodtype%.id ORDER BY productname";
 		$stmt = $pdo->prepare(DbUtils::substTableAlias($sql));
 		$stmt->execute(array($kind));
@@ -377,13 +387,51 @@ class QueueContent {
 						"printer" => $aQueueItem["printer"],
 						"extras" => $extras			
 				);
-				$jobs[] = $theEntry;
+				if ($groupworkitems) {
+					$this->grouping($jobs, $theEntry);
+				} else {
+					$jobs[] = $theEntry;
+				}
+			}
+		}
+
+		if ($groupworkitems) {
+			// new put the count number into the longname
+			foreach($jobs as &$aJob) {
+				$cnt = $aJob["count"];
+				if ($cnt > 1) {
+					$aJob["longname"] = $cnt . "x " . $aJob["longname"];
+				}
 			}
 		}
 		
 		return $jobs;
 	}
 	
+	
+	private function grouping(&$collection,$entry) {
+		$extrasTxt = join(",",$entry["extras"]);
+		$found = false;
+		foreach($collection as &$anEntry) {
+			if (($anEntry["longname"] == $entry["longname"]) && ($anEntry["anoption"] == $entry["anoption"]) && (join(",",$anEntry["extras"]) == $extrasTxt)) {
+				$found = true;
+				$anEntry["count"] = $anEntry["count"] + 1;
+			}
+		}
+		if (!$found) {
+			$collection[] = array("id" => $entry["id"],
+					"productid" => $entry["productid"],
+					"longname" => $entry["longname"],
+					"printer" => $entry["printer"],
+					"anoption" => $entry["anoption"],
+					"kind" => $entry["kind"],
+					"extras" => $entry["extras"],
+					"count" => 1
+			);
+		}
+	}
+	
+	
 	private function doWorkPrint($pdo,$theTableid,$insertedQueueIds,$username,$payPrintType,$lang) {
 		// is it server or local print?
 		
diff --git a/webapp/php/utilities/basedb.php b/webapp/php/utilities/basedb.php
index 3ca8eb4..2634e7b 100644
--- a/webapp/php/utilities/basedb.php
+++ b/webapp/php/utilities/basedb.php
@@ -230,6 +230,7 @@ class Basedb {
 		`prodbtnsize` INT(1) NULL,
 		`prefertablemap` INT(1) NULL,
 		`keeptypelevel` INT(1) NOT NULL,
+		`extrasapplybtnpos` INT(1) NOT NULL,
 		`active` INT (2) NOT NULL
 		) CHARACTER SET utf8 COLLATE utf8_general_ci ENGINE = InnoDb ;
 		";
diff --git a/webapp/preferences.html b/webapp/preferences.html
index 66a6f89..696bca4 100644
--- a/webapp/preferences.html
+++ b/webapp/preferences.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.9">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
@@ -56,6 +56,10 @@ var PREF_KTL_GO_HIGH = ["-> oberste Produkthierarchie","-> top product hierarchy
 var PREF_KTL_DESC = ["Soll in der Bestellansicht nach Auswahl eines Produktes wieder an den Anfang der Produkthierarchie gesprungen werden?",
 		"Do you prefer to jump to the top of the product hierachy after selecting a product in the waiter view?",
 				"Donde quiere Usted empezar después de seleccion de un producto?"];
+var PREF_APPLY_EXTRA_POS = ["Position Extras-Anwenden-Button","Position apply extras button","Posicion aplicar boton extras"];
+var PREF_APPLY_EXTRAS_OPTION_TOP = ["Listenanfang","Start of list","Al inicio de la lista"];
+var PREF_APPLY_EXTRAS_OPTION_BOTTOM = ["Listenende","End of list","Al final de la lista"];
+var PREF_APPLY_EXTRAS_OPTION_BOTH = ["Listenanfang und -ende","Start and end of list","Al inicio y final de la lista"];
 
 var l=0;
 
@@ -210,6 +214,10 @@ function setKeepTypeLevel() {
 	doAjax("GET","php/contenthandler.php?module=admin&command=getKeepTypeLevel",null,fillKeepTypeLevel,"Keine Information über Bevorzugung Bestellnavigation");
 }
 
+function setApplyBtnPos() {
+	doAjax("GET","php/contenthandler.php?module=admin&command=getApplyExtrasBtnPos",null,fillExtrasApplyBtnPosPart,"Keine Information über Position Extra-Anwenden-Button");
+}
+
 function fillOrderVolume(volume) {
 	$("#slidervolume").val(volume);
 	$("#slidervolume").slider('refresh');
@@ -253,6 +261,19 @@ function createPreferKTLPart(prefervalue,label,labeltxt) {
     return html;
 }
 
+function createPreferExtrasApplyBtnPosPart(prefervalue,label,labeltxt) {
+	var html = '<div class="ui-field-contain">';
+    html += '<label for="' + label + '"><span id="' + label + 'txt">' + labeltxt + '</span> :</label>';
+    html += '<select name="' + label + '" id="' + label + '" data-theme="e">';
+
+    html += '<option value="1"' + isSelected(1,prefervalue) + '>' + PREF_APPLY_EXTRAS_OPTION_BOTTOM[l] + '</option>';
+    html += '<option value="2"' + isSelected(2,prefervalue) + '>' + PREF_APPLY_EXTRAS_OPTION_TOP[l] + '</option>';
+    html += '<option value="3"' + isSelected(3,prefervalue) + '>' + PREF_APPLY_EXTRAS_OPTION_BOTH[l] + '</option>';
+ 
+    html += '</select></div>';
+    return html;
+}
+
 function fillButtonSizes(buttonsizes) {
 	$("#roombtnpart").html(createBtnSizePart(buttonsizes.roombtnsize, "roombtnsize", PREF_ROOM_BTN_SIZE[l]));
 	$("#tablebtnpart").html(createBtnSizePart(buttonsizes.tablebtnsize, "tablebtnsize", PREF_TABLE_BTN_SIZE[l]));
@@ -270,6 +291,12 @@ function fillKeepTypeLevel(preferKeepTypeLevel) {
 	$("#preferktlpartbox").trigger("create");
 }
 
+// REM* position iof apply button for extras
+function fillExtrasApplyBtnPosPart(applyPos) {
+	$("#preferapplypospart").html(createPreferExtrasApplyBtnPosPart(applyPos, "preferapplyposlabel", PREF_APPLY_EXTRA_POS[l]));
+	$("#preferktlpartbox").trigger("create");
+}
+
 function handleBtnSize(jsonResult) {
 	if (jsonResult != "OK") {
 		alert("Fehler");
@@ -346,11 +373,18 @@ function binding() {
 	
 	$("#preferktllabel").off('change').on('change', function(e) {
 		var newVal = $("#preferktllabel").find(":selected").val();
-		$("#preferktlbtnpart").html(createPreferKTLPart(newVal, "preferktllabel", PREF_TM[l]));
+		$("#preferktlbtnpart").html(createPreferKTLPart(newVal, "preferktllabel", PREF_KTL[l]));
 		$("#preferktlpartbox").trigger("create");
 		doAjax("POST","php/contenthandler.php?module=admin&command=setKeepTypeLevel",{keeptypelevel:newVal},handleGeneralAnswer,"Keep Type Level");
 		binding();
 	});
+	$("#preferapplyposlabel").off('change').on('change', function(e) {
+		var newVal = $("#preferapplyposlabel").find(":selected").val();
+		$("#preferapplypospart").html(createPreferExtrasApplyBtnPosPart(newVal, "preferapplyposlabel", PREF_APPLY_EXTRA_POS[l]));
+		$("#preferktlpartbox").trigger("create");
+		doAjax("POST","php/contenthandler.php?module=admin&command=setApplyExtrasBtnPos",{applyextrasbtnpos:newVal},handleGeneralAnswer,"Apply Extras Button Position");
+		binding();
+	});
 }
 
 $(document).on("pageinit", "#pref-page", function () {
@@ -362,6 +396,7 @@ $(document).on("pageinit", "#pref-page", function () {
 	setButtonSizes();
 	setPreferTablemap();
 	setKeepTypeLevel();
+	setApplyBtnPos();
 	binding();
 });
 
@@ -422,9 +457,10 @@ $(document).on("pageinit", "#pref-page", function () {
 		</div>
 
 		<div id="preferktlpartbox" data-role="collapsible" data-collapsed="false" data-theme="e" data-content-theme="c" class="noprint">
-			<h3><span id="preferktltxt">Tischplan</span></h3>
-			<p><span id="preferktldesc">Besxhreibung</span></p>
+			<h3><span id="preferktltxt">Bestellnavigation</span></h3>
+			<p><span id="preferktldesc">Beschreibung</span></p>
 			<div id="preferktlbtnpart"></div>
+			<div id="preferapplypospart"></div>
 		</div>
 		
     </div>
diff --git a/webapp/products.html b/webapp/products.html
index 01d469c..a35a6e9 100644
--- a/webapp/products.html
+++ b/webapp/products.html
@@ -7,7 +7,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.9">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
@@ -63,6 +63,7 @@ var PROD_ASSIGN_EXTRAS_ALL = ["Extras allen Produkten dieser Kategorie zuweisen:
 var PROD_PRINTER = ["Drucker","Printer","Imrpimadora"];
 var PROD_PRINTER_1 = ["Drucker 1","Printer 1","Imprimadora 1"];
 var PROD_PRINTER_2 = ["Drucker 2","Printer 2","Imprimadora 2"];
+var PROD_PLACEHOLDER_NEW_PRODTYPE = ["Name der neuen Kategorie", "Name of the new category","Nombre de la categoría nueva"];
 
 var decpoint = ".";
 var lang = 0;
diff --git a/webapp/rating.html b/webapp/rating.html
index d9f2bfd..6c71f24 100644
--- a/webapp/rating.html
+++ b/webapp/rating.html
@@ -7,7 +7,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.9">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
diff --git a/webapp/reports.html b/webapp/reports.html
index acf91c4..b87ce7b 100644
--- a/webapp/reports.html
+++ b/webapp/reports.html
@@ -7,7 +7,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.9">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
diff --git a/webapp/reservation.html b/webapp/reservation.html
index 965311c..2d03b29 100644
--- a/webapp/reservation.html
+++ b/webapp/reservation.html
@@ -5,7 +5,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"> 
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.9">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html
index 181d1d8..5ecb5b8 100644
--- a/webapp/supplydesk.html
+++ b/webapp/supplydesk.html
@@ -5,7 +5,7 @@
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
      <meta name="author" content="Stefan Pichel">
 
- <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
+ <link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.9">
  
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
diff --git a/webapp/waiter.html b/webapp/waiter.html
index 1d390f0..e05d5b9 100644
--- a/webapp/waiter.html
+++ b/webapp/waiter.html
@@ -4,7 +4,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1"> 
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
     <meta name="author" content="Stefan Pichel">
-	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.8">
+	<link rel="stylesheet" type="text/css" href="css/bestformat.css?v=1.1.9">
 	<link rel="stylesheet" href="php/3rdparty/orderstyle/orderstyle.min.css" />
  	<link rel="stylesheet" href="php/3rdparty/orderstyle/jquery.mobile.icons.min.css" />
   
@@ -95,6 +95,8 @@ var supplyright = 0;
 
 var keeptypelevel = 1;
 
+var applyExtraBtnPos = 1;
+
 var prominentsearch = 0;
 
 var osroombtnsize = 0;
@@ -668,6 +670,7 @@ function insertWaiterSettings(settings) {
 		rightchangeprice = settings.rightchangeprice;
 		supplyright = settings.supplyright;
 		keeptypelevel = settings.keeptypelevel;
+		applyExtraBtnPos = settings.extrasapplybtnpos;
 		prominentsearch = config.prominentsearch;
 		setLanguage(settings.userlanguage);
 		
@@ -1119,6 +1122,9 @@ function attachAndDisplayFirstRefTypes(jsonTypesAndProds) {
 function listOfExtras(prodid) {
 	var size = getProdSizeClass();
 	var li = "<li data-role=\"list-divider\" data-theme=\"b\" data-role=\"heading\">" + W_EXTRAS[lang] +"</li>";
+	if (applyExtraBtnPos != 1) {
+		li += '<li data-theme="c"><a href="#" id="extra_atop_' + prodid + '" class="extrasel ' + size + '">' + W_APPLY[lang] + '</a></li>';
+	}
 	for (var i=0;i<w_allextras.length;i++) {
 		var anExtra = w_allextras[i];
 		var extraid=anExtra.extraid;
@@ -1131,7 +1137,9 @@ function listOfExtras(prodid) {
 		}
 		li += '<li data-theme="' + dt + '" data-icon="' + di + '"><a href="#" id="extra_' + extraid + '_' + prodid + '" class="extrasel ' + size + '">' + toHtml(extraname) + '</a></li>';
 	}
-	li += '<li data-theme="c"><a href="#" id="extra_a_' + prodid + '" class="extrasel ' + size + '">' + W_APPLY[lang] + '</a></li>';
+	if (applyExtraBtnPos != 2) {
+		li += '<li data-theme="c"><a href="#" id="extra_abottom_' + prodid + '" class="extrasel ' + size + '">' + W_APPLY[lang] + '</a></li>';
+	}
 	li += createHigherLine(size);
 	return li;
 }
@@ -1143,7 +1151,7 @@ function bindExtrasSel() {
 		var ids = this.id.split("_");
 		var extraid = ids[1];
 		var prodid = ids[2];
-		if (extraid == "a") {
+		if ((extraid == "abottom") || (extraid == "atop")) {
 			var aProd = getProdEntry(prodid);
 			var allAvailExtrasOfProd = aProd.extras;
 			var assignedExtras = [];
@@ -1324,6 +1332,7 @@ function bindFavEvent() {
 
 
 function displayTypesProds(ref,extras) {
+	window.scrollTo(0,0);
 	if (ref==0) {
 		fillFavArea();
 		bindFavEvent();