DO

xml/page_catalog_group_other.xml

@@ -4047,8 +4047,7 @@ Soda & Ice" </Value>
 		Var NameDrink = "PLUM 
 LIMENADE SODA"
 		Var NameDrinkTH = "บ๊วยมะนาวโซดา"
-		Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย มะนาว โซดา 
+		Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย มะนาว โซดา "
- "
 		Var DrinkDescription = "Ume Syrup, Limenade, 
 Soda & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_ume_lime_soda.png"
@@ -4129,8 +4128,7 @@ Soda & Ice"
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมบ๊วย มะนาว โซดา 
+	<Value> "น้ำเชื่อมบ๊วย มะนาว โซดา " </Value>
- " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/page_catalog_group_recommend.xml

@@ -8,7 +8,7 @@
 <Volume> SoundVolume </Volume>
 <EventOpen>
 	; On open
-	Var NextPage = "-"
+	    Var NextPage = "-"
 
     DEBUGVAR ICE_PROCESS_STATUS
     DEBUGVAR ICE_PROCESS_TXT
@@ -11835,8 +11835,7 @@ DRINK SODA" </Value>
 		Var NameDrink = "PLUM 
 LIMENADE SODA"
 		Var NameDrinkTH = "บ๊วยมะนาวโซดา"
-		Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย มะนาว โซดา 
+		Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย มะนาว โซดา"
- "
 		Var DrinkDescription = "Ume Syrup, Limenade, Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_ume_lime_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -11916,8 +11915,7 @@ LIMENADE SODA"
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมบ๊วย มะนาว โซดา 
+	<Value> "น้ำเชื่อมบ๊วย มะนาว โซดา" </Value>
- " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/page_catalog_group_recommend3.xml

@@ -12679,8 +12679,7 @@ DRINK SODA" </Value>
 		Var NameDrink = "PLUM 
 LIMENADE SODA"
 		Var NameDrinkTH = "บ๊วยมะนาวโซดา"
-		Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย มะนาว โซดา 
+		Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย มะนาว โซดา"
- "
 		Var DrinkDescription = "Ume Syrup, Limenade, Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_ume_lime_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -12760,8 +12759,7 @@ LIMENADE SODA"
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมบ๊วย มะนาว โซดา 
+	<Value> "น้ำเชื่อมบ๊วย มะนาว โซดา" </Value>
- " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/page_payment.xml

@@ -260,28 +260,29 @@
 
 	If Seeker = "curr" Then
 		If web_ready = "false" Then
+			If Delay = 0 Then
+				If MachineStage = "remove-cup" Then
+					SAVELOG "MachineStage = remove-cup"
+					If HaveCup = "true" Then
+						Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+					EndIf
 
-			If MachineStage = "remove-cup" Then
-				SAVELOG "MachineStage = remove-cup"
-				If HaveCup = "true" Then
-					Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
 				EndIf
 				
-			EndIf
+				If CupChecking = "true" Then
+					If HaveCup = "true" Then
+						SAVELOG "Have cup"
+						Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+					EndIf
+				EndIf
 
-			If CupChecking = "true" Then
+				If DoorCupPosition = "bottom" Then
-				If HaveCup = "true" Then
+
-					SAVELOG "Have cup"
+				Else
+					SAVELOG "DoorCupPosition not bottom"
 					Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
 				EndIf
 			EndIf
-
-			If DoorCupPosition = "bottom" Then
-
-			Else
-				SAVELOG "DoorCupPosition not bottom"
-				Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
-			EndIf
 		EndIf
 	Else
 
@@ -360,35 +361,6 @@
 			Var SessionID2 = SelectSlot + ":"
 			Var SessionID2 = SessionID2 + Seeker.ExtendData
 
-			;Var CreditAmount1 = ""
-			;Var ServiceAmountFlow = ""
-			;Var TelephoneNumberQR = "0899999999"
-			;Var ServiceType = "coffee"
-			;Var ECommerceQR = ""
-			;Var ECommerceQR = ECommerceQR + PriceDrink
-			;Var ECommerceQR =	ECommerceQR + "/"
-			;Var ECommerceQR =	ECommerceQR + DiscountDrink 
-			;Var ECommerceQR =	ECommerceQR + "/"
-			;Var ECommerceQR =	ECommerceQR + SessionID2 
-			;Var ECommerceQR =	ECommerceQR + "/"
-			;Var ECommerceQR =	ECommerceQR + SelectDrink 
-			;Var ECommerceQR =	ECommerceQR + "/"
-			;Var ECommerceQR =	ECommerceQR + "KBA:2"
-			;Var ServiceParameter = "max"
-			;Var ServiceCharge = 0
-			;Var AccountType = "new"
-			;Var testservice = "kbank"
-			;Var tc = ""
-			;Var GetScore = ""
-			;Var OperatorName = ""
-			;Var SessionID = ""
-
-
-			;GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
-			;Var Timeout = 0
-			;Var GetPayInfoFlag = 1
-			;Var ReqPayInfoFlag = 1
-
 		EndIf
 
 		; Reset

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "7.06"
+	Var XMLPageVersion = "7.07"
-	Var XMLPageVersionInt = 706
+	Var XMLPageVersionInt = 707
 </EventOpen>
 
 <Text>