From e57e51e0b6a0a784a26b1332622df5c605d1bebb Mon Sep 17 00:00:00 2001 From: kong Date: Fri, 5 Nov 2021 00:03:35 +0700 Subject: [PATCH] DO blender and disable --- image/topping2/bd_straw.png | Bin 735 -> 773 bytes image/topping2/cb_force_checked.png | Bin 1388 -> 1388 bytes image/topping2/text5.png | Bin 4706 -> 4702 bytes image/topping2_en/bd_straw.png | Bin 738 -> 779 bytes image/topping2_en/text20.png | Bin 3103 -> 2666 bytes image/topping2_en/text21.png | Bin 2280 -> 2033 bytes image/topping2_en/text5.png | Bin 5219 -> 5180 bytes xml/menu_catalog.xml | 10 +- xml/menu_gen.py | 6 +- xml/page_catalog_choose_drink.xml | 26 ++- xml/page_catalog_choose_drink1.xml | 26 ++- xml/page_catalog_choose_drink2.xml | 46 ++++- xml/page_catalog_choose_drink3.xml | 42 +++- xml/page_catalog_choose_drink4.xml | 23 ++- xml/page_catalog_choose_drink5.xml | 18 +- xml/page_catalog_choose_drink6.xml | 48 ++++- xml/page_catalog_choose_drink7.xml | 22 ++- xml/page_catalog_choose_drink8.xml | 20 +- xml/page_topping_select3.xml | 289 ++++++++++++---------------- 19 files changed, 394 insertions(+), 182 deletions(-) diff --git a/image/topping2/bd_straw.png b/image/topping2/bd_straw.png index c9c1393cf3112f84aefeca640856dbed876a3063..92802ef6e180402a40ff6c0f8c0b4c2ee1bcc63a 100644 GIT binary patch delta 699 zcmV;s0!01a1%(EXR)3mFL_t(|0qvV>iW)%_g-`eR7B%1t{UP=WW|oj-12ap>4&v-! zvXoiDWCw8v`d2|zM8$XRDJ)S*z(3W<-1?wqs=BYpIrZpjtQ+8pUa$8x48s?xK1*ri zbI=Wfpu5}cUZW`LpWg^Y*^ruSk{1ZD2hTin++zD$?1BrSbsEA!-|iK*q#EVQt8y@&|j@q zrdVi7I-S0VhmfPZql0Z@)N0Lt+OKsnw3D90NB<#+?29B%-W;|+jvya7;-Hvr1<20%IddAyH1 zNs#2p(CZVWj*rTA!~K5$jyr&72xtJaMQmZ7fy=W6%q9(vsj?qXh;)7wMp5)zD!-r% z(fr0dV!H@-q;#Q&KT=*@q*D he_ZU}Ipxo9`~?IU3_Kcy41WLs002ovPDHLkV1gL0O}GF6 delta 661 zcmV;G0&4w*2HypcR)2I!L_t(|0qvWKZQC#uhJVTO1)uN)?gXtih`T^LN;hb-K{`q% zXg07nh(`!~-wuCT6qFzVf+S>&y!QcwEQtpEK0eYHUxX(Nhr^4*;qW_-<6q{qkFUWf zYgcKSj*B-U_rL_+HHW{Z{lVAf8YdC=Jh1|@;QyQU12SMX41Xvg&Mt7|r36nHD`Q4v zM!#>4caX^-J|2&k5Q<&wqbT|gq41q9L7=&BM59)#p;D=!R4TpLZ@=GTwOV1lULyeg z1OYIn(Q379;M?ui21s~LDf9U}?^`aH(P%X6^~q!cGezN(AOc+Q9NpP$mIsw2i4Bxe z%zU)hHk*y@%YW8vHZh$};gcAiaVgJH=QL=y+xGYz?mjbSxm?<8pd_Do7r+2Gx{Jla zj;0HeQk)0|%;th;>QexpM}b~nA3Q?=Ont&5C2&e~I-R@^11Fps4BqvpfS0o6!(JZ( z){;nE`Z+x`MLio z&t3Zrf@DCTpSRwGE`kt_3V?7_0ED9gARH9{;iv!zM+HDQDgeS!0T7M~fN)d*grfo= z92EfJsDA(mM+HDQ{Cj+iGbxbdmfGS@(EyBM^Z)$~&H(Ns;MQ1Hi?~+YY3_*;%jPa{ zDw>qYw>VAHTVwwp5c*snaD** z{xAsHSOkR3B7am0r>_xQO|4Mn3LYnTikPrgio?cOm1dg8R^JALswv3S4 z_Lo#5a>;}k%d}z%A?Vz9Yx6@sR;;kkWz zrBoF+w0}}DAvUM0z_}58+Pq4DAyY^c$7^D`h&OUZRX@_3+hUBaMkm*URdSz!MZ0p#2sCqDr*(In)`Pa{R^vDNbfoM+Dgu5%+8Gp_!A7R*GG5Hx|zRPib2oh%7p_SW;(bM%|g&mFufKs>1D4e=G;goa>10C z!9!PM$3U1kegsN`!t8J#tQNXc6kNQUJJAn%SuK;2C@I(a_sq8|j$}&Aju|{kP8#P~ z99U^2lbHSL16XYgWxrZRGK?AJSW7k}WPhcROv;kWf#LZ`v5`z~s&53Ykd-ppe9&|f z#}A8h3t(^ba>+Q$rTSMbX7J$7M=;gUYuA`NnVmoJaMtrPac+40Kxb9>l`bQN+}W^vC%X@4Js zpugUJ&nC9Cx?i08+=RlwM|}`wVhDv(WN8x(4dK>}cRw8z-(TMf;D&*hpKr%QN^_*a ze(CRcl=X`H|7^DTm(%0$`1TfXRab*zzm4UPws0(_7g)cL_k(A`Lw2m#+~7S+1bB*7 zcux+00Wuy19l;RTRX^&T@eN_wL!!YmeOz75D*Oh7#>&FT?eiq V{nqX`LN@>a002ovPDHLkV1lNsX`285 delta 1259 zcmVICJ%txHfMQCI^rLe#Y}VQsf;EvzG@lzTYe z9rto?d)D3C-nN%t()HeR?!D{(obNl|cg{Tovgmr=+d@F-0zx{0LOqy^AfXTxZj$}} z--BUg1(6QATD(rnO~FSgc?<3W2%(1stL1=yJeUyA@ehh18GjmJhu+nWYS_MG7d-aV zGtkIBW+L>@B{)9(H3WVhk%}g$jkKZ|QOL_%pE!&?QTM=lIMCM*_-$rlk;~xQvm0ij z(_+tjf9m|(q^sFmPi!=V7aSe_$@C&5P|Q2sJ7F=oKq-(`8?g!>poMLFu_H%BDs%zj zzYIb;5&|K$2!EBr?r8)^Q!7+I-6og0+z*N_F!a??W>rF`jrGlwSb>E~;-lX}VssG9 zKq@pTelqbHsA+pmF5l#B62A#0ofh`(#S_mX8{`X;XU9wSZUU5=>TWjPDoErL8SkExqlq}m4^*X2>JnvK+w^Z2-o?8 zjs;9cmAgR}fuzD0G~H(^A-0-2aJ~Mns%+tGK-0Y@5<`X0$${@-HyFE<$7ZVkFp6te{lDF$eet2PFtkTl%1Bb*Pkq>l!<-!3EBOP3cW+CV&m|hF1yGXcF6lxtl*{o{%wnG)>DQm-W!oHWj} zIIz-4CNcZn5hyi9WxrZRGK?AJSW7NS$bU*BnUp1$gQDjn`9`u*JGc_Akd-ppY|wOK z#}0~f3t(^bGVv(OrTR-2Gk9?4BbaLFwQJ0sjLx5U*z5V3IJZZ5*{oS`G;QOSTPT4r z9!yUBDHr1W!;E6GmytsMUXl)j){PIlJOoHHzM59ub0+=0TtXMGT6VhDwkWN8x(4dB*|kG~ug-(TMi;D&)WUv0-jN;9Ov zdh!2gnDvVDMmpX6$Ek66c54ebs;fb<-^O%ETR0Yz3#?zr5&!AnkQFO7Hn`6a0bXDg z?i0h`z)Um(buKqJ*Vcj&5MoTD{A9)aIB;?VK0WAz#QYoC5a9R!8XQ;F-2%!$ V{MehM>uLZ1002ovPDHLkV1nLdWg!3n diff --git a/image/topping2/text5.png b/image/topping2/text5.png index ae851650708775ae59ee43d3a6dc31c56608cdae..788f6ae57a3055e60beba473d8ffdad27a90451f 100644 GIT binary patch delta 4659 zcmV-363p%5B;F*DR)6zJL_t(|0qvddauY`qz`JL40dmP9zraNc&ew~a2M98su@QNI zSnvSExGH5#s=%fy*i@>p$pi2w50Ds>&%w?E#P)p+Sh^>$$mIwS?eule?#gTZvm{Hl zZ2IRKOWK{;nH}x4X1aT302D=06h%=KMNt$*Q50o=ASjB`7JtR*ytJ4c7@7dGndUKZ z-Jf5X0;OwGpeV|oJfFD$0R)!};157hX5mu;qH?3SXy8Af>{f zk6FUCvkNP;aEKT%GP=0Qfso9Izpz{arEjQUQU(ePwF^E0=Hg@AODV!&kmXQ}h0^os zF)47tGv+h@&VQ3Dp!5s_iZVb9-+cl);5a{;xJWjcB&vfH*tGd%QK_2*X}yW_KY(Y6f1Uv$q!v^dwy z#9o}t%S$>q8RXf*b&iKbIr$s~r_bSW+cH@5r1lzdT6o`n8K&cM07xjiv`8BjOOHQZ z_-VDi?0+sT>xk$}ex>rOms2B4tL0|p3-f?NR4#Yw<)6QwkJBWqbmuJDO&@@2@Lcu8Ykv-JAT7r^OjMwfX_VeI6lw6MY|$V- zbk_+5OZ;$W#C3oL!V;nVwKy|AkxU<)2!I9JB|bk3p^HJBk5f!@@d~UHdRDwK_Mp~s zRtdONwlWlzv5-EQuCuJM1rFdO_*}mAFpp~4-1U=bxcp+Mb9G?|#yiO;2E#u;j+;DZ zP=CCsoPMi-WU|l#jstPsBVi_SJo$a)T3utW{EA=mE&kmWt)Eu)-!gAd zltW@`W=tB%GkK^%9%TLnXY>0cH}4U&#^=W1%X|JMz6_zMeu&lK4}ZIUAy>T!O8{0p zZ}TpnpU78puIV(|6U;(s{yLxxmHehS28tBUwvVhVMRo)Fk@G*37s(;J0e{?N*f-qONBD$w88TcFT@w|*9=qg!^YlqFI*C{S zEJfCuwCF3EDUfTiR%97`&kZCezuKLob>hekBQax;K7#>4JkD9c{ZXTHEW)MBBm#b$ zhoL=R<-iyxt-o;P5C!@k!&wR|QC#_R?f$5!U{VeRf7Xq>#6hx9WL*=#%70L6QVz1N zc&IkM8%2ViI}Mhf_HY-J+DmMFAayA<&U2#u43I%mDtUkTb{QVta&_wy@DoDjdc)@yx8FF?p$a4&JpXw8M_c+O0o}?b7%6&jdC-ND;8BW$ zSG~t(&aL~T1fezc6X*jfn3Q7=Tl~a_`C|03)Wxtyl+0w&{<~!?bk3fUrOcG#!znKX zDU;gCGk~^rTmwK|S$`?~bAr!9RKcVuog%|U7D^d0ughod^{hhYlq9J^_*biZki1MZ zErvB`v{pU&9*4iVYq%m<&*mFmV=@ok8*j)UUWEgIkaF>&cXefP_haOo2qrQftyj}I zpE8Jj%9>tdKd4|*_63E(^#*o5=;EhzqN>-x6yiAa0r7I?kbf-3|vs#?3#JdrAlwr~8xTjT84%{@;JA_al}{!&X6v1h&*~ zuZ5E;zm@%AQGe`en;hh6mWR2xH8W1ZpTQMlP#Uy!`Li798Xvy~JzjM(2m;Y`jF=QY z;Oob$NXjpHn!s(b6bliV_A)hmH{o~mo{Lz5w@!e{!f%UwjYSB(na_xik~w80&V71o z#bY_+Ci0%Lvm9@O^9luWm`|pf57?>Ug_TmWoQR&t@P8>HCnSd`W!K|taC#|Y#)KYd;VAx4-_;I(5oMAhe9reH!YlsXqx6`zWLJk5e!2!- zqCF;MUr56>C(QkLvSt!)+-|x8wCT*)4dOiM8K>x#kajB(gu|(L`HeC+t!Fafw$?vN zdNRS=%6~R@isDJabx0h4Zh4!9njiTx#rKj;fS!ZB_g^thRT2!W8cKmhZ=!(ZqLOP0!!TY1jw4 z9+Pq`h}Q+GoT!A2il1yZOnU{TX7jiXE1!6hZGR=Gq~rA5(EBF5`(378b<(GLR}@82 z6h%=KMNtMG)iEi`JI+?Px&vDa@gp`?oF9Z$In`Z2QQmo~%b0uw1A@8>D2g(0s9;hQ zW#G`EoT9wrh$Aczj2`leoV!rvx6&7)`BoVVw!lHQWm@IWd9)_``zlx@+m`XZjQ)U0#gPA&`f=SsIzfE5dg}|tX=I3T{q}K%D zy50hTGBC)-3Oq!uKS8j3W?|(Lr2-kgE`NGpa;%J!U3ag*0ic3O=>@WO*lN3R%dg8v zb8;s+nY!xUVt;lAIS6ccADgZ8IB2?BP_JjG@>@}qrX;+=b4d8mUwCpLJtkFtD~d93 z=uqyMBFm-9w$?Jl^5<9T7IAxi{X(caFy85af+wwZY%SinC~+Ui`-%-7CwB^o-G2hW z*o&NBygRI0krBcrcS}6ZE6Gx<4a+feL0WV z@nnTb^6%{YqPxvBoo=gnJ=ESu0F_C$AD*kdhgM|>?*a3yuer$iY;!(S^>x^OS(<$} zt?sqmG8Jc?tH2QaMfY4pi*w!hE`P=AH}S<}izq6;dO6k11*DU5$7qk~n8E@g$DzQ= zkaLaByM06Wp_MpnJI?NLEeQn<6WpE8>^kSx*0r-7Wy$3iu6`KDaZ9wau*tJl<56*D z>|Qdh2m_B&K9}T2F3Xn^FG{;BeZ2c^@y6JL^~u~WR|5?H{HT0|nsVb_^?%^XAwt90 zNm(9N%F*Z^s%5CT2UiAbWZ~)vTUK*&d?Z_2 zOWb5yL^EQ6E@8Ovy{rX$`F|hpe|Qgi$n)tj2rOOZ@-K#^p;folc4zmX^cWq=DJ_Y+ z>_p*ixwY1)v-3~oWvRs_N?X^**PN38!i4M)!tZ9~1P>wHc@CFbq~CZkJ-*CoXT|M+ zg;?RY>leQ7)y9*?I0MiZ(Z}^O3r|NIL@T`r@8L*qyM2_<9+T1<3V)Ep&FE998-ZZa z5)b&EL?6?gZuN8a?h3GuXD-_Q2vgvF0X;zUE%=_7j`xB?BY8B22Uo=5e)KW@!O0J@ zp!5yxF)88zd65;|4cFq~ftqxgM1Qa?+Y&(+xXu<*Su*Mt9>&SbCSM{a``1A)chTQ+kUECPj#?Y0VJz_w81eJ0UqabQj$40}QIl(MaK1 zf({_jz#|K$Xi+m!g6mM~_@aVI5sS$(D|nyO9`_8M=HAYT(+vSGvYsV=7u}^Sh1%Fb(bWBmfq{tM7&EbW{ zOL(v_!lcp{BE_{3DaJ?K?y?jKB#L`NHB&Yale@cyhe9FaN1G(>f&y6MmpWnDPf{M9 z7XL5qn-w5(7Z7V>tuR*lj|wKGCB%wr79ndaM8vzZon z1PRn~qOU{Dz#XYWapY%&b7LHd^Z&DlY$}Y0fON0SL z-364cKqI3wtm=~vV4WV3OrN_?+i?Y>@D(Lb;hQm8&ll&v}@D#wC#8uEPRg9GZ|Qi{wL|x3d&V>J$&QPo%14 zu^2R*ihom_%!BvF8#0Jjp#xMf9e2=XpbsP-Oc73)KK0>E*eAuW@^uZZIPISIQT~;W z^;4x*6JV1|#ZnlY@MK|-?bNZeOWJWD_4$6bMA4p%8(BEz+z-{5fwx&rbZ1%gdeu7T zVf2Gt=~)PHNQ1Gr_!_?gK*MqbZ0!h$Zp(X?@_(bn8)FY^%iOTu6IN1xmdo-sD928( z{G)NTQCWhML4i)Wvb1tXsY7*4#}IL|<{tQ(b4KI`Z);}U+1h)#o{l`2FJ{KJ`R#3f zDDTM}GS253h7YPd@M+Hfk$-39ew&v>O4)V3Mj4}DbGZhA6RdG>tSCFhCKGw+$;&Fa zJ%0jRV|6Ps@^J5&wRm29pEyV>8<9!6QWw46NWg}9uX*9`{7{sSEAN^4l{2;R#XW<7 zvTX62`6CRV^qC$9lv<0#AO z1^B1=w04OO(V6ftqL?g0%t6(IG;~A8HFRjhw@TbISUCDJSs21HXA}1;Y|H&La(`18 zp8rXt(~pU?P@A5I*>hZ1BYcg`W@V6RJ{)Gk_r zs-4)q(G@I}o)Ay=tppV}#Uo`>Wq8Hi{|*$%yRIQbZUcj|*I7SkRBt?FYfHIbm$u8g zl3^EtZZ|v4{F!YFz~2gQj{Z3q=a5&i`{|FE$k=iE}$sKfRyK& za#>ayHAtU1pD=Q+3+^}^F|@~|D8~SCz6_|c!M&!(;=3k3VUcc07WlgjM=T7r$|=e* pBHj*5c2_Y5w&9g|d=w`n{~zp@Z4rhyGb#W8002ovPDHLkV1mMm4730M delta 4663 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 diff --git a/image/topping2_en/bd_straw.png b/image/topping2_en/bd_straw.png index f230feaaa9e9b899c2b78e90e0d5afb2f94bae2b..9f8f69244242dd6d00bcedb55ce4f544b8298b62 100644 GIT binary patch delta 705 zcmV;y0zUoX1&aodR)3&LL_t(|0qvVzZW=KZh0jb#_!Cg^D|kT63X&zX-9WOG?x17` z=~A+SbO&Vz@Cp(FgaGm1dn}9qwGuBLpJ7w1;iz<%LV&5lWHdKPM2=+Lu3uTrP)nI*o^i zhyTW{Rx3=WQ_N;F#6T;77)T@%D3{Ad_5r50<4u`{|sLf_$gf12f(|g`}=z%nD82#70);tz-8gu0Ow19LhbbC z5}-H=t=H?v7>)@A^K-`8csa1ZC9&)Qr%)7yuGedf$A9DF^?W{WmWCA{7qQ(13WdUP z%&EUzE={x0lw>k_7RT?&g9}^|ivbjz&1TQW*Tm6)QweM%5i=U;0Z62$)MS6o?Ul+z_}LZ2JpPk=lx667{Dh%`!slq_)QSX z@diLS-hTin#~T3UcmtpuZvd3z4S;gI0Z@)N0Lt+OKsnw3D90NB<#+?29B%-W;|+jv z`0w!^ZlpkxZ-!pJQR?_r*-p6I?cQ+%@Ermgz-kfOSTy1C-2zsV28UAF4=6;EAB9mA z{g%!zC_^;Av5weof^BIX=;4pFS9Xj6tf6HUr8xo^}$n_4J{X3WZ=?8xS`Uea=N!{!u00000NkvXXu0mjfi%(P- delta 664 zcmeBXd&D{+tiIgS#WAFU@$Kx+TxmlA*Z=Fn#7mq+HAGczH%?`n6m-e)4d0xg7{@z} zR~kc`7XF_0bLG>d+#3yvv$s5$$u6K>r0MYg{DfT=g7XYy`1JYO55KqQtDl)CAKx5! zZQUgkS@C?Aca4JgOsDT(_V?iRXHx3Q?{02nOL_Ev_BUpu1T&uc45vA~2A_hC2xl!# zb5Z+MTfDc~hwbCXiajj>Z_?ylFP3w(zAxcqT3efJlC@PzYbux5(o5Z+zx}oiTP=F+ zwJFmDe*uQaCQ)mriSE0bx7Oj1o$t)^&wt)2+S%i_IPtjpWX>}}t^Q3C4vr$HUz|(Z z91}80B}~KD@b$&MTr+9w>Gf-G<|J9oJ)~}Eb9hR6h-9f=bJ_0P_2(bHGftj%dTFhk z@2AdkW{rl6u{vUAv;0()-}Ed;Uk@6aG_3TmSju^a-)gR(UHc)< z>1;=L|1^29H0S4r>+J_D3S++aY-+A%Ji6=mLXISc%X{P2+e;;vl<$tcm;PmDz3$P< z7`}bHoJkDI(QCs#+qLdZzvnJ=gu!jskFslT%i>MXzvZ?2nE!F+Vm1ehEQS^kbjUuOn>)$RVxv0DY(MG;m+GYn5u`X`SJaSM0$|I zN#(6aCof`@IQs1WZ|OOVHtq)&Z`4^=u(smT9bx5ZXJa3Pm}pMSFPyb(`?0_E6ONm{ z?s%(~5%gYYc~OuikMHhB%-IfM9yS6KIM-ZD`uOF%`_ap;5niXWF0EN$RARevz0^)a j^Xkbj&0{_tmF8E9c_O%=iOYU30}yz+`njxgN@xNA+odr$ diff --git a/image/topping2_en/text20.png b/image/topping2_en/text20.png index 475ce0331660ed7abd732ace5eed0b1c12fcd6cc..89ca1af7156554c36cc0a8d0be375c8c2dbb4b6b 100644 GIT binary patch delta 2485 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 diff --git a/image/topping2_en/text21.png b/image/topping2_en/text21.png index 88d93b24e46af23a03412b8ffb295798a2667f34..c76d17eec349495f62d64e6017b0c35c2b28b421 100644 GIT binary patch delta 1877 zcmV-b2den!5%CX@Rb>Z;NkleEF=IpHSFx{q`_eDt-^OoRzA0|u<%sTPn}NZ;X(H~ z|C={&)_idG?Abf(>+5^9>#Y|rUbK90V!r-=}cAJpz!#c98XOYeW)y<0lyUI~(; zCA~-AJCFeVtav0$y5G@P=g*(-`nulzs)VJNW?*q~(a|M^;WJ#(_VFF;EJm;%A$in?I#Ln0O}_B_KmlQoHX+ z2)1qY_?iT#N(};Gf<}LlMM)j-af+deI-!N2_xkngk??3JQb{P*6s|b`;^N{H4J9rg zhd8Oz+a=`&v=mV-8RyWO4+d-g}kYWlN|@A#U|rzmet z*Pd&*a&=r8F`INr!$VtYgO@K~c04O3-<9jrl|WYEcy}GYR=HR5y%N&xX`RHSuS(%B zDTb;>>0Lcz_tk%^SKH-`SiVQ?vTvyszP5!67cT5X`#jWrsURv)Wmdf~rVQ*9+788MW-Zu9KblniYSu@U3T2j(4(@CjpB5?c#Xq zdeo8M&XI?~?Xq~ilUA9};;p=wl<#qIZ7)K8ckMJK4CSCPgdkOMJhd=cSiF27lC8UU z?^bCJ$a)zltf)hNp2E3oN4(B0MfhA+)}hXJSzh*?trs(DJsqz|bS~OTbgXk<#WNOk zydxnP3ao#HN#UP~e!}ULDR71^O-up)IyV;*E#KBPC6mf>vqr@D_eeIFAt~c z4(LxoEbOfE5Yj{0GzYMlpfMCqY`bOtlxAaOmCVcc0v|K4g`Ef!GzMD=3d7krf3!R8 zeGB`15y!{!z1+Mw$ZvEKhomvQ9Ep)880LRcKZFSy!(g9>alEXVsPBRbn#XHpx0Kx=~BCMvHaqNADo{Y1c{Hcb|t0Q|Q z^6)bj<^5afU-G&pgX0^r}ql~ zQLETAZiu%d8MkBNn6ml`*@E%??I>?o}?7(&zN7CUvfClq_AV47H>(rri P00000NkvXXu0mjfV;tG6 delta 2122 zcmV-Q2(|a|59kq)Rc;7x%!(g|FT1`K{-H5!S2?-Xy2z_ zSoh9?7WE6f?|e{_n$Kpi7p~Pew|akiz05)FsS*&Fpi&Nkl6xZ2Akr17A>5bsPT;~U z@JK04D2W2Hi}GG;QuQzlpZ@)`-(Gqh!HKQYE|CWkAS35!jZQ%FldthK0^@@;2Wj}N z1|?mQW|zLi^fSDF_mRFl$d}g+feEU`um*v9l+^&98)N5Y*0+WQn^=NaM{0i&c@U#W zg44t8rRJq_-^rO3P^Hh&5l@E)36XvyXJBbH6 z^FN}){X#p&@D90Ptvn+3?B->^PiV}l-EZuAA1Ib6Rx-Hl0Q+fqO-xckr4@)02 zCBdilFAx7H6eD|*|D}Qa_Y6ti$$XPCk9AxGCa4T4nELX8??hty+qi%GaW(?fmc5!% zcpJs%(jVkUqKq+3*`zya|0MPOH#OaPvGrK2}|Khuz zWTdCpF5kat&3H4E(3F3J3ei7m6X`oCX%hq{{nzjOt;sKYL{nhcO81p*$?FW|>1#*4 zd{)nwnQ$*WwzK^oH?L6Y_>=xHKXWH_u4R6*7i2N|>WDwikD=lDfpp~i02{mrDA)`B ztjBZAMU$1K`PwS-L3_bfdPUMymUv0qa*lOLb8gr+zNX|PII@55%hRBw&F9w4di%o6 zM!PQiUeNvZ+R&I#V}h!Q$X8Z49(RYp_&@Vl3Jy(EG1|4eGGDF+^y+sfn|x@qYQ*pJ z)$N&$N3DTPdeWrYlIZ$9@4Kh69-RvVZC1|7$eaIOnsk2dRxxKfq%fW|AEW4bO7Mv# zO$mxGU&GWSdeDE>yr$HZAT)PzqaBy`*StvpUeX_wd@j_HP-B9#&-tZ4N~Kc?=#=nt zjMzr0$4n4t zwDUS~2c5Or%%Ri5`HuX4-j1AOHCXc-=zu;6dMiu01{$W}ROU}1FhSMClnpffdfXkP z4@YVm2cvP*XllR+Q<~U`zy#I7)So7h-?TgCZY-U){6W4t^;=S=>BxSgQ`jU81F3)7 zQY|T+PX2!on4mIb2%1xJ#iYu{vs;&&$L*tiAOVMwbk6F8KfSrN--nY;BjA7Kt0z+6 zgFuG+ZO{*vZ@>9=W7M{(_TX?D73)9l{dn?0_6=Fi9o&bP+O$DafWQQmp|iLHV>^^L z=j8pp<3^@*C|eetAEeuHK;gk$8p}GmUi{kEx}Se7{Om#{!|Cr%vc1j|Vs;u}G#@6k z=69pEwPf@b-C|n7&S|*kPe%)RKka2R>*fE6rIGp9%o{V_4*&uaREpC&4{>pO#q7Ip zz4LTf%}H2kyyoR=FOxJe`};dTiTr++N3+SBT=IMvGWRH(L9MgTU+be)CYe&f{?bxA zdvBV9`Byr#UHbWM$T@sIPMUavB~;EovwOgnvx3@}-;d=BhX$93O3gDVIcvk7m^dUY zeZbs~1el(LKn(`XJRMCtn`^{&X2|_&EeU^KPX^PFNXqq%@2=A^c2}-wS$sm}TS>B7 z$V=y=&suta=Hzfa~u49~^ z3(u^#M^=nbV}iB0@5jpT$b+{daVK`TWwT{Ad%?vi)nG29?v0#3LHR%=#m(b+n`~FH>=Q z%i#I2FYL>ML1`NN1kOG8ynGINZ0P|Tt7+=O!NZF5r&I%tVJ=B<>@``6k zCuu&f$KSBidMwMxbf$DZucCND zK*Cv5E_@O0OmYo;8s+@|f_Vp#!7&;D0I0D414zG!T6@4_g#Z8m07*qoM6N<$g0GWU A4*&oF diff --git a/image/topping2_en/text5.png b/image/topping2_en/text5.png index 93eba60e6b3e02128afd00b58999cdaee66e33c5..0fe9d5064f6e54d975d4c503fc63cf696d557bac 100644 GIT binary patch delta 5141 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 delta 5163 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 Z{6Af~`k%8Z9?bv%002ovPDHLkV1l5PWyb&j diff --git a/xml/menu_catalog.xml b/xml/menu_catalog.xml index b2245f5e..66b55005 100644 --- a/xml/menu_catalog.xml +++ b/xml/menu_catalog.xml @@ -4,8 +4,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf diff --git a/xml/menu_gen.py b/xml/menu_gen.py index c3a46086..0f361ba6 100644 --- a/xml/menu_gen.py +++ b/xml/menu_gen.py @@ -40,8 +40,11 @@ #out_xml( '\t\tVar PriceShowValue = "Free"\r\n') out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n') + out_xml( '\t\tSTRCONTAIN "Smoothie" $' + product_code[i] + '.Button IsSmoRet\r\n') + out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_alter.xml"\r\n') - + + out_xml( '\t\r\n') out_xml( '\t\r\n') @@ -55,6 +58,7 @@ out_xml( '\t KanitTTF \r\n') out_xml( '\t 0xB78F24 \r\n') out_xml( '\t $' + product_code[i] + '.Price \r\n') + #out_xml( '\t eval( STRCONTAIN "Smoothie" $' + product_code[i] + '.Button SmoRet \n If SmoRet = "true" Then\n Var return = "Enable"\n Else\n Var return = "Invisible"\n EndIf\n) \r\n') out_xml( '\t\r\n') out_xml( '\t\r\n') diff --git a/xml/page_catalog_choose_drink.xml b/xml/page_catalog_choose_drink.xml index 7e12960a..fec98dfe 100644 --- a/xml/page_catalog_choose_drink.xml +++ b/xml/page_catalog_choose_drink.xml @@ -53,8 +53,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf @@ -287,6 +293,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_1.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -392,6 +399,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -497,6 +505,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -602,6 +611,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -707,6 +717,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-02-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -812,6 +823,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-02-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -917,6 +929,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1022,6 +1035,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1127,6 +1141,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1232,6 +1247,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1337,6 +1353,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0008.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1442,6 +1459,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1547,6 +1565,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0021.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1652,6 +1671,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0013.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1757,6 +1777,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0012.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1862,6 +1883,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml index 51136105..5543510a 100644 --- a/xml/page_catalog_choose_drink1.xml +++ b/xml/page_catalog_choose_drink1.xml @@ -53,8 +53,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf @@ -287,6 +293,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_1.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -392,6 +399,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_2.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -497,6 +505,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_3.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -602,6 +611,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_4.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -707,6 +717,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_5.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -812,6 +823,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_6.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -917,6 +929,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_7.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1022,6 +1035,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_8.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1127,6 +1141,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_9.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1232,6 +1247,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_10.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1337,6 +1353,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_11.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1442,6 +1459,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_12.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1547,6 +1565,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_13.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1652,6 +1671,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_14.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1757,6 +1777,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_15.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1862,6 +1883,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $best_seller_16.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml index 251aaa5f..2e988c76 100644 --- a/xml/page_catalog_choose_drink2.xml +++ b/xml/page_catalog_choose_drink2.xml @@ -56,8 +56,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf @@ -291,6 +297,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -396,6 +403,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0013.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -501,6 +509,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0020.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -606,6 +615,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0022.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -711,6 +721,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-11-01-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -816,6 +827,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -921,6 +933,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0014.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1026,6 +1039,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0019.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1131,6 +1145,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0021.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1236,6 +1251,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1341,6 +1357,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0005.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1446,6 +1463,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0006.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1551,6 +1569,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1656,6 +1675,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1761,6 +1781,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0010.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1866,6 +1887,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0011.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1971,6 +1993,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0012.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2076,6 +2099,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-01-0017.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2181,6 +2205,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0018.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2286,6 +2311,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0020.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2391,6 +2417,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0022.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2496,6 +2523,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-11-02-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2601,6 +2629,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2706,6 +2735,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0011.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2811,6 +2841,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0019.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2916,6 +2947,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0021.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3021,6 +3053,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3126,6 +3159,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-11-02-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3231,6 +3265,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3336,6 +3371,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3441,6 +3477,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0005.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3546,6 +3583,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3651,6 +3689,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0008.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3756,6 +3795,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3861,6 +3901,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-01-02-0017.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3966,6 +4007,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-01-02-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml index 02422cf0..ae51ca32 100644 --- a/xml/page_catalog_choose_drink3.xml +++ b/xml/page_catalog_choose_drink3.xml @@ -52,8 +52,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf @@ -287,6 +293,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -392,6 +399,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -497,6 +505,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0020.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -602,6 +611,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -707,6 +717,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -812,6 +823,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0006.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -917,6 +929,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0021.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1022,6 +1035,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1127,6 +1141,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0008.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1232,6 +1247,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0019.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1337,6 +1353,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1442,6 +1459,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0022.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1547,6 +1565,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0010.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1652,6 +1671,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0011.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1757,6 +1777,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0012.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1862,6 +1883,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-01-0017.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1967,6 +1989,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0020.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2072,6 +2095,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2177,6 +2201,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2282,6 +2307,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2387,6 +2413,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2492,6 +2519,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0005.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2597,6 +2625,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0006.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2702,6 +2731,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2807,6 +2837,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0008.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2912,6 +2943,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0019.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3017,6 +3049,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3122,6 +3155,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0022.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3227,6 +3261,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0010.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3332,6 +3367,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0011.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3437,6 +3473,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-02-02-0012.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3542,6 +3579,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0027.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml index 6bb0cd2b..4fe6e190 100644 --- a/xml/page_catalog_choose_drink4.xml +++ b/xml/page_catalog_choose_drink4.xml @@ -52,8 +52,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf @@ -288,6 +294,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-01-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -393,6 +400,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-01-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -498,6 +506,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-01-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -603,6 +612,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-01-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -708,6 +718,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-01-0005.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -813,6 +824,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-02-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -918,6 +930,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-02-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1023,6 +1036,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-02-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1128,6 +1142,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-02-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1233,6 +1248,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-02-0006.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1338,6 +1354,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-02-0005.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1443,6 +1460,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-02-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1548,6 +1566,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-03-03-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml index 586bbae3..fcd7e2c8 100644 --- a/xml/page_catalog_choose_drink5.xml +++ b/xml/page_catalog_choose_drink5.xml @@ -52,8 +52,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf @@ -288,6 +294,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-01-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -393,6 +400,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -498,6 +506,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -603,6 +612,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -708,6 +718,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -813,6 +824,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0005.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -918,6 +930,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0040.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1023,6 +1036,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0006.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml index c44df289..64b7f94a 100644 --- a/xml/page_catalog_choose_drink6.xml +++ b/xml/page_catalog_choose_drink6.xml @@ -51,8 +51,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf @@ -289,6 +295,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -394,6 +401,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0019.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -499,6 +507,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0020.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -604,6 +613,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0021.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -709,6 +719,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0035.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -814,6 +825,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0010.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -919,6 +931,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0011.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1024,6 +1037,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0033.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1129,6 +1143,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0028.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1234,6 +1249,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0012.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1339,6 +1355,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0041.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1444,6 +1461,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0013.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1549,6 +1567,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0031.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1654,6 +1673,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0008.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1759,6 +1779,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1864,6 +1885,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0024.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1969,6 +1991,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0038.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2074,6 +2097,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0029.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2179,6 +2203,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0025.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2284,6 +2309,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0039.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2389,6 +2415,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0014.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2494,6 +2521,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0015.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2599,6 +2627,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-01-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2704,6 +2733,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2809,6 +2839,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0034.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -2914,6 +2945,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3019,6 +3051,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0032.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3124,6 +3157,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0005.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3229,6 +3263,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0040.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3334,6 +3369,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0006.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3439,6 +3475,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0026.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3544,6 +3581,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0030.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3649,6 +3687,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3754,6 +3793,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3859,6 +3899,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0016.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -3964,6 +4005,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0017.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -4069,6 +4111,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-02-0018.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -4174,6 +4217,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-05-01-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" diff --git a/xml/page_catalog_choose_drink7.xml b/xml/page_catalog_choose_drink7.xml index b4d025ee..e9c4a2c9 100644 --- a/xml/page_catalog_choose_drink7.xml +++ b/xml/page_catalog_choose_drink7.xml @@ -50,8 +50,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf @@ -288,6 +294,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -393,6 +400,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -498,6 +506,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -603,6 +612,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0013.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -708,6 +718,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -813,6 +824,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0005.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -918,6 +930,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0006.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1023,6 +1036,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1128,6 +1142,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0008.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1233,6 +1248,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1338,6 +1354,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0010.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1443,6 +1460,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $12-04-02-0011.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" diff --git a/xml/page_catalog_choose_drink8.xml b/xml/page_catalog_choose_drink8.xml index 7e5290b3..c26d8895 100644 --- a/xml/page_catalog_choose_drink8.xml +++ b/xml/page_catalog_choose_drink8.xml @@ -51,8 +51,14 @@ If NextPage = "-" Then Else - If Timeout > 30 Then - Open NextPage + If CupOnArm = "true" Then + If Timeout > 9 Then + Open NextPage + EndIf + Else + If Timeout > 30 Then + Open NextPage + EndIf EndIf EndIf @@ -289,6 +295,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0001.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -394,6 +401,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0002.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -499,6 +507,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0003.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -604,6 +613,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0004.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -709,6 +719,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0005.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -814,6 +825,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0006.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -919,6 +931,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0007.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1024,6 +1037,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0008.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1129,6 +1143,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0009.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" @@ -1234,6 +1249,7 @@ SAVELOG NameDrink Var PriceShowValue = charOfBaht + PriceDrink Var OpenFromXML = CurrentXMLFileName2 + STRCONTAIN "Smoothie" $11-99-05-0010.Button IsSmoRet Open "ROOT/taobin_project/xml/page_topping_alter.xml" diff --git a/xml/page_topping_select3.xml b/xml/page_topping_select3.xml index 5dba8b83..ca894d1c 100644 --- a/xml/page_topping_select3.xml +++ b/xml/page_topping_select3.xml @@ -49,8 +49,6 @@ Var ShotCoffeePremium = "Invisible" - Var StarwState = "Enable" - ; On open Var LidState = Lid1Status @@ -147,7 +145,9 @@ EndIf EndIf - + Var LidDeactiveButton = "Invisible" + Var StrawDeactiveButton = "Invisible" + Machine DoorClose 2000 @@ -250,6 +250,8 @@ + DEBUGVAR MAT_ID_9701 + DEBUGVAR MAT_ID_9601 DEBUGVAR SubMenuProductCode1 @@ -322,7 +324,17 @@ Var blendedStateShow = "Enable" Var PriceDiff = SubMenuPrice1 - PriceDrinkNoTop - + + DEBUGVAR IsSmoRet + + If IsSmoRet = "true" Then + Var blendedState = "ForceSet" + Var blendedStateTxt = "Enable" + Function 1 + Else + Var blendedStateTxt = "Invisible" + + EndIf EndIf @@ -330,25 +342,54 @@ Var IgnoreLidStraw = "false" Var ShowLidStraw = "Invisible" Var ShowLidOnly = "Invisible" - Var ShowStrawOnly = "Invisible" - + Var ShowStrawOnly = "Invisible" + + Else - If LidState = "Enable" Then - Var ShowLidStraw = "Enable" - Var ShowLidOnly = "Invisible" + Var ShowLidStraw = "Enable" + + If MAT_ID_9701 = "Enable" Then + Var StrawState = MAT_ID_9701 Else - Var ShowLidStraw = "Invisible" - Var ShowStrawOnly = "Enable" + Var StrawState = MAT_ID_9701 EndIf + + If MAT_ID_9601 = "Enable" Then + Var LidState = MAT_ID_9601 + Else + Var LidState = MAT_ID_9601 + EndIf + EndIf + ; Override all If Service_LidStraw = "Disable" Then - Var ShowLidStraw = "Invisible" - Var ShowLidOnly = "Invisible" - Var ShowStawOnly = "Invisible" - + Var ShowLidStraw = "Enable" + ;Var ShowLidOnly = "Invisible" + ;Var ShowStawOnly = "Invisible" + + + Var StrawState = "Disable" + Var LidState = "Disable" + EndIf + If StrawState = "Enable" Then + Var StrawDeactiveButton = "Invisible" + Else + Var StrawDeactiveButton = "Enable" + EndIf + + + If LidState = "Enable" Then + Var LidDeactiveButton = "Invisible" + Else + Var LidDeactiveButton = "Enable" + EndIf + + + + ;PressForever If TOPPING1 = "Sugar" Then @@ -564,6 +605,14 @@ DEBUGVAR TOPPING2 Refresh EndIf + If TOPPING2 = "shot coffee 1008" Then + + Var ShotCoffeePremium = "Enable" + Var showShotEnable = "Enable" + + DEBUGVAR TOPPING2 + Refresh + EndIf ;-END If TOPPING3 = "Collagen" Then @@ -702,6 +751,7 @@ Var( DirImage + "/bn_blended.png" ) Var( DirImage + "/bp_blended.png" ) Var( DirImage + "/bd_blended.png" ) + Var( DirImage + "/bp_blended.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -732,6 +782,7 @@ Var( DirImage + "/cb_notcheck.png" ) Var( DirImage + "/cb_checked.png" ) Var( DirImage + "/cb_checkdis.png" ) + Var( DirImage + "/cb_force_checked.png" ) "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume @@ -758,6 +809,13 @@ Var( DirImage + "/text7.png" ) + + blendedStateTxt + 602 + 64 + Var( DirImage + "/text5.png" ) + + ;- Begin topping1 @@ -1040,7 +1098,7 @@ SoundVolume SAVELOG "premium shot press" -ป + If showShotEnable = "Press" Then Var showShotEnable = "Enable" Var PriceDrinkTmp = PriceDrinkTmp - toppingID2price2 @@ -1176,129 +1234,6 @@ ; ; ;-BEGIN Collagen - -;- END -; -; -; -;-BEGIN Lid only - - 987 - 188 - 20 - ShowLidOnly - - "Enable" - bg_lid_only - - -; lid left - - - - - -;- END -; -; -; -; -; -; -; -; -; -;-BEGIN Straw only - - 987 - 188 - 20 - ShowStrawOnly - - "Enable" - bg_straw_only - - - -; straw left - - - - - -;- END -; -; -; -; -; -; -; -; ; ;-BEGIN Lid straw @@ -1314,16 +1249,17 @@ + + ; LID left + + + StrawDeactiveButton + 602 + 64 + Var( DirImage + "/text20.png" ) + + + + + LidDeactiveButton + 602 + 150 + Var( DirImage + "/text21.png" ) + + + + ; ; ; @@ -1435,13 +1394,13 @@ DEBUGVAR topping3 DEBUGVAR LidState - DEBUGVAR StarwState + DEBUGVAR StrawState DEBUGVAR UserSelectProductCode DEBUGVAR HAVE_UV_DOOR_LID If HAVE_UV_DOOR_LID = "true" Then - If StarwState = "Press" Then + If StrawState = "Press" Then Machine StrawOrder Var LedLidBlink = "true" EndIf @@ -1451,7 +1410,7 @@ Var LedLidBlink = "true" EndIf - Var StarwState = "Enable" + Var StrawState = "Enable" Var LidState = "Enable" ; @@ -1501,13 +1460,13 @@ DEBUGVAR topping3 DEBUGVAR LidState - DEBUGVAR StarwState + DEBUGVAR StrawState DEBUGVAR UserSelectProductCode DEBUGVAR HAVE_UV_DOOR_LID If HAVE_UV_DOOR_LID = "true" Then - If StarwState = "Press" Then + If StrawState = "Press" Then Machine StrawOrder Var LedLidBlink = "true" EndIf @@ -1517,7 +1476,7 @@ Var LedLidBlink = "true" EndIf - Var StarwState = "Enable" + Var StrawState = "Enable" Var LidState = "Enable" ; @@ -1550,21 +1509,29 @@ DEBUGVAR showShotEnable DEBUGVAR blendedState - - If blendedState = "Press" Then + If blendedState = "ForceSet" Then Var TOPPING_PRICE = PriceDiff Var UserSelectProductCode = SubMenuProductCode1 Var showShotEnable = "Disable" Var showText4 = "Enable" Else - - Var UserSelectProductCode = SaveProductCodeSelect - If showShotEnable = "Disable" Then - Var showShotEnable = "Enable" + + If blendedState = "Press" Then + Var TOPPING_PRICE = PriceDiff + Var UserSelectProductCode = SubMenuProductCode1 + + Var showShotEnable = "Disable" + Var showText4 = "Enable" + Else + + Var UserSelectProductCode = SaveProductCodeSelect + If showShotEnable = "Disable" Then + Var showShotEnable = "Enable" + EndIf + + Var showText4 = "Invisible" EndIf - - Var showText4 = "Invisible" EndIf DEBUGVAR UserSelectProductCode