From 7b92d697619c7646e7d99618980c0eb9137c879b Mon Sep 17 00:00:00 2001 From: kong Date: Thu, 24 Mar 2022 11:42:29 +0700 Subject: [PATCH] Before pull --- image/topping2/bt_cold_disable2.png | Bin 0 -> 883 bytes image/topping2/bt_hot_disable2.png | Bin 0 -> 1829 bytes image/topping2/bt_smoothie_disable2.png | Bin 0 -> 1515 bytes image/topping2_en/bt_cold_disable2.png | Bin 0 -> 932 bytes image/topping2_en/bt_hot_disable2.png | Bin 0 -> 1657 bytes image/topping2_en/bt_smoothie_disable2.png | Bin 0 -> 1898 bytes xml/menu_new_layout_gen.py | 36 ++- xml/page_catalog_group_coffee.xml | 333 +++++++++++++++++++++ xml/page_catalog_group_milk.xml | 72 +++++ xml/page_catalog_group_other.xml | 297 ++++++++++++++++++ xml/page_catalog_group_tea.xml | 234 +++++++++++++++ xml/page_catalog_group_whey.xml | 135 +++++++++ xml/page_topping_select4.xml | 90 +++++- 13 files changed, 1183 insertions(+), 14 deletions(-) create mode 100644 image/topping2/bt_cold_disable2.png create mode 100644 image/topping2/bt_hot_disable2.png create mode 100644 image/topping2/bt_smoothie_disable2.png create mode 100644 image/topping2_en/bt_cold_disable2.png create mode 100644 image/topping2_en/bt_hot_disable2.png create mode 100644 image/topping2_en/bt_smoothie_disable2.png diff --git a/image/topping2/bt_cold_disable2.png b/image/topping2/bt_cold_disable2.png new file mode 100644 index 0000000000000000000000000000000000000000..2c9bcf887edad03a2e106b462e3841d309156fcb GIT binary patch literal 883 zcmeAS@N?(olHy`uVBq!ia0vp^3xL>ygAGVl{rb!dq&N#aB8wRqxP?KOkzv*x37{Zj zage(c!@6@aFM%AEbVpxD28NCO+ zPkQwqY~8z=|AIKn5t}Ier4BbcvZBL+13Ujs4q}}ey5Yt0j-C}uvhVM&-N~XjX9c^W zOy-Sl|M~mb6i+?+dcD6QghgbXhr`1zJd~Gm%8|0&y^m|`#N#f%Eqg3bIia^<_E|N) z71v)E-dX%&&kD7h96N5meYElV>sG(z!bgfH`0m)S<#yKAb9jQJV4g+p-L^ z*@1S8WFCF|_w?!0-U&+jo3aj1XnVgk;!4>`@p8t?rnjqgr<{H&#Mka@!!&XI#f&{O zw_7e!eq6tA@eAW4$pzvDYm=5=et9=r!$`x4id`SAH+`c6 zHaSy&Y`NVE$Gqb zz@Gw1tqks_Gw1gMm2Bl+62sMEqSWk znkJWcIW)KDN=}rY+TZZy{~95+TY;>%cLiM3uLpXGr`>sL+`JyI|E7`OBWKm-i<>NY z`NPa;S^t%gBO%>hoE5jzJdZkVSY*aioVjFA?UiX3RZ@f;001}$1^@s6diwJN00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP8&n&rkr)<4*fNqROAOP5ARn+q7pI&M@{oEtthNj>OdG68fDoP; zuN@*G@?;ZT?}mQbJh+W|H}+HC#!VEDCn(v|Lky!i_0fmc-lRw1f$*dfp0I>Buw^T4 zd+KT0{>)B_ClbUk?XYSA9)Bml-w^VIB$35y2ybZD2n{I5W0=*_wg4^HOUR={GOr2> z79QgZZ3(b&IG;61exVMBJ5+cbR>Iry-1EdRYo(hdbVuHmIASz!;GJ9|RUOz>N<>h5- zYX+g22_8#;h9Rw_@7V|~Fo45(5sSr$2_F3^NkV% z8VncCQN?rjXTP5=JE4 zZ)s_X78e)mA9OSL(2@Jal#=!M;dG$>HK#0TJv5GwX=0%M#(4ruiy`ZjE$umWLd@xkRf zJ3B3x(_sz*!!;0Fa~Osj=`d?ATrdXV7-O`P@y zoLmaRbL#u0QYmr+WAJ_uC&UNfv{4D4eqiV)7KAwj+e4_mi0}&tTDvL4?$p?3oG~Z@ z*uyOZGBYz%51W4e4vpP$8E+zytU!F--Q8Ar)VUjq2E0btg?Q`&(%@QL$0&@B7S-Mg!@vFVGldoHTwXuNw3~gJPFKzLMz-77 zbUN+25J9hkaT2y38`Txq*4I@^aZ(7GyY>6^(5{Ns6>RgGJ{^wT1ZH2j3Kz7`aC(4f6T<|7Ye%;5{^-qRA@)Fon4s`*f>J65MoBf;mE z-nYA{j~&h*G)TTq_nx+zxqq7P)@D2jL?FkH001}$1^@s6diwJN00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yPc%yh)qTrqbd07%4Tn!eCZ$9uASs$ed`@m@5wDD2TqC2n zZg@pG=SmSV(6{f6FgiW2y(xs;kLFNFy1E~eXJ77-r=H#|sZ>g4r?rSm?bmb0{&(Jb zJ@(y&U&l8xrXz%uz}D_ET5i z0hgDTg=}87Ke59^K~1MO3f4^uURhZ&BIY(LCN{q3=jTm>w50LK7X|A^KnRvkK)erd zeGu0L(U`6q6K@m@hSb~W_%2{mQ27^L24?CXOz1qv9Vc);q*49=b4-dPZ zdrAKIDT;0{(y;Fl5UJI+N{r#Ug>P}ev0~06)dLr$u|+3XjD++KiTDUah{a;r|GT=n zq!bc~gjvJ@MAT5`%KJJncf=wF;2cI@f52Q2CH=}x^>QnY)SRwv69L6lP7ehnHOC65 zcSaZiN$qJ0wU}2u3-^B!LLNTaG9_AOZh1OjW0v2?$&Fwc`QxOaSyfZl2slwaio`?lU1z}yNMuaJdq z<%Ha{|8Zu*c1vbD6dWTP4iQX!6wj)vT|Wh z7<o35@wJAmo9BHu|Appisdnq-<|*&pQTgV6vYpGzKE4 zEm|P{Ft6u-tIrmU4UI&ib+HJ6fT&C#X+}Z@MK_1*v!9_g_pu;JCv>$4^gs zk23<2sU*YQbtZnW@LTq~$yKAo&0VBxNym z^SVs@_Osl&X{uaYz1lsE1xKMdUoI4olthkrCgtjFjw3@SBcmG`hXRtK!2;vzUzg?D zKUcHjX=e5I+L_d%M2d}iUhWCVa&_V%k%*i5+|2ZCiRp$yQqQlXLzY-M;#sl+e)Z)k zA*28{IzhBC*VW=BC0dSnmY`>FLbBkVU7Zwll#?+>-0`$>#&xtCtAuo3?gH$Bhtmc& Rkv0GT002ovPDHLkV1n#~!K(lO literal 0 HcmV?d00001 diff --git a/image/topping2_en/bt_cold_disable2.png b/image/topping2_en/bt_cold_disable2.png new file mode 100644 index 0000000000000000000000000000000000000000..30db79a7bc5989588886f00e3ceec718b71555be GIT binary patch literal 932 zcmeAS@N?(olHy`uVBq!ia0vp^3xL>ygAGVl{rb!dq&N#aB8wRqxP?KOkzv*x37{Zj zage(c!@6@aFM%AEbVpxD28NCO+{qnzxHs8I(i9d|2HMtKYOgQqp zD2$Q4`QYu!{rCNMZoZp$Ic>A&BHJx2-2o~KI9!>!0ygD1U3*;`r8nJ`H!UVEZdu;; z*?M}b{-=el4lRuES$^5``t|G8$K|_H^=9#1w2S2IU@4jV=g#rRkCPRr^-K02pL&+* z{m~o0fB*Ip>{Q&AWp_+@W5)CxmO1C2XBy3Xv!{(gjc?P0g*9O*vsoH>j@_!*q>(J? z{O0rL&*!Q?-^wt#C3yW&XXy88xlIBS^lzU&9#mak{{6gBMv&w-_x2Sj$39i8JD;{$ z>9FFDvuDqqGo8%yQs7Furx%0WWS5-jIwXJ z^ttfc39SwL)~&u>`AdT3i+7Ijl)p(p%}YKzU2Qy*dfMRYEyIahmQGTS0#d_p7`%S^LF`6-W4>*O^j*M zM;+~(Y#Z}+BIa3cx3zVMnmi%f?wHw{+}%s}%y&Pw<)=h?x$_#H4c10y)NiTImYT5F zLdB@?RJkjU9GB_GdGqF7DzMNwCf~)lfA8U%JM%VwUP&3oJpbHLW|_@q^G(D=NKv?bzkK%h zjPISDIx;ER`yG4NwC_ruR>&tGKJT@%&Cb6QPkyU+ny~z(n&G86pCqoXEPV9;qTU*C znt>)ABB+0MeM{BrT^aJ3_Wk=ev&F)kW5pHqLqC}R6?O~#KX9=On5h^%UHx3vIVCg! E04!Rca{vGU literal 0 HcmV?d00001 diff --git a/image/topping2_en/bt_hot_disable2.png b/image/topping2_en/bt_hot_disable2.png new file mode 100644 index 0000000000000000000000000000000000000000..a8d93ce5403b0fa8be8c81c7c1bf8b15ef6bb8b8 GIT binary patch literal 1657 zcmV-<28Q{GP)001}$1^@s6diwJN00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yPP9R7#EgqbZu~> zUDzg?XcGeqTQN;6CDF!MEm|Z&P(I{q2Id~mbL^R3U_S1JnQ6*>f63*Zxg1DU#yJQSfGi=1wUM2{fC5tl?=#4uYBR0g!@!jup~o>eb<)Db6!@xZPG2;tdb z=PU`4B$w!#_P5f3j!tT7X{F|tHVTI$6m4uIhA|9%_<=s#v;!UrPb%RFExh)Fhp6+( zr|9t0M=2bM5W{%Ew*Uv;PM)%ayeLU@;WdQUeXN(-mE$ptUpxy?yIw?|Cz453P_Xcr zvfxR8ss3b_P4aU!?5R=VwMPl>$g|H8!|axl0)+T#NDiZo5^ZRtlYOTt#svjaCW;Es zEk0DXCr_Q`0)r_l1qJ99-{B)i>4g)o5W|!kE8j&F9B$`h@iCPmuK-c)=5jt2b{VEp zY!l#xw~}YnDT!(q1qbJROeNWr10wGWk#;}bYT;^^sWh7$(3Z{{Chy}uA5#r-4hZ*C zs~jne6R-9W!&HNu11k4R;f$6GhhC;y$IF2)iUZ$F80iyENxu4#@*GddiEp!fO zSyCr`&+Kvca~y}}=jU^;o12@9&QGV)w7k5m$F^-#V}()^DWyKEC`3WS6d?(GXg|nX ztE$QR`Z}$xtrS9_p8nNaV+IKnR%AJrw3$!HM<8B544ZX#m$V;%`M z2}@VM?0!23IUL*!Ii>;mTun_4g+ifi^Dz%cHk-{|!x*91fSfZ3;HT6#6*cc~BgP*P z9*Pu*uMiMYEEZFR-or(w)zwv9;J869hy!45JRXcYTP^Y6hH>nCVf?YMuuxQd0Ir64 zZg(t&TdaE>+dQ!#h#}Y=^89`tE@ni9a9dkjtE*Uu2iH+tm^pCDrKP1@8wV9{U0ofm ztgPe&jBDX=n1V(y5{&{ZE-uneafi^YEfk0luaN_qz9Ym8G2(L&tT_xA2g&&i!TX8J z015`T`xWZnK~U~uBIqrbd<5D7OC|aUj|h`nap!ZTTnhp;q1;a%7!**1Okl9Ii*WR~ z0`U|(yey5CniIt3H9uG?Kh{Y~CX*({Kc!sFtn)JYu_Vdc7|hN7MT|Gxd7Wu07s6dh z=W9v_9TkG*7zY2$&Jg1bgjKf)(Qe5HiVm-<8$oqSTZ+(_5+O}b-6zI7sCm>r?{x!IX`CcQ@CNG&m?fuJBXvwVh% zxzMTzM1@{qzV89|gm@u3te6NkiVz)!fBpFCgfHvr)L`rc<2${J5+uc3AD;j_3QoEqtz@bWQ5;b$+Vp|IiFT%p|8xGUl z_R|8|3+UfaHbW!oG(SBxNz;E$65}7U{mLAET@8XYIbe`_hx)gKFf1K;3FF&0ZxF*& zi`?5ZyKW5jphN%PvyQQi31}D~qH~|r2iSCO}hd3NFWv6Jn-Yr5n;g_F% z!i5P_R!Z)W9Qk&1{^gf?ud0cCnM}F~ZWyv{YHfdl7-pxS%K|)Y(bXb6*88!rWv!FV zK0o!xgqXZ{mpVGTc>5N!BYX)EjEs)14PXEM>%@z_zpJ?2y}Gi}bZ7h)Evrg7+OUu6 z>Z8OkUhyqJ!|?UdF@$6x#DdBVkI&7{h+lpjCv4?HXpV#6WCQydTFCxXeS47{<+ib;D2heQg?_00000NkvXXu0mjf DNE7r` literal 0 HcmV?d00001 diff --git a/image/topping2_en/bt_smoothie_disable2.png b/image/topping2_en/bt_smoothie_disable2.png new file mode 100644 index 0000000000000000000000000000000000000000..720cded5987fe7002ae229b5699e82061be94a17 GIT binary patch literal 1898 zcmV-w2bK7VP)001}$1^@s6diwJN00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yPA-)5|XjCMTH1Uzh0$JdyJ6CRKSV%(BIE^MeHVkasLR`84 zmzt>K0*#tL%K|h(ZNekGJ8h@X*Ua(!Px}q0mwRXK%-p%9_WLE5Iovz<+}qyYeBXK8 zxm928+oMSkJSd`JBgU{P<`wB&i4sHohq5_}7$pJ`n*!$^T z5(H*qY>W!yqjcx?O*E~kgy|S5}er6*Ti$xl_WkghJyJ<7-eE01) z@;{vZZK#$y6C?BoqOKrm(f=gK{KHkv`6eePZN%WRHxdf}e=sPG zDY}u{H#?JQGebfV0s&iET70)*JyP)a__+Q5?CdNF%M-K(aZA6_#b^brhAU@10;0`@ z=s7bpQ(l)yBy7ES^}@%%2Ltl+IxMIQV0|i;^4;I9$8R5@KDyVewXa$wHZR(55mM9w zQue)j_sSA@S-EnhT^OYLv9U2*hAc?;Xn%62!Fw*NR;{ufBp1B5P$&d`SXgSIHdsJK z6mJBanwlz?Yl$Eb4-126#Sx3;z;+1J*4FmG{&){W0vruFngWy|ryEIGU{_c^F4l2d zR;Znp^jzCtV>pH)1Q*hk%mo(=Q4Bx=H(FH!`>}ku_z=uZ<=75+FeZm%BZ~RS4e1c& zy!*0bICs>+9V0hd`W+YYp*`ytQH9F1&)uRmf3IMK;38HVkcE659UT?hTrQA;fwbOE z4$HysgM?lIam>}LS3giU_T|(JIHEx+_qcxN3!!m7G63Bek&gp%nsOJny$4AVIou0e z3HNxYC`s;~_)~9`OP2e3{sXVUR|-=NdGm;^L;r zpz%Hz5$53s4?O~EF$4@FoeR=5cMcFi;}`&T)2{S#qsKl^#-c}K4;OByB22V$J09Fy zZ8oleINu-%WgM_R3iA^LCK}};4<|vh2Dn%lB5}voSS~ls;(b_nU2AJ=dGHr?<4zhx zLP){`%2==s?MuIb=vv`a&*Os_E5uC}I3CUm>+!SjxTa7Wc*GmfiR56U0=m;*)qq4C z0o^Ev3(mJ|agQ3~a6DiPIeAvYk0=D>dichPpq~pe*4m_4?o62W-~6)$^Zf_2xmZ&$ zgu_e)28G>u*J?8(*bfq-#~hTlQAd>RLwqRk0SKxS>+y5cI;Xwdxpw99d`bU|e;dAH z5Td)gn;HcILNHF@NO!JmC}S!O3!{%!Fv;eTL;AF6wmA2!S$}LE)v3n zr>g?^}XGa)uEoIAtC92Z1D zAr{d2`1{ZEwp>(dfY*zFLM(iL>Kps2jeMDd_n)RO0t!tBsTcFVrtSBy8M;62Zj&!I z2u%g4_uL=9+Hx|X2l@{j9d@@%1QeRa%+#b!z0+paNR!HP&(}o+6q*L)E2rKm8t{9M z2q-j#(?5P^|IVD1PpO_vHtYNR7HINja4ZLK%E#*Ca&~ "Vertical" \r\n') out_xml(' 4 \r\n') + pd_code_available = '##-##-##-####' + count_test = 0 out_xml('; menu_new_list '+ str(len(menu_new_list))+'\r\n') for spl in menu_new_list: @@ -27,7 +29,25 @@ str_con += spl[6] + '.Button,' out_xml( '\t Flag( '+ str_con + ') \r\n') - + + pd_code_1 = spl[4] + pd_stage1 = '$' + spl[4] + '.Button' + if spl[4] == "-" or len(spl[4]) == 0 : + pd_code_1 = pd_code_available + pd_stage1 = '"Disable2"' + + pd_code_2 = spl[5] + pd_stage2 = '$' + spl[5] + '.Button' + if spl[5] == "-" or len(spl[5]) == 0: + pd_code_2 = pd_code_available + pd_stage2 = '"Disable2"' + + pd_code_3 = spl[6] + pd_stage3 = '$' + spl[6] + '.Button' + if spl[6] == "-" or len(spl[6]) == 0: + pd_code_3 = pd_code_available + pd_stage3 = '"Disable2"' + out_xml( '\t @@ -737,6 +746,15 @@ Var PriceD1 = $12-11-01-0001.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-11-01-0001" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-11-01-0001.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -867,6 +885,15 @@ Var PriceD1 = $12-01-01-0013.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0013" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0013.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1001,6 +1028,15 @@ Strawberry, Orange, Floral" Var PriceD1 = $12-01-01-0020.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0020" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0020.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1135,6 +1171,15 @@ Note: Blue Berry and Floral" Var PriceD1 = $12-01-01-0022.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0022" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0022.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1269,6 +1314,15 @@ Note: Strawberry & Floral" Var PriceD1 = $12-01-01-0024.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0024" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0024.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1403,6 +1457,15 @@ Note: Jasmine & Honey" Var PriceD1 = $12-01-01-0026.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0026" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0026.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1537,6 +1600,15 @@ Note: Whisky & Vanilla" Var PriceD1 = $12-01-01-0028.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0028" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0028.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1671,6 +1743,15 @@ Note: Peach, tea, chocolate" Var PriceD1 = $12-01-01-0033.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0033" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0033.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1804,6 +1885,15 @@ ESPRESSO" Var PriceD1 = $12-01-01-0003.Price Var PriceD2 = $12-01-02-0001.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0003" + Var PD_CODE2 = "12-01-02-0001" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0003.Button + Var PD_STAGE_2 = $12-01-02-0001.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1934,6 +2024,15 @@ ESPRESSO" Var PriceD1 = $12-01-01-0014.Price Var PriceD2 = $12-01-02-0011.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0014" + Var PD_CODE2 = "12-01-02-0011" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0014.Button + Var PD_STAGE_2 = $12-01-02-0011.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2068,6 +2167,15 @@ Strawberry, Orange, Floral" Var PriceD1 = $12-01-01-0019.Price Var PriceD2 = $12-01-02-0019.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0019" + Var PD_CODE2 = "12-01-02-0019" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0019.Button + Var PD_STAGE_2 = $12-01-02-0019.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2202,6 +2310,15 @@ Note: Blue Berry and Floral" Var PriceD1 = $12-01-01-0021.Price Var PriceD2 = $12-01-02-0021.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0021" + Var PD_CODE2 = "12-01-02-0021" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0021.Button + Var PD_STAGE_2 = $12-01-02-0021.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2336,6 +2453,15 @@ Note: Strawberry & Floral" Var PriceD1 = $12-01-01-0025.Price Var PriceD2 = $12-01-02-0025.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0025" + Var PD_CODE2 = "12-01-02-0025" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0025.Button + Var PD_STAGE_2 = $12-01-02-0025.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2470,6 +2596,15 @@ Note: Whisky & Vanilla" Var PriceD1 = $12-01-01-0023.Price Var PriceD2 = $12-01-02-0023.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0023" + Var PD_CODE2 = "12-01-02-0023" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0023.Button + Var PD_STAGE_2 = $12-01-02-0023.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2604,6 +2739,15 @@ Note: Jasmine & Honey" Var PriceD1 = $12-01-01-0027.Price Var PriceD2 = $12-01-02-0027.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0027" + Var PD_CODE2 = "12-01-02-0027" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0027.Button + Var PD_STAGE_2 = $12-01-02-0027.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2738,6 +2882,15 @@ Note: Peach, tea, chocolate" Var PriceD1 = $12-01-01-0032.Price Var PriceD2 = $12-01-02-0032.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0032" + Var PD_CODE2 = "12-01-02-0032" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0032.Button + Var PD_STAGE_2 = $12-01-02-0032.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2871,6 +3024,15 @@ AMERICANO" Var PriceD1 = $-.Price Var PriceD2 = $12-01-02-0020.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-01-02-0020" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-01-02-0020.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3005,6 +3167,15 @@ Note: Blue Berry and Floral" Var PriceD1 = $-.Price Var PriceD2 = $12-01-02-0022.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-01-02-0022" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-01-02-0022.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3139,6 +3310,15 @@ Note: Strawberry & Floral" Var PriceD1 = $-.Price Var PriceD2 = $12-01-02-0026.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-01-02-0026" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-01-02-0026.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3273,6 +3453,15 @@ Note: Whisky & Vanilla" Var PriceD1 = $-.Price Var PriceD2 = $12-01-02-0024.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-01-02-0024" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-01-02-0024.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3407,6 +3596,15 @@ Note: Jasmine & Honey" Var PriceD1 = $-.Price Var PriceD2 = $12-01-02-0018.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-01-02-0018" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-01-02-0018.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3541,6 +3739,15 @@ Strawberry, Orange, Floral" Var PriceD1 = $-.Price Var PriceD2 = $12-01-02-0028.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-01-02-0028" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-01-02-0028.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3675,6 +3882,15 @@ Note: Peach, tea, chocolate" Var PriceD1 = $-.Price Var PriceD2 = $12-01-02-0033.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-01-02-0033" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-01-02-0033.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3808,6 +4024,15 @@ ALMOST DIRTY" Var PriceD1 = $12-01-01-0004.Price Var PriceD2 = $12-01-02-0002.Price Var PriceD3 = $12-01-03-0002.Price + Var PD_CODE1 = "12-01-01-0004" + Var PD_CODE2 = "12-01-02-0002" + Var PD_CODE3 = "12-01-03-0002" + Var PD_STAGE_1 = $12-01-01-0004.Button + Var PD_STAGE_2 = $12-01-02-0002.Button + Var PD_STAGE_3 = $12-01-03-0002.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3939,6 +4164,15 @@ Foamed milk" Var PriceD1 = $12-01-01-0005.Price Var PriceD2 = $12-11-02-0002.Price Var PriceD3 = $12-11-03-0002.Price + Var PD_CODE1 = "12-01-01-0005" + Var PD_CODE2 = "12-11-02-0002" + Var PD_CODE3 = "12-11-03-0002" + Var PD_STAGE_1 = $12-01-01-0005.Button + Var PD_STAGE_2 = $12-11-02-0002.Button + Var PD_STAGE_3 = $12-11-03-0002.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4070,6 +4304,15 @@ Foamed milk" Var PriceD1 = $12-01-01-0006.Price Var PriceD2 = $12-01-02-0003.Price Var PriceD3 = $12-01-03-0003.Price + Var PD_CODE1 = "12-01-01-0006" + Var PD_CODE2 = "12-01-02-0003" + Var PD_CODE3 = "12-01-03-0003" + Var PD_STAGE_1 = $12-01-01-0006.Button + Var PD_STAGE_2 = $12-01-02-0003.Button + Var PD_STAGE_3 = $12-01-03-0003.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4202,6 +4445,15 @@ Milk, Sugar" Var PriceD1 = $12-01-01-0007.Price Var PriceD2 = $12-01-02-0004.Price Var PriceD3 = $12-01-03-0004.Price + Var PD_CODE1 = "12-01-01-0007" + Var PD_CODE2 = "12-01-02-0004" + Var PD_CODE3 = "12-01-03-0004" + Var PD_STAGE_1 = $12-01-01-0007.Button + Var PD_STAGE_2 = $12-01-02-0004.Button + Var PD_STAGE_3 = $12-01-03-0004.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4334,6 +4586,15 @@ Caramel Syrup" Var PriceD1 = $12-01-01-0031.Price Var PriceD2 = $12-01-02-0031.Price Var PriceD3 = $12-01-03-0031.Price + Var PD_CODE1 = "12-01-01-0031" + Var PD_CODE2 = "12-01-02-0031" + Var PD_CODE3 = "12-01-03-0031" + Var PD_STAGE_1 = $12-01-01-0031.Button + Var PD_STAGE_2 = $12-01-02-0031.Button + Var PD_STAGE_3 = $12-01-03-0031.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4466,6 +4727,15 @@ CAFÉ LATTE" Var PriceD1 = $12-01-01-0008.Price Var PriceD2 = $12-01-02-0005.Price Var PriceD3 = $12-01-03-0005.Price + Var PD_CODE1 = "12-01-01-0008" + Var PD_CODE2 = "12-01-02-0005" + Var PD_CODE3 = "12-01-03-0005" + Var PD_STAGE_1 = $12-01-01-0008.Button + Var PD_STAGE_2 = $12-01-02-0005.Button + Var PD_STAGE_3 = $12-01-03-0005.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4598,6 +4868,15 @@ CAFÉ LATTE" Var PriceD1 = $12-01-01-0011.Price Var PriceD2 = $12-01-02-0008.Price Var PriceD3 = $12-01-03-0008.Price + Var PD_CODE1 = "12-01-01-0011" + Var PD_CODE2 = "12-01-02-0008" + Var PD_CODE3 = "12-01-03-0008" + Var PD_STAGE_1 = $12-01-01-0011.Button + Var PD_STAGE_2 = $12-01-02-0008.Button + Var PD_STAGE_3 = $12-01-03-0008.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4731,6 +5010,15 @@ Kokuto syrup" Var PriceD1 = $12-01-01-0009.Price Var PriceD2 = $12-01-02-0006.Price Var PriceD3 = $12-01-03-0006.Price + Var PD_CODE1 = "12-01-01-0009" + Var PD_CODE2 = "12-01-02-0006" + Var PD_CODE3 = "12-01-03-0006" + Var PD_STAGE_1 = $12-01-01-0009.Button + Var PD_STAGE_2 = $12-01-02-0006.Button + Var PD_STAGE_3 = $12-01-03-0006.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4864,6 +5152,15 @@ Milk, Sugar" Var PriceD1 = $12-01-01-0012.Price Var PriceD2 = $12-01-02-0009.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0012" + Var PD_CODE2 = "12-01-02-0009" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0012.Button + Var PD_STAGE_2 = $12-01-02-0009.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4995,6 +5292,15 @@ Sugar, Water" Var PriceD1 = $12-01-01-0017.Price Var PriceD2 = $12-01-02-0017.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-01-01-0017" + Var PD_CODE2 = "12-01-02-0017" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-01-01-0017.Button + Var PD_STAGE_2 = $12-01-02-0017.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -5126,6 +5432,15 @@ Sugar, Water" Var PriceD1 = $12-01-01-0010.Price Var PriceD2 = $12-01-02-0007.Price Var PriceD3 = $12-01-03-0007.Price + Var PD_CODE1 = "12-01-01-0010" + Var PD_CODE2 = "12-01-02-0007" + Var PD_CODE3 = "12-01-03-0007" + Var PD_STAGE_1 = $12-01-01-0010.Button + Var PD_STAGE_2 = $12-01-02-0007.Button + Var PD_STAGE_3 = $12-01-03-0007.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -5258,6 +5573,15 @@ CAFÉ LATTE" Var PriceD1 = $12-01-01-0029.Price Var PriceD2 = $12-01-02-0029.Price Var PriceD3 = $12-01-03-0029.Price + Var PD_CODE1 = "12-01-01-0029" + Var PD_CODE2 = "12-01-02-0029" + Var PD_CODE3 = "12-01-03-0029" + Var PD_STAGE_1 = $12-01-01-0029.Button + Var PD_STAGE_2 = $12-01-02-0029.Button + Var PD_STAGE_3 = $12-01-03-0029.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -5389,6 +5713,15 @@ CAFÉ LATTE" Var PriceD1 = $12-01-01-0030.Price Var PriceD2 = $12-01-02-0030.Price Var PriceD3 = $12-01-03-0030.Price + Var PD_CODE1 = "12-01-01-0030" + Var PD_CODE2 = "12-01-02-0030" + Var PD_CODE3 = "12-01-03-0030" + Var PD_STAGE_1 = $12-01-01-0030.Button + Var PD_STAGE_2 = $12-01-02-0030.Button + Var PD_STAGE_3 = $12-01-03-0030.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index 434a3c03..427c85cc 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -607,6 +607,15 @@ Var PriceD1 = $12-03-01-0005.Price Var PriceD2 = $12-03-02-0005.Price Var PriceD3 = $12-03-03-0005.Price + Var PD_CODE1 = "12-03-01-0005" + Var PD_CODE2 = "12-03-02-0005" + Var PD_CODE3 = "12-03-03-0005" + Var PD_STAGE_1 = $12-03-01-0005.Button + Var PD_STAGE_2 = $12-03-02-0005.Button + Var PD_STAGE_3 = $12-03-03-0005.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -737,6 +746,15 @@ Var PriceD1 = $12-03-01-0001.Price Var PriceD2 = $12-03-02-0001.Price Var PriceD3 = $12-03-03-0001.Price + Var PD_CODE1 = "12-03-01-0001" + Var PD_CODE2 = "12-03-02-0001" + Var PD_CODE3 = "12-03-03-0001" + Var PD_STAGE_1 = $12-03-01-0001.Button + Var PD_STAGE_2 = $12-03-02-0001.Button + Var PD_STAGE_3 = $12-03-03-0001.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -867,6 +885,15 @@ Var PriceD1 = $12-02-02-0009.Price Var PriceD2 = $12-02-01-0009.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-02-02-0009" + Var PD_CODE2 = "12-02-01-0009" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-02-02-0009.Button + Var PD_STAGE_2 = $12-02-01-0009.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -999,6 +1026,15 @@ Water, Ice" Var PriceD1 = $12-03-01-0004.Price Var PriceD2 = $12-03-02-0004.Price Var PriceD3 = $12-03-03-0004.Price + Var PD_CODE1 = "12-03-01-0004" + Var PD_CODE2 = "12-03-02-0004" + Var PD_CODE3 = "12-03-03-0004" + Var PD_STAGE_1 = $12-03-01-0004.Button + Var PD_STAGE_2 = $12-03-02-0004.Button + Var PD_STAGE_3 = $12-03-03-0004.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1131,6 +1167,15 @@ Caramel Syrup" Var PriceD1 = $12-03-01-0003.Price Var PriceD2 = $12-03-02-0003.Price Var PriceD3 = $12-03-03-0003.Price + Var PD_CODE1 = "12-03-01-0003" + Var PD_CODE2 = "12-03-02-0003" + Var PD_CODE3 = "12-03-03-0003" + Var PD_STAGE_1 = $12-03-01-0003.Button + Var PD_STAGE_2 = $12-03-02-0003.Button + Var PD_STAGE_3 = $12-03-03-0003.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1262,6 +1307,15 @@ MILK" Var PriceD1 = $-.Price Var PriceD2 = $12-03-02-0006.Price Var PriceD3 = $12-03-03-0006.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-03-02-0006" + Var PD_CODE3 = "12-03-03-0006" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-03-02-0006.Button + Var PD_STAGE_3 = $12-03-03-0006.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1394,6 +1448,15 @@ Sugar, Ice" Var PriceD1 = $12-03-01-0002.Price Var PriceD2 = $12-03-02-0002.Price Var PriceD3 = $12-03-03-0002.Price + Var PD_CODE1 = "12-03-01-0002" + Var PD_CODE2 = "12-03-02-0002" + Var PD_CODE3 = "12-03-03-0002" + Var PD_STAGE_1 = $12-03-01-0002.Button + Var PD_STAGE_2 = $12-03-02-0002.Button + Var PD_STAGE_3 = $12-03-03-0002.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1524,6 +1587,15 @@ Sugar, Ice" Var PriceD1 = $-.Price Var PriceD2 = $-.Price Var PriceD3 = $12-03-03-0009.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "12-03-03-0009" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = $12-03-03-0009.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index 3693710c..66b01017 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -605,6 +605,15 @@ Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0007.Price Var PriceD3 = $12-05-03-0007.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0007" + Var PD_CODE3 = "12-05-03-0007" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0007.Button + Var PD_STAGE_3 = $12-05-03-0007.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -735,6 +744,15 @@ Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0019.Price Var PriceD3 = $12-05-03-0019.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0019" + Var PD_CODE3 = "12-05-03-0019" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0019.Button + Var PD_STAGE_3 = $12-05-03-0019.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -865,6 +883,15 @@ Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0020.Price Var PriceD3 = $12-05-03-0020.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0020" + Var PD_CODE3 = "12-05-03-0020" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0020.Button + Var PD_STAGE_3 = $12-05-03-0020.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -995,6 +1022,15 @@ Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0035.Price Var PriceD3 = $12-05-03-0035.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0035" + Var PD_CODE3 = "12-05-03-0035" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0035.Button + Var PD_STAGE_3 = $12-05-03-0035.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1126,6 +1162,15 @@ DRINK SODA" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0010.Price Var PriceD3 = $12-05-03-0010.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0010" + Var PD_CODE3 = "12-05-03-0010" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0010.Button + Var PD_STAGE_3 = $12-05-03-0010.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1257,6 +1302,15 @@ SODA" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0033.Price Var PriceD3 = $12-05-03-0033.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0033" + Var PD_CODE3 = "12-05-03-0033" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0033.Button + Var PD_STAGE_3 = $12-05-03-0033.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1387,6 +1441,15 @@ SODA" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0011.Price Var PriceD3 = $12-05-03-0011.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0011" + Var PD_CODE3 = "12-05-03-0011" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0011.Button + Var PD_STAGE_3 = $12-05-03-0011.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1517,6 +1580,15 @@ SODA" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0022.Price Var PriceD3 = $12-05-03-0022.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0022" + Var PD_CODE3 = "12-05-03-0022" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0022.Button + Var PD_STAGE_3 = $12-05-03-0022.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1650,6 +1722,15 @@ Limenade,Soda, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0028.Price Var PriceD3 = $12-05-03-0028.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0028" + Var PD_CODE3 = "12-05-03-0028" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0028.Button + Var PD_STAGE_3 = $12-05-03-0028.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1781,6 +1862,15 @@ Limenade,Soda, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0029.Price Var PriceD3 = $12-05-03-0029.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0029" + Var PD_CODE3 = "12-05-03-0029" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0029.Button + Var PD_STAGE_3 = $12-05-03-0029.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1914,6 +2004,15 @@ Soda, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0012.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0012" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0012.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2045,6 +2144,15 @@ Soda, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0041.Price Var PriceD3 = $12-05-03-0041.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0041" + Var PD_CODE3 = "12-05-03-0041" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0041.Button + Var PD_STAGE_3 = $12-05-03-0041.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2176,6 +2284,15 @@ Soda, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0008.Price Var PriceD3 = $12-05-03-0008.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0008" + Var PD_CODE3 = "12-05-03-0008" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0008.Button + Var PD_STAGE_3 = $12-05-03-0008.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2307,6 +2424,15 @@ Soda, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0009.Price Var PriceD3 = $12-05-03-0009.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0009" + Var PD_CODE3 = "12-05-03-0009" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0009.Button + Var PD_STAGE_3 = $12-05-03-0009.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2440,6 +2566,15 @@ Limenade,Soda, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0024.Price Var PriceD3 = $12-05-03-0024.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0024" + Var PD_CODE3 = "12-05-03-0024" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0024.Button + Var PD_STAGE_3 = $12-05-03-0024.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2570,6 +2705,15 @@ Limenade,Soda, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0025.Price Var PriceD3 = $12-05-03-0025.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0025" + Var PD_CODE3 = "12-05-03-0025" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0025.Button + Var PD_STAGE_3 = $12-05-03-0025.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2703,6 +2847,15 @@ Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0038.Price Var PriceD3 = $12-05-03-0038.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0038" + Var PD_CODE3 = "12-05-03-0038" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0038.Button + Var PD_STAGE_3 = $12-05-03-0038.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2833,6 +2986,15 @@ Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0039.Price Var PriceD3 = $12-05-03-0039.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0039" + Var PD_CODE3 = "12-05-03-0039" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0039.Button + Var PD_STAGE_3 = $12-05-03-0039.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2964,6 +3126,15 @@ SODA" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0014.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0014" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0014.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3094,6 +3265,15 @@ SODA" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0015.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0015" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0015.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3224,6 +3404,15 @@ SODA" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0034.Price Var PriceD3 = $12-05-03-0034.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0034" + Var PD_CODE3 = "12-05-03-0034" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0034.Button + Var PD_STAGE_3 = $12-05-03-0034.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3354,6 +3543,15 @@ SODA" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0003.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0003" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0003.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3486,6 +3684,15 @@ Water, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0004.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0004" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0004.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3617,6 +3824,15 @@ Water, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0002.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0002" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0002.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3748,6 +3964,15 @@ Water, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0005.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0005" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0005.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3880,6 +4105,15 @@ Water, Ice" Var PriceD1 = $12-05-01-0001.Price Var PriceD2 = $12-05-02-0001.Price Var PriceD3 = $12-05-03-0001.Price + Var PD_CODE1 = "12-05-01-0001" + Var PD_CODE2 = "12-05-02-0001" + Var PD_CODE3 = "12-05-03-0001" + Var PD_STAGE_1 = $12-05-01-0001.Button + Var PD_STAGE_2 = $12-05-02-0001.Button + Var PD_STAGE_3 = $12-05-03-0001.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4010,6 +4244,15 @@ Water, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-05-02-0026.Price Var PriceD3 = $12-05-03-0026.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0026" + Var PD_CODE3 = "12-05-03-0026" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0026.Button + Var PD_STAGE_3 = $12-05-03-0026.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4140,6 +4383,15 @@ Water, Ice" Var PriceD1 = $12-05-02-0032.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-05-02-0032" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-05-02-0032.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4271,6 +4523,15 @@ Water, Ice" Var PriceD1 = $12-05-02-0040.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-05-02-0040" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-05-02-0040.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4402,6 +4663,15 @@ Water, Ice" Var PriceD1 = $12-06-01-0001.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-06-01-0001" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-06-01-0001.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4532,6 +4802,15 @@ Water, Ice" Var PriceD1 = $.Price Var PriceD2 = $12-05-02-0017.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-05-02-0017" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-05-02-0017.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4662,6 +4941,15 @@ Water, Ice" Var PriceD1 = $12-05-02-0016.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-05-02-0016" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-05-02-0016.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -4792,6 +5080,15 @@ Water, Ice" Var PriceD1 = $12-05-01-0002.Price Var PriceD2 = $12-05-02-0018.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-05-01-0002" + Var PD_CODE2 = "12-05-02-0018" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-05-01-0002.Button + Var PD_STAGE_2 = $12-05-02-0018.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index 89660638..dce05474 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -607,6 +607,15 @@ Var PriceD1 = $12-02-01-0001.Price Var PriceD2 = $12-02-02-0001.Price Var PriceD3 = $12-02-03-0001.Price + Var PD_CODE1 = "12-02-01-0001" + Var PD_CODE2 = "12-02-02-0001" + Var PD_CODE3 = "12-02-03-0001" + Var PD_STAGE_1 = $12-02-01-0001.Button + Var PD_STAGE_2 = $12-02-02-0001.Button + Var PD_STAGE_3 = $12-02-03-0001.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -738,6 +747,15 @@ and water" Var PriceD1 = $12-02-01-0020.Price Var PriceD2 = $12-02-02-0020.Price Var PriceD3 = $12-02-03-0020.Price + Var PD_CODE1 = "12-02-01-0020" + Var PD_CODE2 = "12-02-02-0020" + Var PD_CODE3 = "12-02-03-0020" + Var PD_STAGE_1 = $12-02-01-0020.Button + Var PD_STAGE_2 = $12-02-02-0020.Button + Var PD_STAGE_3 = $12-02-03-0020.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -868,6 +886,15 @@ and water" Var PriceD1 = $12-02-01-0007.Price Var PriceD2 = $12-02-02-0007.Price Var PriceD3 = $12-02-03-0007.Price + Var PD_CODE1 = "12-02-01-0007" + Var PD_CODE2 = "12-02-02-0007" + Var PD_CODE3 = "12-02-03-0007" + Var PD_STAGE_1 = $12-02-01-0007.Button + Var PD_STAGE_2 = $12-02-02-0007.Button + Var PD_STAGE_3 = $12-02-03-0007.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -999,6 +1026,15 @@ and water" Var PriceD1 = $12-02-01-0002.Price Var PriceD2 = $12-02-02-0002.Price Var PriceD3 = $12-02-03-0002.Price + Var PD_CODE1 = "12-02-01-0002" + Var PD_CODE2 = "12-02-02-0002" + Var PD_CODE3 = "12-02-03-0002" + Var PD_STAGE_1 = $12-02-01-0002.Button + Var PD_STAGE_2 = $12-02-02-0002.Button + Var PD_STAGE_3 = $12-02-03-0002.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1129,6 +1165,15 @@ and water" Var PriceD1 = $12-02-01-0021.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-02-01-0021" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-02-01-0021.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1260,6 +1305,15 @@ GINGER TEA" Var PriceD1 = $12-02-01-0024.Price Var PriceD2 = $12-02-02-0024.Price Var PriceD3 = $12-02-03-0024.Price + Var PD_CODE1 = "12-02-01-0024" + Var PD_CODE2 = "12-02-02-0024" + Var PD_CODE3 = "12-02-03-0024" + Var PD_STAGE_1 = $12-02-01-0024.Button + Var PD_STAGE_2 = $12-02-02-0024.Button + Var PD_STAGE_3 = $12-02-03-0024.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1390,6 +1444,15 @@ GINGER TEA" Var PriceD1 = $12-02-01-0025.Price Var PriceD2 = $12-02-02-0025.Price Var PriceD3 = $12-02-03-0025.Price + Var PD_CODE1 = "12-02-01-0025" + Var PD_CODE2 = "12-02-02-0025" + Var PD_CODE3 = "12-02-03-0025" + Var PD_STAGE_1 = $12-02-01-0025.Button + Var PD_STAGE_2 = $12-02-02-0025.Button + Var PD_STAGE_3 = $12-02-03-0025.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1521,6 +1584,15 @@ and Warm milk" Var PriceD1 = $12-02-01-0026.Price Var PriceD2 = $12-02-02-0026.Price Var PriceD3 = $12-02-03-0026.Price + Var PD_CODE1 = "12-02-01-0026" + Var PD_CODE2 = "12-02-02-0026" + Var PD_CODE3 = "12-02-03-0026" + Var PD_STAGE_1 = $12-02-01-0026.Button + Var PD_STAGE_2 = $12-02-02-0026.Button + Var PD_STAGE_3 = $12-02-03-0026.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1651,6 +1723,15 @@ and Warm milk" Var PriceD1 = $12-02-01-0027.Price Var PriceD2 = $12-02-02-0027.Price Var PriceD3 = $12-02-03-0027.Price + Var PD_CODE1 = "12-02-01-0027" + Var PD_CODE2 = "12-02-02-0027" + Var PD_CODE3 = "12-02-03-0027" + Var PD_STAGE_1 = $12-02-01-0027.Button + Var PD_STAGE_2 = $12-02-02-0027.Button + Var PD_STAGE_3 = $12-02-03-0027.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1781,6 +1862,15 @@ and Warm milk" Var PriceD1 = $12-02-01-0028.Price Var PriceD2 = $12-02-02-0028.Price Var PriceD3 = $12-02-03-0028.Price + Var PD_CODE1 = "12-02-01-0028" + Var PD_CODE2 = "12-02-02-0028" + Var PD_CODE3 = "12-02-03-0028" + Var PD_STAGE_1 = $12-02-01-0028.Button + Var PD_STAGE_2 = $12-02-02-0028.Button + Var PD_STAGE_3 = $12-02-03-0028.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1914,6 +2004,15 @@ and water" Var PriceD1 = $12-02-01-0011.Price Var PriceD2 = $12-02-02-0011.Price Var PriceD3 = $12-02-03-0011.Price + Var PD_CODE1 = "12-02-01-0011" + Var PD_CODE2 = "12-02-02-0011" + Var PD_CODE3 = "12-02-03-0011" + Var PD_STAGE_1 = $12-02-01-0011.Button + Var PD_STAGE_2 = $12-02-02-0011.Button + Var PD_STAGE_3 = $12-02-03-0011.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2044,6 +2143,15 @@ and water" Var PriceD1 = $12-02-01-0012.Price Var PriceD2 = $12-02-02-0012.Price Var PriceD3 = $12-02-03-0012.Price + Var PD_CODE1 = "12-02-01-0012" + Var PD_CODE2 = "12-02-02-0012" + Var PD_CODE3 = "12-02-03-0012" + Var PD_STAGE_1 = $12-02-01-0012.Button + Var PD_STAGE_2 = $12-02-02-0012.Button + Var PD_STAGE_3 = $12-02-03-0012.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2176,6 +2284,15 @@ LIMENADE" Var PriceD1 = $12-02-02-0006.Price Var PriceD2 = $12-02-01-0006.Price Var PriceD3 = $12-02-03-0006.Price + Var PD_CODE1 = "12-02-02-0006" + Var PD_CODE2 = "12-02-01-0006" + Var PD_CODE3 = "12-02-03-0006" + Var PD_STAGE_1 = $12-02-02-0006.Button + Var PD_STAGE_2 = $12-02-01-0006.Button + Var PD_STAGE_3 = $12-02-03-0006.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2309,6 +2426,15 @@ TEA" Var PriceD1 = $12-02-02-0003.Price Var PriceD2 = $12-02-01-0003.Price Var PriceD3 = $12-02-03-0003.Price + Var PD_CODE1 = "12-02-02-0003" + Var PD_CODE2 = "12-02-01-0003" + Var PD_CODE3 = "12-02-03-0003" + Var PD_STAGE_1 = $12-02-02-0003.Button + Var PD_STAGE_2 = $12-02-01-0003.Button + Var PD_STAGE_3 = $12-02-03-0003.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2439,6 +2565,15 @@ TEA" Var PriceD1 = $12-02-02-0004.Price Var PriceD2 = $12-02-01-0004.Price Var PriceD3 = $12-02-03-0004.Price + Var PD_CODE1 = "12-02-02-0004" + Var PD_CODE2 = "12-02-01-0004" + Var PD_CODE3 = "12-02-03-0004" + Var PD_STAGE_1 = $12-02-02-0004.Button + Var PD_STAGE_2 = $12-02-01-0004.Button + Var PD_STAGE_3 = $12-02-03-0004.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2569,6 +2704,15 @@ TEA" Var PriceD1 = $12-02-02-0008.Price Var PriceD2 = $12-02-01-0008.Price Var PriceD3 = $12-02-03-0008.Price + Var PD_CODE1 = "12-02-02-0008" + Var PD_CODE2 = "12-02-01-0008" + Var PD_CODE3 = "12-02-03-0008" + Var PD_STAGE_1 = $12-02-02-0008.Button + Var PD_STAGE_2 = $12-02-01-0008.Button + Var PD_STAGE_3 = $12-02-03-0008.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2700,6 +2844,15 @@ Sugar, Water, Ice" Var PriceD1 = $12-02-01-0011.Price Var PriceD2 = $12-02-02-0011.Price Var PriceD3 = $12-02-03-0011.Price + Var PD_CODE1 = "12-02-01-0011" + Var PD_CODE2 = "12-02-02-0011" + Var PD_CODE3 = "12-02-03-0011" + Var PD_STAGE_1 = $12-02-01-0011.Button + Var PD_STAGE_2 = $12-02-02-0011.Button + Var PD_STAGE_3 = $12-02-03-0011.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2830,6 +2983,15 @@ Sugar, Water, Ice" Var PriceD1 = $12-02-02-0012.Price Var PriceD2 = $12-02-01-0012.Price Var PriceD3 = $12-02-03-0012.Price + Var PD_CODE1 = "12-02-02-0012" + Var PD_CODE2 = "12-02-01-0012" + Var PD_CODE3 = "12-02-03-0012" + Var PD_STAGE_1 = $12-02-02-0012.Button + Var PD_STAGE_2 = $12-02-01-0012.Button + Var PD_STAGE_3 = $12-02-03-0012.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2962,6 +3124,15 @@ LIMENADE" Var PriceD1 = $12-02-01-0019.Price Var PriceD2 = $12-02-02-0019.Price Var PriceD3 = $12-02-03-0019.Price + Var PD_CODE1 = "12-02-01-0019" + Var PD_CODE2 = "12-02-02-0019" + Var PD_CODE3 = "12-02-03-0019" + Var PD_STAGE_1 = $12-02-01-0019.Button + Var PD_STAGE_2 = $12-02-02-0019.Button + Var PD_STAGE_3 = $12-02-03-0019.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3092,6 +3263,15 @@ LIMENADE" Var PriceD1 = $12-02-01-0022.Price Var PriceD2 = $12-02-02-0022.Price Var PriceD3 = $12-02-03-0022.Price + Var PD_CODE1 = "12-02-01-0022" + Var PD_CODE2 = "12-02-02-0022" + Var PD_CODE3 = "12-02-03-0022" + Var PD_STAGE_1 = $12-02-01-0022.Button + Var PD_STAGE_2 = $12-02-02-0022.Button + Var PD_STAGE_3 = $12-02-03-0022.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3224,6 +3404,15 @@ Water, Ice" Var PriceD1 = $12-02-01-0017.Price Var PriceD2 = $12-05-02-0027.Price Var PriceD3 = $12-05-03-0027.Price + Var PD_CODE1 = "12-02-01-0017" + Var PD_CODE2 = "12-05-02-0027" + Var PD_CODE3 = "12-05-03-0027" + Var PD_STAGE_1 = $12-02-01-0017.Button + Var PD_STAGE_2 = $12-05-02-0027.Button + Var PD_STAGE_3 = $12-05-03-0027.Button + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3355,6 +3544,15 @@ Water, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-02-02-0029.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-02-02-0029" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-02-02-0029.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3485,6 +3683,15 @@ Water, Ice" Var PriceD1 = $-.Price Var PriceD2 = $12-02-02-0030.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-02-02-0030" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-02-02-0030.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3616,6 +3823,15 @@ LIMENADE" Var PriceD1 = $12-02-01-0031.Price Var PriceD2 = $12-02-02-0031.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-02-01-0031" + Var PD_CODE2 = "12-02-02-0031" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-02-01-0031.Button + Var PD_STAGE_2 = $12-02-02-0031.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3747,6 +3963,15 @@ LIMENADE" Var PriceD1 = $12-02-01-0031.Price Var PriceD2 = $12-02-02-0032.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-02-01-0031" + Var PD_CODE2 = "12-02-02-0032" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-02-01-0031.Button + Var PD_STAGE_2 = $12-02-02-0032.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -3880,6 +4105,15 @@ Water, and Ice" Var PriceD1 = $12-02-01-0016.Price Var PriceD2 = $-.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "12-02-01-0016" + Var PD_CODE2 = "##-##-##-####" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = $12-02-01-0016.Button + Var PD_STAGE_2 = "Disable2" + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml index 0951d072..860d4feb 100644 --- a/xml/page_catalog_group_whey.xml +++ b/xml/page_catalog_group_whey.xml @@ -620,6 +620,15 @@ Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0001.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0001" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0001.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -751,6 +760,15 @@ Matcha, and Milk" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0016.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0016" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0016.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -882,6 +900,15 @@ Matcha, and Milk" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0002.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0002" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0002.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1013,6 +1040,15 @@ Cocoa, and Milk" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0003.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0003" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0003.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1146,6 +1182,15 @@ Strawberry Syrup" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0013.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0013" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0013.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1279,6 +1324,15 @@ Strawberry Syrup" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0004.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0004" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0004.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1410,6 +1464,15 @@ and Milk" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0005.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0005" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0005.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1541,6 +1604,15 @@ Thai Tea, and Milk" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0015.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0015" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0015.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1672,6 +1744,15 @@ Thai Tea, and Milk" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0006.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0006" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0006.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1805,6 +1886,15 @@ Kokuto syrup" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0007.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0007" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0007.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -1937,6 +2027,15 @@ Blueberry Syrup and Milk" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0008.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0008" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0008.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2070,6 +2169,15 @@ Taiwanese Tea, Sugar" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0017.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0017" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0017.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2203,6 +2311,15 @@ Taiwanese Tea, Sugar" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0009.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0009" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0009.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2335,6 +2452,15 @@ Caramel Syrup" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0010.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0010" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0010.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" @@ -2465,6 +2591,15 @@ Caramel Syrup" Var PriceD1 = $-.Price Var PriceD2 = $12-04-02-0011.Price Var PriceD3 = $-.Price + Var PD_CODE1 = "##-##-##-####" + Var PD_CODE2 = "12-04-02-0011" + Var PD_CODE3 = "##-##-##-####" + Var PD_STAGE_1 = "Disable2" + Var PD_STAGE_2 = $12-04-02-0011.Button + Var PD_STAGE_3 = "Disable2" + If PD_STAGE_2 = "Enable" Then + Var PD_STAGE_2 = "PressForever" + EndIf Open "ROOT/taobin_project/xml/page_topping_select4.xml" diff --git a/xml/page_topping_select4.xml b/xml/page_topping_select4.xml index 1f88d05d..411a5b79 100644 --- a/xml/page_topping_select4.xml +++ b/xml/page_topping_select4.xml @@ -156,11 +156,6 @@ EndIf EndIf - DEBUGVAR GetFreeFromError - If GetFreeFromError = 1 Then - Var btnAddCart = "Invisible" - EndIf - Var LidDeactiveButton = "Invisible" Var StrawDeactiveButton = "Invisible" @@ -176,6 +171,11 @@ If new_layout = "true" Then Var show_select_type = "Enable" + + Var hot_button_state = PD_STAGE_1 + Var cold_button_state = PD_STAGE_2 + Var blend_button_state = PD_STAGE_3 + Else Var show_select_type = "Invisible" EndIf @@ -184,6 +184,14 @@ DEBUGVAR PriceD1 DEBUGVAR PriceD2 DEBUGVAR PriceD3 + DEBUGVAR PD_CODE1 + DEBUGVAR PD_CODE2 + DEBUGVAR PD_CODE3 + DEBUGVAR PD_STAGE_1 + DEBUGVAR PD_STAGE_2 + DEBUGVAR PD_STAGE_3 + + @@ -875,10 +883,12 @@ @@ -911,22 +962,35 @@