From 02d99d886577bc46e6b196e42c114e985c9b1523 Mon Sep 17 00:00:00 2001 From: Geno Date: Thu, 19 Nov 2020 23:03:04 +0100 Subject: [PATCH] OrderSprinter 1.3.11 --- javaprinter/javaprinter.jar | Bin 60460 -> 60592 bytes printserver/OrderSprinterPrintserver.exe | Bin 260096 -> 260096 bytes spider/install/installer.php | 2 +- webapp/OrderSprinterPrintserver.exe | Bin 260096 -> 260096 bytes webapp/bar.html | 2 +- webapp/bill.html | 2 +- webapp/css/bestformat.css | 2 +- webapp/feedback.html | 2 +- webapp/index.html | 6 +-- webapp/install.html | 2 +- webapp/install/installer.php | 48 +++++++++++++++++++-- webapp/kitchen.html | 2 +- webapp/manager.html | 24 ++++++++--- webapp/paydesk.html | 2 +- webapp/php/admin.php | 51 +++++++++++++---------- webapp/php/printqueue.php | 3 ++ webapp/php/updater.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 | 4 +- 24 files changed, 115 insertions(+), 51 deletions(-) diff --git a/javaprinter/javaprinter.jar b/javaprinter/javaprinter.jar index 9613657829c7c5a2eddc9c9c578bec5fdd9078de..61e390c169b3996933d1955edad7c9f78051a394 100644 GIT binary patch delta 11505 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 delta 11357 zcmZv?1yEc~6E?cIyL)hl;K4(1mn?2Uf=kdqkPYq-SX_geTE!)7{fO(=(^eQ(ZL=S2hQSp{582j}JgbMh4Kp`&DC*!NB3b@qk%j7~vvn zeIS}JiIjf;$Pv}>-;pCK4#++=C;YP**Ej_@VucW*#;}G7hyA1{W={cLT)~By@$td` z0U&9DWT?*u8YOX2;i%#Lz^dx3ATACwI};a|1a)OcJT7b>hok}&w4gd>sUln?O#6IO z>IV97V2&1x9=1XWaB#$lA#5s&!ZXA7o=ruL{08PhodA+%P(ny&H}5FI<0vLl|FO*% z?j}$Vg%#G3VNYYErP{B>4$Q!V1|2p20=mu)lv`D6E+#LDJe-{Zs>FW>^`|E+c*d<+ z$ecx1@?#8uXXvVay!;VZ(7w0gtNp^J5k|8r+&Pj_2X9U;GT-ssI_o}VuW)!yDP7B2 z+Y{WDG{_XG%utnfpZmS(b^gY-(Nq{S>@uWnECqHennagiJCowq0ElmjDQ?K~WwDYH zA?bB^%H}Yu3jMjau|eAkXmbREQa__6T$bYKln6 z$HzTid|&{8Pp|;M|ILN}vr&*9RV5hl*Ay_qeL84&wb&bxFbrq?@=9B;qEeQGB0Sl) z4l47!#bEvzqHkk1wR|#U@c&~-A9e-=DN~n(Az3UIK(%?2GX5W_fg}pBojL}%Vighe zO$WsTI79H;ksEw%arOlpnfnDX4lIfvj8r_z*I;Q$Nhz(4d=&=HmoHODEE((;^lWVP z7jw$LMF7iLXG~cY;84r8^zEPeh6W3ItjpIvlDnWIuXAp&60+8i?27YoBQ*W)(X!Do z^V8uPCv0;5HVM;PWcx^m=mMTo^HI=fVA3L&aOP;a{Coa+5;(CSmK03JoPo==^F@J$ z>hw3dmTx4!F(td0g?Vsird6tmHTr(@ca$jU!hD@Q=}$#~DyhFA-(22Yx;$DIS;uG> zwD$wZma0QB(!I4zQI=df1Fs&kc!&qgMs>V13*-z;zb_%6Z=nn}_SBn88_51{ga@5W{;`6s@9FnQHVO%a{nux9Qc z$vYog#WVHFRZF`hSJ-51itKyK;!)kcX>kPy>ae~ebm5?!vYXVgqj9vyekHPLv|FV5 zrJo^msY}jw9aC(>oxAAW27@U;5HVLHJO{(* zi&WN0cM)60fXFdHLYjAg8GHmaF%SGyr09&_3wJSc-Z*~AMjiNMY9xj+7WMRIr8S32 z#coQ;Ry45-ljO#2Y$awf**;xyiaP3-NFpch|m)5MBX>9X3q16QB?Lh7hg<*Fzi` zNQ`}kzCt^M@q4dIrS(JQ=c2rsqmOGp@U8UJ#g7t66Nv;>NbIe@&f~o_*0OT@jLUM@ z+S}=MV${1EY*nZ17$qC!CSeePMeNbm`Jt6N6SY3Q&B}Hdqyk+p&I`gC#4#tr1XBoEFKfUsgn|bTUayP#8LnrEw%ov{Upc9i&JsaqNQX-`KYuHgW_TlHu-W z)qTJ^dY_<7WT&<^DZn{;N9;C+XhF##yj5paB>5a;1$PmBQCx zjpfEp5bC#K=5D)cLy?Hb&zkx%(@oJclMp$3?6D1LI8OZO3x794UnXO|;4ALf_*b{p zK}mErtmhLrKP#~0IQ4IsjnMdm3JL$zCAQ1<=3)$V0wQ0Km*74B}j84~|wr)UYa2yYSI8B77YNBNYR<}iH99O=<$ zT}aA=eesfDwShOp@C9&$+mNpIW#)S~r8B#CAMyL6UQA0nuaL)vU0LM$i!YQxUamUN zb~^8OdYyTJjk@?86!^dAJETBZ2pb+IdYpTwYEFkI357e1&1J)@)4hEeYvv zq^&J=p*p=VMgeDUDYJsx13ScJSbpw#B!LJtw*!!mw%(GkdCqR+GPBdx{DyZ_PX3s3 zDR9s?{#{XJT9Hi_(4{uw1?b}H1R35_NB{E3TB*X~`>wyX=!Km-d$yGaSF{|{wD*fr z$rI2)8R+#AQl9^IFP?rzfZhW>;EU)R&6q@R*;=Q1hSzec}m42j!ldHTd0vI;8+N230izkWGE2>0^Sp)>8|(LOmTYspT#8TGNJY|)GR|d|BGfY6 zRS!)gwVX{AX$|$d+T8A&r6}6pPJQzpW;>fw2 z><_PTzjwL2JUTraq!c4f9MprnCKB0)tMJX)QL&oT-U=$}_r8IAsG5Y857*j~j1pJB z3f!#qOa98ZAPYXj`GIcd#ws6f*6D{TS?LGS`I7NOu}Cr&9dvNlAr@N4uZR1*E|%(C(l`F^q9o1pxQ)~VM^uM?Z?Hs(>6JJq&?6asqf$XqD*SbTT<{`9GL!;1-&D3HczXDaL_$tR; ze-(qm3LySkq^Bf%{8p@?q75;=%R7_S9yIBLq$4>_w7MyT+ol?Qgd)teISDEEy>~ThmDaqRJ*sG2D z%p}l{%}b0%^1MMrQ#&?$jffvNTBUw1z$RXMupOW3tZdYXM0%seYMieaK_`nW3iwXXs}0IR4`Cr^@j3yKliW|(1%~raxY5qz2JVhhhQX7) zkudxm;|oih(vAeYg?W!!8Na9g!-(cnka;=j-bzU0^_l~mUXCgo6xuju*19U!WjB%H!pJHRN-q+yDyou^$Z9=Zpq~=RKG48xn{lF%t zYO`F3-?r9U1fFAa-7c;6w)uhd>QUW+?rSL*vrphOsKiMl0YejwTq47-OZH`|qb)k0 zl+Jgg>n1kUuU?b;N&H7|3x}_o?=iIt<5o%A-p0y*$W$mWmo$q>CFYu=JfB8)EIMs& zk+XI6NKyGo7)t~d8*YVq7Ej4se|Wq$Auk=GTT%@}3fmVOyj(Rnuw?a;GxM$9_!@Gn zfpwl=0?OPUy3nCK&!^mmmLM8EOdA%emwyeawn44tE&3@jZtZPXEjtex5%K@XJP_Rl zo8^qtoH}s)qAp{Qe(j@2GImq%%1H%oXu(xcF^-u)@BZ*hx6m{iMrz7;u>Ik*I9**{ zh^O24)~(D0+&13bngGg~7jIi9eny<-mmw~O)_`27wpY%X#(vyT_}?dUqZ+SEtZ`*l zP+30QaF3}Quc>e8R@{j3uOS&+ih zmodzQ2Z`G|xT#Ye_tr>woi7zKi;&A-q+QS!!*;VamK_t+xPbp zQnpYtNVj4;67HJW#S9Kwem@N3hDbJ?x-yn#b9kV5-+qe%w@EK_QL}O-CtFy5D0BO{ zpog0v_FIYkNRYRD!qoTkWA|&{{>BHQKOd$lt34ogOaNej`rj|yKWxQGA_e$p6$dhC zB98b>UpxU2W~(MR_zy62auBF35C;C^pMT=^x_{Y^GzY$C;v=?%0({~?3qtWQm~s1E zY2nF}%jn7GX&3XJY^ansjtyI?9hpqOcjz-)0R2!u_mB>$yjdOz7Y{CX_B3;Wc?X>` zb-A355;cvQUdTdRqy+Es*IEq4&jq%yC2+5xnnuP8)I z+$`KCI=Ki8B0qM>@r-PNcAX&xScy!pSCUd*#zH$#KLI)L@)^!z8FRVuc*@j+P};t= zPIfD8G7lF;Fq&SrE`yp)i+hWDi@tKqlOEcH7p$K-s0#69I5p|$eGGP@vG6P}CdT>3 zh~G)yXTOr6!oV_1k9T+)otn4+PNLaJRnWI-ZNMfXYmhS;`6Oa?It0g2eN=z zMBmZHkA?6R@l{>Dg4Lzws>V!WZkQA`bV_Z?F%SRxEnS3>Q~;Db7pm;9#i*1^6-#&cQs!xa6pMVN7haGs3M*>ksn+I6JvA2|?x1SKifX4!5yM5YW1EP4k%s7sipsV~ z!b2%wL$fWZa4JYDXG97;&VC{@Qzs`1Jze1c0(hctxN*MQ(kY@-X`0Xxuw);P619FlP*j4hc5tiH?#| z{GjD-fe%y(Z`~5`9iyn^^(Ia2zY|DIoO}&~+aUeq0n68*@79>THATo1OwDI>99zT+JE;lv`k2uq%@&APQnmut@652s}e(Fv_Rb~X}DH9QAY*(|mwpq{L{IAa>~P^~n@y1>r|9 z*xeP#9hSvw*U-@XG&WrjNGZ4WniwT8w&b`-cjVw~z|lkp|iro+|=u`h7s@ENs4WD(z}UIkj#c66(r1_HY-f<46d13?x= zepy_MjO%3C(a}1CA=f8pc#rfN#b7FhWM=m5L=Dc@}%H5j$G(VV;4THEsC?G~4(5rG@EF87AA#a`HP?KvF zd1*;1H{e?LDA;QHKyAsC&;?WpivbB|Rw%oF8;D;728(_ZU13lfyRbCxuq-jy4ZtX; zo!nOUR&Sn1D<&y8Q{)6D9|qA-gqgF{aim%R95oRNSbz{YgZ&7-Ed0*Vj2s0ice#*k zi?>cmvLjox?7yHXC2}Ls2_M`~yDCYlGtwDlss~0^B`)0#mC~LS9zZU>dJqqTO;~Ya z$@|G3>!FK}HYJ!oB^FvD`X(i~nk=o344QnunbT_SX9k_#Ghi`9-f0FEYn3Rx;SZa# zox*Ux^S;Gr88x?1U`-Gj18VNw+ripb?KJ-qSYJc=fczjLM4mp_lUCBHMl^X1Za%zn zFQ_ZgB7$UVn-HoIUNfXL1cDx#_43txgYBD{O4ejf-k41`WUfT=$#W<(a=;hy%?MF{ zZe}E~jk)%k{^V}ECap0T{@w>%Ow<1!J=gHw&K*MDe?U-B0@j`V(ch~aUb)ZG>;YZFljc}&;ci;(R^X(zNbz@%PT0WeNKM#y33{@B+q0dmIpNR_I zBWaV{{pOZ20jy0B*#Jc;=5OM)IfR!FW1fDKb*Lb}_K06f+d;RLm8=n%Azj3tZKEZ> z4ro`H2ry05L27Si-qgnI7Y}~8m{YCv-R`d>`(;g|Dt>+lMZepv-?G@d_O{`8P5n5! zzBpE7INC_h8~M8bwzhD7?V69Wcj=3MOay6K#_#oBi=>}p^PV8ak<6j_+rBZ%-p(%@ zFA0NC38{J~)jH0)m?k#V`cG@2F9$D&2GwHwwFMms1uZChzPjm9W~BQN|rC{uY%b}w91os z98DCqqx5>2gasrVXj2_CMp~UXrf6k)>(URgrwo*}V~6U`kq8CmBa{Yzu%65BbddeF zR&<5F-u0FB9Wba>;u!l!h>wJ^ggLS{`YKm+9r_vz^m3+A;wN^UW*Q97m%EplsJ~zv zVO)^4L(Zd3EnPakbv1}33k3e4b`3m_G5vV{vT5@(Nk9>3*|O*}j%yU<=UHYvsBYhF zz;AztOczcM>VfP0CL;~@BAayzQPG%{Eo#NJFd(SY9;vg7mP2j~dP1RX6V z2iC+LjzJj#Ojw`L9HznvRSAW|7t;b(OqSHSBFFS=@DkOk8COY&&ym?y!f6}cngAG1 zb$R_OgIj$;^*^LuwekCV6|1;5`L6_9T!S0hvggM^q6VPXKZ+k-m~BlPcw{)iCdM8P z4FnNH`ZCiR1=BM@l@Mg1XFpk{U*?pmM}2DvF$#{T!Xe7dge>-_?>E$tCB-q?j;n?( zszp?qh*Ex?mYfTe#qP*$AV+dS_>JyHOf!|ab_D$ZqBrW%y!lvjgu%Po7w!m`hN;%a;KeuftxpsTO-rG~r zOtBvR-!@20eM4P*KYgPN@k~r|54el>`TY_q^U4LuIZ3!LInD^quAYN;-0@x8Z?Epx zdJ~mg25^tOrHDUH+79qes3b#kW4`e8wv38y@q@l@N^Vj};%Fl;5}ndFSGnQgGG_I> z@9d=((R8d90&1x+#Kc8(il#YfU7n&GHH7(I?K1_jA0Tdz9I09HL3?gT-JFBU_4#kThj(R(R|v&YQPzQ5jH9K5fXk;smRx@4Fm|Y??d2sh8Xmz zekZLBPvjc!nY&bn>e5dH!29-KH+iTqighohXAEHL(^rRX-P3w2F{7-YR>^@z{AJA) z(tp-w^M8o!BbS_OZ>BPFz=RJwPWRCf7vw9;N{1;!+T8)y?qDyAD%}O|tRtI`Q*e5ekn-ox8p5n0z5 zh3#2;)A9cNMJhuWrV?%jsKyGE61ozRpSa_{D?P*rFp}$gZFQzQuBg+?X@TSTj&?j4 zs(WOVJZ*F|;@_y<_2S);CgsCC<-}oAE?ccX=P^$RJE38bE&ho|$9ff5%M&d@Fz@U* zD61eaZ&X-zdN|;R!s|+pSNaZP!xKDc`LgI5FZ=mp(a;WLVp|s(6dhtgiD-d?Z)#fJ z>9A9(4~1y%tZrs((I{@w--EVrG>^I)DCdb>ofjKx7$b%id|GcfXs>YPPq<@01&z#J zH(ar3t??!Pn#D1b_#XEDT8z*@Vh?s`nN1_cGWL^*VsoE-vq9!s_t&P+GsDFbJZnP1 zL2Ms+wAl;_B<|a{hi&;oLF{-h^xBix%iGm_NQqTGJn*O}?bk|&P>mN+P3{VKJbHkY z9&xNs3FjZL=os~DRO-w#>;@9c63f7gjDouX8^qfa13^Jb5&1SLhwA}CX!D-&g6S=U z(-fLBBj+JA(wEUTO_o~m7{#fFcj+vv>7aK958>3`K6S2p{z|;Y11&tfz4~%&!hh_3 zerphHtW?7v|BXLydy+CAnnxAywJzdTtS9Lcbf8K<+gCnv3lG82RE~r8J96@uk})$g ziJBsrvmf(cZ;(@`wdlIC0+V8mw+Q?AU3>#7vX9Z%t(jNn7 z1GuC@`}oQ~3#yfZ4q^Snv>l@q6QUr-GMKj6&dwGDC$P+q~Y6?-=M z?P)H$$@?Hl5T8{aBVwO!EPaVFhbDPAseUz}D&!6izH&sV#AjO}pA=a56|N5Lx(VK1 z+z$T?2`{V*HpHEBX8p>|2IPtk4+e&8e#I<5Cwb*+E12W%(tAv%jv~C1S~b1s{_bEk zg{1`B)2E?a4TO(D<2tCE?Q}a3WSGRM`Fb2}_l}JQx8079EMl5GSg4&$ANwcp{DfUI zFlib#YTX8nAcJ~5w^nAtkI3!SmOv8Jv(yU+RRCwOMpP+WI?v?8=_5l6he>xAql;p2 zZjsXxr#`b=!rXs{ApGVHSHbwro2CNe%hh45^fL+jUL+qLMABiba*~95kLz!&a3Trc zcK=A^o&Ss8aXQl&?hpM0;(*H|8{VB4^?)pO_VM6Nsx}M8vAl|_`2+#D= zY{bjw)~}fY{IEd;5sUo%Ttx%!NMw5+I7$5Rr-ck8QT`>SP7-M#=qW2m&!b0F6mb;@ z5UgxfSh#=|Z?H)&?=v1=#s#L>#)Qn~lK<68uB8EEZeu|h^9f*{C1XptARh{3|Bn9Y z>=z3C?HE+kfWL3!K=g}wV4h2ZVoR=`M+&IA(fg1zhD$sxN0A!+2TO59UEm@kdy)f_ieLjV%?Yl2hRahUY z20E+gT`NUkXM~5prtjM&@$~X-?e%Ib7EBP31|CC+rxUVr7&WR98lLgUIwC( z(9cba=qYs{41>3N!*-hEUx(Rr-}%|frc*c5ir~zUOy)aByvV$vsGyF52=S(yB-2ue2XUY@Dw8)X34$Vs;&AM~AW;D-}}b}e-UDERvs4Uo= zD)qfw(vKzfSYdO-?DGI=I;uyONrjD2m&E4vh@c8TjKwv|CS081|NWaq7cycXXV>J(a4$xJ3fIR(TB`2?;2-nw16VByW; zcjD@5R&XRXT#vsT|C}lPo5dQArwXERxPQ;opB#HSG04w3mfbZ0`<(P?f`1MJIH?!w zx$DX!6$C_pj-%SJje=e*~fsK5263f&Wl44Z=0vi4ONv zAqT!%l6wkWd>R=;vS~fLB7+8G3->SVo3jZ?PRR4$r z0QVYC3S>_;Rk&17gtx*$fFCzKA^;GH4ggU6N6;PobCvDcQOq?mm~Al2ngUD=*lmsG znFCS?E5?B!4LBG1}O>twJ9e&Eb?a&Vm=&VM5PV`2g^EC>bx00>3_0NDOx;wtD_ z$zkKUUJ)F#K?b7^KH4DuA1@S>7}qRN0f3))008ZOOawm3bHDgA&A;%|)&0*;I1y|D z#rq$>l5=Z?qMyX(pPv6Ntj)6mIBt{pIll5uGFZu^KQ_S2o21XsuP4Yn`58h_LH{3r zdwIuXX`XVu;VIYY{_z9=umqcI@w|At;Q!+<$$w-PbDj*7fycJ~ZqCXU87yw@6GZd$ zBKSMK&^8(DhrDOVa~t>hEfD<#HReA-bl|aVqGu;}pCI1CXQ}-{jQ@!rJ$;EA=c%l( z@abXsj{`YHPfD+zk4id}3>K~A*~TK2;b2VeFq*j$GBJQ*tB zY0HoSfdB9A{5M*|a8I|zL61pTObhJvec{%5hJ zI3KGJ-~oUwBmjWnKmOo?-|g}}`~2_a!~7o^+lFVuXJ)Gw_mY*Qv-e>6P>H-t)6FkEl z`(&`A1OEr6dGU0IDWHS;ThE>n1@PoQ<9~c(8Txp!Joyj@EsxE~*^Mv^QPZw*Satrp5+MV~=U$;vz9PrO0!8x(EbGX`>O%Nh3sx@pu z=Syhhe*^I&fB{BL5us!|fQWn>fU&Bvvrxj=XthTC6C0xzNe2-HLk;3$!$xbDc)7|5 zAf=*vW4cilQGZb0i8xJphK*_bRS7XMuWAi*B_%VE4DrsaW(xR_hf5AAU3N%i z0|1n8$rMOxyen)GV=3y<@MxB*UI=%wv_?ZjKgKfEL7hA-OP$uq6`75pl5Y#;5o<12p6frOb9~MKP7e1`!Kmk5%=0G=m1Uv}gl1{pCV$ewf z5+fxKH|nZHZa3+qGbd)}@}U4MTs8*^)$g6&A-O!tZuDhgrNS+Oe~ATVnge;dHk)g$ zdJI;f2kImHtin!P@DcW&bGZQ^#@7a#hqUB1~aLVKJUMZ3}LOW_TZTI&;rS{Ka%y@KJWh|py_%CQ}d7Im5{ z*A{{5=?+sM5}#w#&C#9g;by;zeXQ%aDmq*i9H#l))#t^2KvO4_@!?c|a}~+d0}M6X zSsfoOYZ^h*IHM?^-c0VMi-Nj7+I>6qnH9DE?O3WW8T0Ek=1N_(wTrwRzBC$kLm)=I z7Jb%ADHPP>yi_m5bT(3jjE!NjaS~r{YL=&0R4I=u!R(ds*rkGtrkVHX!|EbWCY#pS z=vioC;~NXoKXkD{jiv#iT`kkwA~vZ*=Q!2wb8MDJ+H_mg1#_GaKgV;$EboC+)_Zhj zo3WvzdRCiyYe%)eO^w?@dy?`tHEtH|>I(Jf9H(V=n{kI4Ki8?6=Gw+T)~0)b2gK@? znbW3zv7>r!oBE}W>UnMImpiHh>a4j=%ltOuF7+Um`utp*WkH+n59;@Gojn_QSZhaA zwHfzx%vRl|ewC}^^qST*hRv%J*jRPv{LgWJd%UtQ8>zlmIR~-t0*?C$^MYk)-5NZ? zV%3VOZ1>+8Kvw{V5ZK4F1>Qpx%N#f}lm&y;=BlLJW$2+<%M?^wjAcLJ_=nrN-;ahc zo9`Mj+`ZgbE!-Sp@ewYmy=$CiSzFX5wXiy$ol|F4C$KnmW%cdW?hf3n;?U6?h*v+W z9?I@ki)tdIH0OeQP>5yg)dy;#ykpS8VJ$1d^uDWD@JUF8qFnwO0D50MjK%*^9kwXk z@BvC6sIS&|*)a9?aby)$wb+>g3$Y!tVsGZvd4^xnLA^Q1k@_?t5v_tG+apDACQbcP!iP%{nf z&2$*%wYM`G+xiuLaEAjsemef)!Uq1qdO=TIIS(xu*ZBG3VxuFbb13=6bk2tGYzbah z3zsECEyPaIR_!{KlW4nui9 z>I^yphT9!>-&%AJx7j7% zW)x!R6&N1o2yMK*<59K zdeUv4v)J#R6F4Kw%Xx+h-7ARain3`$e!wCk%NDfBSe)FkIBxgh{#6UjJ{YxjI@;&1L^Kb#%Qu*zzx_`3&%-wRaBZ9t+Md z&kgK{j>Et${@2>eKi?@34gmp_v zT-`dqxa>dIUMlCU^NY*c{QB#^%r9-FHXxpjJR84JWCB`>gF+l=OVzcs0CB9Pz1 zw@xvxi|dfnpUVBGt9{BnYU#7FMs6>AM4k6+pp(nDl(*790zG^*wNO+Krgc)Y*P6Rr zM@PXog?osVKNEQiM&ai2W-mMt`^o zI|#pWDCu4?-6d$}{ZRGw^^>&2r9thyp^qj?>XZ#}5Aa}%(HgHTzYRAyo9r}ikt0n3 ze!$-%NBIvaxYx-pQ{VCWfjdt)ikXZWY7SovmWH`r*d-Gzy~wG!BWPbjNuOqW^Pa zTc1T5^`=@>*Csu;RlR*vqE?Jmo!Y9ksmnL@&^o}Zey}N46J_<{rWj2$Him9~gR$O? z?{5haa(ZL;6k;Did{A*(L?OTxW%#{InLc(pjsQ_S{V3DTV@hqvRm;|%thYLF>l28_ zwssoO9)KQY7ja5CY^f2caYCRErb_LC6Osf}6tyZyK*b%ciaXTwZSlbYNCiKg5$$1;`5{=}c=9A8jM8NOtcGCWEvl|1W7G3g`-zP{KH zJjG%@v64!VDtY!)M#mfVy=`vRS3S2aiS<)Mws*?sIhXaoX|u%~JL0iJJ* z+3imx1-61`+Cty?6nrfXRL5+OE#hfuaac^LndMknrK%WJsjHn;58%^THG!~%a3bOF z2qz(?4q8yGHf>Lho zU0mwNrNLYp!KEQwn#`rUxm3ZWd$_cSOZ)`jU&$qWQ%U{?F5SzeJzN^jrMI~>f=i!p zX(X4{#5h9mMW4W#$m&S2v1WKxHhuiI} z>d*&q+L+@+qOnh1*n7v4-aA-R?;XO8jlHaS015bhpM%fI-BBK1;V*q;N;&ofd@%!{ zBo%cdheOXb0DN#0?i^X%51)gPN7T(N7PDN7aMt5S2>8tl@HPT)$mkO2$-3rZ@oaF9 zyFgOlviqc4f#q>~1qB+qa2%A7mY~3R!V1FWgpS0UsP_@}C!9=JNw}JDH{oHzeeh-I*X@B$Xci< zupnz?h1AgNGd_W)yf%Pmp~< zG>oX1ogmhQSPDBytShl}_9d|*Vwvm|v7yAevD3sR5bMdlA~r?v3o`U(f5)4FP%dQ=-Ec=5#un@BzOEfv z&u$&r$XsGgj|~+sOJaWB=(=em#X!&&or#4Ei256%i{znE^^C!2L}O_0m`pH+4kR3b z$Uv3fLhA!D8F=3}Ip#3RGh&V+K1x_c_ynO!K3mD>px75<_wYOr8_Us4m=Q*g0>VCo z#dWjp6C=}x5gBUWzGFyUMDhfZO9^KY&aP{`PfQ2~h|~}+CVVRPP7JOkc|GAI!!BGW zyJBA!jc_pb4~TV!*APF5-G`_Z_HpbxDDR`fesS^QhZ=aEvy|aS%6WrigPU8mN<;_A z)k-P{VH9CBVIrYc>kRiXETCiMCQ)Gy%Fv5E2e|)+K6ksnM7*E;OWfyBo=VmX_hpnT z+`L*r!e`t;PPCd1a9>CBBCIuo4es8E`EfZCgTZlJGnsI8-0i5@Nb(NCKg99jeS@$W z(E%UD4V0X403avk3bUmc(ZU(cmZYB;f|aM#2vX&k+h9o+5%UgRnbc zG2vLk>4dX9pD`!Y5UPX?gs&35i)h3zj(iAyMgO1?cngd)iM5UjXZNHYG>5abgs%{m zcfGEJvn7OU311<6i||vz3xqcb!@F_+WWv$iZle4M;X=YSgfDUI!QLeDDdD$-ESCp3 z3Da_UqCO=1b0teSJDp64u)0r2ix+|@Na3{90p2xq7ab4|*@;~7 zHRH?)uj92mz~fPmie7NR!CTm$iG9sdL|VyZdExD{;&bk^Uv6WO~u8)ke3*->J=Y6l<=Jov=}D+(_f4?!3B zRc8l`M<5Yi^l7$_jh{dg48&axpc+qGyS*gjzis7iv=9}W#Aefn>*;be`*bw*(w@U8$ys0M}26J$8 zWje&D`Sm(y$rWvdR2H#GMdgdWG+Qw?wL(sD~w^hS6(-JlX z=Icx`bGAok-H2Ty_Bh;YehO_P`n2ZU!h%!bZH>Y|@NVc4h`56rtKpJ)7kdOsbSBA7 zY$jCqr9g;~moPsp)tOKJ6S7*J^&(bJtQzjcI6pM#?03j2U>HBc!rQPxKExgsU}jzK z@nTHyR59hohTdRvAoecKs^PRE3Ugr`vB%*$vU#vhw}n__Apli_HP1wg7v{rqo%OOb zvH7q`XX7j(!UFh0XJzPF1?fYyxW|cg58kcOZA3@hqp?O}yL9#^VwZH*LQJ|>^E_^e z!lc)9cE;iqs-OrjAoxgLLeCoLN30rer<+&}TpFpxg&|u6?omOFCLnzrZX2bsKFFSc z2|9ZK*^^MIvnpiEV4cpkS>3|Za8qYZX!|{M8Legc5?L+u*O}SY#8jB7vm9ir;HlAg zROQ`07HJ*4tQ%{P)x$BJ?L@W~uITI|Wa}Yvj8?>TWE-J}&bru}*k&lv*&t-k!Dl)f zg={Otj@9BGMYbJEkYV}NunOr8XwZ#&ki7usboL3dmmqzd7Wf0QS74^jLPMI^ZrG!< zOk|C4O=p9Vy$U_YYjF=FYl14BJ%Ma5Y~n14#lL`bAM|-Zb8SZUM>wUk&yXE}stKCy zBC=-ilxWNp+Qi<1gF15~dk0D;YPN334gvg5W5vi?V3W=!AbTJBOyahpYM71m1Nf3? zHEay+B76u}bhZy|#~^;PmgdjMK87q}+B*6R46R#LB31@Hc)Ngej`oW)kiVvtjS|kl zaE*ZwH9=mySkD~nnxd;{Zj_F9xG zT!80;Iz1Fs!@h;Xn>5!ik$neMTQv4l)CS>uIP)B5kAuPGg{$xzv1&+mH40ZDwt?HU z_s>tTjhNP?>#&R1YUttGD_n<9bk@&xK==hBw$d_M4MSZm!VP$PD^If;M!7x|Zo(Cv zmAL*Y2yEFl%{I+-QZTS{I-BP@BN&-yyJmaBbwMz(a$;KXGW$Du)FSkgYa~ zzeE)l*iOr+7FN103kqA=7Ffe9tn*HuRCBemp2T?4p9K8Zsu#HJad_YKn-Ic!zQkEI zbcwc$5v)RI-J&B!CmZ~-X6qlFD7x5DosEs|D#o%AujtFDBD#+l&(e2kuGP`SVrK@s zTiI|ikv*Za<Ca+`1zTw%QEhSbXZ?s(!#3Fq16al0*1!$o0Jc(N z@TZst@lLj%ST!7u@#1BQ{SEF}4PV4Gv4PB~vkS-uu>_s*{cSMI(O3|ELF3)5r*5>w zHnE{>7cs4B_p;Y-VFz_jKJ)KoCv^6F><)1RJ4Z}g2P4^|`&z5*g;A`En0E3S#SRmz zhTz+VgW_lwyI-p}PdbM6B&MYq$NC)LwyzmKh)rM*64Re~LTCM4R%r%{eUs8av)d_^vCy|PcGMj&&0({waeunLXQhCG|i zZ)0~zvsu(Tyuf#%C9WPGWA74M4WD|3NsqCQbasl^HJyF$8HqOQyF6|+T=k5V=CZOw zoM}T5oX4h?b?$7Bi?p zjR1=gMOcq0!6eE#8)YMTvLFPh;Khg{L}Rc79z=#;+t^D!?)FmADtsK< zMvSIC6uQ5ztW=B)e+LPJj|fj93UIcrzEpGvuMqi_42CY;U`1r`pJY2(qX<3!0XxQe z(MJGnxHC!4qbS`c*pd9N znE(U$!1aTUlcHS~VF;Qf;I0hrBkT}HR-x5eH+#C65*$xX4-t0Urnp9cX^0~1$9XQn z&?vqLM=TZ4v&T_Rxitc?o4xNq(JVZB_2)Gg*MQ5Ji3Uztd(G;XRb` z){<8C$0UD2R=%@=*j2;ZSk$7V2ir!&rEfeZ|; zQflrb>Td+T`~?uP7}QWKjpk&&z+zM>MCM}#N;MSrVLJ;iRqJQ6%lo_|0L3ealcNx4dZgKcI3 zT1eJrAb%e+_<%J3Kl8uCjJaLkAGQMqMK#bm6eH+!40^@YqLdw zuPLtMOZ(p^;TC`(ZL3>nsL=q!dk>Tq+lR|nx{=1e*w?MCY_cQqVi{Pe`-?m<#r z5IE^i@(jay3Omk5CO4vHT=Ejet@{j2;OUODn&cw}nPdm-PmVHfW`9YJGY-Qd@n;FB z&oQQuH3#tysSvS-r3m@HB4d%z-!~X>v~M_Ksjr3wi-Zb%6bXxb$%Z0fwQr0u2e$hr zAim`D!fDp%tA`@teP6&hOgM|yiI}e1SSmPDcne|(6H=Zu&Js4@7nS3zN6K#Fan={{ z7`rRw4dZ#N)&azpI5#$OSW2yUoK2vp_+*PIHwa}ZLrguPGNr_HoGnc`fQcIldSy_kL$6+(|XCJFfOehVlb^3{gw*n+XZ@lh z*qC;R{VcqjHXB_(NejqK{0=p;_^4PYGz-r38u@3zlRjH^pk}G;68oqB9&uXwYS{&q z>AeuwrLU)I9m0z4O7}tzdh$x2Oh3dN!Z+y+vO~C;UJr$0Y{pKxP)y6fVHNvk?3Rng zdxIIT$-~5lGTuO(oAGDFr!x3hK9g}=KF-!;?7%VGlJO*t>za&z$fLzqGcL$WVL$rR z!{0J~k|&C1GH%GF;vN(ox8lfD+6oo=9 z4#8xl7P7Lu`0YOrtv?GzS+lXX?jjt4SPSFOdR*-9o2Kk#HCbn+)8eyPvy}6g!3)&_ zPRxAaytpT8j#3Z%vU)1V+2O2Oah7;j%1WhF{48q;bHO)R^~zrtV41@b}KEuorua3bL_ zaY^nHymx&%*JY`NO(;8r=G-_-sdOwi(Gm-MWNYC>Zi5mFf6pCli9ihU2RB5}YFtLE zaT%>fE9tGIUrG9vq>m-dI?}8o&0h9x?rBS{a4q+er2&TISgZ}SO!(?ev{p-zd6`ze zwd@dI#1Y4F7sls3Y^@bqQlAW3N5ka2ov>86D`ma4p4zcldOmNMv{~Ahx5K(wI+6D> z2A|I3`_)^idr&@;am28PR_`9#682DQ_E2@_le}AS@1 zSKEFTlmb5X;RWk$vJ{K*WihkhHTgI-;IuTNpoX27__RAMO)J16#qGFF?-1t{;9SP4 ze`Pz4+jKwqcn}}wkZ?mYYe}6TT$a`*ofJ+3e{r0~)_}bb@M}IR1bz{48iO0e6nLs2 z!v3?cvLF`mS;9?-r(s)x$9^7ODd=h6Pd&7sdT2lOO|{fikZIjdJ!FPwU?r0w_yv59 zk5h1pWkNZ;YR`m)@Fn6?Z~;+;D~M?@8nGKZhIkucU#LX+F47N&XHXtX`e}&8@Eq%I zoCMFoG-(p7#muFoISs?vDaIH_5pOh3vCeFGUGF)fiG5mk=N$1uQ}?;z3N~_cGWTdE zWccH6^dl@HtWM|F&4kT_rwLgG*T0=%LI1z8Dbg4CIf~bdeF4h^pOe71?ENO56zd%znLv^ zS9z#BPM#$nkx$8&WT%p>^ic*W3G%M8l~%X^k{7N<4W+S}UC zy2iTIy5D-#dc}Iv8r#KIXuH#Pw{4tlmTjqRn{AivHQNE(JGSp^*KG!SlD)`2wC*oh z&yYY|o&-=8*8_1$T#q`#e6d&XSh_QRu%XV!CMh$#lYO zkY&qc%PPy87K8P7*7vLf?E~0y7@;ueE6!jE`FN!vma&7;0`gfbn|L`pfxJkZ%`VXM zG4?Ax=Q2x-0Nrl~{2fLg#E03yAU>wCODh1TGqVaXgLx1iVcikS*igioY%1a`R)y$i zYY@xXF2oAjrkDgvOb9O*eJvRn~6A|J%L!sHX$xxuOkN8 z(Un=)A?zHIY6kc(4mB(rFSHl3?ud(+RK*XFBHpC5{srpFD#Z!nr;@MkSfv;~c6SoD zi1-bw^^d_z^l!34s{)_+8v^<#Rjy+A*;fGYx-OqXdFlp%^p5TTo{gH^wXXL9(HmA} zJ^*jZ27y__g~irR_-uM~fq27Zo?2F3QSsoMiYEUWk%cA<$nT#wpnq;gQFea6jNJYM z24oa=%_+#p>pGxYVYdPO`ezpuHLZSLyxrdPm)FFN9+uNI`%^I}N(Kd#rXT($z9}@l zaYCFYhMt-5$d@xV-Mo86USEi_KimTO|{wH)Z>i!u`DK-!s|l67dtU~ zllObEg|ULVixHn#dH}|)?@t4FHOY8shL`_rRl9<5i>_3QAvIV=2 zcZj8_?gzY?#RNb7C?3FcO;^MV$ez0@7T_T{6SCDDmSC3fHVc12*t^N`Pw^tF%{KiH DJL2BA delta 14926 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 "OK","msg" => "Installation successful"); diff --git a/webapp/OrderSprinterPrintserver.exe b/webapp/OrderSprinterPrintserver.exe index c2d90a70b1a153a66fc09efda95565d9a0db4d24..d866290d61434670edd63f58f6d13c6d0cdbee49 100644 GIT binary patch delta 14962 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 DJL2BA delta 14926 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 - + diff --git a/webapp/bill.html b/webapp/bill.html index 730f580..aa2d4ca 100644 --- a/webapp/bill.html +++ b/webapp/bill.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/css/bestformat.css b/webapp/css/bestformat.css index 6fbe122..140edb4 100644 --- a/webapp/css/bestformat.css +++ b/webapp/css/bestformat.css @@ -1 +1 @@ -@charset "UTF-8";table.viewtable{width:100%;display:block;table-layout:fixed}table.viewtable th{background:#7abe5f;font-size:10pt;border-bottom:1px solid rgba(255,255,255,.7);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2);-o-box-shadow:inset 0 1px 0 rgba(255,255,255,.2);box-shadow:inset 0 1px 0 rgba(255,255,255,.2);padding:6px 10px}table.viewtable td{background:#eed33f;font-size:8pt;border-bottom:1px solid #fafafa;border-bottom:1px solid rgba(255,255,255,.5);padding:6px 10px;color:rgba(0,0,0,255)}table.viewtable th.complete{background:#17370b;color:rgba(255,255,255,0)}table.viewtable th.incomplete{background:#9c9224;color:rgba(0,0,0,255)}table.viewtable td.complete{background:#78bb5e;color:rgba(0,0,0,255)}table.viewtable td.incomplete{background:#eed33f;color:rgba(0,0,0,255)}table.viewtable tr:last-child td{border-bottom:0}table.viewtable tr:hover td{background-color:#faf}table.receipttable td{border:solid black 0;padding:3px;text-align:left;vertical-align:bottom}table.receipttable td.price{border:solid black 0;padding:3px;text-align:right;vertical-align:bottom}table.receipttable td.restinfo{text-align:center;vertical-align:bottom}table.receipttable td.declaration{font-weight:bold;text-align:right}table.gridtable{font-family:verdana,arial,sans-serif;font-size:20px;color:#333;border-width:2px;border-color:#666;border-collapse:collapse;width:100%}table.gridtable th{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#dedede;font-weight:bold}table.gridtable td{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#fff}table.linetable{font-family:verdana,arial,sans-serif;font-size:20px;color:#333;border-width:2px;border-color:#666;border-collapse:collapse;width:100%}table.linetable th{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#dedede;font-weight:bold}table.linetable td{border-width:1px;padding:8px;border-style:solid;border-color:#666}table.linetable tr{background:#fff}table.linetable tr:hover{background-color:#faf}table.reporttable{font-family:verdana,arial,sans-serif;font-size:20px;color:#333;border:solid black 2px;border-color:#666;border-collapse:collapse;width:100%;border-spacing:10px}table.reporttable th{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#dedede;font-weight:bold}table.reporttable td{border:solid black 0;padding:8px;text-align:left;vertical-align:top}table.reporttable tr{background:#d6f8be}table.reporttable tr:hover{background-color:#faf}table.commandtable{font-family:verdana,arial,sans-serif;font-size:20px;color:#333;border-width:1px;border-color:#666;border-collapse:collapse;width:100%}table.commandtable th{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#e4d662;font-weight:bold}table.commandtable td{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#fff;font-weight:bold}table.navitable{font-family:verdana,arial,sans-serif;font-size:20px;color:#333;border-width:1px;border-color:#666;border-collapse:collapse;width:100%}table.navitable th{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#d09696;font-weight:bold}table.navitable td{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#c08f8f}table.infotable{font-family:verdana,arial,sans-serif;font-size:20px;color:#333;border-width:1px;border-color:#666;border-collapse:collapse;width:100%}table.infotable th{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#c3c3ff;font-weight:bold}table.infotable td{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#c3c3ff}table.billtable{font-family:verdana,arial,sans-serif;font-size:20px;color:#000;border:solid black 2px;border-color:#000;border-collapse:collapse;width:100%;border-spacing:10px}table.billtable th{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#c3c3ff;font-weight:bold;text-align:left}table.billtable #pricecolheader{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#c3c3ff;font-weight:bold;text-align:right}table.billtable td{border:solid black 0;padding:8px;background-color:#fff;text-align:left}table.billtable #pricecol{border:solid black 0;padding:8px;background-color:#fff;text-align:right}table.billtable #totalprice{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#c3c3ff;font-weight:bold;text-align:center}.grid_right{text-align:right;font-style:italic}.userinfo{font-style:italic}.counting{position:absolute;top:0;bottom:0;right:90px;width:80px;border:0;background-color:rgb(246,246,246,0.0) !important}.counting:hover{background-color:#0f0}.goup{position:absolute;top:5px;bottom:0;right:90px;border:0;background-color:#f6f6f6 !important}.osroom-1{height:40px !important}.osroom-2{height:70px !important}.ostable-1{height:40px !important}.ostable-2{height:70px !important}.osprod-1{height:40px !important}.osprod-2{height:70px !important}.osbigbtn.ui-btn{height:40px !important;text-align:center;line-height:30px}table.prodtable{font-family:verdana,arial,sans-serif;font-size:20px;color:#333;border-width:1px;border-color:#666;border-collapse:collapse;width:70%}table.prodtable th{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:OrangeRed;font-weight:bold}table.prodtable .prodtype td{background-color:DarkGreen}table.prodtable tr>td:first-child{text-align:left}table.prodtable td{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:LimeGreen;text-align:right;font-weight:bold;white-space:nowrap;max-width:50%;word-break:break-all}table.prodtable input{line-height:30px;background-color:PaleGreen;font-weight:bold}table.prodtable select{background-color:PaleGreen;font-weight:bold;width:100%}table.prodtable option.yes{background-color:green}table.prodtable option.no{background-color:red}table.prodtable .prodpriceA{width:50px;text-align:right}table.prodtable .prodpriceB{width:50px;text-align:right}table.prodtable .prodpriceC{width:50px;text-align:right}.prodinfo,.srinfo{position:absolute;top:0;bottom:0;right:20px;width:20px;border:0;background-color:rgb(246,246,246,0.0) !important}.waitinfo{position:absolute;top:0;bottom:0;right:20px;border:0;background-color:rgb(246,246,246,0.0) !important}.waitinfo img{position:absolute;top:0;bottom:0;right:20px;height:35px;border:0;background-color:rgb(246,246,246,0.0) !important}.typehigher{text-align:right;background-color:rgb(246,246,246,0.0) !important}.typetop{text-align:left;background-color:rgb(246,246,246,0.0) !important}@media all and (min-width:0){.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:0;bottom:0;right:130px;height:20px;border:0;background-color:rgb(246,246,246,0.0) !important}.prodcount,.srprodcount{position:absolute;top:10px;bottom:0;right:95px;width:20px;border:0;background-color:rgb(246,246,246,0.0) !important}.prodplus,.srplus{position:absolute;top:0;bottom:0;right:60px;height:20px;border:0;background-color:rgb(246,246,246,0.0) !important}.prodplus img{width:30px}.prodminus img{width:30px}.srplus img{width:30px}.srminus img{width:30px}.srminus:hover,.prodminus:hover{height:40px;width:30px;background-color:#0f0}.srplus:hover,.prodplus:hover{height:40px;width:30px;background-color:#0f0}.prodinfo img:hover,.srinfo img:hover{background-color:#0f0}.tbusy{color:black !important;font-weight:bold;font-style:italic}.tempty{color:gray !important;color:gray !important;font-weight:normal}.overlaytxt{background:linear-gradient(red,yellow);color:black;font-weight:bold;border-radius:25px;border:3px solid #000;padding:8px}.overlayfull{background:linear-gradient(red,yellow)}.overlayempty{background:linear-gradient(green,yellow)}.overlaysize-0{font-size:7px}.overlaysize-1{font-size:12px}.overlaysize-2{font-size:15px}.selectedtable{border:6px solid red}.prodreadyicon{position:absolute;top:0;bottom:0;right:70px;height:20px;border:0;background-color:rgb(246,246,246,0.0) !important}.prodreadyicon:hover{height:40px;background-color:#0f0}.prodreadycount{position:absolute;top:10px;bottom:0;right:40px;width:20px;border:0;background-color:rgb(246,246,246,0.0) !important}.changetableprodlist{width:100%;background-color:LightCyan;resize:none}.usersums{border:solid black 3px;background-color:#ffe8bc}.usersums td{border:solid black 1px;padding:3px;text-align:right;vertical-align:bottom}.taxessums{border:solid black 3px;background-color:#f0e8bc}.taxessums td{border:solid black 1px;padding:3px;text-align:right;vertical-align:bottom}.scrolllistview{height:150px;top:10px;overflow:auto;background-color:blanchedalmond;-webkit-overflow-scrolling:touch}.scrolllistview li{height:15px;vertical-align:middle}.selecteditem{color:black;font-weight:bold}.unselecteditem{color:gray}.printerstatus{height:20px}.warning{color:red}.whiteinput[type=text]{color:black;background-color:white}.customerlistbox{background-color:white;border:2px solid #aaa}.genConfigEl[type=text],.genConfigEl[type=password]{border:1px solid #666;background-color:#fff}#userlabel_username[type=text],#userlabel_password[type=text],.userlabel_newpassword[type=text],#remarkfield[type=text],#oldpass[type=password],#newpass[type=password]{border:1px solid #666;background-color:#fff}.reservationinputfield[type=text]{border:1px solid #666;background-color:#fff} \ No newline at end of file +@charset "UTF-8";table.viewtable{width:100%;display:block;table-layout:fixed}table.viewtable th{background:#7abe5f;font-size:10pt;border-bottom:1px solid rgba(255,255,255,.7);-webkit-box-shadow:inset 0 1px 0 rgba(255,255,255,.2);-moz-box-shadow:inset 0 1px 0 rgba(255,255,255,.2);-o-box-shadow:inset 0 1px 0 rgba(255,255,255,.2);box-shadow:inset 0 1px 0 rgba(255,255,255,.2);padding:6px 10px}table.viewtable td{background:#eed33f;font-size:8pt;border-bottom:1px solid #fafafa;border-bottom:1px solid rgba(255,255,255,.5);padding:6px 10px;color:rgba(0,0,0,255)}table.viewtable th.complete{background:#17370b;color:rgba(255,255,255,0)}table.viewtable th.incomplete{background:#9c9224;color:rgba(0,0,0,255)}table.viewtable td.complete{background:#78bb5e;color:rgba(0,0,0,255)}table.viewtable td.incomplete{background:#eed33f;color:rgba(0,0,0,255)}table.viewtable tr:last-child td{border-bottom:0}table.viewtable tr:hover td{background-color:#faf}table.receipttable td{border:solid black 0;padding:3px;text-align:left;vertical-align:bottom}table.receipttable td.price{border:solid black 0;padding:3px;text-align:right;vertical-align:bottom}table.receipttable td.restinfo{text-align:center;vertical-align:bottom}table.receipttable td.declaration{font-weight:bold;text-align:right}table.gridtable{font-family:verdana,arial,sans-serif;font-size:20px;color:#333;border-width:2px;border-color:#666;border-collapse:collapse;width:100%}table.gridtable th{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#dedede;font-weight:bold}table.gridtable td{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#fff}table.linetable{font-family:verdana,arial,sans-serif;font-size:20px;color:#333;border-width:2px;border-color:#666;border-collapse:collapse;width:100%}table.linetable th{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#dedede;font-weight:bold}table.linetable td{border-width:1px;padding:8px;border-style:solid;border-color:#666}table.linetable tr{background:#fff}table.linetable tr:hover{background-color:#faf}table.reporttable{font-family:verdana,arial,sans-serif;font-size:20px;color:#333;border:solid black 2px;border-color:#666;border-collapse:collapse;width:100%;border-spacing:10px}table.reporttable th{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#dedede;font-weight:bold}table.reporttable td{border:solid black 0;padding:8px;text-align:left;vertical-align:top}table.reporttable tr{background:#d6f8be}table.reporttable tr:hover{background-color:#faf}table.commandtable{font-family:verdana,arial,sans-serif;font-size:20px;color:#333;border-width:1px;border-color:#666;border-collapse:collapse;width:100%}table.commandtable th{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#e4d662;font-weight:bold}table.commandtable td{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#fff;font-weight:bold}table.navitable{font-family:verdana,arial,sans-serif;font-size:20px;color:#333;border-width:1px;border-color:#666;border-collapse:collapse;width:100%}table.navitable th{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#d09696;font-weight:bold}table.navitable td{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#c08f8f}table.infotable{font-family:verdana,arial,sans-serif;font-size:20px;color:#333;border-width:1px;border-color:#666;border-collapse:collapse;width:100%}table.infotable th{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#c3c3ff;font-weight:bold}table.infotable td{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#c3c3ff}table.billtable{font-family:verdana,arial,sans-serif;font-size:20px;color:#000;border:solid black 2px;border-color:#000;border-collapse:collapse;width:100%;border-spacing:10px}table.billtable th{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#c3c3ff;font-weight:bold;text-align:left}table.billtable #pricecolheader{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#c3c3ff;font-weight:bold;text-align:right}table.billtable td{border:solid black 0;padding:8px;background-color:#fff;text-align:left}table.billtable #pricecol{border:solid black 0;padding:8px;background-color:#fff;text-align:right}table.billtable #totalprice{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:#c3c3ff;font-weight:bold;text-align:center}.grid_right{text-align:right;font-style:italic}.userinfo{font-style:italic}.counting{position:absolute;top:0;bottom:0;right:90px;width:80px;border:0;background-color:rgb(246,246,246,0.0) !important}.counting:hover{background-color:#0f0}.goup{position:absolute;top:5px;bottom:0;right:90px;border:0;background-color:#f6f6f6 !important}.osroom-1{height:40px !important}.osroom-2{height:70px !important}.ostable-1{height:40px !important}.ostable-2{height:70px !important}.osprod-1{height:40px !important}.osprod-2{height:70px !important}.osbigbtn.ui-btn{height:40px !important;text-align:center;line-height:30px}table.prodtable{font-family:verdana,arial,sans-serif;font-size:20px;color:#333;border-width:1px;border-color:#666;border-collapse:collapse;width:70%}table.prodtable th{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:OrangeRed;font-weight:bold}table.prodtable .prodtype td{background-color:DarkGreen}table.prodtable tr>td:first-child{text-align:left}table.prodtable td{border-width:1px;padding:8px;border-style:solid;border-color:#666;background-color:LimeGreen;text-align:right;font-weight:bold;white-space:nowrap;max-width:50%;word-break:break-all}table.prodtable input{line-height:30px;background-color:PaleGreen;font-weight:bold}table.prodtable select{background-color:PaleGreen;font-weight:bold;width:100%}table.prodtable option.yes{background-color:green}table.prodtable option.no{background-color:red}table.prodtable .prodpriceA{width:50px;text-align:right}table.prodtable .prodpriceB{width:50px;text-align:right}table.prodtable .prodpriceC{width:50px;text-align:right}.prodinfo,.srinfo{position:absolute;top:0;bottom:0;right:20px;width:20px;border:0;background-color:rgb(246,246,246,0.0) !important}.waitinfo{position:absolute;top:0;bottom:0;right:20px;border:0;background-color:rgb(246,246,246,0.0) !important}.waitinfo img{position:absolute;top:0;bottom:0;right:20px;height:35px;border:0;background-color:rgb(246,246,246,0.0) !important}.typehigher{text-align:right;background-color:rgb(246,246,246,0.0) !important}.typetop{text-align:left;background-color:rgb(246,246,246,0.0) !important}@media all and (min-width:0){.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:0;bottom:0;right:130px;height:20px;border:0;background-color:rgb(246,246,246,0.0) !important}.prodcount,.srprodcount{position:absolute;top:10px;bottom:0;right:95px;width:20px;border:0;background-color:rgb(246,246,246,0.0) !important}.prodplus,.srplus{position:absolute;top:0;bottom:0;right:60px;height:20px;border:0;background-color:rgb(246,246,246,0.0) !important}.prodplus img{width:30px}.prodminus img{width:30px}.srplus img{width:30px}.srminus img{width:30px}.srminus:hover,.prodminus:hover{height:40px;width:30px;background-color:#0f0}.srplus:hover,.prodplus:hover{height:40px;width:30px;background-color:#0f0}.prodinfo img:hover,.srinfo img:hover{background-color:#0f0}.tbusy{color:black !important;font-weight:bold;font-style:italic}.tempty{color:gray !important;color:gray !important;font-weight:normal}.overlaytxt{background:linear-gradient(red,yellow);color:black;font-weight:bold;border-radius:25px;border:3px solid #000;padding:8px}.overlayfull{background:linear-gradient(red,yellow)}.overlayempty{background:linear-gradient(green,yellow)}.overlaysize-0{font-size:7px}.overlaysize-1{font-size:12px}.overlaysize-2{font-size:15px}.selectedtable{border:6px solid red}.prodreadyicon{position:absolute;top:0;bottom:0;right:70px;height:20px;border:0;background-color:rgb(246,246,246,0.0) !important}.prodreadyicon:hover{height:40px;background-color:#0f0}.prodreadycount{position:absolute;top:10px;bottom:0;right:40px;width:20px;border:0;background-color:rgb(246,246,246,0.0) !important}.changetableprodlist{width:100%;background-color:LightCyan;resize:none}.usersums{border:solid black 3px;background-color:#ffe8bc}.usersums td{border:solid black 1px;padding:3px;text-align:right;vertical-align:bottom}.taxessums{border:solid black 3px;background-color:#f0e8bc}.taxessums td{border:solid black 1px;padding:3px;text-align:right;vertical-align:bottom}.scrolllistview{height:150px;top:10px;overflow:auto;background-color:blanchedalmond;-webkit-overflow-scrolling:touch}.scrolllistview li{height:15px;vertical-align:middle}.selecteditem{color:black;font-weight:bold}.unselecteditem{color:gray}.printerstatus{height:20px}.warning{color:red}.whiteinput[type=text]{color:black;background-color:white}.customerlistbox{background-color:white;border:2px solid #aaa}.genConfigEl[type=text],.genConfigEl[type=password]{border:1px solid #666;background-color:#fff;font-family:"Courier New",Courier,monospace}#userlabel_username[type=text],#userlabel_password[type=text],.userlabel_newpassword[type=text],#remarkfield[type=text],#oldpass[type=password],#newpass[type=password]{border:1px solid #666;background-color:#fff}.reservationinputfield[type=text]{border:1px solid #666;background-color:#fff}textarea.genConfigEl{font-family:"Courier New",Courier,monospace} \ No newline at end of file diff --git a/webapp/feedback.html b/webapp/feedback.html index 16c794c..dc74208 100644 --- a/webapp/feedback.html +++ b/webapp/feedback.html @@ -4,7 +4,7 @@ - + diff --git a/webapp/index.html b/webapp/index.html index 25a6a09..160e7cd 100644 --- a/webapp/index.html +++ b/webapp/index.html @@ -9,8 +9,8 @@ - - + + @@ -206,7 +206,7 @@ function handleResultOfInstallCheck(is_installed) { if (is_installed == "Yes") { useInstallation(); } else { - setTimeout(function(){document.location.href = "install.html?v=1.3.10"},500); + setTimeout(function(){document.location.href = "install.html?v=1.3.11"},500); } } diff --git a/webapp/install.html b/webapp/install.html index 23bd0d0..56d8cbd 100644 --- a/webapp/install.html +++ b/webapp/install.html @@ -725,7 +725,7 @@ $(document).ready(function() {   - +   diff --git a/webapp/install/installer.php b/webapp/install/installer.php index c106981..92baa90 100644 --- a/webapp/install/installer.php +++ b/webapp/install/installer.php @@ -2104,6 +2104,33 @@ return false; } } +function updateUserTable1310_1311($prefix, $version, $dbname) { +$pdo = $this->pdo; +try { +if ($version != "1.3.10") { +$ret = $this->updateUserTable1309_1310($prefix, $version, $dbname); +if (!$ret) { +echo "Version update v1.3.9 to 1.3.10 not successful."; +return false; +} +} + +DbUtils::overrulePrefix($prefix); + +$sql = "INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL,?,?)"; +$stmt = $pdo->prepare($this->basedb->resolveTablenamesInSqlString($sql)); +$hosttext = self::genSampleHostText(); +$stmt->execute(array('hosttext',$hosttext)); + +$this->updateVersion($pdo, '1.3.11'); + +return true; +} catch (PDOException $e) { +echo "Error in v1.3.10 to 1.3.11: $e"; +return false; +} +} + function setVersion($prefix,$theVersion) { $pdo = $this->pdo; @@ -2230,7 +2257,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.3.10')"); +$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'version', '1.3.11')"); $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')"); @@ -2294,6 +2321,9 @@ $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VAL $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'showpayment7', '1')"); $this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'showpayment8', '1')"); +$hosttext = self::genSampleHostText(); +$this->basedb->doSQL($pdo,"INSERT INTO `%config%` (`id` , `name`, `setting`) VALUES (NULL , 'hosttext', '$hosttext')"); + // prepare for later inconsistency check if version is obsolete date_default_timezone_set($timezone); $installDate = date('Y-m-d H:i:s'); @@ -2303,6 +2333,16 @@ $this->readConfigTableAndSendToHist($pdo); return; } +public static function genSampleHostText() { +$hosttext = "\n\nAngaben zum Nachweis der Höhe\nund der betrieblichen\nVeranlassung von\nBewirtungsaufwendungen\n(Par. 4 Abs. 5 Ziff. 2 EStG)\n\n"; +$hosttext .= "Tag der Bewirtung:\n\n\n"; +$hosttext .= "Ort der Bewirtung:\n\n\n"; +$hosttext .= "Bewirtete Person(en):\n\n\n\n\n\n"; +$hosttext .= "Anlass der Bewirtung:\n\n\n\n\n\n\n"; +$hosttext .= "Ort, Datum Unterschrift\n\n"; +return $hosttext; +} + public function getCurrentVersion() { try { $pdo = $this->pdo; @@ -2630,7 +2670,7 @@ $zones[] = $timezone_identifiers[$i]; } echo json_encode($zones); } else if ($command == 'update') { -$installerVersion = "1.3.10"; +$installerVersion = "1.3.11"; $admin = new InstallAdmin(); $pdo = $admin->openDbAndReturnPdo($_POST['host'],$_POST['db'],$_POST['user'],$_POST['password']); @@ -2660,7 +2700,7 @@ $supportedVersions = array("1.0.22","1.0.23","1.0.24","1.0.25","1.0.26","1.0.27" "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.12","1.2.13","1.2.14","1.2.15","1.2.16","1.2.17", -"1.2.18","1.2.19","1.2.20","1.2.21","1.2.22","1.3.0","1.3.1","1.3.2","1.3.3","1.3.4","1.3.5","1.3.6","1.3.7","1.3.8","1.3.9" +"1.2.18","1.2.19","1.2.20","1.2.21","1.2.22","1.3.0","1.3.1","1.3.2","1.3.3","1.3.4","1.3.5","1.3.6","1.3.7","1.3.8","1.3.9","1.3.10" ); if (!in_array($version, $supportedVersions)) { @@ -2668,7 +2708,7 @@ echo json_encode("Quellversion nicht unterstützt"); return; } -$ret = $admin->updateUserTable1309_1310($_POST['prefix'], $version, $_POST['db']); +$ret = $admin->updateUserTable1310_1311($_POST['prefix'], $version, $_POST['db']); if(session_id() == '') { session_start(); diff --git a/webapp/kitchen.html b/webapp/kitchen.html index 1eca438..1a28d9b 100644 --- a/webapp/kitchen.html +++ b/webapp/kitchen.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/manager.html b/webapp/manager.html index 8b6185a..264b3e2 100644 --- a/webapp/manager.html +++ b/webapp/manager.html @@ -5,7 +5,7 @@ - + @@ -174,6 +174,7 @@ var MAN_RECEIPT_FONTSIZE = ["Schriftgröße Bon (Bildschirm)","Font size receipt 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."]; +var MAN_HOSTTEXT_TXT = ["Vorlage Bewirtungsbeleg","Template Host Area","Bewirtungsbeleg"]; var MAN_EMAIL_SENDER_TXT = ["Email-Absender:","Email sender:","Remitente de email:"]; var MAN_DEFAULT_EMAIL_TO = ["Standard-Email-Empfänger:","Standard email receiver","Destinario estandard de emails"]; var MAN_NEW_VERSION_AVAIL = ["Neue Version verfügbar", "New version available", "Hay una versión nueva"]; @@ -380,6 +381,7 @@ var generalValuesSettings = [ ["stornocode","Stornocode","i",1,"Stornocode wurde nicht angegeben!"], ["printpass","Printcode","i",1,"Printcode wurde nicht angegeben"], ["companyinfo","Betriebsinfo","i",0], + ["hosttext","Bewirtungsbeleg","i",0], ["rectemplate","Bonvorlage ","i",0], ["foodtemplate","Arb.bonvorlage Speisen","i",0], ["drinktemplate","Arb.bonvorlage Getränke","i",0], @@ -495,6 +497,7 @@ function setLanguage(l) { $("#roomfield_prefill").html(MAN_DO_AUTO_NUM[l]); $("#readspeisekarte").html(MAN_APPLY[l]); + $("#hosttexttxt").html(MAN_HOSTTEXT_TXT[l]); $("#fromemailtxt").html(MAN_EMAIL_SENDER_TXT[l]); $("#toemailtxt").html(MAN_DEFAULT_EMAIL_TO[l]); @@ -658,6 +661,7 @@ function insertGeneralConfigItems(configResult) { version = values.version; $("#companyinfo").val(values.companyinfo); + $("#hosttext").val(values.hosttext); $("#rectemplate").val(values.rectemplate); $("#foodtemplate").val(values.foodtemplate); $("#drinktemplate").val(values.drinktemplate); @@ -796,6 +800,7 @@ function insertGeneralConfigItems(configResult) { $("#configpart").trigger("create"); bindConfig(); + continueInitialization(); } else { setTimeout(function(){document.location.href = "index.html"},250); // not logged in } @@ -1582,9 +1587,9 @@ function handleUpdateCheckResult(answer) { var millis=getMillis(); setTimeout(function(){ - document.location.href = "install.html?v=1.3.10&mode=onlyupdate&n=" + millis; + document.location.href = "install.html?v=1.3.11&mode=onlyupdate&n=" + millis; },250); - document.location.href = "install.html?v=1.3.10&mode=onlyupdate&n=" + millis; + document.location.href = "install.html?v=1.3.11&mode=onlyupdate&n=" + millis; } function handleUpdateReplace(answer) { @@ -2634,9 +2639,7 @@ function insertPrintQueue(queue) { } } -$(document).on("pageinit", "#admin-page", function () { - initializeMainMenu("#modulemenu"); - getGeneralConfigItems(); +function continueInitialization() { doAjax("GET","php/contenthandler.php?module=admin&command=isLoggedinUserAdminOrManagerOrTE",null,showPanelsDueToUserStatus,"Fehler"); askAndFillUserList(); @@ -2661,6 +2664,11 @@ $(document).on("pageinit", "#admin-page", function () { getVersionInfoForUpdate(); binding(); +} + +$(document).on("pageinit", "#admin-page", function () { + initializeMainMenu("#modulemenu"); + getGeneralConfigItems(); }); @@ -2822,6 +2830,10 @@ $(document).on("pageinit", "#admin-page", function () { Hinweis: siehe Anleitung +
+ + +
diff --git a/webapp/paydesk.html b/webapp/paydesk.html index c4658e6..6c0a3b3 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 3e1321d..4f760d1 100644 --- a/webapp/php/admin.php +++ b/webapp/php/admin.php @@ -867,6 +867,7 @@ class Admin { } $companyInfo = CommonUtils::getConfigValue($pdo,"companyinfo",null); + $hosttext = CommonUtils::getConfigValue($pdo,"hosttext",null); $rectemplate = CommonUtils::getConfigValue($pdo,"rectemplate",null); $foodtemplate = CommonUtils::getConfigValue($pdo,"foodtemplate",null); $drinktemplate = CommonUtils::getConfigValue($pdo,"drinktemplate",null); @@ -986,14 +987,14 @@ class Admin { "paydeskid" => $paydeskid, "aeskey" => $aeskey, "certificatesn" => $certificatesn, "rksvserver" => $rksvserver, "addreceipttoprinter" => $addreceipttoprinter, "printandqueuejobs" => $printandqueuejobs, "cashenabled" => $cashenabled, "returntoorder" => $returntoorder, "beepcooked" => $beepcooked,"restaurantmode" => $restaurantmode, "discountname1" => $discountname1,"discountname2" => $discountname2,"discountname3" => $discountname3, - "closshowci" => $closshowci, "closshowpaytaxes" => $closshowpaytaxes, "closshowprods" => $closshowprods, + "closshowci" => $closshowci, "closshowpaytaxes" => $closshowpaytaxes, "closshowprods" => $closshowprods,"hosttext" => $hosttext, "showpayment2" => $showpayment2, "showpayment3" => $showpayment3, "showpayment4" => $showpayment4, "showpayment5" => $showpayment5, "showpayment6" => $showpayment6, "showpayment7" => $showpayment7, - "showpayment8" => $showpayment8 + "showpayment8" => $showpayment8 ); @@ -1084,7 +1085,7 @@ class Admin { $view = "preferences.html"; } - echo json_encode($view . "?v=1.3.10"); + echo json_encode($view . "?v=1.3.11"); } } @@ -1286,25 +1287,25 @@ 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.3.10"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waitertxt[$lang], "link" => "waiter.html?v=1.3.11"); }; } else { - if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.3.10"); }; + if ($_SESSION['right_waiter']) { $mainMenu[] = array("name" => $waiterdesktxt[$lang], "link" => "waiterdesktop.php?v=1.3.11"); }; } - if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.3.10"); }; - if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.3.10"); }; - if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.3.10"); }; + if ($_SESSION['right_kitchen']) { $mainMenu[] = array("name" => $kitchentxt[$lang], "link" => "kitchen.html?v=1.3.11"); }; + if ($_SESSION['right_bar']) { $mainMenu[] = array("name" => "Bar", "link" => "bar.html?v=1.3.11"); }; + if ($_SESSION['right_supply']) { $mainMenu[] = array("name" => $supplytxt[$lang], "link" => "supplydesk.html?v=1.3.11"); }; if ($_SESSION['modus'] == 0) { - if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.3.10"); }; + if ($_SESSION['right_paydesk']) { $mainMenu[] = array("name" => $paydesktxt[$lang], "link" => "paydesk.html?v=1.3.11"); }; } - if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.3.10"); }; - if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.3.10"); }; - if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.3.10"); }; - if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.3.10"); }; - if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.3.10"); }; - if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.3.10"); }; - if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.3.10"); }; - $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.3.10"); - $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.3.10"); + if ($_SESSION['right_statistics']) { $mainMenu[] = array("name" => $stattxt[$lang], "link" => "reports.html?v=1.3.11"); }; + if ($_SESSION['right_bill']) { $mainMenu[] = array("name" => $bontxt[$lang], "link" => "bill.html?v=1.3.11"); }; + if ($_SESSION['right_products']) { $mainMenu[] = array("name" => $prodtxt[$lang], "link" => "products.html?v=1.3.11"); }; + if ($_SESSION['right_reservation']) { $mainMenu[] = array("name" => $restxt[$lang], "link" => "reservation.html?v=1.3.11"); }; + if ($_SESSION['right_rating']) { $mainMenu[] = array("name" => $ratingtxt[$lang], "link" => "rating.html?v=1.3.11"); }; + if ($_SESSION['right_customers']) { $mainMenu[] = array("name" => $customerstxt[$lang], "link" => "customers.html?v=1.3.11"); }; + if ($_SESSION['right_manager'] || $_SESSION['is_admin'] || $_SESSION['right_closing']) { $mainMenu[] = array("name" => $admintxt[$lang], "link" => "manager.html?v=1.3.11"); }; + $mainMenu[] = array("name" => $settingtxt[$lang], "link" => "preferences.html?v=1.3.11"); + $mainMenu[] = array("name" => "Feedback", "link" => "feedback.html?v=1.3.11"); } $mainMenu[] = array("name" => $logout[$lang], "link" => "logout.php"); @@ -1312,7 +1313,7 @@ class Admin { $waiterMessage = $this->getMessage(null, "waitermessage"); } - $mainMenuAndVersion = array ("version" => "OrderSprinter 1.3.10", + $mainMenuAndVersion = array ("version" => "OrderSprinter 1.3.11", "user" => $currentUser, "menu" => $mainMenu, "waitermessage" => $waiterMessage, @@ -1348,7 +1349,13 @@ class Admin { private function getGuestInfo($pdo) { try { - $sql = "SELECT %customers%.id as id,%customers%.id as object,CONCAT(IFNULL(name,''),' - ',IFNULL(room,'')) as guest FROM %customers%,%vacations% where %customers%.id=%vacations%.customerid AND ((checkin <= CURDATE()) AND (CURDATE() <= checkout)) GROUP BY id"; + $sql = "SELECT %customers%.id as id,%customers%.id as object,CONCAT(IFNULL(name,''),' - ',IFNULL(room,'')) as guest "; + $sql .= " FROM %customers%,%vacations% "; + $sql .= " WHERE %customers%.id=%vacations%.customerid AND ("; + $sql .= " ((checkin <= CURDATE()) AND (CURDATE() <= checkout)) "; + $sql .= " OR (checkin is null AND (CURDATE() <= checkout)) "; + $sql .= " OR ((checkin <= CURDATE()) AND checkout is null) "; + $sql .= ") GROUP BY id"; $guests = CommonUtils::fetchSqlAll($pdo, $sql, null); return(array("status" => "OK","guests" => $guests)); } catch (Exception $ex) { @@ -1551,6 +1558,7 @@ class Admin { "stornocode" => array("dbcol" => "stornocode","checknum" => 0), "printpass" => array("dbcol" => "printpass","checknum" => 0), "companyinfo" => array("dbcol" => "companyinfo","checknum" => 0), + "hosttext" => array("dbcol" => "hosttext","checknum" => 0), "rectemplate" => array("dbcol" => "rectemplate","checknum" => 0), "foodtemplate" => array("dbcol" => "foodtemplate","checknum" => 0), "drinktemplate" => array("dbcol" => "drinktemplate","checknum" => 0), @@ -2082,6 +2090,7 @@ class Admin { } public function backup($theType,$remoteaccesscode) { + set_time_limit(60*60); date_default_timezone_set(DbUtils::getTimeZone()); $nowtime = date('Y-m-d'); @@ -2183,7 +2192,7 @@ class Admin { } private function restore() { - set_time_limit(60*20); + set_time_limit(60*60); if ($_FILES['userfile']['error'] != UPLOAD_ERR_OK //checks for errors && is_uploaded_file($_FILES['userfile']['tmp_name'])) { //checks that file is uploaded diff --git a/webapp/php/printqueue.php b/webapp/php/printqueue.php index b362d55..e60c6b9 100644 --- a/webapp/php/printqueue.php +++ b/webapp/php/printqueue.php @@ -488,6 +488,9 @@ class PrintQueue { if (in_array($printer, $printersArr)) { if (is_null($fl)) { $receiptJob = array("id" => $printJobId,"bill" => $bill->getBillWithId($pdo,$aBillId,$language,$printer)); + } else if ($fl >= 9) { + $hosttext = CommonUtils::getConfigValue($pdo, 'hosttext', ''); + $receiptJob = array("id" => $printJobId,"bill" => $bill->getBillWithId($pdo,$aBillId,$language,$printer,true,true), "template" => $template, "hosttext" => $hosttext); } else if ($fl >= 6) { $receiptJob = array("id" => $printJobId,"bill" => $bill->getBillWithId($pdo,$aBillId,$language,$printer,true,true), "template" => $template); } else if ($fl >= 4) { diff --git a/webapp/php/updater.php b/webapp/php/updater.php index 6417376..45ad157 100644 --- a/webapp/php/updater.php +++ b/webapp/php/updater.php @@ -117,7 +117,7 @@ class Updater { $infoFileLines = $infoFile["msg"]; if (count($infoFileLines) > 1) { - $checkIfNewerVersion = self::isV2Newer('1.3.10',trim($infoFileLines[0])); + $checkIfNewerVersion = self::isV2Newer('1.3.11',trim($infoFileLines[0])); return array("status" => "OK","msg" => $infoFileLines[0],"url" => $url,"neweravailable" => ($checkIfNewerVersion ? 1 : 0)); } else { return array("status" => "ERROR","msg" => "Info file not valid","url" => $url); diff --git a/webapp/preferences.html b/webapp/preferences.html index c48b502..942dd8c 100644 --- a/webapp/preferences.html +++ b/webapp/preferences.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/products.html b/webapp/products.html index 614d552..c8e2332 100644 --- a/webapp/products.html +++ b/webapp/products.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/rating.html b/webapp/rating.html index 53e3f31..c125e1d 100644 --- a/webapp/rating.html +++ b/webapp/rating.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reports.html b/webapp/reports.html index 7c12bab..1d95c6b 100644 --- a/webapp/reports.html +++ b/webapp/reports.html @@ -7,7 +7,7 @@ - + diff --git a/webapp/reservation.html b/webapp/reservation.html index d12abed..6e0963e 100644 --- a/webapp/reservation.html +++ b/webapp/reservation.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/supplydesk.html b/webapp/supplydesk.html index 558dec0..6ca0a12 100644 --- a/webapp/supplydesk.html +++ b/webapp/supplydesk.html @@ -5,7 +5,7 @@ - + diff --git a/webapp/waiter.html b/webapp/waiter.html index fb04b1d..f65f9f1 100644 --- a/webapp/waiter.html +++ b/webapp/waiter.html @@ -4,8 +4,8 @@ - - + +