diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml
index 39c69e42..6760cb25 100644
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@@ -245,6 +245,12 @@
 		EndIf
 	EndIf
 
+	DEBUGVAR HaveCup
+	DEBUGVAR CHECKCUP
+	DEBUGVAR CupChecking
+	DEBUGVAR MaybeHaveCup
+	DEBUGVAR NextOrder
+	
 	; Do not change 
 	;
 	If MachineStage = "show-menu" Then
@@ -262,6 +268,12 @@
 				EndIf
 			Else
 
+				If HaveCup = "true" Then
+					Var buttonRemoveCup = "Enable"
+				Else
+					Var buttonRemoveCup = "Invisible"
+				EndIf
+				
 				If CupOnArm = "true" Then
 					Var buttonRemoveCup = "Enable"
 				Else
@@ -271,6 +283,19 @@
 
 		Else
 			If sendPayMultiFlag = 1 Then
+
+				If HaveCup = "true" Then
+					Var buttonRemoveCup = "Enable"
+				Else
+					Var buttonRemoveCup = "Invisible"
+				EndIf
+				
+				If CupOnArm = "true" Then
+					Var buttonRemoveCup = "Enable"
+				Else
+					Var buttonRemoveCup = "Invisible"
+				EndIf
+
 				Var Seeker.TNumberTaobinMember = ""
 				
 				If FailedCount > 0 Then
@@ -280,21 +305,24 @@
 						; next order set. Havecup and checkup value must false. Certain cup not on any arm.
 
 
-						DEBUGVAR HaveCup
-						DEBUGVAR CHECKCUP
-						DEBUGVAR CupChecking
-						DEBUGVAR MaybeHaveCup
+					
 						If HaveCup = "false" Then 
 							If MaybeHaveCup = "true" Then
-								
-							Else
-								Var NextOrder = "false"
 
-								TransferVar "next" "curr"
-								Var Seeker = "curr"
-								SAVELOG "Make next order by take-cup"
-								
-								Open "ROOT/taobin_project/xml/page_cannotConti.xml" 
+							Else
+								If CupChecking = "true" Then
+									
+								Else
+									If CupOnArm = "false" Then 
+										Var NextOrder = "false"
+
+										TransferVar "next" "curr"
+										Var Seeker = "curr"
+										SAVELOG "Make next order by take-cup"
+										
+										Open "ROOT/taobin_project/xml/page_thankyouConti.xml" 
+									EndIf
+								EndIf
 							EndIf
 						EndIf
 					Else
@@ -306,14 +334,6 @@
 
 	EndIf
 
-	If HaveCup = "true" Then
-
-		If CupOnArm = "true" Then
-			Var buttonRemoveCup = "Enable"
-		Else
-			Var buttonRemoveCup = "Invisible"
-		EndIf
-	EndIf
 	
 	;