Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into masterpiece

adv/last-cmd

@@ -1,2 +0,0 @@
-mkdir /mnt/sdcard/coffeevending/taobin_project/sound_thai/lipit
-

menu/new-layout.tsv

@@ -12,11 +12,11 @@ TAGESP
 		นมสตรอเบอร์รี่\nบิสคอฟ	STRAWBERRY MILK \nBISCOFF VOLCANO	น้ำเชื่อมสตรอเบอร์รี่ นม น้ำตาล \n บิสคอฟ	Strawberry Syrup, Milk,\nSugar, Biscof	-	-	12-03-03-0042	bn_STRAWBERRY_MILK_MINT_BISCOFF.png	-	-	-	posi1
 		นมมินต์\nบิสคอฟ	Mint MILK \nBISCOFF VOLCANO	น้ำเชื่อมมินต์ นม น้ำตาล \n บิสคอฟ	Mint Syrup, Milk,\nSugar, Biscof	-	-	12-03-03-0043	bn_STRAWBERRY_MILK_BISCOFF.png	-	-	-	posi1
 
-		มัทฉะลาเต้ 	MATCHA LATTE	ชาเชียว นม  	Green Tea, Milk, Sugar, Ice	-	12-02-62-0026	12-02-63-0026	bn_matcha_bubble.png	-	-	-	posi1
+		มัทฉะลาเต้ไข่มุก	MATCHA LATTE BUBBLE	ชาเชียว นม ไข่มุก	Green Tea, Milk, Sugar, Ice, Bubble	-	12-02-62-0026	12-02-63-0026	bn_matcha_bubble.png	-	-	-	posi1
-		ชานมไทย 	THAI MILK TEA	ชาไทย และ นม	Thai tea, Sugar, milk	-	12-02-62-0039	12-02-63-0039	bn_thaitea_bubble.png	-	-	-	posi1
+		ชานมไทยไข่มุก	THAI MILK TEA BUBBLE	ชาไทย นม ไข่มุก	Thai tea, Sugar, milk, Bubble	-	12-02-62-0039	12-02-63-0039	bn_thaitea_bubble.png	-	-	-	posi1
-		ชานมมะลิ	JASMINE MILK TEA	ชามะลิ และนม	Jasmine & Milk	-	12-02-62-0047	12-02-63-0047	bn_jasmine_bubble.png	-	-	-	posi1
+		ชานมมะลิไข่มุก	JASMINE MILK TEA BUBBLE	ชามะลิ นม ไข่มุก	Jasmine , Milk, Bubble	-	12-02-62-0047	12-02-63-0047	bn_jasmine_bubble.png	-	-	-	posi1
-		ชานมไต้หวัน	TAIWANESE TEA	ชาไต้หวัน นม	Taiwan Tea, Milk, Sugar	-	12-02-62-0025	12-02-63-0025	bn_taiwan_bubble.png	-	-	-	posi1
+		ชานมไต้หวันไข่มุก	TAIWANESE TEA BUBBLE	ชาไต้หวัน นม ไข่มุก	Taiwan Tea, Milk, Sugar, Bubble	-	12-02-62-0025	12-02-63-0025	bn_taiwan_bubble.png	-	-	-	posi1
-		เต่าติมไข่มุก	TAO TIM BUBBLE TEA	ไอศครีมนม น้ำเชื่อมคาราเมล และบุกไข่มุก	Icecream, Caramel syrup and Pearl carrageenan	-	-	12-41-03-0028	taotim_bubble.png	-	-	-	posi1
+		เต่าติมไข่มุก	TAO TIM BUBBLE TEA	ไอศครีมนม น้ำเชื่อมคาราเมล และบุกไข่มุก	Icecream, Caramel syrup and Pearl carrageenan	TAOTIM	-	12-41-03-0028	taotim_bubble.png	-	-	-	posi1
 
 
 		นมโอ๊ตสตรอว์เบอร์รี่	Strawberry Oat Milk	นมโอ๊ต น้ำเชื่อมสตรอว์เบอร์รี่\nและน้ำแข็ง	Oat Milk, Strawberry Syrup 	-	12-03-82-0011	12-03-83-0011	bn_smoothie_Strawberry_Oat_smoothie.png	-	-	-	posi1
@@ -564,7 +564,7 @@ Name=Monday_Banana,file=page_catalog_group_pro_monday_banana.skt
 		โบที่ดีคือโบนัส\nสิบสองเดือน	A favorable boost\nis a MONEY BOOST	น้ำเชื่อมกล้วย นม  และน้ำแข็ง	Banana Syrup, milk and Ice	-	12-03-02-0023	12-03-03-0023	bn_Banana_milk_monday_banana.png	-	-	-	posi1
 
 
-Name=Tea Time Festival
+Name=Tea Time Festival,file=page_catalog_group_pro_tea_time.skt
 
 
 
@@ -572,10 +572,37 @@ Name=Tea Time Festival
 
 
 
-Name=Free fire
+
-		คาเพลล่าสวีทดริ๊งค์	Kapella's Sweet Drinks	น้ำเชื่อมสตอเบอร์รี่ นม น้ำตาล \n Oreo	Strawberry Syrup, Milk,\nSugar, Oreo	-	-	12-99-03-0027
+
-		แม๊กซิมบูสเตอร์ 	Maxim's Booster	เป๊ปซี่ โกโก้ นม และโอริโอ้	Pepsi, Cocoa, Milk, Oreo and Ice	-	-	12-99-03-0067
+
-		สูตรลับเคลลี่	Kelly's secret recipe	เป๊ปซี่ นม และโอริโอ้	pepsi, Milk,\nSugar, Oreo	-	-	12-99-03-0066
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Name=Free fire,file=page_catalog_group_pro_freefile.skt
+		คาเพลล่าสวีทดริ๊งค์	Kapella's Sweet Drinks	น้ำเชื่อมสตอเบอร์รี่ นม น้ำตาล \n Oreo	Strawberry Syrup, Milk,\nSugar, Oreo	-	-	12-99-03-0026	bn_smoothie_oreo_freefire.png	-	-	-	posi1
+		แม๊กซิมบูสเตอร์ 	Maxim's Booster	เป๊ปซี่ โกโก้ นม และโอริโอ้	Pepsi, Cocoa, Milk, Oreo and Ice	-	-	12-99-03-0067	bn_smoothie_oreo_Chocolate_Milk_freefire.png	-	-	-	posi1
+		สูตรลับเคลลี่	Kelly's secret recipe	เป๊ปซี่ นม และโอริโอ้	pepsi, Milk,\nSugar, Oreo	-	-	12-99-03-0066	bn_smoothie_oreo_Pepsi_Milk_freefire.png	-	-	-	posi1
 
 
 Name= bubble tea

video/script3_brew.ev

@@ -23,3 +23,13 @@ If LipitPro = 1 Then
 
 EndIf	
 
+If TeaTimePro = 1 Then
+
+	Var adver_brewing_play_index = 1
+	Var adver_brewing_count_down = 16
+	
+	Var brew_vdo2 = "ROOT/taobin_project/video/top_spender.png"
+	SAVELOG "Play adv4"
+
+EndIf
+

video/sync_1.file

@@ -1,4 +1,4 @@
-total 165324
+total 184692
 -rw-rw---- 1 root sdcard_rw 14292128 2022-12-29 13:13 brewing_adv1.mp4
 -rw-rw---- 1 root sdcard_rw  9526548 2023-09-18 18:44 brewing_adv3.mp4
 -rw-rw---- 1 root sdcard_rw   408089 2024-03-18 14:14 brewing_adv4.mp4
@@ -12,10 +12,15 @@ total 165324
 -rw-rw---- 1 root sdcard_rw 23054056 2023-09-18 18:44 event_2.mp4
 -rw-rw---- 1 root sdcard_rw  8948565 2023-12-19 10:07 main_page_event.mp4
 -rw-rw---- 1 root sdcard_rw  7185758 2023-05-23 11:02 main_page_event_en.mp4
--rw-rw---- 1 root sdcard_rw      481 2024-03-18 16:03 script1.ev
+-rw-rw---- 1 root sdcard_rw  4837414 2024-03-21 17:57 main_page_event_pro1.jpg
+-rw-rw---- 1 root sdcard_rw  7972612 2024-03-22 11:27 main_page_event_pro1.mp4
+-rw-rw---- 1 root sdcard_rw   927171 2024-03-21 18:31 main_page_event_pro1.png
+-rw-rw---- 1 root sdcard_rw  5072406 2024-03-21 17:58 main_page_event_pro2.jpg
+-rw-rw---- 1 root sdcard_rw   986756 2024-03-21 18:31 main_page_event_pro2.png
+-rw-rw---- 1 root sdcard_rw      507 2024-03-22 12:45 script1.ev
 -rw-rw---- 1 root sdcard_rw      307 2024-03-18 16:03 script2.ev
--rw-rw---- 1 root sdcard_rw      502 2024-03-18 16:04 script3_brew.ev
+-rw-rw---- 1 root sdcard_rw      502 2024-03-18 16:12 script3_brew.ev
--rw-rw---- 1 root sdcard_rw        0 2021-03-21 07:03 sync_1.file
+-rw-rw---- 1 root sdcard_rw        0 2021-03-23 02:46 sync_1.file
 -rw-rw---- 1 root sdcard_rw 14168973 2021-02-19 17:11 taobin_adv1.mp4
 -rw-rw---- 1 root sdcard_rw  9135672 2021-02-16 17:41 taobin_adv2.mp4
 -rw-rw---- 1 root sdcard_rw  8980019 2021-03-05 13:35 taobin_adv2_1.mp4

webs/index.htm

@@ -2,6 +2,12 @@
 <html>
 <head>
 <title>Page Title</title>
+
+<style>
+    table, th, td {
+      border: 1px thin black;
+    }
+    </style>
 </head>
 
 <body>
@@ -21,11 +27,47 @@
         return result;
     }
 
+    function show_table_one_row( str_req){
+        var all_out = ""
+        var str1 = readFile("?"+str_req+"&concat");
+        console.log("["+ str1+"]")
+        
+        
+        const sp1 = str1.split("|");
+        all_out += "<H1>" + sp1[0] + "</H1>"
+        const sp2 = sp1[1].split(",");
+
+        all_out += "<table>";
+        all_out += "<tr>";
+        for (let i = 0; i < sp2.length; i++) {
+            const sp3 = sp2[i].split("=");
+            if( sp3.length == 2){
+                all_out += "<th>" + sp3[0] + "</th>"
+            }
+        }
+        all_out += "</tr>";
+        all_out += "<tr>";
+        for (let i = 0; i < sp2.length; i++) {
+            const sp3 = sp2[i].split("=");
+            if( sp3.length == 2){
+                all_out += "<td>" + sp3[1] + "</td>"
+            }
+        }
+        
+        all_out += "</tr>";
+        all_out += "</table>";
+        return all_out;
+    }
 
     function RereshAll(){
-        var str_out = readFile("?machine");
+        var all_out = ""
-        console.log("Test readFile " + str_out)
+        all_out += show_table_one_row("machine")
-        document.getElementById("begin").innerHTML = str_out;
+        
+        //console.log("Test readFile " + str_out)
+        all_out += show_table_one_row("order-position")
+        
+        document.getElementById("begin").innerHTML = all_out;
+        
     }
     
 

xml/event/lipit/page_collect_point_pro_lipit_2.xml

@@ -27,6 +27,8 @@
 	EndIf
 
     Var Seeker.IsLineMember = 0
+    Var LipMaskOutofStock = 0
+    Var TintMeOutofStock = 0
 
 	If PayOfflineMode = 1 Then
 		Var Seeker.TaobinErrorNetwork = 1
@@ -90,6 +92,18 @@
             Var TelephoneNumber = TelephoneNumberX
             Var TNumberTaobinMemberXXX = TelephoneNumber
             Var Seeker.IsAlreadyGetReward = Ext1c
+            Var LipMaskOutofStock = Ext1d
+            Var TintMeOutofStock = Ext1e
+            
+
+            ;DEBUG
+            ;Var LipMaskOutofStock = 1
+            ;Var TintMeOutofStock = 1
+
+
+            DEBUGVAR LipMaskOutofStock
+            DEBUGVAR TintMeOutofStock
+
             If TaobinName = "" Then
                 Var Seeker.IsLineMember = 0 
             Else
@@ -131,6 +145,27 @@
                 EndIf
             EndIf
 
+            If LipMaskOutofStock = 1 Then
+                If TintMeOutofStock = 1 Then
+                    SAVELOG "All reward out of stock skip to normal collect point."
+
+                    WRITE_FILE "/mnt/sdcard/lipit_reward_out_of_stock" "1"
+
+                    If Seeker.CodeChannel = 1 Then
+                        If Seeker.CollectPointMain = 1 Then
+                            GETACCEXT Param1 23
+                            Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+                        Else
+                            Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+                        EndIf
+                    Else
+                        GETACCEXT Param1 23
+                        Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+                    EndIf
+                EndIf
+            EndIf
+
+
 
             Var Seeker.PointTaobinStr = ParamCP
             Var Seeker.TNumberTaobinMember = TelephoneNumberX

xml/event/lipit/page_lipit_random.xml

@@ -163,6 +163,15 @@
         Var var3 = "X"
         
         Var randResultStr = rewardList[randResultInt] 
+                
+        If LipMaskOutofStock = 1 Then
+            Var randResultStr = "tint_me_healthy_balm"
+        EndIf
+
+        If TintMeOutofStock = 1 Then
+            Var randResultStr = "lip_mask_stick"
+        EndIf
+
         If randResultStr = "lip_mask_stick" Then
             Var rewardImage = DirImage + "/reward_lip_mask_stick.png"
             Var CodeType = "126"

xml/event/multi_promotion_config_13_4-17_05_2024.json

@@ -0,0 +1,43 @@
+[
+    {
+        "name": "tea_time",
+        "template": "/event/promotion_video_template.inc",
+        "config": {
+            "normal_eng": "ROOT/taobin_project/image/event/lipit/tea_time_th.png",
+            "normal_thai": "ROOT/taobin_project/image/event/lipit/tea_time_th.png",
+            "press_eng": "ROOT/taobin_project/image/event/lipit/tea_time_th.png",
+            "press_thai": "ROOT/taobin_project/image/event/lipit/tea_time_th.png",
+            "disable_eng": "ROOT/taobin_project/image/event/lipit/tea_time_th.png",
+            "disable_thai": "ROOT/taobin_project/image/event/lipit/tea_time_th.png",
+            "video_eng": "ROOT/taobin_project/image/event/lipit/tea_time_en.mp4",
+            "video_thai": "ROOT/taobin_project/image/event/lipit/tea_time_th.mp4",
+            "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_tea_time.xml"
+        }
+    },
+    {
+        "name": "monday_banana",
+        "template": "/event/promotion_template.inc",
+        "config": {
+            "normal_eng": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "normal_thai": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "press_eng": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "press_thai": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "disable_eng": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "disable_thai": "ROOT/taobin_project/image/event/monday_banana/monday_banana_th.png",
+            "event_on_click": "ROOT/taobin_project/xml/page_catalog_group_pro_monday_banana.xml"
+        }
+    },
+    {
+        "name": "free_energy_drink",
+        "template": "/event/promotion_template.inc",
+        "config": {
+            "normal_eng": "ROOT/taobin_project/image/event/powerup_free_1/powerup_en.png",
+            "normal_thai": "ROOT/taobin_project/image/event/powerup_free_1/powerup.png",
+            "press_eng": "ROOT/taobin_project/image/event/powerup_free_1/powerup_en.png",
+            "press_thai": "ROOT/taobin_project/image/event/powerup_free_1/powerup.png",
+            "disable_eng": "ROOT/taobin_project/image/event/powerup_free_1/powerup_en.png",
+            "disable_thai": "ROOT/taobin_project/image/event/powerup_free_1/powerup.png",
+            "event_on_click": "ROOT/taobin_project/xml/event/powerup_free_1/page_powerup_bridge.xml"
+        }
+    }
+]

xml/event/promotion_monday_banana.xml

@@ -1909,7 +1909,7 @@
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -2162,7 +2162,7 @@ VOLCANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -2417,7 +2417,7 @@ VOLCANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -2671,7 +2671,7 @@ Sugar, Oreo" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -2928,7 +2928,7 @@ BANANA MILK" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -3183,7 +3183,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -3438,7 +3438,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -3633,10 +3633,10 @@ Sugar, Biscof" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MATCHA LATTE"
+		Var NameDrink = "MATCHA LATTE BUBBLE"
-		Var NameDrinkTH = "มัทฉะลาเต้ "
+		Var NameDrinkTH = "มัทฉะลาเต้ไข่มุก"
-		Var DrinkDescriptionTH = "ชาเชียว นม  "
+		Var DrinkDescriptionTH = "ชาเชียว นม ไข่มุก"
-		Var DrinkDescription = "Green Tea, Milk, Sugar, Ice"
+		Var DrinkDescription = "Green Tea, Milk, Sugar, Ice, Bubble"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_matcha_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -3693,7 +3693,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -3707,7 +3707,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "มัทฉะลาเต้ " </Value>
+	<Value> "มัทฉะลาเต้ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3717,7 +3717,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาเชียว นม  " </Value>
+	<Value> "ชาเชียว นม ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3728,7 +3728,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MATCHA LATTE" </Value>
+	<Value> "MATCHA LATTE BUBBLE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3738,7 +3738,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Green Tea, Milk, Sugar, Ice" </Value>
+	<Value> "Green Tea, Milk, Sugar, Ice, Bubble" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -3884,10 +3884,10 @@ Sugar, Biscof" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "THAI MILK TEA"
+		Var NameDrink = "THAI MILK TEA BUBBLE"
-		Var NameDrinkTH = "ชานมไทย "
+		Var NameDrinkTH = "ชานมไทยไข่มุก"
-		Var DrinkDescriptionTH = "ชาไทย และ นม"
+		Var DrinkDescriptionTH = "ชาไทย นม ไข่มุก"
-		Var DrinkDescription = "Thai tea, Sugar, milk"
+		Var DrinkDescription = "Thai tea, Sugar, milk, Bubble"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_thaitea_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -3944,7 +3944,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -3958,7 +3958,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชานมไทย " </Value>
+	<Value> "ชานมไทยไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3968,7 +3968,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาไทย และ นม" </Value>
+	<Value> "ชาไทย นม ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3979,7 +3979,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "THAI MILK TEA" </Value>
+	<Value> "THAI MILK TEA BUBBLE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3989,7 +3989,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Thai tea, Sugar, milk" </Value>
+	<Value> "Thai tea, Sugar, milk, Bubble" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -4135,10 +4135,10 @@ Sugar, Biscof" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "JASMINE MILK TEA"
+		Var NameDrink = "JASMINE MILK TEA BUBBLE"
-		Var NameDrinkTH = "ชานมมะลิ"
+		Var NameDrinkTH = "ชานมมะลิไข่มุก"
-		Var DrinkDescriptionTH = "ชามะลิ และนม"
+		Var DrinkDescriptionTH = "ชามะลิ นม ไข่มุก"
-		Var DrinkDescription = "Jasmine & Milk"
+		Var DrinkDescription = "Jasmine , Milk, Bubble"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -4195,7 +4195,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -4209,7 +4209,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชานมมะลิ" </Value>
+	<Value> "ชานมมะลิไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4219,7 +4219,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชามะลิ และนม" </Value>
+	<Value> "ชามะลิ นม ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4230,7 +4230,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "JASMINE MILK TEA" </Value>
+	<Value> "JASMINE MILK TEA BUBBLE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4240,7 +4240,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Jasmine & Milk" </Value>
+	<Value> "Jasmine , Milk, Bubble" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -4386,10 +4386,10 @@ Sugar, Biscof" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "TAIWANESE TEA"
+		Var NameDrink = "TAIWANESE TEA BUBBLE"
-		Var NameDrinkTH = "ชานมไต้หวัน"
+		Var NameDrinkTH = "ชานมไต้หวันไข่มุก"
-		Var DrinkDescriptionTH = "ชาไต้หวัน นม"
+		Var DrinkDescriptionTH = "ชาไต้หวัน นม ไข่มุก"
-		Var DrinkDescription = "Taiwan Tea, Milk, Sugar"
+		Var DrinkDescription = "Taiwan Tea, Milk, Sugar, Bubble"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_taiwan_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -4446,7 +4446,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -4460,7 +4460,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชานมไต้หวัน" </Value>
+	<Value> "ชานมไต้หวันไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4470,7 +4470,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาไต้หวัน นม" </Value>
+	<Value> "ชาไต้หวัน นม ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4481,7 +4481,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TAIWANESE TEA" </Value>
+	<Value> "TAIWANESE TEA BUBBLE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4491,7 +4491,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Taiwan Tea, Milk, Sugar" </Value>
+	<Value> "Taiwan Tea, Milk, Sugar, Bubble" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -4621,19 +4621,19 @@ Sugar, Biscof" </Value>
 </Block>
 	; - - - 
 	; ==================> Len = 12
-	; - - 12-41-03-0028 
+	; TAOTIM - 12-41-03-0028 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-41-03-0028.Button,Disable=Invisible,$Sum1241030028) </State> 
+	<State> Flag( TAOTIM.Button,12-41-03-0028.Button,Disable=Invisible,$SumTAOTIM1241030028) </State> 
 	<Button>
-	<State> $Sum1241030028 </State> 
+	<State> $SumTAOTIM1241030028 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//taotim_bubble.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//taotim_bubble.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//taotim_bubble.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-41-03-0028, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( TAOTIM, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -4643,16 +4643,16 @@ Sugar, Biscof" </Value>
 		Var DrinkDescription = "Icecream, Caramel syrup and Pearl carrageenan"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "taotim_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
+		Var PriceD1 = $TAOTIM.Price
 		Var PriceD2 = $-.Price
 		Var PriceD3 = $12-41-03-0028.Price
-		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE1 = "TAOTIM"
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "12-41-03-0028"
-		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_1 = $TAOTIM.Button
 		Var PD_STAGE_2 = "Disable2"
 		Var PD_STAGE_3 = $12-41-03-0028.Button
-		Var OverlayMenuFilter !assigned xmlpro( 12-41-03-0028, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var OverlayMenuFilter !assigned xmlpro( TAOTIM, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -4672,15 +4672,15 @@ Sugar, Biscof" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "TAOTIM"
 			Else
 			Topping "Load" "12-41-03-0028"
 			EndIf
 		EndIf
-		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_name_eng_hot = $TAOTIM.NameE
-		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_desc_eng_hot = $TAOTIM.descriptionE
-		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_name_thai_hot = $TAOTIM.Name
-		Var menu_desc_thai_hot = $##-##-##-####.description
+		Var menu_desc_thai_hot = $TAOTIM.description
 		
 		Var menu_name_eng_cold = $##-##-##-####.NameE
 		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
@@ -4697,7 +4697,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -4747,11 +4747,6 @@ Sugar, Biscof" </Value>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
-	</Image>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
 	<State> "Invisible" </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
@@ -4765,7 +4760,7 @@ Sugar, Biscof" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -4788,8 +4783,8 @@ Sugar, Biscof" </Value>
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<Filename> Var( DirImage2 + "pricetaotim.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<FilenameDisable> Var( DirImage2 + "pricetaotim.png" ) </FilenameDisable>
 	<State> $12-41-03-0028.Button </State>
 	</Image>
 	<Text>
@@ -4826,8 +4821,8 @@ Sugar, Biscof" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1241030028 = "Disable" Then
+			If $SumTAOTIM1241030028 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $TAOTIM.TAG tag1_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
 				STRCONTAIN "ERR" $12-41-03-0028.TAG tag3_is_disable
 				Var return = "Invisible"
@@ -4865,7 +4860,7 @@ Sugar, Biscof" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1241030028 </State> 
+	<State> $SumTAOTIM1241030028 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
@@ -4948,7 +4943,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -5200,7 +5195,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -5452,7 +5447,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -5704,7 +5699,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -5956,7 +5951,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -6211,7 +6206,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -6466,7 +6461,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -6721,7 +6716,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -6976,7 +6971,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -7231,7 +7226,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -7490,7 +7485,7 @@ ETHIOPAI GUJI" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -7749,7 +7744,7 @@ Note: Blue Berry & Floral" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -8008,7 +8003,7 @@ Note: Strawberry & Floral" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -8267,7 +8262,7 @@ Note: Whisky & Vanilla" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -8526,7 +8521,7 @@ Note: Jasmine & Honey" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -8785,7 +8780,7 @@ Note: Peach, tea, chocolate" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -9043,7 +9038,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -9300,7 +9295,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -9559,7 +9554,7 @@ Pink​ Rose & Berry" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -9818,7 +9813,7 @@ Note: Strawberry & Floral" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -10075,7 +10070,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -10332,7 +10327,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -10587,7 +10582,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -10842,7 +10837,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -11097,7 +11092,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -11350,7 +11345,7 @@ Sugar" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -11603,7 +11598,7 @@ SMOOTHIE" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -11854,7 +11849,7 @@ SMOOTHIE" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -12105,7 +12100,7 @@ SMOOTHIE" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -12357,7 +12352,7 @@ DRINK SODA" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>

xml/event/promotion_pepsi_second_cup_30.xml

@@ -1909,7 +1909,7 @@
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -2162,7 +2162,7 @@ VOLCANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -2417,7 +2417,7 @@ VOLCANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -2671,7 +2671,7 @@ Sugar, Oreo" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -2928,7 +2928,7 @@ BANANA MILK" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -3183,7 +3183,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -3438,7 +3438,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -3633,10 +3633,10 @@ Sugar, Biscof" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MATCHA LATTE"
+		Var NameDrink = "MATCHA LATTE BUBBLE"
-		Var NameDrinkTH = "มัทฉะลาเต้ "
+		Var NameDrinkTH = "มัทฉะลาเต้ไข่มุก"
-		Var DrinkDescriptionTH = "ชาเชียว นม  "
+		Var DrinkDescriptionTH = "ชาเชียว นม ไข่มุก"
-		Var DrinkDescription = "Green Tea, Milk, Sugar, Ice"
+		Var DrinkDescription = "Green Tea, Milk, Sugar, Ice, Bubble"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_matcha_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -3693,7 +3693,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -3707,7 +3707,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "มัทฉะลาเต้ " </Value>
+	<Value> "มัทฉะลาเต้ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3717,7 +3717,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาเชียว นม  " </Value>
+	<Value> "ชาเชียว นม ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3728,7 +3728,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MATCHA LATTE" </Value>
+	<Value> "MATCHA LATTE BUBBLE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3738,7 +3738,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Green Tea, Milk, Sugar, Ice" </Value>
+	<Value> "Green Tea, Milk, Sugar, Ice, Bubble" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -3884,10 +3884,10 @@ Sugar, Biscof" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "THAI MILK TEA"
+		Var NameDrink = "THAI MILK TEA BUBBLE"
-		Var NameDrinkTH = "ชานมไทย "
+		Var NameDrinkTH = "ชานมไทยไข่มุก"
-		Var DrinkDescriptionTH = "ชาไทย และ นม"
+		Var DrinkDescriptionTH = "ชาไทย นม ไข่มุก"
-		Var DrinkDescription = "Thai tea, Sugar, milk"
+		Var DrinkDescription = "Thai tea, Sugar, milk, Bubble"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_thaitea_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -3944,7 +3944,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -3958,7 +3958,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชานมไทย " </Value>
+	<Value> "ชานมไทยไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3968,7 +3968,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาไทย และ นม" </Value>
+	<Value> "ชาไทย นม ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3979,7 +3979,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "THAI MILK TEA" </Value>
+	<Value> "THAI MILK TEA BUBBLE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3989,7 +3989,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Thai tea, Sugar, milk" </Value>
+	<Value> "Thai tea, Sugar, milk, Bubble" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -4135,10 +4135,10 @@ Sugar, Biscof" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "JASMINE MILK TEA"
+		Var NameDrink = "JASMINE MILK TEA BUBBLE"
-		Var NameDrinkTH = "ชานมมะลิ"
+		Var NameDrinkTH = "ชานมมะลิไข่มุก"
-		Var DrinkDescriptionTH = "ชามะลิ และนม"
+		Var DrinkDescriptionTH = "ชามะลิ นม ไข่มุก"
-		Var DrinkDescription = "Jasmine & Milk"
+		Var DrinkDescription = "Jasmine , Milk, Bubble"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -4195,7 +4195,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -4209,7 +4209,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชานมมะลิ" </Value>
+	<Value> "ชานมมะลิไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4219,7 +4219,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชามะลิ และนม" </Value>
+	<Value> "ชามะลิ นม ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4230,7 +4230,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "JASMINE MILK TEA" </Value>
+	<Value> "JASMINE MILK TEA BUBBLE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4240,7 +4240,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Jasmine & Milk" </Value>
+	<Value> "Jasmine , Milk, Bubble" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -4386,10 +4386,10 @@ Sugar, Biscof" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "TAIWANESE TEA"
+		Var NameDrink = "TAIWANESE TEA BUBBLE"
-		Var NameDrinkTH = "ชานมไต้หวัน"
+		Var NameDrinkTH = "ชานมไต้หวันไข่มุก"
-		Var DrinkDescriptionTH = "ชาไต้หวัน นม"
+		Var DrinkDescriptionTH = "ชาไต้หวัน นม ไข่มุก"
-		Var DrinkDescription = "Taiwan Tea, Milk, Sugar"
+		Var DrinkDescription = "Taiwan Tea, Milk, Sugar, Bubble"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_taiwan_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -4446,7 +4446,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -4460,7 +4460,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชานมไต้หวัน" </Value>
+	<Value> "ชานมไต้หวันไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4470,7 +4470,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาไต้หวัน นม" </Value>
+	<Value> "ชาไต้หวัน นม ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4481,7 +4481,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TAIWANESE TEA" </Value>
+	<Value> "TAIWANESE TEA BUBBLE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -4491,7 +4491,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Taiwan Tea, Milk, Sugar" </Value>
+	<Value> "Taiwan Tea, Milk, Sugar, Bubble" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -4621,19 +4621,19 @@ Sugar, Biscof" </Value>
 </Block>
 	; - - - 
 	; ==================> Len = 12
-	; - - 12-41-03-0028 
+	; TAOTIM - 12-41-03-0028 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-41-03-0028.Button,Disable=Invisible,$Sum1241030028) </State> 
+	<State> Flag( TAOTIM.Button,12-41-03-0028.Button,Disable=Invisible,$SumTAOTIM1241030028) </State> 
 	<Button>
-	<State> $Sum1241030028 </State> 
+	<State> $SumTAOTIM1241030028 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//taotim_bubble.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//taotim_bubble.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//taotim_bubble.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-41-03-0028, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( TAOTIM, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -4643,16 +4643,16 @@ Sugar, Biscof" </Value>
 		Var DrinkDescription = "Icecream, Caramel syrup and Pearl carrageenan"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "taotim_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
+		Var PriceD1 = $TAOTIM.Price
 		Var PriceD2 = $-.Price
 		Var PriceD3 = $12-41-03-0028.Price
-		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE1 = "TAOTIM"
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "12-41-03-0028"
-		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_1 = $TAOTIM.Button
 		Var PD_STAGE_2 = "Disable2"
 		Var PD_STAGE_3 = $12-41-03-0028.Button
-		Var OverlayMenuFilter !assigned xmlpro( 12-41-03-0028, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var OverlayMenuFilter !assigned xmlpro( TAOTIM, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -4672,15 +4672,15 @@ Sugar, Biscof" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "TAOTIM"
 			Else
 			Topping "Load" "12-41-03-0028"
 			EndIf
 		EndIf
-		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_name_eng_hot = $TAOTIM.NameE
-		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_desc_eng_hot = $TAOTIM.descriptionE
-		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_name_thai_hot = $TAOTIM.Name
-		Var menu_desc_thai_hot = $##-##-##-####.description
+		Var menu_desc_thai_hot = $TAOTIM.description
 		
 		Var menu_name_eng_cold = $##-##-##-####.NameE
 		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
@@ -4697,7 +4697,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -4747,11 +4747,6 @@ Sugar, Biscof" </Value>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
-	</Image>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
 	<State> "Invisible" </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
@@ -4765,7 +4760,7 @@ Sugar, Biscof" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -4788,8 +4783,8 @@ Sugar, Biscof" </Value>
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<Filename> Var( DirImage2 + "pricetaotim.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<FilenameDisable> Var( DirImage2 + "pricetaotim.png" ) </FilenameDisable>
 	<State> $12-41-03-0028.Button </State>
 	</Image>
 	<Text>
@@ -4826,8 +4821,8 @@ Sugar, Biscof" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1241030028 = "Disable" Then
+			If $SumTAOTIM1241030028 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $TAOTIM.TAG tag1_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
 				STRCONTAIN "ERR" $12-41-03-0028.TAG tag3_is_disable
 				Var return = "Invisible"
@@ -4865,7 +4860,7 @@ Sugar, Biscof" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1241030028 </State> 
+	<State> $SumTAOTIM1241030028 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
@@ -4948,7 +4943,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -5200,7 +5195,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -5452,7 +5447,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -5704,7 +5699,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -5956,7 +5951,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -6211,7 +6206,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -6466,7 +6461,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -6721,7 +6716,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -6976,7 +6971,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -7231,7 +7226,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -7490,7 +7485,7 @@ ETHIOPAI GUJI" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -7749,7 +7744,7 @@ Note: Blue Berry & Floral" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -8008,7 +8003,7 @@ Note: Strawberry & Floral" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -8267,7 +8262,7 @@ Note: Whisky & Vanilla" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -8526,7 +8521,7 @@ Note: Jasmine & Honey" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -8785,7 +8780,7 @@ Note: Peach, tea, chocolate" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -9043,7 +9038,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -9300,7 +9295,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -9559,7 +9554,7 @@ Pink​ Rose & Berry" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -9818,7 +9813,7 @@ Note: Strawberry & Floral" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -10075,7 +10070,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -10332,7 +10327,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -10587,7 +10582,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -10842,7 +10837,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -11097,7 +11092,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -11350,7 +11345,7 @@ Sugar" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -11603,7 +11598,7 @@ SMOOTHIE" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -11854,7 +11849,7 @@ SMOOTHIE" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -12105,7 +12100,7 @@ SMOOTHIE" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -12357,7 +12352,7 @@ DRINK SODA" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>

xml/event/promotion_template1.inc

@@ -3,7 +3,71 @@
     <X> 42 </X>
     <Y> 518 </Y>
 
-<State> BigButtonEnable </State>
+<State> 
+	eval(
+		If BigButtonEnable = "Enable" Then
+			If LipitRewardOutOfStock = 1 Then
+				Var return = "Enable"
+			Else
+				Var return = "Invisible"
+			EndIf
+		Else
+			Var return = "Invisible"
+		EndIf
+	)
+ </State>
+    <Filename>
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_en.png"
+        Else
+            Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_th.png"
+        EndIf
+        )
+     </Filename>
+    <FilenamePress> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_en.png"
+        Else
+            Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_th.png"
+        EndIf
+        )
+     </FilenamePress>
+    <FilenameDisable> 
+     eval( 
+        If show_eng = "true" Then 
+            Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_en.png"
+        Else
+            Var return = "ROOT/taobin_project/image/event/lipit/lipit_reward_out_of_stock_th.png"
+        EndIf
+        )
+     </FilenameDisable>
+<EventOnClick> 
+
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_lipit.xml"
+        
+</EventOnClick>
+
+</Button>
+
+<Button>
+    <X> 42 </X>
+    <Y> 518 </Y>
+
+<State>
+	eval(
+		If BigButtonEnable = "Enable" Then
+			If LipitRewardOutOfStock = 1 Then
+				Var return = "Invisible"
+			Else
+				Var return = "Enable"
+			EndIf
+		Else
+			Var return = "Invisible"
+		EndIf
+	)
+ </State>
     <Filename>
      eval( 
         If show_eng = "true" Then 
@@ -49,7 +113,11 @@
             If show_eng = "true" Then
                 Var return = "Invisible"
             Else
-                Var return  = "Enable"
+                If LipitRewardOutOfStock = 1 Then
+					Var return = "Invisible"
+				Else
+					Var return = "Enable"
+				EndIf
             EndIf
         ) 
     </State>
@@ -64,7 +132,11 @@
     <State> 
         eval(
             If show_eng = "true" Then
-                Var return = "Enable"
+                If LipitRewardOutOfStock = 1 Then
+					Var return = "Invisible"
+				Else
+					Var return = "Enable"
+				EndIf
             Else
                 Var return  = "Invisible"
             EndIf

xml/event/script_common_for_open_promotion_xml.ev

@@ -6,9 +6,13 @@ DEBUGVAR OpenFromPageBoard
 
 DEBUGVAR LipitPro
 DEBUGVAR MondayBananaPro
-DEBUGVAR PepsiSecondCup30Enable
 DEBUGVAR FreeEnergyDrink
 DEBUGVAR EnergyDrinkEnable
+DEBUGVAR TeaTimePro
+DEBUGVAR FreeFirePro
+DEBUGVAR FreeFireMenuState1
+DEBUGVAR FreeFireMenuState2
+DEBUGVAR FreeFireMenuState3
 
 Var PromotionState1 = "Invisible"
 Var PromotionState2 = "Invisible"
@@ -29,6 +33,7 @@ Else
 	DEBUGVAR FreeEnergyDrink
 	;Var FreeEnergyDrink = 1
 	;Var EnableFreeEnergyDrink = "true"
+	;Var MondayBananaPro = 1
 	DEBUGVAR EnableFreeEnergyDrink
 
 	Var CountEnablePromotion = 0

xml/event/tricker.ev

@@ -69,9 +69,10 @@ Var PepsiSecondCup30Enable = 0
 Var PepsiSecondCup30DiscountEnable = 0
 Var FromPepsiSecondCup30 = 0
 
-; Enable Lipit Promotion, 18 Mar - 12 Apr
+; Enable Lipit Promotion, 18 Mar - 5 Apr
 Var LipitPro = 0
 Var FromLipitPro = 0
+Var LipitRewardOutOfStock = 0
 
 ; Enable Monday Banana Promotion, every Monday start 11 Mar - 19 Apr
 Var MondayBananaPro = 0
@@ -82,6 +83,12 @@ Var FreeEnergyDrink = 0
 Var FromPowerUpPro = 0
 Var FreePowerup = "Invisible"
 
+; Enable Tea Time, 13 - 30 Apr
+Var TeaTimePro = 0
+
+; Enable Free Fire, 1 - 30 Apr
+Var FreeFirePro = 0
+
 Var NewCollectPoint = 1
 
 Var NewFlowPaymentCode = 0
@@ -189,6 +196,7 @@ EndIf
 If SystemDateMonthInt = 4 Then
 
 	Var FreeEnergyDrink = 1
+	Var FreeFirePro = 1
 
 	If SystemDateDayInt = 1 Then
 		Var MondayBananaPro = 1
@@ -214,6 +222,10 @@ If SystemDateMonthInt = 4 Then
 		Var LipitPro = 1
 	EndIf
 
+	If SystemDateDayInt >= 13 Then
+		Var TeaTimePro = 1
+	EndIf
+
 EndIf
 
 
@@ -258,9 +270,7 @@ EndIf
 If BoxID = 173149 Then
 	Var ProBadValentineEnable = 0
 	Var PepsiSecondCup30Enable = 0
-	Var MondayBananaPro = 1
+
-	Var LipitPro = 1
-	Var FreeEnergyDrink = 1
 EndIf
 
 
@@ -274,11 +284,14 @@ EndIf
 
 Var XMLLiveInfoEnable = 1
 
-If BoxID = 173973 Then
+If BoxID = 172053 Then
 	Var ProBadValentineEnable = 0
 	Var PepsiSecondCup30Enable = 0
 	Var PepsiSecondCup30DiscountEnable = 0
 	Var NewFlowPaymentCode = 0
+		Var MondayBananaPro = 0
+	Var LipitPro = 1
+	Var FreeEnergyDrink = 0
 EndIf
 
 
@@ -364,8 +377,23 @@ Else
 	Var FreeEnergyDrink = 0
 EndIf
 
+If FreeFirePro = 1 Then	
+	Var FreeFireMenuState1 = $12-99-03-0026.Button
+	Var FreeFireMenuState2 = $12-99-03-0067.Button
+	Var FreeFireMenuState3 = $12-99-03-0066.Button
+Else
+	Var FreeFireMenuState1 = "Invisible"
+	Var FreeFireMenuState2 = "Invisible"
+	Var FreeFireMenuState3 = "Invisible"
+EndIf
+
 If LipitPro = 1 Then
 
+	READ_FILE "/mnt/sdcard/lipit_reward_out_of_stock" lipitOutOfStock
+	STRCONTAIN "1" lipitOutOfStock LipitOutOfStockContain
+	If LipitOutOfStockContain = "true" Then
+		Var LipitRewardOutOfStock = 1
+	EndIf
 	
 	Var VideoMainPage = "ROOT/taobin_project/video/main_page_event_pro1.mp4"
 	Var CountDownShowButton = 0

xml/menu_new_layout_gen.py

@@ -40,6 +40,8 @@
     else:
         return ""
 
+  button_add_string = ""
+
   if "v2" in param:
     print("Version 1 ignore ")
   else:  
@@ -47,8 +49,10 @@
     menu_xml_var = ""
     if current_file_name == "page_catalog_group_recommend.skt":
       touch_less_gen = True
+      button_add_string = "Var OpenFromInstMenuTab = 0"
     else:
       touch_less_gen = False
+      button_add_string = ""
     
     if current_file_name == "page_catalog_group_recommend_double_pro.skt":
       double_pro_gen = True
@@ -477,7 +481,7 @@
 
         
         out_xml( '\t\t\r\n')
-        out_xml( '\t\t\r\n')
+        out_xml( '\t\t'+ button_add_string +'\r\n')
         if spl[1] != "None":
           out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_select5.xml"\r\n')
         out_xml( '\t\t\r\n')
@@ -550,11 +554,12 @@
           out_xml( '\t<Value> "' + spl[3].replace("\\n", "\n") + '" </Value>\r\n')
           out_xml( '\t</Text>\r\n')
 
-          out_xml( '\t<Image>\r\n')
+          if spl[4] != "TAOTIM":  
-          out_xml( '\t<X> 16 </X>\r\n')
+            out_xml( '\t<Image>\r\n')
-          out_xml( '\t<Y> 264 </Y>\r\n')
+            out_xml( '\t<X> 16 </X>\r\n')
-          out_xml( '\t<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>\r\n')
+            out_xml( '\t<Y> 264 </Y>\r\n')
-          out_xml( '\t</Image>\r\n')
+            out_xml( '\t<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>\r\n')
+            out_xml( '\t</Image>\r\n')
 
           ice_tab_hot_show = True
           shw = "$" + spl[4] + ".Button"
@@ -565,7 +570,11 @@
           if len(spl[4]) == 0 :
             shw = '"Invisible"'
             ice_tab_hot_show = False
-
+          
+          if spl[4] == "TAOTIM":
+            shw = '"Invisible"'
+            ice_tab_hot_show = False
+          
           out_xml( '\t<Image>\r\n')
           out_xml( '\t<X> 16 </X>\r\n')
           out_xml( '\t<Y> 264 </Y>\r\n')
@@ -628,6 +637,10 @@
             shw = '"Invisible"'
             ice_tab_ice_show = False
 
+          if spl[4] == "TAOTIM":
+            shw = '"Invisible"'
+            ice_tab_ice_show = False
+          
           out_xml( '\t<Image>\r\n')
           out_xml( '\t<X> 81 </X>\r\n')
           out_xml( '\t<Y> 264 </Y>\r\n')
@@ -678,22 +691,40 @@
       
           ice_tab_blend_show = True
 
-          shw = "$" + spl[6] + ".Button"
+          if spl[4] == "TAOTIM":
-          if spl[6] == "-" :
+            shw = "$" + spl[6] + ".Button"
-            shw = '"Invisible"'
+            if spl[6] == "-" :
-            ice_tab_blend_show = False
+              shw = '"Invisible"'
+              ice_tab_blend_show = False
 
-          if len(spl[6]) == 0 :
+            if len(spl[6]) == 0 :
-            shw = '"Invisible"'
+              shw = '"Invisible"'
-            ice_tab_blend_show = False
+              ice_tab_blend_show = False
 
-          out_xml( '\t<Image>\r\n')
+            out_xml( '\t<Image>\r\n')
-          out_xml( '\t<X> 146 </X>\r\n')
+            out_xml( '\t<X> 146 </X>\r\n')
-          out_xml( '\t<Y> 264 </Y>\r\n')
+            out_xml( '\t<Y> 264 </Y>\r\n')
-          out_xml( '\t<Filename> Var( DirImage2 + "blend.png" ) </Filename>\r\n')
+            out_xml( '\t<Filename> Var( DirImage2 + "pricetaotim.png" ) </Filename>\r\n')
-          out_xml( '\t<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>\r\n')
+            out_xml( '\t<FilenameDisable> Var( DirImage2 + "pricetaotim.png" ) </FilenameDisable>\r\n')
-          out_xml( '\t<State> ' + shw + ' </State>\r\n')
+            out_xml( '\t<State> ' + shw + ' </State>\r\n')
-          out_xml( '\t</Image>\r\n')
+            out_xml( '\t</Image>\r\n')
+          else:
+            shw = "$" + spl[6] + ".Button"
+            if spl[6] == "-" :
+              shw = '"Invisible"'
+              ice_tab_blend_show = False
+
+            if len(spl[6]) == 0 :
+              shw = '"Invisible"'
+              ice_tab_blend_show = False
+
+            out_xml( '\t<Image>\r\n')
+            out_xml( '\t<X> 146 </X>\r\n')
+            out_xml( '\t<Y> 264 </Y>\r\n')
+            out_xml( '\t<Filename> Var( DirImage2 + "blend.png" ) </Filename>\r\n')
+            out_xml( '\t<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>\r\n')
+            out_xml( '\t<State> ' + shw + ' </State>\r\n')
+            out_xml( '\t</Image>\r\n')
 
           out_xml( '\t<Text>\r\n')
           if "inter" in param:

xml/menutab/page_catalog_group_recommend.xml

@@ -2699,10 +2699,10 @@ Sugar, Biscof" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MATCHA LATTE"
+		Var NameDrink = "MATCHA LATTE BUBBLE"
-		Var NameDrinkTH = "มัทฉะลาเต้ "
+		Var NameDrinkTH = "มัทฉะลาเต้ไข่มุก"
-		Var DrinkDescriptionTH = "ชาเชียว นม  "
+		Var DrinkDescriptionTH = "ชาเชียว นม ไข่มุก"
-		Var DrinkDescription = "Green Tea, Milk, Sugar, Ice"
+		Var DrinkDescription = "Green Tea, Milk, Sugar, Ice, Bubble"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_matcha_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
@@ -2775,7 +2775,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "มัทฉะลาเต้ " </Value>
+	<Value> "มัทฉะลาเต้ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2785,7 +2785,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาเชียว นม  " </Value>
+	<Value> "ชาเชียว นม ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2796,7 +2796,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MATCHA LATTE" </Value>
+	<Value> "MATCHA LATTE BUBBLE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2806,7 +2806,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Green Tea, Milk, Sugar, Ice" </Value>
+	<Value> "Green Tea, Milk, Sugar, Ice, Bubble" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -2952,10 +2952,10 @@ Sugar, Biscof" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "THAI MILK TEA"
+		Var NameDrink = "THAI MILK TEA BUBBLE"
-		Var NameDrinkTH = "ชานมไทย "
+		Var NameDrinkTH = "ชานมไทยไข่มุก"
-		Var DrinkDescriptionTH = "ชาไทย และ นม"
+		Var DrinkDescriptionTH = "ชาไทย นม ไข่มุก"
-		Var DrinkDescription = "Thai tea, Sugar, milk"
+		Var DrinkDescription = "Thai tea, Sugar, milk, Bubble"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_thaitea_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
@@ -3028,7 +3028,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชานมไทย " </Value>
+	<Value> "ชานมไทยไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3038,7 +3038,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาไทย และ นม" </Value>
+	<Value> "ชาไทย นม ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3049,7 +3049,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "THAI MILK TEA" </Value>
+	<Value> "THAI MILK TEA BUBBLE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3059,7 +3059,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Thai tea, Sugar, milk" </Value>
+	<Value> "Thai tea, Sugar, milk, Bubble" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -3205,10 +3205,10 @@ Sugar, Biscof" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "JASMINE MILK TEA"
+		Var NameDrink = "JASMINE MILK TEA BUBBLE"
-		Var NameDrinkTH = "ชานมมะลิ"
+		Var NameDrinkTH = "ชานมมะลิไข่มุก"
-		Var DrinkDescriptionTH = "ชามะลิ และนม"
+		Var DrinkDescriptionTH = "ชามะลิ นม ไข่มุก"
-		Var DrinkDescription = "Jasmine & Milk"
+		Var DrinkDescription = "Jasmine , Milk, Bubble"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
@@ -3281,7 +3281,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชานมมะลิ" </Value>
+	<Value> "ชานมมะลิไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3291,7 +3291,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชามะลิ และนม" </Value>
+	<Value> "ชามะลิ นม ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3302,7 +3302,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "JASMINE MILK TEA" </Value>
+	<Value> "JASMINE MILK TEA BUBBLE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3312,7 +3312,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Jasmine & Milk" </Value>
+	<Value> "Jasmine , Milk, Bubble" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -3458,10 +3458,10 @@ Sugar, Biscof" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "TAIWANESE TEA"
+		Var NameDrink = "TAIWANESE TEA BUBBLE"
-		Var NameDrinkTH = "ชานมไต้หวัน"
+		Var NameDrinkTH = "ชานมไต้หวันไข่มุก"
-		Var DrinkDescriptionTH = "ชาไต้หวัน นม"
+		Var DrinkDescriptionTH = "ชาไต้หวัน นม ไข่มุก"
-		Var DrinkDescription = "Taiwan Tea, Milk, Sugar"
+		Var DrinkDescription = "Taiwan Tea, Milk, Sugar, Bubble"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_taiwan_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
@@ -3534,7 +3534,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชานมไต้หวัน" </Value>
+	<Value> "ชานมไต้หวันไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3544,7 +3544,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาไต้หวัน นม" </Value>
+	<Value> "ชาไต้หวัน นม ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3555,7 +3555,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TAIWANESE TEA" </Value>
+	<Value> "TAIWANESE TEA BUBBLE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3565,7 +3565,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Taiwan Tea, Milk, Sugar" </Value>
+	<Value> "Taiwan Tea, Milk, Sugar, Bubble" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -3695,19 +3695,19 @@ Sugar, Biscof" </Value>
 </Block>
 	; - - - 
 	; ==================> Len = 12
-	; - - 12-41-03-0028 
+	; TAOTIM - 12-41-03-0028 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-41-03-0028.Button,Disable=Invisible,$Sum1241030028) </State> 
+	<State> Flag( TAOTIM.Button,12-41-03-0028.Button,Disable=Invisible,$SumTAOTIM1241030028) </State> 
 	<Button>
-	<State> $Sum1241030028 </State> 
+	<State> $SumTAOTIM1241030028 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//taotim_bubble.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//taotim_bubble.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//taotim_bubble.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-41-03-0028, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( TAOTIM, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -3718,16 +3718,16 @@ Sugar, Biscof" </Value>
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "taotim_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
-		Var PriceD1 = $-.Price
+		Var PriceD1 = $TAOTIM.Price
 		Var PriceD2 = $-.Price
 		Var PriceD3 = $12-41-03-0028.Price
-		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE1 = "TAOTIM"
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "12-41-03-0028"
-		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_1 = $TAOTIM.Button
 		Var PD_STAGE_2 = "Disable2"
 		Var PD_STAGE_3 = $12-41-03-0028.Button
-		Var OverlayMenuFilter !assigned xmlpro( 12-41-03-0028, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var OverlayMenuFilter !assigned xmlpro( TAOTIM, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -3747,15 +3747,15 @@ Sugar, Biscof" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "TAOTIM"
 			Else
 			Topping "Load" "12-41-03-0028"
 			EndIf
 		EndIf
-		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_name_eng_hot = $TAOTIM.NameE
-		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_desc_eng_hot = $TAOTIM.descriptionE
-		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_name_thai_hot = $TAOTIM.Name
-		Var menu_desc_thai_hot = $##-##-##-####.description
+		Var menu_desc_thai_hot = $TAOTIM.description
 		
 		Var menu_name_eng_cold = $##-##-##-####.NameE
 		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
@@ -3828,7 +3828,7 @@ Sugar, Biscof" </Value>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<State> "Invisible" </State>
+	<State> $TAOTIM.Button </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
 	</Image>
@@ -3840,8 +3840,8 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> "Invisible" </State>
+	<State> $TAOTIM.Button </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -3886,7 +3886,11 @@ Sugar, Biscof" </Value>
 		eval( 
 		If ICE_PROCESS_STATUS = 2 Then
 		
-			Var ice_tab_process_show = "Invisible"
+			If $SumTAOTIM1241030028 = "Disable" Then
+				Var ice_tab_process_show = "Disable"
+			Else
+				Var ice_tab_process_show = "Enable"
+			EndIf
 		
 		Else
 			Var ice_tab_process_show = "Invisible"
@@ -3902,8 +3906,8 @@ Sugar, Biscof" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1241030028 = "Disable" Then
+			If $SumTAOTIM1241030028 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $TAOTIM.TAG tag1_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
 				STRCONTAIN "ERR" $12-41-03-0028.TAG tag3_is_disable
 				Var return = "Invisible"
@@ -3941,7 +3945,7 @@ Sugar, Biscof" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1241030028 </State> 
+	<State> $SumTAOTIM1241030028 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>

xml/page_board.xml

@@ -82,6 +82,8 @@
 	Var RobotoRegular = "ROOT/taobin_project/font/Roboto/Roboto-Regular.ttf"
 	Var RobotoThin = "ROOT/taobin_project/font/Roboto/Roboto-Thin.ttf"
 
+	Var RobotoCondensedRegular = "ROOT/taobin_project/font/Roboto/RobotoCondensed-Regular.ttf"
+
 	Var KanitMediumTTF = "ROOT/taobin_project/font/Kanit/Kanit-Regular.ttf"
 	Var KanitRegularTTF = "ROOT/taobin_project/font/Kanit/Kanit-Regular.ttf"
 	Var KanitThinTTF = "ROOT/taobin_project/font/Kanit/Kanit-Thin.ttf"
@@ -96,6 +98,9 @@
 
 	Var MITRegularTTF = "ROOT/taobin_project/font/Mitr/Mitr-Regular.ttf"
 
+	Var DinCondensedRegular = "ROOT/taobin_project/font/Din/DIN-Regular.ttf"
+	Var DinCondensedBold = "ROOT/taobin_project/font/Din/DIN-Condensed-Bold.ttf"
+
 
 	Var countClick = 0
 
@@ -1350,8 +1355,7 @@
 		EndIf
 	EndIf
 
-	DEBUGVAR ShowButtonClick2
+	
-
 	Refresh
 
 	TimerReset
@@ -1634,7 +1638,7 @@
 	Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml"
 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-4
+
 
 	Var OpenFromPageBoard = 1
 

xml/page_catalog_group_pro_freefile.skt

@@ -0,0 +1,63 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	<?hurr
+        #include=menu_catalog_default_init.py
+    ?>
+    
+    Var FromMyMintPro = 0
+
+    Var Timeout = 0
+
+
+    <?hurr 
+        #include=menu_catalog_new_menu.py
+    ?>
+
+
+</EventOpen>
+
+
+<?hurr 
+    #include=menu_catalog_new.py
+?>
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+;BigLogoLayout
+
+<Button>
+<X> 780 </X>
+<Y> 500 </Y>
+<State> buttonRemoveCup </State>
+;<Color> "0x00BDFF" </Color>
+<Interval> 500 </Interval>
+<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
+<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
+<EventClick> 
+    Machine RemoveCup
+    Machine DoorLidOpen
+    Var buttonRemoveCup = "Invisible"
+</EventClick>
+</Button>
+
+</Popup>
+
+

xml/page_catalog_group_recommend.xml

@@ -674,7 +674,7 @@
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -930,7 +930,7 @@
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -1183,7 +1183,7 @@ VOLCANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -1438,7 +1438,7 @@ VOLCANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -1692,7 +1692,7 @@ Sugar, Oreo" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -1949,7 +1949,7 @@ BANANA MILK" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -2204,7 +2204,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -2459,7 +2459,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -2654,10 +2654,10 @@ Sugar, Biscof" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "MATCHA LATTE"
+		Var NameDrink = "MATCHA LATTE BUBBLE"
-		Var NameDrinkTH = "มัทฉะลาเต้ "
+		Var NameDrinkTH = "มัทฉะลาเต้ไข่มุก"
-		Var DrinkDescriptionTH = "ชาเชียว นม  "
+		Var DrinkDescriptionTH = "ชาเชียว นม ไข่มุก"
-		Var DrinkDescription = "Green Tea, Milk, Sugar, Ice"
+		Var DrinkDescription = "Green Tea, Milk, Sugar, Ice, Bubble"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_matcha_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -2714,7 +2714,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -2728,7 +2728,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "มัทฉะลาเต้ " </Value>
+	<Value> "มัทฉะลาเต้ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2738,7 +2738,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาเชียว นม  " </Value>
+	<Value> "ชาเชียว นม ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2749,7 +2749,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "MATCHA LATTE" </Value>
+	<Value> "MATCHA LATTE BUBBLE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2759,7 +2759,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Green Tea, Milk, Sugar, Ice" </Value>
+	<Value> "Green Tea, Milk, Sugar, Ice, Bubble" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -2905,10 +2905,10 @@ Sugar, Biscof" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "THAI MILK TEA"
+		Var NameDrink = "THAI MILK TEA BUBBLE"
-		Var NameDrinkTH = "ชานมไทย "
+		Var NameDrinkTH = "ชานมไทยไข่มุก"
-		Var DrinkDescriptionTH = "ชาไทย และ นม"
+		Var DrinkDescriptionTH = "ชาไทย นม ไข่มุก"
-		Var DrinkDescription = "Thai tea, Sugar, milk"
+		Var DrinkDescription = "Thai tea, Sugar, milk, Bubble"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_thaitea_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -2965,7 +2965,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -2979,7 +2979,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชานมไทย " </Value>
+	<Value> "ชานมไทยไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2989,7 +2989,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาไทย และ นม" </Value>
+	<Value> "ชาไทย นม ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3000,7 +3000,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "THAI MILK TEA" </Value>
+	<Value> "THAI MILK TEA BUBBLE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3010,7 +3010,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Thai tea, Sugar, milk" </Value>
+	<Value> "Thai tea, Sugar, milk, Bubble" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -3156,10 +3156,10 @@ Sugar, Biscof" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "JASMINE MILK TEA"
+		Var NameDrink = "JASMINE MILK TEA BUBBLE"
-		Var NameDrinkTH = "ชานมมะลิ"
+		Var NameDrinkTH = "ชานมมะลิไข่มุก"
-		Var DrinkDescriptionTH = "ชามะลิ และนม"
+		Var DrinkDescriptionTH = "ชามะลิ นม ไข่มุก"
-		Var DrinkDescription = "Jasmine & Milk"
+		Var DrinkDescription = "Jasmine , Milk, Bubble"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_jasmine_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -3216,7 +3216,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -3230,7 +3230,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชานมมะลิ" </Value>
+	<Value> "ชานมมะลิไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3240,7 +3240,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชามะลิ และนม" </Value>
+	<Value> "ชามะลิ นม ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3251,7 +3251,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "JASMINE MILK TEA" </Value>
+	<Value> "JASMINE MILK TEA BUBBLE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3261,7 +3261,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Jasmine & Milk" </Value>
+	<Value> "Jasmine , Milk, Bubble" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -3407,10 +3407,10 @@ Sugar, Biscof" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "TAIWANESE TEA"
+		Var NameDrink = "TAIWANESE TEA BUBBLE"
-		Var NameDrinkTH = "ชานมไต้หวัน"
+		Var NameDrinkTH = "ชานมไต้หวันไข่มุก"
-		Var DrinkDescriptionTH = "ชาไต้หวัน นม"
+		Var DrinkDescriptionTH = "ชาไต้หวัน นม ไข่มุก"
-		Var DrinkDescription = "Taiwan Tea, Milk, Sugar"
+		Var DrinkDescription = "Taiwan Tea, Milk, Sugar, Bubble"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_taiwan_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -3467,7 +3467,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -3481,7 +3481,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "ชานมไต้หวัน" </Value>
+	<Value> "ชานมไต้หวันไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3491,7 +3491,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ชาไต้หวัน นม" </Value>
+	<Value> "ชาไต้หวัน นม ไข่มุก" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3502,7 +3502,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TAIWANESE TEA" </Value>
+	<Value> "TAIWANESE TEA BUBBLE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3512,7 +3512,7 @@ Sugar, Biscof" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Taiwan Tea, Milk, Sugar" </Value>
+	<Value> "Taiwan Tea, Milk, Sugar, Bubble" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -3642,19 +3642,19 @@ Sugar, Biscof" </Value>
 </Block>
 	; - - - 
 	; ==================> Len = 12
-	; - - 12-41-03-0028 
+	; TAOTIM - 12-41-03-0028 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-41-03-0028.Button,Disable=Invisible,$Sum1241030028) </State> 
+	<State> Flag( TAOTIM.Button,12-41-03-0028.Button,Disable=Invisible,$SumTAOTIM1241030028) </State> 
 	<Button>
-	<State> $Sum1241030028 </State> 
+	<State> $SumTAOTIM1241030028 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//taotim_bubble.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//taotim_bubble.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//taotim_bubble.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-41-03-0028, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( TAOTIM, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
@@ -3664,16 +3664,16 @@ Sugar, Biscof" </Value>
 		Var DrinkDescription = "Icecream, Caramel syrup and Pearl carrageenan"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "taotim_bubble.png"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $-.Price
+		Var PriceD1 = $TAOTIM.Price
 		Var PriceD2 = $-.Price
 		Var PriceD3 = $12-41-03-0028.Price
-		Var PD_CODE1 = "##-##-##-####"
+		Var PD_CODE1 = "TAOTIM"
 		Var PD_CODE2 = "##-##-##-####"
 		Var PD_CODE3 = "12-41-03-0028"
-		Var PD_STAGE_1 = "Disable2"
+		Var PD_STAGE_1 = $TAOTIM.Button
 		Var PD_STAGE_2 = "Disable2"
 		Var PD_STAGE_3 = $12-41-03-0028.Button
-		Var OverlayMenuFilter !assigned xmlpro( 12-41-03-0028, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var OverlayMenuFilter !assigned xmlpro( TAOTIM, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@@ -3693,15 +3693,15 @@ Sugar, Biscof" </Value>
 			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "-"
+			Topping "Load" "TAOTIM"
 			Else
 			Topping "Load" "12-41-03-0028"
 			EndIf
 		EndIf
-		Var menu_name_eng_hot = $##-##-##-####.NameE
+		Var menu_name_eng_hot = $TAOTIM.NameE
-		Var menu_desc_eng_hot = $##-##-##-####.descriptionE
+		Var menu_desc_eng_hot = $TAOTIM.descriptionE
-		Var menu_name_thai_hot = $##-##-##-####.Name
+		Var menu_name_thai_hot = $TAOTIM.Name
-		Var menu_desc_thai_hot = $##-##-##-####.description
+		Var menu_desc_thai_hot = $TAOTIM.description
 		
 		Var menu_name_eng_cold = $##-##-##-####.NameE
 		Var menu_desc_eng_cold = $##-##-##-####.descriptionE
@@ -3718,7 +3718,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -3768,11 +3768,6 @@ Sugar, Biscof" </Value>
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "option_deactive.png" ) </Filename>
-	</Image>
-	<Image>
-	<X> 16 </X>
-	<Y> 264 </Y>
 	<State> "Invisible" </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
@@ -3786,7 +3781,7 @@ Sugar, Biscof" </Value>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
 	<State> "Invisible" </State>
-	<Value> StringFmt(  $-.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<Value> StringFmt(  $TAOTIM.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -3809,8 +3804,8 @@ Sugar, Biscof" </Value>
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
-	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
+	<Filename> Var( DirImage2 + "pricetaotim.png" ) </Filename>
-	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
+	<FilenameDisable> Var( DirImage2 + "pricetaotim.png" ) </FilenameDisable>
 	<State> $12-41-03-0028.Button </State>
 	</Image>
 	<Text>
@@ -3847,8 +3842,8 @@ Sugar, Biscof" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1241030028 = "Disable" Then
+			If $SumTAOTIM1241030028 = "Disable" Then
-				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
+				STRCONTAIN "ERR" $TAOTIM.TAG tag1_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable
 				STRCONTAIN "ERR" $12-41-03-0028.TAG tag3_is_disable
 				Var return = "Invisible"
@@ -3886,7 +3881,7 @@ Sugar, Biscof" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1241030028 </State> 
+	<State> $SumTAOTIM1241030028 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
@@ -3969,7 +3964,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -4221,7 +4216,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -4473,7 +4468,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -4725,7 +4720,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -4977,7 +4972,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -5232,7 +5227,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -5487,7 +5482,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -5742,7 +5737,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -5997,7 +5992,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -6252,7 +6247,7 @@ Sugar, Biscof" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -6511,7 +6506,7 @@ ETHIOPAI GUJI" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -6770,7 +6765,7 @@ Note: Blue Berry & Floral" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -7029,7 +7024,7 @@ Note: Strawberry & Floral" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -7288,7 +7283,7 @@ Note: Whisky & Vanilla" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -7547,7 +7542,7 @@ Note: Jasmine & Honey" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -7806,7 +7801,7 @@ Note: Peach, tea, chocolate" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -8064,7 +8059,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -8321,7 +8316,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -8580,7 +8575,7 @@ Pink​ Rose & Berry" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -8839,7 +8834,7 @@ Note: Strawberry & Floral" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -9096,7 +9091,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -9353,7 +9348,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -9608,7 +9603,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -9863,7 +9858,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -10118,7 +10113,7 @@ AMERICANO" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -10371,7 +10366,7 @@ Sugar" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -10624,7 +10619,7 @@ SMOOTHIE" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -10875,7 +10870,7 @@ SMOOTHIE" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -11126,7 +11121,7 @@ SMOOTHIE" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>
@@ -11378,7 +11373,7 @@ DRINK SODA" </Value>
 		DEBUGVAR PD_STAGE_3
 		Var SelectDrinkType = 0
 		
-		
+		Var OpenFromInstMenuTab = 0
 		Open "ROOT/taobin_project/xml/page_topping_select5.xml"
 		
 	</EventOnClick>

xml/page_collect_point_1.xml

@@ -187,12 +187,16 @@
 				If FromLipitPro = 1 Then
 					If Seeker.CodeChannel = 1 Then
 						If Seeker.CollectPointPromotion = 1 Then
+							If LipitRewardOutOfStock = 0 Then
+								GETACCEXT TelephoneNumber 32
+								Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
+							EndIf
+						EndIf
+					Else
+						If LipitRewardOutOfStock = 0 Then
 							GETACCEXT TelephoneNumber 32
 							Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
 						EndIf
-					Else
-						GETACCEXT TelephoneNumber 32
-						Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
 					EndIf
 				EndIf
 			EndIf
@@ -257,12 +261,16 @@
 			If FromLipitPro = 1 Then
 				If Seeker.CodeChannel = 1 Then
 					If Seeker.CollectPointPromotion = 1 Then
+						If LipitRewardOutOfStock = 0 Then
+							GETACCEXT TelephoneNumber 32
+							Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
+						EndIf
+					EndIf
+				Else
+					If LipitRewardOutOfStock = 0 Then
 						GETACCEXT TelephoneNumber 32
 						Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
 					EndIf
-				Else
-					GETACCEXT TelephoneNumber 32
-					Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
 				EndIf
 			EndIf
 		EndIf
@@ -772,12 +780,16 @@
 				If FromLipitPro = 1 Then
 					If Seeker.CodeChannel = 1 Then
 						If Seeker.CollectPointPromotion = 1 Then
+							If LipitRewardOutOfStock = 0 Then
+								GETACCEXT TelephoneNumber 32
+								Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
+							EndIf
+						EndIf
+					Else
+						If LipitRewardOutOfStock = 0 Then
 							GETACCEXT TelephoneNumber 32
 							Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
 						EndIf
-					Else
-						GETACCEXT TelephoneNumber 32
-						Open "ROOT/taobin_project/xml/event/lipit/page_collect_point_pro_lipit_2.xml"
 					EndIf
 				EndIf
 			EndIf

xml/topview_blank_main.xml

@@ -4,6 +4,7 @@
 <Height> 1920 </Height>
 <EventOpen>
 
+    ;Open "/mnt/sdcard/coffeevending/taobin_project/xml/sometime/top_spender.xml"
 
 </EventOpen>
 

xml_main/startup.xml

@@ -108,8 +108,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "8.32"
+	Var XMLPageVersion = "8.33"
-	Var XMLPageVersionInt = 832
+	Var XMLPageVersionInt = 833
 ;Oreo
 Var OreoGuarantee = 0
 </EventOpen>