diff --git a/inter/tha/xml/page_topping_frozen_fruit_select.lxml b/inter/tha/xml/page_topping_frozen_fruit_select.lxml
index 957f95bc..28de4cf6 100644
--- a/inter/tha/xml/page_topping_frozen_fruit_select.lxml
+++ b/inter/tha/xml/page_topping_frozen_fruit_select.lxml
@@ -772,6 +772,7 @@
 </EventClick>
 </Button>
 <Text>
+	<State> NextButtonState </State>
 	<X> 420 </X>
 	<Y> 1442 </Y>
 	<Width> 250 </Width>
diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index fb2f308e..44060558 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -447,7 +447,7 @@
 			If New_Payment = 1 Then
 				__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 			EndIf
-			If SmoothieToPayment = 1 Then
+			If Seeker.SmoothieToPayment = 1 Then
 				; do nothing
 			Else
 				MakeDrinkV1  SelectDrink SelectSugarID
@@ -462,7 +462,7 @@
 			Var PaidPaymentFromNextStage = 1
 
 		EndIf
-		If SmoothieToPayment = 1 Then
+		If Seeker.SmoothieToPayment = 1 Then
 			Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
 		Else
 			Open "ROOT/taobin_project/xml/page_thankyou.xml"
@@ -2172,7 +2172,7 @@
 
 
 	If TestLoopMakeDrink = 1 Then
-		If SmoothieToPayment = 1 Then
+		If Seeker.SmoothieToPayment = 1 Then
 			Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
 		Else
 			MakeDrinkV1  SelectDrink SelectSugarID
@@ -2208,7 +2208,7 @@
 				If New_Payment = 1 Then
 					__CMD "SetPay" "coffee-payment"  Seeker.VendingTSID Seeker.ORDER_ID
 				EndIf
-				If SmoothieToPayment = 1 Then
+				If Seeker.SmoothieToPayment = 1 Then
 					; do nothing
 				Else
 					MakeDrinkV1  SelectDrink SelectSugarID
@@ -2223,7 +2223,7 @@
 
 			EndIf
 
-			If SmoothieToPayment = 1 Then
+			If Seeker.SmoothieToPayment = 1 Then
 				Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
 			Else
 				Open "ROOT/taobin_project/xml/page_thankyou.xml"
@@ -2917,7 +2917,7 @@
 				Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
 				Var MachineStage = "make-drink"
 				Var BrewingTextThai = "เตรียมแก้ว"
-				If SmoothieToPayment = 1 Then
+				If Seeker.SmoothieToPayment = 1 Then
 					Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
 				Else
 					MakeDrinkV1  SelectDrink SelectSugarID
@@ -3775,7 +3775,7 @@ eval(
 	If IgnoreNetCore = "true" Then
 		If Seeker = "curr" Then
 
-			If SmoothieToPayment = 1 Then
+			If Seeker.SmoothieToPayment = 1 Then
 				; do nothing
 			Else
 				MakeDrinkV1  SelectDrink SelectSugarID
@@ -3783,7 +3783,7 @@ eval(
 		Else
 
 		EndIf
-		If SmoothieToPayment = 1 Then
+		If Seeker.SmoothieToPayment = 1 Then
 			Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
 		Else
 			Open "ROOT/taobin_project/xml/page_thankyou.xml"
@@ -3804,7 +3804,7 @@ eval(
 </Text>
 
 <EventUnitTest1>
-	If SmoothieToPayment = 1 Then
+	If Seeker.SmoothieToPayment = 1 Then
 		Open "ROOT/taobin_project/xml/page_spiral_sell.xml"
 	Else
 		MakeDrinkV1  SelectDrink SelectSugarID
diff --git a/xml/page_topping_select8.xml b/xml/page_topping_select8.xml
index 8157ad0a..e88b3549 100644
--- a/xml/page_topping_select8.xml
+++ b/xml/page_topping_select8.xml
@@ -8053,7 +8053,7 @@
 		<Y> CustomEspressoTextY </Y>
 		<State> showEspressoLevel </State>
 		<Language>
-			<ID> 002059 </ID>
+			<ID> 002058 </ID>
 		</Language>
 	</Text>