THAI: check if when cancel popup in payment_cash

xml/page_payment.xml

@@ -114,7 +114,7 @@
     Var QRCODE8 = ""
    
     Var CountStepPackPayment = 0
-    Var CountStepForCupFlagDelay = 1
+    Var CountStepForCupFlagDelay = 0
 
 	Var VendingBank = "other"
 	Var ReqPayInfoFromCashOther = 0
@@ -528,8 +528,6 @@
 	;		Var CountStepPackPayment = CountStepPackPayment + 1
 	;EndIf
 
-	Var CountStepPackPayment = 1
-
 	DEBUGVAR Seeker
 	DEBUGVAR HaveCup
 	;DEBUGVAR CupChecking
@@ -561,6 +559,7 @@
 					Var CoinAmount = 0 
 				Else
 					If NOCashFlag = 0 Then
+						SAVELOG "CoinVending XBILL from page_payment"
 						CoinVending XBILL
 					Else
 						Var CoinAmount = 0 
@@ -588,7 +587,7 @@
 		DEBUGVAR Seeker
 		DEBUGVAR Seeker.ExtendData
 
-
+		Var CountStepPackPayment = 1
 	EndIf
 
 	If Delay = 1 Then

xml/page_payment_cash.xml

@@ -2834,7 +2834,9 @@
 	  ;CoinVending ON
 	  ;VendingQR OFF
 
-	  CashlessReq OFF
+	  If ReqPayInfoFromCashOther = 2 Then
+	  	CashlessReq OFF
+	  EndIf
 
 	  If CashlessPayFlag = 1 Then
 		Var CashlessPayFlag = 0