fix frozen

inter/tha/xml/multi/page_catalog.lxml

@@ -74,9 +74,9 @@
 	DEBUGVAR MAT_ID_2301
 	Var SpiralModeFrozenFruit = 0
 	Var SpiralModeGoods = 0
-	
+
 	Var ButtonFrozenSmoothie = "Invisible"
-	
+
 	If SpiralOnline = "true" Then
 
 		If MAT_ID_2301 = "Enable" Then
@@ -270,12 +270,12 @@
 		EndIf
 	EndIf
 
-	
+
 
 	DEBUGVAR SpiralOnline
 
 	RootLayoutVisible 13 "hide"
-	
+
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -297,21 +297,24 @@
 	EndIf
 
 
-
-	; zone cup on arm
-    If CupOnArm = "true" Then
-
-		If CheckCupStateDoorCupClose = "" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
-
-		If CheckCupStateDoorCupClose = "done" Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
+    If Seeker = "curr" Then
+	   Var buttonRemoveCup = "Invisible"
 	Else
-		If buttonRemoveCup = "Enable" Then
-			Var buttonRemoveCup = "Invisible"
-		EndIf
+    	; zone cup on arm
+        If CupOnArm = "true" Then
+
+    		If CheckCupStateDoorCupClose = "" Then
+    			Var buttonRemoveCup = "Enable"
+    		EndIf
+
+    		If CheckCupStateDoorCupClose = "done" Then
+    			Var buttonRemoveCup = "Enable"
+    		EndIf
+    	Else
+    		If buttonRemoveCup = "Enable" Then
+    			Var buttonRemoveCup = "Invisible"
+    		EndIf
+    	EndIf
 	EndIf
 
 
@@ -329,10 +332,10 @@
 		Var Inst9MenuLoaded = "done"
 		Var Inst10MenuLoaded = "done"
 		Var Inst11MenuLoaded = "done"
-		
+
 	EndIf
 
-	
+
 	If MultiProcess = "Enable" Then
         If SelectedMenu = "coffee" Then
             Var MultiProcessTimer = MultiProcessTimer + 1
@@ -602,7 +605,7 @@
 		If SpiralModeFrozenFruit = 1 Then
 			Var ColumnOverride[0] = 3
 		EndIf
-		
+
 		If SpiralModeGoods = 1 Then
 			Var ColumnOverride[0] = 3
 		EndIf
@@ -612,10 +615,10 @@
 				Var MenuKidButtonState = "Invisible"
 			EndIf
 		EndIf
-		
-	
 
-		
+
+
+
 
 		Var ColumnOverride[1] = 3
 		Var ColumnOverride[2] = 3

inter/tha/xml/page_payment_pack_and_send.xml

@@ -28,11 +28,10 @@
 
 	Var OverrideVideoThankyou = 1
 
-	Open "ROOT/taobin_project/xml/page_thankyou.xml"
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>
-
+    DEBUGVAR TimeOutSmoothiesProcess
 	;SAVELOG SoundPlaying
 
 	If TimeOutSmoothiesProcess > 0 Then
@@ -43,6 +42,15 @@
 	If TimeOutSmoothiesProcess = 0 Then
 		Var OverrideVideoThankyou = 1
 
+		Var SelectDrink = Seeker.selected_a_drink
+		Var SelectSugarID = ""
+
+        SAVELOG "============================= Select ======================================="
+
+		Machine StrawOrder
+
+		Topping "Select" SelectDrink
+        SAVELOG "============================= MakeDrinkV1 ======================================="
 		MakeDrinkV1 SelectDrink SelectSugarID
 
 		Open "ROOT/taobin_project/xml/page_thankyou.xml"

inter/tha/xml/page_smoothie_suggest_and_process.xml

@@ -254,13 +254,7 @@
 	If SmoothieProcessState = "blendnow" Then
 		Var TextDoorButtonID = 001206
 
-		Var SelectDrink = Seeker.selected_a_drink
-		Var SelectSugarID = ""
 
-		Machine StrawOrder
-
-
-		Topping "Select" SelectDrink
 
 		Var SmoothieProcessState = "blending"