Update page_payment_cash.xml

xml/page_payment_cash.xml

@@ -140,6 +140,10 @@
 	Var alphaState3 = "Invisible"
 	Var alphaState3_offline = "Invisible"
 
+	Var cancelButtonQRPopupState = "Invisible"
+
+	Var QRCodeImageState = "Invisible"
+
 
 	Var CoinInFlag = 0
 	;Var CoinAmount = 0
@@ -599,6 +603,8 @@
 
 				Var FlagQROpened = 1
 				Var alphaState = "Enable"
+				Var cancelButtonQRPopupState = "Enable"
+				Var QRCodeImageState = "Enable"
 				;CoinVending OFF
 				VendingQR ON
 				Var QRPopupOpenFlag = 1
@@ -665,6 +671,8 @@
 
 				Var FlagQROpened = 1
 				Var alphaState = "Enable"
+				Var cancelButtonQRPopupState = "Enable"
+				Var QRCodeImageState = "Enable"
 				;CoinVending OFF
 				VendingQR ON
 				Var QRPopupOpenFlag = 1
@@ -718,6 +726,8 @@
 
 				Var FlagQROpened = 1
 				Var alphaState = "Enable"
+				Var cancelButtonQRPopupState = "Enable"
+				Var QRCodeImageState = "Enable"
 				;CoinVending OFF
 				VendingQR ON
 				Var QRPopupOpenFlag = 1
@@ -770,6 +780,8 @@
 
 				Var FlagQROpened = 1
 				Var alphaState = "Enable"
+				Var cancelButtonQRPopupState = "Enable"
+				Var QRCodeImageState = "Enable"
 				;CoinVending OFF
 				VendingQR ON
 				Var QRPopupOpenFlag = 1
@@ -821,6 +833,8 @@
 
 				Var FlagQROpened = 1
 				Var alphaState = "Enable"
+				Var cancelButtonQRPopupState = "Enable"
+				Var QRCodeImageState = "Enable"
 				;CoinVending OFF
 				VendingQR ON
 				Var QRPopupOpenFlag = 1
@@ -872,6 +886,8 @@
 
 				Var FlagQROpened = 1
 				Var alphaState = "Enable"
+				Var cancelButtonQRPopupState = "Enable"
+				Var QRCodeImageState = "Enable"
 				;CoinVending OFF
 				VendingQR ON
 				Var QRPopupOpenFlag = 1
@@ -923,6 +939,8 @@
 
 				Var FlagQROpened = 1
 				Var alphaState = "Enable"
+				Var cancelButtonQRPopupState = "Enable"
+				Var QRCodeImageState = "Enable"
 				;CoinVending OFF
 				VendingQR ON
 				Var QRPopupOpenFlag = 1
@@ -975,6 +993,8 @@
 
 				Var FlagQROpened = 1
 				Var alphaState = "Enable"
+				Var cancelButtonQRPopupState = "Enable"
+				Var QRCodeImageState = "Enable"
 				;CoinVending OFF
 				VendingQR ON
 				Var QRPopupOpenFlag = 1
@@ -1027,6 +1047,8 @@
 
 				Var FlagQROpened = 1
 				Var alphaState = "Enable"
+				Var cancelButtonQRPopupState = "Enable"
+				Var QRCodeImageState = "Enable"
 				;CoinVending OFF
 				VendingQR ON
 				Var QRPopupOpenFlag = 1
@@ -1078,6 +1100,8 @@
 
 				Var FlagQROpened = 1
 				Var alphaState = "Enable"
+				Var cancelButtonQRPopupState = "Enable"
+				Var QRCodeImageState = "Enable"
 				;CoinVending OFF
 				VendingQR ON
 				Var QRPopupOpenFlag = 1
@@ -1130,6 +1154,8 @@
 
 				Var FlagQROpened = 1
 				Var alphaState = "Enable"
+				Var cancelButtonQRPopupState = "Enable"
+				Var QRCodeImageState = "Enable"
 				;CoinVending OFF
 				VendingQR ON
 				Var QRPopupOpenFlag = 1
@@ -1187,6 +1213,8 @@
 
 			Var FlagQROpened = 1
 			Var alphaState = "Enable"
+			Var cancelButtonQRPopupState = "Enable"
+			Var QRCodeImageState = "Enable"
 
 			VendingQR ON
 			Var QRPopupOpenFlag = 1
@@ -1945,6 +1973,8 @@
 
 	If Timeout >= 120 Then
 	  Var alphaState = "Invisible"
+      Var cancelButtonQRPopupState = "Invisible"
+      Var QRCodeImageState = "Invisible"
 
 
 	  If RoadShow = "true" Then
@@ -2361,6 +2391,8 @@
 	If CoinInFlag = 0 Then
 		;VendingQR OFF
 		Var alphaState = "Invisible"
+		Var cancelButtonQRPopupState = "Invisible"
+		Var QRCodeImageState = "Invisible"
 	EndIf
 
 
@@ -2711,6 +2743,8 @@
 
 				Var FlagQROpened = 1
 				Var alphaState = "Enable"
+				Var cancelButtonQRPopupState = "Enable"
+				Var QRCodeImageState = "Enable"
 				;CoinVending OFF
 				VendingQR ON
 				Var QRPopupOpenFlag = 1
@@ -2851,6 +2885,7 @@
 			If CancelFlag = 0 Then
 				Var QR_POPUP = "/img_popup8.png"
 				Var alphaState = "Enable"
+				Var cancelButtonQRPopupState = "Enable"
 				Coin CARD
 				Var ReqPayInfoFromCashOther = 2
 			EndIf
@@ -3039,7 +3074,7 @@ eval(
 <Button>
 <X> 438 </X>
 <Y> 1345 </Y>
-<State> alphaState </State>
+<State> cancelButtonQRPopupState </State>
 <Filename> Var( DirImage + "/bn_cancel.png" )</Filename>
 <FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -3049,6 +3084,8 @@ eval(
     If CancelingPopupFlag = "Invisible" Then
         Var LOADING_STATE = "Invisible"
         Var QRErrorState = "Invisible"
+        Var cancelButtonQRPopupState = "Invisible"
+		Var QRCodeImageState = "Invisible"
         Var QRCODE99 = ""
         ;CoinVending ON
 
@@ -3356,7 +3393,7 @@ eval(
 <Y> 958 </Y>
 <Width> 200 </Width>
 <Height> 200 </Height>
-<State> alphaState </State>
+<State> QRCodeImageState </State>
 <Service> testservice </Service>
 </QRCode>