From 9545fc63e0b85deafc280b376f55740e1e287d23 Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Wed, 28 Aug 2024 13:37:07 +0700
Subject: [PATCH] AUS: update australia

---
 inter/aus/xml/page_catalog_group_milk.lxml |   6 +-
 inter/aus/xml/page_show_error.lxml         | 130 ++++++++++-----------
 xml/page_payment_cash-AUS.xml              |   2 +-
 3 files changed, 67 insertions(+), 71 deletions(-)

diff --git a/inter/aus/xml/page_catalog_group_milk.lxml b/inter/aus/xml/page_catalog_group_milk.lxml
index d224e6b2..d74b002d 100644
--- a/inter/aus/xml/page_catalog_group_milk.lxml
+++ b/inter/aus/xml/page_catalog_group_milk.lxml
@@ -9305,7 +9305,7 @@
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "51-03-03-0047"
 		; begin lang 
-		Var aliasName[0] = "Mint MILK \nBISCOFF VOLCANO"
+		Var aliasName[0] = "MINT MILK \nBISCOFF VOLCANO"
 		Var aliasDesc[0] = "Mint Syrup, Milk,\nSugar, Biscof"
 		Var aliasName[1] = ""
 		Var aliasDesc[1] = ""
@@ -9400,9 +9400,9 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<LanguageGroup>
-		<LanguageSlot1>Mint MILK \nBISCOFF VOLCANO</LanguageSlot1>
+		<LanguageSlot1>MINT MILK \nBISCOFF VOLCANO</LanguageSlot1>
 		<LanguageSlot2></LanguageSlot2>
-		<LanguageSlot3>Mint MILK \nBISCOFF VOLCANO</LanguageSlot3>
+		<LanguageSlot3>MINT MILK \nBISCOFF VOLCANO</LanguageSlot3>
 		<LanguageSlot4></LanguageSlot4>
 		<LanguageSlot5></LanguageSlot5>
 		<LanguageSlot6></LanguageSlot6>
diff --git a/inter/aus/xml/page_show_error.lxml b/inter/aus/xml/page_show_error.lxml
index 3a433b6a..03f9ad66 100644
--- a/inter/aus/xml/page_show_error.lxml
+++ b/inter/aus/xml/page_show_error.lxml
@@ -29,7 +29,68 @@
 		LED LedDoorLid Off 255 255 255 255
 	EndIf
 
-	Function 2
+	DEBUGVAR MachineStage
+	DEBUGVAR stop_now
+	Var DirImage = "ROOT/taobin_project/inter/aus/image/vending_error_en"
+	If MachineStage = "mcu-upgrade" Then
+		Var DirImage = CountryRootPath + "image/vending_error_en"
+	EndIf
+
+	If NeedUpgrade = "true" Then
+		Var DirImage = CountryRootPath + "image/vending_error_en"
+	EndIf
+
+	DEBUGVAR MachineStage
+	
+	If MachineStage = "close-maintenance" Then
+		DEBUGVAR stop_now
+		If stop_now = "true" Then
+			Var DirImage = CountryRootPath + "image/vending_error_en"
+		Else
+			Var show_error_normal = "Enable"
+			Var show_error_sp1 = "Invisible"
+			
+			Var DirImage = CountryRootPath + "image/vending_error_en"
+		EndIf
+	EndIf
+
+
+
+	If MachineStage = "drink-failed" Then
+		If stop_now = "true" Then
+			Var DirImage = CountryRootPath + "image/vending_error_en"
+		Else
+			Var show_error_normal = "Enable"
+			Var show_error_sp1 = "Invisible"
+			Var DirImage = CountryRootPath + "image/vending_error_en"
+		EndIf
+	EndIf
+	
+	If NETCORE_LOST_CNT > 0 Then
+		
+		Var DirImage = CountryRootPath + "image/vending_error_en"
+	EndIf
+
+	If NETCORE_EVENT_CNT_X >= 30 Then
+		Var NETCORE_EVENT_CNT_X = 0
+		
+		Var DirImage = CountryRootPath + "image/vending_error_en"
+	EndIf
+
+	Var MaintenanceCard = 20
+	Random MaintenanceCard
+	Var index = 1 + MaintenanceCard
+
+	DEBUGVAR DirImage
+
+
+	Var RandomImage = "ROOT/taobin_project/image/close_en/Frame" + index
+	Var RandomImage =  RandomImage + ".png"
+	DEBUGVAR RandomImage
+	DEBUGVAR Seeker
+	DEBUGVAR DoorCupPosition
+	DEBUGVAR DoorLidPosition
+	DEBUGVAR EmergencyStop
 
 	Var TimeOut = 0
 	Var textStep = 0
@@ -188,76 +249,11 @@
 	Var ButtonLanguageListYPosition = 640
 	OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
 
-	Function 2
+	Open "ROOT/taobin_project/inter/aus/xml/page_show_error.lxml"
 
 	Refresh
 </EventLanguageOnChange>
 
-<Function2>
-	DEBUGVAR MachineStage
-	DEBUGVAR stop_now
-	Var DirImage = "ROOT/taobin_project/inter/aus/image/vending_error_en"
-	If MachineStage = "mcu-upgrade" Then
-		Var DirImage = CountryRootPath + "image/vending_error_en"
-	EndIf
-
-	If NeedUpgrade = "true" Then
-		Var DirImage = CountryRootPath + "image/vending_error_en"
-	EndIf
-
-	DEBUGVAR MachineStage
-	
-	If MachineStage = "close-maintenance" Then
-		DEBUGVAR stop_now
-		If stop_now = "true" Then
-			Var DirImage = CountryRootPath + "image/vending_error_en"
-		Else
-			Var show_error_normal = "Enable"
-			Var show_error_sp1 = "Invisible"
-			
-			Var DirImage = CountryRootPath + "image/vending_error_en"
-		EndIf
-	EndIf
-
-
-
-	If MachineStage = "drink-failed" Then
-		If stop_now = "true" Then
-			Var DirImage = CountryRootPath + "image/vending_error_en"
-		Else
-			Var show_error_normal = "Enable"
-			Var show_error_sp1 = "Invisible"
-			Var DirImage = CountryRootPath + "image/vending_error_en"
-		EndIf
-	EndIf
-	
-	If NETCORE_LOST_CNT > 0 Then
-		
-		Var DirImage = CountryRootPath + "image/vending_error_en"
-	EndIf
-
-	If NETCORE_EVENT_CNT_X >= 30 Then
-		Var NETCORE_EVENT_CNT_X = 0
-		
-		Var DirImage = CountryRootPath + "image/vending_error_en"
-	EndIf
-
-	Var MaintenanceCard = 20
-	Random MaintenanceCard
-	Var index = 1 + MaintenanceCard
-
-	DEBUGVAR DirImage
-
-
-	Var RandomImage = "ROOT/taobin_project/image/close_en/Frame" + index
-	Var RandomImage =  RandomImage + ".png"
-	DEBUGVAR RandomImage
-	DEBUGVAR Seeker
-	DEBUGVAR DoorCupPosition
-	DEBUGVAR DoorLidPosition
-	DEBUGVAR EmergencyStop
-</Function2>
-
 <Image>
 <State> show_error_normal </State>
 <X> 69 </X>
diff --git a/xml/page_payment_cash-AUS.xml b/xml/page_payment_cash-AUS.xml
index 35d204c0..05d1457c 100644
--- a/xml/page_payment_cash-AUS.xml
+++ b/xml/page_payment_cash-AUS.xml
@@ -365,7 +365,7 @@
 			Var PayState2 = "Disable"
 			Var PayState3 = "Disable"
 			Var PayState4 = "Disable"
-			Var PayState5 = "Disable"
+			Var PayState5 = "Enable"
 			Var PayState6 = "Disable"
 
 			Var PayOfflineMode = 1