do

adv/sync_1.file

@@ -1,11 +1,11 @@
-total 135732
+total 129564
--rw-rw---- 1 root sdcard_rw        0 2025-03-26 10:14 sync_1.file
+-rw-rw---- 1 root sdcard_rw        0 2025-03-19 16:39 sync_1.file
 -rw-rw---- 1 root sdcard_rw  3772465 2023-09-18 18:44 taobin_adv_00.mp4
 -rw-rw---- 1 root sdcard_rw  2625751 2023-09-18 18:44 taobin_adv_menu_00.mp4
 -rw-rw---- 1 root sdcard_rw  7417004 2024-07-23 09:12 taobin_adv_menu_01.mp4
 -rw-rw---- 1 root sdcard_rw 12272227 2024-05-21 14:49 taobin_adv_menu_02.mp4
--rw-rw---- 1 root sdcard_rw 11349969 2024-11-20 10:04 taobin_adv_menu_03.mp4
+-rw-rw---- 1 root sdcard_rw 11268391 1980-01-01 00:00 taobin_adv_menu_03.mp4
--rw-rw---- 1 root sdcard_rw  8099405 2024-08-20 17:10 taobin_adv_menu_04.mp4
+-rw-rw---- 1 root sdcard_rw  1209432 1980-01-01 00:00 taobin_adv_menu_04.mp4
 -rw-rw---- 1 root sdcard_rw  5209838 2024-08-30 17:36 taobin_adv_menu_05.mp4
 -rw-rw---- 1 root sdcard_rw  2625751 2023-09-18 18:44 taobin_adv_menu_06.mp4
 -rw-rw---- 1 root sdcard_rw  4537156 2025-03-17 17:49 taobin_adv_menu_07.mp4
@@ -16,7 +16,7 @@ total 135732
 -rw-rw---- 1 root sdcard_rw  1151618 2024-06-14 16:56 taobin_adv_menu_12.mp4
 -rw-rw---- 1 root sdcard_rw   258907 2023-09-18 18:44 taobin_adv_menu_13.mp4
 -rw-rw---- 1 root sdcard_rw  3868333 2023-09-18 18:44 taobin_adv_menu_14.mp4
--rw-rw---- 1 root sdcard_rw  2518504 2025-01-30 17:39 taobin_adv_menu_15.mp4
+-rw-rw---- 1 root sdcard_rw  3178714 1980-01-01 00:00 taobin_adv_menu_15.mp4
 -rw-rw---- 1 root sdcard_rw  8680417 2024-10-07 15:33 taobin_adv_menu_16.mp4
 -rw-rw---- 1 root sdcard_rw 18310974 2023-09-18 18:44 taobin_adv_menu_17.mp4
 -rw-rw---- 1 root sdcard_rw 10038728 2024-11-19 11:49 taobin_adv_menu_18.mp4

inc/button_topping_select_confirm_order.inc

@@ -227,6 +227,14 @@ EndIf
     Var Seeker.get_a_straw = StrawState
     Var Seeker.get_a_lid = LidState
 
+    Var Seeker.strMulti6_1 = strMulti6_1
+    Var Seeker.strMulti6_2 = strMulti6_2
+    Var Seeker.strMulti6_3 = strMulti6_3
+    Var Seeker.strMulti6_4 = strMulti6_4
+    Var Seeker.strMulti6_5 = strMulti6_5
+    Var Seeker.strMulti6_6 = strMulti6_6
+    
+    
 
     DEBUGVAR Seeker.topping1
     DEBUGVAR Seeker.topping2
@@ -242,6 +250,12 @@ EndIf
     DEBUGVAR Seeker.get_a_straw
     DEBUGVAR Seeker.get_a_lid
 
+    DEBUGVAR Seeker.strMulti6_1
+    DEBUGVAR Seeker.strMulti6_2
+    DEBUGVAR Seeker.strMulti6_3
+    DEBUGVAR Seeker.strMulti6_4
+    DEBUGVAR Seeker.strMulti6_5
+
     DEBUGVAR LidState
     DEBUGVAR StrawState
     DEBUGVAR UserSelectProductCode
@@ -284,59 +298,12 @@ EndIf
 
     If Seeker = "curr" Then
 
-        ;include="ROOT/taobin_project/inc/select_drink_current.inc"
+        ;include="ROOT/taobin_project/inc/select_drink_current_multi_topping.inc"
 
-        If SelectToppingType = 0 Then
-            
-        Else
-
-            Topping "ClearMultiTopping" "Test 4"
-
-            Topping "Multiply6-ID" strMulti6_1
-            Topping "Multiply6-ID" strMulti6_2
-            Topping "Multiply6-ID" strMulti6_3
-            Topping "Multiply6-ID" strMulti6_5
-            Topping "Multiply6-ID" strMulti6_6
-
-            Topping "Pack" ExtendDataCurr
-        EndIf
        
     Else
-        Topping "SetNextOrder" UserSelectProductCode
-
-
-        Topping "__select" UserSelectProductCode
-        ; Set option toppinng and pack
-        Topping "__select1-id" topping1
-        Topping "__select2-id" topping2
-        Topping "__select3-id" topping3
-        Topping "__select6-id" topping6
-        Topping "__select7-id" topping7
-        Topping "__select8-id" topping8
-        Topping "__select9-id" topping9
-        Topping "__select10-id" topping10
-        Topping "__select11-id" topping11
-        Topping "__select12-id" topping12
-        Topping "__select13-id" topping13
-
-        Topping "__posttopping1-ID" sugarToppingID
-        ; Pack
-        Topping "__pack" ExtendDataNext
-
-        Var NextUserSelectDrinkFromPaid = UserSelectProductCode
-        Var NextUserSelecttopping1Paid = topping1
-        Var NextUserSelecttopping2Paid = topping2
-        Var NextUserSelecttopping3Paid = topping3
-        Var NextUserSelecttopping6Paid = topping6
-        Var NextUserSelecttopping7Paid = topping7
-        Var NextUserSelecttopping8Paid = topping8
-        Var NextUserSelecttopping9Paid = topping9
-        Var NextUserSelecttopping10Paid = topping10
-        Var NextUserSelecttopping11Paid = topping11
-        Var NextUserSelecttopping12Paid = topping12
-        Var NextUserSelecttopping13Paid = topping13
-
 
+        ; next ignore
     EndIf
 
     DEBUGVAR Seeker

inter/tha/menu/lang.tsv

@@ -1158,7 +1158,7 @@
 1300003		Beans module	ชุดเมล็ดกาแฟ
 1300004		Bean tray	ถาดใส่เมล็ดกาแฟ
 1300005		Switch tray :	สวิตซ์ถาด :
-1300006		Check tray shutter	ตรวจสอบชัตเตอร์ถาด
+1300006		Check tray shutter	ตรวจสอบชัตเตอร์ของถาด
 1300007		Pay beans	จ่ายถั่ว
 1300008		1. Select beans	1. เลือกเมล็ดกาแฟ
 1300009		2. Select direction	2. เลือกทิศทาง
@@ -1171,7 +1171,7 @@
 1300016		Brew time:sec	เวลาชง: วินาที
 1300017		Test grind sizes	ทดสอบขนาดบด
 1300018		Coffee module type :	ประเภทชุดกาแฟ :
-1300019		1. Select grind sizes	1. เลือกขนาดบด
+1300019		1. Select grind sizes	1. เลือกขนาดการบด
 1300020		More coarse	หยาบขึ้น
 1300021		More fine	ละเอียดขึ้น
 1300022		2. Test grinding	2. ทดสอบการบด

inter/tha/xml/multi/v3/page_catalog_group_pro_buble_tea.lxml

@@ -188,7 +188,7 @@
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
 			Var aliasName[5] = "လာတေး"
-			Var aliasDesc[5] = "Espresso, Milk, Foamed နို့"
+			Var aliasDesc[5] = "ကော်ဖီ နို့  နို့"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -218,7 +218,7 @@
 			Var NameLang[2][2] = "-"
 			Var NameLang[2][3] = "-"
 			Var NameLang[2][4] = "-"
-			Var NameLang[2][5] = "Latte SMOOTHIE"
+			Var NameLang[2][5] = "ICED Latte"
 			Var DescLang[2][0] = "Espresso, Milk, Foamed milk"
 			Var DescLang[2][1] = "กาแฟ นม และ ฟองนม"
 			Var DescLang[2][2] = "-"
@@ -363,7 +363,7 @@
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
 			Var aliasName[5] = "လာတေး"
-			Var aliasDesc[5] = "Espresso, Milk, Foamed နို့"
+			Var aliasDesc[5] = "ကော်ဖီ နို့  နို့"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -537,8 +537,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "မိုချာ"
+			Var aliasName[5] = "မိုခါး"
-			Var aliasDesc[5] = "Espresso၊ ကိုကိုး၊ နို့၊ သကြား"
+			Var aliasDesc[5] = "ကော်ဖီ နို့ ကိုကိုး  သကြားး"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -568,7 +568,7 @@
 			Var NameLang[2][2] = "-"
 			Var NameLang[2][3] = "-"
 			Var NameLang[2][4] = "-"
-			Var NameLang[2][5] = "Mocha SMOOTHIE"
+			Var NameLang[2][5] = "ICED Mocha"
 			Var DescLang[2][0] = "Espresso, Cocoa, Milk, Sugar"
 			Var DescLang[2][1] = "กาแฟ นม โกโก้ และ น้ำตาล"
 			Var DescLang[2][2] = "-"
@@ -712,8 +712,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "မိုချာ"
+			Var aliasName[5] = "မိုခါး"
-			Var aliasDesc[5] = "Espresso၊ ကိုကိုး၊ နို့၊ သကြား"
+			Var aliasDesc[5] = "ကော်ဖီ နို့ ကိုကိုး  သကြားး"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -887,8 +887,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "Caramel Latte"
+			Var aliasName[5] = "ကာလာ​မေလ်လာတေး"
-			Var aliasDesc[5] = "Espresso၊ နို့၊\nCaramel "
+			Var aliasDesc[5] = "ကော်ဖီ နို့  နို့\nကာလာ​မေလ်"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -918,7 +918,7 @@
 			Var NameLang[2][2] = "-"
 			Var NameLang[2][3] = "-"
 			Var NameLang[2][4] = "-"
-			Var NameLang[2][5] = "Caramel Latte SMOOTHIE"
+			Var NameLang[2][5] = "ICED Caramel Latte"
 			Var DescLang[2][0] = "Espresso, Milk,\nCaramel "
 			Var DescLang[2][1] = "กาแฟ นม และ นม\nคาราเมล"
 			Var DescLang[2][2] = "-"
@@ -1062,8 +1062,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "Caramel Latte"
+			Var aliasName[5] = "ကာလာ​မေလ်လာတေး"
-			Var aliasDesc[5] = "Espresso၊ နို့၊\nCaramel "
+			Var aliasDesc[5] = "ကော်ဖီ နို့  နို့\nကာလာ​မေလ်"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -1237,8 +1237,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "ကိုကိုး"
+			Var aliasName[5] = "ကိုကိုး "
-			Var aliasDesc[5] = "နို့၊ ကိုကိုး၊ သကြား"
+			Var aliasDesc[5] = "ကိုကိုး နို့သကြားး"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -1268,7 +1268,7 @@
 			Var NameLang[2][2] = "-"
 			Var NameLang[2][3] = "-"
 			Var NameLang[2][4] = "-"
-			Var NameLang[2][5] = "Cocoa ချောချောမွေ့မွေ့"
+			Var NameLang[2][5] = "ICED ကိုကိုး"
 			Var DescLang[2][0] = "Milk, Cocoa, Sugar"
 			Var DescLang[2][1] = "โกโก้ นมและน้ำตาล"
 			Var DescLang[2][2] = "-"
@@ -1412,8 +1412,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "ကိုကိုး"
+			Var aliasName[5] = "ကိုကိုး "
-			Var aliasDesc[5] = "နို့၊ ကိုကိုး၊ သကြား"
+			Var aliasDesc[5] = "ကိုကိုး နို့သကြားး"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -1587,7 +1587,7 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "နို့"
+			Var aliasName[5] = "နို့ "
 			Var aliasDesc[5] = "နို့"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
@@ -1618,7 +1618,7 @@
 			Var NameLang[2][2] = "-"
 			Var NameLang[2][3] = "-"
 			Var NameLang[2][4] = "-"
-			Var NameLang[2][5] = "နို့ SMOOTHIE"
+			Var NameLang[2][5] = "ICED နို့"
 			Var DescLang[2][0] = "Milk"
 			Var DescLang[2][1] = "นม"
 			Var DescLang[2][2] = "-"
@@ -1762,7 +1762,7 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "နို့"
+			Var aliasName[5] = "နို့ "
 			Var aliasDesc[5] = "နို့"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
@@ -1938,7 +1938,7 @@
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
 			Var aliasName[5] = "ပန်းရောင်နို့"
-			Var aliasDesc[5] = "ဆလပ်၊ နို့၊\nသကြား"
+			Var aliasDesc[5] = "ဆလပ်သီး နို့ \nသကြားး "
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -1968,7 +1968,7 @@
 			Var NameLang[2][2] = "-"
 			Var NameLang[2][3] = "-"
 			Var NameLang[2][4] = "-"
-			Var NameLang[2][5] = "ပန်းရောင်နို့ SMOOTHIE"
+			Var NameLang[2][5] = "ICED ပန်းရောင်နို့"
 			Var DescLang[2][0] = "Salak , Milk,\nSugar"
 			Var DescLang[2][1] = "น้ำแดงกลิ่นสละ นม \nน้ำตาล "
 			Var DescLang[2][2] = "-"
@@ -2113,7 +2113,7 @@
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
 			Var aliasName[5] = "ပန်းရောင်နို့"
-			Var aliasDesc[5] = "ဆလပ်၊ နို့၊\nသကြား"
+			Var aliasDesc[5] = "ဆလပ်သီး နို့ \nသကြားး "
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -2288,7 +2288,7 @@
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
 			Var aliasName[5] = "ပက်စီ"
-			Var aliasDesc[5] = "ပက်စီ၊ ရေခဲ"
+			Var aliasDesc[5] = "ပက်စီ  "
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -2318,7 +2318,7 @@
 			Var NameLang[2][2] = "-"
 			Var NameLang[2][3] = "-"
 			Var NameLang[2][4] = "-"
-			Var NameLang[2][5] = "Pepsi SMOOTHIe"
+			Var NameLang[2][5] = "ICED Pepsi"
 			Var DescLang[2][0] = "Pepsi, Ice"
 			Var DescLang[2][1] = "เป๊ปซี่  "
 			Var DescLang[2][2] = "-"
@@ -2463,7 +2463,7 @@
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
 			Var aliasName[5] = "ပက်စီ"
-			Var aliasDesc[5] = "ပက်စီ၊ ရေခဲ"
+			Var aliasDesc[5] = "ပက်စီ  "
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -2637,8 +2637,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "သံပုရာသီး Salak Soda"
+			Var aliasName[5] = "ဆလပ်သီးသံပရာရည်ဆိုဒါ"
-			Var aliasDesc[5] = "ဆလပ်၊ သံပရာနိတ်၊ \nဆိုဒါနှင့် ရေခဲ"
+			Var aliasDesc[5] = "ဆလပ်သီး သံပရာရည် ဆိုဒါ "
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -2668,7 +2668,7 @@
 			Var NameLang[2][2] = "-"
 			Var NameLang[2][3] = "-"
 			Var NameLang[2][4] = "-"
-			Var NameLang[2][5] = "သံပုရာသီး Salak Soda SMOOTHIE"
+			Var NameLang[2][5] = "ICED Lime Salak Soda"
 			Var DescLang[2][0] = "Salak , Limenade, \nSoda & Ice"
 			Var DescLang[2][1] = "น้ำแดงกลิ่นสละ มะนาว โซดา "
 			Var DescLang[2][2] = "-"
@@ -2812,8 +2812,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "သံပုရာသီး Salak Soda"
+			Var aliasName[5] = "ဆလပ်သီးသံပရာရည်ဆိုဒါ"
-			Var aliasDesc[5] = "ဆလပ်၊ သံပရာနိတ်၊ \nဆိုဒါနှင့် ရေခဲ"
+			Var aliasDesc[5] = "ဆလပ်သီး သံပရာရည် ဆိုဒါ "
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -2987,8 +2987,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "Plum Limenade ဆိုဒါ"
+			Var aliasName[5] = "ဆားငန်သီးသံပုရာ ဆိုဒါ"
-			Var aliasDesc[5] = "Ume ၊ Limenade ၊ Soda"
+			Var aliasDesc[5] = "ဆားငန်သီး သံပရာရည် ဆိုဒါ"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -3018,7 +3018,7 @@
 			Var NameLang[2][2] = "-"
 			Var NameLang[2][3] = "-"
 			Var NameLang[2][4] = "-"
-			Var NameLang[2][5] = "Plum Limenade ဆိုဒါ SMOOTHIE"
+			Var NameLang[2][5] = "ICED Plum Limenade ဆိုဒါ"
 			Var DescLang[2][0] = "Ume , Limenade, Soda"
 			Var DescLang[2][1] = "บ๊วย มะนาว โซดา"
 			Var DescLang[2][2] = "-"
@@ -3162,8 +3162,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "Plum Limenade ဆိုဒါ"
+			Var aliasName[5] = "ဆားငန်သီးသံပုရာ ဆိုဒါ"
-			Var aliasDesc[5] = "Ume ၊ Limenade ၊ Soda"
+			Var aliasDesc[5] = "ဆားငန်သီး သံပရာရည် ဆိုဒါ"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -3337,8 +3337,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "Tao Power Drink ဆိုဒါ"
+			Var aliasName[5] = "တောင်းဆုံးဖလမ်းဆိုဒါ"
-			Var aliasDesc[5] = "ဆေးသောက်၊ ဆိုဒါ"
+			Var aliasDesc[5] = "တောင်းဆုံးဖလမ်း  ဆိုဒါ  "
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -3368,7 +3368,7 @@
 			Var NameLang[2][2] = "-"
 			Var NameLang[2][3] = "-"
 			Var NameLang[2][4] = "-"
-			Var NameLang[2][5] = "Tao Power Drink Soda SMOOTHIE"
+			Var NameLang[2][5] = "ICED Tao Power Drink ဆိုဒါ"
 			Var DescLang[2][0] = "Medicine Drink, Soda"
 			Var DescLang[2][1] = "เครื่องดื่มเต่าทรงพลัง  โซดา  "
 			Var DescLang[2][2] = "-"
@@ -3512,8 +3512,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "Tao Power Drink ဆိုဒါ"
+			Var aliasName[5] = "တောင်းဆုံးဖလမ်းဆိုဒါ"
-			Var aliasDesc[5] = "ဆေးသောက်၊ ဆိုဒါ"
+			Var aliasDesc[5] = "တောင်းဆုံးဖလမ်း  ဆိုဒါ  "
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -3687,8 +3687,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "Pepsi Plum"
+			Var aliasName[5] = "ပက်စီဆားငန်သီး"
-			Var aliasDesc[5] = "Pepsi၊ Ume နှင့် Ice"
+			Var aliasDesc[5] = "ပက်စီ ဆားငန်သီး ဆိုဒါ  "
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -3718,7 +3718,7 @@
 			Var NameLang[2][2] = "-"
 			Var NameLang[2][3] = "-"
 			Var NameLang[2][4] = "-"
-			Var NameLang[2][5] = "Pepsi Plum ချောချောမွေ့မွေ့"
+			Var NameLang[2][5] = "ICED Pepsi Plum"
 			Var DescLang[2][0] = "Pepsi, Ume & Ice"
 			Var DescLang[2][1] = "เป๊ปซี่ บ๊วย โซดา  "
 			Var DescLang[2][2] = "-"
@@ -3862,8 +3862,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "Pepsi Plum"
+			Var aliasName[5] = "ပက်စီဆားငန်သီး"
-			Var aliasDesc[5] = "Pepsi၊ Ume နှင့် Ice"
+			Var aliasDesc[5] = "ပက်စီ ဆားငန်သီး ဆိုဒါ  "
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -4037,8 +4037,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "Matcha Latte"
+			Var aliasName[5] = "ဂျပန်လက်ဖက်စိမ်းလာ​တေး "
-			Var aliasDesc[5] = "လက်ဖက်စိမ်း၊ နို့၊ သကြား၊ ရေခဲ"
+			Var aliasDesc[5] = "ဂျပန်လက်ဖက်စိမ်း နို့  "
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -4056,19 +4056,19 @@
 			Var NameLang[1][2] = "-"
 			Var NameLang[1][3] = "-"
 			Var NameLang[1][4] = "-"
-			Var NameLang[1][5] = "ICED Matcha Latte ပူဖောင်း"
+			Var NameLang[1][5] = "ICED Matcha Latte"
 			Var DescLang[1][0] = "Green Tea, Milk, Sugar, Ice, Bubble"
 			Var DescLang[1][1] = "ชาเชียว นม ไข่มุก"
 			Var DescLang[1][2] = "-"
 			Var DescLang[1][3] = "-"
 			Var DescLang[1][4] = "-"
-			Var DescLang[1][5] = "လက်ဖက်စိမ်း၊ နို့၊ သကြား၊ ရေခဲ၊ ပူဖောင်း"
+			Var DescLang[1][5] = "လက်ဖက်စိမ်း၊ နို့၊ သကြား၊ ရေခဲ"
 			Var NameLang[2][0] = "Matcha Latte SMOOTHIE"
 			Var NameLang[2][1] = "มัทฉะลาเต้ "
 			Var NameLang[2][2] = "-"
 			Var NameLang[2][3] = "-"
 			Var NameLang[2][4] = "-"
-			Var NameLang[2][5] = "Matcha Latte SMOOTHIE"
+			Var NameLang[2][5] = "ICED Matcha Latte"
 			Var DescLang[2][0] = "Green Tea, Milk, Sugar, Ice"
 			Var DescLang[2][1] = "ชาเชียว นม  "
 			Var DescLang[2][2] = "-"
@@ -4212,8 +4212,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "Matcha Latte"
+			Var aliasName[5] = "ဂျပန်လက်ဖက်စိမ်းလာ​တေး "
-			Var aliasDesc[5] = "လက်ဖက်စိမ်း၊ နို့၊ သကြား၊ ရေခဲ"
+			Var aliasDesc[5] = "ဂျပန်လက်ဖက်စိမ်း နို့  "
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -4387,8 +4387,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "ထိုင်းနို့လက်ဖက်ရည်"
+			Var aliasName[5] = "ထိုင်းလက်ဖက်ရည် "
-			Var aliasDesc[5] = "ထိုင်းလက်ဖက်ရည်၊ သကြား၊ နို့"
+			Var aliasDesc[5] = "ထိုင်းလက်ဖက်ရည်  နို့"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -4406,19 +4406,19 @@
 			Var NameLang[1][2] = "-"
 			Var NameLang[1][3] = "-"
 			Var NameLang[1][4] = "-"
-			Var NameLang[1][5] = "ICED ထိုင်းနို့လက်ဖက်ရည်ပူဖောင်း"
+			Var NameLang[1][5] = "ICED ထိုင်းနို့လက်ဖက်ရည်"
 			Var DescLang[1][0] = "Thai tea, Sugar, milk, Bubble"
 			Var DescLang[1][1] = "ชาไทย นม ไข่มุก"
 			Var DescLang[1][2] = "-"
 			Var DescLang[1][3] = "-"
 			Var DescLang[1][4] = "-"
-			Var DescLang[1][5] = "ထိုင်းလက်ဖက်ရည်၊ သကြား၊ နို့၊ ပူဖောင်း"
+			Var DescLang[1][5] = "ထိုင်းလက်ဖက်ရည်၊ သကြား၊ နို့"
 			Var NameLang[2][0] = "Thai Milk Tea SMOOTHIE"
 			Var NameLang[2][1] = "ชานมไทย "
 			Var NameLang[2][2] = "-"
 			Var NameLang[2][3] = "-"
 			Var NameLang[2][4] = "-"
-			Var NameLang[2][5] = "ထိုင်းနို့လက်ဖက်ရည် SMOOTHIE"
+			Var NameLang[2][5] = "ICED ထိုင်းနို့လက်ဖက်ရည်"
 			Var DescLang[2][0] = "Thai Tea, Sugar, Milk"
 			Var DescLang[2][1] = "ชาไทย และ นม"
 			Var DescLang[2][2] = "-"
@@ -4562,8 +4562,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "ထိုင်းနို့လက်ဖက်ရည်"
+			Var aliasName[5] = "ထိုင်းလက်ဖက်ရည် "
-			Var aliasDesc[5] = "ထိုင်းလက်ဖက်ရည်၊ သကြား၊ နို့"
+			Var aliasDesc[5] = "ထိုင်းလက်ဖက်ရည်  နို့"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -4737,8 +4737,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "Jasmine Milk Tea ၊"
+			Var aliasName[5] = "စံပယ်မွှေးလက်ဖက်ရည်"
-			Var aliasDesc[5] = "Jasmine & Milk"
+			Var aliasDesc[5] = "စံပယ်မွှေးလက်ဖက်ရည် နို့"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -4756,19 +4756,19 @@
 			Var NameLang[1][2] = "-"
 			Var NameLang[1][3] = "-"
 			Var NameLang[1][4] = "-"
-			Var NameLang[1][5] = "ICED Jasmine နို့လက်ဖက်ရည်ပူဖောင်း"
+			Var NameLang[1][5] = "ICED Jasmine နို့လက်ဖက်ရည်"
 			Var DescLang[1][0] = "Jasmine , Milk, Bubble"
 			Var DescLang[1][1] = "ชามะลิ นม ไข่มุก"
 			Var DescLang[1][2] = "-"
 			Var DescLang[1][3] = "-"
 			Var DescLang[1][4] = "-"
-			Var DescLang[1][5] = "Jasmine, Milk, Bubble"
+			Var DescLang[1][5] = "Jasmine & Milk"
 			Var NameLang[2][0] = "Jasmine Milk Tea SMOOTHIE"
 			Var NameLang[2][1] = "ชานมมะลิ"
 			Var NameLang[2][2] = "-"
 			Var NameLang[2][3] = "-"
 			Var NameLang[2][4] = "-"
-			Var NameLang[2][5] = "Jasmine Milk Tea SMOOTHIE"
+			Var NameLang[2][5] = "ICED Jasmine နို့လက်ဖက်ရည်"
 			Var DescLang[2][0] = "Jasmine & Milk"
 			Var DescLang[2][1] = "ชามะลิ และนม"
 			Var DescLang[2][2] = "-"
@@ -4912,8 +4912,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "Jasmine Milk Tea ၊"
+			Var aliasName[5] = "စံပယ်မွှေးလက်ဖက်ရည်"
-			Var aliasDesc[5] = "Jasmine & Milk"
+			Var aliasDesc[5] = "စံပယ်မွှေးလက်ဖက်ရည် နို့"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -5087,8 +5087,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "ထိုင်ဝမ်လက်ဖက်ရည်"
+			Var aliasName[5] = "ထိုက်ဝမ်လက်ဖက်ရည်"
-			Var aliasDesc[5] = "ထိုင်ဝမ်လက်ဖက်ရည်၊ နို့၊ သကြား"
+			Var aliasDesc[5] = "ထိုက်ဝမ်လက်ဖက်ရည် နို့"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -5118,7 +5118,7 @@
 			Var NameLang[2][2] = "-"
 			Var NameLang[2][3] = "-"
 			Var NameLang[2][4] = "-"
-			Var NameLang[2][5] = "ထိုင်ဝမ်လက်ဖက်ရည်ပူဖောင်း ချောမွေ့"
+			Var NameLang[2][5] = "ICED ထိုင်ဝမ်လက်ဖက်ရည်ပူဖောင်း"
 			Var DescLang[2][0] = "Taiwan Tea, Milk, Sugar, Bubble"
 			Var DescLang[2][1] = "ชาไต้หวัน นม ไข่มุก"
 			Var DescLang[2][2] = "-"
@@ -5262,8 +5262,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "ထိုင်ဝမ်လက်ဖက်ရည်"
+			Var aliasName[5] = "ထိုက်ဝမ်လက်ဖက်ရည်"
-			Var aliasDesc[5] = "ထိုင်ဝမ်လက်ဖက်ရည်၊ နို့၊ သကြား"
+			Var aliasDesc[5] = "ထိုက်ဝမ်လက်ဖက်ရည် နို့"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -5437,8 +5437,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "Tao Tim Bubble Tea"
+			Var aliasName[5] = "တောင် ရေခဲမှန့်ပုလဲ"
-			Var aliasDesc[5] = "ရေခဲမုန့်၊ Caramel နှင့် Pearl Carrageenan"
+			Var aliasDesc[5] = "ရေခဲမုန့်နို့ ကာလာ​မေလ် บุกပုလဲ"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""
@@ -5612,8 +5612,8 @@
 			Var aliasDesc[3] = "-"
 			Var aliasName[4] = "-"
 			Var aliasDesc[4] = "-"
-			Var aliasName[5] = "Tao Tim Bubble Tea"
+			Var aliasName[5] = "တောင် ရေခဲမှန့်ပုလဲ"
-			Var aliasDesc[5] = "ရေခဲမုန့်၊ Caramel နှင့် Pearl Carrageenan"
+			Var aliasDesc[5] = "ရေခဲမုန့်နို့ ကာလာ​မေလ် บุกပုလဲ"
 			Var NameLang[0][0] = ""
 			Var NameLang[0][1] = ""
 			Var NameLang[0][2] = ""

menu/new-layout.tsv

@@ -246,11 +246,11 @@ Name=Tea,file=page_catalog_group_tea.skt
 		ชานมไทย 	Thai Milk Tea	ชาไทย และ นม	Thai tea, Sugar, milk	12-02-01-0039	12-02-02-0039	12-02-03-0039	bn_thai_milk_tea_SingPark.png	-	-	-	posi1	-	-	-	#REF!	#REF!	#REF!	#REF!	#REF!
 		ชานมไทย 	Thai Milk Tea	ชาไทย และ นมอุ่น	Thai tea, Sugar, Warm milk	12-02-01-0024	12-02-02-0024	12-02-03-0024	bn_hot_thai_milk_tea_tacc.png	-	-	-	posi1	-	-	-	#REF!	#REF!	#REF!	#REF!	#REF!
 		ชาไทยละโว้	Central Thai Milk Tea	ชาไทย นม น้ำตาล สละ	Thai Tea Milk Sugar Salak	12-02-01-0091	12-02-02-0091	12-02-03-0091	bn_thai_milk_tea_SALAK.png	-	-	-	posi1	2025/04/01T00:00:00	2025/04/30T00:00:00	-
-		โกโก้หริกุญชัย	Northern Cocoa	ชาไทย นม น้ำตาล โกโก้ คาราเมล	Thai Tea Milk Sugar Cocoa Caramel	12-02-01-0092	12-02-02-0092	12-02-03-0092	bn_thai_milk_tea_COCOA.png	-	-	-	posi1	2025/04/01T00:00:00	2025/04/30T00:00:00	-
+		โกโก้หริกุญชัย	Western Cocoa Thai Milk Tea	ชาไทย นม น้ำตาล โกโก้ คาราเมล	Thai Tea Milk Sugar Cocoa Caramel	12-02-01-0092	12-02-02-0092	12-02-03-0092	bn_thai_milk_tea_COCOA.png	-	-	-	posi1	2025/04/01T00:00:00	2025/04/30T00:00:00	-
-		สตรอว์เบอร์รีล้านนา	Northern Strawberry Tea	ชาไทย ชาไต้หวัน นม สตรอเบอรี	Thai Tea Oolong Tea Milk Strawberry	12-02-01-0093	12-02-02-0093	12-02-03-0093	bn_taiwanese_milk_tea_Strawberry.png	-	-	-	posi1	2025/04/01T00:00:00	2025/04/30T00:00:00	-
+		สตรอว์เบอร์รีล้านนา	Northern Strawberry Thai Milk Tea	ชาไทย ชาไต้หวัน นม สตรอเบอรี	Thai Tea Oolong Tea Milk Strawberry	12-02-01-0093	12-02-02-0093	12-02-03-0093	bn_taiwanese_milk_tea_Strawberry.png	-	-	-	posi1	2025/04/01T00:00:00	2025/04/30T00:00:00	-
-		ชาไทยมะพร้าวศรีวิชัย	Southern Coconut Thai Tea	ชาไทย ชาไต้หวัน นม โกโก้ มะพร้าว	Thai Tea Oolong Tea Milk Sugar Cocoa Coconut	12-02-01-0094	12-02-02-0094	12-02-03-0094	bn_thai_milk_tea_Cocoa_Coconut.png	-	-	-	posi1	2025/04/01T00:00:00	2025/04/30T00:00:00	-
+		ชาไทยมะพร้าวศรีวิชัย	Southern Coconut Thai Milk Tea	ชาไทย ชาไต้หวัน นม โกโก้ มะพร้าว	Thai Tea Oolong Tea Milk Sugar Cocoa Coconut	12-02-01-0094	12-02-02-0094	12-02-03-0094	bn_thai_milk_tea_Cocoa_Coconut.png	-	-	-	posi1	2025/04/01T00:00:00	2025/04/30T00:00:00	-
-		ชาไทยลิ้นจี่ศรีโคตรบูรณ์	Northeastern Lychee Thai Tea	ชาไทย นม น้ำตาล ลิ้นจี่	Thai Tea Milk Sugar Lychee	12-02-01-0095	12-02-02-0095	12-02-03-0095	bn_thai_milk_tea_Lychee.png	-	-	-	posi1	2025/04/01T00:00:00	2025/04/30T00:00:00	-
+		ชาไทยลิ้นจี่ศรีโคตรบูรณ์	Northeastern Lychee Thai Milk Tea	ชาไทย นม น้ำตาล ลิ้นจี่	Thai Tea Milk Sugar Lychee	12-02-01-0095	12-02-02-0095	12-02-03-0095	bn_thai_milk_tea_Lychee.png	-	-	-	posi1	2025/04/01T00:00:00	2025/04/30T00:00:00	-
-		ชาบ๊วยทวารวดี	Western Ume Tea	ชาไทย นม น้ำตาล บ๊วย	Thai Tea Milk Sugar Ume	12-02-01-0096	12-02-02-0096	12-02-03-0096	bn_thai_milk_tea_Plum.png	-	-	-	posi1	2025/04/01T00:00:00	2025/04/30T00:00:00	-
+		ชาบ๊วยทวารวดี	Eastern Ume Thai Milk Tea	ชาไทย นม น้ำตาล บ๊วย	Thai Tea Milk Sugar Ume	12-02-01-0096	12-02-02-0096	12-02-03-0096	bn_thai_milk_tea_Plum.png	-	-	-	posi1	2025/04/01T00:00:00	2025/04/30T00:00:00	-
 
 		เพียวมัทฉะคูณ 3	Pure Matcha X3	มัทฉะ น้ำเย็น	Matcha Cold Water	-	12-02-02-0099	-	bn_hot_matcha_tea_pure_x3.png	-	-	-	posi1	2025/03/20T00:00:00	-	-
 		ยูซุมัทฉะลาเต้	Yuzu Matcha Latte	ยูซุ มัทฉะ นม 	Yuzu Matcha Milk	12-02-01-0097	12-02-02-0097	12-02-03-0097	bn_Matcha_Milk_Yuzu.png	-	-	-	posi1	2025/03/20T00:00:00	-	-
@@ -1256,11 +1256,11 @@ Name=MatchaEveryDay,file=page_catalog_group_pro_matcha_every_day.skt
 
 Name=KingdomOfThaiTea,file=page_catalog_group_pro_kingdom_thai_tea.skt
 		ชาไทยละโว้	Central Thai Milk Tea	ชาไทย นม น้ำตาล สละ	Thai Tea Milk Sugar Salak	12-02-01-0091	12-02-02-0091	12-02-03-0091	bn_thai_milk_tea_SALAK.png	-	-	-	posi1	-	-	-
-		โกโก้หริกุญชัย	Northern Cocoa	ชาไทย นม น้ำตาล โกโก้ คาราเมล	Thai Tea Milk Sugar Cocoa Caramel	12-02-01-0092	12-02-02-0092	12-02-03-0092	bn_thai_milk_tea_COCOA.png	-	-	-	posi1	-	-	-
+		โกโก้หริกุญชัย	Western Cocoa Thai Milk Tea	ชาไทย นม น้ำตาล โกโก้ คาราเมล	Thai Tea Milk Sugar Cocoa Caramel	12-02-01-0092	12-02-02-0092	12-02-03-0092	bn_thai_milk_tea_COCOA.png	-	-	-	posi1	-	-	-
-		สตรอว์เบอร์รีล้านนา	Northern Strawberry Tea	ชาไทย ชาไต้หวัน นม สตรอเบอรี	Thai Tea Oolong Tea Milk Strawberry	12-02-01-0093	12-02-02-0093	12-02-03-0093	bn_taiwanese_milk_tea_Strawberry.png	-	-	-	posi1	-	-	-
+		สตรอว์เบอร์รีล้านนา	Northern Strawberry Thai Milk Tea	ชาไทย ชาไต้หวัน นม สตรอเบอรี	Thai Tea Oolong Tea Milk Strawberry	12-02-01-0093	12-02-02-0093	12-02-03-0093	bn_taiwanese_milk_tea_Strawberry.png	-	-	-	posi1	-	-	-
-		ชาไทยมะพร้าวศรีวิชัย	Southern Coconut Thai Tea	ชาไทย ชาไต้หวัน นม โกโก้ มะพร้าว	Thai Tea Oolong Tea Milk Sugar Cocoa Coconut	12-02-01-0094	12-02-02-0094	12-02-03-0094	bn_thai_milk_tea_Cocoa_Coconut.png	-	-	-	posi1	-	-	-
+		ชาไทยมะพร้าวศรีวิชัย	Southern Coconut Thai Milk Tea	ชาไทย ชาไต้หวัน นม โกโก้ มะพร้าว	Thai Tea Oolong Tea Milk Sugar Cocoa Coconut	12-02-01-0094	12-02-02-0094	12-02-03-0094	bn_thai_milk_tea_Cocoa_Coconut.png	-	-	-	posi1	-	-	-
-		ชาไทยลิ้นจี่ศรีโคตรบูรณ์	Northeastern Lychee Thai Tea	ชาไทย นม น้ำตาล ลิ้นจี่	Thai Tea Milk Sugar Lychee	12-02-01-0095	12-02-02-0095	12-02-03-0095	bn_thai_milk_tea_Lychee.png	-	-	-	posi1	-	-	-
+		ชาไทยลิ้นจี่ศรีโคตรบูรณ์	Northeastern Lychee Thai Milk Tea	ชาไทย นม น้ำตาล ลิ้นจี่	Thai Tea Milk Sugar Lychee	12-02-01-0095	12-02-02-0095	12-02-03-0095	bn_thai_milk_tea_Lychee.png	-	-	-	posi1	-	-	-
-		ชาบ๊วยทวารวดี	Western Ume Tea	ชาไทย นม น้ำตาล บ๊วย	Thai Tea Milk Sugar Ume	12-02-01-0096	12-02-02-0096	12-02-03-0096	bn_thai_milk_tea_Plum.png	-	-	-	posi1	-	-	-
+		ชาบ๊วยทวารวดี	Eastern Ume Thai Milk Tea	ชาไทย นม น้ำตาล บ๊วย	Thai Tea Milk Sugar Ume	12-02-01-0096	12-02-02-0096	12-02-03-0096	bn_thai_milk_tea_Plum.png	-	-	-	posi1	-	-	-
 		ชาไทยเต่าบิน (ชานมไทย)	Tao Bin Thai Tea (Thai Milk Tea)	ชาไทย และ นม	Thai Tea, Sugar, Milk	12-02-01-0039	12-02-02-0039	12-02-03-0039	bn_thai_milk_tea_Banner.png	-	-	-	posi1	-	-	-
 
 Name=Taobin_Deep_Fryer,file=page_catalog_group_deep_fryer.skt

xml/page_catalog_group_pro_kingdom_thai_tea.xml

@@ -308,7 +308,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Northern Cocoa"
+		Var NameDrink = "Western Cocoa Thai Milk Tea"
 		Var NameDrinkTH = "โกโก้หริกุญชัย"
 		Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล โกโก้ คาราเมล"
 		Var DrinkDescription = "Thai Tea Milk Sugar Cocoa Caramel"
@@ -403,7 +403,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Northern Cocoa" </Value>
+	<Value> "Western Cocoa Thai Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -563,7 +563,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Northern Strawberry Tea"
+		Var NameDrink = "Northern Strawberry Thai Milk Tea"
 		Var NameDrinkTH = "สตรอว์เบอร์รีล้านนา"
 		Var DrinkDescriptionTH = "ชาไทย ชาไต้หวัน นม สตรอเบอรี"
 		Var DrinkDescription = "Thai Tea Oolong Tea Milk Strawberry"
@@ -658,7 +658,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Northern Strawberry Tea" </Value>
+	<Value> "Northern Strawberry Thai Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -818,7 +818,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Southern Coconut Thai Tea"
+		Var NameDrink = "Southern Coconut Thai Milk Tea"
 		Var NameDrinkTH = "ชาไทยมะพร้าวศรีวิชัย"
 		Var DrinkDescriptionTH = "ชาไทย ชาไต้หวัน นม โกโก้ มะพร้าว"
 		Var DrinkDescription = "Thai Tea Oolong Tea Milk Sugar Cocoa Coconut"
@@ -913,7 +913,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Southern Coconut Thai Tea" </Value>
+	<Value> "Southern Coconut Thai Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1073,7 +1073,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Northeastern Lychee Thai Tea"
+		Var NameDrink = "Northeastern Lychee Thai Milk Tea"
 		Var NameDrinkTH = "ชาไทยลิ้นจี่ศรีโคตรบูรณ์"
 		Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล ลิ้นจี่"
 		Var DrinkDescription = "Thai Tea Milk Sugar Lychee"
@@ -1168,7 +1168,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Northeastern Lychee Thai Tea" </Value>
+	<Value> "Northeastern Lychee Thai Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1328,7 +1328,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Western Ume Tea"
+		Var NameDrink = "Eastern Ume Thai Milk Tea"
 		Var NameDrinkTH = "ชาบ๊วยทวารวดี"
 		Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล บ๊วย"
 		Var DrinkDescription = "Thai Tea Milk Sugar Ume"
@@ -1423,7 +1423,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Western Ume Tea" </Value>
+	<Value> "Eastern Ume Thai Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/page_catalog_group_tea.xml

@@ -1336,7 +1336,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Northern Cocoa"
+		Var NameDrink = "Western Cocoa Thai Milk Tea"
 		Var NameDrinkTH = "โกโก้หริกุญชัย"
 		Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล โกโก้ คาราเมล"
 		Var DrinkDescription = "Thai Tea Milk Sugar Cocoa Caramel"
@@ -1431,7 +1431,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Northern Cocoa" </Value>
+	<Value> "Western Cocoa Thai Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1591,7 +1591,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Northern Strawberry Tea"
+		Var NameDrink = "Northern Strawberry Thai Milk Tea"
 		Var NameDrinkTH = "สตรอว์เบอร์รีล้านนา"
 		Var DrinkDescriptionTH = "ชาไทย ชาไต้หวัน นม สตรอเบอรี"
 		Var DrinkDescription = "Thai Tea Oolong Tea Milk Strawberry"
@@ -1686,7 +1686,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Northern Strawberry Tea" </Value>
+	<Value> "Northern Strawberry Thai Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1846,7 +1846,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Southern Coconut Thai Tea"
+		Var NameDrink = "Southern Coconut Thai Milk Tea"
 		Var NameDrinkTH = "ชาไทยมะพร้าวศรีวิชัย"
 		Var DrinkDescriptionTH = "ชาไทย ชาไต้หวัน นม โกโก้ มะพร้าว"
 		Var DrinkDescription = "Thai Tea Oolong Tea Milk Sugar Cocoa Coconut"
@@ -1941,7 +1941,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Southern Coconut Thai Tea" </Value>
+	<Value> "Southern Coconut Thai Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2101,7 +2101,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Northeastern Lychee Thai Tea"
+		Var NameDrink = "Northeastern Lychee Thai Milk Tea"
 		Var NameDrinkTH = "ชาไทยลิ้นจี่ศรีโคตรบูรณ์"
 		Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล ลิ้นจี่"
 		Var DrinkDescription = "Thai Tea Milk Sugar Lychee"
@@ -2196,7 +2196,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Northeastern Lychee Thai Tea" </Value>
+	<Value> "Northeastern Lychee Thai Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2356,7 +2356,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "Western Ume Tea"
+		Var NameDrink = "Eastern Ume Thai Milk Tea"
 		Var NameDrinkTH = "ชาบ๊วยทวารวดี"
 		Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล บ๊วย"
 		Var DrinkDescription = "Thai Tea Milk Sugar Ume"
@@ -2451,7 +2451,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "Western Ume Tea" </Value>
+	<Value> "Eastern Ume Thai Milk Tea" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/page_thankyouConti.xml

@@ -88,7 +88,10 @@
 			Var bg_lidProblem_ST = "Enable"
 		EndIf
 
-		;include="ROOT/taobin_project/inc/select_drink_current.inc"
+
+		;include="ROOT/taobin_project/inc/select_drink_current_multi_topping.inc"
+
+
 
 
 		Topping "ClearNextOrder" "-"

xml/page_topping_select8.xml

@@ -1461,6 +1461,13 @@
 	DEBUGVAR toppingID6index5
 	DEBUGVAR toppingID6index6
 	
+	DEBUGVAR toppingID6index1Status
+	DEBUGVAR toppingID6index2Status
+	DEBUGVAR toppingID6index3Status
+	DEBUGVAR toppingID6index4Status
+	DEBUGVAR toppingID6index5Status
+	DEBUGVAR toppingID6index6Status
+	
 	DEBUGVAR toppingID7index1
 	DEBUGVAR toppingID7index2
 	DEBUGVAR toppingID7index3
@@ -10057,11 +10064,14 @@
 	DEBUGVAR TOPPING_PRICE
 
 	; Oreo
-	Var strMulti6_1 = "TPID:321+multiply:0"
+	Var strMulti6_1 = ""
 	; Ovaltine
-	Var strMulti6_2 = "TPID:323+multiply:0"
+	Var strMulti6_2 = ""
 	; Coaco
-	Var strMulti6_3 = "TPID:322+multiply:0"
+	Var strMulti6_3 = ""
+	Var strMulti6_4 = ""
+	Var strMulti6_5 = ""
+	Var strMulti6_6 = ""
 
 
 	If showOreoAddEnable = "Press" Then