From a00cf7c8ad8618c2465c97ae5fa743048322c48b Mon Sep 17 00:00:00 2001
From: kenta420 <poomipat002@gmail.com>
Date: Mon, 26 Jun 2023 11:17:51 +0700
Subject: [PATCH] Update select topping page random cup 35

---
 xml/event/promotion_mystery_cup_35.xml |  8 ++---
 xml/page_topping_select_35.xml         | 44 ++++++++++++++++++++++++--
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/xml/event/promotion_mystery_cup_35.xml b/xml/event/promotion_mystery_cup_35.xml
index 33069f85..d3b9fd5f 100644
--- a/xml/event/promotion_mystery_cup_35.xml
+++ b/xml/event/promotion_mystery_cup_35.xml
@@ -8970,7 +8970,7 @@ LIMENADE SODA" </Value>
 		Var ProductCodeRandom = ListOfMilk[ResultRandomIndex]
 		DEBUGVAR ListOfMilk[ResultRandomIndex]
 		Topping "Load" ProductCodeRandom
-		Open "ROOT/taobin_project/xml/page_topping_select35.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
 	</EventClick>
 </Button>
 
@@ -8998,7 +8998,7 @@ LIMENADE SODA" </Value>
 		Var ProductCodeRandom = ListOfTea[ResultRandomIndex]
 		DEBUGVAR ListOfTea[ResultRandomIndex]
 		Topping "Load" ProductCodeRandom
-		Open "ROOT/taobin_project/xml/page_topping_select35.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
 	</EventClick>
 </Button>
 
@@ -9026,7 +9026,7 @@ LIMENADE SODA" </Value>
 		Var ProductCodeRandom = ListOfCoffee[ResultRandomIndex]
 		DEBUGVAR ListOfCoffee[ResultRandomIndex]
 		Topping "Load" ProductCodeRandom
-		Open "ROOT/taobin_project/xml/page_topping_select35.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
 	</EventClick>
 </Button>
 
@@ -9054,7 +9054,7 @@ LIMENADE SODA" </Value>
 		Var ProductCodeRandom = ListOfAllRandom[ResultRandomIndex]
 		DEBUGVAR ListOfAllRandom[ResultRandomIndex]
 		Topping "Load" ProductCodeRandom
-		Open "ROOT/taobin_project/xml/page_topping_select35.xml"
+		Open "ROOT/taobin_project/xml/page_topping_select_35.xml"
 	</EventClick>
 </Button>
 
diff --git a/xml/page_topping_select_35.xml b/xml/page_topping_select_35.xml
index 1e217c6b..87cf6340 100644
--- a/xml/page_topping_select_35.xml
+++ b/xml/page_topping_select_35.xml
@@ -25,6 +25,40 @@
 		WRITE_FILE "/mnt/sdcard/xml_alert_bug" "double called"
 	EndIf
 
+	; Fix All variable random drink
+		Var NameDrink = ""
+		Var NameDrinkTH = ""
+		Var DrinkDescriptionTH = ""
+		Var DrinkDescription = ""
+		Var PictureDrink = "ROOT/taobin_project/image/event/bn_mystery_cup.png"
+
+		Var menu_name_eng_hot = ""
+		Var menu_desc_eng_hot = ""
+		Var menu_name_thai_hot = ""
+		Var menu_desc_thai_hot = ""
+		
+		Var menu_name_eng_cold = ""
+		Var menu_desc_eng_cold = ""
+		Var menu_name_thai_cold = ""
+		Var menu_desc_thai_cold = ""
+
+		Var menu_name_eng_blender = ""
+		Var menu_desc_eng_blender = ""
+		Var menu_name_thai_blender = ""
+		Var menu_desc_thai_blender = ""
+
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = 35
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = ProductCodeRandom
+
+		Var SelectCountDrinkType = 1
+		Var DefaultDrinkType = 3
+
+		Var SelectDrinkType = 0
+
 	WEB "DISABLE"
 	DEBUGVAR Seeker
 
@@ -171,6 +205,7 @@
 	CRLFToSpace showdesc
 	
 	;- Begin
+	Var PriceDrink = 35
 	Var PriceDrinkNoTop = PriceDrink
 	Var PriceDrinkTmp = PriceDrink
 	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp
@@ -227,7 +262,7 @@
 	If new_layout = "true" Then
 		Var PriceDrinkTmpShow = "---"
 
-		Var show_select_type = "Enable"
+		Var show_select_type = "Invisible"
 
 		Var hot_button_state = PD_STAGE_1
 		Var cold_button_state = PD_STAGE_2
@@ -1444,6 +1479,8 @@
 		Function 2
 	EndIf
 
+	Var ExtraTopping = "Invisible"
+
 
 </EventMachine>
 
@@ -4036,7 +4073,6 @@
 
 		Machine PreparCup
 	EndIf
-	
 	If blend_button_state = "PressForever" Then
 		Var PriceDrinkNoTop = PriceD3
 		Var UserSelectProductCode = PD_CODE3
@@ -4179,6 +4215,10 @@
 	EndIf
 
 	Var PriceDrinkTmp = PriceDrinkNoTop + TOPPING_PRICE
+
+	; Fix Price
+	Var PriceDrinkTmp = 35
+
 	Var PriceDrinkTmpShow = charOfBaht + PriceDrinkTmp