diff --git a/inter/aus/xml/open_page_catalog.ev b/inter/aus/xml/open_page_catalog.ev
index bb6529bb..d9d210f2 100644
--- a/inter/aus/xml/open_page_catalog.ev
+++ b/inter/aus/xml/open_page_catalog.ev
@@ -1,7 +1,7 @@
 If WinterWarmersCatalogFlag = 1 Then
     Var catalogFile = CountryRootPath + "/xml/page_catalog_winter_warmers.lxml"
 Else
-    Var catalogFile = CountryRootPath + "/xml/page_catalog_westfield.lxml"
+    Var catalogFile = CountryRootPath + "/xml/page_catalog.lxml"
 EndIf
 
 
diff --git a/inter/aus/xml/page_catalog_westfield.lxml b/inter/aus/xml/page_catalog.lxml
similarity index 97%
rename from inter/aus/xml/page_catalog_westfield.lxml
rename to inter/aus/xml/page_catalog.lxml
index 37038b5b..cd41764f 100644
--- a/inter/aus/xml/page_catalog_westfield.lxml
+++ b/inter/aus/xml/page_catalog.lxml
@@ -42,6 +42,8 @@
 	Var GetPayInfoFlag = 0
 	Var countDownRetrun = 300
 
+    Var OpenRouteManTest = 0
+
 	CoinVending OFF
 
 	
@@ -712,6 +714,34 @@
 </EventClick>
 </Button>
 
+
+
+
+
+
+<Image>
+<X> 0 </X>
+<Y> 1820 </Y>
+<Width> 100 </Width>
+<Height> 100 </Height>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var ClickCountMainTe = ClickCountMainTe + 1
+	
+	DEBUGVAR ClickCountMainTe
+
+	If ClickCountMainTe = 2 Then 
+		Var OpenRouteManTest = 1
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        Var ClickCountMainTe = 0
+ 	EndIf
+</EventClick>
+</Image>
+
+
+
+
 <EventUnitTest1>
 	Var StrawGetMoreState = "Invisible"
 	Var bg_lidProblem_ST = "Invisible"
diff --git a/inter/aus/xml/page_catalog_cocktail.lxml b/inter/aus/xml/page_catalog_cocktail.lxml
index a1a14472..936324d7 100644
--- a/inter/aus/xml/page_catalog_cocktail.lxml
+++ b/inter/aus/xml/page_catalog_cocktail.lxml
@@ -681,6 +681,25 @@
 </EventWebApp>
 
 
+<Image>
+<X> 0 </X>
+<Y> 1820 </Y>
+<Width> 100 </Width>
+<Height> 100 </Height>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var ClickCountMainTe = ClickCountMainTe + 1
+	
+	DEBUGVAR ClickCountMainTe
+
+	If ClickCountMainTe = 2 Then 
+		Var OpenRouteManTest = 1
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        Var ClickCountMainTe = 0
+ 	EndIf
+</EventClick>
+</Image>
 
 
 <Button>
diff --git a/inter/aus/xml/page_catalog_group_menu_test.lxml b/inter/aus/xml/page_catalog_group_menu_test.lxml
new file mode 100644
index 00000000..7a55c212
--- /dev/null
+++ b/inter/aus/xml/page_catalog_group_menu_test.lxml
@@ -0,0 +1,316 @@
+<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"
+
+
+<FrameScroll> 
+<X> 10 </X>
+<Y> 497 </Y>
+<Width> 1080 </Width>
+<ScrollHeight> "auto" </ScrollHeight>
+<Scroll> "Vertical" </Scroll>
+<Column> 4 </Column>
+<Script>
+	 Var block_index_override = 0
+	 Var block_index_move = 0
+</Script>
+;dummy_layout.inc
+	; ==================> Len = 1
+	; 51-99-99-9999
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> Flag( 51-99-99-9999.Button,$Sum5199999999) </State> 
+	<Button>
+	<State> $Sum5199999999 </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 = $-.Price
+		Var PriceD2 = $51-99-99-9999.Price
+		Var PriceD3 = $-.Price
+		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE2 = "51-99-99-9999"
+		Var PD_CODE3 = "##-##-##-####"
+		; begin lang 
+		Var aliasName[0] = "Test Drink"
+		Var aliasDesc[0] = "Just drop cup"
+		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] = "Test Drink"
+		Var NameLang[1][1] = "นมเย็น"
+		Var NameLang[1][2] = ""
+		Var NameLang[1][3] = ""
+		Var NameLang[1][4] = ""
+		Var NameLang[1][5] = ""
+		Var DescLang[1][0] = "Just drop cup"
+		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 = $51-99-99-9999.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-99-99-9999"
+		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>Test Drink</LanguageSlot1>
+		<LanguageSlot2>นม</LanguageSlot2>
+		<LanguageSlot3>Test Drink</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> "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-99-99-9999.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-99-99-9999.Button </State>
+	<Value> StringFmt( $51-99-99-9999.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 $Sum5199999999 = "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 $Sum5199999999 = "Disable" Then
+				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $51-99-99-9999.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> $Sum5199999999 </State> 
+	<Language>
+		<ID> 000013 </ID> 
+	</Language>
+	<Align> center-vertical-horizontal </Align>
+	</Text>
+</Block>
+</FrameScroll>
+
+<EventUnitTest4>
+    RefreshAll
+</EventUnitTest4>
+
+
+</Popup>
diff --git a/inter/aus/xml/page_catalog_winter_warmers.lxml b/inter/aus/xml/page_catalog_winter_warmers.lxml
index a23b4b4a..2a1ba4e0 100644
--- a/inter/aus/xml/page_catalog_winter_warmers.lxml
+++ b/inter/aus/xml/page_catalog_winter_warmers.lxml
@@ -693,6 +693,26 @@
 
 
 
+<Image>
+<X> 0 </X>
+<Y> 1820 </Y>
+<Width> 100 </Width>
+<Height> 100 </Height>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var ClickCountMainTe = ClickCountMainTe + 1
+	
+	DEBUGVAR ClickCountMainTe
+
+	If ClickCountMainTe = 2 Then 
+		Var OpenRouteManTest = 1
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        Var ClickCountMainTe = 0
+ 	EndIf
+</EventClick>
+</Image>
+
 
 <Button>
 <X> 780 </X>
diff --git a/inter/aus/xml/page_drinkfail_aus.lxml b/inter/aus/xml/page_drinkfail_aus.lxml
new file mode 100644
index 00000000..d402260c
--- /dev/null
+++ b/inter/aus/xml/page_drinkfail_aus.lxml
@@ -0,0 +1,646 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xEFEDEA" </Background>
+<Volume> SoundVolume </Volume>
+;<Refresh> "Partial" </Refresh>
+<EventOpen>
+	; On open
+
+	Var Seeker.TNumberTaobinMember = ""
+
+	
+	DEBUGVAR TelephoneNumberProblem
+	DEBUGVAR Seeker.PromotionIDCurrentOrder
+
+	If TelephoneNumberProblem = "" Then
+
+	Else
+		Var NumberFailed = "true"
+		CHECKNUMBERFAIL TelephoneNumberProblem NumberFailed
+
+		DEBUGVAR NumberFailed
+		DEBUGVAR ERROR_PAY_TIMEOUT
+		DEBUGVAR ERROR_BREW_CAUSE_ENG
+		DEBUGVAR ERROR_BREW_CAUSE_THAI
+
+
+		If FailedCount > 0 Then 
+			Var ERROR_PAY_TIMEOUT = "false"
+			DEBUGVAR FailedCount
+			DEBUGVAR ERROR_PAY_TIMEOUT
+		EndIf
+
+		If  NextOrder = "true" Then
+			Var ERROR_PAY_TIMEOUT = "false"
+			DEBUGVAR FailedCount
+			DEBUGVAR ERROR_PAY_TIMEOUT
+		EndIf
+
+
+		If ERROR_PAY_TIMEOUT = "true" Then
+			
+			If NumberFailed = "false" Then
+
+				If show_eng = "true" Then 
+					Var TextErrorShow = ERROR_BREW_CAUSE_ENG
+				Else
+					If show_japan = "true" Then 
+						Var TextErrorShow = ERROR_BREW_CAUSE_JAPAN
+					Else
+						Var TextErrorShow = ERROR_BREW_CAUSE_THAI
+					EndIf
+				EndIf
+
+
+				Open "ROOT/taobin_project/xml/page_drinkfail4.xml" 
+
+			EndIf
+
+			
+			Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
+		Else
+			Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
+		EndIf
+		
+		
+	EndIf
+
+
+	
+	
+	
+
+	If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/collectiing_en/"
+
+	Else
+		Var DirImage = "ROOT/taobin_project/image/collectiing/"
+	EndIf
+
+	
+	Var Timeout = 0
+
+	
+	StopLongPlay
+
+
+	
+
+   
+
+    Var MachineErrorDetailAll = MachineErrorDetail + " / "
+	Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
+
+	
+
+
+	If show_eng = "true" Then 
+		Var textRefundChannelX = "textRefundChannel1.png"
+		Var xRefundChannelX = 249
+
+		If Seeker.PayWithQR = 0 Then 
+
+			If Seeker.StoreCreditFlag = 1 Then
+				Var textRefundChannelX = "textRefundChannel2.png"
+				Var xRefundChannelX = 249
+			EndIf
+
+			If Seeker.CodeChannel = 1 Then
+				Var textRefundChannelX = "textRefundChannel3.png"
+				Var xRefundChannelX = 60
+			EndIf
+
+		Else
+			Var textRefundChannelX = "textRefundChannel3.png"
+			Var xRefundChannelX = 60
+		EndIf
+
+		Var textRefundChannelX = "textRefundChannel3.png"
+		Var xRefundChannelX = 60
+
+	Else
+		Var textRefundChannelX = "textRefundChannel1.png"
+		Var xRefundChannelX = 204
+
+		If Seeker.PayWithQR = 0 Then 
+
+			If Seeker.StoreCreditFlag = 1 Then
+				Var textRefundChannelX = "textRefundChannel2.png"
+				Var xRefundChannelX = 256
+			EndIf
+
+			If Seeker.CodeChannel = 1 Then
+				Var textRefundChannelX = "textRefundChannel3.png"
+				Var xRefundChannelX = 162
+			EndIf
+
+		Else
+			Var textRefundChannelX = "textRefundChannel3.png"
+			Var xRefundChannelX = 162
+		EndIf
+
+		Var textRefundChannelX = "textRefundChannel3.png"
+		Var xRefundChannelX = 162
+	EndIf
+
+	Var text22 = "/text22.png"
+
+	DEBUGVAR CountryName
+	DEBUGVAR MaxPhoneNumber
+	
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	
+	SAVELOG MachineStage
+
+    Var Timeout = Timeout + 1
+
+	If Timeout > 15 Then
+
+        If MachineStage = "remove-cup" Then
+			Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
+		Else
+			If  NextOrder = "true" Then
+				Var NextOrder = "false"
+
+				TransferVar "next" "curr"
+				Var Seeker = "curr"
+							
+				Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
+			Else
+				Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+			EndIf
+		EndIf
+	EndIf
+
+	
+
+	TimerReset
+
+</EventTimeout> 
+
+
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+
+
+
+
+
+
+
+
+<Button>
+<X> 333 </X>
+<Y> 1281 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_1.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_1.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "1"
+	Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1281 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_2.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_2.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "2"
+	Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 620 </X>
+<Y> 1281 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_3.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_3.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "3"
+	Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+	
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 333 </X>
+<Y> 1395 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_4.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_4.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "4"
+	Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+	
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1395 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_5.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_5.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "5"
+	Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 620 </X>
+<Y> 1395 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_6.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_6.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "6"
+	Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 333 </X>
+<Y> 1507 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_7.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_7.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "7"
+	Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+	
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1507 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_8.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_8.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "8"
+    Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 620 </X>
+<Y> 1507 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_9.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_9.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "9"
+	 Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+	
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1620 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_0.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_0.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Var TelephoneNumberProblem = TelephoneNumberProblem + "0"
+	 Trim TelephoneNumberProblem MaxPhoneNumber
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then 
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+	
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 620 </X>
+<Y> 1620 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bns_back-1.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_back-1.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Var Timeout = 0
+	Trim TelephoneNumberProblem  -1
+	
+	StrLen TelephoneNumberProblem TelNumLen
+
+	If TelNumLen < 10 Then 
+		Var Tel_Confirm_State = "Invisible"
+	EndIf
+	
+	If TelNumLen = 0 Then 
+		Var ShowTextNumber = "Enable"
+	EndIf
+
+	TimerReset
+	Refresh
+	
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 44 </X>
+<Y> 1783 </Y>
+<Filename> Var( DirImage + "/bn_back2.png" )</Filename>
+<FilenamePress> Var( DirImage + "/bp_back2.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+
+	
+
+			
+	If MachineStage = "remove-cup" Then
+		Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
+	Else
+		
+		If  NextOrder = "true" Then
+			Var NextOrder = "false"
+
+			TransferVar "next" "curr"
+			Var Seeker = "curr"
+						
+			Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
+		Else
+			Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+		EndIf
+	EndIf
+
+
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 750 </X>
+<Y> 1783 </Y>
+<Refresh> "Enable" </Refresh>
+<State> Tel_Confirm_State </State>
+<Filename> Var( DirImage + "/bn_confirm.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_confirm.png" )</FilenamePress>
+<FilenameDisable> Var( DirImage + "/bp_confirm.png" )</FilenameDisable>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+
+	StrLen TelephoneNumberProblem TelNumLen
+	If TelNumLen >= MinPhoneNumber Then  
+
+		If MachineStage = "remove-cup" Then
+			Open "ROOT/taobin_project/xml/page_drinkfail3.xml" 
+		Else
+			If  NextOrder = "true" Then
+				Var NextOrder = "false"
+
+				TransferVar "next" "curr"
+				Var Seeker = "curr"
+						
+				Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
+			Else
+				Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
+			EndIf
+		EndIf
+
+	EndIf
+
+	
+
+</EventClick>
+</Button>
+
+;<Image>
+;<X> xRefundChannelX </X>
+;<Y> 960 </Y>
+;<Filename> Var( DirImage + textRefundChannelX ) </Filename>
+;</Image>
+
+<Image>
+<X> 47 </X>
+<Y> 408 </Y>
+<Filename> Var( DirImage + text22 ) </Filename>
+</Image>
+
+;<Image>
+;<X> 410 </X>
+;<Y> 524 </Y>
+;<Filename> Var( DirImage + "/Businessman_sorry.png" ) </Filename>
+;</Image>
+
+
+
+<Image>
+<X> 262 </X>
+<Y> 1119 </Y>
+<Filename> Var( DirImage + "/img5.png" ) </Filename>
+</Image>
+
+<Image>
+<X> 400 </X>
+<Y> 1160 </Y>
+<State> ShowTextNumber </State>
+;<Refresh> "Enable" </Refresh>
+<Filename> Var( DirImage + "/text15.png" )</Filename>
+</Image>
+
+<Image>
+<X> 293 </X>
+<Y> 1140 </Y>
+<State> ShowTextNumber </State>
+;<Refresh> "Enable" </Refresh>
+<Filename> Var( DirImage + "/Group.png" )</Filename>
+</Image>
+
+<Text>
+<X> 0 </X>
+<Y> 1140 </Y>
+<Width> 1080 </Width>
+<Align> Center </Align>
+<Size> 62 </Size>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+
+<Value> TelephoneNumberProblem </Value>
+<Format> Telnum-mask-1 </Format>
+</Text>
+
+
+
+
+<Text>
+<X> 5 </X>
+<Y> 1868 </Y>
+<Size> 24 </Size>
+<Align> Center </Align>
+<Width> 1080 </Width>
+<Font> RobotoRegular </Font>
+<Color> 0xDE794E </Color>
+<Value> MachineErrorDetailAll </Value>
+</Text>
+
+
+
+
+</Popup>
\ No newline at end of file
diff --git a/inter/aus/xml/route_man_test.lxml b/inter/aus/xml/route_man_test.lxml
new file mode 100644
index 00000000..b3e3cb68
--- /dev/null
+++ b/inter/aus/xml/route_man_test.lxml
@@ -0,0 +1,61 @@
+<Page>
+<Width> 1080 </Width>
+<Height> 1312 </Height>
+<Volume> SoundVolume </Volume>
+<Background> "0xeae6e1" </Background>
+<EventOpen>
+    Var OpenRouteManTest = 0
+    Var Timeout = 0
+</EventOpen>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+    Var Timeout = Timeout + 1
+    DEBUGVAR Timeout
+
+    If Timeout > 15 Then
+        Open "ROOT/taobin_project/xml/page_board.xml"
+	EndIf
+
+	TimerReset
+</EventTimeout>
+
+
+
+<Image>
+<X> 290 </X>
+<Y> 800 </Y>
+<Filename> "ROOT/taobin_project/image/tab_1.png" </Filename>
+<EventClick>
+	TopView "show"
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+    OpenInst 2 "ROOT/taobin_project/inter/aus/xml/page_catalog_group_menu_test.lxml"
+</EventClick>
+</Image>
+
+<Text>
+<X> 290 </X>
+<Y> 800 </Y>
+<Width> 500 </Width>
+<Height> 75 </Height>
+<Size> 30 </Size>
+<Font> fontType1 </Font>
+<Color> 0x000000 </Color>
+<Align> center-vertical-horizontal </Align>
+<Value> "Test Buy Drink" </Value>
+</Text>
+
+
+<Button>
+<X> 431 </X>
+<Y> 1100 </Y>
+<Filename> "ROOT/taobin_project/image//bp_cancel.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/bp_cancel.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	Open "ROOT/taobin_project/xml/page_board.xml"
+</EventClick>
+</Button>
+
+</Page>
\ No newline at end of file
diff --git a/xml/page_back_to_main.xml b/xml/page_back_to_main.xml
index c9575456..e5ffcf3f 100644
--- a/xml/page_back_to_main.xml
+++ b/xml/page_back_to_main.xml
@@ -7,8 +7,12 @@
 	; Reset here
 	Var CheckCupStateDoorCupClose = ""
 
-	
-	OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml"
+	If OpenRouteManTest = 1 Then
+		Var routeManTest = CountryRootPath + "/xml/route_man_test.lxml"
+ 		OpenInst 0 routeManTest
+	Else
+		OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_board.xml"
+	EndIf
 	
 	If showMultiAds = "true" Then
 		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/sold_cup_count.xml"
diff --git a/xml/page_drinkfail2.xml b/xml/page_drinkfail2.xml
index b81f6ecf..49e0160b 100644
--- a/xml/page_drinkfail2.xml
+++ b/xml/page_drinkfail2.xml
@@ -19,6 +19,10 @@
 		Open "ROOT/taobin_project/inter/sgp/xml/page_drinkfail_sg.lxml"
 	EndIf
 
+	If CountryName = "Australia" Then 
+		Open "ROOT/taobin_project/inter/aus/xml/page_drinkfail_aus.lxml"
+	EndIf
+ 
 
 
 	If TelephoneNumberProblem = "" Then
diff --git a/xml/vending_info.xml b/xml/vending_info.xml
index c13b95e1..ba2fef6d 100644
--- a/xml/vending_info.xml
+++ b/xml/vending_info.xml
@@ -3,7 +3,7 @@
 <Width> 1080 </Width>
 <Height> 1312 </Height>
 <Volume> SoundVolume </Volume>
-<Background> "ROOT/image/BG1SLOT_TAB.bmp" </Background>
+<Background> "0xeae6e1" </Background>
 <EventOpen>
 	; On open
 	Machine AndroidTemperatureUpdateNow