From 0bbb2fb7e4995ca4b5d3f3796467486aac21184f Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Fri, 28 Mar 2025 11:03:46 +0700
Subject: [PATCH 1/3] HKG: Update menu name

---
 inter/hkg/xml/multi/page_catalog_group_milk.lxml  |  6 +++---
 inter/hkg/xml/multi/page_catalog_group_other.lxml | 10 +++++-----
 inter/hkg/xml/page_catalog_group_milk.lxml        |  6 +++---
 inter/hkg/xml/page_catalog_group_other.lxml       | 10 +++++-----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/inter/hkg/xml/multi/page_catalog_group_milk.lxml b/inter/hkg/xml/multi/page_catalog_group_milk.lxml
index 3a8040e5..70fdeee6 100644
--- a/inter/hkg/xml/multi/page_catalog_group_milk.lxml
+++ b/inter/hkg/xml/multi/page_catalog_group_milk.lxml
@@ -6585,9 +6585,9 @@
 		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][0] = "GINGER CAFE LATTE"
+		Var NameLang[1][1] = "生姜拿铁咖啡"
+		Var NameLang[1][2] = "生薑拿鐵咖啡"
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
diff --git a/inter/hkg/xml/multi/page_catalog_group_other.lxml b/inter/hkg/xml/multi/page_catalog_group_other.lxml
index 1087d523..8b54c9d6 100644
--- a/inter/hkg/xml/multi/page_catalog_group_other.lxml
+++ b/inter/hkg/xml/multi/page_catalog_group_other.lxml
@@ -2963,7 +2963,7 @@
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = "7Up , Medicine drink, Ume, Ice"
+		Var DescLang[1][0] = "7Up , Energy drink, Ume, Ice"
 		Var DescLang[1][1] = "七喜、特鳖能量水、梅子，冰"
 		Var DescLang[1][2] = "七喜、特鳖能量水、梅子、冰"
 		Var DescLang[1][3] = ""
@@ -16671,13 +16671,13 @@
 	<State> Flag( 54-05-02-0034.Button,54-05-03-0034.Button,$Sum54050200345405030034) </State> 
 	<Button>
 	<State> $Sum54050200345405030034 </State> 
-	<Filename> "ROOT/taobin_project/inter/hkg/image/page_drink_n//bn_iced_energy_drink.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/hkg/image/page_drink_press_n//bn_iced_energy_drink.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/hkg/image/page_drink_disable_n2//bn_iced_energy_drink.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/hkg/image/page_drink_n//7Up , Energy drink, Ume, Ice" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/hkg/image/page_drink_press_n//7Up , Energy drink, Ume, Ice" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/hkg/image/page_drink_disable_n2//7Up , Energy drink, Ume, Ice" </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_iced_energy_drink.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/hkg/image/page_drink_picture2_n/" + "7Up , Energy drink, Ume, Ice"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
 		Var PriceD1 = $-.Price
diff --git a/inter/hkg/xml/page_catalog_group_milk.lxml b/inter/hkg/xml/page_catalog_group_milk.lxml
index 1f40804b..a37a70c5 100644
--- a/inter/hkg/xml/page_catalog_group_milk.lxml
+++ b/inter/hkg/xml/page_catalog_group_milk.lxml
@@ -6450,9 +6450,9 @@
 		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][0] = "GINGER CAFE LATTE"
+		Var NameLang[1][1] = "生姜拿铁咖啡"
+		Var NameLang[1][2] = "生薑拿鐵咖啡"
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
diff --git a/inter/hkg/xml/page_catalog_group_other.lxml b/inter/hkg/xml/page_catalog_group_other.lxml
index 4e4d9e44..7e92967e 100644
--- a/inter/hkg/xml/page_catalog_group_other.lxml
+++ b/inter/hkg/xml/page_catalog_group_other.lxml
@@ -3174,7 +3174,7 @@
 		Var NameLang[1][3] = ""
 		Var NameLang[1][4] = ""
 		Var NameLang[1][5] = ""
-		Var DescLang[1][0] = "7Up , Medicine drink, Ume, Ice"
+		Var DescLang[1][0] = "7Up , Energy drink, Ume, Ice"
 		Var DescLang[1][1] = "七喜、特鳖能量水、梅子，冰"
 		Var DescLang[1][2] = "七喜、特鳖能量水、梅子、冰"
 		Var DescLang[1][3] = ""
@@ -15549,13 +15549,13 @@
 	<State> Flag( 54-05-02-0034.Button,54-05-03-0034.Button,$Sum54050200345405030034) </State> 
 	<Button>
 	<State> $Sum54050200345405030034 </State> 
-	<Filename> "ROOT/taobin_project/inter/hkg/image/page_drink_n//bn_iced_energy_drink.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/hkg/image/page_drink_press_n//bn_iced_energy_drink.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/hkg/image/page_drink_disable_n2//bn_iced_energy_drink.png" </FilenameDisable>
+	<Filename> "ROOT/taobin_project/inter/hkg/image/page_drink_n//7Up , Energy drink, Ume, Ice" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/hkg/image/page_drink_press_n//7Up , Energy drink, Ume, Ice" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/hkg/image/page_drink_disable_n2//7Up , Energy drink, Ume, Ice" </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_iced_energy_drink.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/hkg/image/page_drink_picture2_n/" + "7Up , Energy drink, Ume, Ice"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
 		Var PriceD2 = $54-05-02-0034.Price

From 9e62d39908fa099a41447a3a75a175cfa423ed4a Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Fri, 28 Mar 2025 15:07:05 +0700
Subject: [PATCH 2/3] THAI: Added popup timeout for credit card

---
 xml/page_payment_cash.xml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index d6020a44..c5f6bfa0 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -196,6 +196,9 @@
 	Var SendCancelActionFlag = 0
 	Var CancelingPopupCountDown = 0
 
+	Var PopupTimeout = 20
+	Var PopupTimeoutEnable = "Invisible"
+
 	Var CashTextWarning = ""
 	Var QRErrorState = "Invisible"
 	Var QRErrorFlag = 0
@@ -1965,6 +1968,7 @@
 					If KBankCashlessMachine = 1 Then
 						; popup will close after 30 second
 						Var Timeout = 90
+						Var PopupTimeoutEnable = "Invisible"
 						Var cancelButtonQRPopupState = "Enable"
 					Else
 						Var Timeout = 0
@@ -2397,6 +2401,21 @@
         EndIf
     EndIf
 
+	If KBankCashlessMachine = 1 Then
+		If alphaState = "Enable" Then
+			If ReqPayInfoFromCashOther = 2 Then
+				If PopupTimeoutEnable = "Enable" Then
+					If PopupTimeout > 0 Then
+						Var PopupTimeout = PopupTimeout - 1
+					Else
+						Var PopupTimeoutEnable = "Invisible"
+						Var cancelButtonQRPopupState = "Enable"
+					EndIf
+				EndIf
+			EndIf
+		EndIf
+	EndIf
+
 	Refresh
 	TimerReset
 </EventTimeout>
@@ -3048,6 +3067,8 @@
 				If KBankCashlessMachine = 1 Then
 					Var QR_POPUP = "/img_popup8_with_service_charge.png"
 					Var cancelButtonQRPopupState = "Invisible"
+					Var PopupTimeoutEnable = "Enable"
+					Var PopupTimeout = 20
 				Else
 					Var QR_POPUP = "/img_popup8.png"
 					Var cancelButtonQRPopupState = "Enable"
@@ -3283,6 +3304,18 @@ eval(
 </EventClick>
 </Button>
 
+<Text>
+<X> 766 </X>
+<Y> 777 </Y>
+<State> PopupTimeoutEnable </State>
+<Width> 50 </Width>
+<Size> 25 </Size>
+<Align> center-vertical-horizontal </Align>
+<Font> RobotoRegular </Font>
+<Color> 0xDE794E </Color>
+<Value> PopupTimeout </Value>
+</Text>
+
 
 
 ; begin cash popup

From eb5ca86c68eeef19f9c6955c6cebae30abf21dce Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Fri, 28 Mar 2025 16:44:04 +0700
Subject: [PATCH 3/3] THAI: update

---
 xml/page_payment_cash.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index c5f6bfa0..813ff0d1 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -2091,6 +2091,7 @@
 	If Timeout >= 120 Then
 	  Var alphaState = "Invisible"
       Var cancelButtonQRPopupState = "Invisible"
+	  Var PopupTimeoutEnable = "Invisible"
       Var QRCodeImageState = "Invisible"