Merge origin/masterpiece into smoothie_tbp

xml/page_thankyouConti.xml

@@ -151,8 +151,8 @@
 
 	Var buttonRemoveCup = "Invisible"
 
-	SAVELOG "Thank you conti version TCT7"
-	SAVELOG "Support NextSmoothie"
+	SAVELOG "Thank you conti version TCV9"
+	SAVELOG "Support NextSmoothie and fix bug next"
 
     DEBUGVAR NextSmoothie
     DEBUGVAR Seeker.SmoothieToPayment
@@ -351,23 +351,25 @@
 
 		If MenuReadyForCup = "YES" Then
 
-			; smoothie next
-           	If NextSmoothie = 1 Then
-          		DEBUGVAR Seeker
-          		DEBUGVAR Seeker.SmoothieToPayment
-          		Var NextSmoothie = 0
-          		If Seeker.SmoothieToPayment = 1 Then
-         			Var TimeOutSmoothiesProcess = 120
-         			Var Seeker.SmoothieToPayment = 0
-         			OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
-         			Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
-          		EndIf
-           	EndIf
+			
 
 			Var LastMakeDrinkResult = "-"
 			If New_Payment = 1 Then
 				__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 			EndIf
+
+			; smoothie next
+			DEBUGVAR Seeker
+			DEBUGVAR Seeker.SmoothieToPayment
+			Var NextSmoothie = 0
+			If Seeker.SmoothieToPayment = 1 Then
+				Var TimeOutSmoothiesProcess = 120
+				
+				OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
+				Open "ROOT/taobin_project/inter/tha/xml/page_smoothie_suggest_and_process.xml"
+			EndIf
+
+
 			MakeDrinkV1  Seeker.selected_a_drink SelectSugarID
 
 			If CountryName = "Thailand" Then