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

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