merge master

xml/page_payment_cash.xml

@@ -29,13 +29,14 @@
 	Var alphaState = "Invisible"
 	
 	Var CoinInFlag = 0
-	Var CoinAmount = 0
+	;Var CoinAmount = 0
 	Var CancelFlag = 0
 	Var CancelCounter = 0
 	Var CoinInCounter = 0
 	
 	Var PayAmount = PriceDrink
-	Var RemainAmount = PayAmount - IntVendingCampaign
+	Var RemainAmount = PayAmount - IntVendingCampaign 
+	Var RemainAmount = RemainAmount - CoinAmount
 	Var RemainAmountStr = "" + RemainAmount
 	Var Timeout = 0
 	Var PayOK = 0
@@ -70,7 +71,14 @@
 		If QRChannel = 0 Then
 			;Var VendingQRCode = "ERROR"
 			VendingQR ON
-			CoinVending ON
+			If CoinVendingOnFlag = 0 Then
+				CoinVending ON
+				Var CoinVendingOnFlag = 1
+			Else
+
+			
+
+			EndIf
 			;Var QRCODE99 = ""
 			
 
@@ -110,6 +118,11 @@
 			Var PayState2 = "Disable"
 		EndIf
 		Var PayState3 = "Enable"
+		If CoinAmount > 0 Then
+			Var PayState2 = "Disable"
+			Var PayState3 = "Disable"
+			Var CoinInFlag = 1
+		EndIf
 		Var showRemaining = charOfBaht + RemainAmountStr
 	EndIf
 
@@ -136,6 +149,36 @@
 
 	EndIf
 
+	If CoinInOK = 0 Then
+
+		Var RemainAmount = PayAmount - CoinAmount
+		Var RemainAmount = RemainAmount - IntVendingCampaign
+		Var SumCoinAmount = CoinAmount + IntVendingCampaign
+		If SumCoinAmount >= PayAmount Then 
+			;Var VendingQRCode = "ERROR"
+			CoinVending OFF
+			Var Canout = SumCoinAmount - PayAmount
+			If Canout = 0 Then
+				Var RemainAmountStr = 0
+			Else
+				Var RemainAmountStr = "ทอน " + Canout
+			EndIf
+
+			
+			Var CancleState = "Disable"
+			Var CoinInOK = 1
+			Var CoinInCounter = 0
+
+
+
+		Else
+			Var RemainAmountStr = "" + RemainAmount
+		EndIf
+
+		;Var RemainAmount = 0
+		Var showRemaining = charOfBaht + RemainAmountStr
+	
+	EndIf
 
 
 </EventOpen>
@@ -517,7 +560,7 @@
 
 	If CoinInFlag = 0 Then
 		Var alphaState = "Enable"
-		CoinVending OFF
+		;CoinVending OFF
 		VendingQR ON
 		Refresh
 
@@ -645,7 +688,7 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	  Var alphaState = "Invisible"
-	  CoinVending ON
+	  ;CoinVending ON
 	  VendingQR OFF
 	  Refresh
 </EventClick>