do cup on arm

2025-06-05 21:43:07 +07:00 · 2025-06-05 21:43:07 +07:00 · 871145f2b9
commit 871145f2b9
parent e83400044a
14 changed files with 170 additions and 74 deletions
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -1741,7 +1741,7 @@

    Var onResume = "false"

-	Machine DoorClose
+	

 	Machine NewPaymentOpenBrewingXMLEnable

--- a/xml/page_catalog_group_pro_school_ovaltine.xml
+++ b/xml/page_catalog_group_pro_school_ovaltine.xml
@ -561,8 +561,8 @@ Super Volcano" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Ms. Savage"
-		Var NameDrinkTH = "ครูไหวใจร้าย"
+		Var NameDrink = "Ovaltine Latte"
+		Var NameDrinkTH = "โอวัลตินกาแฟ"
 		Var DrinkDescriptionTH = "โอวัลติน นม กาแฟ"
 		Var DrinkDescription = "Ovaltine Milk Coffee"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Latte.png"
@ -635,7 +635,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ครูไหวใจร้าย" </Value>
+	<Value> "โอวัลตินกาแฟ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -656,7 +656,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Ms. Savage" </Value>
+	<Value> "Ovaltine Latte" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -810,8 +810,8 @@ Super Volcano" </Value>
 	<Volume> SoundVolume </Volume>
 	<OverlayImage> xmlpro( 12-21-03-0092, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<EventOnClick> 
-		Var NameDrink = "Ms. Savage"
-		Var NameDrinkTH = "ครูไหวใจร้าย"
+		Var NameDrink = "Ovaltine Latte"
+		Var NameDrinkTH = "โอวัลตินกาแฟ"
 		Var DrinkDescriptionTH = "โอวัลติน นม กาแฟ"
 		Var DrinkDescription = "Ovaltine Milk Coffee"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Latte.png"
@ -884,7 +884,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ครูไหวใจร้าย" </Value>
+	<Value> "โอวัลตินกาแฟ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -905,7 +905,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Ms. Savage" </Value>
+	<Value> "Ovaltine Latte" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1060,8 +1060,8 @@ Super Volcano" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Hot Senior"
-		Var NameDrinkTH = "รุ่นพี่โซฮ็อต"
+		Var NameDrink = "Ovaltine Thai Milk Tea"
+		Var NameDrinkTH = "โอวัลตินชาไทยนม"
 		Var DrinkDescriptionTH = "โอวัลติน นม ชาไทย"
 		Var DrinkDescription = "Ovaltine Milk Thai Tea"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_ThaiTea.png"
@ -1134,7 +1134,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "รุ่นพี่โซฮ็อต" </Value>
+	<Value> "โอวัลตินชาไทยนม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1155,7 +1155,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Hot Senior" </Value>
+	<Value> "Ovaltine Thai Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1311,8 +1311,8 @@ Super Volcano" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Gifted Geek"
-		Var NameDrinkTH = "กิ๊ฟเต็ดสายเนิร์ด"
+		Var NameDrink = "Ovaltine Matcha Latte"
+		Var NameDrinkTH = "โอวัลตินมัทฉะลาเต้"
 		Var DrinkDescriptionTH = "โอวัลติน นม มัทฉะ"
 		Var DrinkDescription = "Ovaltine Milk Matcha"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_Matcha.png"
@ -1385,7 +1385,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "กิ๊ฟเต็ดสายเนิร์ด" </Value>
+	<Value> "โอวัลตินมัทฉะลาเต้" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1406,7 +1406,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Gifted Geek" </Value>
+	<Value> "Ovaltine Matcha Latte" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1562,8 +1562,8 @@ Super Volcano" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Back Row Gang"
-		Var NameDrinkTH = "แก๊งเด็กหลังห้อง"
+		Var NameDrink = "Ovaltine Taiwanese Milk Tea"
+		Var NameDrinkTH = "โอวัลตินชานม"
 		Var DrinkDescriptionTH = "โอวัลติน นม ชาไต้หวัน"
 		Var DrinkDescription = "Ovaltine Milk Taiwanese Tea"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_Taiwanese_Tea.png"
@ -1636,7 +1636,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "แก๊งเด็กหลังห้อง" </Value>
+	<Value> "โอวัลตินชานม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1657,7 +1657,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Back Row Gang" </Value>
+	<Value> "Ovaltine Taiwanese Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1813,8 +1813,8 @@ Super Volcano" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Hallway Gossiper"
-		Var NameDrinkTH = "เจ่เจ้ขาเมาส์"
+		Var NameDrink = "Ovaltine Jasmine Tea"
+		Var NameDrinkTH = "โอวัลตินมะลิ"
 		Var DrinkDescriptionTH = "โอวัลติน นม ชามะลิ"
 		Var DrinkDescription = "Ovaltine Milk Jasmine Tea"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_Jasmine.png"
@ -1887,7 +1887,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "เจ่เจ้ขาเมาส์" </Value>
+	<Value> "โอวัลตินมะลิ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1908,7 +1908,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Hallway Gossiper" </Value>
+	<Value> "Ovaltine Jasmine Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2064,8 +2064,8 @@ Super Volcano" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Cool Class Prez"
-		Var NameDrinkTH = "ประธานสุดคูล"
+		Var NameDrink = "Ovaltine Salak"
+		Var NameDrinkTH = "โอวัลตินน้ำแดง"
 		Var DrinkDescriptionTH = "โอวัลติน นม สละ"
 		Var DrinkDescription = "Ovaltine Milk Salak"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_Salak.png"
@ -2138,7 +2138,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ประธานสุดคูล" </Value>
+	<Value> "โอวัลตินน้ำแดง" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2159,7 +2159,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Cool Class Prez" </Value>
+	<Value> "Ovaltine Salak" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2315,8 +2315,8 @@ Super Volcano" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Head Majorette"
-		Var NameDrinkTH = "ดรัมเมเยอร์ไม้หนึ่ง"
+		Var NameDrink = "Ovaltine Caramel"
+		Var NameDrinkTH = "โอวัลตินคาราเมล"
 		Var DrinkDescriptionTH = "โอวัลติน นม คาราเมล"
 		Var DrinkDescription = "Ovaltine Milk Caramel"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_Caramel.png"
@ -2389,7 +2389,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ดรัมเมเยอร์ไม้หนึ่ง" </Value>
+	<Value> "โอวัลตินคาราเมล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2410,7 +2410,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Head Majorette" </Value>
+	<Value> "Ovaltine Caramel" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2566,8 +2566,8 @@ Super Volcano" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Sweet Freshie"
-		Var NameDrinkTH = "รุ่นน้องหน้าหวาน"
+		Var NameDrink = "Ovaltine Coconut"
+		Var NameDrinkTH = "โอวัลตินมะพร้าว"
 		Var DrinkDescriptionTH = "โอวัลติน นม มะพร้าว"
 		Var DrinkDescription = "Ovaltine Milk Coconut"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Ovaltine_Milk_Coconut.png"
@ -2640,7 +2640,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "รุ่นน้องหน้าหวาน" </Value>
+	<Value> "โอวัลตินมะพร้าว" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2661,7 +2661,7 @@ Super Volcano" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Sweet Freshie" </Value>
+	<Value> "Ovaltine Coconut" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@ -151,8 +151,12 @@
 	; ================= Video thankyou =============================

 	If InternationalEnable = 1 Then
-		Var script_thankyou = CountryRootPath + "video/script_thank.ev"
-		TRY script_thankyou
+		If CountryName = "Thailand" Then
+			TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"	
+		Else
+			Var script_thankyou = CountryRootPath + "video/script_thank.ev"
+			TRY script_thankyou
+		EndIf
 	Else
 		TRY "/mnt/sdcard/coffeevending/taobin_project/video/script2.ev"
 	EndIf
@ -198,16 +202,16 @@
 	DEBUGVAR Seeker.CreditCardRef

 	TRY "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/script_thankyou.ev"
-
-
+	SAVELOG "============================================== Thankyou.xml ====================================="
+	Var TimeoutThankyou = 0
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout>

 	Var CountDownBrewing = BREW_CNT

-	Var Timeout = Timeout + 1
-	If Timeout = TimeoutToNext Then
+	Var TimeoutThankyou = TimeoutThankyou + 1
+	If TimeoutThankyou = TimeoutToNext Then

 		If 	CART_INDEX = 0  Then
 		Else
@ -288,6 +292,9 @@

 	EndIf

+	DEBUGVAR CountDownThankyou
+	DEBUGVAR PayOfflineMode
+	DEBUGVAR CleanFeedbackFlag

 	; run test;
 	If CountDownThankyou = 0 Then
--- a/xml/page_topping_select8.xml
+++ b/xml/page_topping_select8.xml
@ -2886,6 +2886,7 @@

 			If Seeker.SmoothieToPayment = 1 Then
 				Var StrawState = "Press"
+				Var Seeker.thankStrawFlag = 1
 			EndIf

 			If StrawState = "Press" Then