GBR & AUS: Update remove cup

inter/aus/xml/page_remove_cup.lxml

@@ -15,7 +15,7 @@
 	DEBUGVAR "AUS Remove Cup"
 
     Var DirImage = "ROOT/taobin_project/inter/common/image/user_take_cup_en/"
-		
+
 	LED LedDoorDoor 5 255 255 255 255
 
 	;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
@@ -25,19 +25,16 @@
 	Var remove_cup_name = ""
 	Var remove_cup_image = ""
 
+	Var remove_cup_button_text = "Press Here"
+
 	RootLayoutVisible 3 "show"
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>
-	
-	;SAVELOG MachineErrorDetail
-	Var MachineErrorDetailAll = MachineErrorDetail + " / "
-	Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
 
-	If InternationalEnable = 1 Then
+	;SAVELOG MachineErrorDetail
-		Var MachineErrorDetailAll = MachineErrorDetailEng
+	Var MachineErrorDetailAll = MachineErrorDetailEng
-	EndIf
 
 
 	; Add haveCup false for block display abnormal. Alternate between page_board.xml and this file.
@@ -109,21 +106,40 @@
 <Y> 1661 </Y>
 <Filename> Var( DirImage + "/bn_door_open.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/bp_door_open.png" )</FilenamePress>
+<FilenameDisable> Var( DirImage + "/bd_door_open.png" ) </FilenameDisable>
+<FilenameDisable2> Var( DirImage + "/bd_door_open_rem.png" ) </FilenameDisable2>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <State> buttonRemoveCup </State>
-<EventClick> 
+<EventClick>
 	;include=ROOT/taobin_project/inc/remove_cup_button.inc
+
+	If buttonRemoveCup = "Enable" Then
+        Var remove_cup_button_text = "Press Here"
+    EndIf
+
+    If buttonRemoveCup = "Disable" Then
+        Var remove_cup_button_text = "Please Wait..."
+    EndIf
+
+    If buttonRemoveCup = "Disable2" Then
+        Var remove_cup_button_text = "Please take cup below"
+    EndIf
 </EventClick>
-<Language>
-  <ID> 000411 </ID>
-  <X> 80 </X>
-  <Y> 40 </Y>
-  <Width> 500 </Width>
-  <Height> 50 <Height>
-</Language>
 </Button>
 
+<Text>
+    <X> 212 </X>
+    <Y> 1705 </Y>
+    <Width> 656 </Width>
+    <Font> KanitRegularTTF </Font>
+    <Size> 56 </Size>
+    <Color> 0xFFFFFF </Color>
+    <State> buttonRemoveCup </State>
+    <Value> remove_cup_button_text </Value>
+    <Align> Center </Align>
+<Text>
+
 
 <Image>
 <X> 125 </X>

inter/gbr/menu/lang.tsv

@@ -197,6 +197,8 @@ TextID	Note	English	Thai
 		Font=Roboto,Type=Regular,Size=36,Color=0x513C2F,Align=Center,LineHeight=50	Font=Roboto,Type=Regular,Size=43,Color=0x513C2F,Align=Center,LineHeight=40
 000410		Please press the button below to open the door.\nTake the drink out.\nAnd start ordering your drink.	กรุณกดปุ่มเปิดช่องรับเครื่องดื่ม\nนำเครื่องดื่มที่ค้างอยู่ออกจากช่อง\nก่อนเริ่มสั่งเครื่องดื่มของคุณ
 		Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50	Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
+		Font=Kanit,Type=Regular,Size=64,Color=0xCCCCCC,Align=Center,LineHeight=50	Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
+		Font=Kanit,Type=Regular,Size=64,Color=0xAAAAAA,Align=Center,LineHeight=50	Font=Kanit,Type=Regular,Size=64,Color=0xFFFFFF,Align=Center,LineHeight=50
 000411		Press Here	กดที่นี่
 
 

inter/gbr/xml/page_remove_cup.lxml

@@ -25,6 +25,8 @@
 	Var remove_cup_name = ""
 	Var remove_cup_image = ""
 
+	Var remove_cup_button_text = "Press Here"
+
 	RootLayoutVisible 3 "show"
 
 </EventOpen>
@@ -32,12 +34,7 @@
 <EventTimeout>
 
 	;SAVELOG MachineErrorDetail
-	Var MachineErrorDetailAll = MachineErrorDetail + " / "
+	Var MachineErrorDetailAll = MachineErrorDetailEng
-	Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
-
-	If InternationalEnable = 1 Then
-		Var MachineErrorDetailAll = MachineErrorDetailEng
-	EndIf
 
 
 	; Add haveCup false for block display abnormal. Alternate between page_board.xml and this file.
@@ -109,21 +106,40 @@
 <Y> 1661 </Y>
 <Filename> Var( DirImage + "/bn_door_open.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/bp_door_open.png" )</FilenamePress>
+<FilenameDisable> Var( DirImage + "/bd_door_open.png" ) </FilenameDisable>
+<FilenameDisable2> Var( DirImage + "/bd_door_open_rem.png" ) </FilenameDisable2>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <State> buttonRemoveCup </State>
 <EventClick>
 	;include=ROOT/taobin_project/inc/remove_cup_button.inc
+
+	If buttonRemoveCup = "Enable" Then
+        Var remove_cup_button_text = "Press Here"
+    EndIf
+
+    If buttonRemoveCup = "Disable" Then
+        Var remove_cup_button_text = "Please Wait..."
+    EndIf
+
+    If buttonRemoveCup = "Disable2" Then
+        Var remove_cup_button_text = "Please take cup below"
+    EndIf
 </EventClick>
-<Language>
-  <ID> 000411 </ID>
-  <X> 80 </X>
-  <Y> 40 </Y>
-  <Width> 500 </Width>
-  <Height> 50 <Height>
-</Language>
 </Button>
 
+<Text>
+    <X> 212 </X>
+    <Y> 1705 </Y>
+    <Width> 656 </Width>
+    <Font> KanitRegularTTF </Font>
+    <Size> 56 </Size>
+    <Color> 0xFFFFFF </Color>
+    <State> buttonRemoveCup </State>
+    <Value> remove_cup_button_text </Value>
+    <Align> Center </Align>
+<Text>
+
 
 <Image>
 <X> 125 </X>

xml/page_remove_cup.xml

@@ -23,6 +23,10 @@
 	If StrCountryShort = "AUS" Then
 		Open "ROOT/taobin_project/inter/aus/xml/page_remove_cup.lxml"
 	EndIf
+	
+	If StrCountryShort = "GBR" Then
+	    Open "ROOT/taobin_project/inter/gbr/xml/page_remove_cup.lxml"
+	EndIf
 
 	If StrCountryShort = "SGP" Then
 		Open "ROOT/taobin_project/inter/sgp/xml/page_remove_cup.lxml"