DO

xml/page_topping_select6.lxml

@@ -83,7 +83,7 @@
 	Var LidState = Lid1Status
 	
 	;SAVELOG PreviseXMLFileName2
-	
+
 
 	Var topping1 = "1"
 	Var topping2 = "31"
@@ -275,6 +275,9 @@
 	Var img_smth_dis2 = "/bt_smoothie_disable2_no.png"
 
 
+	Var OatMilkToppingEnable = "Invisible"
+	Var OatMilkEnable = "Invisible"
+
 	Var topping_price_refresh = 1
 
 	Var StrawState = "Enable"
@@ -300,6 +303,8 @@
 	CRLFToSpace showname
 	CRLFToSpace showdesc
 
+	Var text_milk_choice_price_x = 265
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -525,13 +530,6 @@
 	DEBUGVAR MAT_ID_LID_OFFER
 	
 
-	DEBUGVAR SubMenuProductCode1
-	DEBUGVAR SubMenuName11
-	DEBUGVAR SubMenuPrice1
-
-	DEBUGVAR SubMenuProductCode2
-	DEBUGVAR SubMenuName12
-	
 	DEBUGVAR TOPPING1
 	DEBUGVAR TOPPING1_EXT_2
 	DEBUGVAR TOPPING2
@@ -555,26 +553,24 @@
 	DEBUGVAR toppingID2index4
 	DEBUGVAR toppingID2index5
 	
-	If toppingID1index5 > 0 Then
-		SAVELOG "toppingID1index5 not set"
-	EndIf
-
-	
-	
-	
-	DEBUGVAR MenuCodeName
 	DEBUGVAR toppingID1Default
 	DEBUGVAR toppingID2Default
 	DEBUGVAR toppingID3Default
 	
+	
+	DEBUGVAR MenuCodeName1
+	DEBUGVAR MenuCodeName1_State
+	DEBUGVAR MenuCodeName2
+	DEBUGVAR MenuCodeName2_State
+	DEBUGVAR SubMenuProductCode1
+	DEBUGVAR SubMenuProductCode2
+	DEBUGVAR SubMenuProductCode3
+
 
 	DEBUGVAR toppingID2price2
 	DEBUGVAR toppingID3price2
 	DEBUGVAR toppingID6price2
 
-	DEBUGVAR BrewParam
-	DEBUGVAR UserSeletedSugar
-
 	If BugFlag = 1 Then
 
 	Else
@@ -1270,6 +1266,24 @@
 
 		EndIf 
 		;topping_price_refresh = 0
+
+		If MenuCodeName1 = "OatMilk" Then
+			Var OatMilkToppingEnable = "Enable"
+			
+
+			DEBUGVAR OatMilkOnTopPrice
+
+			Var OatMilkOnTopPriceStr !assigned StringFmt( OatMilkOnTopPrice , DisplayFormat, PreScaleConvertShow)
+			
+			Var text_price_oat_milk = OatMilkOnTopPriceStr + ")"
+			Var text_price_oat_milk = "(+" + text_price_oat_milk	
+
+			Var OatMilkAddAmount = OatMilkOnTopPrice
+
+			If MenuCodeName1_State = "Enable" Then
+				Var OatMilkEnable = "Enable"
+			EndIf
+		EndIf
 		
 		
 		SAVELOG ToppingGotoPayment
@@ -1393,7 +1407,8 @@
 <X> 52 </X>
 <Y> 881 </Y>
 <Width> 1080 </Width>
-<ScrollHeight> "auto-all" </ScrollHeight>
+<Height> 880 </Height>
+<ScrollHeight> 880 </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 1 </Column>
 
@@ -2554,6 +2569,125 @@
 ;
 ;
 ;
+;
+;
+;
+;
+;
+;
+
+
+;-BEGIN milk choice
+<Block>
+<State> OatMilkToppingEnable </State>
+<Width> 986 </Width>
+<Height> 157 </Height>
+<MarginTop> 20 </MarginTop>
+<Image>
+<State> OatMilkToppingEnable </State>
+<Filename> "ROOT/taobin_project/image/topping_inter/bg_milk_choice.png" </Filename>
+</Image>
+
+<Text>
+	<X> 40 </X>
+	<Y> 10 </Y>
+	<Width> 500 </Width>
+	<Height> 72 </Height>
+	<Language>
+		<ID> 000103 </ID>
+	</Language>
+</Text>
+
+<Button>
+<X> 40 </X>
+<Y> 72 </Y>
+<State> OatMilkEnable </State>
+<Mode> "No" </Mode>
+<Filename> "ROOT/taobin_project/image/topping2/bn_cereal.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/topping2/bp_cereal.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	SAVELOG " OatMilkEnable "
+	
+
+	If OatMilkEnable = "Press" Then
+		Var OatMilkEnable = "Enable"
+	Else
+		Var OatMilkEnable = "Press"
+	EndIf
+
+	Function 2
+
+	Refresh
+</EventClick>
+</Button>
+
+
+; 
+<Button>
+<X> 896 </X>
+<Y> 78 </Y>
+<State> OatMilkEnable </State>
+<Mode> "No" </Mode>
+<Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	SAVELOG " OatMilkEnable "
+	
+
+	If OatMilkEnable = "Press" Then
+		Var OatMilkEnable = "Enable"
+	Else
+		Var OatMilkEnable = "Press"
+	EndIf
+
+	Function 2
+
+	Refresh
+
+
+</EventClick>
+</Button>
+
+<Text>
+<X> text_milk_choice_price_x </X>
+<Y> 63 </Y>
+<Font> KanitRegularTTF </Font>
+<State> "Enable" </State>
+<Size> 36 </Size>
+<Color> 0x84776F </Color>
+<Value> text_price_oat_milk </Value>
+</Text>
+
+
+
+<Text>
+<X> 120 </X>
+<Y> 62 </Y>
+<Width> 800 </Width>
+<Height> 65 </Height>
+<Language>
+	<ID> 000104 </ID>
+</Language>
+</Text>
+
+
+</Block>
+;
+;
+;
+;
+;
+;
+;
+;
+;
+
+
+
 
 ;-END
 ;
@@ -3743,6 +3877,19 @@
 		
 	EndIf
 	
+	DEBUGVAR OatMilkEnable
+	DEBUGVAR MenuCodeName1
+	DEBUGVAR MenuCodeName1_State
+
+	If OatMilkEnable = "Press" Then
+		If MenuCodeName1 = "OatMilk" Then
+			If MenuCodeName1_State = "Enable" Then
+				Var TOPPING_PRICE = TOPPING_PRICE + OatMilkAddAmount
+				Var UserSelectProductCode = SubMenuProductCode1
+			EndIf
+		EndIf
+	EndIf
+	
 
 	DEBUGVAR SelectDrinkType