Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

2025-03-28 22:48:23 +07:00 · 2025-03-28 22:48:23 +07:00 · 909cbecfd3
commit 909cbecfd3
parent 226c293487 eb5ca86c68
5 changed files with 50 additions and 16 deletions
--- 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] = ""
--- 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
--- 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] = ""
--- 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
--- 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
@ -2087,6 +2091,7 @@
 	If Timeout >= 120 Then
 	  Var alphaState = "Invisible"
      Var cancelButtonQRPopupState = "Invisible"
+	  Var PopupTimeoutEnable = "Invisible"
      Var QRCodeImageState = "Invisible"


@ -2397,6 +2402,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 +3068,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 +3305,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