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

xml/page_payment_cash-HKG.xml

@@ -346,21 +346,21 @@
 	Var FirstTimeDelayEnableButton = 1
 	Var FirstTimeDelayEnableButtonCountDown = 5
 
-    If CoinInFlag = 0 Then
-        If CancelFlag = 0 Then
-            If CreditCardButtonState = "Enable" Then
-                Coin CARD
-                Var UserChoosePayment = "CreditCard"
-                Var CreditCardButtonState = "Disable"
-                Var QRCodeButtonState = "Disable"
-                Var LOADING_STATE = "Enable"
-				Var AlphaLoadingState = "Enable"
-                Var EnablingCreditCard = 1
-                Var EnablingCountDown = 5
-                Var RequestCreditCardCountDown = 1
-            EndIf
-        EndIf
-    EndIf
+    ;If CoinInFlag = 0 Then
+    ;    If CancelFlag = 0 Then
+    ;        If CreditCardButtonState = "Enable" Then
+    ;            Coin CARD
+    ;            Var UserChoosePayment = "CreditCard"
+    ;            Var CreditCardButtonState = "Disable"
+    ;            Var QRCodeButtonState = "Disable"
+    ;            Var LOADING_STATE = "Enable"
+	;			 Var AlphaLoadingState = "Enable"
+    ;            Var EnablingCreditCard = 1
+    ;            Var EnablingCountDown = 5
+    ;            Var RequestCreditCardCountDown = 1
+    ;        EndIf
+    ;    EndIf
+    ;EndIf
 
 	If show_eng = "true" Then
 		Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
@@ -746,6 +746,9 @@
 
 		DEBUGVAR UserChoosePayment
 		Var UserChoosePayment = ""
+
+		CashlessReq SUCCESS ""
+
 		Open "ROOT/taobin_project/xml/page_thankyou.xml"
 
 	EndIf
@@ -984,7 +987,7 @@
 	Var stringLog = stringLog + PayOK
 
 
-	If Timeout > 180 Then
+	If Timeout >= 120 Then
 		If PayOK = 1 Then
 
 			If Seeker = "curr" Then
@@ -1006,7 +1009,7 @@
 
 		Else
 			If CancelFlag = 0 Then
-				SAVELOG "Timeout  > 180 s."
+				SAVELOG "Timeout  > 120 s."
 
 				If ViewBill > 0 Then
 					CoinVending BILLREJECT

xml/page_payment_cash.xml

@@ -1942,6 +1942,7 @@
 			If KBankCashlessMachine = 1 Then
 				; popup will close after 30 second
 				Var Timeout = 90
+				Var cancelButtonQRPopupState = "Enable"
 			Else
 				Var Timeout = 0
 			EndIf