Addjust layout

2025-04-24 14:36:24 +07:00 · 2025-04-24 14:36:24 +07:00 · 874edff35a
commit 874edff35a
parent b3404ac94d
16 changed files with 798 additions and 70 deletions
--- a/inter/tha/xml/multi/menu_catalog_new.lxml
+++ b/inter/tha/xml/multi/menu_catalog_new.lxml
@ -61,8 +61,11 @@
    OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"

    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
+   
+
    RefreshAll

+    
    Script "-" "-" 
    
    Var Timeout = 0
--- a/inter/tha/xml/multi/page_catalog.lxml
+++ b/inter/tha/xml/multi/page_catalog.lxml
@ -255,6 +255,9 @@

 	DEBUGVAR SpiralOnline

+	RootLayoutVisible 13 "hide"
+	
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>
--- a/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml
+++ b/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml
@ -1,2 +1,3 @@

    OpenInst 13 "ROOT/taobin_project/inter/tha/xml/multi/tab_menu.lxml"
+    RootLayoutVisible 13 "show"
--- a/inter/tha/xml/multi/v3/event/event_v3/1_promotion_matcha_every_day.json
+++ b/inter/tha/xml/multi/v3/event/event_v3/1_promotion_matcha_every_day.json
@ -5,5 +5,5 @@
  "type": "IMAGE",
  "media_thai": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
  "media_eng": "ROOT/taobin_project/image/event/matcha_every_day/matcha_every_day.png",
-  "event_click": "Open \"ROOT/taobin_project/xml/v3/page_catalog_group_pro_matcha_every_day.xml\""
+  "event_click": "Open \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_matcha_every_day.lxml\""
 }
--- a/inter/tha/xml/multi/v3/event/event_v3/2_promotion_oreo_volcano.json
+++ b/inter/tha/xml/multi/v3/event/event_v3/2_promotion_oreo_volcano.json
@ -5,5 +5,5 @@
  "type": "IMAGE",
  "media_thai": "ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png",
  "media_eng": "ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png",
-  "event_click": "Open \"ROOT/taobin_project/xml/v3/page_catalog_group_pro_oreo_volcano.xml\""
+  "event_click": "Open \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_oreo_volcano.lxml\""
 }
--- a/inter/tha/xml/multi/v3/event/event_v3/3_promotion_kingdom_thai_tea.json
+++ b/inter/tha/xml/multi/v3/event/event_v3/3_promotion_kingdom_thai_tea.json
@ -5,5 +5,5 @@
  "type": "IMAGE",
  "media_thai": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
  "media_eng": "ROOT/taobin_project/image/event/kingdom_thai_tea/kingdom_thai_tea.png",
-  "event_click": "Open \"ROOT/taobin_project/xml/v3/page_catalog_group_pro_kingdom_thai_tea.xml\""
+  "event_click": "Open \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_kingdom_thai_tea.lxml\""
 }
--- a/inter/tha/xml/multi/v3/event/event_v3/4_promotion_pepsi_x_taobin.json
+++ b/inter/tha/xml/multi/v3/event/event_v3/4_promotion_pepsi_x_taobin.json
@ -5,5 +5,5 @@
  "type": "VIDEO",
  "media_thai": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4",
  "media_eng": "ROOT/taobin_project/image/event/pepsi_x_taobin/pepsi_x_taobin.mp4",
-  "event_click": "Open \"ROOT/taobin_project/xml/v3/page_catalog_group_pro_pepsi_x_taobin.xml\""
+  "event_click": "Open \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_pepsi_x_taobin.lxml\""
 }
--- a/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml
+++ b/inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml
@ -7,19 +7,26 @@
 ;<Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
-    RootLayoutVisible 13 "show"
-	    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"    
+     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"    
     ; soda and other
    Var Menu1Selected = "PressForever"


    Var Timeout = 0
    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
-
+    
    SetInstanceIgnoreTouch


    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
+
+    Var OtherOtherRefreshTimeOut = 14
+
+	DEBUGVAR SlientRefreshIndex
+    
+	RefreshAll
+
+
 </EventOpen>

 <EventOnShow>
@ -132,7 +139,7 @@
 				)
 			</Media>
 			<EventOnClick>
-				Open "ROOT/taobin_project/xml/v3/page_catalog_group_pro_matcha_every_day.xml"
+				Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_matcha_every_day.lxml"
 			</EventOnClick>
 		</Banner>
 		<Banner>
@ -148,7 +155,7 @@
 				)
 			</Media>
 			<EventOnClick>
-				Open "ROOT/taobin_project/xml/v3/page_catalog_group_pro_oreo_volcano.xml"
+				Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_oreo_volcano.lxml"
 			</EventOnClick>
 		</Banner>
 		<Banner>
@ -164,7 +171,7 @@
 				)
 			</Media>
 			<EventOnClick>
-				Open "ROOT/taobin_project/xml/v3/page_catalog_group_pro_kingdom_thai_tea.xml"
+				Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_kingdom_thai_tea.lxml"
 			</EventOnClick>
 		</Banner>
 		<Banner>
@ -180,7 +187,7 @@
 				)
 			</Media>
 			<EventOnClick>
-				Open "ROOT/taobin_project/xml/v3/page_catalog_group_pro_pepsi_x_taobin.xml"
+				Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_pepsi_x_taobin.lxml"
 			</EventOnClick>
 		</Banner>

@ -2690,7 +2697,7 @@
 			; ==================> Len = 3
 		; - - 12-03-03-0009 
 		<Menu>
-		<State> Flag( 12-03-03-0009.Button,Disable=Invisible,$Sum1203030009) </State>
+		<State> Flag( 12-03-03-0009.Button,DateTimeEnd="2025/05/01T00:00:00",Disable=Invisible,$Sum1203030009) </State>
 		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_smoothie_oreo.png" </IdleImage>
 		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_smoothie_oreo.png" </PressImage>
 		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_smoothie_oreo.png" </DisableImage>
@ -2912,6 +2919,233 @@
 			
 			
 			
+		</EventOnClick>
+		</Menu>
+
+			; ==================> Len = 3
+		; - 12-05-02-0133 - 
+		<Menu>
+		<State> Flag( 12-05-02-0133.Button,DateTimeStart="2025/05/01T00:00:00",Disable=Invisible,$Sum1205020133) </State>
+		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_iced_pepsi_extra_catalog.png" </IdleImage>
+		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_iced_pepsi_extra_catalog.png" </PressImage>
+		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_iced_pepsi_extra_catalog.png" </DisableImage>
+		<Name>
+			<LanguageGroup>
+				<LanguageSlot1>Pepsi Extra</LanguageSlot1>
+				<LanguageSlot2>เป๊ปซี่ (เพิ่มปริมาณ)</LanguageSlot2>
+				<LanguageSlot3>-</LanguageSlot3>
+				<LanguageSlot4>-</LanguageSlot4>
+				<LanguageSlot5>-</LanguageSlot5>
+				<LanguageSlot6>ပက်စီ\n(အပိုဖြည့်)</LanguageSlot6>
+			</LanguageGroup>
+		</Name>
+		<Description>
+			<LanguageGroup>
+				<LanguageSlot1>Pepsi, Soda And Ice</LanguageSlot1>
+				<LanguageSlot2>เป๊ปซี่ โซดา และน้ำแข็ง</LanguageSlot2>
+				<LanguageSlot3>-</LanguageSlot3>
+				<LanguageSlot4>-</LanguageSlot4>
+				<LanguageSlot5>-</LanguageSlot5>
+				<LanguageSlot6>ပက်စီ ဆိုဒါ ရေခဲ</LanguageSlot6>
+			</LanguageGroup>
+		</Description>
+		<HotState> "Disable2" </HotState>
+		<IceState> $12-05-02-0133.Button </IceState>
+		<BlendState> "Disable2" </BlendState>
+		<HotPrice> eval( 
+		If $##-##-##-####.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
+		) </HotPrice>
+		<IcePrice> eval( 
+		If $12-05-02-0133.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $12-05-02-0133.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
+		) </IcePrice>
+		<BlendPrice> eval( 
+		If $##-##-##-####.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $##-##-##-####.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
+		) </BlendPrice>
+		<IceProcessingState>
+			eval(
+				If ICE_PROCESS_STATUS = 2 Then
+					If $Sum510201003951020200395102030039 = "Disable" Then
+						Var ice_tab_process_show = "Disable"
+					Else
+						Var ice_tab_process_show = "Enable"
+					EndIf
+				Else
+					Var ice_tab_process_show = "Invisible"
+				EndIf
+				Var return = ice_tab_process_show
+			)
+		</IceProcessingState>
+		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
+		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
+		<ConditionalDisable>
+			<Script>
+				If $Sum1205020133 = "Disable" Then
+					STRCONTAIN "STG=CLOSE" $##-##-##-####.TAG tag1_is_disable
+					STRCONTAIN "STG=CLOSE" $12-05-02-0133.TAG tag2_is_disable
+					STRCONTAIN "STG=CLOSE" $##-##-##-####.TAG tag3_is_disable
+					If tag1_is_disable = "true" Then
+						Var $Sum1205020133Tag = $##-##-##-####.TAG
+					EndIf
+					If tag2_is_disable = "true" Then
+						Var $Sum1205020133Tag = $12-05-02-0133.TAG
+					EndIf
+					If tag3_is_disable = "true" Then
+						Var $Sum1205020133Tag = $##-##-##-####.TAG
+					EndIf
+					Var $Sum1205020133TextValue !assigned GETS($Sum1205020133Tag,"MSG")
+					Var $Sum1205020133TextID !assigned GETS($Sum1205020133Tag,"TextID")
+					If $Sum1205020133TextID != "" Then
+						Var $Sum1205020133TextValue = ""
+					EndIf
+					If $Sum1205020133TextValue = "" Then
+						If $Sum1205020133TextID = "" Then
+							Var $Sum1205020133TextID = "000013"
+						EndIf
+					EndIf
+				EndIf
+			</Script>
+			<ID> $Sum1205020133TextID </ID>
+			<Value> $Sum1205020133TextValue </Value>
+		</ConditionalDisable>
+		<EventOnClick>
+			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_iced_pepsi_extra_catalog.png"
+			GetInstanceIDMenuTab OpenFromInstMenuTab
+			Var OpenFromXML = CurrentXMLFileName2
+			Var PriceD1 = $##-##-##-####.Price
+			Var PriceD2 = $12-05-02-0133.Price
+			Var PriceD3 = $##-##-##-####.Price
+			Var PD_CODE1 = "##-##-##-####"
+			Var PD_CODE2 = "12-05-02-0133"
+			Var PD_CODE3 = "##-##-##-####"
+			; begin lang
+			Var aliasName[0] = "Pepsi Extra"
+			Var aliasDesc[0] = "Pepsi, Soda And Ice"
+			Var aliasName[1] = "เป๊ปซี่ (เพิ่มปริมาณ)"
+			Var aliasDesc[1] = "เป๊ปซี่ โซดา และน้ำแข็ง"
+			Var aliasName[2] = "-"
+			Var aliasDesc[2] = "-"
+			Var aliasName[3] = "-"
+			Var aliasDesc[3] = "-"
+			Var aliasName[4] = "-"
+			Var aliasDesc[4] = "-"
+			Var aliasName[5] = "ပက်စီ\n(အပိုဖြည့်)"
+			Var aliasDesc[5] = "ပက်စီ ဆိုဒါ ရေခဲ"
+			Var NameLang[0][0] = ""
+			Var NameLang[0][1] = ""
+			Var NameLang[0][2] = ""
+			Var NameLang[0][3] = ""
+			Var NameLang[0][4] = ""
+			Var NameLang[0][5] = ""
+			Var DescLang[0][0] = ""
+			Var DescLang[0][1] = ""
+			Var DescLang[0][2] = ""
+			Var DescLang[0][3] = ""
+			Var DescLang[0][4] = ""
+			Var DescLang[0][5] = ""
+			Var NameLang[1][0] = "ICED Pepsi Extra"
+			Var NameLang[1][1] = "เป๊ปซี่ (เพิ่มปริมาณ)"
+			Var NameLang[1][2] = "-"
+			Var NameLang[1][3] = "-"
+			Var NameLang[1][4] = "-"
+			Var NameLang[1][5] = "ICED Pepsi အပို"
+			Var DescLang[1][0] = "Pepsi, Soda And Ice"
+			Var DescLang[1][1] = "เป๊ปซี่ โซดา และน้ำแข็ง"
+			Var DescLang[1][2] = "-"
+			Var DescLang[1][3] = "-"
+			Var DescLang[1][4] = "-"
+			Var DescLang[1][5] = "ပက်စီ၊ ဆိုဒါနှင့် ရေခဲ"
+			Var NameLang[2][0] = ""
+			Var NameLang[2][1] = ""
+			Var NameLang[2][2] = ""
+			Var NameLang[2][3] = ""
+			Var NameLang[2][4] = ""
+			Var NameLang[2][5] = ""
+			Var DescLang[2][0] = ""
+			Var DescLang[2][1] = ""
+			Var DescLang[2][2] = ""
+			Var DescLang[2][3] = ""
+			Var DescLang[2][4] = ""
+			Var DescLang[2][5] = ""
+			; end lang
+			Var PD_STAGE_1 = "Disable2"
+			Var PD_STAGE_2 = $12-05-02-0133.Button
+			Var PD_STAGE_3 = "Disable2"
+			Var SelectCountDrinkType = 0
+			Var DefaultDrinkType = 0
+			If PD_STAGE_1 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 1
+			EndIf
+			If PD_STAGE_2 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 2
+			EndIf
+			If PD_STAGE_3 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 3
+			EndIf
+			If PD_STAGE_2 = "Enable" Then
+				Topping "Load" "12-05-02-0133"
+			Else
+				If PD_STAGE_1 = "Enable" Then
+				Topping "Load" "-"
+				Else
+				Topping "Load" "-"
+				EndIf
+			EndIf
+			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml"
+			
+			
+			TabMenuVisibleInst 99
+			DEBUGVAR RedirectToNormalVersion
+			DEBUGVAR ToppingNewUINewSystem
+			If RedirectToNormalVersion = 1 Then
+				Var menu_name_eng_hot = NameLang[0][0]
+				Var menu_desc_eng_hot = DescLang[0][0]
+				Var menu_name_eng_cold = NameLang[1][0]
+				Var menu_desc_eng_cold = DescLang[1][0]
+				Var menu_name_eng_blender = NameLang[2][0]
+				Var menu_desc_eng_blender = DescLang[2][0]
+				
+				
+				
+				Var menu_name_thai_hot = NameLang[0][1]
+				Var menu_desc_thai_hot = DescLang[0][1]
+				Var menu_name_thai_cold = NameLang[1][1]
+				Var menu_desc_thai_cold = DescLang[1][1]
+				Var menu_name_thai_blender = NameLang[2][1]
+				Var menu_desc_thai_blender = DescLang[2][1]
+				DEBUGVAR menu_name_thai_cold
+				DEBUGVAR menu_desc_thai_cold
+					Var NameDrink = aliasName[0]
+					Var DrinkDescription =  aliasDesc[0]
+					Var NameDrinkTH = aliasName[1]
+					Var DrinkDescriptionTH = aliasDesc[1]
+			If LanguageShow = "THAI" Then
+				Var show_eng =  "false"
+			Else
+				Var show_eng =  "true"
+			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
+			Else
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+			EndIf
+			
+			
+			
 		</EventOnClick>
 		</Menu>

@ -3372,7 +3606,7 @@
 			; ==================> Len = 3
 		; 12-02-01-0026 12-02-02-0026 12-02-03-0026 
 		<Menu>
-		<State> Flag( 12-02-01-0026.Button,12-02-02-0026.Button,12-02-03-0026.Button,Disable=Invisible,$Sum120201002612020200261202030026) </State>
+		<State> Flag( 12-02-01-0026.Button,12-02-02-0026.Button,12-02-03-0026.Button,DateTimeEnd="2025/05/01T00:00:00",Disable=Invisible,$Sum120201002612020200261202030026) </State>
 		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_matcha_milk_tea.png" </IdleImage>
 		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_matcha_milk_tea.png" </PressImage>
 		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_matcha_milk_tea.png" </DisableImage>
@ -3594,6 +3828,460 @@
 			
 			
 			
+		</EventOnClick>
+		</Menu>
+
+			; ==================> Len = 3
+		; 12-02-01-0039 12-02-02-0039 12-02-03-0039 
+		<Menu>
+		<State> Flag( 12-02-01-0039.Button,12-02-02-0039.Button,12-02-03-0039.Button,DateTimeStart="2025/05/01T00:00:00",Disable=Invisible,$Sum120201003912020200391202030039) </State>
+		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_thai_milk_tea_SingPark.png" </IdleImage>
+		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" </PressImage>
+		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" </DisableImage>
+		<Name>
+			<LanguageGroup>
+				<LanguageSlot1>Thai Milk Tea</LanguageSlot1>
+				<LanguageSlot2>ชานมไทย </LanguageSlot2>
+				<LanguageSlot3>泰式奶茶</LanguageSlot3>
+				<LanguageSlot4>-</LanguageSlot4>
+				<LanguageSlot5>-</LanguageSlot5>
+				<LanguageSlot6>ထိုင်းလက်ဖက်ရည် </LanguageSlot6>
+			</LanguageGroup>
+		</Name>
+		<Description>
+			<LanguageGroup>
+				<LanguageSlot1>Thai tea, Sugar, milk</LanguageSlot1>
+				<LanguageSlot2>ชาไทย และ นม</LanguageSlot2>
+				<LanguageSlot3>泰式红茶、糖、牛奶</LanguageSlot3>
+				<LanguageSlot4>-</LanguageSlot4>
+				<LanguageSlot5>-</LanguageSlot5>
+				<LanguageSlot6>ထိုင်းလက်ဖက်ရည်  နို့</LanguageSlot6>
+			</LanguageGroup>
+		</Description>
+		<HotState> $12-02-01-0039.Button </HotState>
+		<IceState> $12-02-02-0039.Button </IceState>
+		<BlendState> $12-02-03-0039.Button </BlendState>
+		<HotPrice> eval( 
+		If $12-02-01-0039.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $12-02-01-0039.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
+		) </HotPrice>
+		<IcePrice> eval( 
+		If $12-02-02-0039.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $12-02-02-0039.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
+		) </IcePrice>
+		<BlendPrice> eval( 
+		If $12-02-03-0039.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $12-02-03-0039.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
+		) </BlendPrice>
+		<IceProcessingState>
+			eval(
+				If ICE_PROCESS_STATUS = 2 Then
+					If $Sum510201003951020200395102030039 = "Disable" Then
+						Var ice_tab_process_show = "Disable"
+					Else
+						Var ice_tab_process_show = "Enable"
+					EndIf
+				Else
+					Var ice_tab_process_show = "Invisible"
+				EndIf
+				Var return = ice_tab_process_show
+			)
+		</IceProcessingState>
+		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
+		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
+		<ConditionalDisable>
+			<Script>
+				If $Sum120201003912020200391202030039 = "Disable" Then
+					STRCONTAIN "STG=CLOSE" $12-02-01-0039.TAG tag1_is_disable
+					STRCONTAIN "STG=CLOSE" $12-02-02-0039.TAG tag2_is_disable
+					STRCONTAIN "STG=CLOSE" $12-02-03-0039.TAG tag3_is_disable
+					If tag1_is_disable = "true" Then
+						Var $Sum120201003912020200391202030039Tag = $12-02-01-0039.TAG
+					EndIf
+					If tag2_is_disable = "true" Then
+						Var $Sum120201003912020200391202030039Tag = $12-02-02-0039.TAG
+					EndIf
+					If tag3_is_disable = "true" Then
+						Var $Sum120201003912020200391202030039Tag = $12-02-03-0039.TAG
+					EndIf
+					Var $Sum120201003912020200391202030039TextValue !assigned GETS($Sum120201003912020200391202030039Tag,"MSG")
+					Var $Sum120201003912020200391202030039TextID !assigned GETS($Sum120201003912020200391202030039Tag,"TextID")
+					If $Sum120201003912020200391202030039TextID != "" Then
+						Var $Sum120201003912020200391202030039TextValue = ""
+					EndIf
+					If $Sum120201003912020200391202030039TextValue = "" Then
+						If $Sum120201003912020200391202030039TextID = "" Then
+							Var $Sum120201003912020200391202030039TextID = "000013"
+						EndIf
+					EndIf
+				EndIf
+			</Script>
+			<ID> $Sum120201003912020200391202030039TextID </ID>
+			<Value> $Sum120201003912020200391202030039TextValue </Value>
+		</ConditionalDisable>
+		<EventOnClick>
+			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark.png"
+			GetInstanceIDMenuTab OpenFromInstMenuTab
+			Var OpenFromXML = CurrentXMLFileName2
+			Var PriceD1 = $12-02-01-0039.Price
+			Var PriceD2 = $12-02-02-0039.Price
+			Var PriceD3 = $12-02-03-0039.Price
+			Var PD_CODE1 = "12-02-01-0039"
+			Var PD_CODE2 = "12-02-02-0039"
+			Var PD_CODE3 = "12-02-03-0039"
+			; begin lang
+			Var aliasName[0] = "Thai Milk Tea"
+			Var aliasDesc[0] = "Thai tea, Sugar, milk"
+			Var aliasName[1] = "ชานมไทย "
+			Var aliasDesc[1] = "ชาไทย และ นม"
+			Var aliasName[2] = "泰式奶茶"
+			Var aliasDesc[2] = "泰式红茶、糖、牛奶"
+			Var aliasName[3] = "-"
+			Var aliasDesc[3] = "-"
+			Var aliasName[4] = "-"
+			Var aliasDesc[4] = "-"
+			Var aliasName[5] = "ထိုင်းလက်ဖက်ရည် "
+			Var aliasDesc[5] = "ထိုင်းလက်ဖက်ရည်  နို့"
+			Var NameLang[0][0] = "HOT Thai Milk Tea"
+			Var NameLang[0][1] = "ชานมไทย "
+			Var NameLang[0][2] = "热泰式奶茶"
+			Var NameLang[0][3] = "-"
+			Var NameLang[0][4] = "-"
+			Var NameLang[0][5] = "ထိုင်းနို့လက်ဖက်ရည်ပူပူ"
+			Var DescLang[0][0] = "Thai tea, Sugar, milk"
+			Var DescLang[0][1] = "ชาไทย และ นม"
+			Var DescLang[0][2] = "泰式红茶、牛奶、糖"
+			Var DescLang[0][3] = "-"
+			Var DescLang[0][4] = "-"
+			Var DescLang[0][5] = "ထိုင်းလက်ဖက်ရည်၊ သကြား၊ နို့"
+			Var NameLang[1][0] = "ICED Thai Milk Tea"
+			Var NameLang[1][1] = "ชานมไทย "
+			Var NameLang[1][2] = "热泰式奶茶"
+			Var NameLang[1][3] = "-"
+			Var NameLang[1][4] = "-"
+			Var NameLang[1][5] = "ထိုင်းနို့လက်ဖက်ရည်ပူပူ"
+			Var DescLang[1][0] = "Thai tea, Sugar, milk"
+			Var DescLang[1][1] = "ชาไทย และ นม"
+			Var DescLang[1][2] = "泰式红茶、牛奶、糖"
+			Var DescLang[1][3] = "-"
+			Var DescLang[1][4] = "-"
+			Var DescLang[1][5] = "ထိုင်းလက်ဖက်ရည်၊ သကြား၊ နို့"
+			Var NameLang[2][0] = "Thai Milk Tea SMOOTHIE"
+			Var NameLang[2][1] = "ชานมไทย "
+			Var NameLang[2][2] = "热泰式奶茶"
+			Var NameLang[2][3] = "-"
+			Var NameLang[2][4] = "-"
+			Var NameLang[2][5] = "ထိုင်းနို့လက်ဖက်ရည်ပူပူ"
+			Var DescLang[2][0] = "Thai tea, Sugar, milk"
+			Var DescLang[2][1] = "ชาไทย และ นม"
+			Var DescLang[2][2] = "泰式红茶、牛奶、糖"
+			Var DescLang[2][3] = "-"
+			Var DescLang[2][4] = "-"
+			Var DescLang[2][5] = "ထိုင်းလက်ဖက်ရည်၊ သကြား၊ နို့"
+			; end lang
+			Var PD_STAGE_1 = $12-02-01-0039.Button
+			Var PD_STAGE_2 = $12-02-02-0039.Button
+			Var PD_STAGE_3 = $12-02-03-0039.Button
+			Var SelectCountDrinkType = 0
+			Var DefaultDrinkType = 0
+			If PD_STAGE_1 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 1
+			EndIf
+			If PD_STAGE_2 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 2
+			EndIf
+			If PD_STAGE_3 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 3
+			EndIf
+			If PD_STAGE_2 = "Enable" Then
+				Topping "Load" "12-02-02-0039"
+			Else
+				If PD_STAGE_1 = "Enable" Then
+				Topping "Load" "12-02-01-0039"
+				Else
+				Topping "Load" "12-02-03-0039"
+				EndIf
+			EndIf
+			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml"
+			
+			
+			TabMenuVisibleInst 99
+			DEBUGVAR RedirectToNormalVersion
+			DEBUGVAR ToppingNewUINewSystem
+			If RedirectToNormalVersion = 1 Then
+				Var menu_name_eng_hot = NameLang[0][0]
+				Var menu_desc_eng_hot = DescLang[0][0]
+				Var menu_name_eng_cold = NameLang[1][0]
+				Var menu_desc_eng_cold = DescLang[1][0]
+				Var menu_name_eng_blender = NameLang[2][0]
+				Var menu_desc_eng_blender = DescLang[2][0]
+				
+				
+				
+				Var menu_name_thai_hot = NameLang[0][1]
+				Var menu_desc_thai_hot = DescLang[0][1]
+				Var menu_name_thai_cold = NameLang[1][1]
+				Var menu_desc_thai_cold = DescLang[1][1]
+				Var menu_name_thai_blender = NameLang[2][1]
+				Var menu_desc_thai_blender = DescLang[2][1]
+				DEBUGVAR menu_name_thai_cold
+				DEBUGVAR menu_desc_thai_cold
+					Var NameDrink = aliasName[0]
+					Var DrinkDescription =  aliasDesc[0]
+					Var NameDrinkTH = aliasName[1]
+					Var DrinkDescriptionTH = aliasDesc[1]
+			If LanguageShow = "THAI" Then
+				Var show_eng =  "false"
+			Else
+				Var show_eng =  "true"
+			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
+			Else
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+			EndIf
+			
+			
+			
+		</EventOnClick>
+		</Menu>
+
+			; ==================> Len = 3
+		; 12-02-01-0024 12-02-02-0024 12-02-03-0024 
+		<Menu>
+		<State> Flag( 12-02-01-0024.Button,12-02-02-0024.Button,12-02-03-0024.Button,DateTimeStart="2025/05/01T00:00:00",Disable=Invisible,$Sum120201002412020200241202030024) </State>
+		<IdleImage> "ROOT/taobin_project/inter/tha/image/page_drink_n//bn_hot_thai_milk_tea_tacc.png" </IdleImage>
+		<PressImage> "ROOT/taobin_project/inter/tha/image/page_drink_press_n//bn_hot_thai_milk_tea_tacc.png" </PressImage>
+		<DisableImage> "ROOT/taobin_project/inter/tha/image/page_drink_disable_n2//bn_hot_thai_milk_tea_tacc.png" </DisableImage>
+		<Name>
+			<LanguageGroup>
+				<LanguageSlot1>Thai Milk Tea</LanguageSlot1>
+				<LanguageSlot2>ชานมไทย </LanguageSlot2>
+				<LanguageSlot3>泰式奶茶</LanguageSlot3>
+				<LanguageSlot4>-</LanguageSlot4>
+				<LanguageSlot5>-</LanguageSlot5>
+				<LanguageSlot6>ထိုင်းလက်ဖက်ရည် </LanguageSlot6>
+			</LanguageGroup>
+		</Name>
+		<Description>
+			<LanguageGroup>
+				<LanguageSlot1>Thai tea, Sugar, Warm milk</LanguageSlot1>
+				<LanguageSlot2>ชาไทย และ นมอุ่น</LanguageSlot2>
+				<LanguageSlot3>泰式红茶、糖、牛奶</LanguageSlot3>
+				<LanguageSlot4>-</LanguageSlot4>
+				<LanguageSlot5>-</LanguageSlot5>
+				<LanguageSlot6>ထိုင်းလက်ဖက်ရည်  နို့</LanguageSlot6>
+			</LanguageGroup>
+		</Description>
+		<HotState> $12-02-01-0024.Button </HotState>
+		<IceState> $12-02-02-0024.Button </IceState>
+		<BlendState> $12-02-03-0024.Button </BlendState>
+		<HotPrice> eval( 
+		If $12-02-01-0024.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $12-02-01-0024.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
+		) </HotPrice>
+		<IcePrice> eval( 
+		If $12-02-02-0024.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $12-02-02-0024.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
+		) </IcePrice>
+		<BlendPrice> eval( 
+		If $12-02-03-0024.Price = -1 Then
+			Var return = "Free"
+		Else
+			Var return !assigned StringFmt(  $12-02-03-0024.Price , DisplayFormat, PreScaleConvertShow) 
+		EndIf
+		) </BlendPrice>
+		<IceProcessingState>
+			eval(
+				If ICE_PROCESS_STATUS = 2 Then
+					If $Sum510201003951020200395102030039 = "Disable" Then
+						Var ice_tab_process_show = "Disable"
+					Else
+						Var ice_tab_process_show = "Enable"
+					EndIf
+				Else
+					Var ice_tab_process_show = "Invisible"
+				EndIf
+				Var return = ice_tab_process_show
+			)
+		</IceProcessingState>
+		<IceProcessingImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </IceProcessingImage>
+		<IceProcessingDisableImage> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </IceProcessingDisableImage>
+		<ConditionalDisable>
+			<Script>
+				If $Sum120201002412020200241202030024 = "Disable" Then
+					STRCONTAIN "STG=CLOSE" $12-02-01-0024.TAG tag1_is_disable
+					STRCONTAIN "STG=CLOSE" $12-02-02-0024.TAG tag2_is_disable
+					STRCONTAIN "STG=CLOSE" $12-02-03-0024.TAG tag3_is_disable
+					If tag1_is_disable = "true" Then
+						Var $Sum120201002412020200241202030024Tag = $12-02-01-0024.TAG
+					EndIf
+					If tag2_is_disable = "true" Then
+						Var $Sum120201002412020200241202030024Tag = $12-02-02-0024.TAG
+					EndIf
+					If tag3_is_disable = "true" Then
+						Var $Sum120201002412020200241202030024Tag = $12-02-03-0024.TAG
+					EndIf
+					Var $Sum120201002412020200241202030024TextValue !assigned GETS($Sum120201002412020200241202030024Tag,"MSG")
+					Var $Sum120201002412020200241202030024TextID !assigned GETS($Sum120201002412020200241202030024Tag,"TextID")
+					If $Sum120201002412020200241202030024TextID != "" Then
+						Var $Sum120201002412020200241202030024TextValue = ""
+					EndIf
+					If $Sum120201002412020200241202030024TextValue = "" Then
+						If $Sum120201002412020200241202030024TextID = "" Then
+							Var $Sum120201002412020200241202030024TextID = "000013"
+						EndIf
+					EndIf
+				EndIf
+			</Script>
+			<ID> $Sum120201002412020200241202030024TextID </ID>
+			<Value> $Sum120201002412020200241202030024TextValue </Value>
+		</ConditionalDisable>
+		<EventOnClick>
+			Var PictureDrink = "ROOT/taobin_project/inter/tha/image/page_drink_picture2_n/" + "bn_hot_thai_milk_tea_tacc.png"
+			GetInstanceIDMenuTab OpenFromInstMenuTab
+			Var OpenFromXML = CurrentXMLFileName2
+			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"
+			; begin lang
+			Var aliasName[0] = "Thai Milk Tea"
+			Var aliasDesc[0] = "Thai tea, Sugar, Warm milk"
+			Var aliasName[1] = "ชานมไทย "
+			Var aliasDesc[1] = "ชาไทย และ นมอุ่น"
+			Var aliasName[2] = "泰式奶茶"
+			Var aliasDesc[2] = "泰式红茶、糖、牛奶"
+			Var aliasName[3] = "-"
+			Var aliasDesc[3] = "-"
+			Var aliasName[4] = "-"
+			Var aliasDesc[4] = "-"
+			Var aliasName[5] = "ထိုင်းလက်ဖက်ရည် "
+			Var aliasDesc[5] = "ထိုင်းလက်ဖက်ရည်  နို့"
+			Var NameLang[0][0] = "HOT Thai Milk Tea"
+			Var NameLang[0][1] = "ชานมไทย "
+			Var NameLang[0][2] = "热泰式奶茶"
+			Var NameLang[0][3] = "-"
+			Var NameLang[0][4] = "-"
+			Var NameLang[0][5] = "ထိုင်းနို့လက်ဖက်ရည်ပူပူ"
+			Var DescLang[0][0] = "Thai tea, Sugar, Warm milk"
+			Var DescLang[0][1] = "ชาไทย และ นมอุ่น"
+			Var DescLang[0][2] = "泰式红茶、糖、牛奶"
+			Var DescLang[0][3] = "-"
+			Var DescLang[0][4] = "-"
+			Var DescLang[0][5] = "ထိုင်းလက်ဖက်ရည်၊ သကြား၊ နွားနို့ပူပူ"
+			Var NameLang[1][0] = "ICED Thai Milk Tea"
+			Var NameLang[1][1] = "ชานมไทย "
+			Var NameLang[1][2] = "热泰式奶茶"
+			Var NameLang[1][3] = "-"
+			Var NameLang[1][4] = "-"
+			Var NameLang[1][5] = "ထိုင်းနို့လက်ဖက်ရည်ပူပူ"
+			Var DescLang[1][0] = "Thai tea, Sugar, Warm milk"
+			Var DescLang[1][1] = "ชาไทย และ นมอุ่น"
+			Var DescLang[1][2] = "泰式红茶、糖、牛奶"
+			Var DescLang[1][3] = "-"
+			Var DescLang[1][4] = "-"
+			Var DescLang[1][5] = "ထိုင်းလက်ဖက်ရည်၊ သကြား၊ နွားနို့ပူပူ"
+			Var NameLang[2][0] = "Thai Milk Tea SMOOTHIE"
+			Var NameLang[2][1] = "ชานมไทย "
+			Var NameLang[2][2] = "热泰式奶茶"
+			Var NameLang[2][3] = "-"
+			Var NameLang[2][4] = "-"
+			Var NameLang[2][5] = "ထိုင်းနို့လက်ဖက်ရည်ပူပူ"
+			Var DescLang[2][0] = "Thai tea, Sugar, Warm milk"
+			Var DescLang[2][1] = "ชาไทย และ นมอุ่น"
+			Var DescLang[2][2] = "泰式红茶、糖、牛奶"
+			Var DescLang[2][3] = "-"
+			Var DescLang[2][4] = "-"
+			Var DescLang[2][5] = "ထိုင်းလက်ဖက်ရည်၊ သကြား၊ နွားနို့ပူပူ"
+			; end lang
+			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
+			Var SelectCountDrinkType = 0
+			Var DefaultDrinkType = 0
+			If PD_STAGE_1 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 1
+			EndIf
+			If PD_STAGE_2 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 2
+			EndIf
+			If PD_STAGE_3 = "Enable" Then
+				Var SelectCountDrinkType = SelectCountDrinkType + 1
+				Var DefaultDrinkType = 3
+			EndIf
+			If PD_STAGE_2 = "Enable" Then
+				Topping "Load" "12-02-02-0024"
+			Else
+				If PD_STAGE_1 = "Enable" Then
+				Topping "Load" "12-02-01-0024"
+				Else
+				Topping "Load" "12-02-03-0024"
+				EndIf
+			EndIf
+			;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_hide.lxml"
+			Var OpenFromXML = "ROOT/taobin_project/inter/tha/xml/page_catalog_group_recommend.lxml"
+			
+			
+			TabMenuVisibleInst 99
+			DEBUGVAR RedirectToNormalVersion
+			DEBUGVAR ToppingNewUINewSystem
+			If RedirectToNormalVersion = 1 Then
+				Var menu_name_eng_hot = NameLang[0][0]
+				Var menu_desc_eng_hot = DescLang[0][0]
+				Var menu_name_eng_cold = NameLang[1][0]
+				Var menu_desc_eng_cold = DescLang[1][0]
+				Var menu_name_eng_blender = NameLang[2][0]
+				Var menu_desc_eng_blender = DescLang[2][0]
+				
+				
+				
+				Var menu_name_thai_hot = NameLang[0][1]
+				Var menu_desc_thai_hot = DescLang[0][1]
+				Var menu_name_thai_cold = NameLang[1][1]
+				Var menu_desc_thai_cold = DescLang[1][1]
+				Var menu_name_thai_blender = NameLang[2][1]
+				Var menu_desc_thai_blender = DescLang[2][1]
+				DEBUGVAR menu_name_thai_cold
+				DEBUGVAR menu_desc_thai_cold
+					Var NameDrink = aliasName[0]
+					Var DrinkDescription =  aliasDesc[0]
+					Var NameDrinkTH = aliasName[1]
+					Var DrinkDescriptionTH = aliasDesc[1]
+			If LanguageShow = "THAI" Then
+				Var show_eng =  "false"
+			Else
+				Var show_eng =  "true"
+			EndIf
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_topping_select5.xml"
+			Else
+				OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/inter/tha/xml/page_topping_select6.lxml"
+			EndIf
+			
+			
+			
 		</EventOnClick>
 		</Menu>

@ -11348,20 +12036,20 @@
 			<LanguageGroup>
 				<LanguageSlot1>Geisha  \nAmericano</LanguageSlot1>
 				<LanguageSlot2>อเมริกาโน \nGeisha</LanguageSlot2>
-				<LanguageSlot3>瑰夏美式咖啡</LanguageSlot3>
+				<LanguageSlot3>-</LanguageSlot3>
 				<LanguageSlot4>-</LanguageSlot4>
 				<LanguageSlot5>-</LanguageSlot5>
-				<LanguageSlot6>Geisha \nအမေရိကန်</LanguageSlot6>
+				<LanguageSlot6>-</LanguageSlot6>
 			</LanguageGroup>
 		</Name>
 		<Description>
 			<LanguageGroup>
-				<LanguageSlot1>Light Roast (Natural Process) Lemon, Peach, Honey, Jasmin</LanguageSlot1>
-				<LanguageSlot2>กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ</LanguageSlot2>
-				<LanguageSlot3>浅烘（自然处理）\n 风味说明：柠檬、蜜桃、蜂蜜、茉莉</LanguageSlot3>
+				<LanguageSlot1>Light Roast (Natural Process) White flower/Blood orange/Grape fruit</LanguageSlot1>
+				<LanguageSlot2>กาแฟคั่วอ่อน (natural process) ดอกไม้สีขาว/ส้มบลัดออเรนจ์/เกรปฟรุต</LanguageSlot2>
+				<LanguageSlot3>-</LanguageSlot3>
 				<LanguageSlot4>-</LanguageSlot4>
 				<LanguageSlot5>-</LanguageSlot5>
-				<LanguageSlot6>Light Roast (သဘာဝဖြစ်စဉ်) Lemon, Peach, Honey, Jasmin</LanguageSlot6>
+				<LanguageSlot6>-</LanguageSlot6>
 			</LanguageGroup>
 		</Description>
 		<HotState> $12-01-01-0035.Button </HotState>
@ -11446,25 +12134,25 @@
 			Var PD_CODE3 = "##-##-##-####"
 			; begin lang
 			Var aliasName[0] = "Geisha  \nAmericano"
-			Var aliasDesc[0] = "Light Roast (Natural Process) Lemon, Peach, Honey, Jasmin"
+			Var aliasDesc[0] = "Light Roast (Natural Process) White flower/Blood orange/Grape fruit"
 			Var aliasName[1] = "อเมริกาโน \nGeisha"
-			Var aliasDesc[1] = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ"
-			Var aliasName[2] = "瑰夏美式咖啡"
-			Var aliasDesc[2] = "浅烘（自然处理）\n 风味说明：柠檬、蜜桃、蜂蜜、茉莉"
+			Var aliasDesc[1] = "กาแฟคั่วอ่อน (natural process) ดอกไม้สีขาว/ส้มบลัดออเรนจ์/เกรปฟรุต"
+			Var aliasName[2] = "-"
+			Var aliasDesc[2] = "-"
 			Var aliasName[3] = "-"
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "Geisha \nအမေရိကန်"
-			Var aliasDesc[5] = "Light Roast (သဘာဝဖြစ်စဉ်) Lemon, Peach, Honey, Jasmin"
+			Var aliasName[5] = "-"
+			Var aliasDesc[5] = "-"
 			Var NameLang[0][0] = "HOT Geisha  \nAmericano"
 			Var NameLang[0][1] = "อเมริกาโน \nGeisha"
 			Var NameLang[0][2] = "瑰夏美式咖啡"
 			Var NameLang[0][3] = "-"
 			Var NameLang[0][4] = "-"
 			Var NameLang[0][5] = "ဟော့ Geisha \nအမေရိကန်"
-			Var DescLang[0][0] = "Light Roast (Natural Process) Lemon, Peach, Honey, Jasmin"
-			Var DescLang[0][1] = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ"
+			Var DescLang[0][0] = "Light Roast (Natural Process) White flower/Blood orange/Grape fruit"
+			Var DescLang[0][1] = "กาแฟคั่วอ่อน (natural process) ดอกไม้สีขาว/ส้มบลัดออเรนจ์/เกรปฟรุต"
 			Var DescLang[0][2] = "浅烘（自然处理）"
 			Var DescLang[0][3] = ""
 			Var DescLang[0][4] = ""
@ -11475,8 +12163,8 @@
 			Var NameLang[1][3] = "-"
 			Var NameLang[1][4] = "-"
 			Var NameLang[1][5] = "ဟော့ Geisha \nအမေရိကန်"
-			Var DescLang[1][0] = "Light Roast (Natural Process) Lemon, Peach, Honey, Jasmin"
-			Var DescLang[1][1] = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ"
+			Var DescLang[1][0] = "Light Roast (Natural Process) White flower/Blood orange/Grape fruit"
+			Var DescLang[1][1] = "กาแฟคั่วอ่อน (natural process) ดอกไม้สีขาว/ส้มบลัดออเรนจ์/เกรปฟรุต"
 			Var DescLang[1][2] = "浅烘（自然处理）"
 			Var DescLang[1][3] = ""
 			Var DescLang[1][4] = ""
@ -12256,20 +12944,20 @@
 			<LanguageGroup>
 				<LanguageSlot1>Opus One \nAmericano</LanguageSlot1>
 				<LanguageSlot2>อเมริกาโน \nOpus One</LanguageSlot2>
-				<LanguageSlot3>一号美式咖啡</LanguageSlot3>
+				<LanguageSlot3>-</LanguageSlot3>
 				<LanguageSlot4>-</LanguageSlot4>
 				<LanguageSlot5>-</LanguageSlot5>
-				<LanguageSlot6>Opus One \nအမေရိကန်</LanguageSlot6>
+				<LanguageSlot6>-</LanguageSlot6>
 			</LanguageGroup>
 		</Name>
 		<Description>
 			<LanguageGroup>
-				<LanguageSlot1>Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint.</LanguageSlot1>
-				<LanguageSlot2>กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น</LanguageSlot2>
-				<LanguageSlot3>浅烘\n 风味说明：葡萄果冻、苹果派、核桃、薄荷</LanguageSlot3>
+				<LanguageSlot1>Light Roast. Note: Grape/Dried prunes/Mint/Brown Sugar</LanguageSlot1>
+				<LanguageSlot2>กาแฟคั่วอ่อน โน๊ต: องุ่น/ลูกพรุนแห้ง/มิ้นท์/น้ำตาลทรายแดง</LanguageSlot2>
+				<LanguageSlot3>-</LanguageSlot3>
 				<LanguageSlot4>-</LanguageSlot4>
 				<LanguageSlot5>-</LanguageSlot5>
-				<LanguageSlot6>မီးကင်။ မှတ်ချက်- စပျစ်သီးဂျယ်လီ၊ Apple Pie၊ သစ်ကြားသီး၊ Mint။</LanguageSlot6>
+				<LanguageSlot6>-</LanguageSlot6>
 			</LanguageGroup>
 		</Description>
 		<HotState> $12-01-01-0050.Button </HotState>
@ -12354,25 +13042,25 @@
 			Var PD_CODE3 = "##-##-##-####"
 			; begin lang
 			Var aliasName[0] = "Opus One \nAmericano"
-			Var aliasDesc[0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
+			Var aliasDesc[0] = "Light Roast. Note: Grape/Dried prunes/Mint/Brown Sugar"
 			Var aliasName[1] = "อเมริกาโน \nOpus One"
-			Var aliasDesc[1] = "กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น"
-			Var aliasName[2] = "一号美式咖啡"
-			Var aliasDesc[2] = "浅烘\n 风味说明：葡萄果冻、苹果派、核桃、薄荷"
+			Var aliasDesc[1] = "กาแฟคั่วอ่อน โน๊ต: องุ่น/ลูกพรุนแห้ง/มิ้นท์/น้ำตาลทรายแดง"
+			Var aliasName[2] = "-"
+			Var aliasDesc[2] = "-"
 			Var aliasName[3] = "-"
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "Opus One \nအမေရိကန်"
-			Var aliasDesc[5] = "မီးကင်။ မှတ်ချက်- စပျစ်သီးဂျယ်လီ၊ Apple Pie၊ သစ်ကြားသီး၊ Mint။"
+			Var aliasName[5] = "-"
+			Var aliasDesc[5] = "-"
 			Var NameLang[0][0] = "HOT Opus One \nAmericano"
 			Var NameLang[0][1] = "อเมริกาโน \nOpus One"
 			Var NameLang[0][2] = "热一号美式咖啡"
 			Var NameLang[0][3] = "-"
 			Var NameLang[0][4] = "-"
 			Var NameLang[0][5] = "HOT Opus One \nအမေရိကန်"
-			Var DescLang[0][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-			Var DescLang[0][1] = "กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น"
+			Var DescLang[0][0] = "Light Roast. Note: Grape/Dried prunes/Mint/Brown Sugar"
+			Var DescLang[0][1] = "กาแฟคั่วอ่อน โน๊ต: องุ่น/ลูกพรุนแห้ง/มิ้นท์/น้ำตาลทรายแดง"
 			Var DescLang[0][2] = "浅烘"
 			Var DescLang[0][3] = ""
 			Var DescLang[0][4] = ""
@ -12383,8 +13071,8 @@
 			Var NameLang[1][3] = "-"
 			Var NameLang[1][4] = "-"
 			Var NameLang[1][5] = "HOT Opus One \nအမေရိကန်"
-			Var DescLang[1][0] = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint."
-			Var DescLang[1][1] = "กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น"
+			Var DescLang[1][0] = "Light Roast. Note: Grape/Dried prunes/Mint/Brown Sugar"
+			Var DescLang[1][1] = "กาแฟคั่วอ่อน โน๊ต: องุ่น/ลูกพรุนแห้ง/มิ้นท์/น้ำตาลทรายแดง"
 			Var DescLang[1][2] = "浅烘"
 			Var DescLang[1][3] = ""
 			Var DescLang[1][4] = ""
--- a/inter/tha/xml/multi/v3/event/event_v3/catalog_other/active_promotions.lxml
+++ b/inter/tha/xml/multi/v3/event/event_v3/catalog_other/active_promotions.lxml
@ -51,12 +51,6 @@
    
    ;include="ROOT/taobin_project/inter/tha/xml/multi/InstanceGetSetString.inc"

-    ; setvarint RefreshOtherOther 1
-    If RefreshOtherOther = 1 Then
-        Var RefreshOtherOther = 0
-        SAVELOG "OPEN FROM 8"
-        Open "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_other_other.lxml"
-    EndIf 

    GetVisible inst_show_other_other
    
--- a/inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml
+++ b/inter/tha/xml/multi/v3/page_catalog_group_recommend.lxml
@ -7,17 +7,36 @@
 ;<Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
-    RootLayoutVisible 13 "show"
+     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"    
+     ; soda and other
+    Var Menu1Selected = "PressForever"
+
+
+    Var Timeout = 0
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
+    
+    SetInstanceIgnoreTouch
+
+
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
+
+    Var OtherOtherRefreshTimeOut = 14
+
+	DEBUGVAR SlientRefreshIndex
+    
+	RefreshAll
+
+
 </EventOpen>

 <EventOnShow>
    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"    
     ; soda and other
-    Var Menu62Selected = "PressForever"
+    Var Menu1Selected = "PressForever"

-    RootLayoutVisible 12 "show"

    Var Timeout = 0
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"

    SetInstanceIgnoreTouch

@ -28,7 +47,6 @@

 	DEBUGVAR SlientRefreshIndex
    
-	RootLayoutVisible 13 "show"
 	RefreshAll

 </EventOnShow>
--- a/inter/tha/xml/multi/v3/page_catalog_group_recommend.skt
+++ b/inter/tha/xml/multi/v3/page_catalog_group_recommend.skt
@ -9,17 +9,36 @@
 ;<Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
-    RootLayoutVisible 13 "show"
+     ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"    
+     ; soda and other
+    Var Menu1Selected = "PressForever"
+
+
+    Var Timeout = 0
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"
+    
+    SetInstanceIgnoreTouch
+
+
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
+
+    Var OtherOtherRefreshTimeOut = 14
+
+	DEBUGVAR SlientRefreshIndex
+    
+	RefreshAll
+
+
 </EventOpen>

 <EventOnShow>
    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"    
     ; soda and other
-    Var Menu62Selected = "PressForever"
+    Var Menu1Selected = "PressForever"

-    RootLayoutVisible 12 "show"

    Var Timeout = 0
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/tab_menu_show_and_refresh.lxml"

    SetInstanceIgnoreTouch

@ -30,7 +49,6 @@

 	DEBUGVAR SlientRefreshIndex
    
-	RootLayoutVisible 13 "show"
 	RefreshAll

 </EventOnShow>
--- a/ui/lang.tsv
+++ b/ui/lang.tsv
@ -381,11 +381,11 @@
 		Font=Montserrat,Type=Medium,Size=48,Color=0x513C2F,Align=Center,LineHeight=60	Font=Kanit,Type=Medium,Size=48,Color=0x513C2F,Align=Center,LineHeight=60	Font=Kanit,Type=Medium,Size=48,Color=0x513C2F,Align=Center,LineHeight=60	Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center	Font=Montserrat,Type=Bold,Size=48,Color=0x513C2F,Align=Center,LineHeight=60	Font=Montserrat,Type=Medium,Size=48,Color=0x513C2F,Align=Center,LineHeight=60
 002405		Oh no! Your smoothie’s\n[getting cold feet###Font=MontserratMedium,Size=48]	โอ้ไม่! สมูทตี้ของคุณ\n[กำลังรู้สึกเศร้ามาก###Font=KanitMedium,Size=48]	哎呀！您的冰沙\n[好像犹豫不决了。###Font=KanitMedium,Size=48]			ဝမ်းနည်းပါတယ်။ သင့်စမူသီသည်\n[ကြိတ်ခြင်းမှ ရပ်နေပါပြီ။###Font=MontserratMedium,Size=48]
 002406		You didn’t complete the transaction\n[within 120 seconds. Please try again###Font=MontserratMedium,Size=48]	คุณพลาดการทำรายการภายใน 120 วินาที\n[กรุณาลองทำรายการใหม่อีกครั้ง###Font=KanitMedium,Size=48]	您在 120 秒内\n[未完成交易。请再试一次。###Font=KanitMedium,Size=48]			သင်ငွေပေးချေမှုကို ၁၂၀စက္ကန့်အတွင်း\n[မပြီးမြောက်နိုင်ခဲ့ပါ။ ကျေးဇူးပြု၍ ပြန်လည်ကြိုးစားပါ။###Font=MontserratMedium,Size=48]
-		Font=Kanit,Type=Bold,Size=64,Color=0xEE8C62,Align=Center,LineHeight=60	Font=Kanit,Type=Bold,Size=64,Color=0xEE8C62,Align=Center,LineHeight=60	Font=Kanit,Type=Bold,Size=64,Color=0xEE8C62,Align=Center,LineHeight=60		Font=Kanit,Type=Bold,Size=64,Color=0xEE8C62,Align=Center,LineHeight=60	Font=Kanit,Type=Bold,Size=64,Color=0xEE8C62,Align=Center,LineHeight=60
-002407		Are you sure you\n[want to cancel?###Font=KanitBold,Size=64]	คุณแน่ใจหรือว่าต้องการ\n[ยกเลิกออเดอร์จริงๆ###Font=KanitBold,Size=64]	您确定要\n[取消吗？###Font=KanitBold,Size=64]			မင်းဖျက်ချင်တာ\n[သေချာပြီလား?###Font=KanitBold,Size=64]
+		Font=Kanit,Type=Bold,Size=64,Color=0xEE8C62,Align=Center,LineHeight=60	Font=Kanit,Type=Bold,Size=64,Color=0xEE8C62,Align=Center,LineHeight=60	Font=Kanit,Type=Bold,Size=64,Color=0xEE8C62,Align=Center,LineHeight=70		Font=Kanit,Type=Bold,Size=64,Color=0xEE8C62,Align=Center,LineHeight=60	Font=Kanit,Type=Bold,Size=54,Color=0xEE8C62,Align=Center,LineHeight=70
+002407		Are you sure you\n[want to cancel?###Font=KanitBold,Size=64]	คุณแน่ใจหรือว่าต้องการ\n[ยกเลิกออเดอร์จริงๆ###Font=KanitBold,Size=64]	您确定要\n[ 取消吗？###Font=KanitBold,Size=64]			မင်းဖျက်ချင်တာ\n[သေချာပြီလား?###Font=KanitBold,Size=64]
 002408		Session expired	หมดเวลาทำรายการ	操作超时			ငွေပေးချေမှုအချိန်လွန်သွားပါပြီ
-
-
+		Font=Montserrat,Type=Medium,Size=48,Color=0x513C2F,Align=Center,LineHeight=60	Font=Kanit,Type=Medium,Size=48,Color=0x513C2F,Align=Center,LineHeight=60	Font=Kanit,Type=Medium,Size=48,Color=0x513C2F,Align=Center,LineHeight=60	Font=Montserrat,Type=Bold,Size=48,Color=0xEE8C62,Align=Center	Font=Montserrat,Type=Bold,Size=48,Color=0x513C2F,Align=Center,LineHeight=60	Font=Montserrat,Type=Medium,Size=48,Color=0x513C2F,Align=Center,LineHeight=60
+002409		Taobin has encountered an error.\n[Please press the help button at the top right.###Font=MontserratMedium,Size=48]	เต่าบินเกิดเหตุขัดข้อง\n[โปรดกดปุ่มขอความช่วยเหลือด้านขวาบน###Font=KanitMedium,Size=48]	Taobin 出现故障，\n[请按右上角的求助按钮。###Font=KanitMedium,Size=48]			Taobin ပြဿနာဖြစ်နေသည်။\n[အကူအညီခလုတ်ကို နှိပ်ပါ။###Font=KanitMedium,Size=48]



@ -1256,7 +1256,7 @@
 1300003		Beans module	ชุดเมล็ดกาแฟ
 1300004		Bean tray	ถาดใส่เมล็ดกาแฟ
 1300005		Switch tray :	สวิตซ์ถาด :
-1300006		Check tray shutter	ตรวจสอบชัตเตอร์ถาด
+1300006		Check tray shutter	ตรวจสอบชัตเตอร์ของถาด
 1300007		Pay beans	จ่ายถั่ว
 1300008		1. Select beans	1. เลือกเมล็ดกาแฟ
 1300009		2. Select direction	2. เลือกทิศทาง
@ -1269,7 +1269,7 @@
 1300016		Brew time:sec	เวลาชง: วินาที
 1300017		Test grind sizes	ทดสอบขนาดบด
 1300018		Coffee module type :	ประเภทชุดกาแฟ :
-1300019		1. Select grind sizes	1. เลือกขนาดการบด
+1300019		1. Select grind sizes	1. เลือกขนาดบด
 1300020		More coarse	หยาบขึ้น
 1300021		More fine	ละเอียดขึ้น
 1300022		2. Test grinding	2. ทดสอบการบด
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -7,6 +7,8 @@
 <Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
+	; tab_menu hide
+	RootLayoutVisible 13 "hide"

    DEBUGVAR LangProcess

--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@ -561,7 +561,8 @@
 	DEBUGVAR MenuReady
 	DEBUGVAR CupRemain

-
+	DEBUGVAR CLOSE_ORDER_NOW
+	
 	If CLOSE_ORDER_NOW = "true" Then
 		;include="ROOT/taobin_project/inc/return_condition.ev"
 	EndIf
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0

-	Var XMLPageVersion = "9.83"
-	Var XMLPageVersionInt = 983
+	Var XMLPageVersion = "9.84"
+	Var XMLPageVersionInt = 984
 	
 	Var CurrentMainVideo = 2
 </EventOpen>
--- a/xml_main/startup_dev.xml
+++ b/xml_main/startup_dev.xml
@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0

-	Var XMLPageVersion = "10.83"
-	Var XMLPageVersionInt = 1083
+	Var XMLPageVersion = "10.84"
+	Var XMLPageVersionInt = 1084
 ;Oreo
 Var OreoGuarantee = 0