diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv
index 15407e32..1e60804d 100644
--- a/animation01/play_list.tsv
+++ b/animation01/play_list.tsv
@@ -1158,7 +1158,7 @@ Strawberry milk 7Up lime top ovaltine 12-03-03-0083 1 18 19 17 23 41 51 24 13
ชานมขิงโอรีโอปั่น 12-02-03-0056 1 40 7 10 23 41 24 49 10:01 23
นมมะพร้าวปั่นโอรีโอ\nภูเขาไฟ 12-03-03-0086 1 40 62 23 41 24 49 10:01 23
-
+นมยูสุปั่นโอรีโอภูเขาไฟ 12-03-03-0087 1 40 53 23 41 24 49 10:01 23
diff --git a/xml/menutab/page_catalog_group_coffee.xml b/xml/menutab/page_catalog_group_coffee.xml
index 3556483e..151ec744 100644
--- a/xml/menutab/page_catalog_group_coffee.xml
+++ b/xml/menutab/page_catalog_group_coffee.xml
@@ -1,614 +1,598 @@
-
-
-
- "Enable"
- 1080
- 1920
-; "0xeae6e1"
- SoundVolume
-
- ; On open
- Var NextPage = "-"
-
- DEBUGVAR ICE_PROCESS_STATUS
- DEBUGVAR ICE_PROCESS_TXT
-
-
- If show_eng = "true" Then
- Var showthaiText = "Invisible"
- Var showengText = "Enable"
- Var DirImage = "ROOT/taobin_project/image/page3_en"
- Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
- Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
-
- Var ice_tab_text = "Ice will be ready at "
- Var text_unavailable = "UNAVAILABLE###size=16"
-
- InstanceSetString "ShowEng"
- Else
- Var showengText = "Invisible"
- Var showthaiText = "Enable"
-
- Var DirImage = "ROOT/taobin_project/image/page3"
- Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
- Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-
- Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
- Var text_unavailable = "หมด###size=32"
-
- InstanceSetString "ShowThai"
- EndIf
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- ; SpiralOnline
-
- Var MenuVSelected2 = "Invisible"
-
- Var Menu1Selected2 = "Invisible"
- Var Menu2Selected2 = "Invisible"
- Var Menu3Selected2 = "Invisible"
- Var Menu4Selected2 = "Invisible"
-
- Var Menu6Selected2 = "Invisible"
- Var Menu7Selected2 = "Invisible"
- Var MenuVSelected2 = "Invisible"
- Var Menu11Selected2 = "Invisible"
-
- Var Menu21Selected2 = "Invisible"
-
- Var MenuVSelected2 = "Invisible"
- If SpiralOnline = "true" Then
- If Seeker = "curr" Then
- Var MenuVSelected2 = "Enable"
- EndIf
- EndIf
-
- ; init default
- Var Menu1Selected = "Enable"
- Var Menu2Selected = "Enable"
- Var Menu3Selected = "Enable"
- Var Menu4Selected = "Enable"
- ; 5 fruit
- Var Menu5Selected = "Invisible"
- ;Var Menu6Selected = "Enable"
-
- Var Menu61Selected = "Enable"
- Var Menu62Selected = "Enable"
-
- Var Menu7Selected = "Enable"
- ; 8 cocktail
- Var Menu8Selected = "Invisible"
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- Var Menu8Selected = "Enable"
- EndIf
-
-
- If AppFastEnable = "true" Then
- Var Menu11Selected = "Enable"
- Var Menu21Selected = "Invisible"
- Var Menu7Selected = "Invisible"
- Else
- If MenuKidEnable = "true" Then
- Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Enable"
- Var Menu7Selected = "Invisible"
- Else
- Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Invisible"
- Var Menu7Selected = "Enable"
- EndIf
- EndIf
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- EndIf
-
- If RecipeTag1 = "HealthTurnOn" Then
- Var Menu22Selected = "Enable"
- Else
- Var Menu22Selected = "Invisible"
- EndIf
- ;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Var Menu2Selected = "PressForever"
-
-
-
- SAVELOG PreviseXMLFileName2
-
- Var Timeout = 0
-
-
-
- If show_eng = "true" Then
- Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-
- Else
- Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
- EndIf
-
- SetInstanceIgnoreTouch
-
-
- DEBUGVAR SlientRefreshIndex
-
- If SlientRefreshIndex = 2 Then
- Var SlientRefreshIndex = 3
-
- EndIf
-
-
-
-
-; notice enable heathy menu
-
-
- 0
- 380
- 1080
- 1540
- "0xeae6e1"
-
-
-
-
- 1000
-
- ;DEBUGVAR ICE_PROCESS_STATUS
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- GetVisible inst_show2
- ;DEBUGVAR inst_show2
-
-
- If inst_show2 = 1 Then
- InstanceGetString SaveStringInst
- ;DEBUGVAR SaveStringInst
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
-
- If show_eng = "true" Then
- InstanceSetString "ShowEng"
- Else
- InstanceSetString "ShowThai"
- EndIf
- EndIf
- EndIf
-
- ; setvarint SlientRefreshEnable 1
- ;DEBUGVAR SlientRefreshEnable
-
- If SlientRefreshEnable = 1 Then
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
-
- If show_eng = "true" Then
- InstanceSetString "ShowEng"
- Else
- InstanceSetString "ShowThai"
- EndIf
-
- EndIf
- EndIf
-
- If SlientRefreshIndex = 2 Then
- If inst_show2 = 0 Then
- GetXMLFileNameCurrentRunning CurrentOpenFile2
- Open CurrentOpenFile2
-
- Else
- Var SlientRefreshIndex = 3
- EndIf
- EndIf
-
-
- TimerReset
-
-
-
- SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 "
- RefreshAll
-
-
-
-; under line
-
- 0
- 494
- "ROOT/taobin_project/image/page3/tab_line_bottom.png"
-
-
-
-; under line
-
- 0
- 358
- "ROOT/taobin_project/image/page3/bg1.png"
-
-
-
-; back
-
-
-
-
-
- InstanceGetString SaveStringInst
- DEBUGVAR SaveStringInst
- DEBUGVAR show_eng
-
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
-
- If show_eng = "true" Then
- If SaveStringInst = "ShowThai" Then
-
- InstanceSetString "ShowEng"
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
- Else
- If SaveStringInst = "ShowEng" Then
-
- InstanceSetString "ShowThai"
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
- EndIf
-
-
-
-;
-
- 1080
- "auto"
- 0
- 395
-
- "Enable"
- 896
- 102
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- DEBUGVAR web_ready
- If web_ready = "true" Then
- If web_ref = QRCODE99x Then
-
- Var web_readyOK = web_ready
- Var web_telnumOK = web_telnum
-
- Var web_app_prepar = "true"
-
- ; Handle penetrator
-
- If Only18 = "true" Then
-
- Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
- Else
-
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
- EndIf
-
- ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
-
- EndIf
- Else
- EndIf
-
-
-
-
-
-
-
-
-
-
+
+
+
+ "Enable"
+ 1080
+ 1920
+; "0xeae6e1"
+ SoundVolume
+
+ ; On open
+ Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
+
+ If show_eng = "true" Then
+ Var showthaiText = "Invisible"
+ Var showengText = "Enable"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
+
+ Var ice_tab_text = "Ice will be ready at "
+ Var text_unavailable = "UNAVAILABLE###size=16"
+
+ InstanceSetString "ShowEng"
+ Else
+ Var showengText = "Invisible"
+ Var showthaiText = "Enable"
+
+ Var DirImage = "ROOT/taobin_project/image/page3"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
+ Var text_unavailable = "หมด###size=32"
+
+ InstanceSetString "ShowThai"
+ EndIf
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ ; SpiralOnline
+
+ Var MenuVSelected2 = "Invisible"
+
+ Var Menu1Selected2 = "Invisible"
+ Var Menu2Selected2 = "Invisible"
+ Var Menu3Selected2 = "Invisible"
+ Var Menu4Selected2 = "Invisible"
+
+ Var Menu6Selected2 = "Invisible"
+ Var Menu7Selected2 = "Invisible"
+ Var MenuVSelected2 = "Invisible"
+ Var Menu11Selected2 = "Invisible"
+
+ Var Menu21Selected2 = "Invisible"
+
+ Var MenuVSelected2 = "Invisible"
+ If SpiralOnline = "true" Then
+ If Seeker = "curr" Then
+ Var MenuVSelected2 = "Enable"
+ EndIf
+ EndIf
+
+ ; init default
+ Var Menu1Selected = "Enable"
+ Var Menu2Selected = "Enable"
+ Var Menu3Selected = "Enable"
+ Var Menu4Selected = "Enable"
+ ; 5 fruit
+ Var Menu5Selected = "Invisible"
+ ;Var Menu6Selected = "Enable"
+
+ Var Menu61Selected = "Enable"
+ Var Menu62Selected = "Enable"
+
+ Var Menu7Selected = "Enable"
+ ; 8 cocktail
+ Var Menu8Selected = "Invisible"
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ Var Menu8Selected = "Enable"
+ EndIf
+
+
+ If AppFastEnable = "true" Then
+ Var Menu11Selected = "Enable"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Invisible"
+ Else
+ If MenuKidEnable = "true" Then
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Enable"
+ Var Menu7Selected = "Invisible"
+ Else
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Enable"
+ EndIf
+ EndIf
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ EndIf
+
+ If RecipeTag1 = "HealthTurnOn" Then
+ Var Menu22Selected = "Enable"
+ Else
+ Var Menu22Selected = "Invisible"
+ EndIf
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Var Menu2Selected = "PressForever"
+
+
+
+ SAVELOG PreviseXMLFileName2
+
+ Var Timeout = 0
+
+
+
+ If show_eng = "true" Then
+ Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+
+ Else
+ Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+ EndIf
+
+ SetInstanceIgnoreTouch
+
+
+
+
+
+; notice enable heathy menu
+
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
+ 1000
+
+ ;DEBUGVAR ICE_PROCESS_STATUS
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ GetVisible inst_show
+ ;DEBUGVAR inst_show
+
+ InstanceGetString SaveStringInst
+ ;DEBUGVAR SaveStringInst
+
+ If inst_show = 1 Then
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+
+ If show_eng = "true" Then
+ InstanceSetString "ShowEng"
+ Else
+ InstanceSetString "ShowThai"
+ EndIf
+
+ EndIf
+ EndIf
+
+ ; setvarint SlientRefreshEnable 1
+ ;DEBUGVAR SlientRefreshEnable
+
+ If SlientRefreshEnable = 1 Then
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+
+ If show_eng = "true" Then
+ InstanceSetString "ShowEng"
+ Else
+ InstanceSetString "ShowThai"
+ EndIf
+
+ EndIf
+ EndIf
+
+
+ TimerReset
+
+
+
+ SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 "
+ RefreshAll
+
+
+
+; under line
+
+ 0
+ 494
+ "ROOT/taobin_project/image/page3/tab_line_bottom.png"
+
+
+
+; under line
+
+ 0
+ 358
+ "ROOT/taobin_project/image/page3/bg1.png"
+
+
+
+; back
+
+
+
+
+
+ InstanceGetString SaveStringInst
+ DEBUGVAR SaveStringInst
+ DEBUGVAR show_eng
+
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+
+ If show_eng = "true" Then
+ If SaveStringInst = "ShowThai" Then
+
+ InstanceSetString "ShowEng"
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+ Else
+ If SaveStringInst = "ShowEng" Then
+
+ InstanceSetString "ShowThai"
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+ EndIf
+
+
+
+;
+
+ 1080
+ "auto"
+ 0
+ 395
+
+ "Enable"
+ 896
+ 102
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DEBUGVAR web_ready
+ If web_ready = "true" Then
+ If web_ref = QRCODE99x Then
+
+ Var web_readyOK = web_ready
+ Var web_telnumOK = web_telnum
+
+ Var web_app_prepar = "true"
+
+ ; Handle penetrator
+
+ If Only18 = "true" Then
+
+ Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
+ Else
+
+ Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+ EndIf
+
+ ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+
+ EndIf
+ Else
+ EndIf
+
+
+
+
+
+
+
+
+
+
10
497
@@ -1246,7 +1230,7 @@
KanitMediumTTF
0x322B26
showengText
- "DOUBLE
+ "DOUBLE
ESPRESSO"
@@ -1502,7 +1486,7 @@ ESPRESSO"
KanitMediumTTF
0x322B26
showengText
- "DOUBLE
+ "DOUBLE
ESPRESSO"
@@ -2270,7 +2254,7 @@ ESPRESSO"
KanitMediumTTF
0x322B26
showengText
- "DOUBLE
+ "DOUBLE
ESPRESSO"
@@ -2526,7 +2510,7 @@ ESPRESSO"
KanitMediumTTF
0x322B26
showengText
- "DOUBLE
+ "DOUBLE
ESPRESSO"
@@ -3784,7 +3768,7 @@ ESPRESSO"
KanitMediumTTF
0x322B26
showthaiText
- "เอสเพรสโซ่ช็อต
+ "เอสเพรสโซ่ช็อต
Guji Queen Berry"
@@ -3795,7 +3779,7 @@ Guji Queen Berry"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟคั่วอ่อน (natural process)
+ "กาแฟคั่วอ่อน (natural process)
หอมสตรอว์เบอร์รี ส้ม และดอกไม้"
@@ -3807,7 +3791,7 @@ Guji Queen Berry"
KanitMediumTTF
0x322B26
showengText
- "ESPRESSO
+ "ESPRESSO
ETHIOPAI GUJI"
@@ -3818,7 +3802,7 @@ ETHIOPAI GUJI"
KanitMediumTTF
0x6F5F51
showengText
- "Light roast natural process:
+ "Light roast natural process:
Strawberry, Orange, Floral"
@@ -4045,7 +4029,7 @@ Strawberry, Orange, Floral"
KanitMediumTTF
0x322B26
showthaiText
- "เอสเพรสโซ่ช็อต
+ "เอสเพรสโซ่ช็อต
BLUE DADDY"
@@ -4056,7 +4040,7 @@ BLUE DADDY"
KanitMediumTTF
0x6F5F51
showthaiText
- "Washed process
+ "Washed process
หอมบลูเบอร์รี และดอกไม้"
@@ -4068,7 +4052,7 @@ BLUE DADDY"
KanitMediumTTF
0x322B26
showengText
- "BLUE DADDY
+ "BLUE DADDY
ESPRESSO"
@@ -4079,7 +4063,7 @@ ESPRESSO"
KanitMediumTTF
0x6F5F51
showengText
- "Washed process
+ "Washed process
Note: Blue Berry & Floral"
@@ -4306,7 +4290,7 @@ Note: Blue Berry & Floral"
KanitMediumTTF
0x322B26
showthaiText
- "เอสเพรสโซ่ช็อต
+ "เอสเพรสโซ่ช็อต
CHOPIN"
@@ -4317,7 +4301,7 @@ CHOPIN"
KanitMediumTTF
0x6F5F51
showthaiText
- "Raisin Honey process
+ "Raisin Honey process
หอมสตรอว์เบอร์รี กุหลาบ มะลิ"
@@ -4329,7 +4313,7 @@ CHOPIN"
KanitMediumTTF
0x322B26
showengText
- "CHOPIN
+ "CHOPIN
ESPRESSO"
@@ -4340,7 +4324,7 @@ ESPRESSO"
KanitMediumTTF
0x6F5F51
showengText
- "Raisin Honey process
+ "Raisin Honey process
Note: Strawberry & Floral"
@@ -4567,7 +4551,7 @@ Note: Strawberry & Floral"
KanitMediumTTF
0x322B26
showthaiText
- "เอสเพรสโซ่ช็อต
+ "เอสเพรสโซ่ช็อต
MANDARINE"
@@ -4589,7 +4573,7 @@ MANDARINE"
KanitMediumTTF
0x322B26
showengText
- "MANDARINE
+ "MANDARINE
ESPRESSO"
@@ -4826,7 +4810,7 @@ ESPRESSO"
KanitMediumTTF
0x322B26
showthaiText
- "เอสเพรสโซ่ช็อต
+ "เอสเพรสโซ่ช็อต
OPUS ONE"
@@ -4848,7 +4832,7 @@ OPUS ONE"
KanitMediumTTF
0x322B26
showengText
- "OPUS ONE
+ "OPUS ONE
ESPRESSO"
@@ -5085,7 +5069,7 @@ ESPRESSO"
KanitMediumTTF
0x322B26
showthaiText
- "เอสเพรสโซ่ช็อต
+ "เอสเพรสโซ่ช็อต
MOZART "
@@ -5096,7 +5080,7 @@ MOZART "
KanitMediumTTF
0x6F5F51
showthaiText
- "Raisin Honey process
+ "Raisin Honey process
หอมสตรอว์เบอร์รี กุหลาบ มะลิ"
@@ -5108,7 +5092,7 @@ MOZART "
KanitMediumTTF
0x322B26
showengText
- "MOZART
+ "MOZART
ESPRESSO"
@@ -5119,7 +5103,7 @@ ESPRESSO"
KanitMediumTTF
0x6F5F51
showengText
- "Raisin Honey process
+ "Raisin Honey process
Note: Strawberry & Floral"
@@ -5346,7 +5330,7 @@ Note: Strawberry & Floral"
KanitMediumTTF
0x322B26
showthaiText
- "เอสเพรสโซ่ช็อต
+ "เอสเพรสโซ่ช็อต
SNOWWHITE"
@@ -5357,7 +5341,7 @@ SNOWWHITE"
KanitMediumTTF
0x6F5F51
showthaiText
- "Anaerobic process
+ "Anaerobic process
หอมมะลิ น้ำผึ้ง เมเปิล"
@@ -5369,7 +5353,7 @@ SNOWWHITE"
KanitMediumTTF
0x322B26
showengText
- "SNOWWHITE
+ "SNOWWHITE
ESPRESSO"
@@ -5380,7 +5364,7 @@ ESPRESSO"
KanitMediumTTF
0x6F5F51
showengText
- "Anaerobic process
+ "Anaerobic process
Note: Jasmine & Honey"
@@ -5607,7 +5591,7 @@ Note: Jasmine & Honey"
KanitMediumTTF
0x322B26
showthaiText
- "เอสเพรสโซ่ช็อต
+ "เอสเพรสโซ่ช็อต
WHISKY DUDE"
@@ -5618,7 +5602,7 @@ WHISKY DUDE"
KanitMediumTTF
0x6F5F51
showthaiText
- "Washed Sherry cask ferment
+ "Washed Sherry cask ferment
หอมวิสกี้ ช็อกโกแลต วนิลา"
@@ -5630,7 +5614,7 @@ WHISKY DUDE"
KanitMediumTTF
0x322B26
showengText
- "WHISKY DUDE
+ "WHISKY DUDE
ESPRESSO"
@@ -5641,7 +5625,7 @@ ESPRESSO"
KanitMediumTTF
0x6F5F51
showengText
- "Washed Sherry cask ferment
+ "Washed Sherry cask ferment
Note: Whisky & Vanilla"
@@ -5868,7 +5852,7 @@ Note: Whisky & Vanilla"
KanitMediumTTF
0x322B26
showthaiText
- "เอสเพรสโซ่ช็อต
+ "เอสเพรสโซ่ช็อต
PEACHER"
@@ -5879,7 +5863,7 @@ PEACHER"
KanitMediumTTF
0x6F5F51
showthaiText
- "Barrel-aged process
+ "Barrel-aged process
หอมพีช, ชา, ช็อกโกแลต"
@@ -5891,7 +5875,7 @@ PEACHER"
KanitMediumTTF
0x322B26
showengText
- "PEACHER
+ "PEACHER
ESPRESSO"
@@ -5902,7 +5886,7 @@ ESPRESSO"
KanitMediumTTF
0x6F5F51
showengText
- "Barrel-aged process
+ "Barrel-aged process
Note: Peach, tea, chocolate"
@@ -6129,7 +6113,7 @@ Note: Peach, tea, chocolate"
KanitMediumTTF
0x322B26
showthaiText
- "เอสเพรสโซ่ช็อต
+ "เอสเพรสโซ่ช็อต
PURE BEAUTY"
@@ -6140,7 +6124,7 @@ PURE BEAUTY"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟคั่วอ่อน (natural process)
+ "กาแฟคั่วอ่อน (natural process)
กลิ่นดอกไม้ ผลไม้เขตร้อน"
@@ -6152,7 +6136,7 @@ PURE BEAUTY"
KanitMediumTTF
0x322B26
showengText
- "PURE BEAUTY
+ "PURE BEAUTY
ESPRESSO"
@@ -6389,7 +6373,7 @@ ESPRESSO"
KanitMediumTTF
0x322B26
showthaiText
- "เอสเพรสโซ่ช็อต
+ "เอสเพรสโซ่ช็อต
GEISHA"
@@ -6647,7 +6631,7 @@ GEISHA"
KanitMediumTTF
0x322B26
showthaiText
- "เอสเพรสโซ่ช็อต
+ "เอสเพรสโซ่ช็อต
ROSALYN"
@@ -6658,7 +6642,7 @@ ROSALYN"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟคั่วอ่อน (washed process)
+ "กาแฟคั่วอ่อน (washed process)
กลิ่นกุหลาบ และ เบอร์รี่"
@@ -6680,7 +6664,7 @@ ROSALYN"
KanitMediumTTF
0x6F5F51
showengText
- "Light Roast (natural process)
+ "Light Roast (natural process)
Pink Rose & Berry"
@@ -7410,7 +7394,7 @@ Pink Rose & Berry"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
Guji Queen Berry"
@@ -7421,7 +7405,7 @@ Guji Queen Berry"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟคั่วอ่อน (natural process)
+ "กาแฟคั่วอ่อน (natural process)
หอมสตรอว์เบอร์รี ส้ม และดอกไม้"
@@ -7433,7 +7417,7 @@ Guji Queen Berry"
KanitMediumTTF
0x322B26
showengText
- "AMERICANO
+ "AMERICANO
ETHIOPAI GUJI"
@@ -7444,7 +7428,7 @@ ETHIOPAI GUJI"
KanitMediumTTF
0x6F5F51
showengText
- "Light roast natural process:
+ "Light roast natural process:
Strawberry, Orange, Floral"
@@ -7671,7 +7655,7 @@ Strawberry, Orange, Floral"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
BLUE DADDY"
@@ -7682,7 +7666,7 @@ BLUE DADDY"
KanitMediumTTF
0x6F5F51
showthaiText
- "Washed process
+ "Washed process
หอมบลูเบอร์รี และดอกไม้"
@@ -7694,7 +7678,7 @@ BLUE DADDY"
KanitMediumTTF
0x322B26
showengText
- "BLUE DADDY
+ "BLUE DADDY
AMERICANO"
@@ -7705,7 +7689,7 @@ AMERICANO"
KanitMediumTTF
0x6F5F51
showengText
- "Washed process
+ "Washed process
Note: Blue Berry & Floral"
@@ -7932,7 +7916,7 @@ Note: Blue Berry & Floral"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
CHOPIN"
@@ -7943,7 +7927,7 @@ CHOPIN"
KanitMediumTTF
0x6F5F51
showthaiText
- "Raisin Honey process
+ "Raisin Honey process
หอมสตรอว์เบอร์รี กุหลาบ มะลิ"
@@ -7955,7 +7939,7 @@ CHOPIN"
KanitMediumTTF
0x322B26
showengText
- "CHOPIN
+ "CHOPIN
AMERICANO"
@@ -7966,7 +7950,7 @@ AMERICANO"
KanitMediumTTF
0x6F5F51
showengText
- "Raisin Honey process
+ "Raisin Honey process
Note: Strawberry & Floral"
@@ -8193,7 +8177,7 @@ Note: Strawberry & Floral"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
MANDARINE"
@@ -8215,7 +8199,7 @@ MANDARINE"
KanitMediumTTF
0x322B26
showengText
- "MANDARINE
+ "MANDARINE
AMERICANO"
@@ -8452,7 +8436,7 @@ AMERICANO"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
OPUS ONE"
@@ -8474,7 +8458,7 @@ OPUS ONE"
KanitMediumTTF
0x322B26
showengText
- "OPUS ONE
+ "OPUS ONE
AMERICANO"
@@ -8711,7 +8695,7 @@ AMERICANO"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
MOZART"
@@ -8722,7 +8706,7 @@ MOZART"
KanitMediumTTF
0x6F5F51
showthaiText
- "Raisin Honey process
+ "Raisin Honey process
หอมสตรอว์เบอร์รี กุหลาบ มะลิ"
@@ -8734,7 +8718,7 @@ MOZART"
KanitMediumTTF
0x322B26
showengText
- "MOZART
+ "MOZART
AMERICANO"
@@ -8745,7 +8729,7 @@ AMERICANO"
KanitMediumTTF
0x6F5F51
showengText
- "Raisin Honey process
+ "Raisin Honey process
Note: Strawberry & Floral"
@@ -8972,7 +8956,7 @@ Note: Strawberry & Floral"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
WHISKY DUDE"
@@ -8983,7 +8967,7 @@ WHISKY DUDE"
KanitMediumTTF
0x6F5F51
showthaiText
- "Washed Sherry cask ferment
+ "Washed Sherry cask ferment
หอมวิสกี้ ช็อกโกแลต วนิลา"
@@ -8995,7 +8979,7 @@ WHISKY DUDE"
KanitMediumTTF
0x322B26
showengText
- "WHISKY DUDE
+ "WHISKY DUDE
AMERICANO"
@@ -9006,7 +8990,7 @@ AMERICANO"
KanitMediumTTF
0x6F5F51
showengText
- "Washed Sherry cask ferment
+ "Washed Sherry cask ferment
Note: Whisky & Vanilla"
@@ -9233,7 +9217,7 @@ Note: Whisky & Vanilla"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
SNOWWHITE"
@@ -9244,7 +9228,7 @@ SNOWWHITE"
KanitMediumTTF
0x6F5F51
showthaiText
- "Anaerobic process
+ "Anaerobic process
หอมมะลิ น้ำผึ้ง เมเปิล"
@@ -9256,7 +9240,7 @@ SNOWWHITE"
KanitMediumTTF
0x322B26
showengText
- "SNOWWHITE
+ "SNOWWHITE
AMERICANO"
@@ -9267,7 +9251,7 @@ AMERICANO"
KanitMediumTTF
0x6F5F51
showengText
- "Anaerobic process
+ "Anaerobic process
Note: Jasmine & Honey"
@@ -9494,7 +9478,7 @@ Note: Jasmine & Honey"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
PEACHER"
@@ -9505,7 +9489,7 @@ PEACHER"
KanitMediumTTF
0x6F5F51
showthaiText
- "Barrel-aged process
+ "Barrel-aged process
หอมพีช, ชา, ช็อกโกแลต"
@@ -9517,7 +9501,7 @@ PEACHER"
KanitMediumTTF
0x322B26
showengText
- "PEACHER
+ "PEACHER
AMERICANO"
@@ -9528,7 +9512,7 @@ AMERICANO"
KanitMediumTTF
0x6F5F51
showengText
- "Barrel-aged process
+ "Barrel-aged process
Note: Peach, tea, chocolate"
@@ -9755,7 +9739,7 @@ Note: Peach, tea, chocolate"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
PURE BEAUTY"
@@ -9766,7 +9750,7 @@ PURE BEAUTY"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟคั่วอ่อน (natural process)
+ "กาแฟคั่วอ่อน (natural process)
กลิ่นดอกไม้ ผลไม้เขตร้อน"
@@ -9778,7 +9762,7 @@ PURE BEAUTY"
KanitMediumTTF
0x322B26
showengText
- "PURE BEAUTY
+ "PURE BEAUTY
AMERICANO"
@@ -10015,7 +9999,7 @@ AMERICANO"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
GEISHA"
@@ -10037,7 +10021,7 @@ GEISHA"
KanitMediumTTF
0x322B26
showengText
- "GEISHA
+ "GEISHA
AMERICANO"
@@ -10274,7 +10258,7 @@ AMERICANO"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
ROSALYN"
@@ -10285,7 +10269,7 @@ ROSALYN"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟคั่วอ่อน (washed process)
+ "กาแฟคั่วอ่อน (washed process)
กลิ่นกุหลาบ และ เบอร์รี่"
@@ -10297,7 +10281,7 @@ ROSALYN"
KanitMediumTTF
0x322B26
showengText
- "ROSALYN
+ "ROSALYN
AMERICANO"
@@ -10308,7 +10292,7 @@ AMERICANO"
KanitMediumTTF
0x6F5F51
showengText
- "Light Roast (natural process)
+ "Light Roast (natural process)
Pink Rose & Berry"
@@ -10535,7 +10519,7 @@ Pink Rose & Berry"
KanitMediumTTF
0x322B26
showthaiText
- "BLUE DADDY
+ "BLUE DADDY
ALMOST DIRTY"
@@ -10546,7 +10530,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x6F5F51
showthaiText
- "Washed process
+ "Washed process
หอมบลูเบอร์รี และดอกไม้"
@@ -10558,7 +10542,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x322B26
showengText
- "BLUE DADDY
+ "BLUE DADDY
ALMOST DIRTY"
@@ -10569,7 +10553,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x6F5F51
showengText
- "Washed process
+ "Washed process
Note: Blue Berry & Floral"
@@ -10792,7 +10776,7 @@ Note: Blue Berry & Floral"
KanitMediumTTF
0x322B26
showthaiText
- "MOZART
+ "MOZART
ALMOST DIRTY"
@@ -10803,7 +10787,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x6F5F51
showthaiText
- "Raisin Honey process
+ "Raisin Honey process
หอมสตรอว์เบอร์รี กุหลาบ มะลิ"
@@ -10815,7 +10799,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x322B26
showengText
- "MOZART
+ "MOZART
ALMOST DIRTY"
@@ -10826,7 +10810,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x6F5F51
showengText
- "Raisin Honey process
+ "Raisin Honey process
Note: Strawberry & Floral"
@@ -11049,7 +11033,7 @@ Note: Strawberry & Floral"
KanitMediumTTF
0x322B26
showthaiText
- "CHOPIN
+ "CHOPIN
ALMOST DIRTY"
@@ -11060,7 +11044,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x6F5F51
showthaiText
- "Raisin Honey process
+ "Raisin Honey process
หอมสตรอว์เบอร์รี กุหลาบ มะลิ"
@@ -11072,7 +11056,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x322B26
showengText
- "CHOPIN
+ "CHOPIN
ALMOST DIRTY"
@@ -11083,7 +11067,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x6F5F51
showengText
- "Raisin Honey process
+ "Raisin Honey process
Note: Strawberry & Floral"
@@ -11306,7 +11290,7 @@ Note: Strawberry & Floral"
KanitMediumTTF
0x322B26
showthaiText
- "MANDARINE
+ "MANDARINE
ALMOST DIRTY"
@@ -11328,7 +11312,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x322B26
showengText
- "MANDARINE
+ "MANDARINE
ALMOST DIRTY"
@@ -11561,7 +11545,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x322B26
showthaiText
- "OPUS ONE
+ "OPUS ONE
ALMOST DIRTY"
@@ -11583,7 +11567,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x322B26
showengText
- "OPUS ONE
+ "OPUS ONE
ALMOST DIRTY"
@@ -11816,7 +11800,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x322B26
showthaiText
- "WHISKY DUDE
+ "WHISKY DUDE
ALMOST DIRTY"
@@ -11827,7 +11811,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x6F5F51
showthaiText
- "Washed Sherry cask ferment
+ "Washed Sherry cask ferment
หอมวิสกี้ ช็อกโกแลต วนิลา"
@@ -11839,7 +11823,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x322B26
showengText
- "WHISKY DUDE
+ "WHISKY DUDE
ALMOST DIRTY"
@@ -11850,7 +11834,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x6F5F51
showengText
- "Washed Sherry cask ferment
+ "Washed Sherry cask ferment
Note: Whisky & Vanilla"
@@ -12073,7 +12057,7 @@ Note: Whisky & Vanilla"
KanitMediumTTF
0x322B26
showthaiText
- "SNOWWHITE
+ "SNOWWHITE
ALMOST DIRTY"
@@ -12084,7 +12068,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x6F5F51
showthaiText
- "Anaerobic process
+ "Anaerobic process
หอมมะลิ น้ำผึ้ง เมเปิล"
@@ -12096,7 +12080,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x322B26
showengText
- "SNOWWHITE
+ "SNOWWHITE
ALMOST DIRTY"
@@ -12107,7 +12091,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x6F5F51
showengText
- "Anaerobic process
+ "Anaerobic process
Note: Jasmine & Honey"
@@ -12330,7 +12314,7 @@ Note: Jasmine & Honey"
KanitMediumTTF
0x322B26
showthaiText
- "QUEEN BERRY
+ "QUEEN BERRY
ALMOST DIRTY"
@@ -12341,7 +12325,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟคั่วอ่อน (washed process)
+ "กาแฟคั่วอ่อน (washed process)
หอมสตรอว์เบอร์รี ส้ม และดอกไม้"
@@ -12353,7 +12337,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x322B26
showengText
- "QUEEN BERRY
+ "QUEEN BERRY
ALMOST DIRTY"
@@ -12364,7 +12348,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x6F5F51
showengText
- "Light roast natural process:
+ "Light roast natural process:
Strawberry, Orange, Floral"
@@ -12587,7 +12571,7 @@ Strawberry, Orange, Floral"
KanitMediumTTF
0x322B26
showthaiText
- "PEACHER
+ "PEACHER
ALMOST DIRTY"
@@ -12598,7 +12582,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x6F5F51
showthaiText
- "Barrel-aged process
+ "Barrel-aged process
หอมพีช, ชา, ช็อกโกแลต"
@@ -12610,7 +12594,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x322B26
showengText
- "PEACHER
+ "PEACHER
ALMOST DIRTY"
@@ -12621,7 +12605,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x6F5F51
showengText
- "Barrel-aged process
+ "Barrel-aged process
Note: Peach, tea, chocolate"
@@ -12844,7 +12828,7 @@ Note: Peach, tea, chocolate"
KanitMediumTTF
0x322B26
showthaiText
- "PURE BEAUTY
+ "PURE BEAUTY
ALMOST DIRTY"
@@ -12855,7 +12839,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟคั่วอ่อน (natural process)
+ "กาแฟคั่วอ่อน (natural process)
กลิ่นดอกไม้ ผลไม้เขตร้อน"
@@ -12867,7 +12851,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x322B26
showengText
- "PURE BEAUTY
+ "PURE BEAUTY
ALMOST DIRTY"
@@ -13100,7 +13084,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x322B26
showthaiText
- "GEISHA
+ "GEISHA
ALMOST DIRTY"
@@ -13122,7 +13106,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x322B26
showengText
- "GEISHA
+ "GEISHA
ALMOST DIRTY"
@@ -13355,7 +13339,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x322B26
showthaiText
- "ROSALYN
+ "ROSALYN
ALMOST DIRTY"
@@ -13366,7 +13350,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟคั่วอ่อน (washed process)
+ "กาแฟคั่วอ่อน (washed process)
กลิ่นกุหลาบ และ เบอร์รี่"
@@ -13378,7 +13362,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x322B26
showengText
- "ROSALYN
+ "ROSALYN
ALMOST DIRTY"
@@ -13389,7 +13373,7 @@ ALMOST DIRTY"
KanitMediumTTF
0x6F5F51
showengText
- "Light Roast (natural process)
+ "Light Roast (natural process)
Pink Rose & Berry"
@@ -13633,7 +13617,7 @@ Pink Rose & Berry"
KanitMediumTTF
0x322B26
showengText
- "THAI
+ "THAI
ICED ESPRESSO"
@@ -13885,7 +13869,7 @@ ICED ESPRESSO"
KanitMediumTTF
0x322B26
showengText
- "THAI
+ "THAI
ICED ESPRESSO"
@@ -15660,7 +15644,7 @@ ICED ESPRESSO"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟ นม และ นม
+ "กาแฟ นม และ นม
น้ำเชื่อมคาราเมล"
@@ -15682,7 +15666,7 @@ ICED ESPRESSO"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Milk,
+ "Espresso, Milk,
Caramel Syrup"
@@ -15917,7 +15901,7 @@ Caramel Syrup"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟ นม และ นม
+ "กาแฟ นม และ นม
น้ำเชื่อมคาราเมล"
@@ -15939,7 +15923,7 @@ Caramel Syrup"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Milk,
+ "Espresso, Milk,
Caramel Syrup"
@@ -16175,7 +16159,7 @@ Caramel Syrup"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟ นม ชาเขียวมัทฉะ
+ "กาแฟ นม ชาเขียวมัทฉะ
และ นม"
@@ -16187,7 +16171,7 @@ Caramel Syrup"
KanitMediumTTF
0x322B26
showengText
- "MATCHA
+ "MATCHA
CAFÉ LATTE"
@@ -16432,7 +16416,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟ นม ชาเขียวมัทฉะ
+ "กาแฟ นม ชาเขียวมัทฉะ
และ นม"
@@ -16444,7 +16428,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x322B26
showengText
- "MATCHA
+ "MATCHA
CAFÉ LATTE"
@@ -16690,7 +16674,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟ นม ชาเขียวมัทฉะ
+ "กาแฟ นม ชาเขียวมัทฉะ
และ นม"
@@ -16702,7 +16686,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x322B26
showengText
- "MATCHA
+ "MATCHA
CAFÉ LATTE"
@@ -16947,7 +16931,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟ นม ชาเขียวมัทฉะ
+ "กาแฟ นม ชาเขียวมัทฉะ
และ นม"
@@ -16959,7 +16943,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x322B26
showengText
- "MATCHA
+ "MATCHA
CAFÉ LATTE"
@@ -17205,7 +17189,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟ น้ำเชื่อมน้ำตาลแดง
+ "กาแฟ น้ำเชื่อมน้ำตาลแดง
และ นม"
@@ -17217,7 +17201,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x322B26
showengText
- "BROWN
+ "BROWN
SUGAR LATTE"
@@ -17228,7 +17212,7 @@ SUGAR LATTE"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Milk,
+ "Espresso, Milk,
Kokuto syrup"
@@ -17463,7 +17447,7 @@ Kokuto syrup"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟ น้ำเชื่อมน้ำตาลแดง
+ "กาแฟ น้ำเชื่อมน้ำตาลแดง
และ นม"
@@ -17475,7 +17459,7 @@ Kokuto syrup"
KanitMediumTTF
0x322B26
showengText
- "BROWN
+ "BROWN
SUGAR LATTE"
@@ -17486,7 +17470,7 @@ SUGAR LATTE"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Milk,
+ "Espresso, Milk,
Kokuto syrup"
@@ -17722,7 +17706,7 @@ Kokuto syrup"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟ เมล่อน น้ำตาล
+ "กาแฟ เมล่อน น้ำตาล
และ นม"
@@ -17734,7 +17718,7 @@ Kokuto syrup"
KanitMediumTTF
0x322B26
showengText
- "MELON
+ "MELON
CAFÉ LATTE"
@@ -17979,7 +17963,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟ เมล่อน น้ำตาล
+ "กาแฟ เมล่อน น้ำตาล
และ นม"
@@ -17991,7 +17975,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x322B26
showengText
- "MELON
+ "MELON
CAFÉ LATTE"
@@ -18237,7 +18221,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟ ชาไต้หวัน น้ำตาล
+ "กาแฟ ชาไต้หวัน น้ำตาล
และ นม"
@@ -18249,7 +18233,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x322B26
showengText
- "TAIWANESE TEA
+ "TAIWANESE TEA
CAFÉ LATTE"
@@ -18260,7 +18244,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Taiwanese Tea,
+ "Espresso, Taiwanese Tea,
Milk, Sugar"
@@ -18495,7 +18479,7 @@ Milk, Sugar"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟ ชาไต้หวัน น้ำตาล
+ "กาแฟ ชาไต้หวัน น้ำตาล
และ นม"
@@ -18507,7 +18491,7 @@ Milk, Sugar"
KanitMediumTTF
0x322B26
showengText
- "TAIWANESE TEA
+ "TAIWANESE TEA
CAFÉ LATTE"
@@ -18518,7 +18502,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Taiwanese Tea,
+ "Espresso, Taiwanese Tea,
Milk, Sugar"
@@ -18765,7 +18749,7 @@ Milk, Sugar"
KanitMediumTTF
0x322B26
showengText
- "THAI TEA
+ "THAI TEA
CAFÉ LATTE"
@@ -19021,7 +19005,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x322B26
showengText
- "THAI TEA
+ "THAI TEA
CAFÉ LATTE"
@@ -19278,7 +19262,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x322B26
showengText
- "THAI TEA
+ "THAI TEA
CAFÉ LATTE"
@@ -19534,7 +19518,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x322B26
showengText
- "THAI TEA
+ "THAI TEA
CAFÉ LATTE"
@@ -19780,7 +19764,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟ ชาไต้หวัน น้ำตาล
+ "กาแฟ ชาไต้หวัน น้ำตาล
และ นม"
@@ -19792,7 +19776,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x322B26
showengText
- "TAIWANESE TEA
+ "TAIWANESE TEA
CAFÉ LATTE"
@@ -19803,7 +19787,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Taiwanese Tea,
+ "Espresso, Taiwanese Tea,
Milk, Sugar"
@@ -20038,7 +20022,7 @@ Milk, Sugar"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟ ชาไต้หวัน น้ำตาล
+ "กาแฟ ชาไต้หวัน น้ำตาล
และ นม"
@@ -20050,7 +20034,7 @@ Milk, Sugar"
KanitMediumTTF
0x322B26
showengText
- "TAIWANESE TEA
+ "TAIWANESE TEA
CAFÉ LATTE"
@@ -20061,7 +20045,7 @@ CAFÉ LATTE"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Taiwanese Tea,
+ "Espresso, Taiwanese Tea,
Milk, Sugar"
@@ -20318,7 +20302,7 @@ Milk, Sugar"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Lychee,
+ "Espresso, Lychee,
Sugar, Water"
@@ -20574,7 +20558,7 @@ Sugar, Water"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Lychee,
+ "Espresso, Lychee,
Sugar, Water"
@@ -20831,7 +20815,7 @@ Sugar, Water"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Yuzu,
+ "Espresso, Yuzu,
Sugar, Water"
@@ -21087,7 +21071,7 @@ Sugar, Water"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Yuzu,
+ "Espresso, Yuzu,
Sugar, Water"
@@ -21334,7 +21318,7 @@ Sugar, Water"
KanitMediumTTF
0x322B26
showengText
- "TOKYO BANANA
+ "TOKYO BANANA
LATTE"
@@ -21345,7 +21329,7 @@ LATTE"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Tokyo Banana Syrup,
+ "Espresso, Tokyo Banana Syrup,
Sugar, Water"
@@ -21591,7 +21575,7 @@ Sugar, Water"
KanitMediumTTF
0x322B26
showengText
- "TOKYO BANANA
+ "TOKYO BANANA
LATTE"
@@ -21602,7 +21586,7 @@ LATTE"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Tokyo Banana Syrup,
+ "Espresso, Tokyo Banana Syrup,
Sugar, Water"
@@ -21859,7 +21843,7 @@ Sugar, Water"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Mint Syrup,
+ "Espresso, Mint Syrup,
Sugar, Milk"
@@ -22115,7 +22099,7 @@ Sugar, Milk"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Mint Syrup,
+ "Espresso, Mint Syrup,
Sugar, Milk"
@@ -22372,7 +22356,7 @@ Sugar, Milk"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Mint Syrup,
+ "Espresso, Mint Syrup,
Sugar, Water"
@@ -22628,7 +22612,7 @@ Sugar, Water"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Mint Syrup,
+ "Espresso, Mint Syrup,
Sugar, Water"
@@ -22885,7 +22869,7 @@ Sugar, Water"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Peach Syrup ,
+ "Espresso, Peach Syrup ,
Sugar, Water"
@@ -23141,7 +23125,7 @@ Sugar, Water"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Peach Syrup ,
+ "Espresso, Peach Syrup ,
Sugar, Water"
@@ -23398,7 +23382,7 @@ Sugar, Water"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Peach Syrup,
+ "Espresso, Peach Syrup,
Sugar, Milk"
@@ -23654,7 +23638,7 @@ Sugar, Milk"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Peach Syrup,
+ "Espresso, Peach Syrup,
Sugar, Milk"
@@ -24383,7 +24367,7 @@ Sugar, Milk"
KanitMediumTTF
0x322B26
showthaiText
- "กาแฟดำ
+ "กาแฟดำ
มะพร้าวน้ำหอม"
@@ -24415,7 +24399,7 @@ Sugar, Milk"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Coconut Syrup,
+ "Espresso, Coconut Syrup,
Sugar, Water"
@@ -24636,7 +24620,7 @@ Sugar, Water"
KanitMediumTTF
0x322B26
showthaiText
- "กาแฟดำ
+ "กาแฟดำ
มะพร้าวน้ำหอม"
@@ -24668,7 +24652,7 @@ Sugar, Water"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Coconut Syrup,
+ "Espresso, Coconut Syrup,
Sugar, Water"
@@ -24890,7 +24874,7 @@ Sugar, Water"
KanitMediumTTF
0x322B26
showthaiText
- "เซเว่นอัพ
+ "เซเว่นอัพ
กาแฟบ๊วยโซดา"
@@ -24912,7 +24896,7 @@ Sugar, Water"
KanitMediumTTF
0x322B26
showengText
- "7UP PLUM LIME
+ "7UP PLUM LIME
COFFEE"
@@ -25143,7 +25127,7 @@ COFFEE"
KanitMediumTTF
0x322B26
showthaiText
- "เซเว่นอัพ
+ "เซเว่นอัพ
กาแฟบ๊วยโซดา"
@@ -25165,7 +25149,7 @@ COFFEE"
KanitMediumTTF
0x322B26
showengText
- "7UP PLUM LIME
+ "7UP PLUM LIME
COFFEE"
@@ -25397,7 +25381,7 @@ COFFEE"
KanitMediumTTF
0x322B26
showthaiText
- "เซเว่นอัพ
+ "เซเว่นอัพ
กาแฟสละโซดา"
@@ -25419,7 +25403,7 @@ COFFEE"
KanitMediumTTF
0x322B26
showengText
- "7UP PLUM SALAK
+ "7UP PLUM SALAK
LIME COFFEE"
@@ -25430,7 +25414,7 @@ LIME COFFEE"
KanitMediumTTF
0x6F5F51
showengText
- "Espreeso, 7UP, Lime
+ "Espreeso, 7UP, Lime
Salak, Ice"
@@ -25651,7 +25635,7 @@ LIME COFFEE"
KanitMediumTTF
0x322B26
showthaiText
- "เซเว่นอัพ
+ "เซเว่นอัพ
กาแฟสละโซดา"
@@ -25673,7 +25657,7 @@ LIME COFFEE"
KanitMediumTTF
0x322B26
showengText
- "7UP PLUM SALAK
+ "7UP PLUM SALAK
LIME COFFEE"
@@ -25684,7 +25668,7 @@ LIME COFFEE"
KanitMediumTTF
0x6F5F51
showengText
- "Espreeso, 7UP, Lime
+ "Espreeso, 7UP, Lime
Salak, Ice"
@@ -25827,9 +25811,9 @@ LIME COFFEE"
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
-
-
-
-
-
-
+
+
+
+
+
+
diff --git a/xml/menutab/page_catalog_group_forkid.xml b/xml/menutab/page_catalog_group_forkid.xml
index 587bfb25..9be8e965 100644
--- a/xml/menutab/page_catalog_group_forkid.xml
+++ b/xml/menutab/page_catalog_group_forkid.xml
@@ -1,623 +1,608 @@
-
-
-
- "Enable"
- 1080
- 1920
-; "0xeae6e1"
- SoundVolume
-
- ; On open
- Var NextPage = "-"
-
- DEBUGVAR ICE_PROCESS_STATUS
- DEBUGVAR ICE_PROCESS_TXT
-
-
- If show_eng = "true" Then
- Var showthaiText = "Invisible"
- Var showengText = "Enable"
- Var DirImage = "ROOT/taobin_project/image/page3_en"
- Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
- Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
-
- Var ice_tab_text = "Ice will be ready at "
- Var text_unavailable = "UNAVAILABLE###size=16"
-
- InstanceSetString "ShowEng"
- Else
- Var showengText = "Invisible"
- Var showthaiText = "Enable"
-
- Var DirImage = "ROOT/taobin_project/image/page3"
- Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
- Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-
- Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
- Var text_unavailable = "หมด###size=32"
-
- InstanceSetString "ShowThai"
- EndIf
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- ; SpiralOnline
-
- Var MenuVSelected2 = "Invisible"
-
- Var Menu1Selected2 = "Invisible"
- Var Menu2Selected2 = "Invisible"
- Var Menu3Selected2 = "Invisible"
- Var Menu4Selected2 = "Invisible"
-
- Var Menu6Selected2 = "Invisible"
- Var Menu7Selected2 = "Invisible"
- Var MenuVSelected2 = "Invisible"
- Var Menu11Selected2 = "Invisible"
-
- Var Menu21Selected2 = "Invisible"
-
- Var MenuVSelected2 = "Invisible"
- If SpiralOnline = "true" Then
- If Seeker = "curr" Then
- Var MenuVSelected2 = "Enable"
- EndIf
- EndIf
-
- ; init default
- Var Menu1Selected = "Enable"
- Var Menu2Selected = "Enable"
- Var Menu3Selected = "Enable"
- Var Menu4Selected = "Enable"
- ; 5 fruit
- Var Menu5Selected = "Invisible"
- ;Var Menu6Selected = "Enable"
-
- Var Menu61Selected = "Enable"
- Var Menu62Selected = "Enable"
-
- Var Menu7Selected = "Enable"
- ; 8 cocktail
- Var Menu8Selected = "Invisible"
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- Var Menu8Selected = "Enable"
- EndIf
-
-
- If AppFastEnable = "true" Then
- Var Menu11Selected = "Enable"
- Var Menu21Selected = "Invisible"
- Var Menu7Selected = "Invisible"
- Else
- If MenuKidEnable = "true" Then
- Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Enable"
- Var Menu7Selected = "Invisible"
- Else
- Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Invisible"
- Var Menu7Selected = "Enable"
- EndIf
- EndIf
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- EndIf
-
- If RecipeTag1 = "HealthTurnOn" Then
- Var Menu22Selected = "Enable"
- Else
- Var Menu22Selected = "Invisible"
- EndIf
- ;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ; protein
- If AppFastEnable = "true" Then
- Var Menu11Selected = "PressForever"
- Var Menu7Selected = "Invisible"
- Var Menu21Selected = "Invisible"
- Else
- Var Menu11Selected = "Invisible"
- Var Menu7Selected = "Invisible"
- Var Menu21Selected = "PressForever"
- EndIf
-
-
- SAVELOG PreviseXMLFileName2
-
- Var Timeout = 0
-
-
-
- If show_eng = "true" Then
- Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-
- Else
- Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
- EndIf
-
- SetInstanceIgnoreTouch
-
- DEBUGVAR SlientRefreshIndex
-
- If SlientRefreshIndex = 5 Then
- Var SlientRefreshIndex = 6
- EndIf
-
-
-
-
-
-
-; notice enable heathy menu
-
-
- 0
- 380
- 1080
- 1540
- "0xeae6e1"
-
-
-
-
- 1000
-
- ;DEBUGVAR ICE_PROCESS_STATUS
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- GetVisible inst_show5
- ;DEBUGVAR inst_show5
-
-
- If inst_show5 = 1 Then
- InstanceGetString SaveStringInst
- ;DEBUGVAR SaveStringInst
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
-
- If show_eng = "true" Then
- InstanceSetString "ShowEng"
- Else
- InstanceSetString "ShowThai"
- EndIf
- EndIf
- EndIf
-
- ; setvarint SlientRefreshEnable 1
- ;DEBUGVAR SlientRefreshEnable
-
- If SlientRefreshEnable = 1 Then
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
-
- If show_eng = "true" Then
- InstanceSetString "ShowEng"
- Else
- InstanceSetString "ShowThai"
- EndIf
-
- EndIf
- EndIf
-
-
- If SlientRefreshIndex = 5 Then
- If inst_show5 = 0 Then
- GetXMLFileNameCurrentRunning CurrentOpenFile5
- Open CurrentOpenFile5
- Else
- Var SlientRefreshIndex = 6
- EndIf
- EndIf
-
-
- TimerReset
-
-
-
- SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 "
- RefreshAll
-
-
-
-; under line
-
- 0
- 494
- "ROOT/taobin_project/image/page3/tab_line_bottom.png"
-
-
-
-; under line
-
- 0
- 358
- "ROOT/taobin_project/image/page3/bg1.png"
-
-
-
-; back
-
-
-
-
-
- InstanceGetString SaveStringInst
- DEBUGVAR SaveStringInst
- DEBUGVAR show_eng
-
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
-
- If show_eng = "true" Then
- If SaveStringInst = "ShowThai" Then
-
- InstanceSetString "ShowEng"
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
- Else
- If SaveStringInst = "ShowEng" Then
-
- InstanceSetString "ShowThai"
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
- EndIf
-
-
-
-;
-
- 1080
- "auto"
- 0
- 395
-
- "Enable"
- 896
- 102
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- DEBUGVAR web_ready
- If web_ready = "true" Then
- If web_ref = QRCODE99x Then
-
- Var web_readyOK = web_ready
- Var web_telnumOK = web_telnum
-
- Var web_app_prepar = "true"
-
- ; Handle penetrator
-
- If Only18 = "true" Then
-
- Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
- Else
-
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
- EndIf
-
- ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
-
- EndIf
- Else
- EndIf
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ "Enable"
+ 1080
+ 1920
+; "0xeae6e1"
+ SoundVolume
+
+ ; On open
+ Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
+
+ If show_eng = "true" Then
+ Var showthaiText = "Invisible"
+ Var showengText = "Enable"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
+
+ Var ice_tab_text = "Ice will be ready at "
+ Var text_unavailable = "UNAVAILABLE###size=16"
+
+ InstanceSetString "ShowEng"
+ Else
+ Var showengText = "Invisible"
+ Var showthaiText = "Enable"
+
+ Var DirImage = "ROOT/taobin_project/image/page3"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
+ Var text_unavailable = "หมด###size=32"
+
+ InstanceSetString "ShowThai"
+ EndIf
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ ; SpiralOnline
+
+ Var MenuVSelected2 = "Invisible"
+
+ Var Menu1Selected2 = "Invisible"
+ Var Menu2Selected2 = "Invisible"
+ Var Menu3Selected2 = "Invisible"
+ Var Menu4Selected2 = "Invisible"
+
+ Var Menu6Selected2 = "Invisible"
+ Var Menu7Selected2 = "Invisible"
+ Var MenuVSelected2 = "Invisible"
+ Var Menu11Selected2 = "Invisible"
+
+ Var Menu21Selected2 = "Invisible"
+
+ Var MenuVSelected2 = "Invisible"
+ If SpiralOnline = "true" Then
+ If Seeker = "curr" Then
+ Var MenuVSelected2 = "Enable"
+ EndIf
+ EndIf
+
+ ; init default
+ Var Menu1Selected = "Enable"
+ Var Menu2Selected = "Enable"
+ Var Menu3Selected = "Enable"
+ Var Menu4Selected = "Enable"
+ ; 5 fruit
+ Var Menu5Selected = "Invisible"
+ ;Var Menu6Selected = "Enable"
+
+ Var Menu61Selected = "Enable"
+ Var Menu62Selected = "Enable"
+
+ Var Menu7Selected = "Enable"
+ ; 8 cocktail
+ Var Menu8Selected = "Invisible"
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ Var Menu8Selected = "Enable"
+ EndIf
+
+
+ If AppFastEnable = "true" Then
+ Var Menu11Selected = "Enable"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Invisible"
+ Else
+ If MenuKidEnable = "true" Then
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Enable"
+ Var Menu7Selected = "Invisible"
+ Else
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Enable"
+ EndIf
+ EndIf
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ EndIf
+
+ If RecipeTag1 = "HealthTurnOn" Then
+ Var Menu22Selected = "Enable"
+ Else
+ Var Menu22Selected = "Invisible"
+ EndIf
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ; protein
+ If AppFastEnable = "true" Then
+ Var Menu11Selected = "PressForever"
+ Var Menu7Selected = "Invisible"
+ Var Menu21Selected = "Invisible"
+ Else
+ Var Menu11Selected = "Invisible"
+ Var Menu7Selected = "Invisible"
+ Var Menu21Selected = "PressForever"
+ EndIf
+
+
+ SAVELOG PreviseXMLFileName2
+
+ Var Timeout = 0
+
+
+
+ If show_eng = "true" Then
+ Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+
+ Else
+ Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+ EndIf
+
+ SetInstanceIgnoreTouch
+
+
+
+
+
+
+; notice enable heathy menu
+
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
+ 1000
+
+ ;DEBUGVAR ICE_PROCESS_STATUS
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ GetVisible inst_show
+ ;DEBUGVAR inst_show
+
+ InstanceGetString SaveStringInst
+ ;DEBUGVAR SaveStringInst
+
+ If inst_show = 1 Then
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+
+ If show_eng = "true" Then
+ InstanceSetString "ShowEng"
+ Else
+ InstanceSetString "ShowThai"
+ EndIf
+
+ EndIf
+ EndIf
+
+ ; setvarint SlientRefreshEnable 1
+ ;DEBUGVAR SlientRefreshEnable
+
+ If SlientRefreshEnable = 1 Then
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+
+ If show_eng = "true" Then
+ InstanceSetString "ShowEng"
+ Else
+ InstanceSetString "ShowThai"
+ EndIf
+
+ EndIf
+ EndIf
+
+
+ TimerReset
+
+
+
+ SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 "
+ RefreshAll
+
+
+
+; under line
+
+ 0
+ 494
+ "ROOT/taobin_project/image/page3/tab_line_bottom.png"
+
+
+
+; under line
+
+ 0
+ 358
+ "ROOT/taobin_project/image/page3/bg1.png"
+
+
+
+; back
+
+
+
+
+
+ InstanceGetString SaveStringInst
+ DEBUGVAR SaveStringInst
+ DEBUGVAR show_eng
+
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+
+ If show_eng = "true" Then
+ If SaveStringInst = "ShowThai" Then
+
+ InstanceSetString "ShowEng"
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+ Else
+ If SaveStringInst = "ShowEng" Then
+
+ InstanceSetString "ShowThai"
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+ EndIf
+
+
+
+;
+
+ 1080
+ "auto"
+ 0
+ 395
+
+ "Enable"
+ 896
+ 102
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DEBUGVAR web_ready
+ If web_ready = "true" Then
+ If web_ref = QRCODE99x Then
+
+ Var web_readyOK = web_ready
+ Var web_telnumOK = web_telnum
+
+ Var web_app_prepar = "true"
+
+ ; Handle penetrator
+
+ If Only18 = "true" Then
+
+ Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
+ Else
+
+ Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+ EndIf
+
+ ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+
+ EndIf
+ Else
+ EndIf
+
+
+
+
+
+
+
+
+
+
+
10
497
@@ -1258,7 +1243,7 @@
KanitMediumTTF
0x322B26
showengText
- "BROWN SUGAR
+ "BROWN SUGAR
MILK"
@@ -1505,7 +1490,7 @@ MILK"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำแดงกลิ่นสละ นม
+ "น้ำแดงกลิ่นสละ นม
น้ำตาล "
@@ -2273,7 +2258,7 @@ MILK"
KanitMediumTTF
0x6F5F51
showthaiText
- "นม น้ำเชื่อมสตอเบอร์รี่
+ "นม น้ำเชื่อมสตอเบอร์รี่
โกโก้ และน้ำแข็ง"
@@ -2285,7 +2270,7 @@ MILK"
KanitMediumTTF
0x322B26
showengText
- "STRAWCOCOA
+ "STRAWCOCOA
SMOOTHIE"
@@ -2539,7 +2524,7 @@ SMOOTHIE"
KanitMediumTTF
0x322B26
showengText
- "OVALTINE SMOOTHIE
+ "OVALTINE SMOOTHIE
VOLCANO"
@@ -2793,7 +2778,7 @@ VOLCANO"
KanitMediumTTF
0x322B26
showengText
- "COCOA OVALTINE
+ "COCOA OVALTINE
VOLCANO"
@@ -3542,7 +3527,7 @@ VOLCANO"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำเชื่อมเมล่อน โซดา
+ "น้ำเชื่อมเมล่อน โซดา
และน้ำแข็ง"
@@ -3796,7 +3781,7 @@ VOLCANO"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำเชื่อมยูซุ โซดา
+ "น้ำเชื่อมยูซุ โซดา
และน้ำแข็ง"
@@ -4050,7 +4035,7 @@ VOLCANO"
KanitMediumTTF
0x6F5F51
showthaiText
- "นม น้ำตาล โอรีโอ
+ "นม น้ำตาล โอรีโอ
"
@@ -4062,7 +4047,7 @@ VOLCANO"
KanitMediumTTF
0x322B26
showengText
- "OREO SMOOTHIE
+ "OREO SMOOTHIE
VOLCANO"
@@ -4316,7 +4301,7 @@ VOLCANO"
KanitMediumTTF
0x322B26
showengText
- "TOKYO
+ "TOKYO
BANANA MILK"
@@ -4553,7 +4538,7 @@ BANANA MILK"
KanitMediumTTF
0x322B26
showthaiText
- "นมช็อกโกโตเกียว
+ "นมช็อกโกโตเกียว
บานาน่า"
@@ -4575,7 +4560,7 @@ BANANA MILK"
KanitMediumTTF
0x322B26
showengText
- "CHOCO TOKYO
+ "CHOCO TOKYO
BANANA MILK"
@@ -6345,7 +6330,7 @@ BANANA MILK"
KanitMediumTTF
0x322B26
showthaiText
- "โกโก้
+ "โกโก้
บิสคอฟ"
@@ -6356,7 +6341,7 @@ BANANA MILK"
KanitMediumTTF
0x6F5F51
showthaiText
- "โกโก้ นม น้ำตาล
+ "โกโก้ นม น้ำตาล
บิสคอฟ"
@@ -6368,7 +6353,7 @@ BANANA MILK"
KanitMediumTTF
0x322B26
showengText
- "COCOA MILK
+ "COCOA MILK
BISCOFF VOLCANO"
@@ -6379,7 +6364,7 @@ BISCOFF VOLCANO"
KanitMediumTTF
0x6F5F51
showengText
- "Cocoa, Milk,
+ "Cocoa, Milk,
Sugar, Biscof"
@@ -6523,7 +6508,7 @@ Sugar, Biscof"
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
-
-
-
-
+
+
+
+
diff --git a/xml/menutab/page_catalog_group_health.xml b/xml/menutab/page_catalog_group_health.xml
index 6fe60083..4fce89c5 100644
--- a/xml/menutab/page_catalog_group_health.xml
+++ b/xml/menutab/page_catalog_group_health.xml
@@ -1,611 +1,595 @@
-
-
-
- "Enable"
- 1080
- 1920
-; "0xeae6e1"
- SoundVolume
-
- ; On open
- Var NextPage = "-"
-
- DEBUGVAR ICE_PROCESS_STATUS
- DEBUGVAR ICE_PROCESS_TXT
-
-
- If show_eng = "true" Then
- Var showthaiText = "Invisible"
- Var showengText = "Enable"
- Var DirImage = "ROOT/taobin_project/image/page3_en"
- Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
- Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
-
- Var ice_tab_text = "Ice will be ready at "
- Var text_unavailable = "UNAVAILABLE###size=16"
-
- InstanceSetString "ShowEng"
- Else
- Var showengText = "Invisible"
- Var showthaiText = "Enable"
-
- Var DirImage = "ROOT/taobin_project/image/page3"
- Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
- Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-
- Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
- Var text_unavailable = "หมด###size=32"
-
- InstanceSetString "ShowThai"
- EndIf
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- ; SpiralOnline
-
- Var MenuVSelected2 = "Invisible"
-
- Var Menu1Selected2 = "Invisible"
- Var Menu2Selected2 = "Invisible"
- Var Menu3Selected2 = "Invisible"
- Var Menu4Selected2 = "Invisible"
-
- Var Menu6Selected2 = "Invisible"
- Var Menu7Selected2 = "Invisible"
- Var MenuVSelected2 = "Invisible"
- Var Menu11Selected2 = "Invisible"
-
- Var Menu21Selected2 = "Invisible"
-
- Var MenuVSelected2 = "Invisible"
- If SpiralOnline = "true" Then
- If Seeker = "curr" Then
- Var MenuVSelected2 = "Enable"
- EndIf
- EndIf
-
- ; init default
- Var Menu1Selected = "Enable"
- Var Menu2Selected = "Enable"
- Var Menu3Selected = "Enable"
- Var Menu4Selected = "Enable"
- ; 5 fruit
- Var Menu5Selected = "Invisible"
- ;Var Menu6Selected = "Enable"
-
- Var Menu61Selected = "Enable"
- Var Menu62Selected = "Enable"
-
- Var Menu7Selected = "Enable"
- ; 8 cocktail
- Var Menu8Selected = "Invisible"
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- Var Menu8Selected = "Enable"
- EndIf
-
-
- If AppFastEnable = "true" Then
- Var Menu11Selected = "Enable"
- Var Menu21Selected = "Invisible"
- Var Menu7Selected = "Invisible"
- Else
- If MenuKidEnable = "true" Then
- Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Enable"
- Var Menu7Selected = "Invisible"
- Else
- Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Invisible"
- Var Menu7Selected = "Enable"
- EndIf
- EndIf
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- EndIf
-
- If RecipeTag1 = "HealthTurnOn" Then
- Var Menu22Selected = "Enable"
- Else
- Var Menu22Selected = "Invisible"
- EndIf
- ;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Var Menu22Selected = "PressForever"
-
-
- SAVELOG PreviseXMLFileName2
-
- Var Timeout = 0
-
-
-
- If show_eng = "true" Then
- Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-
- Else
- Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
- EndIf
-
- SetInstanceIgnoreTouch
-
- DEBUGVAR SlientRefreshIndex
-
- If SlientRefreshIndex = 6 Then
- Var SlientRefreshIndex = 7
- EndIf
-
-
-
-
-
-
-; notice enable heathy menu
-
-
- 0
- 380
- 1080
- 1540
- "0xeae6e1"
-
-
-
-
- 1000
-
- ;DEBUGVAR ICE_PROCESS_STATUS
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- GetVisible inst_show6
- ;DEBUGVAR inst_show6
-
-
-
- If inst_show6 = 1 Then
- InstanceGetString SaveStringInst
- ;DEBUGVAR SaveStringInst
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
-
- If show_eng = "true" Then
- InstanceSetString "ShowEng"
- Else
- InstanceSetString "ShowThai"
- EndIf
-
- EndIf
- EndIf
-
- ; setvarint SlientRefreshEnable 1
- ;DEBUGVAR SlientRefreshEnable
-
- If SlientRefreshEnable = 1 Then
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
-
- If show_eng = "true" Then
- InstanceSetString "ShowEng"
- Else
- InstanceSetString "ShowThai"
- EndIf
-
- EndIf
- EndIf
-
- If SlientRefreshIndex = 6 Then
- If inst_show6 = 0 Then
- GetXMLFileNameCurrentRunning CurrentOpenFile6
- Open CurrentOpenFile6
- Else
- Var SlientRefreshIndex = 7
- EndIf
- EndIf
-
-
- TimerReset
-
-
-
- SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 "
- RefreshAll
-
-
-
-; under line
-
- 0
- 494
- "ROOT/taobin_project/image/page3/tab_line_bottom.png"
-
-
-
-; under line
-
- 0
- 358
- "ROOT/taobin_project/image/page3/bg1.png"
-
-
-
-; back
-
-
-
-
-
- InstanceGetString SaveStringInst
- DEBUGVAR SaveStringInst
- DEBUGVAR show_eng
-
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
-
- If show_eng = "true" Then
- If SaveStringInst = "ShowThai" Then
-
- InstanceSetString "ShowEng"
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
- Else
- If SaveStringInst = "ShowEng" Then
-
- InstanceSetString "ShowThai"
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
- EndIf
-
-
-
-;
-
- 1080
- "auto"
- 0
- 395
-
- "Enable"
- 896
- 102
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- DEBUGVAR web_ready
- If web_ready = "true" Then
- If web_ref = QRCODE99x Then
-
- Var web_readyOK = web_ready
- Var web_telnumOK = web_telnum
-
- Var web_app_prepar = "true"
-
- ; Handle penetrator
-
- If Only18 = "true" Then
-
- Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
- Else
-
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
- EndIf
-
- ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
-
- EndIf
- Else
- EndIf
-
-
-
-
-
-
-
+
+
+
+ "Enable"
+ 1080
+ 1920
+; "0xeae6e1"
+ SoundVolume
+
+ ; On open
+ Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
+
+ If show_eng = "true" Then
+ Var showthaiText = "Invisible"
+ Var showengText = "Enable"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
+
+ Var ice_tab_text = "Ice will be ready at "
+ Var text_unavailable = "UNAVAILABLE###size=16"
+
+ InstanceSetString "ShowEng"
+ Else
+ Var showengText = "Invisible"
+ Var showthaiText = "Enable"
+
+ Var DirImage = "ROOT/taobin_project/image/page3"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
+ Var text_unavailable = "หมด###size=32"
+
+ InstanceSetString "ShowThai"
+ EndIf
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ ; SpiralOnline
+
+ Var MenuVSelected2 = "Invisible"
+
+ Var Menu1Selected2 = "Invisible"
+ Var Menu2Selected2 = "Invisible"
+ Var Menu3Selected2 = "Invisible"
+ Var Menu4Selected2 = "Invisible"
+
+ Var Menu6Selected2 = "Invisible"
+ Var Menu7Selected2 = "Invisible"
+ Var MenuVSelected2 = "Invisible"
+ Var Menu11Selected2 = "Invisible"
+
+ Var Menu21Selected2 = "Invisible"
+
+ Var MenuVSelected2 = "Invisible"
+ If SpiralOnline = "true" Then
+ If Seeker = "curr" Then
+ Var MenuVSelected2 = "Enable"
+ EndIf
+ EndIf
+
+ ; init default
+ Var Menu1Selected = "Enable"
+ Var Menu2Selected = "Enable"
+ Var Menu3Selected = "Enable"
+ Var Menu4Selected = "Enable"
+ ; 5 fruit
+ Var Menu5Selected = "Invisible"
+ ;Var Menu6Selected = "Enable"
+
+ Var Menu61Selected = "Enable"
+ Var Menu62Selected = "Enable"
+
+ Var Menu7Selected = "Enable"
+ ; 8 cocktail
+ Var Menu8Selected = "Invisible"
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ Var Menu8Selected = "Enable"
+ EndIf
+
+
+ If AppFastEnable = "true" Then
+ Var Menu11Selected = "Enable"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Invisible"
+ Else
+ If MenuKidEnable = "true" Then
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Enable"
+ Var Menu7Selected = "Invisible"
+ Else
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Enable"
+ EndIf
+ EndIf
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ EndIf
+
+ If RecipeTag1 = "HealthTurnOn" Then
+ Var Menu22Selected = "Enable"
+ Else
+ Var Menu22Selected = "Invisible"
+ EndIf
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Var Menu22Selected = "PressForever"
+
+
+ SAVELOG PreviseXMLFileName2
+
+ Var Timeout = 0
+
+
+
+ If show_eng = "true" Then
+ Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+
+ Else
+ Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+ EndIf
+
+ SetInstanceIgnoreTouch
+
+
+
+
+
+
+; notice enable heathy menu
+
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
+ 1000
+
+ ;DEBUGVAR ICE_PROCESS_STATUS
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ GetVisible inst_show
+ ;DEBUGVAR inst_show
+
+ InstanceGetString SaveStringInst
+ ;DEBUGVAR SaveStringInst
+
+ If inst_show = 1 Then
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+
+ If show_eng = "true" Then
+ InstanceSetString "ShowEng"
+ Else
+ InstanceSetString "ShowThai"
+ EndIf
+
+ EndIf
+ EndIf
+
+ ; setvarint SlientRefreshEnable 1
+ ;DEBUGVAR SlientRefreshEnable
+
+ If SlientRefreshEnable = 1 Then
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+
+ If show_eng = "true" Then
+ InstanceSetString "ShowEng"
+ Else
+ InstanceSetString "ShowThai"
+ EndIf
+
+ EndIf
+ EndIf
+
+
+ TimerReset
+
+
+
+ SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 "
+ RefreshAll
+
+
+
+; under line
+
+ 0
+ 494
+ "ROOT/taobin_project/image/page3/tab_line_bottom.png"
+
+
+
+; under line
+
+ 0
+ 358
+ "ROOT/taobin_project/image/page3/bg1.png"
+
+
+
+; back
+
+
+
+
+
+ InstanceGetString SaveStringInst
+ DEBUGVAR SaveStringInst
+ DEBUGVAR show_eng
+
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+
+ If show_eng = "true" Then
+ If SaveStringInst = "ShowThai" Then
+
+ InstanceSetString "ShowEng"
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+ Else
+ If SaveStringInst = "ShowEng" Then
+
+ InstanceSetString "ShowThai"
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+ EndIf
+
+
+
+;
+
+ 1080
+ "auto"
+ 0
+ 395
+
+ "Enable"
+ 896
+ 102
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DEBUGVAR web_ready
+ If web_ready = "true" Then
+ If web_ref = QRCODE99x Then
+
+ Var web_readyOK = web_ready
+ Var web_telnumOK = web_telnum
+
+ Var web_app_prepar = "true"
+
+ ; Handle penetrator
+
+ If Only18 = "true" Then
+
+ Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
+ Else
+
+ Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+ EndIf
+
+ ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+
+ EndIf
+ Else
+ EndIf
+
+
+
+
+
+
+
10
497
@@ -721,7 +705,7 @@
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟ และน้ำร้อน
+ "กาแฟ และน้ำร้อน
(อเมริกาโน)"
@@ -977,7 +961,7 @@
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟ และน้ำร้อน
+ "กาแฟ และน้ำร้อน
(อเมริกาโน)"
@@ -1255,7 +1239,7 @@
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Milk,
+ "Espresso, Milk,
Foamed milk"
@@ -1511,7 +1495,7 @@ Foamed milk"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Milk,
+ "Espresso, Milk,
Foamed milk"
@@ -1747,7 +1731,7 @@ Foamed milk"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟ นม ผสมช็อกโกแลต
+ "กาแฟ นม ผสมช็อกโกแลต
น้ำตาล"
@@ -1769,7 +1753,7 @@ Foamed milk"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Cocoa,
+ "Espresso, Cocoa,
Milk, Sugar"
@@ -2004,7 +1988,7 @@ Milk, Sugar"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟ นม ผสมช็อกโกแลต
+ "กาแฟ นม ผสมช็อกโกแลต
น้ำตาล"
@@ -2026,7 +2010,7 @@ Milk, Sugar"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Cocoa,
+ "Espresso, Cocoa,
Milk, Sugar"
@@ -2283,7 +2267,7 @@ Milk, Sugar"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Milk,
+ "Espresso, Milk,
Foamed milk"
@@ -2539,7 +2523,7 @@ Foamed milk"
KanitMediumTTF
0x6F5F51
showengText
- "Espresso, Milk,
+ "Espresso, Milk,
Foamed milk"
@@ -3043,7 +3027,7 @@ Foamed milk"
KanitMediumTTF
0x322B26
showengText
- "TAIWANESE
+ "TAIWANESE
MILK TEA"
@@ -3054,7 +3038,7 @@ MILK TEA"
KanitMediumTTF
0x6F5F51
showengText
- "Taiwanese Tea, Sugar,
+ "Taiwanese Tea, Sugar,
and Milk"
@@ -4073,7 +4057,7 @@ and Milk"
KanitMediumTTF
0x322B26
showengText
- "THAI TEA
+ "THAI TEA
LIMENADE"
@@ -4567,7 +4551,7 @@ LIMENADE"
KanitMediumTTF
0x322B26
showthaiText
- "ชาดำไต้หวัน
+ "ชาดำไต้หวัน
มะนาว"
@@ -4589,7 +4573,7 @@ LIMENADE"
KanitMediumTTF
0x322B26
showengText
- "TAIWANESE
+ "TAIWANESE
LBLACK TEA"
@@ -4600,7 +4584,7 @@ LBLACK TEA"
KanitMediumTTF
0x6F5F51
showengText
- "Taiwan tea, Limenade,
+ "Taiwan tea, Limenade,
Water, and Ice"
@@ -5876,7 +5860,7 @@ Water, and Ice"
KanitMediumTTF
0x322B26
showengText
- "ICED LIMENADE
+ "ICED LIMENADE
SODA"
@@ -9581,7 +9565,7 @@ SODA"
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
-
-
-
-
+
+
+
+
diff --git a/xml/menutab/page_catalog_group_milk.xml b/xml/menutab/page_catalog_group_milk.xml
index 8de84915..3ef516d8 100644
--- a/xml/menutab/page_catalog_group_milk.xml
+++ b/xml/menutab/page_catalog_group_milk.xml
@@ -1,613 +1,595 @@
-
-
-
- "Enable"
- 1080
- 1920
-; "0xeae6e1"
- SoundVolume
-
- ; On open
- Var NextPage = "-"
-
- DEBUGVAR ICE_PROCESS_STATUS
- DEBUGVAR ICE_PROCESS_TXT
-
-
- If show_eng = "true" Then
- Var showthaiText = "Invisible"
- Var showengText = "Enable"
- Var DirImage = "ROOT/taobin_project/image/page3_en"
- Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
- Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
-
- Var ice_tab_text = "Ice will be ready at "
- Var text_unavailable = "UNAVAILABLE###size=16"
-
- InstanceSetString "ShowEng"
- Else
- Var showengText = "Invisible"
- Var showthaiText = "Enable"
-
- Var DirImage = "ROOT/taobin_project/image/page3"
- Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
- Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-
- Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
- Var text_unavailable = "หมด###size=32"
-
- InstanceSetString "ShowThai"
- EndIf
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- ; SpiralOnline
-
- Var MenuVSelected2 = "Invisible"
-
- Var Menu1Selected2 = "Invisible"
- Var Menu2Selected2 = "Invisible"
- Var Menu3Selected2 = "Invisible"
- Var Menu4Selected2 = "Invisible"
-
- Var Menu6Selected2 = "Invisible"
- Var Menu7Selected2 = "Invisible"
- Var MenuVSelected2 = "Invisible"
- Var Menu11Selected2 = "Invisible"
-
- Var Menu21Selected2 = "Invisible"
-
- Var MenuVSelected2 = "Invisible"
- If SpiralOnline = "true" Then
- If Seeker = "curr" Then
- Var MenuVSelected2 = "Enable"
- EndIf
- EndIf
-
- ; init default
- Var Menu1Selected = "Enable"
- Var Menu2Selected = "Enable"
- Var Menu3Selected = "Enable"
- Var Menu4Selected = "Enable"
- ; 5 fruit
- Var Menu5Selected = "Invisible"
- ;Var Menu6Selected = "Enable"
-
- Var Menu61Selected = "Enable"
- Var Menu62Selected = "Enable"
-
- Var Menu7Selected = "Enable"
- ; 8 cocktail
- Var Menu8Selected = "Invisible"
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- Var Menu8Selected = "Enable"
- EndIf
-
-
- If AppFastEnable = "true" Then
- Var Menu11Selected = "Enable"
- Var Menu21Selected = "Invisible"
- Var Menu7Selected = "Invisible"
- Else
- If MenuKidEnable = "true" Then
- Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Enable"
- Var Menu7Selected = "Invisible"
- Else
- Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Invisible"
- Var Menu7Selected = "Enable"
- EndIf
- EndIf
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- EndIf
-
- If RecipeTag1 = "HealthTurnOn" Then
- Var Menu22Selected = "Enable"
- Else
- Var Menu22Selected = "Invisible"
- EndIf
- ;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Var Menu4Selected = "PressForever"
-
- SAVELOG PreviseXMLFileName2
-
- Var Timeout = 0
-
-
-
- If show_eng = "true" Then
- Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-
- Else
- Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
- EndIf
-
- SetInstanceIgnoreTouch
-
- DEBUGVAR SlientRefreshIndex
-
- If SlientRefreshIndex = 4 Then
- Var SlientRefreshIndex = 5
- EndIf
-
-
-
-
-
-; notice enable heathy menu
-
-
- 0
- 380
- 1080
- 1540
- "0xeae6e1"
-
-
-
-
- 1000
-
- ;DEBUGVAR ICE_PROCESS_STATUS
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- GetVisible inst_show4
- ;DEBUGVAR inst_show4
-
-
-
- If inst_show4 = 1 Then
- InstanceGetString SaveStringInst
- ;DEBUGVAR SaveStringInst
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
-
- If show_eng = "true" Then
- InstanceSetString "ShowEng"
- Else
- InstanceSetString "ShowThai"
- EndIf
-
- EndIf
- EndIf
-
- ; setvarint SlientRefreshEnable 1
- ;DEBUGVAR SlientRefreshEnable
-
- If SlientRefreshEnable = 1 Then
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
-
- If show_eng = "true" Then
- InstanceSetString "ShowEng"
- Else
- InstanceSetString "ShowThai"
- EndIf
-
- EndIf
- EndIf
-
- If SlientRefreshIndex = 4 Then
- If inst_show4 = 0 Then
- GetXMLFileNameCurrentRunning CurrentOpenFile4
- Open CurrentOpenFile4
-
- Else
- Var SlientRefreshIndex = 5
-
- EndIf
- EndIf
-
-
- TimerReset
-
-
-
- SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 "
- RefreshAll
-
-
-
-; under line
-
- 0
- 494
- "ROOT/taobin_project/image/page3/tab_line_bottom.png"
-
-
-
-; under line
-
- 0
- 358
- "ROOT/taobin_project/image/page3/bg1.png"
-
-
-
-; back
-
-
-
-
-
- InstanceGetString SaveStringInst
- DEBUGVAR SaveStringInst
- DEBUGVAR show_eng
-
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
-
- If show_eng = "true" Then
- If SaveStringInst = "ShowThai" Then
-
- InstanceSetString "ShowEng"
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
- Else
- If SaveStringInst = "ShowEng" Then
-
- InstanceSetString "ShowThai"
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
- EndIf
-
-
-
-;
-
- 1080
- "auto"
- 0
- 395
-
- "Enable"
- 896
- 102
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- DEBUGVAR web_ready
- If web_ready = "true" Then
- If web_ref = QRCODE99x Then
-
- Var web_readyOK = web_ready
- Var web_telnumOK = web_telnum
-
- Var web_app_prepar = "true"
-
- ; Handle penetrator
-
- If Only18 = "true" Then
-
- Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
- Else
-
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
- EndIf
-
- ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
-
- EndIf
- Else
- EndIf
-
-
-
-
-
-
-
-
-
+
+
+
+ "Enable"
+ 1080
+ 1920
+; "0xeae6e1"
+ SoundVolume
+
+ ; On open
+ Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
+
+ If show_eng = "true" Then
+ Var showthaiText = "Invisible"
+ Var showengText = "Enable"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
+
+ Var ice_tab_text = "Ice will be ready at "
+ Var text_unavailable = "UNAVAILABLE###size=16"
+
+ InstanceSetString "ShowEng"
+ Else
+ Var showengText = "Invisible"
+ Var showthaiText = "Enable"
+
+ Var DirImage = "ROOT/taobin_project/image/page3"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
+ Var text_unavailable = "หมด###size=32"
+
+ InstanceSetString "ShowThai"
+ EndIf
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ ; SpiralOnline
+
+ Var MenuVSelected2 = "Invisible"
+
+ Var Menu1Selected2 = "Invisible"
+ Var Menu2Selected2 = "Invisible"
+ Var Menu3Selected2 = "Invisible"
+ Var Menu4Selected2 = "Invisible"
+
+ Var Menu6Selected2 = "Invisible"
+ Var Menu7Selected2 = "Invisible"
+ Var MenuVSelected2 = "Invisible"
+ Var Menu11Selected2 = "Invisible"
+
+ Var Menu21Selected2 = "Invisible"
+
+ Var MenuVSelected2 = "Invisible"
+ If SpiralOnline = "true" Then
+ If Seeker = "curr" Then
+ Var MenuVSelected2 = "Enable"
+ EndIf
+ EndIf
+
+ ; init default
+ Var Menu1Selected = "Enable"
+ Var Menu2Selected = "Enable"
+ Var Menu3Selected = "Enable"
+ Var Menu4Selected = "Enable"
+ ; 5 fruit
+ Var Menu5Selected = "Invisible"
+ ;Var Menu6Selected = "Enable"
+
+ Var Menu61Selected = "Enable"
+ Var Menu62Selected = "Enable"
+
+ Var Menu7Selected = "Enable"
+ ; 8 cocktail
+ Var Menu8Selected = "Invisible"
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ Var Menu8Selected = "Enable"
+ EndIf
+
+
+ If AppFastEnable = "true" Then
+ Var Menu11Selected = "Enable"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Invisible"
+ Else
+ If MenuKidEnable = "true" Then
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Enable"
+ Var Menu7Selected = "Invisible"
+ Else
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Enable"
+ EndIf
+ EndIf
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ EndIf
+
+ If RecipeTag1 = "HealthTurnOn" Then
+ Var Menu22Selected = "Enable"
+ Else
+ Var Menu22Selected = "Invisible"
+ EndIf
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Var Menu4Selected = "PressForever"
+
+ SAVELOG PreviseXMLFileName2
+
+ Var Timeout = 0
+
+
+
+ If show_eng = "true" Then
+ Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+
+ Else
+ Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+ EndIf
+
+ SetInstanceIgnoreTouch
+
+
+
+
+
+; notice enable heathy menu
+
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
+ 1000
+
+ ;DEBUGVAR ICE_PROCESS_STATUS
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ GetVisible inst_show
+ ;DEBUGVAR inst_show
+
+ InstanceGetString SaveStringInst
+ ;DEBUGVAR SaveStringInst
+
+ If inst_show = 1 Then
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+
+ If show_eng = "true" Then
+ InstanceSetString "ShowEng"
+ Else
+ InstanceSetString "ShowThai"
+ EndIf
+
+ EndIf
+ EndIf
+
+ ; setvarint SlientRefreshEnable 1
+ ;DEBUGVAR SlientRefreshEnable
+
+ If SlientRefreshEnable = 1 Then
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+
+ If show_eng = "true" Then
+ InstanceSetString "ShowEng"
+ Else
+ InstanceSetString "ShowThai"
+ EndIf
+
+ EndIf
+ EndIf
+
+
+ TimerReset
+
+
+
+ SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 "
+ RefreshAll
+
+
+
+; under line
+
+ 0
+ 494
+ "ROOT/taobin_project/image/page3/tab_line_bottom.png"
+
+
+
+; under line
+
+ 0
+ 358
+ "ROOT/taobin_project/image/page3/bg1.png"
+
+
+
+; back
+
+
+
+
+
+ InstanceGetString SaveStringInst
+ DEBUGVAR SaveStringInst
+ DEBUGVAR show_eng
+
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+
+ If show_eng = "true" Then
+ If SaveStringInst = "ShowThai" Then
+
+ InstanceSetString "ShowEng"
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+ Else
+ If SaveStringInst = "ShowEng" Then
+
+ InstanceSetString "ShowThai"
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+ EndIf
+
+
+
+;
+
+ 1080
+ "auto"
+ 0
+ 395
+
+ "Enable"
+ 896
+ 102
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DEBUGVAR web_ready
+ If web_ready = "true" Then
+ If web_ref = QRCODE99x Then
+
+ Var web_readyOK = web_ready
+ Var web_telnumOK = web_telnum
+
+ Var web_app_prepar = "true"
+
+ ; Handle penetrator
+
+ If Only18 = "true" Then
+
+ Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
+ Else
+
+ Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+ EndIf
+
+ ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+
+ EndIf
+ Else
+ EndIf
+
+
+
+
+
+
+
+
+
10
497
@@ -1237,7 +1219,7 @@
KanitMediumTTF
0x6F5F51
showthaiText
- "โกโก้ นม น้ำตาล
+ "โกโก้ นม น้ำตาล
น้ำเชื่อมคาราเมล"
@@ -1259,7 +1241,7 @@
KanitMediumTTF
0x6F5F51
showengText
- "Cocoa, Milk,Sugar,
+ "Cocoa, Milk,Sugar,
Caramel Syrup"
@@ -1507,7 +1489,7 @@ Caramel Syrup"
KanitMediumTTF
0x322B26
showengText
- "BROWN SUGAR
+ "BROWN SUGAR
MILK"
@@ -1754,7 +1736,7 @@ MILK"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำแดงกลิ่นสละ นม
+ "น้ำแดงกลิ่นสละ นม
น้ำตาล "
@@ -2771,7 +2753,7 @@ MILK"
KanitMediumTTF
0x6F5F51
showthaiText
- "นม น้ำเชื่อมสตอเบอร์รี่
+ "นม น้ำเชื่อมสตอเบอร์รี่
โกโก้ และน้ำแข็ง"
@@ -2783,7 +2765,7 @@ MILK"
KanitMediumTTF
0x322B26
showengText
- "STRAWCOCOA
+ "STRAWCOCOA
SMOOTHIE"
@@ -3026,7 +3008,7 @@ SMOOTHIE"
KanitMediumTTF
0x6F5F51
showthaiText
- "นม น้ำเชื่อมสตอเบอร์รี่
+ "นม น้ำเชื่อมสตอเบอร์รี่
และน้ำแข็ง"
@@ -3038,7 +3020,7 @@ SMOOTHIE"
KanitMediumTTF
0x322B26
showengText
- "STRAWMILK
+ "STRAWMILK
SMOOTHIE"
@@ -3281,7 +3263,7 @@ SMOOTHIE"
KanitMediumTTF
0x6F5F51
showthaiText
- "นม น้ำตาล โอรีโอ
+ "นม น้ำตาล โอรีโอ
"
@@ -3293,7 +3275,7 @@ SMOOTHIE"
KanitMediumTTF
0x322B26
showengText
- "OREO SMOOTHIE
+ "OREO SMOOTHIE
VOLCANO"
@@ -3804,7 +3786,7 @@ VOLCANO"
KanitMediumTTF
0x322B26
showengText
- "OVALTINE SMOOTHIE
+ "OVALTINE SMOOTHIE
VOLCANO"
@@ -4047,7 +4029,7 @@ VOLCANO"
KanitMediumTTF
0x6F5F51
showthaiText
- "นม น้ำตาล โอรีโอ
+ "นม น้ำตาล โอรีโอ
"
@@ -4059,7 +4041,7 @@ VOLCANO"
KanitMediumTTF
0x322B26
showengText
- "SUPER OREO
+ "SUPER OREO
VOLCANO"
@@ -4313,7 +4295,7 @@ VOLCANO"
KanitMediumTTF
0x322B26
showengText
- "COCOA OVALTINE
+ "COCOA OVALTINE
VOLCANO"
@@ -5060,7 +5042,7 @@ VOLCANO"
KanitMediumTTF
0x322B26
showthaiText
- "นมชมพูปั่น
+ "นมชมพูปั่น
โอรีโอภูเขาไฟ"
@@ -5071,7 +5053,7 @@ VOLCANO"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำแดงกลิ่นสละ นม น้ำตาล
+ "น้ำแดงกลิ่นสละ นม น้ำตาล
Oreo"
@@ -5083,7 +5065,7 @@ VOLCANO"
KanitMediumTTF
0x322B26
showengText
- "PINK MILK
+ "PINK MILK
OREO VOLCANO"
@@ -5094,7 +5076,7 @@ OREO VOLCANO"
KanitMediumTTF
0x6F5F51
showengText
- "Salak Syrup, Milk,
+ "Salak Syrup, Milk,
Sugar Oreo"
@@ -5338,7 +5320,7 @@ Sugar Oreo"
KanitMediumTTF
0x322B26
showengText
- "TOKYO
+ "TOKYO
BANANA MILK"
@@ -5575,7 +5557,7 @@ BANANA MILK"
KanitMediumTTF
0x322B26
showthaiText
- "นมช็อกโกโตเกียว
+ "นมช็อกโกโตเกียว
บานาน่า"
@@ -5597,7 +5579,7 @@ BANANA MILK"
KanitMediumTTF
0x322B26
showengText
- "CHOCO TOKYO
+ "CHOCO TOKYO
BANANA MILK"
@@ -5844,7 +5826,7 @@ BANANA MILK"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำเชื่อมมินต์ นม น้ำตาล
+ "น้ำเชื่อมมินต์ นม น้ำตาล
Oreo"
@@ -5856,7 +5838,7 @@ BANANA MILK"
KanitMediumTTF
0x322B26
showengText
- "MINT
+ "MINT
OREO VOLCANO"
@@ -5867,7 +5849,7 @@ OREO VOLCANO"
KanitMediumTTF
0x6F5F51
showengText
- "Mint Syrup, Milk,
+ "Mint Syrup, Milk,
Sugar, Oreo"
@@ -6121,7 +6103,7 @@ Sugar, Oreo"
KanitMediumTTF
0x6F5F51
showengText
- "Mint Syrup, Milk,
+ "Mint Syrup, Milk,
Sugar, Cocoa"
@@ -6626,7 +6608,7 @@ Sugar, Cocoa"
KanitMediumTTF
0x322B26
showengText
- "STRAWBERRY
+ "STRAWBERRY
MINT MILK"
@@ -6637,7 +6619,7 @@ MINT MILK"
KanitMediumTTF
0x6F5F51
showengText
- "Mint Syrup, Milk,
+ "Mint Syrup, Milk,
Strawberry Syrup"
@@ -7148,7 +7130,7 @@ Strawberry Syrup"
KanitMediumTTF
0x6F5F51
showengText
- "Peach Syrup, Milk,
+ "Peach Syrup, Milk,
Sugar, Cocoa"
@@ -7381,7 +7363,7 @@ Sugar, Cocoa"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำเชื่อมพีช นม น้ำตาล
+ "น้ำเชื่อมพีช นม น้ำตาล
Oreo"
@@ -7403,7 +7385,7 @@ Sugar, Cocoa"
KanitMediumTTF
0x6F5F51
showengText
- "Peach Syrup, Milk,
+ "Peach Syrup, Milk,
Sugar, Oreo"
@@ -7626,7 +7608,7 @@ Sugar, Oreo"
KanitMediumTTF
0x322B26
showthaiText
- "นมคาราเมล
+ "นมคาราเมล
บิสคอฟ"
@@ -7637,7 +7619,7 @@ Sugar, Oreo"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำเชื่อมคาราเมล นม น้ำตาล
+ "น้ำเชื่อมคาราเมล นม น้ำตาล
บิสคอฟ"
@@ -7649,7 +7631,7 @@ Sugar, Oreo"
KanitMediumTTF
0x322B26
showengText
- "CARAMEL MILK
+ "CARAMEL MILK
BISCOFF VOLCANO"
@@ -7660,7 +7642,7 @@ BISCOFF VOLCANO"
KanitMediumTTF
0x6F5F51
showengText
- "Caramel Syrup, Milk,
+ "Caramel Syrup, Milk,
Sugar, Biscof"
@@ -7883,7 +7865,7 @@ Sugar, Biscof"
KanitMediumTTF
0x322B26
showthaiText
- "นมสตรอเบอร์รี่
+ "นมสตรอเบอร์รี่
บิสคอฟ"
@@ -7894,7 +7876,7 @@ Sugar, Biscof"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำเชื่อมสตรอเบอร์รี่ นม น้ำตาล
+ "น้ำเชื่อมสตรอเบอร์รี่ นม น้ำตาล
บิสคอฟ"
@@ -7906,7 +7888,7 @@ Sugar, Biscof"
KanitMediumTTF
0x322B26
showengText
- "STRAWBERRY MILK
+ "STRAWBERRY MILK
BISCOFF VOLCANO"
@@ -7917,7 +7899,7 @@ BISCOFF VOLCANO"
KanitMediumTTF
0x6F5F51
showengText
- "Strawberry Syrup, Milk,
+ "Strawberry Syrup, Milk,
Sugar, Biscof"
@@ -8140,7 +8122,7 @@ Sugar, Biscof"
KanitMediumTTF
0x322B26
showthaiText
- "นมมินต์
+ "นมมินต์
บิสคอฟ"
@@ -8151,7 +8133,7 @@ Sugar, Biscof"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำเชื่อมมินต์ นม น้ำตาล
+ "น้ำเชื่อมมินต์ นม น้ำตาล
บิสคอฟ"
@@ -8163,7 +8145,7 @@ Sugar, Biscof"
KanitMediumTTF
0x322B26
showengText
- "Mint MILK
+ "Mint MILK
BISCOFF VOLCANO"
@@ -8174,7 +8156,7 @@ BISCOFF VOLCANO"
KanitMediumTTF
0x6F5F51
showengText
- "Mint Syrup, Milk,
+ "Mint Syrup, Milk,
Sugar, Biscof"
@@ -8397,7 +8379,7 @@ Sugar, Biscof"
KanitMediumTTF
0x322B26
showthaiText
- "โกโก้
+ "โกโก้
บิสคอฟ"
@@ -8408,7 +8390,7 @@ Sugar, Biscof"
KanitMediumTTF
0x6F5F51
showthaiText
- "โกโก้ นม น้ำตาล
+ "โกโก้ นม น้ำตาล
บิสคอฟ"
@@ -8420,7 +8402,7 @@ Sugar, Biscof"
KanitMediumTTF
0x322B26
showengText
- "COCOA MILK
+ "COCOA MILK
BISCOFF VOLCANO"
@@ -8431,7 +8413,7 @@ BISCOFF VOLCANO"
KanitMediumTTF
0x6F5F51
showengText
- "Cocoa, Milk,
+ "Cocoa, Milk,
Sugar, Biscof"
@@ -8654,7 +8636,7 @@ Sugar, Biscof"
KanitMediumTTF
0x322B26
showthaiText
- "มะพร้าวน้ำหอมปั่น
+ "มะพร้าวน้ำหอมปั่น
นมนิวซีแลนด์"
@@ -8686,7 +8668,7 @@ Sugar, Biscof"
KanitMediumTTF
0x6F5F51
showengText
- "Coconut syrup, Milk,
+ "Coconut syrup, Milk,
Water"
@@ -8909,7 +8891,7 @@ Water"
KanitMediumTTF
0x322B26
showthaiText
- "มะพร้าวโกโก้ปั่น
+ "มะพร้าวโกโก้ปั่น
นมนิวซีแลนด์"
@@ -8941,7 +8923,7 @@ Water"
KanitMediumTTF
0x6F5F51
showengText
- "Coconut syrup, Cocoa, Milk,
+ "Coconut syrup, Cocoa, Milk,
Water"
@@ -9085,14 +9067,14 @@ Water"
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
-
-
-
-
-
-
- RefreshAll
-
-
-
-
+
+
+
+
+
+
+ RefreshAll
+
+
+
+
diff --git a/xml/menutab/page_catalog_group_other.xml b/xml/menutab/page_catalog_group_other.xml
index fde09d6f..2d4e9de1 100644
--- a/xml/menutab/page_catalog_group_other.xml
+++ b/xml/menutab/page_catalog_group_other.xml
@@ -1,616 +1,597 @@
-
-
-
- "Enable"
- 1080
- 1920
-; "0xeae6e1"
- SoundVolume
-
- ; On open
- Var NextPage = "-"
-
- DEBUGVAR ICE_PROCESS_STATUS
- DEBUGVAR ICE_PROCESS_TXT
-
-
- If show_eng = "true" Then
- Var showthaiText = "Invisible"
- Var showengText = "Enable"
- Var DirImage = "ROOT/taobin_project/image/page3_en"
- Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
- Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
-
- Var ice_tab_text = "Ice will be ready at "
- Var text_unavailable = "UNAVAILABLE###size=16"
-
- InstanceSetString "ShowEng"
- Else
- Var showengText = "Invisible"
- Var showthaiText = "Enable"
-
- Var DirImage = "ROOT/taobin_project/image/page3"
- Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
- Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-
- Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
- Var text_unavailable = "หมด###size=32"
-
- InstanceSetString "ShowThai"
- EndIf
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- ; SpiralOnline
-
- Var MenuVSelected2 = "Invisible"
-
- Var Menu1Selected2 = "Invisible"
- Var Menu2Selected2 = "Invisible"
- Var Menu3Selected2 = "Invisible"
- Var Menu4Selected2 = "Invisible"
-
- Var Menu6Selected2 = "Invisible"
- Var Menu7Selected2 = "Invisible"
- Var MenuVSelected2 = "Invisible"
- Var Menu11Selected2 = "Invisible"
-
- Var Menu21Selected2 = "Invisible"
-
- Var MenuVSelected2 = "Invisible"
- If SpiralOnline = "true" Then
- If Seeker = "curr" Then
- Var MenuVSelected2 = "Enable"
- EndIf
- EndIf
-
- ; init default
- Var Menu1Selected = "Enable"
- Var Menu2Selected = "Enable"
- Var Menu3Selected = "Enable"
- Var Menu4Selected = "Enable"
- ; 5 fruit
- Var Menu5Selected = "Invisible"
- ;Var Menu6Selected = "Enable"
-
- Var Menu61Selected = "Enable"
- Var Menu62Selected = "Enable"
-
- Var Menu7Selected = "Enable"
- ; 8 cocktail
- Var Menu8Selected = "Invisible"
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- Var Menu8Selected = "Enable"
- EndIf
-
-
- If AppFastEnable = "true" Then
- Var Menu11Selected = "Enable"
- Var Menu21Selected = "Invisible"
- Var Menu7Selected = "Invisible"
- Else
- If MenuKidEnable = "true" Then
- Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Enable"
- Var Menu7Selected = "Invisible"
- Else
- Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Invisible"
- Var Menu7Selected = "Enable"
- EndIf
- EndIf
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- EndIf
-
- If RecipeTag1 = "HealthTurnOn" Then
- Var Menu22Selected = "Enable"
- Else
- Var Menu22Selected = "Invisible"
- EndIf
- ;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ; soda and other
- Var Menu6Selected = "PressForever"
-
- SAVELOG PreviseXMLFileName2
-
- Var Timeout = 0
-
-
-
- If show_eng = "true" Then
- Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-
- Else
- Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
- EndIf
-
- SetInstanceIgnoreTouch
-
-
- DEBUGVAR SlientRefreshIndex
-
- If SlientRefreshIndex = 7 Then
- Var SlientRefreshIndex = 8
- EndIf
-
-
-
-
-
-
-; notice enable heathy menu
-
-
- 0
- 380
- 1080
- 1540
- "0xeae6e1"
-
-
-
-
- 1000
-
- ;DEBUGVAR ICE_PROCESS_STATUS
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- GetVisible inst_show7
- ;DEBUGVAR inst_show7
-
-
-
- If inst_show7 = 1 Then
- InstanceGetString SaveStringInst
- ;DEBUGVAR SaveStringInst
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
-
- If show_eng = "true" Then
- InstanceSetString "ShowEng"
- Else
- InstanceSetString "ShowThai"
- EndIf
-
- EndIf
- EndIf
-
- ; setvarint SlientRefreshEnable 1
- ;DEBUGVAR SlientRefreshEnable
-
- If SlientRefreshEnable = 1 Then
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
-
- If show_eng = "true" Then
- InstanceSetString "ShowEng"
- Else
- InstanceSetString "ShowThai"
- EndIf
-
- EndIf
- EndIf
-
-
- If SlientRefreshIndex = 7 Then
- If inst_show7 = 0 Then
- GetXMLFileNameCurrentRunning CurrentOpenFile7
- Open CurrentOpenFile7
- Else
- Var SlientRefreshIndex = 8
- EndIf
- EndIf
-
-
- TimerReset
-
-
-
- SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 "
- RefreshAll
-
-
-
-; under line
-
- 0
- 494
- "ROOT/taobin_project/image/page3/tab_line_bottom.png"
-
-
-
-; under line
-
- 0
- 358
- "ROOT/taobin_project/image/page3/bg1.png"
-
-
-
-; back
-
-
-
-
-
- InstanceGetString SaveStringInst
- DEBUGVAR SaveStringInst
- DEBUGVAR show_eng
-
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
-
- If show_eng = "true" Then
- If SaveStringInst = "ShowThai" Then
-
- InstanceSetString "ShowEng"
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
- Else
- If SaveStringInst = "ShowEng" Then
-
- InstanceSetString "ShowThai"
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
- EndIf
-
-
-
-;
-
- 1080
- "auto"
- 0
- 395
-
- "Enable"
- 896
- 102
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- DEBUGVAR web_ready
- If web_ready = "true" Then
- If web_ref = QRCODE99x Then
-
- Var web_readyOK = web_ready
- Var web_telnumOK = web_telnum
-
- Var web_app_prepar = "true"
-
- ; Handle penetrator
-
- If Only18 = "true" Then
-
- Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
- Else
-
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
- EndIf
-
- ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
-
- EndIf
- Else
- EndIf
-
-
-
-
-
-
-
-
-
-
+
+
+
+ "Enable"
+ 1080
+ 1920
+; "0xeae6e1"
+ SoundVolume
+
+ ; On open
+ Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
+
+ If show_eng = "true" Then
+ Var showthaiText = "Invisible"
+ Var showengText = "Enable"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
+
+ Var ice_tab_text = "Ice will be ready at "
+ Var text_unavailable = "UNAVAILABLE###size=16"
+
+ InstanceSetString "ShowEng"
+ Else
+ Var showengText = "Invisible"
+ Var showthaiText = "Enable"
+
+ Var DirImage = "ROOT/taobin_project/image/page3"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
+ Var text_unavailable = "หมด###size=32"
+
+ InstanceSetString "ShowThai"
+ EndIf
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ ; SpiralOnline
+
+ Var MenuVSelected2 = "Invisible"
+
+ Var Menu1Selected2 = "Invisible"
+ Var Menu2Selected2 = "Invisible"
+ Var Menu3Selected2 = "Invisible"
+ Var Menu4Selected2 = "Invisible"
+
+ Var Menu6Selected2 = "Invisible"
+ Var Menu7Selected2 = "Invisible"
+ Var MenuVSelected2 = "Invisible"
+ Var Menu11Selected2 = "Invisible"
+
+ Var Menu21Selected2 = "Invisible"
+
+ Var MenuVSelected2 = "Invisible"
+ If SpiralOnline = "true" Then
+ If Seeker = "curr" Then
+ Var MenuVSelected2 = "Enable"
+ EndIf
+ EndIf
+
+ ; init default
+ Var Menu1Selected = "Enable"
+ Var Menu2Selected = "Enable"
+ Var Menu3Selected = "Enable"
+ Var Menu4Selected = "Enable"
+ ; 5 fruit
+ Var Menu5Selected = "Invisible"
+ ;Var Menu6Selected = "Enable"
+
+ Var Menu61Selected = "Enable"
+ Var Menu62Selected = "Enable"
+
+ Var Menu7Selected = "Enable"
+ ; 8 cocktail
+ Var Menu8Selected = "Invisible"
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ Var Menu8Selected = "Enable"
+ EndIf
+
+
+ If AppFastEnable = "true" Then
+ Var Menu11Selected = "Enable"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Invisible"
+ Else
+ If MenuKidEnable = "true" Then
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Enable"
+ Var Menu7Selected = "Invisible"
+ Else
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Enable"
+ EndIf
+ EndIf
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ EndIf
+
+ If RecipeTag1 = "HealthTurnOn" Then
+ Var Menu22Selected = "Enable"
+ Else
+ Var Menu22Selected = "Invisible"
+ EndIf
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ; soda and other
+ Var Menu6Selected = "PressForever"
+
+ SAVELOG PreviseXMLFileName2
+
+ Var Timeout = 0
+
+
+
+ If show_eng = "true" Then
+ Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+
+ Else
+ Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+ EndIf
+
+ SetInstanceIgnoreTouch
+
+
+
+
+
+; notice enable heathy menu
+
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
+ 1000
+
+ ;DEBUGVAR ICE_PROCESS_STATUS
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ GetVisible inst_show
+ ;DEBUGVAR inst_show
+
+ InstanceGetString SaveStringInst
+ ;DEBUGVAR SaveStringInst
+
+ If inst_show = 1 Then
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+
+ If show_eng = "true" Then
+ InstanceSetString "ShowEng"
+ Else
+ InstanceSetString "ShowThai"
+ EndIf
+
+ EndIf
+ EndIf
+
+ ; setvarint SlientRefreshEnable 1
+ ;DEBUGVAR SlientRefreshEnable
+
+ If SlientRefreshEnable = 1 Then
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+
+ If show_eng = "true" Then
+ InstanceSetString "ShowEng"
+ Else
+ InstanceSetString "ShowThai"
+ EndIf
+
+ EndIf
+ EndIf
+
+
+ TimerReset
+
+
+
+ SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 "
+ RefreshAll
+
+
+
+; under line
+
+ 0
+ 494
+ "ROOT/taobin_project/image/page3/tab_line_bottom.png"
+
+
+
+; under line
+
+ 0
+ 358
+ "ROOT/taobin_project/image/page3/bg1.png"
+
+
+
+; back
+
+
+
+
+
+ InstanceGetString SaveStringInst
+ DEBUGVAR SaveStringInst
+ DEBUGVAR show_eng
+
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+
+ If show_eng = "true" Then
+ If SaveStringInst = "ShowThai" Then
+
+ InstanceSetString "ShowEng"
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+ Else
+ If SaveStringInst = "ShowEng" Then
+
+ InstanceSetString "ShowThai"
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+ EndIf
+
+
+
+;
+
+ 1080
+ "auto"
+ 0
+ 395
+
+ "Enable"
+ 896
+ 102
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DEBUGVAR web_ready
+ If web_ready = "true" Then
+ If web_ref = QRCODE99x Then
+
+ Var web_readyOK = web_ready
+ Var web_telnumOK = web_telnum
+
+ Var web_app_prepar = "true"
+
+ ; Handle penetrator
+
+ If Only18 = "true" Then
+
+ Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
+ Else
+
+ Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+ EndIf
+
+ ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+
+ EndIf
+ Else
+ EndIf
+
+
+
+
+
+
+
+
+
+
10
497
@@ -1485,7 +1466,7 @@
KanitMediumTTF
0x6F5F51
showthaiText
- "เครื่องดื่มเต่าทรงพลัง โซดา
+ "เครื่องดื่มเต่าทรงพลัง โซดา
(มีคาเฟอีน)"
@@ -1497,7 +1478,7 @@
KanitMediumTTF
0x322B26
showengText
- "TAO POWER
+ "TAO POWER
DRINK SODA"
@@ -1730,7 +1711,7 @@ DRINK SODA"
KanitMediumTTF
0x322B26
showthaiText
- "เซเว่นอัพชูกำลัง
+ "เซเว่นอัพชูกำลัง
บ๊วยโซดา"
@@ -1752,7 +1733,7 @@ DRINK SODA"
KanitMediumTTF
0x322B26
showengText
- "7UP TAO POWER
+ "7UP TAO POWER
PLUM SODA"
@@ -1995,7 +1976,7 @@ PLUM SODA"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำเชื่อมเมล่อน โซดา
+ "น้ำเชื่อมเมล่อน โซดา
และน้ำแข็ง"
@@ -2249,7 +2230,7 @@ PLUM SODA"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำเชื่อมยูซุ โซดา
+ "น้ำเชื่อมยูซุ โซดา
และน้ำแข็ง"
@@ -2514,7 +2495,7 @@ PLUM SODA"
KanitMediumTTF
0x322B26
showengText
- "LIMENADE
+ "LIMENADE
SODA"
@@ -3010,7 +2991,7 @@ SODA"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำเชื่อมลิ้นจี่ มะนาว
+ "น้ำเชื่อมลิ้นจี่ มะนาว
โซดา "
@@ -3022,7 +3003,7 @@ SODA"
KanitMediumTTF
0x322B26
showengText
- "LYCHEE
+ "LYCHEE
LIMENADE SODA"
@@ -3033,7 +3014,7 @@ LIMENADE SODA"
KanitMediumTTF
0x6F5F51
showengText
- "Lychee Syrup,
+ "Lychee Syrup,
Limenade, Soda & Ice"
@@ -3256,7 +3237,7 @@ Limenade, Soda & Ice"
KanitMediumTTF
0x322B26
showthaiText
- "เซเว่นอัพลิ้นจี่
+ "เซเว่นอัพลิ้นจี่
มะนาวโซดา"
@@ -4290,7 +4271,7 @@ Limenade, Soda & Ice"
KanitMediumTTF
0x322B26
showengText
- "LIME
+ "LIME
SALAK SODA"
@@ -4301,7 +4282,7 @@ SALAK SODA"
KanitMediumTTF
0x6F5F51
showengText
- "Salak Syrup, Limenade,
+ "Salak Syrup, Limenade,
Soda & Ice"
@@ -4524,7 +4505,7 @@ Soda & Ice"
KanitMediumTTF
0x322B26
showthaiText
- "เซเว่นอัพสละ
+ "เซเว่นอัพสละ
มะนาวโซดา"
@@ -5052,7 +5033,7 @@ Soda & Ice"
KanitMediumTTF
0x322B26
showengText
- "PLUM
+ "PLUM
LIMENADE SODA"
@@ -5063,7 +5044,7 @@ LIMENADE SODA"
KanitMediumTTF
0x6F5F51
showengText
- "Ume Syrup, Limenade,
+ "Ume Syrup, Limenade,
Soda & Ice"
@@ -6045,7 +6026,7 @@ Soda & Ice"
KanitMediumTTF
0x322B26
showthaiText
- "เซเว่นอัพบ๊วย
+ "เซเว่นอัพบ๊วย
มะนาวโซดา"
@@ -6299,7 +6280,7 @@ Soda & Ice"
KanitMediumTTF
0x322B26
showthaiText
- "เซเว่นอัพ
+ "เซเว่นอัพ
สตรอเบอรี่ร์บ๊วยโซดา"
@@ -6321,7 +6302,7 @@ Soda & Ice"
KanitMediumTTF
0x322B26
showengText
- "7UP PLUM
+ "7UP PLUM
STRAWBERRY LIME"
@@ -8072,7 +8053,7 @@ STRAWBERRY LIME"
KanitMediumTTF
0x322B26
showthaiText
- "เซเว่นอัพยูซุ
+ "เซเว่นอัพยูซุ
มะนาวโซดา"
@@ -9359,7 +9340,7 @@ STRAWBERRY LIME"
KanitMediumTTF
0x322B26
showengText
- "GINGER LIME
+ "GINGER LIME
SODA"
@@ -9866,7 +9847,7 @@ SODA"
KanitMediumTTF
0x322B26
showengText
- "GINGER LIME
+ "GINGER LIME
SODA"
@@ -10352,7 +10333,7 @@ SODA"
KanitMediumTTF
0x322B26
showthaiText
- "เซเว่นอัพมินต์
+ "เซเว่นอัพมินต์
มะนาวโซดา"
@@ -10606,7 +10587,7 @@ SODA"
KanitMediumTTF
0x322B26
showthaiText
- "สตรอเบอร์รี่
+ "สตรอเบอร์รี่
มินต์โซดา"
@@ -10628,7 +10609,7 @@ SODA"
KanitMediumTTF
0x322B26
showengText
- "STRAWBERRY
+ "STRAWBERRY
MINT SODA"
@@ -11114,7 +11095,7 @@ MINT SODA"
KanitMediumTTF
0x322B26
showthaiText
- "บ๊วยมะนาว
+ "บ๊วยมะนาว
มินต์โซดา"
@@ -11136,7 +11117,7 @@ MINT SODA"
KanitMediumTTF
0x322B26
showengText
- "PLUM LIMENADE
+ "PLUM LIMENADE
MINT SODA"
@@ -11369,7 +11350,7 @@ MINT SODA"
KanitMediumTTF
0x322B26
showthaiText
- "มินต์ลิ้นจี่
+ "มินต์ลิ้นจี่
มะนาวโซดา"
@@ -11391,7 +11372,7 @@ MINT SODA"
KanitMediumTTF
0x322B26
showengText
- "MINT LYCHEE
+ "MINT LYCHEE
LEMON SODA"
@@ -14660,7 +14641,7 @@ LEMON SODA"
KanitMediumTTF
0x322B26
showthaiText
- "มะพร้าวน้ำหอม
+ "มะพร้าวน้ำหอม
ลิ้นจี่โซดา"
@@ -14682,7 +14663,7 @@ LEMON SODA"
KanitMediumTTF
0x322B26
showengText
- "Coconut
+ "Coconut
Lychee Soda"
@@ -15684,7 +15665,7 @@ Lychee Soda"
KanitMediumTTF
0x6F5F51
showthaiText
- "เครื่องดื่มเต่าทรงพลัง
+ "เครื่องดื่มเต่าทรงพลัง
(มีคาเฟอีน)"
@@ -15938,7 +15919,7 @@ Lychee Soda"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำแดงกลิ่นสละ น้ำมะนาว
+ "น้ำแดงกลิ่นสละ น้ำมะนาว
"
@@ -15960,7 +15941,7 @@ Lychee Soda"
KanitMediumTTF
0x6F5F51
showengText
- "Salak Syrup, Limenade,
+ "Salak Syrup, Limenade,
Water & Ice"
@@ -16214,7 +16195,7 @@ Water & Ice"
KanitMediumTTF
0x6F5F51
showengText
- "Lychee Syrup, Sugar,
+ "Lychee Syrup, Sugar,
Water & Ice"
@@ -16447,7 +16428,7 @@ Water & Ice"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำแดงกลิ่นสละ
+ "น้ำแดงกลิ่นสละ
"
@@ -16701,7 +16682,7 @@ Water & Ice"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำเชื่อมสตอเบอร์รี่ น้ำ
+ "น้ำเชื่อมสตอเบอร์รี่ น้ำ
"
@@ -16723,7 +16704,7 @@ Water & Ice"
KanitMediumTTF
0x6F5F51
showengText
- "Strawberry Syrup,
+ "Strawberry Syrup,
Water & Ice"
@@ -17487,7 +17468,7 @@ Water & Ice"
KanitMediumTTF
0x6F5F51
showengText
- "Lychee Syrup, Sugar,
+ "Lychee Syrup, Sugar,
Water & Ice"
@@ -17741,7 +17722,7 @@ Water & Ice"
KanitMediumTTF
0x6F5F51
showengText
- "Strawberry Syrup,
+ "Strawberry Syrup,
Water, Ice"
@@ -18237,7 +18218,7 @@ Water, Ice"
KanitMediumTTF
0x322B26
showengText
- "CONGEE WITH
+ "CONGEE WITH
PLANT PROTEIN"
@@ -19415,7 +19396,7 @@ PLANT PROTEIN"
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
-
-
-
-
+
+
+
+
diff --git a/xml/menutab/page_catalog_group_pepsi_7up.xml b/xml/menutab/page_catalog_group_pepsi_7up.xml
index a2c3371d..74bd522e 100644
--- a/xml/menutab/page_catalog_group_pepsi_7up.xml
+++ b/xml/menutab/page_catalog_group_pepsi_7up.xml
@@ -1,613 +1,596 @@
-
-
-
- "Enable"
- 1080
- 1920
-; "0xeae6e1"
- SoundVolume
-
- ; On open
- Var NextPage = "-"
-
- DEBUGVAR ICE_PROCESS_STATUS
- DEBUGVAR ICE_PROCESS_TXT
-
-
- If show_eng = "true" Then
- Var showthaiText = "Invisible"
- Var showengText = "Enable"
- Var DirImage = "ROOT/taobin_project/image/page3_en"
- Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
- Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
-
- Var ice_tab_text = "Ice will be ready at "
- Var text_unavailable = "UNAVAILABLE###size=16"
-
- InstanceSetString "ShowEng"
- Else
- Var showengText = "Invisible"
- Var showthaiText = "Enable"
-
- Var DirImage = "ROOT/taobin_project/image/page3"
- Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
- Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-
- Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
- Var text_unavailable = "หมด###size=32"
-
- InstanceSetString "ShowThai"
- EndIf
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- ; SpiralOnline
-
- Var MenuVSelected2 = "Invisible"
-
- Var Menu1Selected2 = "Invisible"
- Var Menu2Selected2 = "Invisible"
- Var Menu3Selected2 = "Invisible"
- Var Menu4Selected2 = "Invisible"
-
- Var Menu6Selected2 = "Invisible"
- Var Menu7Selected2 = "Invisible"
- Var MenuVSelected2 = "Invisible"
- Var Menu11Selected2 = "Invisible"
-
- Var Menu21Selected2 = "Invisible"
-
- Var MenuVSelected2 = "Invisible"
- If SpiralOnline = "true" Then
- If Seeker = "curr" Then
- Var MenuVSelected2 = "Enable"
- EndIf
- EndIf
-
- ; init default
- Var Menu1Selected = "Enable"
- Var Menu2Selected = "Enable"
- Var Menu3Selected = "Enable"
- Var Menu4Selected = "Enable"
- ; 5 fruit
- Var Menu5Selected = "Invisible"
- ;Var Menu6Selected = "Enable"
-
- Var Menu61Selected = "Enable"
- Var Menu62Selected = "Enable"
-
- Var Menu7Selected = "Enable"
- ; 8 cocktail
- Var Menu8Selected = "Invisible"
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- Var Menu8Selected = "Enable"
- EndIf
-
-
- If AppFastEnable = "true" Then
- Var Menu11Selected = "Enable"
- Var Menu21Selected = "Invisible"
- Var Menu7Selected = "Invisible"
- Else
- If MenuKidEnable = "true" Then
- Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Enable"
- Var Menu7Selected = "Invisible"
- Else
- Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Invisible"
- Var Menu7Selected = "Enable"
- EndIf
- EndIf
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- EndIf
-
- If RecipeTag1 = "HealthTurnOn" Then
- Var Menu22Selected = "Enable"
- Else
- Var Menu22Selected = "Invisible"
- EndIf
- ;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ; pepsi 7up
- Var Menu61Selected = "PressForever"
-
- SAVELOG PreviseXMLFileName2
-
- Var Timeout = 0
-
-
-
- If show_eng = "true" Then
- Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-
- Else
- Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
- EndIf
-
- SetInstanceIgnoreTouch
-
- DEBUGVAR SlientRefreshIndex
-
- If SlientRefreshIndex = 9 Then
- Var SlientRefreshIndex = 0
- EndIf
-
-
-
-
-
-; notice enable heathy menu
-
-
- 0
- 380
- 1080
- 1540
- "0xeae6e1"
-
-
-
-
- 1000
-
- ;DEBUGVAR ICE_PROCESS_STATUS
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- GetVisible inst_show9
- ;DEBUGVAR inst_show9
-
-
-
- If inst_show9 = 1 Then
- InstanceGetString SaveStringInst
- ;DEBUGVAR SaveStringInst
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
-
- If show_eng = "true" Then
- InstanceSetString "ShowEng"
- Else
- InstanceSetString "ShowThai"
- EndIf
-
- EndIf
- EndIf
-
- ; setvarint SlientRefreshEnable 1
- ;DEBUGVAR SlientRefreshEnable
-
- If SlientRefreshEnable = 1 Then
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
-
- If show_eng = "true" Then
- InstanceSetString "ShowEng"
- Else
- InstanceSetString "ShowThai"
- EndIf
-
- EndIf
- EndIf
-
-
- If SlientRefreshIndex = 9 Then
- If inst_show9 = 0 Then
- GetXMLFileNameCurrentRunning CurrentOpenFile5
- Open CurrentOpenFile5
- Else
- Var SlientRefreshIndex = 0
- EndIf
- EndIf
-
-
- TimerReset
-
-
-
- SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 "
- RefreshAll
-
-
-
-; under line
-
- 0
- 494
- "ROOT/taobin_project/image/page3/tab_line_bottom.png"
-
-
-
-; under line
-
- 0
- 358
- "ROOT/taobin_project/image/page3/bg1.png"
-
-
-
-; back
-
-
-
-
-
- InstanceGetString SaveStringInst
- DEBUGVAR SaveStringInst
- DEBUGVAR show_eng
-
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
-
- If show_eng = "true" Then
- If SaveStringInst = "ShowThai" Then
-
- InstanceSetString "ShowEng"
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
- Else
- If SaveStringInst = "ShowEng" Then
-
- InstanceSetString "ShowThai"
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
- EndIf
-
-
-
-;
-
- 1080
- "auto"
- 0
- 395
-
- "Enable"
- 896
- 102
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- DEBUGVAR web_ready
- If web_ready = "true" Then
- If web_ref = QRCODE99x Then
-
- Var web_readyOK = web_ready
- Var web_telnumOK = web_telnum
-
- Var web_app_prepar = "true"
-
- ; Handle penetrator
-
- If Only18 = "true" Then
-
- Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
- Else
-
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
- EndIf
-
- ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
-
- EndIf
- Else
- EndIf
-
-
-
-
-
-
-
-
-
+
+
+
+ "Enable"
+ 1080
+ 1920
+; "0xeae6e1"
+ SoundVolume
+
+ ; On open
+ Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
+
+ If show_eng = "true" Then
+ Var showthaiText = "Invisible"
+ Var showengText = "Enable"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
+
+ Var ice_tab_text = "Ice will be ready at "
+ Var text_unavailable = "UNAVAILABLE###size=16"
+
+ InstanceSetString "ShowEng"
+ Else
+ Var showengText = "Invisible"
+ Var showthaiText = "Enable"
+
+ Var DirImage = "ROOT/taobin_project/image/page3"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
+ Var text_unavailable = "หมด###size=32"
+
+ InstanceSetString "ShowThai"
+ EndIf
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ ; SpiralOnline
+
+ Var MenuVSelected2 = "Invisible"
+
+ Var Menu1Selected2 = "Invisible"
+ Var Menu2Selected2 = "Invisible"
+ Var Menu3Selected2 = "Invisible"
+ Var Menu4Selected2 = "Invisible"
+
+ Var Menu6Selected2 = "Invisible"
+ Var Menu7Selected2 = "Invisible"
+ Var MenuVSelected2 = "Invisible"
+ Var Menu11Selected2 = "Invisible"
+
+ Var Menu21Selected2 = "Invisible"
+
+ Var MenuVSelected2 = "Invisible"
+ If SpiralOnline = "true" Then
+ If Seeker = "curr" Then
+ Var MenuVSelected2 = "Enable"
+ EndIf
+ EndIf
+
+ ; init default
+ Var Menu1Selected = "Enable"
+ Var Menu2Selected = "Enable"
+ Var Menu3Selected = "Enable"
+ Var Menu4Selected = "Enable"
+ ; 5 fruit
+ Var Menu5Selected = "Invisible"
+ ;Var Menu6Selected = "Enable"
+
+ Var Menu61Selected = "Enable"
+ Var Menu62Selected = "Enable"
+
+ Var Menu7Selected = "Enable"
+ ; 8 cocktail
+ Var Menu8Selected = "Invisible"
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ Var Menu8Selected = "Enable"
+ EndIf
+
+
+ If AppFastEnable = "true" Then
+ Var Menu11Selected = "Enable"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Invisible"
+ Else
+ If MenuKidEnable = "true" Then
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Enable"
+ Var Menu7Selected = "Invisible"
+ Else
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Enable"
+ EndIf
+ EndIf
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ EndIf
+
+ If RecipeTag1 = "HealthTurnOn" Then
+ Var Menu22Selected = "Enable"
+ Else
+ Var Menu22Selected = "Invisible"
+ EndIf
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ; pepsi 7up
+ Var Menu61Selected = "PressForever"
+
+ SAVELOG PreviseXMLFileName2
+
+ Var Timeout = 0
+
+
+
+ If show_eng = "true" Then
+ Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+
+ Else
+ Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+ EndIf
+
+ SetInstanceIgnoreTouch
+
+
+
+
+
+; notice enable heathy menu
+
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
+ 1000
+
+ ;DEBUGVAR ICE_PROCESS_STATUS
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ GetVisible inst_show
+ ;DEBUGVAR inst_show
+
+ InstanceGetString SaveStringInst
+ ;DEBUGVAR SaveStringInst
+
+ If inst_show = 1 Then
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+
+ If show_eng = "true" Then
+ InstanceSetString "ShowEng"
+ Else
+ InstanceSetString "ShowThai"
+ EndIf
+
+ EndIf
+ EndIf
+
+ ; setvarint SlientRefreshEnable 1
+ ;DEBUGVAR SlientRefreshEnable
+
+ If SlientRefreshEnable = 1 Then
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+
+ If show_eng = "true" Then
+ InstanceSetString "ShowEng"
+ Else
+ InstanceSetString "ShowThai"
+ EndIf
+
+ EndIf
+ EndIf
+
+
+ TimerReset
+
+
+
+ SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 "
+ RefreshAll
+
+
+
+; under line
+
+ 0
+ 494
+ "ROOT/taobin_project/image/page3/tab_line_bottom.png"
+
+
+
+; under line
+
+ 0
+ 358
+ "ROOT/taobin_project/image/page3/bg1.png"
+
+
+
+; back
+
+
+
+
+
+ InstanceGetString SaveStringInst
+ DEBUGVAR SaveStringInst
+ DEBUGVAR show_eng
+
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+
+ If show_eng = "true" Then
+ If SaveStringInst = "ShowThai" Then
+
+ InstanceSetString "ShowEng"
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+ Else
+ If SaveStringInst = "ShowEng" Then
+
+ InstanceSetString "ShowThai"
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+ EndIf
+
+
+
+;
+
+ 1080
+ "auto"
+ 0
+ 395
+
+ "Enable"
+ 896
+ 102
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DEBUGVAR web_ready
+ If web_ready = "true" Then
+ If web_ref = QRCODE99x Then
+
+ Var web_readyOK = web_ready
+ Var web_telnumOK = web_telnum
+
+ Var web_app_prepar = "true"
+
+ ; Handle penetrator
+
+ If Only18 = "true" Then
+
+ Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
+ Else
+
+ Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+ EndIf
+
+ ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+
+ EndIf
+ Else
+ EndIf
+
+
+
+
+
+
+
+
+
10
497
@@ -1472,7 +1455,7 @@
KanitMediumTTF
0x322B26
showthaiText
- "เซเว่นอัพชูกำลัง
+ "เซเว่นอัพชูกำลัง
บ๊วยโซดา"
@@ -1494,7 +1477,7 @@
KanitMediumTTF
0x322B26
showengText
- "7UP TAO POWER
+ "7UP TAO POWER
PLUM SODA"
@@ -1727,7 +1710,7 @@ PLUM SODA"
KanitMediumTTF
0x322B26
showthaiText
- "เซเว่นอัพลิ้นจี่
+ "เซเว่นอัพลิ้นจี่
มะนาวโซดา"
@@ -1981,7 +1964,7 @@ PLUM SODA"
KanitMediumTTF
0x322B26
showthaiText
- "เซเว่นอัพสละ
+ "เซเว่นอัพสละ
มะนาวโซดา"
@@ -2994,7 +2977,7 @@ PLUM SODA"
KanitMediumTTF
0x322B26
showthaiText
- "เซเว่นอัพบ๊วย
+ "เซเว่นอัพบ๊วย
มะนาวโซดา"
@@ -3248,7 +3231,7 @@ PLUM SODA"
KanitMediumTTF
0x322B26
showthaiText
- "เซเว่นอัพ
+ "เซเว่นอัพ
สตรอเบอรี่ร์บ๊วยโซดา"
@@ -3270,7 +3253,7 @@ PLUM SODA"
KanitMediumTTF
0x322B26
showengText
- "7UP PLUM
+ "7UP PLUM
STRAWBERRY LIME"
@@ -5021,7 +5004,7 @@ STRAWBERRY LIME"
KanitMediumTTF
0x322B26
showthaiText
- "เซเว่นอัพยูซุ
+ "เซเว่นอัพยูซุ
มะนาวโซดา"
@@ -6034,7 +6017,7 @@ STRAWBERRY LIME"
KanitMediumTTF
0x322B26
showthaiText
- "เซเว่นอัพมินต์
+ "เซเว่นอัพมินต์
มะนาวโซดา"
@@ -7980,14 +7963,14 @@ STRAWBERRY LIME"
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
-
-
-
-
-
-
- RefreshAll
-
-
-
-
+
+
+
+
+
+
+ RefreshAll
+
+
+
+
diff --git a/xml/menutab/page_catalog_group_tea.xml b/xml/menutab/page_catalog_group_tea.xml
index 1b076d28..3c39ee2c 100644
--- a/xml/menutab/page_catalog_group_tea.xml
+++ b/xml/menutab/page_catalog_group_tea.xml
@@ -1,605 +1,600 @@
-
-
-
- "Enable"
- 1080
- 1920
-; "0xeae6e1"
- SoundVolume
-
- ; On open
- Var NextPage = "-"
-
- DEBUGVAR ICE_PROCESS_STATUS
- DEBUGVAR ICE_PROCESS_TXT
-
-
- If show_eng = "true" Then
- Var showthaiText = "Invisible"
- Var showengText = "Enable"
- Var DirImage = "ROOT/taobin_project/image/page3_en"
- Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
- Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
-
- Var ice_tab_text = "Ice will be ready at "
- Var text_unavailable = "UNAVAILABLE###size=16"
-
- InstanceSetString "ShowEng"
- Else
- Var showengText = "Invisible"
- Var showthaiText = "Enable"
-
- Var DirImage = "ROOT/taobin_project/image/page3"
- Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
- Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-
- Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
- Var text_unavailable = "หมด###size=32"
-
- InstanceSetString "ShowThai"
- EndIf
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- ; SpiralOnline
-
- Var MenuVSelected2 = "Invisible"
-
- Var Menu1Selected2 = "Invisible"
- Var Menu2Selected2 = "Invisible"
- Var Menu3Selected2 = "Invisible"
- Var Menu4Selected2 = "Invisible"
-
- Var Menu6Selected2 = "Invisible"
- Var Menu7Selected2 = "Invisible"
- Var MenuVSelected2 = "Invisible"
- Var Menu11Selected2 = "Invisible"
-
- Var Menu21Selected2 = "Invisible"
-
- Var MenuVSelected2 = "Invisible"
- If SpiralOnline = "true" Then
- If Seeker = "curr" Then
- Var MenuVSelected2 = "Enable"
- EndIf
- EndIf
-
- ; init default
- Var Menu1Selected = "Enable"
- Var Menu2Selected = "Enable"
- Var Menu3Selected = "Enable"
- Var Menu4Selected = "Enable"
- ; 5 fruit
- Var Menu5Selected = "Invisible"
- ;Var Menu6Selected = "Enable"
-
- Var Menu61Selected = "Enable"
- Var Menu62Selected = "Enable"
-
- Var Menu7Selected = "Enable"
- ; 8 cocktail
- Var Menu8Selected = "Invisible"
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- Var Menu8Selected = "Enable"
- EndIf
-
-
- If AppFastEnable = "true" Then
- Var Menu11Selected = "Enable"
- Var Menu21Selected = "Invisible"
- Var Menu7Selected = "Invisible"
- Else
- If MenuKidEnable = "true" Then
- Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Enable"
- Var Menu7Selected = "Invisible"
- Else
- Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Invisible"
- Var Menu7Selected = "Enable"
- EndIf
- EndIf
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- EndIf
-
- If RecipeTag1 = "HealthTurnOn" Then
- Var Menu22Selected = "Enable"
- Else
- Var Menu22Selected = "Invisible"
- EndIf
- ;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Var Menu3Selected = "PressForever"
-
-
- SAVELOG PreviseXMLFileName2
-
- Var Timeout = 0
-
-
-
- If show_eng = "true" Then
- Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-
- Else
- Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
- EndIf
-
- SetInstanceIgnoreTouch
-
- DEBUGVAR SlientRefreshIndex
-
- If SlientRefreshIndex = 3 Then
- Var SlientRefreshIndex = 4
-
- EndIf
-
-
-
-
-
-
-; notice enable heathy menu
-
-
- 0
- 380
- 1080
- 1540
- "0xeae6e1"
-
-
-
-
- 1000
-
- ;DEBUGVAR ICE_PROCESS_STATUS
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- GetVisible inst_show3
- ;DEBUGVAR inst_show3
-
-
-
- If inst_show3 = 1 Then
- InstanceGetString SaveStringInst
- ;DEBUGVAR SaveStringInst
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
-
- If show_eng = "true" Then
- InstanceSetString "ShowEng"
- Else
- InstanceSetString "ShowThai"
- EndIf
-
- EndIf
-
- EndIf
-
- ; setvarint SlientRefreshEnable 1
- ;DEBUGVAR SlientRefreshEnable
-
- If SlientRefreshIndex = 3 Then
- If inst_show3 = 0 Then
- GetXMLFileNameCurrentRunning CurrentOpenFile3
- Open CurrentOpenFile3
- Else
- Var SlientRefreshIndex = 4
-
- EndIf
- EndIf
-
-
- TimerReset
-
-
-
- SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 "
- RefreshAll
-
-
-
-; under line
-
- 0
- 494
- "ROOT/taobin_project/image/page3/tab_line_bottom.png"
-
-
-
-; under line
-
- 0
- 358
- "ROOT/taobin_project/image/page3/bg1.png"
-
-
-
-; back
-
-
-
-
-
- InstanceGetString SaveStringInst
- DEBUGVAR SaveStringInst
- DEBUGVAR show_eng
-
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
-
- If show_eng = "true" Then
- If SaveStringInst = "ShowThai" Then
-
- InstanceSetString "ShowEng"
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
- Else
- If SaveStringInst = "ShowEng" Then
-
- InstanceSetString "ShowThai"
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
- EndIf
-
-
-
-;
-
- 1080
- "auto"
- 0
- 395
-
- "Enable"
- 896
- 102
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- DEBUGVAR web_ready
- If web_ready = "true" Then
- If web_ref = QRCODE99x Then
-
- Var web_readyOK = web_ready
- Var web_telnumOK = web_telnum
-
- Var web_app_prepar = "true"
-
- ; Handle penetrator
-
- If Only18 = "true" Then
-
- Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
- Else
-
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
- EndIf
-
- ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
-
- EndIf
- Else
- EndIf
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+ "Enable"
+ 1080
+ 1920
+; "0xeae6e1"
+ SoundVolume
+
+ ; On open
+ Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
+
+ If show_eng = "true" Then
+ Var showthaiText = "Invisible"
+ Var showengText = "Enable"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
+
+ Var ice_tab_text = "Ice will be ready at "
+ Var text_unavailable = "UNAVAILABLE###size=16"
+
+ InstanceSetString "ShowEng"
+ Else
+ Var showengText = "Invisible"
+ Var showthaiText = "Enable"
+
+ Var DirImage = "ROOT/taobin_project/image/page3"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
+ Var text_unavailable = "หมด###size=32"
+
+ InstanceSetString "ShowThai"
+ EndIf
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ ; SpiralOnline
+
+ Var MenuVSelected2 = "Invisible"
+
+ Var Menu1Selected2 = "Invisible"
+ Var Menu2Selected2 = "Invisible"
+ Var Menu3Selected2 = "Invisible"
+ Var Menu4Selected2 = "Invisible"
+
+ Var Menu6Selected2 = "Invisible"
+ Var Menu7Selected2 = "Invisible"
+ Var MenuVSelected2 = "Invisible"
+ Var Menu11Selected2 = "Invisible"
+
+ Var Menu21Selected2 = "Invisible"
+
+ Var MenuVSelected2 = "Invisible"
+ If SpiralOnline = "true" Then
+ If Seeker = "curr" Then
+ Var MenuVSelected2 = "Enable"
+ EndIf
+ EndIf
+
+ ; init default
+ Var Menu1Selected = "Enable"
+ Var Menu2Selected = "Enable"
+ Var Menu3Selected = "Enable"
+ Var Menu4Selected = "Enable"
+ ; 5 fruit
+ Var Menu5Selected = "Invisible"
+ ;Var Menu6Selected = "Enable"
+
+ Var Menu61Selected = "Enable"
+ Var Menu62Selected = "Enable"
+
+ Var Menu7Selected = "Enable"
+ ; 8 cocktail
+ Var Menu8Selected = "Invisible"
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ Var Menu8Selected = "Enable"
+ EndIf
+
+
+ If AppFastEnable = "true" Then
+ Var Menu11Selected = "Enable"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Invisible"
+ Else
+ If MenuKidEnable = "true" Then
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Enable"
+ Var Menu7Selected = "Invisible"
+ Else
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Enable"
+ EndIf
+ EndIf
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ EndIf
+
+ If RecipeTag1 = "HealthTurnOn" Then
+ Var Menu22Selected = "Enable"
+ Else
+ Var Menu22Selected = "Invisible"
+ EndIf
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Var Menu3Selected = "PressForever"
+
+
+ SAVELOG PreviseXMLFileName2
+
+ Var Timeout = 0
+
+
+
+ If show_eng = "true" Then
+ Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+
+ Else
+ Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+ EndIf
+
+ SetInstanceIgnoreTouch
+
+
+
+
+
+
+; notice enable heathy menu
+
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
+ 1000
+
+ ;DEBUGVAR ICE_PROCESS_STATUS
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ GetVisible inst_show
+ ;DEBUGVAR inst_show
+
+ InstanceGetString SaveStringInst
+ ;DEBUGVAR SaveStringInst
+
+ If inst_show = 1 Then
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+
+ If show_eng = "true" Then
+ InstanceSetString "ShowEng"
+ Else
+ InstanceSetString "ShowThai"
+ EndIf
+
+ EndIf
+ EndIf
+
+ ; setvarint SlientRefreshEnable 1
+ ;DEBUGVAR SlientRefreshEnable
+
+ If SlientRefreshEnable = 1 Then
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+
+ If show_eng = "true" Then
+ InstanceSetString "ShowEng"
+ Else
+ InstanceSetString "ShowThai"
+ EndIf
+
+ EndIf
+ EndIf
+
+
+ TimerReset
+
+
+
+ SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 "
+ RefreshAll
+
+
+
+; under line
+
+ 0
+ 494
+ "ROOT/taobin_project/image/page3/tab_line_bottom.png"
+
+
+
+; under line
+
+ 0
+ 358
+ "ROOT/taobin_project/image/page3/bg1.png"
+
+
+
+; back
+
+
+
+
+
+ InstanceGetString SaveStringInst
+ DEBUGVAR SaveStringInst
+ DEBUGVAR show_eng
+
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+
+ If show_eng = "true" Then
+ If SaveStringInst = "ShowThai" Then
+
+ InstanceSetString "ShowEng"
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+ Else
+ If SaveStringInst = "ShowEng" Then
+
+ InstanceSetString "ShowThai"
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+ EndIf
+
+
+
+;
+
+ 1080
+ "auto"
+ 0
+ 395
+
+ "Enable"
+ 896
+ 102
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DEBUGVAR web_ready
+ If web_ready = "true" Then
+ If web_ref = QRCODE99x Then
+
+ Var web_readyOK = web_ready
+ Var web_telnumOK = web_telnum
+
+ Var web_app_prepar = "true"
+
+ ; Handle penetrator
+
+ If Only18 = "true" Then
+
+ Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
+ Else
+
+ Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+ EndIf
+
+ ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+
+ EndIf
+ Else
+ EndIf
+
+
+
+
+
+
+
+
+
+
+
+
10
497
@@ -2011,7 +2006,7 @@
KanitMediumTTF
0x322B26
showengText
- "LIME
+ "LIME
GINGER TEA"
@@ -2269,7 +2264,7 @@ GINGER TEA"
KanitMediumTTF
0x322B26
showengText
- "LIME
+ "LIME
GINGER TEA"
@@ -5076,7 +5071,7 @@ GINGER TEA"
KanitMediumTTF
0x322B26
showthaiText
- "ชาเขียวญี่ปุ่นมะนาว
+ "ชาเขียวญี่ปุ่นมะนาว
"
@@ -5098,7 +5093,7 @@ GINGER TEA"
KanitMediumTTF
0x322B26
showengText
- "MATCHA
+ "MATCHA
LIMENADE"
@@ -5592,7 +5587,7 @@ LIMENADE"
KanitMediumTTF
0x322B26
showthaiText
- "ชาเขียวญี่ปุ่นมะนาว
+ "ชาเขียวญี่ปุ่นมะนาว
"
@@ -5614,7 +5609,7 @@ LIMENADE"
KanitMediumTTF
0x322B26
showengText
- "MATCHA
+ "MATCHA
LIMENADE"
@@ -7132,7 +7127,7 @@ LIMENADE"
KanitMediumTTF
0x322B26
showthaiText
- "มะพร้าวน้ำหอม
+ "มะพร้าวน้ำหอม
มัทฉะลาเต้"
@@ -7154,7 +7149,7 @@ LIMENADE"
KanitMediumTTF
0x322B26
showengText
- "Coconut
+ "Coconut
Matcha latte"
@@ -7165,7 +7160,7 @@ Matcha latte"
KanitMediumTTF
0x6F5F51
showengText
- "Coconut Syrup, Matcha Milk
+ "Coconut Syrup, Matcha Milk
Water"
@@ -7388,7 +7383,7 @@ Water"
KanitMediumTTF
0x322B26
showthaiText
- "ชาเขียวญี่ปุ่น
+ "ชาเขียวญี่ปุ่น
มะพร้าวน้ำหอม"
@@ -7642,7 +7637,7 @@ Water"
KanitMediumTTF
0x322B26
showthaiText
- "มะพร้าว
+ "มะพร้าว
ชาไทยนมนิวซีแลนด์"
@@ -7664,7 +7659,7 @@ Water"
KanitMediumTTF
0x322B26
showengText
- "Coconut
+ "Coconut
Thai Milk Tea"
@@ -7675,7 +7670,7 @@ Thai Milk Tea"
KanitMediumTTF
0x6F5F51
showengText
- "Coconut Syrup, Thai Tea, Milk
+ "Coconut Syrup, Thai Tea, Milk
Water"
@@ -7898,7 +7893,7 @@ Water"
KanitMediumTTF
0x322B26
showthaiText
- "ชาดำเย็น
+ "ชาดำเย็น
มะพร้าวน้ำหอม"
@@ -7920,7 +7915,7 @@ Water"
KanitMediumTTF
0x322B26
showengText
- "Coconut
+ "Coconut
Thai Black Tea"
@@ -8153,7 +8148,7 @@ Thai Black Tea"
KanitMediumTTF
0x322B26
showthaiText
- "มะพร้าว
+ "มะพร้าว
ชามะลินมนิวซีแลนด์"
@@ -8175,7 +8170,7 @@ Thai Black Tea"
KanitMediumTTF
0x322B26
showengText
- "Coconut
+ "Coconut
Jasmine milk tea"
@@ -8186,7 +8181,7 @@ Jasmine milk tea"
KanitMediumTTF
0x6F5F51
showengText
- "Coconut Syrup, Jasmine Tea, Milk
+ "Coconut Syrup, Jasmine Tea, Milk
Water"
@@ -8409,7 +8404,7 @@ Water"
KanitMediumTTF
0x322B26
showthaiText
- "ชามะลิ
+ "ชามะลิ
มะพร้าวน้ำหอม"
@@ -8930,7 +8925,7 @@ Water"
KanitMediumTTF
0x6F5F51
showthaiText
- "ชาไทย น้ำเชื่อมน้ำตาลแดง
+ "ชาไทย น้ำเชื่อมน้ำตาลแดง
นม "
@@ -8942,7 +8937,7 @@ Water"
KanitMediumTTF
0x322B26
showengText
- "BROWN SUGAR
+ "BROWN SUGAR
TEA"
@@ -9703,7 +9698,7 @@ TEA"
KanitMediumTTF
0x6F5F51
showthaiText
- "ชาไทย น้ำเชื่อมสตอเบอร์รี่
+ "ชาไทย น้ำเชื่อมสตอเบอร์รี่
"
@@ -9725,7 +9720,7 @@ TEA"
KanitMediumTTF
0x6F5F51
showengText
- "Thai tea, Strawberry Syrup,
+ "Thai tea, Strawberry Syrup,
Water"
@@ -9962,7 +9957,7 @@ Water"
KanitMediumTTF
0x6F5F51
showthaiText
- "ชาไทย น้ำเชื่อมสตอเบอร์รี่
+ "ชาไทย น้ำเชื่อมสตอเบอร์รี่
"
@@ -9984,7 +9979,7 @@ Water"
KanitMediumTTF
0x6F5F51
showengText
- "Thai tea, Strawberry Syrup,
+ "Thai tea, Strawberry Syrup,
Water"
@@ -10746,7 +10741,7 @@ Water"
KanitMediumTTF
0x322B26
showengText
- "THAI TEA
+ "THAI TEA
LIMENADE"
@@ -11004,7 +10999,7 @@ LIMENADE"
KanitMediumTTF
0x322B26
showengText
- "TAIWANESE
+ "TAIWANESE
BLACK TEA"
@@ -11262,7 +11257,7 @@ LIMENADE"
KanitMediumTTF
0x322B26
showengText
- "TAIWANESE
+ "TAIWANESE
LIME TEA"
@@ -11273,7 +11268,7 @@ LIME TEA"
KanitMediumTTF
0x6F5F51
showengText
- "Taiwanese tea, Limenade,
+ "Taiwanese tea, Limenade,
Water"
@@ -11678,7 +11673,7 @@ Water"
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
-
-
-
-
+
+
+
+
diff --git a/xml/menutab/page_catalog_group_whey.xml b/xml/menutab/page_catalog_group_whey.xml
index bbe44923..ebeee54e 100644
--- a/xml/menutab/page_catalog_group_whey.xml
+++ b/xml/menutab/page_catalog_group_whey.xml
@@ -1,622 +1,603 @@
-
-
-
- "Enable"
- 1080
- 1920
-; "0xeae6e1"
- SoundVolume
-
- ; On open
- Var NextPage = "-"
-
- DEBUGVAR ICE_PROCESS_STATUS
- DEBUGVAR ICE_PROCESS_TXT
-
-
- If show_eng = "true" Then
- Var showthaiText = "Invisible"
- Var showengText = "Enable"
- Var DirImage = "ROOT/taobin_project/image/page3_en"
- Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
- Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
-
- Var ice_tab_text = "Ice will be ready at "
- Var text_unavailable = "UNAVAILABLE###size=16"
-
- InstanceSetString "ShowEng"
- Else
- Var showengText = "Invisible"
- Var showthaiText = "Enable"
-
- Var DirImage = "ROOT/taobin_project/image/page3"
- Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
- Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
-
- Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
- Var text_unavailable = "หมด###size=32"
-
- InstanceSetString "ShowThai"
- EndIf
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- ; SpiralOnline
-
- Var MenuVSelected2 = "Invisible"
-
- Var Menu1Selected2 = "Invisible"
- Var Menu2Selected2 = "Invisible"
- Var Menu3Selected2 = "Invisible"
- Var Menu4Selected2 = "Invisible"
-
- Var Menu6Selected2 = "Invisible"
- Var Menu7Selected2 = "Invisible"
- Var MenuVSelected2 = "Invisible"
- Var Menu11Selected2 = "Invisible"
-
- Var Menu21Selected2 = "Invisible"
-
- Var MenuVSelected2 = "Invisible"
- If SpiralOnline = "true" Then
- If Seeker = "curr" Then
- Var MenuVSelected2 = "Enable"
- EndIf
- EndIf
-
- ; init default
- Var Menu1Selected = "Enable"
- Var Menu2Selected = "Enable"
- Var Menu3Selected = "Enable"
- Var Menu4Selected = "Enable"
- ; 5 fruit
- Var Menu5Selected = "Invisible"
- ;Var Menu6Selected = "Enable"
-
- Var Menu61Selected = "Enable"
- Var Menu62Selected = "Enable"
-
- Var Menu7Selected = "Enable"
- ; 8 cocktail
- Var Menu8Selected = "Invisible"
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- Var Menu8Selected = "Enable"
- EndIf
-
-
- If AppFastEnable = "true" Then
- Var Menu11Selected = "Enable"
- Var Menu21Selected = "Invisible"
- Var Menu7Selected = "Invisible"
- Else
- If MenuKidEnable = "true" Then
- Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Enable"
- Var Menu7Selected = "Invisible"
- Else
- Var Menu11Selected = "Invisible"
- Var Menu21Selected = "Invisible"
- Var Menu7Selected = "Enable"
- EndIf
- EndIf
-
- If CocktailShow = "true" Then
- Var Menu7Selected = "Invisible"
- EndIf
-
- If RecipeTag1 = "HealthTurnOn" Then
- Var Menu22Selected = "Enable"
- Else
- Var Menu22Selected = "Invisible"
- EndIf
- ;
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- If AppFastEnable = "true" Then
- Var Menu11Selected = "PressForever"
- Var Menu7Selected = "Invisible"
- Else
- Var Menu11Selected = "Invisible"
- Var Menu7Selected = "PressForever"
- EndIf
-
- SAVELOG PreviseXMLFileName2
-
- Var Timeout = 0
-
-
-
- If show_eng = "true" Then
- Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
-
- Else
- Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/"
- Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
- EndIf
-
- SetInstanceIgnoreTouch
-
-
- DEBUGVAR SlientRefreshIndex
-
- If SlientRefreshIndex = 8 Then
- Var SlientRefreshIndex = 9
- EndIf
-
-
-
-
-
-
-; notice enable heathy menu
-
-
- 0
- 380
- 1080
- 1540
- "0xeae6e1"
-
-
-
-
- 1000
-
- ;DEBUGVAR ICE_PROCESS_STATUS
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- GetVisible inst_show8
- ;DEBUGVAR inst_show8
-
- InstanceGetString SaveStringInst
- ;DEBUGVAR SaveStringInst
-
- If inst_show8 = 1 Then
- InstanceGetString SaveStringInst
- ;DEBUGVAR SaveStringInst
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
-
- If show_eng = "true" Then
- InstanceSetString "ShowEng"
- Else
- InstanceSetString "ShowThai"
- EndIf
-
- EndIf
- EndIf
-
- ; setvarint SlientRefreshEnable 1
- ;DEBUGVAR SlientRefreshEnable
-
- If SlientRefreshEnable = 1 Then
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
-
- If show_eng = "true" Then
- InstanceSetString "ShowEng"
- Else
- InstanceSetString "ShowThai"
- EndIf
-
- EndIf
- EndIf
-
-
- If SlientRefreshIndex = 8 Then
- If inst_show8 = 0 Then
- GetXMLFileNameCurrentRunning CurrentOpenFile8
- Open CurrentOpenFile8
- Else
- Var SlientRefreshIndex = 9
- EndIf
- EndIf
-
-
- TimerReset
-
-
-
- SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 "
- RefreshAll
-
-
-
-; under line
-
- 0
- 494
- "ROOT/taobin_project/image/page3/tab_line_bottom.png"
-
-
-
-; under line
-
- 0
- 358
- "ROOT/taobin_project/image/page3/bg1.png"
-
-
-
-; back
-
-
-
-
-
- InstanceGetString SaveStringInst
- DEBUGVAR SaveStringInst
- DEBUGVAR show_eng
-
- If SaveStringInst = "RefreshNow" Then
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
-
- If show_eng = "true" Then
- If SaveStringInst = "ShowThai" Then
-
- InstanceSetString "ShowEng"
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
- Else
- If SaveStringInst = "ShowEng" Then
-
- InstanceSetString "ShowThai"
- GetXMLFileNameCurrentRunning CurrentOpenFile
- Open CurrentOpenFile
- EndIf
- EndIf
-
-
-
-;
-
- 1080
- "auto"
- 0
- 395
-
- "Enable"
- 896
- 102
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- DEBUGVAR web_ready
- If web_ready = "true" Then
- If web_ref = QRCODE99x Then
-
- Var web_readyOK = web_ready
- Var web_telnumOK = web_telnum
-
- Var web_app_prepar = "true"
-
- ; Handle penetrator
-
- If Only18 = "true" Then
-
- Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
- Else
-
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
- EndIf
-
- ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
-
- EndIf
- Else
- EndIf
-
-
-
-
-
-
-
-
-
-
+
+
+
+ "Enable"
+ 1080
+ 1920
+; "0xeae6e1"
+ SoundVolume
+
+ ; On open
+ Var NextPage = "-"
+
+ DEBUGVAR ICE_PROCESS_STATUS
+ DEBUGVAR ICE_PROCESS_TXT
+
+
+ If show_eng = "true" Then
+ Var showthaiText = "Invisible"
+ Var showengText = "Enable"
+ Var DirImage = "ROOT/taobin_project/image/page3_en"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_thai_lang_press_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
+
+ Var ice_tab_text = "Ice will be ready at "
+ Var text_unavailable = "UNAVAILABLE###size=16"
+
+ InstanceSetString "ShowEng"
+ Else
+ Var showengText = "Invisible"
+ Var showthaiText = "Enable"
+
+ Var DirImage = "ROOT/taobin_project/image/page3"
+ Var show_btp = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+ Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
+
+ Var ice_tab_text = "น้ำแข็งจะพร้อมเวลา "
+ Var text_unavailable = "หมด###size=32"
+
+ InstanceSetString "ShowThai"
+ EndIf
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ ; SpiralOnline
+
+ Var MenuVSelected2 = "Invisible"
+
+ Var Menu1Selected2 = "Invisible"
+ Var Menu2Selected2 = "Invisible"
+ Var Menu3Selected2 = "Invisible"
+ Var Menu4Selected2 = "Invisible"
+
+ Var Menu6Selected2 = "Invisible"
+ Var Menu7Selected2 = "Invisible"
+ Var MenuVSelected2 = "Invisible"
+ Var Menu11Selected2 = "Invisible"
+
+ Var Menu21Selected2 = "Invisible"
+
+ Var MenuVSelected2 = "Invisible"
+ If SpiralOnline = "true" Then
+ If Seeker = "curr" Then
+ Var MenuVSelected2 = "Enable"
+ EndIf
+ EndIf
+
+ ; init default
+ Var Menu1Selected = "Enable"
+ Var Menu2Selected = "Enable"
+ Var Menu3Selected = "Enable"
+ Var Menu4Selected = "Enable"
+ ; 5 fruit
+ Var Menu5Selected = "Invisible"
+ ;Var Menu6Selected = "Enable"
+
+ Var Menu61Selected = "Enable"
+ Var Menu62Selected = "Enable"
+
+ Var Menu7Selected = "Enable"
+ ; 8 cocktail
+ Var Menu8Selected = "Invisible"
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ Var Menu8Selected = "Enable"
+ EndIf
+
+
+ If AppFastEnable = "true" Then
+ Var Menu11Selected = "Enable"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Invisible"
+ Else
+ If MenuKidEnable = "true" Then
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Enable"
+ Var Menu7Selected = "Invisible"
+ Else
+ Var Menu11Selected = "Invisible"
+ Var Menu21Selected = "Invisible"
+ Var Menu7Selected = "Enable"
+ EndIf
+ EndIf
+
+ If CocktailShow = "true" Then
+ Var Menu7Selected = "Invisible"
+ EndIf
+
+ If RecipeTag1 = "HealthTurnOn" Then
+ Var Menu22Selected = "Enable"
+ Else
+ Var Menu22Selected = "Invisible"
+ EndIf
+ ;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ If AppFastEnable = "true" Then
+ Var Menu11Selected = "PressForever"
+ Var Menu7Selected = "Invisible"
+ Else
+ Var Menu11Selected = "Invisible"
+ Var Menu7Selected = "PressForever"
+ EndIf
+
+ SAVELOG PreviseXMLFileName2
+
+ Var Timeout = 0
+
+
+
+ If show_eng = "true" Then
+ Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option_en/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
+
+ Else
+ Var DirImageDrinkOption = "ROOT/taobin_project/image/drink_option/"
+ Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
+ EndIf
+
+ SetInstanceIgnoreTouch
+
+
+
+
+
+
+; notice enable heathy menu
+
+
+ 0
+ 380
+ 1080
+ 1540
+ "0xeae6e1"
+
+
+
+
+ 1000
+
+ ;DEBUGVAR ICE_PROCESS_STATUS
+
+ If ICE_PROCESS_STATUS = 2 Then
+ Var ice_tab_process_show = "Enable"
+ Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+
+
+ GetVisible inst_show
+ ;DEBUGVAR inst_show
+
+ InstanceGetString SaveStringInst
+ ;DEBUGVAR SaveStringInst
+
+ If inst_show = 1 Then
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+
+ If show_eng = "true" Then
+ InstanceSetString "ShowEng"
+ Else
+ InstanceSetString "ShowThai"
+ EndIf
+
+ EndIf
+ EndIf
+
+ ; setvarint SlientRefreshEnable 1
+ ;DEBUGVAR SlientRefreshEnable
+
+ If SlientRefreshEnable = 1 Then
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+
+ If show_eng = "true" Then
+ InstanceSetString "ShowEng"
+ Else
+ InstanceSetString "ShowThai"
+ EndIf
+
+ EndIf
+ EndIf
+
+
+ TimerReset
+
+
+
+ SAVELOG " EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 EventUnitTest1 "
+ RefreshAll
+
+
+
+; under line
+
+ 0
+ 494
+ "ROOT/taobin_project/image/page3/tab_line_bottom.png"
+
+
+
+; under line
+
+ 0
+ 358
+ "ROOT/taobin_project/image/page3/bg1.png"
+
+
+
+; back
+
+
+
+
+
+ InstanceGetString SaveStringInst
+ DEBUGVAR SaveStringInst
+ DEBUGVAR show_eng
+
+ If SaveStringInst = "RefreshNow" Then
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+
+ If show_eng = "true" Then
+ If SaveStringInst = "ShowThai" Then
+
+ InstanceSetString "ShowEng"
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+ Else
+ If SaveStringInst = "ShowEng" Then
+
+ InstanceSetString "ShowThai"
+ GetXMLFileNameCurrentRunning CurrentOpenFile
+ Open CurrentOpenFile
+ EndIf
+ EndIf
+
+
+
+;
+
+ 1080
+ "auto"
+ 0
+ 395
+
+ "Enable"
+ 896
+ 102
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ DEBUGVAR web_ready
+ If web_ready = "true" Then
+ If web_ref = QRCODE99x Then
+
+ Var web_readyOK = web_ready
+ Var web_telnumOK = web_telnum
+
+ Var web_app_prepar = "true"
+
+ ; Handle penetrator
+
+ If Only18 = "true" Then
+
+ Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
+ Else
+
+ Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+ EndIf
+
+ ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
+
+ EndIf
+ Else
+ EndIf
+
+
+
+
+
+
+
+
+
+
10
497
@@ -753,7 +734,7 @@
KanitMediumTTF
0x6F5F51
showengText
- "Whey protein,
+ "Whey protein,
Matcha, & Milk"
@@ -1007,7 +988,7 @@ Matcha, & Milk"
KanitMediumTTF
0x6F5F51
showengText
- "Whey protein,
+ "Whey protein,
Matcha, & Milk"
@@ -1261,7 +1242,7 @@ Matcha, & Milk"
KanitMediumTTF
0x6F5F51
showengText
- "Whey protein,
+ "Whey protein,
Cocoa, & Milk"
@@ -1494,7 +1475,7 @@ Cocoa, & Milk"
KanitMediumTTF
0x6F5F51
showthaiText
- "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่
+ "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่
นม"
@@ -1506,7 +1487,7 @@ Cocoa, & Milk"
KanitMediumTTF
0x322B26
showengText
- "STRAWBERRY
+ "STRAWBERRY
SHAKE"
@@ -1517,7 +1498,7 @@ SHAKE"
KanitMediumTTF
0x6F5F51
showengText
- "Whey protein,Milk,
+ "Whey protein,Milk,
Strawberry Syrup"
@@ -1750,7 +1731,7 @@ Strawberry Syrup"
KanitMediumTTF
0x6F5F51
showthaiText
- "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่
+ "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่
นม"
@@ -1762,7 +1743,7 @@ Strawberry Syrup"
KanitMediumTTF
0x322B26
showengText
- "STRAWBERRY
+ "STRAWBERRY
SHAKE"
@@ -1773,7 +1754,7 @@ SHAKE"
KanitMediumTTF
0x6F5F51
showengText
- "Whey protein,Milk,
+ "Whey protein,Milk,
Strawberry Syrup"
@@ -2006,7 +1987,7 @@ Strawberry Syrup"
KanitMediumTTF
0x6F5F51
showthaiText
- "เวย์โปรตีน น้ำเชื่อมเมล่อน
+ "เวย์โปรตีน น้ำเชื่อมเมล่อน
นม"
@@ -2028,7 +2009,7 @@ Strawberry Syrup"
KanitMediumTTF
0x6F5F51
showengText
- "Whey protein,Milk,
+ "Whey protein,Milk,
Melon Syrup"
@@ -2282,7 +2263,7 @@ Melon Syrup"
KanitMediumTTF
0x6F5F51
showengText
- "Whey protein, Espresso
+ "Whey protein, Espresso
& Milk"
@@ -2536,7 +2517,7 @@ Melon Syrup"
KanitMediumTTF
0x6F5F51
showengText
- "Whey protein,
+ "Whey protein,
Thai Tea, & Milk"
@@ -2790,7 +2771,7 @@ Thai Tea, & Milk"
KanitMediumTTF
0x6F5F51
showengText
- "Whey protein,
+ "Whey protein,
Thai Tea, & Milk"
@@ -3044,7 +3025,7 @@ Thai Tea, & Milk"
KanitMediumTTF
0x6F5F51
showengText
- "Whey protein,
+ "Whey protein,
Thai Tea, & Milk"
@@ -3277,7 +3258,7 @@ Thai Tea, & Milk"
KanitMediumTTF
0x6F5F51
showthaiText
- "เวย์โปรตีน นม
+ "เวย์โปรตีน นม
น้ำเชื่อมน้ำตาลแดง"
@@ -3289,7 +3270,7 @@ Thai Tea, & Milk"
KanitMediumTTF
0x322B26
showengText
- "BROWN SUGAR
+ "BROWN SUGAR
SHAKE"
@@ -3300,7 +3281,7 @@ SHAKE"
KanitMediumTTF
0x6F5F51
showengText
- "Whey protein, Milk,
+ "Whey protein, Milk,
Kokuto syrup"
@@ -3533,7 +3514,7 @@ Kokuto syrup"
KanitMediumTTF
0x6F5F51
showthaiText
- "เวย์โปรตีน นม
+ "เวย์โปรตีน นม
ชาไต้หวัน"
@@ -3545,7 +3526,7 @@ Kokuto syrup"
KanitMediumTTF
0x322B26
showengText
- "TAIWANESE TEA
+ "TAIWANESE TEA
SHAKE"
@@ -3556,7 +3537,7 @@ SHAKE"
KanitMediumTTF
0x6F5F51
showengText
- "Whey protein, Milk,
+ "Whey protein, Milk,
Taiwanese Tea, Sugar"
@@ -3789,7 +3770,7 @@ Taiwanese Tea, Sugar"
KanitMediumTTF
0x6F5F51
showthaiText
- "เวย์โปรตีน นม
+ "เวย์โปรตีน นม
ชาไต้หวัน"
@@ -3801,7 +3782,7 @@ Taiwanese Tea, Sugar"
KanitMediumTTF
0x322B26
showengText
- "TAIWANESE TEA
+ "TAIWANESE TEA
SHAKE"
@@ -3812,7 +3793,7 @@ SHAKE"
KanitMediumTTF
0x6F5F51
showengText
- "Whey protein, Milk,
+ "Whey protein, Milk,
Taiwanese Tea, Sugar"
@@ -4045,7 +4026,7 @@ Taiwanese Tea, Sugar"
KanitMediumTTF
0x6F5F51
showthaiText
- "เวย์โปรตีน นม
+ "เวย์โปรตีน นม
น้ำเชื่อมคาราเมล"
@@ -4067,7 +4048,7 @@ Taiwanese Tea, Sugar"
KanitMediumTTF
0x6F5F51
showengText
- "Whey protein, Milk,
+ "Whey protein, Milk,
Caramel Syrup"
@@ -4717,7 +4698,7 @@ Caramel Syrup"
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
-
-
-
-
+
+
+
+
diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml
index 46115261..842d9d63 100644
--- a/xml/page_catalog_group_recommend.xml
+++ b/xml/page_catalog_group_recommend.xml
@@ -1,470 +1,51 @@
-
-
-
- "Enable"
- 1080
- 1920
-; "0xeae6e1"
- SoundVolume
-
- ; On open
- ;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
-
- Var Menu1Selected = "PressForever"
-
- Var OreoBigButtonEnable = "Enable"
-
- If $12-01-01-0001.Button = "Invisible" Then
- Var esp102101001Enable = "Invisible"
- Var esp122101001Enable = "Enable"
-
- Else
- Var esp102101001Enable = "Enable"
- Var esp122101001Enable = "Invisible"
-
- EndIf
-
- SAVELOG PreviseXMLFileName2
-
- Var Timeout = 0
-
- If show_eng = "true" Then
-
- Var text_unavailable = "UNAVAILABLE###size=16"
- Else
- Var text_unavailable = "หมด###size=32"
-
- EndIf
-
- ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
-
-
-
-
-
-; notice enable heathy menu
-
-
- 0
- 380
- 1080
- 1540
- "0xeae6e1"
-
-
-
-
- 1000
-
- ;DEBUGVAR ICE_PROCESS_STATUS
-
- If ICE_PROCESS_STATUS = 2 Then
- Var ice_tab_process_show = "Enable"
- Var ice_show_open = ice_tab_text + ICE_PROCESS_TXT
- Else
- Var ice_tab_process_show = "Invisible"
- EndIf
-
-
- If NextPage = "-" Then
-
- Else
- If CupOnArm = "true" Then
- If Timeout > 9 Then
- SAVELOG "COA9"
- Open NextPage
- EndIf
- Else
- If Timeout > 30 Then
- SAVELOG "COA30"
- Open NextPage
- EndIf
- EndIf
- EndIf
-
- If Timeout > 60 Then
- SAVELOG "Timeout"
- If Seeker = "next" Then
- Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"
- Else
- SAVELOG "Back"
- Open "ROOT/taobin_project/xml/page_back_to_main.xml"
- EndIf
- EndIf
-
- If BrewCommand = "RefreshAll" Then
- ;Var BrewCommand = "-"
- Open CurrentXMLFileName2
- EndIf
-
- If Seeker = "curr" Then
- If DoorCupPosition = "bottom" Then
- ; It normal
- Var EmergencyStop = "false"
- Else
- Var EmergencyStop = "true"
-
- ;Open "ROOT/taobin_project/xml/page_back_to_error.xml"
-
- EndIf
- EndIf
-
- If IgnoreNetCore = "true" Then
-
- Else
- ;stop_now
-
- EndIf
-
-
- ; zone cup on arm
- ; zone cup on arm
- If Seeker = "curr" Then
- If CupOnArm = "true" Then
-
- If CheckCupStateDoorCupClose = "" Then
- If buttonRemoveCup = "Enable" Then
-
- Else
- Refresh
- EndIf
-
- Var buttonRemoveCup = "Enable"
-
- EndIf
-
- If CheckCupStateDoorCupClose = "done" Then
- If buttonRemoveCup = "Enable" Then
-
- Else
- Refresh
- EndIf
-
- Var buttonRemoveCup = "Enable"
-
- EndIf
- Else
- If buttonRemoveCup = "Enable" Then
- Var buttonRemoveCup = "Invisible"
- Refresh
- EndIf
- EndIf
- Else
- Var buttonRemoveCup = "Invisible"
- EndIf
-
- Var Timeout = Timeout + 1
- TimerReset
-
-
-
-; under line
-
- 0
- 494
- "ROOT/taobin_project/image/page3/tab_line_bottom.png"
-
-
-
-; under line
-
- 0
- 358
- "ROOT/taobin_project/image/page3/bg1.png"
-
-
-
-; back
-
-
-
-
-;
-
- 1080
- "auto"
- 0
- 395
-
- "Enable"
- 896
- 102
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- DEBUGVAR web_ready
- If web_ready = "true" Then
- If web_ref = QRCODE99x Then
-
- Var web_readyOK = web_ready
- Var web_telnumOK = web_telnum
-
- Var web_app_prepar = "true"
-
- ; Handle penetrator
-
- If Only18 = "true" Then
-
- Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
- Else
-
- Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
- EndIf
-
- ; Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_payment.xml"
-
- EndIf
- Else
- EndIf
-
-
-
-
-
-
-
-
+
+
+
+ "Enable"
+ 1080
+ 1920
+; "0xeae6e1"
+ SoundVolume
+
+ ; On open
+ ;include="ROOT/taobin_project/xml/menu_catalog_default_init.xml"
+
+ Var Menu1Selected = "PressForever"
+
+ Var OreoBigButtonEnable = "Enable"
+
+ If $12-01-01-0001.Button = "Invisible" Then
+ Var esp102101001Enable = "Invisible"
+ Var esp122101001Enable = "Enable"
+
+ Else
+ Var esp102101001Enable = "Enable"
+ Var esp122101001Enable = "Invisible"
+
+ EndIf
+
+ SAVELOG PreviseXMLFileName2
+
+ Var Timeout = 0
+
+ If show_eng = "true" Then
+
+ Var text_unavailable = "UNAVAILABLE###size=16"
+ Else
+ Var text_unavailable = "หมด###size=32"
+
+ EndIf
+
+ ;include="ROOT/taobin_project/xml/menu_catalog_new_menu.xml"
+
+
+
+
+;include="ROOT/taobin_project/xml/menu_catalog_new.xml"
+
+
+
+
16
10
@@ -862,7 +443,7 @@
KanitMediumTTF
0x322B26
showthaiText
- "พรีเมียมเอสเพรสโซ่
+ "พรีเมียมเอสเพรสโซ่
คาราเมลโอรีโอ"
@@ -884,7 +465,7 @@
KanitMediumTTF
0x322B26
showengText
- "PREMIUM ESPRESSO
+ "PREMIUM ESPRESSO
CARAMEL OREO"
@@ -1113,7 +694,7 @@ CARAMEL OREO"
KanitMediumTTF
0x322B26
showthaiText
- "พรีเมียมเอสเพรสโซ่
+ "พรีเมียมเอสเพรสโซ่
คาราเมลโอรีโอ"
@@ -1135,7 +716,7 @@ CARAMEL OREO"
KanitMediumTTF
0x322B26
showengText
- "PREMIUM ESPRESSO
+ "PREMIUM ESPRESSO
CARAMEL OREO"
@@ -1365,7 +946,7 @@ CARAMEL OREO"
KanitMediumTTF
0x322B26
showthaiText
- "พรีเมียมมัทฉะ
+ "พรีเมียมมัทฉะ
คาราเมลโอรีโอ"
@@ -1387,7 +968,7 @@ CARAMEL OREO"
KanitMediumTTF
0x322B26
showengText
- "PREMIUM GREEN TEA
+ "PREMIUM GREEN TEA
CARAMEL OREO"
@@ -1618,7 +1199,7 @@ CARAMEL OREO"
KanitMediumTTF
0x322B26
showthaiText
- "พรีเมียมชาไทย
+ "พรีเมียมชาไทย
คาราเมลโอรีโอ"
@@ -1640,7 +1221,7 @@ CARAMEL OREO"
KanitMediumTTF
0x322B26
showengText
- "PREMIUM THAI TEA
+ "PREMIUM THAI TEA
CARAMEL OREO"
@@ -2122,7 +1703,7 @@ CARAMEL OREO"
KanitMediumTTF
0x322B26
showthaiText
- "มะพร้าวน้ำหอมปั่น
+ "มะพร้าวน้ำหอมปั่น
นมนิวซีแลนด์"
@@ -2154,7 +1735,7 @@ CARAMEL OREO"
KanitMediumTTF
0x6F5F51
showengText
- "Coconut syrup, Milk,
+ "Coconut syrup, Milk,
Water"
@@ -2887,7 +2468,7 @@ Water"
KanitMediumTTF
0x6F5F51
showthaiText
- "นม น้ำตาล โอรีโอ
+ "นม น้ำตาล โอรีโอ
"
@@ -2899,7 +2480,7 @@ Water"
KanitMediumTTF
0x322B26
showengText
- "OREO SMOOTHIE
+ "OREO SMOOTHIE
VOLCANO"
@@ -3385,7 +2966,7 @@ VOLCANO"
KanitMediumTTF
0x322B26
showthaiText
- "นมกล้วยปั่น
+ "นมกล้วยปั่น
โอรีโอภูเขาไฟ"
@@ -3407,7 +2988,7 @@ VOLCANO"
KanitMediumTTF
0x322B26
showengText
- "BANANA MILK OREO
+ "BANANA MILK OREO
VOLCANO"
@@ -3418,7 +2999,7 @@ VOLCANO"
KanitMediumTTF
0x6F5F51
showengText
- "Banana Syrup, Milk,
+ "Banana Syrup, Milk,
Sugar, Oreo"
@@ -3639,7 +3220,7 @@ Sugar, Oreo"
KanitMediumTTF
0x322B26
showthaiText
- "นมช็อกโกโตเกียว
+ "นมช็อกโกโตเกียว
บานาน่า"
@@ -3661,7 +3242,7 @@ Sugar, Oreo"
KanitMediumTTF
0x322B26
showengText
- "CHOCO TOKYO
+ "CHOCO TOKYO
BANANA MILK"
@@ -3896,7 +3477,7 @@ BANANA MILK"
KanitMediumTTF
0x322B26
showthaiText
- "นมคาราเมล
+ "นมคาราเมล
บิสคอฟ"
@@ -3907,7 +3488,7 @@ BANANA MILK"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำเชื่อมคาราเมล นม น้ำตาล
+ "น้ำเชื่อมคาราเมล นม น้ำตาล
บิสคอฟ"
@@ -3919,7 +3500,7 @@ BANANA MILK"
KanitMediumTTF
0x322B26
showengText
- "CARAMEL MILK
+ "CARAMEL MILK
BISCOFF VOLCANO"
@@ -3930,7 +3511,7 @@ BISCOFF VOLCANO"
KanitMediumTTF
0x6F5F51
showengText
- "Caramel Syrup, Milk,
+ "Caramel Syrup, Milk,
Sugar, Biscof"
@@ -4151,7 +3732,7 @@ Sugar, Biscof"
KanitMediumTTF
0x322B26
showthaiText
- "นมสตรอเบอร์รี่
+ "นมสตรอเบอร์รี่
บิสคอฟ"
@@ -4162,7 +3743,7 @@ Sugar, Biscof"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำเชื่อมสตรอเบอร์รี่ นม น้ำตาล
+ "น้ำเชื่อมสตรอเบอร์รี่ นม น้ำตาล
บิสคอฟ"
@@ -4174,7 +3755,7 @@ Sugar, Biscof"
KanitMediumTTF
0x322B26
showengText
- "STRAWBERRY MILK
+ "STRAWBERRY MILK
BISCOFF VOLCANO"
@@ -4185,7 +3766,7 @@ BISCOFF VOLCANO"
KanitMediumTTF
0x6F5F51
showengText
- "Strawberry Syrup, Milk,
+ "Strawberry Syrup, Milk,
Sugar, Biscof"
@@ -4406,7 +3987,7 @@ Sugar, Biscof"
KanitMediumTTF
0x322B26
showthaiText
- "นมมินต์
+ "นมมินต์
บิสคอฟ"
@@ -4417,7 +3998,7 @@ Sugar, Biscof"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำเชื่อมมินต์ นม น้ำตาล
+ "น้ำเชื่อมมินต์ นม น้ำตาล
บิสคอฟ"
@@ -4429,7 +4010,7 @@ Sugar, Biscof"
KanitMediumTTF
0x322B26
showengText
- "Mint MILK
+ "Mint MILK
BISCOFF VOLCANO"
@@ -4440,7 +4021,7 @@ BISCOFF VOLCANO"
KanitMediumTTF
0x6F5F51
showengText
- "Mint Syrup, Milk,
+ "Mint Syrup, Milk,
Sugar, Biscof"
@@ -4661,7 +4242,7 @@ Sugar, Biscof"
KanitMediumTTF
0x322B26
showthaiText
- "โกโก้
+ "โกโก้
บิสคอฟ"
@@ -4672,7 +4253,7 @@ Sugar, Biscof"
KanitMediumTTF
0x6F5F51
showthaiText
- "โกโก้ นม น้ำตาล
+ "โกโก้ นม น้ำตาล
บิสคอฟ"
@@ -4684,7 +4265,7 @@ Sugar, Biscof"
KanitMediumTTF
0x322B26
showengText
- "COCOA MILK
+ "COCOA MILK
BISCOFF VOLCANO"
@@ -4695,7 +4276,7 @@ BISCOFF VOLCANO"
KanitMediumTTF
0x6F5F51
showengText
- "Cocoa, Milk,
+ "Cocoa, Milk,
Sugar, Biscof"
@@ -6176,7 +5757,7 @@ Sugar, Biscof"
KanitMediumTTF
0x6F5F51
showthaiText
- "นมโอ๊ต น้ำเชื่อมสตรอว์เบอร์รี่
+ "นมโอ๊ต น้ำเชื่อมสตรอว์เบอร์รี่
และน้ำแข็ง"
@@ -6428,7 +6009,7 @@ Sugar, Biscof"
KanitMediumTTF
0x6F5F51
showthaiText
- "นมโอ๊ต น้ำเชื่อมยูซุ
+ "นมโอ๊ต น้ำเชื่อมยูซุ
และน้ำแข็ง"
@@ -6680,7 +6261,7 @@ Sugar, Biscof"
KanitMediumTTF
0x6F5F51
showthaiText
- "นมโอ๊ต น้ำเชื่อมลิ้นจี่
+ "นมโอ๊ต น้ำเชื่อมลิ้นจี่
และน้ำแข็ง"
@@ -6932,7 +6513,7 @@ Sugar, Biscof"
KanitMediumTTF
0x6F5F51
showthaiText
- "นมโอ๊ต มะนาว
+ "นมโอ๊ต มะนาว
และน้ำแข็ง"
@@ -8956,7 +8537,7 @@ Sugar, Biscof"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
Guji Queen Berry"
@@ -8967,7 +8548,7 @@ Guji Queen Berry"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟคั่วอ่อน (natural process)
+ "กาแฟคั่วอ่อน (natural process)
หอมสตรอว์เบอร์รี ส้ม และดอกไม้"
@@ -8979,7 +8560,7 @@ Guji Queen Berry"
KanitMediumTTF
0x322B26
showengText
- "AMERICANO
+ "AMERICANO
ETHIOPAI GUJI"
@@ -8990,7 +8571,7 @@ ETHIOPAI GUJI"
KanitMediumTTF
0x6F5F51
showengText
- "กาแฟคั่วอ่อน (natural process)
+ "กาแฟคั่วอ่อน (natural process)
หอมสตรอว์เบอร์รี ส้ม และดอกไม้"
@@ -9215,7 +8796,7 @@ ETHIOPAI GUJI"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
BLUE DADDY"
@@ -9226,7 +8807,7 @@ BLUE DADDY"
KanitMediumTTF
0x6F5F51
showthaiText
- "Washed process
+ "Washed process
หอมบลูเบอร์รี และดอกไม้"
@@ -9238,7 +8819,7 @@ BLUE DADDY"
KanitMediumTTF
0x322B26
showengText
- "BLUE DADDY
+ "BLUE DADDY
AMERICANO"
@@ -9249,7 +8830,7 @@ AMERICANO"
KanitMediumTTF
0x6F5F51
showengText
- "Washed process
+ "Washed process
Note: Blue Berry & Floral"
@@ -9474,7 +9055,7 @@ Note: Blue Berry & Floral"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
MOZART"
@@ -9485,7 +9066,7 @@ MOZART"
KanitMediumTTF
0x6F5F51
showthaiText
- "Raisin Honey process
+ "Raisin Honey process
หอมสตรอว์เบอร์รี กุหลาบ มะลิ"
@@ -9497,7 +9078,7 @@ MOZART"
KanitMediumTTF
0x322B26
showengText
- "MOZART
+ "MOZART
AMERICANO"
@@ -9508,7 +9089,7 @@ AMERICANO"
KanitMediumTTF
0x6F5F51
showengText
- "Raisin Honey process
+ "Raisin Honey process
Note: Strawberry & Floral"
@@ -9733,7 +9314,7 @@ Note: Strawberry & Floral"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
WHISKY DUDE"
@@ -9744,7 +9325,7 @@ WHISKY DUDE"
KanitMediumTTF
0x6F5F51
showthaiText
- "Washed Sherry cask ferment
+ "Washed Sherry cask ferment
หอมวิสกี้ ช็อกโกแลต วนิลา"
@@ -9756,7 +9337,7 @@ WHISKY DUDE"
KanitMediumTTF
0x322B26
showengText
- "WHISKY DUDE
+ "WHISKY DUDE
AMERICANO"
@@ -9767,7 +9348,7 @@ AMERICANO"
KanitMediumTTF
0x6F5F51
showengText
- "Washed Sherry cask ferment
+ "Washed Sherry cask ferment
Note: Whisky & Vanilla"
@@ -9992,7 +9573,7 @@ Note: Whisky & Vanilla"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
SNOWWHITE"
@@ -10003,7 +9584,7 @@ SNOWWHITE"
KanitMediumTTF
0x6F5F51
showthaiText
- "Anaerobic process
+ "Anaerobic process
หอมมะลิ น้ำผึ้ง เมเปิล"
@@ -10015,7 +9596,7 @@ SNOWWHITE"
KanitMediumTTF
0x322B26
showengText
- "SNOWWHITE
+ "SNOWWHITE
AMERICANO"
@@ -10026,7 +9607,7 @@ AMERICANO"
KanitMediumTTF
0x6F5F51
showengText
- "Anaerobic process
+ "Anaerobic process
Note: Jasmine & Honey"
@@ -10251,7 +9832,7 @@ Note: Jasmine & Honey"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
PEACHER"
@@ -10262,7 +9843,7 @@ PEACHER"
KanitMediumTTF
0x6F5F51
showthaiText
- "Barrel-aged process
+ "Barrel-aged process
หอมพีช, ชา, ช็อกโกแลต"
@@ -10274,7 +9855,7 @@ PEACHER"
KanitMediumTTF
0x322B26
showengText
- "PEACHER
+ "PEACHER
AMERICANO"
@@ -10285,7 +9866,7 @@ AMERICANO"
KanitMediumTTF
0x6F5F51
showengText
- "Barrel-aged process
+ "Barrel-aged process
Note: Peach, tea, chocolate"
@@ -10510,7 +10091,7 @@ Note: Peach, tea, chocolate"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
PURE BEAUTY"
@@ -10521,7 +10102,7 @@ PURE BEAUTY"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟคั่วอ่อน (natural process)
+ "กาแฟคั่วอ่อน (natural process)
กลิ่นดอกไม้ ผลไม้เขตร้อน"
@@ -10533,7 +10114,7 @@ PURE BEAUTY"
KanitMediumTTF
0x322B26
showengText
- "PURE BEAUTY
+ "PURE BEAUTY
AMERICANO"
@@ -10768,7 +10349,7 @@ AMERICANO"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
GEISHA"
@@ -10790,7 +10371,7 @@ GEISHA"
KanitMediumTTF
0x322B26
showengText
- "GEISHA
+ "GEISHA
AMERICANO"
@@ -11025,7 +10606,7 @@ AMERICANO"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
ROSALYN"
@@ -11036,7 +10617,7 @@ ROSALYN"
KanitMediumTTF
0x6F5F51
showthaiText
- "กาแฟคั่วอ่อน (washed process)
+ "กาแฟคั่วอ่อน (washed process)
กลิ่นกุหลาบ และ เบอร์รี่"
@@ -11048,7 +10629,7 @@ ROSALYN"
KanitMediumTTF
0x322B26
showengText
- "ROSALYN
+ "ROSALYN
AMERICANO"
@@ -11059,7 +10640,7 @@ AMERICANO"
KanitMediumTTF
0x6F5F51
showengText
- "Light Roast (natural process)
+ "Light Roast (natural process)
Pink Rose & Berry"
@@ -11284,7 +10865,7 @@ Pink Rose & Berry"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
CHOPIN"
@@ -11295,7 +10876,7 @@ CHOPIN"
KanitMediumTTF
0x6F5F51
showthaiText
- "Raisin Honey process
+ "Raisin Honey process
หอมสตรอว์เบอร์รี กุหลาบ มะลิ"
@@ -11307,7 +10888,7 @@ CHOPIN"
KanitMediumTTF
0x322B26
showengText
- "CHOPIN
+ "CHOPIN
AMERICANO"
@@ -11318,7 +10899,7 @@ AMERICANO"
KanitMediumTTF
0x6F5F51
showengText
- "Raisin Honey process
+ "Raisin Honey process
Note: Strawberry & Floral"
@@ -11543,7 +11124,7 @@ Note: Strawberry & Floral"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
MANDARINE"
@@ -11565,7 +11146,7 @@ MANDARINE"
KanitMediumTTF
0x322B26
showengText
- "MANDARINE
+ "MANDARINE
AMERICANO"
@@ -11800,7 +11381,7 @@ AMERICANO"
KanitMediumTTF
0x322B26
showthaiText
- "อเมริกาโน
+ "อเมริกาโน
OPUS ONE"
@@ -11822,7 +11403,7 @@ OPUS ONE"
KanitMediumTTF
0x322B26
showengText
- "OPUS ONE
+ "OPUS ONE
AMERICANO"
@@ -12832,7 +12413,7 @@ AMERICANO"
KanitMediumTTF
0x6F5F51
showthaiText
- "น้ำแดงกลิ่นสละ นม
+ "น้ำแดงกลิ่นสละ นม
น้ำตาล "
@@ -12854,7 +12435,7 @@ AMERICANO"
KanitMediumTTF
0x6F5F51
showengText
- "Salak Syrup, Milk,
+ "Salak Syrup, Milk,
Sugar"
@@ -13085,7 +12666,7 @@ Sugar"
KanitMediumTTF
0x6F5F51
showthaiText
- "นม น้ำเชื่อมสตอเบอร์รี่
+ "นม น้ำเชื่อมสตอเบอร์รี่
และน้ำแข็ง"
@@ -13097,7 +12678,7 @@ Sugar"
KanitMediumTTF
0x322B26
showengText
- "STRAWMILK
+ "STRAWMILK
SMOOTHIE"
@@ -13851,7 +13432,7 @@ SMOOTHIE"
KanitMediumTTF
0x322B26
showengText
- "TAO POWER
+ "TAO POWER
DRINK SODA"
@@ -14103,7 +13684,7 @@ DRINK SODA"
KanitMediumTTF
0x322B26
showengText
- "PLUM
+ "PLUM
LIMENADE SODA"
@@ -14257,30 +13838,30 @@ LIMENADE SODA"
Open "ROOT/taobin_project/xml/page_payment_multi.xml"
-
-
-
-
-
-
-;BigLogoLayout
-
-
-
-
-
-
+
+
+
+
+
+
+;BigLogoLayout
+
+
+
+
+
+
diff --git a/xml/vending_info.xml b/xml/vending_info.xml
index 6c87ca4c..ab360899 100644
--- a/xml/vending_info.xml
+++ b/xml/vending_info.xml
@@ -928,39 +928,6 @@
-
- 5
- 1200
- "ROOT/taobin_project/image/tab_1.png"
-
- Open "ROOT/taobin_project/xml/testscanQRcode.xml"
-
-
-
-
- 30
- 1210
- 30
- fontType1
- 0x000000
- "TestScanQRCode"
-
-
-
-
-;
-; 930
-; info_cancel_y
-; 150
-; "0xEFEDEA"
-; "0xE61A5F"
-; 150
-; "Enable"
-; "Herr"
-;
-
-
-