From 18777cd75e0d0b82d0eb874992bc8fe68df4df0d Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Tue, 3 Oct 2023 15:17:31 +0700
Subject: [PATCH] update page_select7

---
 xml/page_topping_select7.xml | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml
index 04457486..877fcf4a 100644
--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@@ -300,12 +300,11 @@
 	Var img_smth_dis2 = "/bt_smoothie_disable2_no.png"
 
 	If MilkChoiceVeganEnable = 1 Then
-		Var CerealMilkToppingEnable = "Invisible"
-		Var CerealMilkToppingVegan = "Enable"
+		Var CerealMilkToppingBg = DirImage + "/bg_milk_choice_j.png"
 	Else
-		Var CerealMilkToppingEnable = "Enable"
-		Var CerealMilkToppingVegan = "Invisible"
+		Var CerealMilkToppingBg = DirImage + "/bg_milk_choice.png"
 	EndIf
+	Var CerealMilkToppingEnable = "Invisible"
 	Var CerealMilkEnable = "Invisible"
 
 
@@ -712,6 +711,8 @@
 	
 	DEBUGVAR MenuCodeName1
 	DEBUGVAR MenuCodeName2
+	DEBUGVAR MenuCodeNameState1
+	DEBUGVAR MenuCodeNameState2
 	DEBUGVAR SubMenuOnTop1
 	DEBUGVAR SubMenuOnTop2
 	DEBUGVAR SubMenuOnTop3
@@ -1493,7 +1494,9 @@
 		If MenuCodeName1 = "Cereal-Milk" Then
 			Var CerealMilkToppingEnable = "Enable"
 			Var CerealMilkPrice = SubMenuPrice1
-			Var CerealMilkEnable = "Enable"
+			If MenuCodeNameState1 = "Enable" Then
+				Var CerealMilkEnable = "Enable"
+			EndIf
 		EndIf
 
 		
@@ -2806,17 +2809,13 @@
 ;
 ;-BEGIN milk choice
 <Block>
-<State> "Enable" </State>
+<State> CerealMilkToppingEnable </State>
 <Width> 986 </Width>
 <Height> 157 </Height>
 <MarginTop> 20 </MarginTop>
 <Image>
 <State> CerealMilkToppingEnable </State>
-<Filename> Var( DirImage + "/bg_milk_choice.png" )</Filename>
-</Image>
-<Image>
-<State> CerealMilkToppingVegan </State>
-<Filename> Var( DirImage + "/bg_milk_choice_j.png" )</Filename>
+<Filename> CerealMilkToppingBg </Filename>
 </Image>
 
 <Button>
@@ -4184,8 +4183,9 @@
 		Machine PreparCup
 	EndIf
 	
-	Var CerealMilkAddAmount = SubMenuPrice1 - PriceDrinkNoTop
-	
+	;Var CerealMilkAddAmount = SubMenuPrice1 - PriceDrinkNoTop
+	Var CerealMilkAddAmount = 5
+
 	If CerealMilkAddAmount = 0 Then
 		Var CerealMilkPrice = "(+฿5)"
 
@@ -4282,9 +4282,11 @@
 
 	If CerealMilkEnable = "Press" Then
 		If MenuCodeName1 = "Cereal-Milk" Then
-			Var TOPPING_PRICE = TOPPING_PRICE + CerealMilkAddAmount
-			Var DisableUsingCode = "true"
-			Var UserSelectProductCode = SubMenuProductCode1
+			If MenuCodeNameState1 = "Enable" Then
+				Var TOPPING_PRICE = TOPPING_PRICE + CerealMilkAddAmount
+				Var DisableUsingCode = "true"
+				Var UserSelectProductCode = SubMenuProductCode1
+			EndIf
 		EndIf
 
 	Else