diff --git a/inter/mys/menu/lang.tsv b/inter/mys/menu/lang.tsv index 9c5aef5c..18aaae3d 100644 --- a/inter/mys/menu/lang.tsv +++ b/inter/mys/menu/lang.tsv @@ -724,19 +724,9 @@ TextID Note English Thai China Japan Malaysia 800657 Degree องศา 800658 Coarse หยาบ 800659 Fine ละเอียด - - - - - - - - - - - - - +800660 Bucket กระบะ +800661 Shutter ชัตเตอร์ +800662 Motor แกนมอเตอร์ Test (New UI) @@ -783,8 +773,30 @@ TextID Note English Thai China Japan Malaysia 800740 Water ปริมาณน้ำ 800741 Rotate to pay หมุนจ่าย 800742 Rotate back หมุนเก็บ -800743 จ่าย ช่อง %d ผง %d ใน 0.1 วิ Pay slot %d powder %d in 0.1 sec -800744 จ่าย %s ผง %d ใน 0.1 วิ Pay %s powder %d in 0.1 sec -800745 จ่าย %s ผง %d กรัม Pay %s powder %d gram -800746 หมุนล้าง Rotate clean -800747 หมุนชง Rotate brew +800743 Pay slot %d powder %d in 0.1 sec จ่าย ช่อง %d ผง %d ใน 0.1 วิ +800744 Pay %s powder %d in 0.1 sec จ่าย %s ผง %d ใน 0.1 วิ +800745 Pay %s powder %d gram จ่าย %s ผง %d กรัม +800746 Rotate clean หมุนล้าง +800747 Rotate brew หมุนชง +800748 Ginder เครื่องบด +800749 Do you clean GInder module? ล้างเครื่องบดหรือยัง? + +800750 Soda Bath ถังแช่โซดา +800751 Do you clean Soda bath? ล้างถังแสดงโซดาหรือยัง? + +800752 Change / Clean เปลี่ยน / ทำความสะอาด + +800753 Powder Canister กล่องผง +800754 Syrup buffer ถังไซรับ +800755 Bean Canister กล่องเมล็ด +800756 Whipper Module ชุดหัวชง +800757 Clean bowl ถ้วยล้าง +800758 Arm module ชุดแขน +800759 Change Module เปลี่ยนอุปกรณ์ +800760 Clean ทำความสะอาด +800761 Disc Powder ฐานจานผง +800762 Change/Clean เปลี่ยน/ทำตวามสะอาด +800763 Did you change/clean module or not? เปลียนหรือทำความสะอาดอุปกรณ์หรือไม่ +800764 Did you change module or not? เปลียนอุปกรณ์หรือไม่ +800765 Did you clean module or not? ทำความสะอาดหรือไม่ +800766 SerialNumber ตัวเลขประจำอุปกรณ์ diff --git a/inter/mys/xml/page_catalog_group_tea.lxml b/inter/mys/xml/page_catalog_group_tea.lxml index 0a6ee83d..afb1cbfd 100644 --- a/inter/mys/xml/page_catalog_group_tea.lxml +++ b/inter/mys/xml/page_catalog_group_tea.lxml @@ -936,7 +936,7 @@ Var PD_CODE2 = "12-02-02-0020" Var PD_CODE3 = "12-02-03-0020" ; begin lang - Var aliasName[0] = "GINGER TEA" + Var aliasName[0] = "GINGER" Var aliasDesc[0] = "Ginger & Water" Var aliasName[1] = "น้ำขิง" Var aliasDesc[1] = "ขิง และ น้ำ" @@ -944,15 +944,15 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "TEH HALIA" + Var aliasName[4] = "HALIA" Var aliasDesc[4] = "Halia, Air" Var aliasName[5] = "-" Var aliasDesc[5] = "-" - Var NameLang[0][0] = "Hot GINGER TEA" + Var NameLang[0][0] = "Hot GINGER" Var NameLang[0][1] = "ชาขิงร้อน" Var NameLang[0][2] = "-" Var NameLang[0][3] = "-" - Var NameLang[0][4] = "TEH HALIA PANAS" + Var NameLang[0][4] = "HALIA PANAS" Var NameLang[0][5] = "" Var DescLang[0][0] = "Ginger and Hot water" Var DescLang[0][1] = "ขิง และน้ำร้อน" @@ -960,11 +960,11 @@ Var DescLang[0][3] = "-" Var DescLang[0][4] = "Halia, Air" Var DescLang[0][5] = "" - Var NameLang[1][0] = "Iced GINGER TEA" + Var NameLang[1][0] = "Iced GINGER" Var NameLang[1][1] = "ชาขิงเย็น" Var NameLang[1][2] = "-" Var NameLang[1][3] = "-" - Var NameLang[1][4] = "TEH HALIA AIS" + Var NameLang[1][4] = "HALIA AIS" Var NameLang[1][5] = "" Var DescLang[1][0] = "Ginger, Water and Ice" Var DescLang[1][1] = "ขิง น้ำ และน้ำแข็ง" @@ -1031,11 +1031,11 @@ KanitMediumTTF 0x322B26 - GINGER TEA + GINGER น้ำขิง - GINGER TEA + GINGER น้ำขิง - TEH HALIA + HALIA น้ำขิง @@ -1210,7 +1210,7 @@ Var PD_CODE2 = "12-02-02-0041" Var PD_CODE3 = "12-02-03-0041" ; begin lang - Var aliasName[0] = "GINGER TEA" + Var aliasName[0] = "GINGER" Var aliasDesc[0] = "Ginger & Water" Var aliasName[1] = "น้ำขิง" Var aliasDesc[1] = "ขิง และ น้ำ" @@ -1218,15 +1218,15 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "TEH HALIA" + Var aliasName[4] = "HALIA" Var aliasDesc[4] = "Halia, Air" Var aliasName[5] = "-" Var aliasDesc[5] = "-" - Var NameLang[0][0] = "Hot GINGER TEA" + Var NameLang[0][0] = "Hot GINGER" Var NameLang[0][1] = "ชาขิงร้อน" Var NameLang[0][2] = "-" Var NameLang[0][3] = "-" - Var NameLang[0][4] = "TEH HALIA PANAS" + Var NameLang[0][4] = "HALIA PANAS" Var NameLang[0][5] = "" Var DescLang[0][0] = "Ginger and Hot water" Var DescLang[0][1] = "ขิง และน้ำร้อน" @@ -1234,11 +1234,11 @@ Var DescLang[0][3] = "-" Var DescLang[0][4] = "Halia, Air" Var DescLang[0][5] = "" - Var NameLang[1][0] = "Iced GINGER TEA" + Var NameLang[1][0] = "Iced GINGER" Var NameLang[1][1] = "ชาขิงเย็น" Var NameLang[1][2] = "-" Var NameLang[1][3] = "-" - Var NameLang[1][4] = "TEH HALIA AIS" + Var NameLang[1][4] = "HALIA AIS" Var NameLang[1][5] = "" Var DescLang[1][0] = "Ginger, Water and Ice" Var DescLang[1][1] = "ขิง น้ำ และน้ำแข็ง" @@ -1305,11 +1305,11 @@ KanitMediumTTF 0x322B26 - GINGER TEA + GINGER น้ำขิง - GINGER TEA + GINGER น้ำขิง - TEH HALIA + HALIA น้ำขิง @@ -2032,7 +2032,7 @@ Var PD_CODE2 = "##-##-##-####" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "LIME \nGINGER TEA" + Var aliasName[0] = "LIME GINGER" Var aliasDesc[0] = "Ginger, Lime & Water" Var aliasName[1] = "ชาขิงมะนาว" Var aliasDesc[1] = "ขิง มะนาว และน้ำ" @@ -2040,15 +2040,15 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "TEH HALIA LIMAU" + Var aliasName[4] = "HALIA LIMAU" Var aliasDesc[4] = "Halia, Limau, Air" Var aliasName[5] = "-" Var aliasDesc[5] = "-" - Var NameLang[0][0] = "Hot LIME GINGER TEA" + Var NameLang[0][0] = "Hot LIME GINGER" Var NameLang[0][1] = "ชาขิงมะนาวร้อน" Var NameLang[0][2] = "-" Var NameLang[0][3] = "-" - Var NameLang[0][4] = "TEH LIMAU HALIA PANAS" + Var NameLang[0][4] = "LIMAU HALIA PANAS" Var NameLang[0][5] = "" Var DescLang[0][0] = "Ginger, Lime and Hot water" Var DescLang[0][1] = "ขิง มะนาว และน้ำร้อน" @@ -2127,11 +2127,11 @@ KanitMediumTTF 0x322B26 - LIME \nGINGER TEA + LIME GINGER ชาขิงมะนาว - LIME \nGINGER TEA + LIME GINGER ชาขิงมะนาว - TEH HALIA LIMAU + HALIA LIMAU ชาขิงมะนาว @@ -2306,7 +2306,7 @@ Var PD_CODE2 = "12-02-02-0042" Var PD_CODE3 = "12-02-03-0042" ; begin lang - Var aliasName[0] = "LIME \nGINGER TEA" + Var aliasName[0] = "LIME GINGER" Var aliasDesc[0] = "Ginger, Lime & Water" Var aliasName[1] = "ชาขิงมะนาว" Var aliasDesc[1] = "ขิง มะนาว และน้ำ" @@ -2314,15 +2314,15 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "TEH HALIA LIMAU" + Var aliasName[4] = "HALIA LIMAU" Var aliasDesc[4] = "Halia, Limau, Air" Var aliasName[5] = "-" Var aliasDesc[5] = "-" - Var NameLang[0][0] = "Hot LIME GINGER TEA" + Var NameLang[0][0] = "Hot LIME GINGER" Var NameLang[0][1] = "ชาขิงมะนาวร้อน" Var NameLang[0][2] = "-" Var NameLang[0][3] = "-" - Var NameLang[0][4] = "TEH LIMAU HALIA PANAS" + Var NameLang[0][4] = "LIMAU HALIA PANAS" Var NameLang[0][5] = "" Var DescLang[0][0] = "Ginger, Lime and Hot water" Var DescLang[0][1] = "ขิง มะนาว และน้ำร้อน" @@ -2342,11 +2342,11 @@ Var DescLang[1][3] = "-" Var DescLang[1][4] = "Halia, Limau, Ais" Var DescLang[1][5] = "" - Var NameLang[2][0] = "SMOOTHIE\nLIME GINGER TEA" + Var NameLang[2][0] = "SMOOTHIE\nLIME GINGER" Var NameLang[2][1] = "ชาขิงมะนาวปั่น" Var NameLang[2][2] = "-" Var NameLang[2][3] = "-" - Var NameLang[2][4] = "SMOOTHIE TEH HALIA LIMAU" + Var NameLang[2][4] = "SMOOTHIE HALIA LIMAU" Var NameLang[2][5] = "" Var DescLang[2][0] = "Ginger, Lime, Iced" Var DescLang[2][1] = "ขิง มะนาว น้ำแข็ง" @@ -2401,11 +2401,11 @@ KanitMediumTTF 0x322B26 - LIME \nGINGER TEA + LIME GINGER ชาขิงมะนาว - LIME \nGINGER TEA + LIME GINGER ชาขิงมะนาว - TEH HALIA LIMAU + HALIA LIMAU ชาขิงมะนาว @@ -3676,7 +3676,7 @@ Var PD_CODE2 = "12-02-02-0020" Var PD_CODE3 = "12-02-03-0020" ; begin lang - Var aliasName[0] = "GINGER TEA" + Var aliasName[0] = "GINGER" Var aliasDesc[0] = "Ginger & Water" Var aliasName[1] = "ชาขิง" Var aliasDesc[1] = "ขิง และ น้ำ" @@ -3684,15 +3684,15 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "TEH HALIA" + Var aliasName[4] = "HALIA" Var aliasDesc[4] = "Halia, Teh" Var aliasName[5] = "" Var aliasDesc[5] = "" - Var NameLang[0][0] = "Hot GINGER TEA" + Var NameLang[0][0] = "Hot GINGER" Var NameLang[0][1] = "ชาขิงร้อน" Var NameLang[0][2] = "-" Var NameLang[0][3] = "-" - Var NameLang[0][4] = "TEH HALIA PANAS" + Var NameLang[0][4] = "HALIA PANAS" Var NameLang[0][5] = "" Var DescLang[0][0] = "Ginger and Hot water" Var DescLang[0][1] = "ขิง และน้ำร้อน" @@ -3700,11 +3700,11 @@ Var DescLang[0][3] = "-" Var DescLang[0][4] = "Halia, Air" Var DescLang[0][5] = "" - Var NameLang[1][0] = "Iced GINGER TEA" + Var NameLang[1][0] = "Iced GINGER" Var NameLang[1][1] = "ชาขิงเย็น" Var NameLang[1][2] = "-" Var NameLang[1][3] = "-" - Var NameLang[1][4] = "TEH HALIA AIS" + Var NameLang[1][4] = "HALIA AIS" Var NameLang[1][5] = "" Var DescLang[1][0] = "Ginger, Water and Ice" Var DescLang[1][1] = "ขิง น้ำ และน้ำแข็ง" @@ -3771,11 +3771,11 @@ KanitMediumTTF 0x322B26 - GINGER TEA + GINGER ชาขิง - GINGER TEA + GINGER ชาขิง - TEH HALIA + HALIA ชาขิง @@ -4498,7 +4498,7 @@ Var PD_CODE2 = "##-##-##-####" Var PD_CODE3 = "##-##-##-####" ; begin lang - Var aliasName[0] = "LIME \nGINGER TEA" + Var aliasName[0] = "LIME GINGER" Var aliasDesc[0] = "Ginger, Lime & Water" Var aliasName[1] = "ชาขิงมะนาว" Var aliasDesc[1] = "ขิง มะนาว และน้ำ" @@ -4506,15 +4506,15 @@ Var aliasDesc[2] = "-" Var aliasName[3] = "-" Var aliasDesc[3] = "-" - Var aliasName[4] = "TEH HALIA LIMAU" + Var aliasName[4] = "HALIA LIMAU" Var aliasDesc[4] = "Halia, Limau, Air" Var aliasName[5] = "" Var aliasDesc[5] = "" - Var NameLang[0][0] = "Hot LIME GINGER TEA" + Var NameLang[0][0] = "Hot LIME GINGER" Var NameLang[0][1] = "ชาขิงมะนาวร้อน" Var NameLang[0][2] = "-" Var NameLang[0][3] = "-" - Var NameLang[0][4] = "TEH LIMAU HALIA PANAS" + Var NameLang[0][4] = "LIMAU HALIA PANAS" Var NameLang[0][5] = "" Var DescLang[0][0] = "Ginger, Lime and Hot water" Var DescLang[0][1] = "ขิง มะนาว และน้ำร้อน" @@ -4593,11 +4593,11 @@ KanitMediumTTF 0x322B26 - LIME \nGINGER TEA + LIME GINGER ชาขิงมะนาว - LIME \nGINGER TEA + LIME GINGER ชาขิงมะนาว - TEH HALIA LIMAU + HALIA LIMAU ชาขิงมะนาว diff --git a/inter/mys/xml/page_topping_select6.lxml b/inter/mys/xml/page_topping_select6.lxml index 52ac038a..52373fd8 100644 --- a/inter/mys/xml/page_topping_select6.lxml +++ b/inter/mys/xml/page_topping_select6.lxml @@ -433,12 +433,15 @@ CRLFToSpace showname CRLFToSpace showdesc - If BGSugar = "Enable" Then + If SugarSoundFlag = 1 Then If SelectDrinkType = 1 Then If show_eng = "true" Then Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" Else - Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" + + ; Play Sound #zone + Play PlaySoundLag EndIf EndIf EndIf @@ -474,7 +477,9 @@ Var text_x_add_oreo_price = 510 Var text_show_normal_x = 408 Var text_show_blend_x = 872 - Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" + If BGSugar = "Enable" Then + Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" + EndIf EndIf If LanguageShow = "THAI" Then Var topping_shot_price_x = 600 @@ -1106,12 +1111,35 @@ Var ToppingGotoPayment = "false" + Var SugarSoundFlag = 0 + If BGSugarNew = "Enable" Then + Var SugarSoundFlag = 1 + + EndIf If BGSugar = "Enable" Then + Var SugarSoundFlag = 1 + + EndIf + + If BGSugarHotHealthy = "Enable" Then + Var SugarSoundFlag = 1 + EndIf + If BGSugarColdHealthy = "Enable" Then + Var SugarSoundFlag = 1 + EndIf + If BGSugarNew = "Enable" Then + Var SugarSoundFlag = 1 + EndIf + + If SugarSoundFlag = 1 Then If SelectDrinkType = 1 Then If show_eng = "true" Then Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" Else - Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" + + ; Play Sound #zone + Play PlaySoundLag EndIf EndIf EndIf