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

inter/aus/animation01/play_list.tsv

@@ -1,5 +1,6 @@
 name	New Code	เล่น 4 วินาที	ขั้นตอน 1	ขั้นตอน 2	ขั้นตอน 3	ขั้นตอน 4	ขั้นตอน 5	ขั้นตอน 6	ขั้นตอน 7	ขั้นตอน 8	จบ	Time (sec)	นาทีและวินาที	ความยาวการเล่นของแต่ละขั้นตอน
 Espresso	51-01-01-0001	1	2	3	4	5					24	66	1:06	16
+Espresso	51-21-01-0001	1	2	3	4	5					24	66	1:06	16
 Hot Americano	51-01-01-0003	1	2	3	4	5	16				24	88	1:28	17
 Hot Latte	51-01-01-0004	1	2	3	4	5	6	7			24	117	1:57	19
 Hot Latte	51-01-01-0004	1	2	3	4	5	6	70			24	1170	10:30	19
@@ -47,6 +48,8 @@ Geisha	51-01-01-0036	1	2	49	3	4	5				24	66	1:06	32
 อเมริกาโนร้อน ROSALYN	51-01-01-0038	1	2	50	3	4	5	16			24	66	7:06	32
 อเมริกาโนเมล่อนร้อน	51-01-01-0039	1	2	3	4	5	52				24	120	5:00	23
 อเมริกาโนเมล่อนร้อน	51-01-01-0039	1	2	3	4	5	52				24	120	5:00	23
+อเมริกาโนเมล่อนร้อน	51-21-01-0039	1	2	3	4	5	52				24	120	5:00	23
+อเมริกาโนเมล่อนร้อน	51-21-01-0039	1	2	3	4	5	52				24	120	5:00	23
 อเมริกาโนยูซุร้อน	51-01-01-0040	1	53	3	5	6	7				24	49	0:49	23
 HOT BANANA CAFE LATTE	51-01-01-0042	1	56	3	4	5	16				24	49	1	23
 HOT BANANA CAFE LATTE	51-01-01-0042	1	56	3	4	5	16				24	49	1	23

inter/aus/image/event/image_template2

@@ -1,3 +1,3 @@
-normal_eng=ROOT/taobin_project/inter/aus/image/event/anniversary_1st_extended.png
-press_eng=ROOT/taobin_project/inter/aus/image/event/anniversary_1st_extended.png
-disable_eng=ROOT/taobin_project/inter/aus/image/event/anniversary_1st_extended.png
+normal_eng=ROOT/taobin_project/inter/aus/image/event/st_patrick_banner.png
+press_eng=ROOT/taobin_project/inter/aus/image/event/st_patrick_banner.png
+disable_eng=ROOT/taobin_project/inter/aus/image/event/st_patrick_banner.png

inter/aus/menu/lang.tsv

@@ -1280,3 +1280,10 @@ TextID	Note	English	Thai
 2100054		Sleep mode will be turn on
when machine operating.	Sleep mode will be turn on
when machine operating.
 2100055		Sleep mode will be turn off
when machine operating.	Sleep mode will be turn off
when machine operating.
 2100056		Please check before confirming	Please check before confirming
+
+
+
+
+
+	EOF
+9999999		Load language finish	Load language finish	Load language finish	Load language finish	Load language finish	Load language finish

inter/aus/video/script_video.ev

@@ -1,5 +1,7 @@
 Var MainfileSize = 0
 Var EventTurnOn = 0
+Var EventAO = 0
+Var StPatrickEvent = 0
 
 
 
@@ -33,6 +35,15 @@ If SystemDateMonthInt = 1 Then
     EndIf
 EndIf
 
+If SystemDateMonthInt = 3 Then
+    GetFileSizeK "taobin_project/inter/aus/video/video_main_StPatrick.mp4" MainfileSize
+    DEBUGVAR MainfileSize
+    If MainfileSize = 17941307 Then
+        Var StPatrickEvent = 1
+    Else
+        DEBUGVAR "StPatrick: Video size incorrect"
+    EndIf
+EndIf
 
 DEBUGVAR EventTurnOn
 
@@ -49,4 +60,8 @@ EndIf
 If EventAO = 1 Then
 
     Var VideoMainPage = "ROOT/taobin_project/inter/aus/video/video_main_ao.mp4"
+EndIf
+
+If StPatrickEvent = 1 Then
+    Var VideoMainPage = "ROOT/taobin_project/inter/aus/video/video_main_StPatrick.mp4"
 EndIf

inter/aus/xml/event/out_put_file2.txt

@@ -1 +1 @@
-/event/promotion_anniversary_1st.lxml
+/event/promotion_st_patrick_day.lxml

inter/aus/xml/event/promotion_onclick2.inc

@@ -1 +1 @@
-; Do nothing
+		Open "ROOT/taobin_project/inter/aus/xml/page_catalog_group_pro_st_patrick.lxml"

inter/aus/xml/event/script_common_for_open_promotion_xml.ev

@@ -10,6 +10,10 @@ If ValentinePro = 1 Then
     Var RecommendPage = "ROOT/taobin_project/inter/aus/xml/event/promotion_valentine.lxml"
 EndIf
 
+If StPatrickDayPro = 1 Then
+    Var RecommendPage = "ROOT/taobin_project/inter/aus/xml/event/promotion_st_patrick_day.lxml"
+EndIf
+
 If OpenFromPageBoard = 1 Then
 	OpenInst 2 RecommendPage
 Else

inter/aus/xml/event/tricker.ev

@@ -12,11 +12,16 @@ Var GameEnableFromTrickerEv = 0
 Var NewCollectPointFlag = 1
 
 Var ValentinePro = 0
+Var StPatrickDayPro = 0
 
 If SystemDateMonthInt = 2 Then
     Var ValentinePro = 1
 EndIf
 
+If SystemDateMonthInt = 3 Then
+    Var StPatrickDayPro = 1
+EndIf
+
 Var XMLLiveInfoEnable = 1
 
 DEBUGVAR Propepsi99Enable

inter/aus/xml/page_catalog_group_coffee.lxml

@@ -3600,280 +3600,6 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
-</Block>
-	; ==================> Len = 3
-	; 51-01-01-0026 - - 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 51-01-01-0026.Button,$Sum5101010026) </State> 
-	<Button>
-	<State> $Sum5101010026 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_espresso_light_honduras.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_espresso_light_honduras.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_espresso_light_honduras.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_espresso_light_honduras.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $51-01-01-0026.Price
-		Var PriceD2 = $-.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "51-01-01-0026"
-		Var PD_CODE2 = "##-##-##-####"
-		Var PD_CODE3 = "##-##-##-####"
-		; begin lang 
-		Var aliasName[0] = "HONDURAS\nESPRESSO"
-		Var aliasDesc[0] = "Washed Sherry cask ferment \nNotes: blueberry, walnut, dark..."
-		Var aliasName[1] = "เอสเพรสโซ่ช็อต  \nWHISKY DUDE"
-		Var aliasDesc[1] = "Washed Sherry cask ferment\nหอมวิสกี้ ช็อกโกแลต วนิลา"
-		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] = "HONDURAS  ESPRESSO"
-		Var NameLang[0][1] = "เอสเพรสโซ่ช็อต  HONDURAS"
-		Var NameLang[0][2] = ""
-		Var NameLang[0][3] = ""
-		Var NameLang[0][4] = "ESPRESSO HONDURAS"
-		Var NameLang[0][5] = ""
-		Var DescLang[0][0] = "Washed Sherry cask ferment Notes: blueberry, walnut, dark chocolate"
-		Var DescLang[0][1] = "Washed Sherry cask fermentหอมวิสกี้ ช็อกโกแลต วนิลา"
-		Var DescLang[0][2] = ""
-		Var DescLang[0][3] = ""
-		Var DescLang[0][4] = "Penapaian Tong Sherry Yang Telah Dibasuh   Nota: Wiski & Vanila"
-		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = ""
-		Var NameLang[1][1] = ""
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = ""
-		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = ""
-		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 = $51-01-01-0026.Button
-		Var PD_STAGE_2 = "Disable2"
-		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" "-"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "51-01-01-0026"
-			Else
-			Topping "Load" "-"
-			EndIf
-		EndIf
-		
-		DEBUGVAR PD_STAGE_1
-		DEBUGVAR PD_STAGE_2
-		DEBUGVAR PD_STAGE_3
-		Var SelectDrinkType = 0
-		
-		
-		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
-		
-	</EventOnClick>
-	</Button>
-	<Text>
-	<X>  16   </X>
-	<Y>  164  </Y>
-	<Size> 22 </Size>
-	<Width>222</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<LanguageGroup>
-		<LanguageSlot1>HONDURAS\nESPRESSO</LanguageSlot1>
-		<LanguageSlot2>เอสเพรสโซ่ช็อต  \nWHISKY DUDE</LanguageSlot2>
-		<LanguageSlot3>HONDURAS\nESPRESSO</LanguageSlot3>
-		<LanguageSlot4>เอสเพรสโซ่ช็อต  \nWHISKY DUDE</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>เอสเพรสโซ่ช็อต  \nWHISKY DUDE</LanguageSlot6>
-	</LanguageGroup>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>222</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<LanguageGroup>
-		<LanguageSlot1>Washed Sherry cask ferment \nNotes: blueberry, walnut, dark...</LanguageSlot1>
-		<LanguageSlot2>Washed Sherry cask ferment\nหอมวิสกี้ ช็อกโกแลต วนิลา</LanguageSlot2>
-		<LanguageSlot3>Washed Sherry cask ferment \nNotes: blueberry, walnut, dark...</LanguageSlot3>
-		<LanguageSlot4>Washed Sherry cask ferment\nหอมวิสกี้ ช็อกโกแลต วนิลา</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>Washed Sherry cask ferment\nหอมวิสกี้ ช็อกโกแลต วนิลา</LanguageSlot6>
-	</LanguageGroup>
-	</Text>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
-	</Image>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<State> $51-01-01-0026.Button </State>
-	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
-	</Image>
-	<Text>
-	<X> TextPriceMenuHotX </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $51-01-01-0026.Button </State>
-	<Value> StringFmt(  $51-01-01-0026.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> "Invisible" </State>
-	</Image>
-	<Text>
-	<X> 113 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
-	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 146 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> "Invisible" </State>
-	</Image>
-	<Text>
-	<X> TextPriceMenuBlendX </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<State> 
-		eval( 
-		If ICE_PROCESS_STATUS = 2 Then
-		
-			If $Sum5101010026 = "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
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
-	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
-	</Image>
-	<Image>
-	<X> 49 </X>
-	<Y> 117 </Y>
-	<State> 
-		eval( 
-			If $Sum5101010026 = "Disable" Then
-				STRCONTAIN "ERR" $51-01-01-0026.TAG tag1_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
-				Var return = "Invisible"
-				If tag1_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag2_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag3_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-			Else
-					Var return = "Invisible"
-			EndIf
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
-	</Image>
-	<Text>
-	<X> 84 </X>
-	<Y> 266 </Y>
-	<Size> 10 </Size>
-	<Font> OpunMediumTTF </Font>
-	<Color> 0xDE794E </Color>
-	<State> ice_tab_process_show </State>
-	<Value> ice_show_open </Value>
-	</Text>
-	<Text>
-	<X> 48 </X>
-	<Y> 116 </Y>
-	<Size> 32 </Size>
-	<Width>128</Width>
-	<Height>64</Height>
-	<Mode> "disable-show" </Mode>
-	<State> $Sum5101010026 </State> 
-	<Language>
-		<ID> 000013 </ID> 
-	</Language>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
 </Block>
 	; ==================> Len = 3
 	; 51-01-01-0028 - - 
@@ -7154,280 +6880,6 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
-</Block>
-	; ==================> Len = 3
-	; 51-01-01-0025 51-01-02-0025 - 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 51-01-01-0025.Button,51-01-02-0025.Button,$Sum51010100255101020025) </State> 
-	<Button>
-	<State> $Sum51010100255101020025 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_americano_light_honduras.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_americano_light_honduras.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_americano_light_honduras.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_americano_light_honduras.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $51-01-01-0025.Price
-		Var PriceD2 = $51-01-02-0025.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "51-01-01-0025"
-		Var PD_CODE2 = "51-01-02-0025"
-		Var PD_CODE3 = "##-##-##-####"
-		; begin lang 
-		Var aliasName[0] = "HONDURAS\nAMERICANO"
-		Var aliasDesc[0] = "Washed Sherry cask ferment \nNotes: blueberry, walnut, dark..."
-		Var aliasName[1] = "อเมริกาโน \nWHISKY DUDE"
-		Var aliasDesc[1] = "Washed Sherry cask ferment\nหอมวิสกี้ ช็อกโกแลต วนิลา"
-		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] = "HONDURAS  Hot AMERICANO"
-		Var NameLang[0][1] = "อเมริกาโนร้อน  HONDURAS"
-		Var NameLang[0][2] = ""
-		Var NameLang[0][3] = ""
-		Var NameLang[0][4] = "AMERICANO HONDURAS PANAS"
-		Var NameLang[0][5] = ""
-		Var DescLang[0][0] = "Washed Sherry cask ferment Notes: blueberry, walnut, dark chocolate"
-		Var DescLang[0][1] = "Washed Sherry cask fermentหอมวิสกี้ ช็อกโกแลต วนิลา"
-		Var DescLang[0][2] = ""
-		Var DescLang[0][3] = ""
-		Var DescLang[0][4] = "Penapaian Tong Sherry Yang Telah Dibasuh   Nota: Wiski & Vanila"
-		Var DescLang[0][5] = ""
-		Var NameLang[1][0] = "HONDURAS  Iced AMERICANO"
-		Var NameLang[1][1] = "อเมริกาโนเย็น   HONDURAS"
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = "AMERICANO HONDURAS AIS"
-		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = "Washed Sherry cask ferment Notes: blueberry, walnut, dark chocolate"
-		Var DescLang[1][1] = "Washed Sherry cask fermentหอมวิสกี้ ช็อกโกแลต วนิลา"
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = "Penapaian Tong Sherry Yang Telah Dibasuh   Nota: Wiski & Vanila"
-		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 = $51-01-01-0025.Button
-		Var PD_STAGE_2 = $51-01-02-0025.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" "51-01-02-0025"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "51-01-01-0025"
-			Else
-			Topping "Load" "-"
-			EndIf
-		EndIf
-		
-		DEBUGVAR PD_STAGE_1
-		DEBUGVAR PD_STAGE_2
-		DEBUGVAR PD_STAGE_3
-		Var SelectDrinkType = 0
-		
-		
-		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
-		
-	</EventOnClick>
-	</Button>
-	<Text>
-	<X>  16   </X>
-	<Y>  164  </Y>
-	<Size> 22 </Size>
-	<Width>222</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<LanguageGroup>
-		<LanguageSlot1>HONDURAS\nAMERICANO</LanguageSlot1>
-		<LanguageSlot2>อเมริกาโน \nWHISKY DUDE</LanguageSlot2>
-		<LanguageSlot3>HONDURAS\nAMERICANO</LanguageSlot3>
-		<LanguageSlot4>อเมริกาโน \nWHISKY DUDE</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>อเมริกาโน \nWHISKY DUDE</LanguageSlot6>
-	</LanguageGroup>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>222</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<LanguageGroup>
-		<LanguageSlot1>Washed Sherry cask ferment \nNotes: blueberry, walnut, dark...</LanguageSlot1>
-		<LanguageSlot2>Washed Sherry cask ferment\nหอมวิสกี้ ช็อกโกแลต วนิลา</LanguageSlot2>
-		<LanguageSlot3>Washed Sherry cask ferment \nNotes: blueberry, walnut, dark...</LanguageSlot3>
-		<LanguageSlot4>Washed Sherry cask ferment\nหอมวิสกี้ ช็อกโกแลต วนิลา</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>Washed Sherry cask ferment\nหอมวิสกี้ ช็อกโกแลต วนิลา</LanguageSlot6>
-	</LanguageGroup>
-	</Text>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
-	</Image>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<State> $51-01-01-0025.Button </State>
-	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
-	</Image>
-	<Text>
-	<X> TextPriceMenuHotX </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $51-01-01-0025.Button </State>
-	<Value> StringFmt(  $51-01-01-0025.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> $51-01-02-0025.Button </State>
-	</Image>
-	<Text>
-	<X> 113 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $51-01-02-0025.Button </State>
-	<Value> StringFmt( $51-01-02-0025.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 146 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> "Invisible" </State>
-	</Image>
-	<Text>
-	<X> TextPriceMenuBlendX </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<State> 
-		eval( 
-		If ICE_PROCESS_STATUS = 2 Then
-		
-			If $Sum51010100255101020025 = "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
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
-	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
-	</Image>
-	<Image>
-	<X> 49 </X>
-	<Y> 117 </Y>
-	<State> 
-		eval( 
-			If $Sum51010100255101020025 = "Disable" Then
-				STRCONTAIN "ERR" $51-01-01-0025.TAG tag1_is_disable
-				STRCONTAIN "ERR" $51-01-02-0025.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
-				Var return = "Invisible"
-				If tag1_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag2_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag3_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-			Else
-					Var return = "Invisible"
-			EndIf
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
-	</Image>
-	<Text>
-	<X> 84 </X>
-	<Y> 266 </Y>
-	<Size> 10 </Size>
-	<Font> OpunMediumTTF </Font>
-	<Color> 0xDE794E </Color>
-	<State> ice_tab_process_show </State>
-	<Value> ice_show_open </Value>
-	</Text>
-	<Text>
-	<X> 48 </X>
-	<Y> 116 </Y>
-	<Size> 32 </Size>
-	<Width>128</Width>
-	<Height>64</Height>
-	<Mode> "disable-show" </Mode>
-	<State> $Sum51010100255101020025 </State> 
-	<Language>
-		<ID> 000013 </ID> 
-	</Language>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
 </Block>
 	; ==================> Len = 3
 	; 51-01-01-0023 51-01-02-0023 - 
@@ -10148,276 +9600,6 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
-</Block>
-	; ==================> Len = 3
-	; - 51-01-02-0026 - 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 51-01-02-0026.Button,$Sum5101020026) </State> 
-	<Button>
-	<State> $Sum5101020026 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_dirty_light_honduras.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_dirty_light_honduras.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_dirty_light_honduras.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_dirty_light_honduras.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
-		Var PriceD2 = $51-01-02-0026.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "51-01-02-0026"
-		Var PD_CODE3 = "##-##-##-####"
-		; begin lang 
-		Var aliasName[0] = "HONDURAS\nALMOST DIRTY"
-		Var aliasDesc[0] = "Washed Sherry cask ferment \nNotes: blueberry, walnut, dark..."
-		Var aliasName[1] = "WHISKY DUDE \nALMOST DIRTY"
-		Var aliasDesc[1] = "Washed Sherry cask ferment\nหอมวิสกี้ ช็อกโกแลต วนิลา"
-		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] = ""
-		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] = "HONDURAS  ALMOST DIRTY"
-		Var NameLang[1][1] = "HONDURAS ALMOST DIRTY"
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = "KOPI KOTOR HONDURAS"
-		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = "Washed Sherry cask ferment Notes: blueberry, walnut, dark chocolate"
-		Var DescLang[1][1] = "Washed Sherry cask fermentหอมวิสกี้ ช็อกโกแลต วนิลา"
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = "Penapaian Tong Sherry Yang Telah Dibasuh   Nota: Wiski & Vanila"
-		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 = $51-01-02-0026.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" "51-01-02-0026"
-		Else
-			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
-			Else
-			Topping "Load" "-"
-			EndIf
-		EndIf
-		
-		DEBUGVAR PD_STAGE_1
-		DEBUGVAR PD_STAGE_2
-		DEBUGVAR PD_STAGE_3
-		Var SelectDrinkType = 0
-		
-		
-		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
-		
-	</EventOnClick>
-	</Button>
-	<Text>
-	<X>  16   </X>
-	<Y>  164  </Y>
-	<Size> 22 </Size>
-	<Width>222</Width>
-	<Mode> "multi2" </Mode>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x322B26 </Color>
-	<LanguageGroup>
-		<LanguageSlot1>HONDURAS\nALMOST DIRTY</LanguageSlot1>
-		<LanguageSlot2>WHISKY DUDE \nALMOST DIRTY</LanguageSlot2>
-		<LanguageSlot3>HONDURAS\nALMOST DIRTY</LanguageSlot3>
-		<LanguageSlot4>WHISKY DUDE \nALMOST DIRTY</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>WHISKY DUDE \nALMOST DIRTY</LanguageSlot6>
-	</LanguageGroup>
-	</Text>
-	<Text>
-	<X> 16 </X>
-	<Y> 220 </Y>
-	<Size> 14 </Size>
-	<Width>222</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<LanguageGroup>
-		<LanguageSlot1>Washed Sherry cask ferment \nNotes: blueberry, walnut, dark...</LanguageSlot1>
-		<LanguageSlot2>Washed Sherry cask ferment\nหอมวิสกี้ ช็อกโกแลต วนิลา</LanguageSlot2>
-		<LanguageSlot3>Washed Sherry cask ferment \nNotes: blueberry, walnut, dark...</LanguageSlot3>
-		<LanguageSlot4>Washed Sherry cask ferment\nหอมวิสกี้ ช็อกโกแลต วนิลา</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>Washed Sherry cask ferment\nหอมวิสกี้ ช็อกโกแลต วนิลา</LanguageSlot6>
-	</LanguageGroup>
-	</Text>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
-	</Image>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
-	<State> "Invisible" </State>
-	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
-	</Image>
-	<Text>
-	<X> TextPriceMenuHotX </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> $51-01-02-0026.Button </State>
-	</Image>
-	<Text>
-	<X> 113 </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitMediumTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $51-01-02-0026.Button </State>
-	<Value> StringFmt( $51-01-02-0026.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 146 </X>
-	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> "Invisible" </State>
-	</Image>
-	<Text>
-	<X> TextPriceMenuBlendX </X>
-	<Y> TextPriceMenuY </Y>
-	<Size> TextPriceMenuSize </Size>
-	<Width>220</Width>
-	<Font> KanitRegularTTF </Font>
-	<Color> 0x6F5F51 </Color>
-	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
-	</Text>
-	<Image>
-	<X> 81 </X>
-	<Y> 264 </Y>
-	<State> 
-		eval( 
-		If ICE_PROCESS_STATUS = 2 Then
-		
-			Var ice_tab_process_show = "Invisible"
-		
-		Else
-			Var ice_tab_process_show = "Invisible"
-		EndIf
-		Var return = ice_tab_process_show
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
-	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
-	</Image>
-	<Image>
-	<X> 49 </X>
-	<Y> 117 </Y>
-	<State> 
-		eval( 
-			If $Sum5101020026 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $51-01-02-0026.TAG tag2_is_disable
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
-				Var return = "Invisible"
-				If tag1_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag2_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-				If tag3_is_disable = "true" Then
-					Var return = "Enable"
-				EndIf
-			Else
-					Var return = "Invisible"
-			EndIf
-		)
-	</State>
-	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
-	</Image>
-	<Text>
-	<X> 84 </X>
-	<Y> 266 </Y>
-	<Size> 10 </Size>
-	<Font> OpunMediumTTF </Font>
-	<Color> 0xDE794E </Color>
-	<State> ice_tab_process_show </State>
-	<Value> ice_show_open </Value>
-	</Text>
-	<Text>
-	<X> 48 </X>
-	<Y> 116 </Y>
-	<Size> 32 </Size>
-	<Width>128</Width>
-	<Height>64</Height>
-	<Mode> "disable-show" </Mode>
-	<State> $Sum5101020026 </State> 
-	<Language>
-		<ID> 000013 </ID> 
-	</Language>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
 </Block>
 	; ==================> Len = 3
 	; - 51-01-02-0024 - 
@@ -12589,13 +11771,13 @@
 	<State> Flag( 51-01-01-0004.Button,51-01-02-0002.Button,51-01-03-0002.Button,$Sum510101000451010200025101030002) </State> 
 	<Button>
 	<State> $Sum510101000451010200025101030002 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte_st_patrick.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte_st_patrick.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte_st_patrick.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte_st_patrick.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-01-01-0004.Price
 		Var PriceD2 = $51-01-02-0002.Price
@@ -12863,13 +12045,13 @@
 	<State> Flag( 51-21-01-0004.Button,51-21-02-0002.Button,51-21-03-0002.Button,$Sum512101000451210200025121030002) </State> 
 	<Button>
 	<State> $Sum512101000451210200025121030002 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte_st_patrick.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte_st_patrick.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte_st_patrick.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte_st_patrick.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-21-01-0004.Price
 		Var PriceD2 = $51-21-02-0002.Price
@@ -13685,13 +12867,13 @@
 	<State> Flag( 51-01-01-0006.Button,51-01-02-0003.Button,51-01-03-0003.Button,$Sum510101000651010200035101030003) </State> 
 	<Button>
 	<State> $Sum510101000651010200035101030003 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha_st_patrick.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha_st_patrick.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha_st_patrick.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mocha.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mocha_st_patrick.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-01-01-0006.Price
 		Var PriceD2 = $51-01-02-0003.Price
@@ -13959,13 +13141,13 @@
 	<State> Flag( 51-21-01-0006.Button,51-21-02-0003.Button,51-21-03-0003.Button,$Sum512101000651210200035121030003) </State> 
 	<Button>
 	<State> $Sum512101000651210200035121030003 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha_st_patrick.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha_st_patrick.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha_st_patrick.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mocha.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mocha_st_patrick.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-21-01-0006.Price
 		Var PriceD2 = $51-21-02-0003.Price
@@ -14507,13 +13689,13 @@
 	<State> Flag( 51-01-01-0007.Button,51-01-02-0004.Button,51-01-03-0004.Button,$Sum510101000751010200045101030004) </State> 
 	<Button>
 	<State> $Sum510101000751010200045101030004 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_st_patrick.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_st_patrick.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_st_patrick.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_st_patrick.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-01-01-0007.Price
 		Var PriceD2 = $51-01-02-0004.Price
@@ -14781,13 +13963,13 @@
 	<State> Flag( 51-21-01-0007.Button,51-21-02-0004.Button,51-21-03-0004.Button,$Sum512101000751210200045121030004) </State> 
 	<Button>
 	<State> $Sum512101000751210200045121030004 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_st_patrick.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_st_patrick.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_st_patrick.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_st_patrick.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-21-01-0007.Price
 		Var PriceD2 = $51-21-02-0004.Price
@@ -19439,13 +18621,13 @@
 	<State> Flag( 51-01-01-0040.Button,51-01-02-0040.Button,$Sum51010100405101020040) </State> 
 	<Button>
 	<State> $Sum51010100405101020040 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano_pro_valentine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano_pro_valentine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano_pro_valentine.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano_pro_valentine.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-01-01-0040.Price
 		Var PriceD2 = $51-01-02-0040.Price
@@ -19713,13 +18895,13 @@
 	<State> Flag( 51-21-01-0040.Button,51-21-02-0040.Button,$Sum51210100405121020040) </State> 
 	<Button>
 	<State> $Sum51210100405121020040 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano_pro_valentine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano_pro_valentine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano_pro_valentine.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano_pro_valentine.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-21-01-0040.Price
 		Var PriceD2 = $51-21-02-0040.Price

inter/aus/xml/page_catalog_group_forkid.lxml

@@ -3319,13 +3319,13 @@
 	<State> Flag( 51-05-02-0045.Button,$Sum5105020045) </State> 
 	<Button>
 	<State> $Sum5105020045 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda_pro_valentine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda_pro_valentine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda_pro_valentine.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_yuzu_soda_pro_valentine.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_yuzu_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $51-05-02-0045.Price
@@ -4955,13 +4955,13 @@
 	<State> Flag( 51-01-01-0004.Button,$Sum5101010004) </State> 
 	<Button>
 	<State> $Sum5101010004 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte_st_patrick.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte_st_patrick.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte_st_patrick.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte_st_patrick.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-01-01-0004.Price
 		Var PriceD2 = $-.Price
@@ -5229,13 +5229,13 @@
 	<State> Flag( 51-21-01-0004.Button,$Sum5121010004) </State> 
 	<Button>
 	<State> $Sum5121010004 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_latte_st_patrick.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_latte_st_patrick.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_latte_st_patrick.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_latte_st_patrick.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-21-01-0004.Price
 		Var PriceD2 = $-.Price
@@ -5503,13 +5503,13 @@
 	<State> Flag( 51-01-01-0006.Button,$Sum5101010006) </State> 
 	<Button>
 	<State> $Sum5101010006 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha_st_patrick.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha_st_patrick.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha_st_patrick.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mocha.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mocha_st_patrick.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-01-01-0006.Price
 		Var PriceD2 = $-.Price
@@ -5777,13 +5777,13 @@
 	<State> Flag( 51-21-01-0006.Button,$Sum5121010006) </State> 
 	<Button>
 	<State> $Sum5121010006 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_mocha_st_patrick.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_mocha_st_patrick.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_mocha_st_patrick.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mocha.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_mocha_st_patrick.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-21-01-0006.Price
 		Var PriceD2 = $-.Price
@@ -6325,13 +6325,13 @@
 	<State> Flag( 51-01-01-0007.Button,$Sum5101010007) </State> 
 	<Button>
 	<State> $Sum5101010007 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_st_patrick.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_st_patrick.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_st_patrick.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_st_patrick.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-01-01-0007.Price
 		Var PriceD2 = $-.Price
@@ -6599,13 +6599,13 @@
 	<State> Flag( 51-21-01-0007.Button,$Sum5121010007) </State> 
 	<Button>
 	<State> $Sum5121010007 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_st_patrick.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_st_patrick.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_st_patrick.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_st_patrick.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-21-01-0007.Price
 		Var PriceD2 = $-.Price
@@ -6873,13 +6873,13 @@
 	<State> Flag( 51-01-01-0040.Button,$Sum5101010040) </State> 
 	<Button>
 	<State> $Sum5101010040 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano_pro_valentine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano_pro_valentine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano_pro_valentine.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano_pro_valentine.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-01-01-0040.Price
 		Var PriceD2 = $-.Price
@@ -7147,13 +7147,13 @@
 	<State> Flag( 51-21-01-0040.Button,$Sum5121010040) </State> 
 	<Button>
 	<State> $Sum5121010040 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano_pro_valentine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano_pro_valentine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano_pro_valentine.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano_pro_valentine.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-21-01-0040.Price
 		Var PriceD2 = $-.Price
@@ -8517,13 +8517,13 @@
 	<State> Flag( 51-02-01-0039.Button,$Sum5102010039) </State> 
 	<Button>
 	<State> $Sum5102010039 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark_pro_valentine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark_pro_valentine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark_pro_valentine.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark_pro_valentine.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-02-01-0039.Price
 		Var PriceD2 = $-.Price

inter/aus/xml/page_catalog_group_other.lxml

@@ -4368,13 +4368,13 @@
 	<State> Flag( 51-05-02-0045.Button,$Sum5105020045) </State> 
 	<Button>
 	<State> $Sum5105020045 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda_pro_valentine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda_pro_valentine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda_pro_valentine.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_yuzu_soda_pro_valentine.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_yuzu_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $51-05-02-0045.Price

inter/aus/xml/page_catalog_group_pro_st_patrick.skt

@@ -0,0 +1,40 @@
+<?hurr
+    #include=menu_head.py
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_default_init.lxml"
+
+
+    SAVELOG PreviseXMLFileName2
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new_menu.lxml"
+</EventOpen>
+
+
+
+;include="ROOT/taobin_project/inter/aus/xml/menu_catalog_new.lxml"
+
+
+
+
+<?hurr
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr
+    #include=menu_new_layout_gen.py
+?>
+
+
+</Popup>
+

inter/aus/xml/page_catalog_group_pro_valentine.lxml

@@ -48,13 +48,13 @@
 	<State> Flag( 51-05-02-0045.Button,$Sum5105020045) </State> 
 	<Button>
 	<State> $Sum5105020045 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda_pro_valentine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda_pro_valentine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda_pro_valentine.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_yuzu_soda.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_yuzu_soda.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_yuzu_soda.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_yuzu_soda_pro_valentine.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_iced_yuzu_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $51-05-02-0045.Price
@@ -318,13 +318,13 @@
 	<State> Flag( 51-01-01-0040.Button,51-01-02-0040.Button,$Sum51010100405101020040) </State> 
 	<Button>
 	<State> $Sum51010100405101020040 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano_pro_valentine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano_pro_valentine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano_pro_valentine.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano_pro_valentine.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-01-01-0040.Price
 		Var PriceD2 = $51-01-02-0040.Price
@@ -592,13 +592,13 @@
 	<State> Flag( 51-21-01-0040.Button,51-21-02-0040.Button,$Sum51210100405121020040) </State> 
 	<Button>
 	<State> $Sum51210100405121020040 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano_pro_valentine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano_pro_valentine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano_pro_valentine.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano_pro_valentine.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-21-01-0040.Price
 		Var PriceD2 = $51-21-02-0040.Price
@@ -866,13 +866,13 @@
 	<State> Flag( 51-02-01-0039.Button,51-02-02-0039.Button,51-02-03-0039.Button,$Sum510201003951020200395102030039) </State> 
 	<Button>
 	<State> $Sum510201003951020200395102030039 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark_pro_valentine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark_pro_valentine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark_pro_valentine.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark_pro_valentine.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-02-01-0039.Price
 		Var PriceD2 = $51-02-02-0039.Price

inter/aus/xml/page_catalog_group_recommend.lxml

@@ -1959,13 +1959,13 @@
 	<State> Flag( 51-02-01-0039.Button,51-02-02-0039.Button,51-02-03-0039.Button,Disable=Invisible,$Sum510201003951020200395102030039) </State> 
 	<Button>
 	<State> $Sum510201003951020200395102030039 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark_pro_valentine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark_pro_valentine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark_pro_valentine.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark_pro_valentine.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-02-01-0039.Price
 		Var PriceD2 = $51-02-02-0039.Price
@@ -2507,13 +2507,13 @@
 	<State> Flag( 51-01-01-0007.Button,51-01-02-0004.Button,51-01-03-0004.Button,Disable=Invisible,$Sum510101000751010200045101030004) </State> 
 	<Button>
 	<State> $Sum510101000751010200045101030004 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_st_patrick.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_st_patrick.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_st_patrick.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_st_patrick.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-01-01-0007.Price
 		Var PriceD2 = $51-01-02-0004.Price
@@ -2781,13 +2781,13 @@
 	<State> Flag( 51-21-01-0007.Button,51-21-02-0004.Button,51-21-03-0004.Button,Disable=Invisible,$Sum512101000751210200045121030004) </State> 
 	<Button>
 	<State> $Sum512101000751210200045121030004 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_st_patrick.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_st_patrick.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_st_patrick.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_st_patrick.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-21-01-0007.Price
 		Var PriceD2 = $51-21-02-0004.Price
@@ -4413,13 +4413,13 @@
 	<State> Flag( 51-01-01-0040.Button,Disable=Invisible,$Sum5101010040) </State> 
 	<Button>
 	<State> $Sum5101010040 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano_pro_valentine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano_pro_valentine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano_pro_valentine.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano_pro_valentine.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-01-01-0040.Price
 		Var PriceD2 = $-.Price
@@ -4687,13 +4687,13 @@
 	<State> Flag( 51-21-01-0040.Button,Disable=Invisible,$Sum5121010040) </State> 
 	<Button>
 	<State> $Sum5121010040 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano_pro_valentine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano_pro_valentine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano_pro_valentine.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano_pro_valentine.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-21-01-0040.Price
 		Var PriceD2 = $-.Price

inter/aus/xml/page_catalog_group_recommend_multi_pro.lxml

@@ -1934,13 +1934,13 @@
 	<State> Flag( 51-02-01-0039.Button,51-02-02-0039.Button,51-02-03-0039.Button,$Sum510201003951020200395102030039) </State> 
 	<Button>
 	<State> $Sum510201003951020200395102030039 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark_pro_valentine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark_pro_valentine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark_pro_valentine.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark_pro_valentine.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-02-01-0039.Price
 		Var PriceD2 = $51-02-02-0039.Price
@@ -2482,13 +2482,13 @@
 	<State> Flag( 51-01-01-0007.Button,51-01-02-0004.Button,51-01-03-0004.Button,$Sum510101000751010200045101030004) </State> 
 	<Button>
 	<State> $Sum510101000751010200045101030004 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_st_patrick.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_st_patrick.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_st_patrick.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_st_patrick.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-01-01-0007.Price
 		Var PriceD2 = $51-01-02-0004.Price
@@ -2756,13 +2756,13 @@
 	<State> Flag( 51-21-01-0007.Button,51-21-02-0004.Button,51-21-03-0004.Button,$Sum512101000751210200045121030004) </State> 
 	<Button>
 	<State> $Sum512101000751210200045121030004 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_hot_caramel_latte_st_patrick.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_hot_caramel_latte_st_patrick.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_hot_caramel_latte_st_patrick.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_hot_caramel_latte_st_patrick.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-21-01-0007.Price
 		Var PriceD2 = $51-21-02-0004.Price
@@ -4388,13 +4388,13 @@
 	<State> Flag( 51-01-01-0040.Button,$Sum5101010040) </State> 
 	<Button>
 	<State> $Sum5101010040 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano_pro_valentine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano_pro_valentine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano_pro_valentine.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano_pro_valentine.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-01-01-0040.Price
 		Var PriceD2 = $-.Price
@@ -4662,13 +4662,13 @@
 	<State> Flag( 51-21-01-0040.Button,$Sum5121010040) </State> 
 	<Button>
 	<State> $Sum5121010040 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano_pro_valentine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano_pro_valentine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano_pro_valentine.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_Yuzu_americano.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_Yuzu_americano.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_Yuzu_americano.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano_pro_valentine.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_Yuzu_americano.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-21-01-0040.Price
 		Var PriceD2 = $-.Price

inter/aus/xml/page_catalog_group_tea.lxml

@@ -1969,13 +1969,13 @@
 	<State> Flag( 51-02-01-0039.Button,51-02-02-0039.Button,51-02-03-0039.Button,$Sum510201003951020200395102030039) </State> 
 	<Button>
 	<State> $Sum510201003951020200395102030039 </State> 
-	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark_pro_valentine.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark_pro_valentine.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark_pro_valentine.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_thai_milk_tea_SingPark.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_thai_milk_tea_SingPark.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_thai_milk_tea_SingPark.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark_pro_valentine.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/aus/image/page_drink_picture2_n/" + "bn_thai_milk_tea_SingPark.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $51-02-01-0039.Price
 		Var PriceD2 = $51-02-02-0039.Price

inter/aus/xml/page_collect_point_3.lxml

@@ -980,39 +980,39 @@
 </EventClick>
 </Button>
 
-;<Button>
-;<X> 548 </X>
-;<Y> 1752 </Y>
-;<State> redeemButtonState </State>
-;<Filename> Var( DirImage + "/redeem_btn.png" )</Filename>
-;<FilenamePress> Var( DirImage + "/redeem_btn_pressed.png" )</FilenamePress>
-;<FilenameDisable> Var( DirImage + "/redeem_btn_disable.png" ) </FilenameDisable>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick>
-;	; goto lid straw
-;
-;	If CoffeePoint >= 10 Then
-;		Var RedeemType = "1_dollar"
-;	EndIf
-;
-;	If CoffeePoint >= 20 Then
-;		Var RedeemType = "2_dollar"
-;	EndIf
-;
-;	If CoffeePoint >= 30 Then
-;		Var RedeemType = "get_free"
-;	EndIf
-;
-;	DEBUGVAR RedeemType
-;
-;	If RedeemType = "" Then
-;		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-;	Else
-;		Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
-;	EndIf
-;</EventClick>
-;</Button>
+<Button>
+<X> 548 </X>
+<Y> 1752 </Y>
+<State> redeemButtonState </State>
+<Filename> Var( DirImage + "/redeem_btn.png" )</Filename>
+<FilenamePress> Var( DirImage + "/redeem_btn_pressed.png" )</FilenamePress>
+<FilenameDisable> Var( DirImage + "/redeem_btn_disable.png" ) </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	; goto lid straw
+
+	If CoffeePoint >= 10 Then
+		Var RedeemType = "1_dollar"
+	EndIf
+
+	If CoffeePoint >= 20 Then
+		Var RedeemType = "2_dollar"
+	EndIf
+
+	If CoffeePoint >= 30 Then
+		Var RedeemType = "get_free"
+	EndIf
+
+	DEBUGVAR RedeemType
+
+	If RedeemType = "" Then
+		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	Else
+		Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
+	EndIf
+</EventClick>
+</Button>
 
 
 

inter/aus/xml/page_member_topup.lxml

@@ -120,7 +120,7 @@
     If WaitQRPay = 1 Then
         If VendingExtResult = "" Then
         Else
-            Var PayCreditChannel = "fatzebra"
+            Var PayCreditChannel = "qr_code"
 
     		Var ToppupSuccessPage = CountryRootPath + "xml/page_member_topupSuccess.lxml"
     		Open ToppupSuccessPage
@@ -261,13 +261,12 @@
 <Button>
 <X> 287 </X>
 <Y> 778 </Y>
-<State> "Invisible" </State>
-<Filename> Var( DirImage2 + "/bn_fatzebra.png" ) </Filename>
-<FilenamePress> Var( DirImage2 + "/bp_fatzebra.png" ) </FilenamePress>
-<FilenameDisable> Var( DirImage2 + "/bd_fatzebra.png" ) </FilenameDisable>
+<Filename> Var( DirImage2 + "/bn_qr_code.png" ) </Filename>
+<FilenamePress> Var( DirImage2 + "/bp_qr_code.png" ) </FilenamePress>
+<FilenameDisable> Var( DirImage2 + "/bd_qr_code.png" ) </FilenameDisable>
 <EventOnClick>
     Var Timeout = 0
-    Var SelectedPaymentMedthod = "fatzebra"
+    Var SelectedPaymentMedthod = "qr_code"
     Var SelectOptionPopupState = "Enable"
     Var BlurBackgroundState = "Enable"
 </EventOnClick>
@@ -499,8 +498,8 @@
         EndIf
 	EndIf
 
-	If SelectedPaymentMedthod = "fatzebra" Then
-	   SAVELOG "Canceling fatzebra"
+	If SelectedPaymentMedthod = "qr_code" Then
+	   SAVELOG "Canceling qr_code"
 	   VendingQR OFF
 	EndIf
 
@@ -541,7 +540,7 @@
         Coin CARD
     EndIf
 
-    if SelectedPaymentMedthod = "fatzebra" Then
+    if SelectedPaymentMedthod = "qr_code" Then
         Var QR_POPUP = "/img_popup1-AUS.png"
         Var LOADING_TEXT = "Just Moment Please"
         Var LOADING_STATE = "Enable"

inter/aus/xml/page_topping_select6.lxml

@@ -1226,6 +1226,13 @@
 					; select no sugar
 					Var SugarZeroCalCheck = "Disable"
 				EndIf
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var SugarState4 = "Disable"
+
+				EndIf
 			EndIf
 
 			; Suger 4 step hot
@@ -1267,6 +1274,13 @@
 					; select no sugar
 					Var SugarZeroCalCheck = "Disable"
 				EndIf
+
+				; No 2 right steps
+				If NoSugarStepRight2 = "true" Then
+
+					Var SugarState4 = "Disable"
+
+				EndIf
 			EndIf
 
 			DEBUGVAR RecipeTag2
@@ -1324,9 +1338,11 @@
 				If NoSugarStepRight2 = "true" Then
 
 					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState4 = "Disable"
 						Var SugarState5 = "Disable"
 						Var SugarState6 = "Disable"
 					Else
+						Var SugarState4 = "Disable"
 						Var SugarState5 = "Disable"
 					EndIf
 
@@ -1392,9 +1408,11 @@
 				If NoSugarStepRight2 = "true" Then
 
 					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState4 = "Disable"
 						Var SugarState5 = "Disable"
 						Var SugarState6 = "Disable"
 					Else
+						Var SugarState4 = "Disable"
 						Var SugarState5 = "Disable"
 					EndIf
 
@@ -1451,9 +1469,11 @@
 				If NoSugarStepRight2 = "true" Then
 
 					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState4 = "Disable"
 						Var SugarState5 = "Disable"
 						Var SugarState6 = "Disable"
 					Else
+						Var SugarState4 = "Disable"
 						Var SugarState5 = "Disable"
 					EndIf
 
@@ -1506,9 +1526,11 @@
 				If NoSugarStepRight2 = "true" Then
 
 					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState4 = "Disable"
 						Var SugarState5 = "Disable"
 						Var SugarState6 = "Disable"
 					Else
+						Var SugarState4 = "Disable"
 						Var SugarState5 = "Disable"
 					EndIf
 
@@ -1564,9 +1586,11 @@
 				If NoSugarStepRight2 = "true" Then
 
 					If RecipeTag2 = "Topping6Step" Then
+						Var SugarState4 = "Disable"
 						Var SugarState5 = "Disable"
 						Var SugarState6 = "Disable"
 					Else
+						Var SugarState4 = "Disable"
 						Var SugarState5 = "Disable"
 					EndIf
 
@@ -2400,7 +2424,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -2464,7 +2489,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -2483,7 +2509,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -2546,7 +2573,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -2565,7 +2593,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -2626,7 +2655,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -2645,7 +2675,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -2662,7 +2693,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -2723,7 +2755,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -2742,7 +2775,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -2759,7 +2793,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -2820,7 +2855,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -2839,7 +2875,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -2856,7 +2893,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -2971,7 +3009,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 
 			EndIf
 
@@ -3035,7 +3074,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 
 			EndIf
 
@@ -3095,7 +3135,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 
 			EndIf
 
@@ -3156,7 +3197,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 
 			EndIf
 
@@ -3271,7 +3313,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 
 			EndIf
 
@@ -3336,7 +3379,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 
 			EndIf
 
@@ -3396,7 +3440,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 
 			EndIf
 
@@ -3456,7 +3501,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 
 			EndIf
 
@@ -3699,7 +3745,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -3771,7 +3818,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -3790,7 +3838,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -3866,7 +3915,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -3885,7 +3935,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -3960,7 +4011,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -3979,7 +4031,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -3996,7 +4049,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -4072,7 +4126,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -4091,7 +4146,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -4108,7 +4164,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -4173,7 +4230,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -4192,7 +4250,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -4209,7 +4268,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 				Var SugarState6 = "Disable"
 
 			EndIf
@@ -4436,7 +4496,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 
 			EndIf
 
@@ -4501,7 +4562,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 
 			EndIf
 
@@ -4565,7 +4627,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 
 			EndIf
 
@@ -4628,7 +4691,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 
 			EndIf
 
@@ -4856,7 +4920,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 
 			EndIf
 
@@ -4924,7 +4989,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 
 			EndIf
 
@@ -4987,7 +5053,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 
 			EndIf
 
@@ -5049,7 +5116,8 @@
 			; No 2 right steps
 			If NoSugarStepRight2 = "true" Then
 
-				Var SugarState5 = "Disable"
+				Var SugarState4 = "Disable"
+						Var SugarState5 = "Disable"
 
 			EndIf
 

inter/hkg/animation01/play_list.tsv

@@ -903,3 +903,10 @@ PEPSI MINT	54-05-02-0068
 7UP BANANA	12-05-02-0118	1	18	56	23	13					24	120	2:00	23
 7UP MELON	12-05-02-0119	1	18	52	23	13					24	120	2:00	23
 7UP PEACH	12-05-02-0120	1	18	60	23	12					24	120	2:00	23
+
+HOT GINGER MILK TEA	54-02-01-0053	1	6	70	10						24	120	2:00	23
+HOT GINGER YUZU TEA	54-02-01-0054	1	53								24	120	2:00	23
+HOT GINGER STRAWBERRY 7UP	54-02-01-0079	1	19	18							24	120	2:00	23
+HOT GINGER MILK TEA OREO SMOOTHIE	54-02-03-0056	1	6	70	10						24	120	2:00	23
+ICED SANTA GINGER	54-03-02-0081	1	6	70	22	10					24	120	2:00	23
+HOT GINGER CAFE LATTE	54-21-01-0061	1	2	3	4	5	6	70			24	120	2:00	23

inter/hkg/xml/page_brewing3.lxml

@@ -204,10 +204,6 @@
 		Var VendingTSID = ""
 	EndIf
 
-	If Seeker.VendingCode = "MKFOO" Then
-		Var AddData = 0
-	EndIf
-
 
 	If GetFreeFromError = 1 Then
 		;Var GetFreeFromError = 0
@@ -306,11 +302,6 @@
 		Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
 	EndIf
 
-	If Seeker.CreditCard = 1 Then
-		Var SelectMenuBetweenBrewEnable1Blink = "Enable"
-		Var SelectMenuBetweenBrewEnable1 = "Enable"
-	EndIf
-
 	If NeedUpgrade = "true" Then
 		Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"
@@ -321,9 +312,6 @@
 		Var SelectMenuBetweenBrewEnable1 = "Invisible"
 	EndIf
 
-	Var SelectMenuBetweenBrewEnable1Blink = "Invisible"
-	Var SelectMenuBetweenBrewEnable1 = "Invisible"
-
 	DEBUGVAR NeedUpgrade
 	DEBUGVAR NeedReboot
 
@@ -444,8 +432,6 @@
 		Var XPercent = 0
 	EndIf
 
-	CashlessReq SUCCESS ""
-
 </EventOpen>
 <EventLanguageOnChange>
 	Var XPosiShowCountDownBrew = 768

inter/hkg/xml/page_brewing3Conti.xml

@@ -130,33 +130,6 @@
 		Var VendingTSIDTmp1 = ""
 	EndIf
 
-	If Seeker.VendingCode = "MKFOO" Then
-		Var AddData = 0
-	EndIf 
-
-	If MyMintEnable = 1 Then
-		If FromMyMintPro = 1 Then
-			Var AddData = 0
-		EndIf
-	EndIf
-
-	If ProBadValentineEnable = 1 Then
-		If FromBadValentinePro = 1 Then
-			Var AddData = 0
-		EndIf
-	EndIf
-
-	If LipitPro = 1 Then
-		If FromLipitPro = 1 Then
-			If Seeker.CodeChannel = 1 Then
-				If Seeker.CollectPointMain = 1 Then
-				Else
-					Var AddData = 0
-				EndIf
-			EndIf
-		EndIf
-	EndIf
-
 	If LedLidBlink = "true" Then
 		Var LedLidBlink = "no"
 		LED LedDoorLid Blink 255 255 255 255
@@ -178,10 +151,6 @@
 	Var StrawStateX = "Invisible"
 	Var LidStateX = "Invisible"
 
-	If Seeker.CreditCard = 1 Then
-		Var EnableSelectMenuBetweenBrew = "Invisible"  
-	EndIf
-
 	Var CreditCardVoid = 0
 
 	DEBUGVAR ButtonGameCountDownState

inter/hkg/xml/page_catalog_group_coffee.lxml

@@ -690,6 +690,280 @@
 	 Var block_index_move = 0
 </Script>
 ;dummy_layout.inc
+	; ==================> Len = 3
+	; 54-21-01-0061 54-21-02-0061 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 54-21-01-0061.Button,54-21-02-0061.Button,$Sum54210100615421020061) </State> 
+	<Button>
+	<State> $Sum54210100615421020061 </State> 
+	<Filename> "ROOT/taobin_project/inter/hkg/image/page_drink_n//bn_ginger_cafe_latte.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/hkg/image/page_drink_press_n//bn_ginger_cafe_latte.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/hkg/image/page_drink_disable_n2//bn_ginger_cafe_latte.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/hkg/image/page_drink_picture2_n/" + "bn_ginger_cafe_latte.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $54-21-01-0061.Price
+		Var PriceD2 = $54-21-02-0061.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "54-21-01-0061"
+		Var PD_CODE2 = "54-21-02-0061"
+		Var PD_CODE3 = "##-##-##-####"
+		; begin lang 
+		Var aliasName[0] = "GINGER CAFE LATTE"
+		Var aliasDesc[0] = "Espresso, Milk, Ginger"
+		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 VANILLA CARAMEL latte (s)"
+		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 VANILLA CARAMEL latte (s)"
+		Var NameLang[1][1] = "冰香草焦糖拿铁咖啡"
+		Var NameLang[1][2] = "冰雲呢拿焦糖拿鐵咖啡"
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = ""
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = ""
+		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 = $54-21-01-0061.Button
+		Var PD_STAGE_2 = $54-21-02-0061.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" "54-21-02-0061"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "54-21-01-0061"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 22 </Size>
+	<Width>222</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>GINGER CAFE LATTE</LanguageSlot1>
+		<LanguageSlot2>กาแฟขิงลาเต้</LanguageSlot2>
+		<LanguageSlot3>GINGER CAFE LATTE</LanguageSlot3>
+		<LanguageSlot4>กาแฟขิงลาเต้</LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6>กาแฟขิงลาเต้</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>222</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Espresso, Milk, Ginger</LanguageSlot1>
+		<LanguageSlot2>กาแฟ น้ำ นม ขิง</LanguageSlot2>
+		<LanguageSlot3>Espresso, Milk, Ginger</LanguageSlot3>
+		<LanguageSlot4>กาแฟ น้ำ นม ขิง</LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6>กาแฟ น้ำ นม ขิง</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> $54-21-01-0061.Button </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> TextPriceMenuHotX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $54-21-01-0061.Button </State>
+	<Value> StringFmt(  $54-21-01-0061.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $54-21-02-0061.Button </State>
+	</Image>
+	<Text>
+	<X> 113 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $54-21-02-0061.Button </State>
+	<Value> StringFmt( $54-21-02-0061.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> TextPriceMenuBlendX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum54210100615421020061 = "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
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum54210100615421020061 = "Disable" Then
+				STRCONTAIN "ERR" $54-21-01-0061.TAG tag1_is_disable
+				STRCONTAIN "ERR" $54-21-02-0061.TAG tag2_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum54210100615421020061 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
 	; ==================> Len = 3
 	; 54-01-01-0001 - - 
 <Block>

inter/hkg/xml/page_catalog_group_milk.lxml

@@ -6400,6 +6400,276 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 3
+	; - 54-03-02-0081 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 54-03-02-0081.Button,$Sum5403020081) </State> 
+	<Button>
+	<State> $Sum5403020081 </State> 
+	<Filename> "ROOT/taobin_project/inter/hkg/image/page_drink_n//bn_santa_ginger.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/hkg/image/page_drink_press_n//bn_santa_ginger.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/hkg/image/page_drink_disable_n2//bn_santa_ginger.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/hkg/image/page_drink_picture2_n/" + "bn_santa_ginger.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $54-03-02-0081.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "54-03-02-0081"
+		Var PD_CODE3 = "##-##-##-####"
+		; begin lang 
+		Var aliasName[0] = "ICED  SANTA GINGER"
+		Var aliasDesc[0] = "GINGER , MILK, CARAMEL SYRUP AND WATER"
+		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] = ""
+		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  SANTA GINGER"
+		Var NameLang[1][1] = ""
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = ""
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = "GINGER , MILK, CARAMEL SYRUP AND WATER"
+		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 = $54-03-02-0081.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" "54-03-02-0081"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 22 </Size>
+	<Width>222</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>ICED  SANTA GINGER</LanguageSlot1>
+		<LanguageSlot2>ซานต้าจินเจอร์</LanguageSlot2>
+		<LanguageSlot3>ICED  SANTA GINGER</LanguageSlot3>
+		<LanguageSlot4>ซานต้าจินเจอร์</LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6>ซานต้าจินเจอร์</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>222</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>GINGER , MILK, CARAMEL SYRUP AND WATER</LanguageSlot1>
+		<LanguageSlot2>ขิง นม น้ำเชื่อมคาราเมล และน้ำ</LanguageSlot2>
+		<LanguageSlot3>GINGER , MILK, CARAMEL SYRUP AND WATER</LanguageSlot3>
+		<LanguageSlot4>ขิง นม น้ำเชื่อมคาราเมล และน้ำ</LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6>ขิง นม น้ำเชื่อมคาราเมล และน้ำ</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> "Invisible" </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> TextPriceMenuHotX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $54-03-02-0081.Button </State>
+	</Image>
+	<Text>
+	<X> 113 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $54-03-02-0081.Button </State>
+	<Value> StringFmt( $54-03-02-0081.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> TextPriceMenuBlendX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			Var ice_tab_process_show = "Invisible"
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum5403020081 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $54-03-02-0081.TAG tag2_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum5403020081 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; ==================> Len = 3
 	; - - 54-03-03-0034 

inter/hkg/xml/page_catalog_group_tea.lxml

@@ -1513,6 +1513,824 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 3
+	; 54-02-01-0053 54-02-02-0053 54-02-03-0053 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 54-02-01-0053.Button,54-02-02-0053.Button,54-02-03-0053.Button,$Sum540201005354020200535402030053) </State> 
+	<Button>
+	<State> $Sum540201005354020200535402030053 </State> 
+	<Filename> "ROOT/taobin_project/inter/hkg/image/page_drink_n//bn_Ginger_milk_tea.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/hkg/image/page_drink_press_n//bn_Ginger_milk_tea.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/hkg/image/page_drink_disable_n2//bn_Ginger_milk_tea.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/hkg/image/page_drink_picture2_n/" + "bn_Ginger_milk_tea.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $54-02-01-0053.Price
+		Var PriceD2 = $54-02-02-0053.Price
+		Var PriceD3 = $54-02-03-0053.Price
+		Var PD_CODE1 = "54-02-01-0053"
+		Var PD_CODE2 = "54-02-02-0053"
+		Var PD_CODE3 = "54-02-03-0053"
+		; begin lang 
+		Var aliasName[0] = "GINGER MILK TEA"
+		Var aliasDesc[0] = "Ginger, Taiwanese tea, 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 GINGER 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] = "Ginger, Taiwanese tea, 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 GINGER 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] = "Ginger, Taiwanese tea, 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] = "GINGER 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] = "Ginger, Taiwanese tea, 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 = $54-02-01-0053.Button
+		Var PD_STAGE_2 = $54-02-02-0053.Button
+		Var PD_STAGE_3 = $54-02-03-0053.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" "54-02-02-0053"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "54-02-01-0053"
+			Else
+			Topping "Load" "54-02-03-0053"
+			EndIf
+		EndIf
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 22 </Size>
+	<Width>222</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>GINGER MILK TEA</LanguageSlot1>
+		<LanguageSlot2>ชานมขิง</LanguageSlot2>
+		<LanguageSlot3>GINGER MILK TEA</LanguageSlot3>
+		<LanguageSlot4>ชานมขิง</LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6>ชานมขิง</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>222</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Ginger, Taiwanese tea, Milk</LanguageSlot1>
+		<LanguageSlot2>ชาไต้หวัน นม ขิง</LanguageSlot2>
+		<LanguageSlot3>Ginger, Taiwanese tea, Milk</LanguageSlot3>
+		<LanguageSlot4>ชาไต้หวัน นม ขิง</LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6>ชาไต้หวัน นม ขิง</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> $54-02-01-0053.Button </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> TextPriceMenuHotX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $54-02-01-0053.Button </State>
+	<Value> StringFmt(  $54-02-01-0053.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $54-02-02-0053.Button </State>
+	</Image>
+	<Text>
+	<X> 113 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $54-02-02-0053.Button </State>
+	<Value> StringFmt( $54-02-02-0053.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> $54-02-03-0053.Button </State>
+	</Image>
+	<Text>
+	<X> TextPriceMenuBlendX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $54-02-03-0053.Button </State>
+	<Value> StringFmt(  $54-02-03-0053.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum540201005354020200535402030053 = "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
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum540201005354020200535402030053 = "Disable" Then
+				STRCONTAIN "ERR" $54-02-01-0053.TAG tag1_is_disable
+				STRCONTAIN "ERR" $54-02-02-0053.TAG tag2_is_disable
+				STRCONTAIN "ERR" $54-02-03-0053.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum540201005354020200535402030053 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; ==================> Len = 3
+	; 54-02-01-0054 54-02-02-0054 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 54-02-01-0054.Button,54-02-02-0054.Button,$Sum54020100545402020054) </State> 
+	<Button>
+	<State> $Sum54020100545402020054 </State> 
+	<Filename> "ROOT/taobin_project/inter/hkg/image/page_drink_n//bn_hot_GINGER_Yuzu_tea.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/hkg/image/page_drink_press_n//bn_hot_GINGER_Yuzu_tea.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/hkg/image/page_drink_disable_n2//bn_hot_GINGER_Yuzu_tea.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/hkg/image/page_drink_picture2_n/" + "bn_hot_GINGER_Yuzu_tea.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $54-02-01-0054.Price
+		Var PriceD2 = $54-02-02-0054.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "54-02-01-0054"
+		Var PD_CODE2 = "54-02-02-0054"
+		Var PD_CODE3 = "##-##-##-####"
+		; begin lang 
+		Var aliasName[0] = "GINGER YUZU TEA"
+		Var aliasDesc[0] = "Ginger, Yuzu, Water"
+		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] = "GINGER YUZU 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] = "Ginger, Yuzu, Water"
+		Var DescLang[0][1] = ""
+		Var DescLang[0][2] = ""
+		Var DescLang[0][3] = ""
+		Var DescLang[0][4] = ""
+		Var DescLang[0][5] = ""
+		Var NameLang[1][0] = "GINGER YUZU 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] = "Ginger, Yuzu, Water"
+		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 = $54-02-01-0054.Button
+		Var PD_STAGE_2 = $54-02-02-0054.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" "54-02-02-0054"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "54-02-01-0054"
+			Else
+			Topping "Load" "-"
+			EndIf
+		EndIf
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 22 </Size>
+	<Width>222</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>GINGER YUZU TEA</LanguageSlot1>
+		<LanguageSlot2>ชาขิงยูซุ</LanguageSlot2>
+		<LanguageSlot3>GINGER YUZU TEA</LanguageSlot3>
+		<LanguageSlot4>ชาขิงยูซุ</LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6>ชาขิงยูซุ</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>222</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Ginger, Yuzu, Water</LanguageSlot1>
+		<LanguageSlot2>ขิง น้ำเชื่อมยูซุ</LanguageSlot2>
+		<LanguageSlot3>Ginger, Yuzu, Water</LanguageSlot3>
+		<LanguageSlot4>ขิง น้ำเชื่อมยูซุ</LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6>ขิง น้ำเชื่อมยูซุ</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> $54-02-01-0054.Button </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> TextPriceMenuHotX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $54-02-01-0054.Button </State>
+	<Value> StringFmt(  $54-02-01-0054.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> $54-02-02-0054.Button </State>
+	</Image>
+	<Text>
+	<X> 113 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $54-02-02-0054.Button </State>
+	<Value> StringFmt( $54-02-02-0054.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> TextPriceMenuBlendX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum54020100545402020054 = "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
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum54020100545402020054 = "Disable" Then
+				STRCONTAIN "ERR" $54-02-01-0054.TAG tag1_is_disable
+				STRCONTAIN "ERR" $54-02-02-0054.TAG tag2_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum54020100545402020054 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+	; ==================> Len = 3
+	; - - 54-02-03-0056 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 54-02-03-0056.Button,$Sum5402030056) </State> 
+	<Button>
+	<State> $Sum5402030056 </State> 
+	<Filename> "ROOT/taobin_project/inter/hkg/image/page_drink_n//bn_Ginger_Milk_Oreo_smoothie.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/hkg/image/page_drink_press_n//bn_Ginger_Milk_Oreo_smoothie.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/hkg/image/page_drink_disable_n2//bn_Ginger_Milk_Oreo_smoothie.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/hkg/image/page_drink_picture2_n/" + "bn_Ginger_Milk_Oreo_smoothie.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $-.Price
+		Var PriceD3 = $54-02-03-0056.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "##-##-##-####"
+		Var PD_CODE3 = "54-02-03-0056"
+		; begin lang 
+		Var aliasName[0] = "GINGER MILK TEA\nOREO SMOOTHIE"
+		Var aliasDesc[0] = "Ginger, Milk, Oreo"
+		Var aliasName[1] = "ชานมขิงโอริโอ้ปั่น"
+		Var aliasDesc[1] = "ขิง นม Oreo"
+		Var aliasName[2] = "-"
+		Var aliasDesc[2] = "-"
+		Var aliasName[3] = "-"
+		Var aliasDesc[3] = "-"
+		Var aliasName[4] = "TEH SUSU HALIA\nOREO SMOOTHIE"
+		Var aliasDesc[4] = "Ginger, Milk, Oreo"
+		Var aliasName[5] = ""
+		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] = ""
+		Var NameLang[1][1] = ""
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = ""
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = ""
+		Var DescLang[1][1] = ""
+		Var DescLang[1][2] = ""
+		Var DescLang[1][3] = ""
+		Var DescLang[1][4] = ""
+		Var DescLang[1][5] = ""
+		Var NameLang[2][0] = "GINGER MILK TEA\nOREO 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] = "Ginger, Milk, Oreo"
+		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 = "Disable2"
+		Var PD_STAGE_3 = $54-02-03-0056.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" "-"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "-"
+			Else
+			Topping "Load" "54-02-03-0056"
+			EndIf
+		EndIf
+		
+		DEBUGVAR PD_STAGE_1
+		DEBUGVAR PD_STAGE_2
+		DEBUGVAR PD_STAGE_3
+		Var SelectDrinkType = 0
+		
+		
+		Open "ROOT/taobin_project/xml/page_topping_select6.lxml"
+		
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X>  16   </X>
+	<Y>  164  </Y>
+	<Size> 22 </Size>
+	<Width>222</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>GINGER MILK TEA\nOREO SMOOTHIE</LanguageSlot1>
+		<LanguageSlot2>ชานมขิงโอริโอ้ปั่น</LanguageSlot2>
+		<LanguageSlot3>GINGER MILK TEA\nOREO SMOOTHIE</LanguageSlot3>
+		<LanguageSlot4>ชานมขิงโอริโอ้ปั่น</LanguageSlot4>
+		<LanguageSlot5>TEH SUSU HALIA\nOREO SMOOTHIE</LanguageSlot5>
+		<LanguageSlot6>ชานมขิงโอริโอ้ปั่น</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 220 </Y>
+	<Size> 14 </Size>
+	<Width>222</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<LanguageGroup>
+		<LanguageSlot1>Ginger, Milk, Oreo</LanguageSlot1>
+		<LanguageSlot2>ขิง นม Oreo</LanguageSlot2>
+		<LanguageSlot3>Ginger, Milk, Oreo</LanguageSlot3>
+		<LanguageSlot4>ขิง นม Oreo</LanguageSlot4>
+		<LanguageSlot5>Ginger, Milk, Oreo</LanguageSlot5>
+		<LanguageSlot6>ขิง นม Oreo</LanguageSlot6>
+	</LanguageGroup>
+	</Text>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
+	</Image>
+	<Image>
+	<X> 16 </X>
+	<Y> 264 </Y>
+	<State> "Invisible" </State>
+	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
+	</Image>
+	<Text>
+	<X> TextPriceMenuHotX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
+	<State> "Invisible" </State>
+	</Image>
+	<Text>
+	<X> 113 </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> "Invisible" </State>
+	<Value> StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 146 </X>
+	<Y> 264 </Y>
+	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<State> $54-02-03-0056.Button </State>
+	</Image>
+	<Text>
+	<X> TextPriceMenuBlendX </X>
+	<Y> TextPriceMenuY </Y>
+	<Size> TextPriceMenuSize </Size>
+	<Width>220</Width>
+	<Font> KanitRegularTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<ColorDisable> 0xEAE6E1 </ColorDisable>
+	<State> $54-02-03-0056.Button </State>
+	<Value> StringFmt(  $54-02-03-0056.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			Var ice_tab_process_show = "Invisible"
+		
+		Else
+			Var ice_tab_process_show = "Invisible"
+		EndIf
+		Var return = ice_tab_process_show
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" </Filename>
+	<FilenameDisable> "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" </FilenameDisable>
+	</Image>
+	<Image>
+	<X> 49 </X>
+	<Y> 117 </Y>
+	<State> 
+		eval( 
+			If $Sum5402030056 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
+				STRCONTAIN "ERR" $54-02-03-0056.TAG tag3_is_disable
+				Var return = "Invisible"
+				If tag1_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag2_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+				If tag3_is_disable = "true" Then
+					Var return = "Enable"
+				EndIf
+			Else
+					Var return = "Invisible"
+			EndIf
+		)
+	</State>
+	<Filename> "ROOT/taobin_project/image//img_menu_err2.png" </Filename>
+	</Image>
+	<Text>
+	<X> 84 </X>
+	<Y> 266 </Y>
+	<Size> 10 </Size>
+	<Font> OpunMediumTTF </Font>
+	<Color> 0xDE794E </Color>
+	<State> ice_tab_process_show </State>
+	<Value> ice_show_open </Value>
+	</Text>
+	<Text>
+	<X> 48 </X>
+	<Y> 116 </Y>
+	<Size> 32 </Size>
+	<Width>128</Width>
+	<Height>64</Height>
+	<Mode> "disable-show" </Mode>
+	<State> $Sum5402030056 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; ==================> Len = 3
 	; 54-02-01-0017 54-05-02-0027 54-05-03-0027 

inter/tha/.special/RoadShow.ev

@@ -1,5 +1,7 @@
 
-SAVELOG "RoadShow.ev 200435 201316 173319 08 Feb "
+SAVELOG "RoadShow.ev 201316 201494 01 Mar "
+SAVELOG "200435 28 feb"
+
 
 Var RoadShow = "false"
 
@@ -17,16 +19,23 @@ If SystemDateYearInt = 2025 Then
 		Var RoadShowBoxID = 1
 	EndIf
 	If BoxID = 200435 Then
-		Var RoadShowBoxID = 1
-	EndIf
-	If BoxID = 173319 Then
-		Var RoadShowBoxID = 1
+		Var RoadShowBoxID = 2
 	EndIf
 	
 	If SystemDateMonthInt = 2 Then
 
+		If RoadShowBoxID = 2 Then
+			If SystemDateDayInt = 28 Then
+				Var RoadShow = "true"
+			EndIf
+		EndIf
+
+	EndIf
+	
+	If SystemDateMonthInt = 3 Then
+
 		If RoadShowBoxID = 1 Then
-			If SystemDateDayInt = 8 Then
+			If SystemDateDayInt = 1 Then
 				Var RoadShow = "true"
 			EndIf
 		EndIf

inter/tha/animation01/play_list.tsv

@@ -1277,6 +1277,14 @@ Turtle of BKK	11-99-05-0047	1	27	28							24	100	5:40	32
 TAO Island Beach	11-99-05-0048	1	27	28							24	100	6:40	32
 Yuzu Fizzy	11-99-05-0049	1	27	28							24	100	7:40	32
 
+Glenfiddich Highball	11-99-05-0050	1	27	28							24	100	7:40	32
+Glenfiddich Mizuwari	11-99-05-0051	1	27	28							24	100	7:40	32
+Balvenie Highball	11-99-05-0052	1	27	28							24	100	7:40	32
+Balvenie Mizuwari	11-99-05-0053	1	27	28							24	100	7:40	32
+Macallan Lumina Highball	11-99-05-0054	1	27	28							24	100	7:40	32
+Macallan Lumina Mizuwari	11-99-05-0055	1	27	28							24	100	7:40	32
+
+
 กาแฟชานมไต้หวันร้อน	12-01-01-0030	1	2	3	4	5	10				24	100	7:40	32
 กาแฟชานมไต้หวันเย็น	12-01-02-0030	1	2	3	4	5	10	23			24	100	7:40	32
 กาแฟชานมไต้หวันปั่น	12-01-03-0030	1	2	3	4	5	10	23	41		24	100	7:40	32
@@ -1294,3 +1302,13 @@ Yuzu Fizzy	11-99-05-0049	1	27	28							24	100	7:40	32
 เก๊กฮวยเย็น	12-02-02-0066	1	23								24	100	7:40	32
 เก๊กฮวยปั่น	12-02-03-0066	1	23	41							24	100	7:40	32
 เก๊กฮวยนมเย็น	12-02-02-0090	1	6	70	23						24	100	7:40	32
+
+เต่าบินไอติมถังกะทิ	12-03-03-0103	1	62	6	70	23	41				24	100	7:40	32
+เต่าบินไอติมถังสตรอเบอรี	12-03-03-0104	1	62	6	70	19	23	41			24	100	7:40	32
+เต่าบินไอติมถังโกโก้	12-03-03-0105	1	62	6	70	15	23	41			24	100	7:40	32
+เต่าบินไอติมถังมัทฉะญี่ปุ่น	12-03-03-0106	1	62	6	70	8	9	23	41		24	100	7:40	32
+เต่าบินไอติมถังกาแฟ	12-01-03-0090	1	2	3	4	5	62	70	23	41	24	100	7:40	32
+เต่าบินไอติมถังกาแฟ	12-21-03-0090	1	2	3	4	5	62	70	23	41	24	100	7:40	32
+
+โอเลี้ยงเย็น	12-01-02-0090	1	2	3	4	22	15	23			24	100	7:40	32
+โอเลี้ยงเย็น	12-21-02-0090	1	2	3	4	22	15	23			24	100	7:40	32

inter/tha/hardware/powder_schedule.ev

@@ -12,7 +12,7 @@ If PowderPayPushLowScheduleTurnOn10 = "1" Then
     Var PowderPayPushLowScheduleTurnOn10 = 1
 EndIf
 
-If PowderPayPushLowScheduleTurnOn10 = 1 Then
+If PowderPayPushLowScheduleTurnOn10 = 99 Then
     If SystemTimeHourInt = 3 Then
         If SystemTimeMinuteInt = 30 Then
             ; idle 

inter/tha/menu/lang.tsv

@@ -378,8 +378,14 @@
 800121		Current	กระแสไฟฟ้า			Current
 800122		Soda	โซดา			Soda
 800123		Start Defrost. Wait check	ละลายน้ำแข็ง			Start Defrost
-
-
+800124		Start Agitator soda	หมุนมอเตอร์คนโซดา			Start Agitator soda
+800125		Stop Agitator soda	หยุดมอเตอร์คนโซดา			Stop Agitator soda
+800126		Start/Stop Agitator soda	หมุน/หยุดมอเตอร์คนโซดา			Start/Stop Agitator soda
+800127		Stop	หยุด			Stop
+800128		Low Speed	หมุนช้า			Low Speed
+800129		Hight Speed	หมุนเร็ว			Hight Speed
+800130		Compressor fan speed control	ควบคุมพัลดคอมเพสเซอร์			Compressor fan speed control
+800131
 
 
 	Test

inter/tha/xml/multi/page_catalog_group_appfast.lxml

@@ -170,10 +170,10 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
 		Var aliasName[5] = "အက်ပ်အမြန် မူရင်း"
-		Var aliasDesc[5] = "မရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း"
+		Var aliasDesc[5] = "\nမရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -191,13 +191,13 @@
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
 		Var NameLang[1][4] = "-"
-		Var NameLang[1][5] = "ICE အက်ပ် အမြန် မူရင်း"
+		Var NameLang[1][5] = "-"
 		Var DescLang[1][0] = "Plant-Based Protein with \nEssential nutrients"
 		Var DescLang[1][1] = "โปรตีนจากพืชคุณภาพสูง \nพร้อมสารอาหารที่มีประโยชน์"
 		Var DescLang[1][2] = "-"
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
-		Var DescLang[1][5] = "မရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း"
+		Var DescLang[1][5] = "-"
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
@@ -294,7 +294,7 @@
 		<LanguageSlot2>แอพ ฟาสท์ \nวานิลลา (Original)</LanguageSlot2>
 		<LanguageSlot3>App Fast Original</LanguageSlot3>
 		<LanguageSlot4>แอพ ฟาสท์ \nวานิลลา (Original)</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>-</LanguageSlot5>
 		<LanguageSlot6>အက်ပ်အမြန် မူရင်း</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -310,8 +310,8 @@
 		<LanguageSlot2>โปรตีนจากพืชคุณภาพสูง \nพร้อมสารอาหารที่มีประโยชน์</LanguageSlot2>
 		<LanguageSlot3>Plant-Based Protein with \nEssential nutrients</LanguageSlot3>
 		<LanguageSlot4>โปรตีนจากพืชคุณภาพสูง \nพร้อมสารอาหารที่มีประโยชน์</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>မရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>\nမရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>
@@ -525,10 +525,10 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var aliasName[5] = "အမြန် ESPRESSO အက်ပ်"
-		Var aliasDesc[5] = "မရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "App အမြန် Espresso"
+		Var aliasDesc[5] = "\nမရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -546,13 +546,13 @@
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
 		Var NameLang[1][4] = "-"
-		Var NameLang[1][5] = "ရေခဲအက်ပလီကေးရှင်း အမြန် ESPRESSO"
+		Var NameLang[1][5] = "-"
 		Var DescLang[1][0] = "Plant-Based Protein with \nEssential nutrients"
 		Var DescLang[1][1] = "โปรตีนจากพืชคุณภาพสูง \nพร้อมสารอาหารที่มีประโยชน์"
 		Var DescLang[1][2] = "-"
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
-		Var DescLang[1][5] = "မရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း"
+		Var DescLang[1][5] = "-"
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
@@ -649,8 +649,8 @@
 		<LanguageSlot2>แอพ ฟาสท์ กาแฟ</LanguageSlot2>
 		<LanguageSlot3>App Fast Espresso</LanguageSlot3>
 		<LanguageSlot4>แอพ ฟาสท์ กาแฟ</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>အမြန် ESPRESSO အက်ပ်</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>App အမြန် Espresso</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -665,8 +665,8 @@
 		<LanguageSlot2>โปรตีนจากพืชคุณภาพสูง \nพร้อมสารอาหารที่มีประโยชน์</LanguageSlot2>
 		<LanguageSlot3>Plant-Based Protein with \nEssential nutrients</LanguageSlot3>
 		<LanguageSlot4>โปรตีนจากพืชคุณภาพสูง \nพร้อมสารอาหารที่มีประโยชน์</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>မရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>\nမရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>
@@ -880,10 +880,10 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
 		Var aliasName[5] = "အက်ပ်အမြန် \nချောကလက်"
-		Var aliasDesc[5] = "မရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း"
+		Var aliasDesc[5] = "\nမရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -901,13 +901,13 @@
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
 		Var NameLang[1][4] = "-"
-		Var NameLang[1][5] = "ရေခဲအက်ပ် အမြန် \nချောကလက်"
+		Var NameLang[1][5] = "-"
 		Var DescLang[1][0] = "Plant-Based Protein with \nEssential nutrients"
 		Var DescLang[1][1] = "โปรตีนจากพืชคุณภาพสูง \nพร้อมสารอาหารที่มีประโยชน์"
 		Var DescLang[1][2] = "-"
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
-		Var DescLang[1][5] = "မရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း"
+		Var DescLang[1][5] = "-"
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
@@ -1004,7 +1004,7 @@
 		<LanguageSlot2>แอพ ฟาสท์ ช็อกโก</LanguageSlot2>
 		<LanguageSlot3>App Fast \nChocolate</LanguageSlot3>
 		<LanguageSlot4>แอพ ฟาสท์ ช็อกโก</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>-</LanguageSlot5>
 		<LanguageSlot6>အက်ပ်အမြန် \nချောကလက်</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -1020,8 +1020,8 @@
 		<LanguageSlot2>โปรตีนจากพืชคุณภาพสูง \nพร้อมสารอาหารที่มีประโยชน์</LanguageSlot2>
 		<LanguageSlot3>Plant-Based Protein with \nEssential nutrients</LanguageSlot3>
 		<LanguageSlot4>โปรตีนจากพืชคุณภาพสูง \nพร้อมสารอาหารที่มีประโยชน์</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>မရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>\nမရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>
@@ -1235,10 +1235,10 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var aliasName[5] = "အက်ပ်အမြန် \nTHAI TEA"
-		Var aliasDesc[5] = "မရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "အက်ပ်အမြန် \nထိုင်းလက်ဖက်ရည်"
+		Var aliasDesc[5] = "\nမရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -1256,13 +1256,13 @@
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
 		Var NameLang[1][4] = "-"
-		Var NameLang[1][5] = "ရေခဲအက်ပ် အမြန် \nTHAI လက်ဖက်ရည်"
+		Var NameLang[1][5] = "-"
 		Var DescLang[1][0] = "Plant-Based Protein with \nEssential nutrients"
 		Var DescLang[1][1] = "โปรตีนจากพืชคุณภาพสูง \nพร้อมสารอาหารที่มีประโยชน์"
 		Var DescLang[1][2] = "-"
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
-		Var DescLang[1][5] = "မရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း"
+		Var DescLang[1][5] = "-"
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
@@ -1359,8 +1359,8 @@
 		<LanguageSlot2>แอพ ฟาสท์ ชาไทย</LanguageSlot2>
 		<LanguageSlot3>App Fast \nThai Tea</LanguageSlot3>
 		<LanguageSlot4>แอพ ฟาสท์ ชาไทย</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>အက်ပ်အမြန် \nTHAI TEA</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>အက်ပ်အမြန် \nထိုင်းလက်ဖက်ရည်</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -1375,8 +1375,8 @@
 		<LanguageSlot2>โปรตีนจากพืชคุณภาพสูง \nพร้อมสารอาหารที่มีประโยชน์</LanguageSlot2>
 		<LanguageSlot3>Plant-Based Protein with \nEssential nutrients</LanguageSlot3>
 		<LanguageSlot4>โปรตีนจากพืชคุณภาพสูง \nพร้อมสารอาหารที่มีประโยชน์</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>မရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>\nမရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>
@@ -1590,10 +1590,10 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var aliasName[5] = "အက်ပ်အမြန် \nMATCHA"
-		Var aliasDesc[5] = "မရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "အက်ပ်အမြန် \nMatcha"
+		Var aliasDesc[5] = "\nမရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -1611,13 +1611,13 @@
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
 		Var NameLang[1][4] = "-"
-		Var NameLang[1][5] = "ရေခဲအက်ပ် အမြန် \nMATCHA"
+		Var NameLang[1][5] = "-"
 		Var DescLang[1][0] = "Plant-Based Protein with \nEssential nutrients"
 		Var DescLang[1][1] = "โปรตีนจากพืชคุณภาพสูง \nพร้อมสารอาหารที่มีประโยชน์"
 		Var DescLang[1][2] = "-"
 		Var DescLang[1][3] = "-"
 		Var DescLang[1][4] = "-"
-		Var DescLang[1][5] = "မရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း"
+		Var DescLang[1][5] = "-"
 		Var NameLang[2][0] = ""
 		Var NameLang[2][1] = ""
 		Var NameLang[2][2] = ""
@@ -1714,8 +1714,8 @@
 		<LanguageSlot2>แอพ ฟาสท์ ชาเขียว</LanguageSlot2>
 		<LanguageSlot3>App Fast \nMatcha</LanguageSlot3>
 		<LanguageSlot4>แอพ ฟาสท์ ชาเขียว</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>အက်ပ်အမြန် \nMATCHA</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>အက်ပ်အမြန် \nMatcha</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -1730,8 +1730,8 @@
 		<LanguageSlot2>โปรตีนจากพืชคุณภาพสูง \nพร้อมสารอาหารที่มีประโยชน์</LanguageSlot2>
 		<LanguageSlot3>Plant-Based Protein with \nEssential nutrients</LanguageSlot3>
 		<LanguageSlot4>โปรตีนจากพืชคุณภาพสูง \nพร้อมสารอาหารที่มีประโยชน์</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>မရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>\nမရှိမဖြစ်လိုအပ်သောအာဟာရများပါရှိသော အပင်အခြေခံပရိုတင်း</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>

inter/tha/xml/multi/page_catalog_group_deep_fryer.skt

@@ -0,0 +1,91 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"    
+
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
+
+    SetInstanceIgnoreTouch
+</EventOpen>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+    ;DEBUGVAR ICE_PROCESS_STATUS
+
+    If ICE_PROCESS_STATUS = 2 Then
+        Var ice_tab_process_show = "Enable"
+        Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+    Else
+        Var ice_tab_process_show = "Invisible"
+    EndIf
+
+
+    
+
+    GetVisible inst_show
+    ;DEBUGVAR inst_show
+
+    InstanceGetString SaveStringInst
+    ;DEBUGVAR SaveStringInst
+
+    If inst_show = 1 Then
+        If SaveStringInst = "RefreshNow" Then
+            GetXMLFileNameCurrentRunning CurrentOpenFile
+            Open CurrentOpenFile
+
+            If show_eng = "true" Then 
+                InstanceSetString "ShowEng"
+            Else
+                InstanceSetString "ShowThai"
+            EndIf
+       
+        EndIf
+    EndIf
+
+    ; setvarint SlientRefreshEnable 1
+    ;DEBUGVAR SlientRefreshEnable
+
+    If SlientRefreshEnable = 1 Then
+        If SaveStringInst = "RefreshNow" Then
+            GetXMLFileNameCurrentRunning CurrentOpenFile
+            Open CurrentOpenFile
+
+            If show_eng = "true" Then 
+                InstanceSetString "ShowEng"
+            Else
+                InstanceSetString "ShowThai"
+            EndIf
+       
+        EndIf
+    EndIf
+
+    TimerReset
+</EventTimeout>
+
+;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml"
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+</Popup>

inter/tha/xml/multi/page_catalog_group_oreo.lxml

@@ -123,9 +123,9 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var aliasName[5] = "OREO ချောမွေ့မှု \nမီးတောင်"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "Oreo Smoothie \nမီးတောင်"
 		Var aliasDesc[5] = "နို့၊ သကြား၊ Oreo၊ ရေခဲ"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
@@ -151,18 +151,18 @@
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = "Oreo Smoothie \nVolcano SMOOTHIE"
+		Var NameLang[2][0] = "Oreo Smoothie\nVolcano SMOOTHIE"
 		Var NameLang[2][1] = "โอรีโอปั่นภูเขาไฟ"
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = "OREO ချောမွေ့မှု\nမီးတောင် ချောမွေ့မှု"
-		Var DescLang[2][0] = "Milk, Sugar, Oreo, Ice"
-		Var DescLang[2][1] = "นม น้ำตาล โอรีโอ \n "
+		Var NameLang[2][5] = "-"
+		Var DescLang[2][0] = "Milk, Sugar, Oreo"
+		Var DescLang[2][1] = "นม น้ำตาล โอรีโอ \n"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = "နို့၊ သကြား၊ Oreo၊ ရေခဲ"
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = "Disable2"
@@ -247,8 +247,8 @@
 		<LanguageSlot2>โอรีโอปั่นภูเขาไฟ</LanguageSlot2>
 		<LanguageSlot3>Oreo Smoothie \nVolcano</LanguageSlot3>
 		<LanguageSlot4>โอรีโอปั่นภูเขาไฟ</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>OREO ချောမွေ့မှု \nမီးတောင်</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>Oreo Smoothie \nမီးတောင်</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -263,7 +263,7 @@
 		<LanguageSlot2>นม น้ำตาล โอรีโอ \n </LanguageSlot2>
 		<LanguageSlot3>Milk, Sugar, Oreo, Ice</LanguageSlot3>
 		<LanguageSlot4>นม น้ำตาล โอรีโอ \n </LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>-</LanguageSlot5>
 		<LanguageSlot6>နို့၊ သကြား၊ Oreo၊ ရေခဲ</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -478,10 +478,10 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var aliasName[5] = "စတော်ဘယ်ရီနို့ \nOREO မီးတောင်"
-		Var aliasDesc[5] = "စတော်ဘယ်ရီရည်၊ နို့၊\nသကြား၊ Oreo"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "စတော်ဘယ်ရီနို့ \nOreo မီးတောင်"
+		Var aliasDesc[5] = "စတော်ဘယ်ရီ၊ နို့၊\nသကြား၊ Oreo"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -511,13 +511,13 @@
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = "စတော်ဘယ်ရီနို့ Oreo\nချောမွတ်ချောမွေ့မှု"
+		Var NameLang[2][5] = "-"
 		Var DescLang[2][0] = "Strawberry, Milk,\nSugar, Oreo"
 		Var DescLang[2][1] = "สตรอเบอรี นม น้ำตาล \n Oreo"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = "စတော်ဘယ်ရီရည်၊ နို့၊\nသကြား၊ Oreo"
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = "Disable2"
@@ -602,8 +602,8 @@
 		<LanguageSlot2>สตรอเบอรีปั่น\nโอรีโอภูเขาไฟ</LanguageSlot2>
 		<LanguageSlot3>Strawberry Milk \nOreo Volcano</LanguageSlot3>
 		<LanguageSlot4>สตรอเบอรีปั่น\nโอรีโอภูเขาไฟ</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>စတော်ဘယ်ရီနို့ \nOREO မီးတောင်</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>စတော်ဘယ်ရီနို့ \nOreo မီးတောင်</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -618,8 +618,8 @@
 		<LanguageSlot2>สตรอเบอรี นม น้ำตาล \n Oreo</LanguageSlot2>
 		<LanguageSlot3>Strawberry, Milk,\nSugar, Oreo</LanguageSlot3>
 		<LanguageSlot4>สตรอเบอรี นม น้ำตาล \n Oreo</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>စတော်ဘယ်ရီရည်၊ နို့၊\nသကြား၊ Oreo</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>စတော်ဘယ်ရီ၊ နို့၊\nသကြား၊ Oreo</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>
@@ -833,10 +833,10 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var aliasName[5] = "MELON နို့ OREO မီးတောင်"
-		Var aliasDesc[5] = "ဖရဲသီးရည်၊ နို့၊\nသကြား၊ Oreo"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "Melon Milk Oreo မီးတောင်"
+		Var aliasDesc[5] = "ဖရဲသီး၊ နို့၊\nသကြား၊ Oreo"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -866,13 +866,13 @@
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = "Melon Milk Oreo\nSmoothie ချောမွေ့မှု"
+		Var NameLang[2][5] = "-"
 		Var DescLang[2][0] = "Melon, Milk,\nSugar, Oreo"
 		Var DescLang[2][1] = "เมล่อน นม น้ำตาล \n Oreo"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = "ဖရဲသီးရည်၊ နို့၊\nသကြား၊ Oreo"
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = "Disable2"
@@ -957,8 +957,8 @@
 		<LanguageSlot2>เมล่อนปั่น\nโอรีโอภูเขาไฟ</LanguageSlot2>
 		<LanguageSlot3>Melon Milk Oreo Volcano</LanguageSlot3>
 		<LanguageSlot4>เมล่อนปั่น\nโอรีโอภูเขาไฟ</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>MELON နို့ OREO မီးတောင်</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>Melon Milk Oreo မီးတောင်</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -973,8 +973,8 @@
 		<LanguageSlot2>เมล่อน นม น้ำตาล \n Oreo</LanguageSlot2>
 		<LanguageSlot3>Melon, Milk,\nSugar, Oreo</LanguageSlot3>
 		<LanguageSlot4>เมล่อน นม น้ำตาล \n Oreo</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>ဖရဲသီးရည်၊ နို့၊\nသကြား၊ Oreo</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>ဖရဲသီး၊ နို့၊\nသကြား၊ Oreo</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>
@@ -1188,10 +1188,10 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var aliasName[5] = "ငှက်ပျောနို့ OREO \nမီးတောင်"
-		Var aliasDesc[5] = "ငှက်ပျောသီးရည်၊ နို့၊\nသကြား၊ Oreo"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "ငှက်ပျောသီး Mlik Oreo \nမီးတောင်"
+		Var aliasDesc[5] = "ငှက်ပျောသီး၊ နို့၊\nသကြား၊ Oreo"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -1216,18 +1216,18 @@
 		Var DescLang[1][3] = ""
 		Var DescLang[1][4] = ""
 		Var DescLang[1][5] = ""
-		Var NameLang[2][0] = "Banana Mlik Oreo \nVolcano SMOOTHIE"
+		Var NameLang[2][0] = "Banana Milk Oreo \nVolcano SMOOTHIE"
 		Var NameLang[2][1] = "นมกล้วยปั่น\nโอรีโอภูเขาไฟ"
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = "ငှက်ပျောနို့ Oreo\nချောမွတ်ချောမွတ်ခြင်း။"
+		Var NameLang[2][5] = "-"
 		Var DescLang[2][0] = "Banana, Milk,\nSugar, Oreo"
-		Var DescLang[2][1] = "กล้วย นม น้ำตาล Oreo"
+		Var DescLang[2][1] = "กล้วย นม น้ำตาล โอรีโอ"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = "ငှက်ပျောသီးရည်၊ နို့၊\nသကြား၊ Oreo"
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = "Disable2"
@@ -1312,8 +1312,8 @@
 		<LanguageSlot2>นมกล้วยปั่น\nโอรีโอภูเขาไฟ</LanguageSlot2>
 		<LanguageSlot3>Banana Mlik Oreo \nVolcano</LanguageSlot3>
 		<LanguageSlot4>นมกล้วยปั่น\nโอรีโอภูเขาไฟ</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>ငှက်ပျောနို့ OREO \nမီးတောင်</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>ငှက်ပျောသီး Mlik Oreo \nမီးတောင်</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -1328,8 +1328,8 @@
 		<LanguageSlot2>กล้วย นม น้ำตาล Oreo</LanguageSlot2>
 		<LanguageSlot3>Banana, Milk,\nSugar, Oreo</LanguageSlot3>
 		<LanguageSlot4>กล้วย นม น้ำตาล Oreo</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>ငှက်ပျောသီးရည်၊ နို့၊\nသကြား၊ Oreo</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>ငှက်ပျောသီး၊ နို့၊\nသကြား၊ Oreo</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>
@@ -1543,9 +1543,9 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var aliasName[5] = "CHOCO OREO မီးတောင်"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "Choco Oreo မီးတောင်"
 		Var aliasDesc[5] = "ကိုကိုး၊ နို့၊\nသကြား၊ Oreo"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
@@ -1576,13 +1576,13 @@
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = "Choco Oreo\nSmoothie ချောချောမွေ့မွေ့"
+		Var NameLang[2][5] = "-"
 		Var DescLang[2][0] = "Cocoa, Milk,\nSugar, Oreo"
 		Var DescLang[2][1] = "โกโก้ นม น้ำตาล \n Oreo"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = "ကိုကိုး၊ နို့၊\nသကြား၊ Oreo"
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = "Disable2"
@@ -1667,8 +1667,8 @@
 		<LanguageSlot2>โกโก้ปั่น\nโอรีโอภูเขาไฟ</LanguageSlot2>
 		<LanguageSlot3>Choco Oreo Volcano</LanguageSlot3>
 		<LanguageSlot4>โกโก้ปั่น\nโอรีโอภูเขาไฟ</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>CHOCO OREO မီးတောင်</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>Choco Oreo မီးတောင်</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -1683,7 +1683,7 @@
 		<LanguageSlot2>โกโก้ นม น้ำตาล \n Oreo</LanguageSlot2>
 		<LanguageSlot3>Cocoa, Milk,\nSugar, Oreo</LanguageSlot3>
 		<LanguageSlot4>โกโก้ นม น้ำตาล \n Oreo</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>-</LanguageSlot5>
 		<LanguageSlot6>ကိုကိုး၊ နို့၊\nသကြား၊ Oreo</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -1898,10 +1898,10 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var aliasName[5] = "CARAMEL နို့ \nOREO မီးတောင်"
-		Var aliasDesc[5] = "Caramel Syrup၊ နို့၊\nသကြား၊ Oreo"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "Caramel နို့ \nOreo မီးတောင်"
+		Var aliasDesc[5] = "ကာရာမယ်လ်၊ နို့၊\nသကြား၊ Oreo"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -1931,13 +1931,13 @@
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = "Caramel Milk Oreo\nSmoothie ချောမွေ့မှု"
+		Var NameLang[2][5] = "-"
 		Var DescLang[2][0] = "Caramel, Milk,\nSugar, Oreo"
 		Var DescLang[2][1] = "คาราเมล นม น้ำตาล \n Oreo"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = "Caramel Syrup၊ နို့၊\nသကြား၊ Oreo"
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = "Disable2"
@@ -2022,8 +2022,8 @@
 		<LanguageSlot2>นมคาราเมลปั่น\nโอรีโอภูเขาไฟ</LanguageSlot2>
 		<LanguageSlot3>Caramel Milk \nOreo Volcano</LanguageSlot3>
 		<LanguageSlot4>นมคาราเมลปั่น\nโอรีโอภูเขาไฟ</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>CARAMEL နို့ \nOREO မီးတောင်</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>Caramel နို့ \nOreo မီးတောင်</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -2038,8 +2038,8 @@
 		<LanguageSlot2>คาราเมล นม น้ำตาล \n Oreo</LanguageSlot2>
 		<LanguageSlot3>Caramel, Milk,\nSugar, Oreo</LanguageSlot3>
 		<LanguageSlot4>คาราเมล นม น้ำตาล \n Oreo</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>Caramel Syrup၊ နို့၊\nသကြား၊ Oreo</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>ကာရာမယ်လ်၊ နို့၊\nသကြား၊ Oreo</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>
@@ -2253,9 +2253,9 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var aliasName[5] = "HOJICHA OREO မီးတောင်"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "Hojicha Oreo မီးတောင်"
 		Var aliasDesc[5] = "Hojicha၊ နို့၊\nသကြား၊ Oreo"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
@@ -2286,13 +2286,13 @@
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = "Hojicha Oreo\nSmoothie ချောချောမွေ့မွေ့"
+		Var NameLang[2][5] = "-"
 		Var DescLang[2][0] = "Hojicha, Milk,\nSugar, Oreo"
 		Var DescLang[2][1] = "โฮจิฉะ นม น้ำตาล \n Oreo"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = "Hojicha၊ နို့၊\nသကြား၊ Oreo"
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = "Disable2"
@@ -2377,8 +2377,8 @@
 		<LanguageSlot2>โฮจิฉะ\nโอรีโอภูเขาไฟ</LanguageSlot2>
 		<LanguageSlot3>Hojicha Oreo Volcano</LanguageSlot3>
 		<LanguageSlot4>โฮจิฉะ\nโอรีโอภูเขาไฟ</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>HOJICHA OREO မီးတောင်</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>Hojicha Oreo မီးတောင်</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -2393,7 +2393,7 @@
 		<LanguageSlot2>โฮจิฉะ นม น้ำตาล \n Oreo</LanguageSlot2>
 		<LanguageSlot3>Hojicha, Milk,\nSugar, Oreo</LanguageSlot3>
 		<LanguageSlot4>โฮจิฉะ นม น้ำตาล \n Oreo</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>-</LanguageSlot5>
 		<LanguageSlot6>Hojicha၊ နို့၊\nသကြား၊ Oreo</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -2608,9 +2608,9 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var aliasName[5] = "THAI MILK TEA OREO မီးတောင်"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "ထိုင်းနို့လက်ဖက်ရည် Oreo မီးတောင်"
 		Var aliasDesc[5] = "ထိုင်းလက်ဖက်ရည်၊ နို့၊\nသကြား၊ Oreo"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
@@ -2641,13 +2641,13 @@
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = "Thai Milk Tea Oreo\nSmoothie Smoothie"
+		Var NameLang[2][5] = "-"
 		Var DescLang[2][0] = "Thai Tea, Milk,\nSugar, Oreo"
 		Var DescLang[2][1] = "ชาไทย นม น้ำตาล \n Oreo"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = "ထိုင်းလက်ဖက်ရည်၊ နို့၊\nသကြား၊ Oreo"
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = "Disable2"
@@ -2732,8 +2732,8 @@
 		<LanguageSlot2>ชานมไทย\nโอรีโอภูเขาไฟ</LanguageSlot2>
 		<LanguageSlot3>Thai Milk Tea Oreo Volcano</LanguageSlot3>
 		<LanguageSlot4>ชานมไทย\nโอรีโอภูเขาไฟ</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>THAI MILK TEA OREO မီးတောင်</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>ထိုင်းနို့လက်ဖက်ရည် Oreo မီးတောင်</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -2748,7 +2748,7 @@
 		<LanguageSlot2>ชาไทย นม น้ำตาล \n Oreo</LanguageSlot2>
 		<LanguageSlot3>Thai Tea, Milk,\nSugar, Oreo</LanguageSlot3>
 		<LanguageSlot4>ชาไทย นม น้ำตาล \n Oreo</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>-</LanguageSlot5>
 		<LanguageSlot6>ထိုင်းလက်ဖက်ရည်၊ နို့၊\nသကြား၊ Oreo</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -2963,9 +2963,9 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var aliasName[5] = "CAFE LATTE OREO မီးတောင်"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "ကော်ဖီဆိုင် Latte Oreo မီးတောင်"
 		Var aliasDesc[5] = "ကော်ဖီ၊ နို့၊ \nသကြား၊ Oreo"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
@@ -2996,13 +2996,13 @@
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = "Iced Cafe Latte Oreo\nSmoothie Smoothie"
+		Var NameLang[2][5] = "-"
 		Var DescLang[2][0] = "Coffee, Milk, \nSugar, Oreo"
 		Var DescLang[2][1] = "กาแฟ นม น้ำตาล \n Oero"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = "ကော်ဖီ၊ နို့၊ \nသကြား၊ Oreo"
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = "Disable2"
@@ -3087,8 +3087,8 @@
 		<LanguageSlot2>ลาเต้ปั่น\n โอรีโอภูเขาไฟ</LanguageSlot2>
 		<LanguageSlot3>Cafe Latte Oreo Volcano</LanguageSlot3>
 		<LanguageSlot4>ลาเต้ปั่น\n โอรีโอภูเขาไฟ</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>CAFE LATTE OREO မီးတောင်</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>ကော်ဖီဆိုင် Latte Oreo မီးတောင်</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -3103,7 +3103,7 @@
 		<LanguageSlot2>กาแฟ นม น้ำตาล \n Oero</LanguageSlot2>
 		<LanguageSlot3>Coffee, Milk, \nSugar, Oreo</LanguageSlot3>
 		<LanguageSlot4>กาแฟ นม น้ำตาล \n Oero</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>-</LanguageSlot5>
 		<LanguageSlot6>ကော်ဖီ၊ နို့၊ \nသကြား၊ Oreo</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -3318,10 +3318,10 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var aliasName[5] = "ပန်းရောင်နို့\nOREO မီးတောင်"
-		Var aliasDesc[5] = "Salak Syrup၊ နို့၊\nသကြား Oreo"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "ပန်းရောင်နို့\nOreo မီးတောင်"
+		Var aliasDesc[5] = "Salak၊ နို့၊\nသကြား Oreo"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -3351,13 +3351,13 @@
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = "ပန်းရောင် Oreo\nမီးတောင် ချောမွေ့မှု"
+		Var NameLang[2][5] = "-"
 		Var DescLang[2][0] = "Salak , Milk,\nSugar Oreo"
 		Var DescLang[2][1] = "น้ำแดงกลิ่นสละ นม น้ำตาล \n Oreo"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = "Salak Syrup၊ နို့၊\nသကြား Oreo"
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = "Disable2"
@@ -3442,8 +3442,8 @@
 		<LanguageSlot2>นมชมพูปั่น\nโอรีโอภูเขาไฟ</LanguageSlot2>
 		<LanguageSlot3>Pink Milk\nOreo Volcano</LanguageSlot3>
 		<LanguageSlot4>นมชมพูปั่น\nโอรีโอภูเขาไฟ</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>ပန်းရောင်နို့\nOREO မီးတောင်</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>ပန်းရောင်နို့\nOreo မီးတောင်</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -3458,8 +3458,8 @@
 		<LanguageSlot2>น้ำแดงกลิ่นสละ นม น้ำตาล \n Oreo</LanguageSlot2>
 		<LanguageSlot3>Salak , Milk,\nSugar Oreo</LanguageSlot3>
 		<LanguageSlot4>น้ำแดงกลิ่นสละ นม น้ำตาล \n Oreo</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>Salak Syrup၊ နို့၊\nသကြား Oreo</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>Salak၊ နို့၊\nသကြား Oreo</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>
@@ -3673,9 +3673,9 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var aliasName[5] = "THAI MILK TEA OREO မီးတောင်"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "ထိုင်းနို့လက်ဖက်ရည် Oreo မီးတောင်"
 		Var aliasDesc[5] = "ထိုင်းလက်ဖက်ရည်၊ နို့၊\nသကြား၊ Oreo"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
@@ -3706,13 +3706,13 @@
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = "ထိုင်းနို့လက်ဖက်ရည် OREO ချောမွေ့မှု"
+		Var NameLang[2][5] = "-"
 		Var DescLang[2][0] = "Thai Tea, Milk,\nSugar, Oreo"
 		Var DescLang[2][1] = "ชาไทย นม น้ำตาล \n Oreo"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = "ထိုင်းလက်ဖက်ရည်၊ နို့၊\nသကြား၊ Oreo"
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = "Disable2"
@@ -3797,8 +3797,8 @@
 		<LanguageSlot2>ชานมไทย\nโอรีโอภูเขาไฟ</LanguageSlot2>
 		<LanguageSlot3>Thai Milk Tea Oreo Volcano</LanguageSlot3>
 		<LanguageSlot4>ชานมไทย\nโอรีโอภูเขาไฟ</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>THAI MILK TEA OREO မီးတောင်</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>ထိုင်းနို့လက်ဖက်ရည် Oreo မီးတောင်</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -3813,7 +3813,7 @@
 		<LanguageSlot2>ชาไทย นม น้ำตาล \n Oreo</LanguageSlot2>
 		<LanguageSlot3>Thai Tea, Milk,\nSugar, Oreo</LanguageSlot3>
 		<LanguageSlot4>ชาไทย นม น้ำตาล \n Oreo</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot5>-</LanguageSlot5>
 		<LanguageSlot6>ထိုင်းလက်ဖက်ရည်၊ နို့၊\nသကြား၊ Oreo</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
@@ -4028,10 +4028,10 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var aliasName[5] = "MinT OREO မီးတောင်"
-		Var aliasDesc[5] = "Mint Syrup၊ နို့၊\nသကြား၊ Oreo"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "Mint Oreo မီးတောင်"
+		Var aliasDesc[5] = "Mint၊ နို့၊\nသကြား၊ Oreo"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -4061,13 +4061,13 @@
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = "Mint OREO မီးတောင် ချောမွေ့မှု"
+		Var NameLang[2][5] = "-"
 		Var DescLang[2][0] = "Mint, Milk,\nSugar, Oreo"
 		Var DescLang[2][1] = "มินต์ นม น้ำตาล \n Oreo"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = "Mint Syrup၊ နို့၊\nသကြား၊ Oreo"
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = "Disable2"
@@ -4152,8 +4152,8 @@
 		<LanguageSlot2>มินต์โอรีโอภูเขาไฟ</LanguageSlot2>
 		<LanguageSlot3>Mint Oreo Volcano</LanguageSlot3>
 		<LanguageSlot4>มินต์โอรีโอภูเขาไฟ</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>MinT OREO မီးတောင်</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>Mint Oreo မီးတောင်</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -4168,8 +4168,8 @@
 		<LanguageSlot2>มินต์ นม น้ำตาล \n Oreo</LanguageSlot2>
 		<LanguageSlot3>Mint, Milk,\nSugar, Oreo</LanguageSlot3>
 		<LanguageSlot4>มินต์ นม น้ำตาล \n Oreo</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>Mint Syrup၊ နို့၊\nသကြား၊ Oreo</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>Mint၊ နို့၊\nသကြား၊ Oreo</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>
@@ -4383,10 +4383,10 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var aliasName[5] = "PEACH OREO"
-		Var aliasDesc[5] = "မက်မွန်ရည်၊ နို့၊\nသကြား၊ Oreo"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "Peach Oreo"
+		Var aliasDesc[5] = "မက်မွန်သီး၊ နို့၊\nသကြား၊ Oreo"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -4416,13 +4416,13 @@
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "-"
-		Var NameLang[2][5] = "ငါ့ကိုချစ်ပါ\nPEACH SMOOTHIE"
+		Var NameLang[2][5] = "-"
 		Var DescLang[2][0] = "Peach, Milk,\nSugar, Oreo"
 		Var DescLang[2][1] = "พีช นม น้ำตาล \n Oreo"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
 		Var DescLang[2][4] = "-"
-		Var DescLang[2][5] = "မက်မွန်ရည်၊ နို့၊ Oreo နှင့် ရေခဲ"
+		Var DescLang[2][5] = "-"
 		; end lang 
 		Var PD_STAGE_1 = "Disable2"
 		Var PD_STAGE_2 = "Disable2"
@@ -4507,8 +4507,8 @@
 		<LanguageSlot2>พีชโอรีโอภูเขาไฟ</LanguageSlot2>
 		<LanguageSlot3>Peach Oreo</LanguageSlot3>
 		<LanguageSlot4>พีชโอรีโอภูเขาไฟ</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>PEACH OREO</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>Peach Oreo</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -4523,8 +4523,8 @@
 		<LanguageSlot2>พีช นม น้ำตาล \n Oreo</LanguageSlot2>
 		<LanguageSlot3>Peach, Milk,\nSugar, Oreo</LanguageSlot3>
 		<LanguageSlot4>พีช นม น้ำตาล \n Oreo</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>မက်မွန်ရည်၊ နို့၊\nသကြား၊ Oreo</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>မက်မွန်သီး၊ နို့၊\nသကြား၊ Oreo</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>
@@ -4738,10 +4738,10 @@
 		Var aliasDesc[2] = "-"
 		Var aliasName[3] = "-"
 		Var aliasDesc[3] = "-"
-		Var aliasName[4] = ""
-		Var aliasDesc[4] = ""
-		Var aliasName[5] = "PEACH OREO"
-		Var aliasDesc[5] = "မက်မွန်ရည်၊ နို့၊\nသကြား၊ Oreo"
+		Var aliasName[4] = "-"
+		Var aliasDesc[4] = "-"
+		Var aliasName[5] = "Peach Oreo"
+		Var aliasDesc[5] = "မက်မွန်သီး၊ နို့၊\nသကြား၊ Oreo"
 		Var NameLang[0][0] = ""
 		Var NameLang[0][1] = ""
 		Var NameLang[0][2] = ""
@@ -4862,8 +4862,8 @@
 		<LanguageSlot2>พีชโอรีโอภูเขาไฟ</LanguageSlot2>
 		<LanguageSlot3>Peach Oreo</LanguageSlot3>
 		<LanguageSlot4>พีชโอรีโอภูเขาไฟ</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>PEACH OREO</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>Peach Oreo</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Text>
@@ -4878,8 +4878,8 @@
 		<LanguageSlot2>พีช นม น้ำตาล \n Oreo</LanguageSlot2>
 		<LanguageSlot3>Peach, Milk,\nSugar, Oreo</LanguageSlot3>
 		<LanguageSlot4>พีช นม น้ำตาล \n Oreo</LanguageSlot4>
-		<LanguageSlot5></LanguageSlot5>
-		<LanguageSlot6>မက်မွန်ရည်၊ နို့၊\nသကြား၊ Oreo</LanguageSlot6>
+		<LanguageSlot5>-</LanguageSlot5>
+		<LanguageSlot6>မက်မွန်သီး၊ နို့၊\nသကြား၊ Oreo</LanguageSlot6>
 	</LanguageGroup>
 	</Text>
 	<Image>