diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index 867a1ed3..fc1f9ffc 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -216,6 +216,7 @@
 	EndIf
 
 	If waitAckPay = 1 Then	
+		SAVELOG "waitAckPay = 1"
 		Open "ROOT/taobin_project/xml/page_drinkok.xml" 
 		
 	EndIf
@@ -332,6 +333,7 @@
 	If  waitAckPay = 1 Then  
 		If Timeout > 60 Then
 			Var VendingTSID = ""
+			SAVELOG "TIMEOUT=60"
 			Open "ROOT/taobin_project/xml/page_drinkok.xml" 
 
 		EndIf
@@ -625,6 +627,7 @@
 
 		Var ServiceSuccess = "yes"
 		If  waitAckPay = 0 Then
+			SAVELOG "waitAckPay=0"
 			Open "ROOT/taobin_project/xml/page_drinkok.xml" 
 		EndIf
 
@@ -708,7 +711,7 @@
 
 	If MachineStage = "show-menu" Then
 		If MachineState_Result = 0 Then
-			SAVELOG "back_to_main from line  > 655."
+			SAVELOG "back_to_main from line  > 714."
 			;Open "ROOT/taobin_project/xml/page_drinkok.xml" 
 			Var MachineState_Result = 1
 		EndIf
@@ -812,6 +815,7 @@
 
 	If IgnoreNetCore = "true" Then 
 		If CountDownBrewing = 0 Then
+			SAVELOG "CountDownBrewing=0"
 			Open "ROOT/taobin_project/xml/page_drinkok.xml"
 		EndIf
 	EndIf
diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml
index dc94fbcf..0401de2d 100644
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@@ -235,12 +235,16 @@
 					Open "ROOT/taobin_project/xml/page_drinkfail2.xml"  
 				Else
 					If  NextOrder = "true" Then
-						Var NextOrder = "false"
+						If HaveCup = "false" Then 
+							If CHECKCUP = "false" Then
+								Var NextOrder = "false"
 
-						TransferVar "next" "curr"
-						Var Seeker = "curr"
-						
-						Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
+								TransferVar "next" "curr"
+								Var Seeker = "curr"
+								
+								Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
+							EndIf
+						EndIf
 					Else
 						Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
 					EndIf
diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index ed8de8ff..9fd2983e 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -74,12 +74,13 @@
 	EndIf
 
 	If MachineStage = "remove-cup" Then
+		SAVELOG "MachineStage = remove-cup"
 		Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
 
 	EndIf
 	
 	If CupChecking = "true" Then
-		
+		SAVELOG "CupChecking = true"
 		Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
 	EndIf
 
@@ -111,6 +112,7 @@
 	EndIf
 
 	If MachineStage = "remove-cup" Then
+		SAVELOG "MachineStage = remove-cup 2"
 		Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
 
 	EndIf
diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml
index 90d8d08f..f51322ba 100644
--- a/xml/page_thankyouConti.xml
+++ b/xml/page_thankyouConti.xml
@@ -7,7 +7,7 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
-	Var CountDownThankyou = 3
+	Var CountDownThankyou = 4
 	Var CountDownBrewing = BrewTime
 	Var CountUpBrewing = 0
 	SAVELOG BrewTime
@@ -83,6 +83,8 @@
 
 		; Pack
 		Topping "Pack" ExtendData
+
+		Var MachineStage = "NextOrder"
 	
 
 
@@ -112,6 +114,7 @@
 		Var PictureFile = PictureFile + PictureEnd
 
 		If 	CART_INDEX = 0  Then   
+			DEBUGVAR Seeker.selected_a_drink
             MakeDrinkV1  Seeker.selected_a_drink SelectSugarID
 		Else
 			;Cart "MakeID" CART_INDEX
@@ -125,12 +128,13 @@
 	; run test;
 	If CountDownThankyou = 0 Then 
 		
-		
+		DEBUGVAR MachineStage
 
 		Var CountDownBrewing = BrewTime
 		Var CountUpBrewing = 0
 		SAVELOG BrewTime
 		Var ShowCountDownBrewing = CountDownBrewing
+		Var MachineState_Result = 0
 
         Open "ROOT/taobin_project/xml/page_brewing3.xml"  
 
diff --git a/xml/page_topping_select.xml b/xml/page_topping_select.xml
index 95a7d3b8..d7b51c1d 100644
--- a/xml/page_topping_select.xml
+++ b/xml/page_topping_select.xml
@@ -10,7 +10,7 @@
 	WEB "DISABLE"
 
 	
-	Open "ROOT/taobin_project/xml/page_topping_select3.xml"
+	DEBUGVAR EnableSelectMenuBetweenBrew
 	
 	If JXMLVersionInt >= 369 Then
 		If EnableSelectMenuBetweenBrew = "Enable" Then
@@ -18,6 +18,7 @@
 		EndIf
 	EndIf
 
+	Open "ROOT/taobin_project/xml/page_topping_select3.xml"
 	
 		
 	DEBUGVAR BrewVersionInt