diff --git a/xml/page_brewing2.xml b/xml/page_brewing2.xml
index 543ac74a..868968de 100644
--- a/xml/page_brewing2.xml
+++ b/xml/page_brewing2.xml
@@ -246,12 +246,45 @@
 
 				Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 			Else
+				If CodeChannel = 2 Then
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + ""
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + VendingCode
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + SelectDrink
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + BoxID
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + "S"
+					Var SessionID2 = SessionID2 + "/"
+					Var SessionID2 = SessionID2 + CodeNumber
+					Var SessionID2 = SessionID2 + "/"
+
+					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+				Else
+					Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
+				EndIf
+			EndIf
+
+			
+		Else
+			If ChangeFlag2 = 1 Then
+				Var TelephoneNumber = "0899999999"
+				Var VendingDiscount = 0
+				Var VendingCampaign = 0
+				Var ServiceType = "credit"
+				Var SessionID2 = SelectDrink
+				Var ServiceCredit = "coffee"
 				Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
 			EndIf
+			
 		EndIf
 
+
 		Var ServiceSuccess = "yes"
 		Open "ROOT/taobin_project/xml/page_drinkok.xml" 
+
 	EndIf
 
 	If MachineState_Result = 2 Then
@@ -299,7 +332,11 @@
 							
 						EndIf
 					Else
-						Var ChangeOK = 3
+						If ChangeFlag2 = 1 Then
+							Var ChangeOK = 2
+						Else
+							Var ChangeOK = 3
+						EndIf
 					EndIf
 
 				Else
diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index 29071bf7..96931dd3 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -26,10 +26,10 @@
     Var QRCODE3 = "VDGN"
     Var QRCODE4 = BoxID
     Var QRCODE5 = SelectSlot
-    Var QRCODE6 = ServiceCredit                
-    Var QRCODE7 = ServiceAmount2 
+    Var QRCODE6 = SelectDrink                
+    Var QRCODE7 = PriceDrink 
     Var QRCODE8 = ""
-
+   
     Var CountStepPackPayment = 0
 
 
diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index 599276de..7ad906cc 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -219,6 +219,7 @@
 			;Var VendingQRCode = "ERROR"
 			;Coin STANDBY
 			VendingQR OFF
+			CoinVending OFF
 			
 			;Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif" 
 			MakeDrinkV1  SelectDrink SelectSugarID
@@ -335,7 +336,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
@@ -413,7 +414,7 @@
 	TimerReset
 
 	If CoinInFlag = 0 Then
-		VendingQR OFF
+		;VendingQR OFF
 	EndIf
 
 	Var CoinInFlag = 1
@@ -426,6 +427,7 @@
 		If SumCoinAmount >= PayAmount Then 
 			;Var VendingQRCode = "ERROR"
 			CoinVending OFF
+			VendingQR OFF
 			Var Canout = SumCoinAmount - PayAmount
 			If Canout = 0 Then
 				Var RemainAmountStr = 0
@@ -460,9 +462,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"
@@ -552,11 +554,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>
@@ -572,6 +574,7 @@
 <EventClick> 
 
 	If CoinInFlag = 0 Then
+		If CancelFlag = 0 Then
 		Var alphaState = "Enable"
 		;CoinVending OFF
 		VendingQR ON
@@ -585,6 +588,7 @@
 			Var NoGotoMenupage = "true"
 					
 		EndIf
+		EndIf
 	EndIf
 
 ;	If CoinInFlag = 0 Then
@@ -617,11 +621,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
 
@@ -654,6 +654,8 @@
 <Value> showRemaining </Value>
 </Text>
 
+
+
 <Text>
 <X> 0 </X>
 <Y> 938 </Y>
diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml
index 4038f71a..ab5db4d1 100644
--- a/xml/page_payment_code.xml
+++ b/xml/page_payment_code.xml
@@ -38,14 +38,41 @@
 
 	Var Timeout = Timeout + 1
 	If Timeout > 30 Then
-		VendingQR OFF
-        Open menu_back_to_main 
+		;VendingQR OFF
+        ;Open menu_back_to_main 
+
+		Var PayState1 = "PressForever"
+		Var PayState2 = "Enable"
+		Var QRChannel = 0
+		Var CodeChannel = 0
+		Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
+
 	EndIf
 
 	TimerReset
 	Refresh
 </EventTimeout> 
 
+<EventIDCard>
+	
+
+	If IDCardStatus = "OK" Then
+		If IDCardReady = "OK" Then
+			If IDCardData = "DONE" Then
+			CoinVending OFF
+			Open "ROOT/taobin_project/xml/page_show_consent2.xml" 
+			EndIf
+		EndIf
+	EndIf
+
+
+	
+
+
+
+</EventIDCard>
+
+
 <EventActionOk>
 	
 
@@ -71,6 +98,9 @@
 		    	MakeDrinkV1  SelectDrink SelectSugarID
 		   		Open "ROOT/taobin_project/xml/page_thankyou.xml" 
 			EndIf
+
+
+			
 			
 
 			Var SessionID2 = SelectSlot + ":"
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index 6cf9ab2e..8b3252b4 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -25,16 +25,26 @@
 
 	Var Timeout = Timeout + 1 
 	If Timeout = 3 Then
-		If FreeVendingCampaign = 0 Then
-			If IntVendingCampaign < PayAmount Then 
-				Var SumCoinAmount = CoinAmount + IntVendingCampaign
-				If SumCoinAmount >= PayAmount Then 
-					Var Canout = SumCoinAmount - PayAmount
-					If Canout > 0 Then
-						Change Canout	
-						Var ChangeFlag2 = 1
+		If PayWithQR = 0 Then
+			If FreeVendingCampaign = 0 Then
+				If IntVendingCampaign < PayAmount Then 
+					Var SumCoinAmount = CoinAmount + IntVendingCampaign
+					If SumCoinAmount >= PayAmount Then 
+						Var Canout = SumCoinAmount - PayAmount
+						If Canout > 0 Then
+							Change Canout	
+							Var ChangeFlag2 = 1
+						EndIf
 					EndIf
 				EndIf
+			Else
+
+				Var Canout = CoinAmount
+				If Canout > 0 Then
+					Change Canout	
+					Var ChangeFlag2 = 1
+				EndIf
+
 			EndIf
 		Else