Merge branch 'master' of forthrd.ddns.net:/1TBHDD/ikong/taobin_project

xml/page_payment_cash.xml

@@ -220,6 +220,7 @@
 			;Var VendingQRCode = "ERROR"
 			;Coin STANDBY
 			VendingQR OFF
+			CoinVending OFF
 			
 			;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
 			MakeDrinkV1  SelectDrink SelectSugarID
@@ -336,7 +337,7 @@
 	If CancelFlag = 1 Then
 
 		Var CancelCounter = CancelCounter + 1
-		If CancelCounter = 3 Then
+		If CancelCounter = 2 Then
 			;Change CoinAmount
 			If CoinAmount > 0 Then
 				Change CoinAmount
@@ -414,7 +415,7 @@
 	TimerReset
 
 	If CoinInFlag = 0 Then
-		VendingQR OFF
+		;VendingQR OFF
 	EndIf
 
 	Var CoinInFlag = 1
@@ -427,6 +428,7 @@
 		If SumCoinAmount >= PayAmount Then 
 			;Var VendingQRCode = "ERROR"
 			CoinVending OFF
+			VendingQR OFF
 			Var Canout = SumCoinAmount - PayAmount
 			If Canout = 0 Then
 				Var RemainAmountStr = 0
@@ -461,9 +463,9 @@
             CoinVending OFF
 			Var CancelFlag = 1
 			Var CancelCounter = 0
-			If CoinAmount = 0 Then
-				Open "ROOT/taobin_project/xml/page_catalog.xml"  
-			EndIf
+			;If CoinAmount = 0 Then
+			;	Open "ROOT/taobin_project/xml/page_catalog.xml"  
+			;EndIf
 
 			Var showRemaining = "คืนเงิน"
 			;Open "ROOT/taobin_project/xml/page_catalog.xml"
@@ -553,11 +555,11 @@
 <EventClick> 
 	
 	If CoinInFlag = 0 Then
-
+		If CancelFlag = 0 Then
 		Var TelephoneNumber = ""
 		Var Tel_Confirm_State = "Disable"
     	Open "ROOT/taobin_project/xml/page_payment_code.xml" 
-
+		EndIf
 	EndIf
 </EventClick>
 </Button>
@@ -573,6 +575,7 @@
 <EventClick> 
 
 	If CoinInFlag = 0 Then
+		If CancelFlag = 0 Then
 		Var alphaState = "Enable"
 		;CoinVending OFF
 		VendingQR ON
@@ -586,6 +589,7 @@
 			Var NoGotoMenupage = "true"
 					
 		EndIf
+		EndIf
 	EndIf
 
 ;	If CoinInFlag = 0 Then
@@ -618,11 +622,7 @@
             CoinVending OFF
 			Var CancelFlag = 1
 			Var CancelCounter = 0
-			If CoinAmount = 0 Then
-				If IntVendingCampaign = 0 Then
-					Open "ROOT/taobin_project/xml/page_catalog.xml"  
-				EndIf
-			EndIf
+			
         EndIf
 	EndIf
 
@@ -655,6 +655,8 @@
 <Value> showRemaining </Value>
 </Text>
 
+
+
 <Text>
 <X> 0 </X>
 <Y> 938 </Y>