before merge

inter/aus/animation01/play_list.tsv

@@ -851,3 +851,11 @@ Hot Coconut Matcha tea	51-02-01-0061	1	8	9	62						24	120	17:00	23
 Frappe Vanilla Caramel Latte	51-21-03-0079	1	2	3	4	5	63	22	23	41	24	120	17:00	23
 Hot strawberry matcha	51-02-01-0071	1	8	9	19	70					24	120	17:00	23
 Frappe strawberry matcha latte	51-02-03-0071	1	8	9	19	70	23	41			24	120	17:00	23
+
+Yuzu Turtle Power Energy	51-05-02-9990	1	53	34	13	23					24	120	17:00	23
+Strawberry Turtle Power Energy	51-05-02-9991	1	19	34	13	23					24	120	17:00	23
+Coconut Turtle Power Energy	51-05-02-9992	1	62	34	13	23					24	120	17:00	23
+Mint Turtle Power Energy	51-05-02-9993	1	59	34	13	23					24	120	17:00	23
+Vanilla Turtle Power Energy	51-05-02-9994	1	34	13	23						24	120	17:00	23
+Caramel Turtle Power Energy	51-05-02-9995	1	22	34	13	23					24	120	17:00	23
+Lychee Turtle Power Energy	51-05-02-9996	1	11	34	13	23					24	120	17:00	23

inter/aus/configure.ev

@@ -1,6 +1,6 @@
 
 	If BoxID = 200027 Then
-		Var EnableMultiInstanceFromBoxID = 1
+		Var EnableMultiInstanceFromBoxID = 0
 	EndIf
 
 	READ_FILE "/mnt/sdcard/enable_ui_v3" EnableMultiInstanceFromConfig

inter/aus/menu/lang.tsv

@@ -18,6 +18,7 @@ TextID	Note	English	Thai
 000011		Kid Menu	เมนูเด็ก
 000012		App Fast	แอพ ฟาสท์
 000025		Dessert	ของหวาน
+000026		Energy Drink	Energy Drink
 
 	Menu 
 		Font=Kanit,Type=Regular,Size=16,Color=0x5A5A5A,Align=center-vertical-horizontal	Font=Kanit,Type=Regular,Size=32,Color=0x5A5A5A,Align=center-vertical-horizontal

inter/aus/xml/menu_catalog_default_init.lxml

@@ -6,15 +6,15 @@
 
     DEBUGVAR LanguageShow
     DEBUGVAR CountryName
-    
-    If LanguageShow = "ENG" Then 
+
+    If LanguageShow = "ENG" Then
         Var DirImage2 = "ROOT/taobin_project/image/drink_option_en/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
         Var DirImage = "ROOT/taobin_project/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
-        
+
     EndIf
-    If LanguageShow = "THAI" Then 
+    If LanguageShow = "THAI" Then
         Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
         Var ice_tab_text =  "น้ำแข็งจะพร้อมเวลา "
@@ -28,7 +28,7 @@
         Var DirImage = "ROOT/taobin_project/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
-    
+
 
     ;inter-image
     If CountryName = "Australia" Then
@@ -37,7 +37,7 @@
         Var DirImage = "ROOT/taobin_project/image/page3_en"
         Var ice_tab_text =  "Ice will be ready at "
     EndIf
-    
+
 
     If ICE_PROCESS_STATUS = 2 Then
         Var ice_tab_process_show = "Enable"
@@ -48,14 +48,14 @@
 
 
     ; SpiralOnline
-  
+
         Var MenuVSelected2 = "Invisible"
 
         Var Menu1Selected2 = "Invisible"
         Var Menu2Selected2 = "Invisible"
         Var Menu3Selected2 = "Invisible"
         Var Menu4Selected2 = "Invisible"
-        
+
         Var Menu6Selected2 = "Invisible"
         Var Menu7Selected2 = "Invisible"
         Var MenuVSelected2 = "Invisible"
@@ -64,12 +64,12 @@
         Var Menu21Selected2 = "Invisible"
 
         Var MenuVSelected2 = "Invisible"
-        If SpiralOnline = "true" Then 
+        If SpiralOnline = "true" Then
             If Seeker =  "curr" Then
                 Var MenuVSelected2 = "Enable"
             EndIf
-        EndIf 
-        
+        EndIf
+
         ; init default
         Var Menu1Selected = "Enable"
         Var Menu2Selected = "Enable"
@@ -82,44 +82,41 @@
         ; 8 cocktail
         Var Menu8Selected = "Invisible"
 
-        If CocktailShow = "true" Then 
+        If CocktailShow = "true" Then
             Var Menu7Selected = "Invisible"
             Var Menu8Selected = "Enable"
         EndIf
 
-            
+
         If AppFastEnable = "true" Then
-            Var Menu11Selected = "Enable" 
-            Var Menu21Selected = "Invisible" 
+            Var Menu11Selected = "Enable"
+            Var Menu21Selected = "Invisible"
             Var Menu7Selected = "Invisible"
         Else
             If MenuKidEnable = "true" Then
-                Var Menu11Selected = "Invisible" 
+                Var Menu11Selected = "Invisible"
                 Var Menu21Selected = "Enable"
                 Var Menu7Selected = "Invisible"
             Else
                 Var Menu11Selected = "Invisible"
-                Var Menu21Selected = "Invisible" 
+                Var Menu21Selected = "Invisible"
                 Var Menu7Selected = "Enable"
             EndIf
         EndIf
 
         If CocktailShow = "true" Then
             Var Menu7Selected = "Invisible"
-        EndIf 
-
-        If RecipeTag1 = "HealthTurnOn" Then
-            Var Menu22Selected = "Enable"
-        Else
-            Var Menu22Selected = "Invisible"
         EndIf
 
-        If WinterWarmersCatalogFlag = 1 Then
-            Var MenuWinterWarmersCatalogState = "Enable"
-        Else
-            Var MenuWinterWarmersCatalogState = "Invisible"
-        EndIf
-        DEBUGVAR WinterWarmersCatalogFlag
-        DEBUGVAR MenuWinterWarmersCatalogState
+        Var Menu22Selected = "Enable"
+        Var Menu23Selected = "Enable"
+
+        ;If WinterWarmersCatalogFlag = 1 Then
+        ;    Var MenuWinterWarmersCatalogState = "Enable"
+        ;Else
+        ;    Var MenuWinterWarmersCatalogState = "Invisible"
+        ;EndIf
+        ;DEBUGVAR WinterWarmersCatalogFlag
+        ;DEBUGVAR MenuWinterWarmersCatalogState
         ;
-        
+

inter/aus/xml/menu_catalog_new.lxml

@@ -384,6 +384,26 @@
         </EventClick>
         </Button>
 
+        <Button>
+        <Layout> "linear" </Layout>
+        <State> Menu23Selected </State>
+        <Filename> Var( DirImageAlterAus + "/bn_energy_drink.png") </Filename>
+        <FilenamePress> Var( DirImageAlterAus + "/bp_energy_drink.png") </FilenamePress>
+        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        <Volume> SoundVolume </Volume>
+        <EventClick>
+            Var NextPage = "-"
+            ;Open "ROOT/taobin_project/xml/page_catalog_group_energy_drink.lxml"
+
+            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_energy_drink.lxml"
+
+            DEBUGVAR CountryRootPath
+            DEBUGVAR OpenFileXML
+
+            Open OpenFileXML
+        </EventClick>
+        </Button>
+
         <Button>
         <Layout> "linear" </Layout>
         <State> Menu8Selected </State>
@@ -444,19 +464,19 @@
         </EventClick>
         </Button>
 
-        <Button>
-        <Layout> "linear" </Layout>
-        <State> MenuWinterWarmersCatalogState </State>
-        <Filename> "ROOT/taobin_project/inter/aus/image/page3_2_en/bn_winter_warmers.png" </Filename>
-        <FilenamePress> "ROOT/taobin_project/inter/aus/image/page3_2_en/bp_winter_warmers.png" </FilenamePress>
-        <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-        <Volume> SoundVolume </Volume>
-        <EventClick>
-            Var NextPage = "-"
-            Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_winter_warmers_ignore.lxml"
-            Open OpenFileXML
-        </EventClick>
-        </Button>
+        ;<Button>
+        ;<Layout> "linear" </Layout>
+        ;<State> MenuWinterWarmersCatalogState </State>
+        ;<Filename> "ROOT/taobin_project/inter/aus/image/page3_2_en/bn_winter_warmers.png" </Filename>
+        ;<FilenamePress> "ROOT/taobin_project/inter/aus/image/page3_2_en/bp_winter_warmers.png" </FilenamePress>
+        ;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+        ;<Volume> SoundVolume </Volume>
+        ;<EventClick>
+        ;    Var NextPage = "-"
+        ;    Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_winter_warmers_ignore.lxml"
+        ;    Open OpenFileXML
+        ;</EventClick>
+        ;</Button>
 </Row2>
 </ListView1>
 

inter/aus/xml/open_page_catalog.ev

@@ -1,3 +1,4 @@
+DEBUGVAR EnableMultiInstance
 If EnableMultiInstance = "true" Then
 	Var OpenFromPageBoard = 1
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"

inter/aus/xml/page_catalog.lxml

@@ -493,7 +493,8 @@
 
 
 <Button>
-<X> 220 </X>
+;<X> 220 </X>
+<X> 47 </X>
 <Y> 1532 </Y>
 <State>WheyButtonState</State>
 <Filename> Var(DirImage + "/bn_protein.png") </Filename>
@@ -520,7 +521,8 @@
 
 
 <Button>
-<X> 564 </X>
+;<X> 564 </X>
+<X> 391 </X>
 <Y> 1532 </Y>
 <State> "Enable" </State>
 <Filename> Var(DirImageAUS + "/bn_dessert.png") </Filename>
@@ -546,28 +548,55 @@
 </Language>
 </Button>
 
-
 <Button>
-<X> 736 </X>
+<X> 748 </X>
 <Y> 1532 </Y>
-<State> "Invisible" </State>
-<Filename> Var(DirImage + "/bn_winter_warmers.png") </Filename>
-<FilenamePress> Var(DirImage + "/bn_winter_warmers.png") </FilenamePress>
+<State> "Enable" </State>
+<Filename> Var(DirImageAUS + "/bn_energy_drink.png") </Filename>
+<FilenamePress> Var(DirImageAUS + "/bp_energy_drink.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
 
-	;Open "ROOT/taobin_project/xml/page_catalog_group_winter_warmers.lxml"
+	;Open "ROOT/taobin_project/xml/page_catalog_group_energy_drink.lxml"
 
 
-	Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_winter_warmers_ignore.lxml"
+	Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_energy_drink.lxml"
 	Open OpenFileXML
 
 </EventClick>
+<Language>
+	<ID> 000026 </ID>
+	<X> 28 </X>
+	<Y> 202 </Y>
+	<Width> 241 </Width>
+	<Height> 82 </Height>
+</Language>
 </Button>
 
 
+;<Button>
+;<X> 736 </X>
+;<Y> 1532 </Y>
+;<State> "Invisible" </State>
+;<Filename> Var(DirImage + "/bn_winter_warmers.png") </Filename>
+;<FilenamePress> Var(DirImage + "/bn_winter_warmers.png") </FilenamePress>
+;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+;<Volume> SoundVolume </Volume>
+;<EventClick>
+;	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+;
+;	;Open "ROOT/taobin_project/xml/page_catalog_group_winter_warmers.lxml"
+;
+;
+;	Var OpenFileXML = CountryRootPath + "xml/page_catalog_group_winter_warmers_ignore.lxml"
+;	Open OpenFileXML
+;
+;</EventClick>
+;</Button>
+
+
 ;###############################################################
 
 <Button>

inter/aus/xml/page_catalog_group_energy_drink.skt

@@ -0,0 +1,42 @@
+<?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"
+    Var Menu23Selected = "PressForever"
+
+
+
+    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_milk.lxml

@@ -36,6 +36,280 @@
 		Var block_index_move = 0
 </Script>
 ;dummy_layout.inc
+	; ==================> Len = 3
+	; 51-03-01-0005 51-03-02-0005 51-03-03-0005 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 51-03-01-0005.Button,51-03-02-0005.Button,51-03-03-0005.Button,$Sum510301000551030200055103030005) </State> 
+	<Button>
+	<State> $Sum510301000551030200055103030005 </State> 
+	<Filename> "ROOT/taobin_project/inter/aus/image/page_drink_n//bn_iced_milk.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/aus/image/page_drink_press_n//bn_iced_milk.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/aus/image/page_drink_disable_n2//bn_iced_milk.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_milk.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $51-03-01-0005.Price
+		Var PriceD2 = $51-03-02-0005.Price
+		Var PriceD3 = $51-03-03-0005.Price
+		Var PD_CODE1 = "51-03-01-0005"
+		Var PD_CODE2 = "51-03-02-0005"
+		Var PD_CODE3 = "51-03-03-0005"
+		; begin lang 
+		Var aliasName[0] = "MILK"
+		Var aliasDesc[0] = "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] = "WARM MILK"
+		Var NameLang[0][1] = "นมร้อน"
+		Var NameLang[0][2] = ""
+		Var NameLang[0][3] = ""
+		Var NameLang[0][4] = "SUSU SUAM"
+		Var NameLang[0][5] = ""
+		Var DescLang[0][0] = "Milk"
+		Var DescLang[0][1] = "นม"
+		Var DescLang[0][2] = ""
+		Var DescLang[0][3] = ""
+		Var DescLang[0][4] = "Susu"
+		Var DescLang[0][5] = ""
+		Var NameLang[1][0] = "MILK WITH Iced"
+		Var NameLang[1][1] = "นมเย็น"
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = "SUSU AIS"
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = "Milk, Ice"
+		Var DescLang[1][1] = "นม และน้ำแข็ง"
+		Var DescLang[1][2] = ""
+		Var DescLang[1][3] = ""
+		Var DescLang[1][4] = "Susu, Ice"
+		Var DescLang[1][5] = ""
+		Var NameLang[2][0] = "MILK SMOOTHIE"
+		Var NameLang[2][1] = "นมปั่น"
+		Var NameLang[2][2] = ""
+		Var NameLang[2][3] = ""
+		Var NameLang[2][4] = "SMOOTHIE SUSU"
+		Var NameLang[2][5] = ""
+		Var DescLang[2][0] = "Milk, Ice"
+		Var DescLang[2][1] = "นม และน้ำแข็ง"
+		Var DescLang[2][2] = ""
+		Var DescLang[2][3] = ""
+		Var DescLang[2][4] = "Susu, Ais"
+		Var DescLang[2][5] = ""
+		; end lang 
+		Var PD_STAGE_1 = $51-03-01-0005.Button
+		Var PD_STAGE_2 = $51-03-02-0005.Button
+		Var PD_STAGE_3 = $51-03-03-0005.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" "51-03-02-0005"
+		Else
+			If PD_STAGE_1 = "Enable" Then
+			Topping "Load" "51-03-01-0005"
+			Else
+			Topping "Load" "51-03-03-0005"
+			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>MILK</LanguageSlot1>
+		<LanguageSlot2>นม</LanguageSlot2>
+		<LanguageSlot3>MILK</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>Milk</LanguageSlot1>
+		<LanguageSlot2>นม</LanguageSlot2>
+		<LanguageSlot3>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> $51-03-01-0005.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-03-01-0005.Button </State>
+	<Value> StringFmt(  $51-03-01-0005.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-03-02-0005.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-03-02-0005.Button </State>
+	<Value> StringFmt( $51-03-02-0005.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> $51-03-03-0005.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> $51-03-03-0005.Button </State>
+	<Value> StringFmt(  $51-03-03-0005.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	</Text>
+	<Image>
+	<X> 81 </X>
+	<Y> 264 </Y>
+	<State> 
+		eval( 
+		If ICE_PROCESS_STATUS = 2 Then
+		
+			If $Sum510301000551030200055103030005 = "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 $Sum510301000551030200055103030005 = "Disable" Then
+				STRCONTAIN "ERR" $51-03-01-0005.TAG tag1_is_disable
+				STRCONTAIN "ERR" $51-03-02-0005.TAG tag2_is_disable
+				STRCONTAIN "ERR" $51-03-03-0005.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> $Sum510301000551030200055103030005 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
 	; ==================> Len = 3
 	; 51-03-01-0002 51-03-02-0002 51-03-03-0002 
 <Block>

inter/aus/xml/page_check_member1.lxml

@@ -6,13 +6,13 @@
 <Background> "0xeae6e1" </Background>
 
 <Volume> SoundVolume </Volume>
-<Refresh> "Partial" </Refresh>
 <EventOpen>
 	; On open
 
 	Var Timeout = 0
 	Var TimeoutSMS = 0
 	Var StateBGetSMS = "Enable"
+	Var LOADING_STATE = "Invisible"
    
    
 	Var ShowSentSmsText = "Invisible"
@@ -87,7 +87,7 @@
     Else
         If StepX = 2 Then
            
-
+                Var LOADING_STATE = "Invisible"
                 Var PolygonST1 = "Invisible"
                 Var PolygonST2 = "Invisible"
                 Var CouponSTA =  "Invisible"
@@ -128,6 +128,8 @@
 		Else
 			Var ShowErrorText = "Enable"
             Var ShowText = "Invisible"
+            Var LOADING_STATE = "Invisible"
+            Var Tel_Confirm_State = "Enable"
             
             Var ShowTextNumber1 = "Invisible"
 	        Var ShowTextNumber2 = "Invisible"
@@ -144,8 +146,10 @@
 
 <EventActionError>
 	If  GetAccFlag = 1 Then
+	    Var LOADING_STATE = "Invisible"
    		Var ShowErrorText = "Enable"
         Var ShowText = "Invisible"
+        Var Tel_Confirm_State = "Enable"
         Var GetAccFlag = 0
 
         Var ShowTextNumber1 = "Invisible"
@@ -160,10 +164,14 @@
     If StepX = 1 Then
         Var ShowErrorText = "Enable"
         Var ShowText = "Invisible"
+        Var LOADING_STATE = "Invisible"
+        Var Tel_Confirm_State = "Enable"
     EndIf
     If StepX = 2 Then
         Var ShowErrorText = "Enable"
+        Var LOADING_STATE = "Invisible"
         Var ShowText = "Invisible"
+        Var Tel_Confirm_State = "Enable"
     EndIf
    Refresh
 </EventActionError>
@@ -687,7 +695,6 @@
 <Button>
 <X> 398 </X>
 <Y> 1600 </Y>
-<Refresh> "Enable" </Refresh>
 <State> Tel_Confirm_State </State>
 <Filename> Var( DirImage + "/bn_confirm.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/bp_confirm.png" )</FilenamePress>
@@ -703,6 +710,10 @@
 			GETACCEXT DataTmp 19
 
 			Var GetAccFlag = 1
+			Var LOADING_STATE = "Enable"
+			Var Tel_Confirm_State = "Press"
+			
+			Refresh
     EndIf
     
 	
@@ -813,6 +824,15 @@
 ;include="ROOT/taobin_project/inc/video.inc"
 
 
+<GIF>
+<X> 493 </X>
+<Y> 740 </Y>
+<Width> 94 </Width>
+<Height> 94 </Height>
+<State> LOADING_STATE </State>
+<Filename> "ROOT/taobin_project/image/page_payment/loading.gif" </Filename>
+</GIF>
+
 			
 <EventSecurity> 
 	Open "/media/bt/xml/security_alarm.xml" 

inter/aus/xml/page_member_topup.lxml

@@ -500,6 +500,7 @@
 
 	If SelectedPaymentMedthod = "qr_code" Then
 	   SAVELOG "Canceling qr_code"
+	   Var WaitQRPay = 0
 	   VendingQR OFF
 	EndIf
 

inter/gbr/animation01/play_list.tsv

@@ -864,3 +864,5 @@ Iced Apple Frop Longback	55-21-02-0091	1	66	2	3	4	5	23			24	100	7:40	32
 Iced Apple Oolong Tea	55-02-02-0101	1	66	16	10	23					24	100	7:40	32
 Iced Apple Juice	55-05-02-0134	1	66	16	23						24	100	7:40	32
 Iced Apple Soda	55-05-02-0135	1	66	13	23						24	100	7:40	32
+
+ICED YUZU	55-05-02-0089	1	53	23							24	100	7:40	32

inter/gbr/xml/page_catalog_group_whey.lxml

@@ -1933,6 +1933,276 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
+</Block>
+	; ==================> Len = 3
+	; - 55-04-02-0008 - 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 55-04-02-0008.Button,$Sum5504020008) </State> 
+	<Button>
+	<State> $Sum5504020008 </State> 
+	<Filename> "ROOT/taobin_project/inter/gbr/image/page_drink_n//bn_protein_Taiwantea.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/gbr/image/page_drink_press_n//bn_protein_Taiwantea.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/page_drink_disable_n2//bn_protein_Taiwantea.png" </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var PictureDrink = "ROOT/taobin_project/inter/gbr/image/page_drink_picture2_n/" + "bn_protein_Taiwantea.png"
+		Var OpenFromXML = CurrentXMLFileName2
+		Var PriceD1 = $-.Price
+		Var PriceD2 = $55-04-02-0008.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "55-04-02-0008"
+		Var PD_CODE3 = "##-##-##-####"
+		; begin lang 
+		Var aliasName[0] = "TAIWANESE TEA \nSHAKE"
+		Var aliasDesc[0] = "Whey protein, Milk,\nTaiwanese Tea, Sugar"
+		Var aliasName[1] = "ชาไต้หวันโปรตีน"
+		Var aliasDesc[1] = "เวย์โปรตีน นม \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] = "TAIWANESE TEA SHAKE"
+		Var NameLang[1][1] = "ชาไต้หวันโปรตีน"
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = "SHAKE TEH TAIWAN"
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = "Whey protein, Milk,Taiwanese Tea, Sugar"
+		Var DescLang[1][1] = "เวย์โปรตีน นม ชาไต้หวัน"
+		Var DescLang[1][2] = ""
+		Var DescLang[1][3] = ""
+		Var DescLang[1][4] = "Protein Whey, Susu, Teh Taiwan, Gula"
+		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 = $55-04-02-0008.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" "55-04-02-0008"
+		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>TAIWANESE TEA \nSHAKE</LanguageSlot1>
+		<LanguageSlot2>ชาไต้หวันโปรตีน</LanguageSlot2>
+		<LanguageSlot3>TAIWANESE TEA \nSHAKE</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>Whey protein, Milk,\nTaiwanese Tea, Sugar</LanguageSlot1>
+		<LanguageSlot2>เวย์โปรตีน นม \nชาไต้หวัน</LanguageSlot2>
+		<LanguageSlot3>Whey protein, Milk,\nTaiwanese Tea, Sugar</LanguageSlot3>
+		<LanguageSlot4>เวย์โปรตีน นม \nชาไต้หวัน</LanguageSlot4>
+		<LanguageSlot5></LanguageSlot5>
+		<LanguageSlot6>เวย์โปรตีน นม \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> $55-04-02-0008.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> $55-04-02-0008.Button </State>
+	<Value> StringFmt( $55-04-02-0008.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 $Sum5504020008 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $55-04-02-0008.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> $Sum5504020008 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
 </Block>
 	; ==================> Len = 3
 	; - 55-04-02-0017 - 
@@ -2473,546 +2743,6 @@
 	</Language>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
-</Block>
-	; ==================> Len = 3
-	; - 55-04-02-0010 - 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 55-04-02-0010.Button,$Sum5504020010) </State> 
-	<Button>
-	<State> $Sum5504020010 </State> 
-	<Filename> "ROOT/taobin_project/inter/gbr/image/page_drink_n//bn_protein_milk.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/gbr/image/page_drink_press_n//bn_protein_milk.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/page_drink_disable_n2//bn_protein_milk.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/gbr/image/page_drink_picture2_n/" + "bn_protein_milk.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
-		Var PriceD2 = $55-04-02-0010.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "55-04-02-0010"
-		Var PD_CODE3 = "##-##-##-####"
-		; begin lang 
-		Var aliasName[0] = "MILK SHAKE"
-		Var aliasDesc[0] = "Whey protein & 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] = ""
-		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] = "MILK SHAKE"
-		Var NameLang[1][1] = "นมโปรตีน"
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = "SHAKE SUSU"
-		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = "Whey protein and Milk"
-		Var DescLang[1][1] = "เวย์โปรตีน นม"
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = "Protein Whey, Susu"
-		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 = $55-04-02-0010.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" "55-04-02-0010"
-		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>MILK SHAKE</LanguageSlot1>
-		<LanguageSlot2>นมโปรตีน</LanguageSlot2>
-		<LanguageSlot3>MILK SHAKE</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>Whey protein & Milk</LanguageSlot1>
-		<LanguageSlot2>เวย์โปรตีน นม</LanguageSlot2>
-		<LanguageSlot3>Whey protein & 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> "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> $55-04-02-0010.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> $55-04-02-0010.Button </State>
-	<Value> StringFmt( $55-04-02-0010.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 $Sum5504020010 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $55-04-02-0010.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> $Sum5504020010 </State> 
-	<Language>
-		<ID> 000013 </ID> 
-	</Language>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
-</Block>
-	; ==================> Len = 3
-	; - 55-04-02-0011 - 
-<Block>
-	<MarginLeft> 33 </MarginLeft>
-	<MarginTop> 22 </MarginTop>
-	<Width> 225 </Width>
-	<Height> 296 </Height>
-	<State> Flag( 55-04-02-0011.Button,$Sum5504020011) </State> 
-	<Button>
-	<State> $Sum5504020011 </State> 
-	<Filename> "ROOT/taobin_project/inter/gbr/image/page_drink_n//bn_protein_isolated.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/gbr/image/page_drink_press_n//bn_protein_isolated.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/page_drink_disable_n2//bn_protein_isolated.png" </FilenameDisable>
-	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-	<Volume> SoundVolume </Volume>
-	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/gbr/image/page_drink_picture2_n/" + "bn_protein_isolated.png"
-		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
-		Var PriceD2 = $55-04-02-0011.Price
-		Var PriceD3 = $-.Price
-		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "55-04-02-0011"
-		Var PD_CODE3 = "##-##-##-####"
-		; begin lang 
-		Var aliasName[0] = "PLAIN PROTEIN"
-		Var aliasDesc[0] = "Whey protein, 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] = "PLAIN PROTEIN"
-		Var NameLang[1][1] = "โปรตีนเปล่า"
-		Var NameLang[1][2] = ""
-		Var NameLang[1][3] = ""
-		Var NameLang[1][4] = "PROTEIN WHEY"
-		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = "Whey protein, Water, and Ice"
-		Var DescLang[1][1] = "เวย์โปรตีน น้ำ และน้ำแข็ง"
-		Var DescLang[1][2] = ""
-		Var DescLang[1][3] = ""
-		Var DescLang[1][4] = "Protein Whey, Air, Ais"
-		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 = $55-04-02-0011.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" "55-04-02-0011"
-		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>PLAIN PROTEIN</LanguageSlot1>
-		<LanguageSlot2>โปรตีนเปล่า</LanguageSlot2>
-		<LanguageSlot3>PLAIN PROTEIN</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>Whey protein, Water</LanguageSlot1>
-		<LanguageSlot2>เวย์โปรตีน น้ำ</LanguageSlot2>
-		<LanguageSlot3>Whey protein, 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> $55-04-02-0011.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> $55-04-02-0011.Button </State>
-	<Value> StringFmt( $55-04-02-0011.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 $Sum5504020011 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $55-04-02-0011.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> $Sum5504020011 </State> 
-	<Language>
-		<ID> 000013 </ID> 
-	</Language>
-	<Align> center-vertical-horizontal </Align>
-	</Text>
 </Block>
 	; ==================> Len = 3
 	; - 55-04-02-0056 - 

inter/gbr/xml/page_show_error.lxml

@@ -173,7 +173,7 @@
 				If MachineStage = "remove-cup" Then
 
 					Var LEDSet = "false"
-					Open "ROOT/taobin_project/xml/page_remove_cup.xml"
+					;Open "ROOT/taobin_project/xml/page_remove_cup.xml"
 
 				EndIf
 
@@ -211,8 +211,11 @@
 	Var TimeOut = TimeOut + 1
 	If TimeOut > 30 Then
 		Var TimeOut = 0
-		Open "ROOT/taobin_project/inter/gbr/xml/page_show_error.lxml"
-
+		If MachineStage = "remove-cup" Then
+		    Open "ROOT/taobin_project/xml/page_remove_cup.xml"
+		Else
+		    Open "ROOT/taobin_project/inter/gbr/xml/page_show_error.lxml"
+		EndIf
 	EndIf
 
 	Refresh

inter/tha/xml/multi/v3/event/dummy_layout_promotion.py

@@ -11,7 +11,8 @@ if "v3" in param and "promotion" in param and "other_catalog" in param:
 
 	files = os.listdir(directory_to_process + "/event/event_v3/catalog_other")
 	files = [f for f in files if f.endswith(".json")]
-	for filename in files:
+	files.sort()
+	for filename in reversed(files):
 		pro_json_file = open(directory_to_process + "/event/event_v3/catalog_other/"+ filename)
 		pro_json = json.load(pro_json_file)
 		start_time = datetime.datetime.strptime(pro_json["start"], "%Y-%m-%dT%H:%M:%S")
@@ -25,9 +26,9 @@ if "v3" in param and "promotion" in param and "other_catalog" in param:
 			pro_content = pro_content.replace("#EventClick", pro_json["event_click"])
 			all_active_pro += pro_content + "\n\t"
 
-		pro_output_file = open(directory_to_process + "/event/event_v3/catalog_other/active_promotions.lxml", 'w')
-		pro_output_file.write(template_content.replace(";banners", all_active_pro))
-		pro_output_file.close()
+	pro_output_file = open(directory_to_process + "/event/event_v3/catalog_other/active_promotions.lxml", 'w')
+	pro_output_file.write(template_content.replace(";banners", all_active_pro))
+	pro_output_file.close()
 
 if "v3" in param and "promotion" in param:
 	file_template = open(directory_to_process + "/page_catalog_group_recommend.lxml", 'r')
@@ -43,7 +44,7 @@ if "v3" in param and "promotion" in param:
 	files = os.listdir(directory_to_process + "/event/event_v3")
 	files = [f for f in files if f.endswith(".json")]
 	files.sort()
-	for filename in files:
+	for filename in reversed(files):
 		pro_json_file = open(directory_to_process + "/event/event_v3/"+ filename)
 		pro_json = json.load(pro_json_file)
 		start_time = datetime.datetime.strptime(pro_json["start"], "%Y-%m-%dT%H:%M:%S")

inter/tha/xml/multi/v3/event/event_v3/8_promotion_americano.json

@@ -0,0 +1,9 @@
+{
+  "start": "2025-07-01T00:00:00",
+  "end": "2025-07-31T00:00:00",
+  "state": "AmericanoProState",
+  "type": "IMAGE",
+  "media_thai": "ROOT/taobin_project/image/event/americano/americano_banner.png",
+  "media_eng": "ROOT/taobin_project/image/event/americano/americano_banner.png",
+  "event_click": "TabMenuVisibleInst 99\r\nOpenInst 2 \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_americano.lxml\""
+}

inter/tha/xml/multi/v3/event/event_v3/active_promotions.lxml

@@ -108,6 +108,23 @@
 		<MenuUnavailableLabel> 000013 </MenuUnavailableLabel>
 	</Configuration>
 	<Menus>
+		<Banner>
+			<State> AmericanoProState </State>
+			<Type> IMAGE </Type>
+			<Media>
+				eval(
+					If show_eng = "true" Then
+						Var return = "ROOT/taobin_project/image/event/americano/americano_banner.png"
+					Else
+						Var return = "ROOT/taobin_project/image/event/americano/americano_banner.png"
+					EndIf
+				)
+			</Media>
+			<EventOnClick>
+				TabMenuVisibleInst 99
+OpenInst 2 "ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_americano.lxml"
+			</EventOnClick>
+		</Banner>
 		<Banner>
 			<State> TaiwaneseTeaProState </State>
 			<Type> IMAGE </Type>