Test 6.51

xml/page_thankyouConti.xml

@@ -6,6 +6,7 @@
 <Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
 <Volume> SoundVolume </Volume>
 <EventOpen>
+	; This page Seeker must curr
 	; On open
 	Var CountDownThankyou = 4
 	Var CountDownBrewing = BrewTime
@@ -95,16 +96,6 @@
 		; Pack
 		Topping "Pack" ExtendDataCurr
 
-				
-		;Var Seeker.ExtendData = ExtendData ; because save in Seeker.
-	
-
-		;Var MachineStage = "NextOrder"
-
-		;Var SessionID2 = SelectSlot + ":"
-		;Var SessionID2 = SessionID2 + ExtendData
-
-		;DEBUGVAR SessionID2
 
 		Topping "ClearNextOrder" "-"
 	EndIf
@@ -129,7 +120,6 @@
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
 	Var CountDownBrewing = CountDownBrewing - 1
-	;Var CountDownThankyou = CountDownThankyou - 1
 
 	DEBUGVAR MachineStage
 	DEBUGVAR stop_now
@@ -142,13 +132,6 @@
 	DEBUGVAR DoorCupPosition
 	DEBUGVAR CountUpDoorCupOpen
 
-	If MachineStage = "close-maintenance" Then
-		If stop_now = "true" Then
-			Open "ROOT/taobin_project/xml/page_cannotConti.xml" 
-		EndIf
-	EndIf
-
-
 	If HaveCup = "true" Then
 		Var Timeout = 0
 	Else 
@@ -201,24 +184,18 @@
 	EndIf
 
 	
-
-	If MachineStage = "close-maintenance" Then 
+	If MachineStage = "close-maintenance" Then
 		If stop_now = "true" Then
-			If  NextOrder = "true" Then
-						
-				Var NextOrder = "false"
-				TransferVar "next" "curr"
-				Var Seeker = "curr"
-				SAVELOG "Make next order by take-cup with close-maintenance"
-								
-				Open "ROOT/taobin_project/xml/page_cannotConti.xml" 
-						
-			Else
-				Open "ROOT/taobin_project/xml/page_back_to_main.xml"  
-			EndIf
+			Open "ROOT/taobin_project/xml/page_cannotConti.xml" 
 		EndIf
 	EndIf
 
+	If RejectOrder = "true" Then
+		SAVELOG "RejectOrder page_thankyouConti"
+		Open "ROOT/taobin_project/xml/page_cannotConti.xml"
+		
+	EndIf
+
 	If Timeout = 2 Then