pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

Merge branch 'master' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project

Browse source
This commit is contained in:
Pakin 2023-10-04 11:34:33 +07:00
commit fd89d1787a
1 changed files with 8 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

20
xml/page_topping_select7.xml
View file

@ -300,12 +300,11 @@
Var img_smth_dis2 = "/bt_smoothie_disable2_no.png" Var img_smth_dis2 = "/bt_smoothie_disable2_no.png"
If MilkChoiceVeganEnable = 1 Then If MilkChoiceVeganEnable = 1 Then
Var CerealMilkToppingEnable = "Invisible" Var CerealMilkToppingBg = DirImage + "/bg_milk_choice_j.png"
Var CerealMilkToppingVegan = "Enable"
Else Else
Var CerealMilkToppingEnable = "Enable" Var CerealMilkToppingBg = DirImage + "/bg_milk_choice.png"
Var CerealMilkToppingVegan = "Invisible"
EndIf EndIf
Var CerealMilkToppingEnable = "Invisible"
Var CerealMilkEnable = "Invisible" Var CerealMilkEnable = "Invisible"
@ -2806,17 +2805,13 @@
; ;
;-BEGIN milk choice ;-BEGIN milk choice
<Block> <Block>
<State> "Enable" </State> <State> CerealMilkToppingEnable </State>
<Width> 986 </Width> <Width> 986 </Width>
<Height> 157 </Height> <Height> 157 </Height>
<MarginTop> 20 </MarginTop> <MarginTop> 20 </MarginTop>
<Image> <Image>
<State> CerealMilkToppingEnable </State> <State> CerealMilkToppingEnable </State>
<Filename> Var( DirImage + "/bg_milk_choice.png" )</Filename> <Filename> CerealMilkToppingBg </Filename>
</Image>
<Image>
<State> CerealMilkToppingVegan </State>
<Filename> Var( DirImage + "/bg_milk_choice_j.png" )</Filename>
</Image> </Image>
<Button> <Button>
@ -4184,8 +4179,9 @@
Machine PreparCup Machine PreparCup
EndIf EndIf
Var CerealMilkAddAmount = SubMenuPrice1 - PriceDrinkNoTop ;Var CerealMilkAddAmount = SubMenuPrice1 - PriceDrinkNoTop
Var CerealMilkAddAmount = 5
If CerealMilkAddAmount = 0 Then If CerealMilkAddAmount = 0 Then
Var CerealMilkPrice = "(+฿5)" Var CerealMilkPrice = "(+฿5)"