THAI: Added Taiwasese Tea promotion & School Ovaltine

animation01/play_list.tsv

@@ -1415,3 +1415,29 @@ Macallan Lumina Mizuwari	11-99-05-0055	1	27	28							24	100	7:40	32
 แอปเปิ้ลอู่หลงร้อน	12-02-01-0101	1	66	16	10						24	100	7:40	32
 แอปเปิ้ลอู่หลงเย็น	12-02-02-0101	1	66	16	10	23					24	100	7:40	32
 แอปเปิ้ลอู่หลงปั่น	12-02-03-0101	1	66	16	10	23	41				24	100	7:40	32
+
+ชานมไต้หวันยูซุร้อน	12-02-01-0109	1	10	70	53						24	100	7:40	32
+ชานมไต้หวันยูซุเย็น	12-02-02-0109	1	10	70	53	23					24	100	7:40	32
+ชานมไต้หวันยูซุปั่น	12-02-03-0109	1	10	70	53	23	41				24	100	7:40	32
+ชานมไต้หวันสตรอเบอรีร้อน	12-02-01-0110	1	10	70	19						24	100	7:40	32
+ชานมไต้หวันสตรอเบอรีเย็น	12-02-02-0110	1	10	70	19	23					24	100	7:40	32
+ชานมไต้หวันสตรอเบอรีปั่น	12-02-03-0110	1	10	70	19	23	41				24	100	7:40	32
+ชานมไต้หวันลิ้นจี่ร้อน	12-02-01-0111	1	10	70	11						24	100	7:40	32
+ชานมไต้หวันลิ้นจี่เย็น	12-02-02-0111	1	10	70	11	23					24	100	7:40	32
+ชานมไต้หวันลิ้นจี่ปั่น	12-02-03-0111	1	10	70	11	23	41				24	100	7:40	32
+ชานมไต้หวันมะพร้าวร้อน	12-02-01-0112	1	10	70	62						24	100	7:40	32
+ชานมไต้หวันมะพร้าวเย็น	12-02-02-0112	1	10	70	62	23					24	100	7:40	32
+ชานมไต้หวันมะพร้าวปั่น	12-02-03-0112	1	10	70	62	23	41				24	100	7:40	32
+ชานมไต้หวันสละร้อน	12-02-01-0113	1	10	70	21						24	100	7:40	32
+ชานมไต้หวันสละเย็น	12-02-02-0113	1	10	70	21	23					24	100	7:40	32
+ชานมไต้หวันสละปั่น	12-02-03-0113	1	10	70	21	23	41				24	100	7:40	32
+ชาไต้หวันยูซุเย็น	12-02-01-0114	1	10	53	23						24	100	7:40	32
+ชาไต้หวันยูซุปั่น	12-02-02-0114	1	10	53	23	41					24	100	7:40	32
+ชาไต้หวันสตรอเบอรีเย็น	12-02-01-0115	1	10	19	23						24	100	7:40	32
+ชาไต้หวันสตรอเบอรีปั่น	12-02-02-0115	1	10	19	23	41					24	100	7:40	32
+ชาไต้หวันลิ้นจี่เย็น	12-02-01-0116	1	10	11	23						24	100	7:40	32
+ชาไต้หวันลิ้นจี่ปั่น	12-02-02-0116	1	10	11	23	41					24	100	7:40	32
+ชาไต้หวันมะพร้าวเย็น	12-02-01-0117	1	10	62	23						24	100	7:40	32
+ชาไต้หวันมะพร้าวปั่น	12-02-02-0117	1	10	62	23	41					24	100	7:40	32
+ชาไต้หวันสละเย็น	12-02-01-0118	1	10	21	23						24	100	7:40	32
+ชาไต้หวันสละปั่น	12-02-02-0118	1	10	21	23	41					24	100	7:40	32

image/event/image_template2

@@ -1,3 +1,3 @@
-normal_thai=ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png
-press_thai=ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png
-disable_thai=ROOT/taobin_project/image/event/oreo_volcano/oreo_volcano_banner.png
+normal_thai=ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png
+press_thai=ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png
+disable_thai=ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png

image/event/image_template4

@@ -1,3 +1,3 @@
-normal_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.png
-press_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.png
-disable_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.png
+normal_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png
+press_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png
+disable_thai=ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png

inter/tha/xml/multi/v3/event/event_v3/1_promotion_taiwanese_tea.json

@@ -0,0 +1,9 @@
+{
+  "start": "2025-06-016T00:00:00",
+  "end": "2025-06-30T00:00:00",
+  "state": "TaiwaneseTeaProState",
+  "type": "IMAGE",
+  "media_thai": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
+  "media_eng": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
+  "event_click": "TabMenuVisibleInst 99\r\nOpenInst 2 \"ROOT/taobin_project/inter/tha/xml/multi/v3/page_catalog_group_pro_taiwanese_tea.lxml\""
+}

inter/tha/xml/multi/v3/event/script_open_promotion_v3.ev

@@ -20,10 +20,11 @@ RootLayoutVisible 15 "show"
 
 
 Var MatchaEveryDayProState  = "Invisible"
-Var SchoolOvaltineProState = "Invisible"
 Var OreoVolcanoProState  = "Invisible"
 Var AppleFarmFestivalProState = "Invisible"
 Var HappyTriosProState = "Invisible"
+Var SchoolOvaltineProState = "Invisible"
+Var TaiwaneseTeaProState = "Invisible"
 
 If MatchaEveryDayPro = 1 Then
     Var MatchaEveryDayProState  = "Enable"
@@ -43,4 +44,8 @@ EndIf
 
 If HappyTriosPro = 1 Then
     Var HappyTriosProState = "Enable"
+EndIf
+
+If TaiwaneseTeaPro = 1 Then
+    Var TaiwaneseTeaProState = "Enable"
 EndIf

inter/tha/xml/multi/v3/page_catalog_group_pro_taiwanese_tea.skt

@@ -0,0 +1,42 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_default_init.lxml"  
+
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new_menu.lxml"
+    SetInstanceIgnoreTouch
+</EventOpen>
+
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+    ;include="ROOT/taobin_project/inter/tha/xml/multi/ForProGroup.inc"
+    
+    
+    TimerReset
+</EventTimeout>
+
+;include="ROOT/taobin_project/inter/tha/xml/multi/menu_catalog_new.lxml"
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v3.py
+?>
+
+
+
+</Popup>

ui/lang.tsv

@@ -279,6 +279,7 @@
 002022		D.I.Y. your cup, your style [(max 1)###Font=KanitLight,Size=20]	เพิ่่มไซรัปฉ่ำๆ D.I.Y ความอร่อยได้เลย [(เลือกสูงสุด 1 ข้อ)###Font=KanitLight,Size=20]	自定义你的杯子，你的风格 [(最多可选 1 项)###Font=KanitLight,Size=20]			ကိုယ်ပိုင်စတိုင်နဲ့ ခွက်လုပ်ပါ[(အများဆုံး ၁ အချက်)###Font=KanitLight,Size=20]
 
 		Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46	Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46			Font=Kanit,Type=Regular,Size=36,Color=0x513C2F,LineHeight=46
+002028		Taiwanese tea Intensity	ความข้นของชาไต้หวัน	台湾茶浓度			တိုင်ဝမ်လက်ဖက်ရည်အား
 002029		Sugar type	ประเภทน้ำตาล	糖类选择			သကြား အမျိုးအစား
 002030		Sweetness	ความหวาน	甜度			အချိုချင်း
 002031		Espresso Shot	เอสเพรสโซ่ช็อต	浓缩咖啡份数			အီစပရိုဆို ရိုက်ခြင်း

xml/event/ignore_multi_promotion_config_apple_farm_festival_school_ovaltine.json

@@ -0,0 +1,28 @@
+[
+  {
+      "name": "apple_farm_festival",
+      "template": "/event/promotion_template.inc",
+      "config": {
+          "normal_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+          "normal_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+          "press_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+          "press_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+          "disable_eng": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+          "disable_thai": "ROOT/taobin_project/image/event/apple_farm_festival/apple_farm_festival_banner.png",
+          "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_apple_farm_festival.xml"
+      }
+  },
+  {
+      "name": "school_ovaltine",
+      "template": "/event/promotion_template.inc",
+      "config": {
+          "normal_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "normal_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "press_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "press_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "disable_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "disable_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_school_ovaltine.xml"
+      }
+  }
+]

xml/event/ignore_multi_promotion_config_taiwanese_tea_school_ovaltine.json

@@ -0,0 +1,28 @@
+[
+  {
+      "name": "taiwanese_tea",
+      "template": "/event/promotion_template.inc",
+      "config": {
+          "normal_eng": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
+          "normal_thai": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
+          "press_eng": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
+          "press_thai": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
+          "disable_eng": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
+          "disable_thai": "ROOT/taobin_project/image/event/taiwanese_tea/taiwanese_tea_banner.png",
+          "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_taiwanese_tea.xml"
+      }
+  },
+  {
+      "name": "school_ovaltine",
+      "template": "/event/promotion_template.inc",
+      "config": {
+          "normal_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "normal_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "press_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "press_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "disable_eng": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "disable_thai": "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine2.png",
+          "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_school_ovaltine.xml"
+      }
+  }
+]

xml/event/out_put_file2.txt

@@ -1 +1 @@
-/event/promotion_oreo_volcano.xml
+/event/promotion_taiwanese_tea.xml

xml/event/promotion_onclick2.inc

@@ -1 +1 @@
-        Open "ROOT/taobin_project/xml/page_catalog_group_pro_oreo_volcano.xml"
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_taiwanese_tea.xml"

xml/event/promotion_onclick4.inc

@@ -1 +1 @@
-        Var BigButtonEnable = "Invisible"
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_school_ovaltine.xml"

xml/event/promotion_template4.inc

@@ -5,18 +5,9 @@
 
 <State> BigButtonEnable </State>
     <Filename> ###normal_thai </Filename>
-    <FilenamePress> ###normal_thai </FilenamePress>
-    <FilenameDisable> ###normal_thai </FilenameDisable>
+    <FilenamePress> ###press_thai </FilenamePress>
+    <FilenameDisable> ###disable_thai </FilenameDisable>
 <EventOnClick>
-        Open "ROOT/taobin_project/xml/page_catalog_group_pro_school_ovaltine.xml"
+        ###EventOnClick
 </EventOnClick>
-
-<Video>
-    <X> 42 </X>
-    <Y> 518 </Y>
-    <Width> 484 </Width>
-    <Height> 616 </Height>
-    <Loop> "true" </Loop>
-    <Filename> "ROOT/taobin_project/image/event/school_ovaltine/school_ovaltine.mp4" </Filename>
-</Video>
 </Button>

xml/event/script_common_for_open_promotion_xml.ev

@@ -5,9 +5,9 @@ DEBUGVAR CocktailShow
 DEBUGVAR OpenFromPageBoard
 
 DEBUGVAR SchoolOvaltinePro
-DEBUGVAR OreoVolcanoPro
 DEBUGVAR AppleFarmFestivalPro
 DEBUGVAR HappyTriosPro
+DEBUGVAR TaiwaneseTeaPro
 
 Var PromotionState1 = "Invisible"
 Var PromotionState2 = "Invisible"
@@ -31,26 +31,6 @@ Else
 
 	Else
 
-		If SchoolOvaltinePro = 1 Then
-			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_school_ovaltine.xml"
-			Var PromotionState1 = "Enable"
-
-			If OreoVolcanoPro = 1 Then
-				Var PromotionState2 = "Enable"
-				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_school_ovaltine_and_oreo_volcano.xml"
-			EndIf
-		Else
-    		If OreoVolcanoPro = 1 Then
-    			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_oreo_volcano.xml"
-    			Var PromotionState1 = "Enable"
-
-    			If MatchaEveryDayPro = 1 Then
-    				Var PromotionState2 = "Enable"
-    				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_matcha_every_day_and_oreo_volcano.xml"
-    			EndIf
-    		EndIf
-		EndIf
-
 		If AppleFarmFestivalPro = 1 Then
             Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_apple_farm_festival.xml"
             Var PromotionState1 = "Enable"
@@ -59,11 +39,30 @@ Else
     			Var PromotionState2 = "Enable"
     			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_apple_farm_festival_and_happy_trios.xml"
     		EndIf
+
+            If SchoolOvaltinePro = 1 Then
+			    Var PromotionState2 = "Enable"
+				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_apple_farm_festival_and_school_ovaltine.xml"
+			EndIf
 		Else
             If HappyTriosPro = 1 Then
     			Var PromotionState2 = "Enable"
     			Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_happy_trios.xml"
     		EndIf
+
+            If SchoolOvaltinePro = 1 Then
+				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_school_ovaltine.xml"
+			EndIf
+		EndIf
+
+		If TaiwaneseTeaPro = 1 Then
+		    Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/promotion_taiwanese_tea.xml"
+			Var PromotionState1 = "Enable"
+
+			If SchoolOvaltinePro = 1 Then
+			    Var PromotionState2 = "Enable"
+				Var FileRecommendToOpen = "ROOT/taobin_project/xml/event/double_promotion_taiwanese_tea_and_school_ovaltine.xml"
+			EndIf
 		EndIf
 
 	EndIf

xml/event/tricker.ev

@@ -80,9 +80,6 @@ Var BoostEnergyPro = 0
 ; Matcha every day, 1 - 18 May
 Var MatchaEveryDayPro = 0
 
-; School Ovaltine, 19 - 31 May
-Var SchoolOvaltinePro = 0
-
 ; Oreo volcano, 1 - 31 May
 Var OreoVolcanoPro = 0
 
@@ -92,6 +89,12 @@ Var AppleFarmFestivalPro = 0
 ; Happy Trios, 1 - 30 June
 Var HappyTriosPro = 0
 
+; School Ovaltine, 15 - 30 June
+Var SchoolOvaltinePro = 0
+
+; Taiwanese Tea, 16 - 30 June
+Var TaiwaneseTeaPro = 0
+
 Var NewCollectPoint = 1
 Var PaymentCodeShouldCollectPromotionPoint = 0
 
@@ -156,8 +159,18 @@ If SystemDateMonthInt = 5 Then
 EndIf
 
 If SystemDateMonthInt = 6 Then
-    Var AppleFarmFestivalPro = 1
-    Var HappyTriosPro = 1
+
+    If SystemDateDayInt <= 14 Then
+        Var HappyTriosPro = 1
+    Else
+        Var SchoolOvaltinePro = 1
+    EndIf
+
+    If SystemDateDayInt <= 15 Then
+        Var AppleFarmFestivalPro = 1
+    Else
+        Var TaiwaneseTeaPro = 1
+    EndIf
 EndIf
 
 
@@ -202,7 +215,6 @@ EndIf
 
 If BoxID = 123456 Then
 	Var AppleFarmFestivalPro = 1
-	
 EndIf
 
 DEBUGVAR ConfigNumer
@@ -307,6 +319,12 @@ Else
     Var AppleFarmFestivalPro = 0
 EndIf
 
+If TaiwanesePowderEnable = "true" Then
+
+Else
+    Var TaiwaneseTeaPro = 0
+EndIf
+
 Var CurrentMainVideoTemp = 0
 
 

xml/page_board.xml

@@ -234,6 +234,7 @@
 
 	STRCONTAIN "1021" MaterialAvailable CaramelSyrupEnable
 	STRCONTAIN "1218" MaterialAvailable AppleSyrupEnable
+	STRCONTAIN "1044" MaterialAvailable TaiwanesePowderEnable
 
 	;Var AppFastEnable = "false"
 	If AppFastEnable = "true" Then

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>

xml/page_catalog_group_pro_taiwanese_tea.skt

@@ -0,0 +1,36 @@
+<?hurr
+    #include=menu_head.py
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
+
+
+    Var Timeout = 0
+
+
+    ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
+</EventOpen>
+
+
+;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
+
+
+
+<?hurr
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+</Popup>