diff --git a/xml/dummy_layout.inc b/xml/dummy_layout.inc index 91670d7f..e351b0d5 100644 --- a/xml/dummy_layout.inc +++ b/xml/dummy_layout.inc @@ -488,38 +488,37 @@ center-vertical-horizontal - ; - - - - ; ==================> Len = 16 - ; 12-01-01-0001 - - - + 33 22 225 296 - esp102101001Enable + Flag( 12-03-03-0032.Button,Disable=Invisible,$Sum1203030032) - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "เอสเพรสโซ่" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "กาแฟ (30 ml)" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "ESPRESSO" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Espresso (30 ml)" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-21-01-0001.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-21-01-0001.Button - StringFmt( $12-21-01-0001.Price , DisplayFormat, PreScaleConvertShow) ; test + $12-03-03-0032.Button + StringFmt( $12-03-03-0032.Price , DisplayFormat, PreScaleConvertShow) ; test 81 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" + 49 + 117 + + eval( + If $Sum1203030032 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0032.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" - 183 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1203030032 + text_unavailable + center-vertical-horizontal - - ; - - - ; ==================> Len = 16 diff --git a/xml/page_catalog2.xml b/xml/page_catalog2.xml index d5ae8ace..7fcd181c 100644 --- a/xml/page_catalog2.xml +++ b/xml/page_catalog2.xml @@ -626,7 +626,12 @@ EndIf - + + Var SongkranEnable = 0 + + + Var SongkranEnable = 1 + diff --git a/xml/page_catalog_group_appfast.xml b/xml/page_catalog_group_appfast.xml index 29721e65..87249ffd 100644 --- a/xml/page_catalog_group_appfast.xml +++ b/xml/page_catalog_group_appfast.xml @@ -552,12 +552,9 @@ SoundVolume Var NameDrink = "APP FAST ORIGINAL" - Var NameDrinkTH = "แอพ ฟาสท์ -วานิลลา (Original)" - Var DrinkDescriptionTH = "โปรตีนจากพืชคุณภาพสูง -พร้อมสารอาหารที่มีประโยชน์" - Var DrinkDescription = "Plant-based protein with -essential nutrients" + Var NameDrinkTH = "แอพ ฟาสท์ วานิลลา (Original)" + Var DrinkDescriptionTH = "โปรตีนจากพืชคุณภาพสูง พร้อมสารอาหารที่มีประโยชน์" + Var DrinkDescription = "Plant-based protein with essential nutrients" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_original_BDMS.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -807,10 +804,8 @@ essential nutrients" Var NameDrink = "APP FAST ESPRESSO" Var NameDrinkTH = "แอพ ฟาสท์ กาแฟ" - Var DrinkDescriptionTH = "โปรตีนจากพืชคุณภาพสูง -พร้อมสารอาหารที่มีประโยชน์" - Var DrinkDescription = "Plant-based protein with -essential nutrients" + Var DrinkDescriptionTH = "โปรตีนจากพืชคุณภาพสูง พร้อมสารอาหารที่มีประโยชน์" + Var DrinkDescription = "Plant-based protein with essential nutrients" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_espresso_BDMS.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -1057,13 +1052,10 @@ essential nutrients" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "APP FAST -CHOCOLATE" + Var NameDrink = "APP FAST CHOCOLATE" Var NameDrinkTH = "แอพ ฟาสท์ ช็อกโก" - Var DrinkDescriptionTH = "โปรตีนจากพืชคุณภาพสูง -พร้อมสารอาหารที่มีประโยชน์" - Var DrinkDescription = "Plant-based protein with -essential nutrients" + Var DrinkDescriptionTH = "โปรตีนจากพืชคุณภาพสูง พร้อมสารอาหารที่มีประโยชน์" + Var DrinkDescription = "Plant-based protein with essential nutrients" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Chocolate_BDMS.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -1311,13 +1303,10 @@ essential nutrients" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "APP FAST -THAI TEA" + Var NameDrink = "APP FAST THAI TEA" Var NameDrinkTH = "แอพ ฟาสท์ ชาไทย" - Var DrinkDescriptionTH = "โปรตีนจากพืชคุณภาพสูง -พร้อมสารอาหารที่มีประโยชน์" - Var DrinkDescription = "Plant-based protein with -essential nutrients" + Var DrinkDescriptionTH = "โปรตีนจากพืชคุณภาพสูง พร้อมสารอาหารที่มีประโยชน์" + Var DrinkDescription = "Plant-based protein with essential nutrients" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Thaitea_BDMS.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -1565,13 +1554,10 @@ essential nutrients" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "APP FAST -MATCHA" + Var NameDrink = "APP FAST MATCHA" Var NameDrinkTH = "แอพ ฟาสท์ ชาเขียว" - Var DrinkDescriptionTH = "โปรตีนจากพืชคุณภาพสูง -พร้อมสารอาหารที่มีประโยชน์" - Var DrinkDescription = "Plant-based protein with -essential nutrients" + Var DrinkDescriptionTH = "โปรตีนจากพืชคุณภาพสูง พร้อมสารอาหารที่มีประโยชน์" + Var DrinkDescription = "Plant-based protein with essential nutrients" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Matcha_BDMS.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price diff --git a/xml/page_catalog_group_cocktail.xml b/xml/page_catalog_group_cocktail.xml index 687a7f48..371f1c3c 100644 --- a/xml/page_catalog_group_cocktail.xml +++ b/xml/page_catalog_group_cocktail.xml @@ -544,10 +544,8 @@ Var NameDrink = "ILYSB" Var NameDrinkTH = "ILYSB" - Var DrinkDescriptionTH = "Pineapple juice, Limeade, -Soda, Ice, Malibu" - Var DrinkDescription = "Pineapple juice, Limeade, -Soda, Ice, Malibu" + Var DrinkDescriptionTH = "Pineapple juice, Limeade, Soda, Ice, Malibu" + Var DrinkDescription = "Pineapple juice, Limeade, Soda, Ice, Malibu" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_ILYSB.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -1044,10 +1042,8 @@ Soda, Ice, Malibu" Var NameDrink = "Behind Bars" Var NameDrinkTH = "Behind Bars" - Var DrinkDescriptionTH = "Strawberry syrup, Limeade, -Soda, Malibu" - Var DrinkDescription = "Strawberry syrup, Limeade, -Soda, Malibu" + Var DrinkDescriptionTH = "Strawberry syrup, Limeade, Soda, Malibu" + Var DrinkDescription = "Strawberry syrup, Limeade, Soda, Malibu" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Third_Behind_Bars.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -1297,8 +1293,7 @@ Soda, Malibu" Var NameDrink = "Pinky Promise" Var NameDrinkTH = "Pinky Promise" Var DrinkDescriptionTH = "Lychee, Limeade, Soda, Rum" - Var DrinkDescription = "Lychee, Limeade, Soda, -Mount Gay Rum" + Var DrinkDescription = "Lychee, Limeade, Soda, Mount Gay Rum" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Pinky_Promise.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -1546,10 +1541,8 @@ Mount Gay Rum" Var NameDrink = "Love Potion" Var NameDrinkTH = "Love Potion" - Var DrinkDescriptionTH = "Pineapple juice, Limeade, -Soda, Ice, Mount Gay Rum" - Var DrinkDescription = "Pineapple juice, Limeade, -Soda, Ice, Mount Gay Rum" + Var DrinkDescriptionTH = "Pineapple juice, Limeade, Soda, Ice, Mount Gay Rum" + Var DrinkDescription = "Pineapple juice, Limeade, Soda, Ice, Mount Gay Rum" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Love_Potion.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -2294,10 +2287,8 @@ Soda, Ice, Mount Gay Rum" Var NameDrink = "Long Night" Var NameDrinkTH = "Long Night" - Var DrinkDescriptionTH = "Strawberry syrup, Pineaple -juice Ice, Malibu" - Var DrinkDescription = "Strawberry syrup, Pineaple -juice Ice, Malibu" + Var DrinkDescriptionTH = "Strawberry syrup, Pineaple juice Ice, Malibu" + Var DrinkDescription = "Strawberry syrup, Pineaple juice Ice, Malibu" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Long_Night.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -2546,10 +2537,8 @@ juice Ice, Malibu" Var NameDrink = "Good Night Kiss" Var NameDrinkTH = "Good Night Kiss" - Var DrinkDescriptionTH = "Black sugar syrup, Milk, Ice, -Mount Gay Rum" - Var DrinkDescription = "Black sugar syrup, Milk, Ice, -Mount Gay Rum" + Var DrinkDescriptionTH = "Black sugar syrup, Milk, Ice, Mount Gay Rum" + Var DrinkDescription = "Black sugar syrup, Milk, Ice, Mount Gay Rum" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Good_Night_Kiss.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -2798,10 +2787,8 @@ Mount Gay Rum" Var NameDrink = "Forever Love" Var NameDrinkTH = "Forever Love" - Var DrinkDescriptionTH = "Lychee juice, Pineaple juice, -Ice, Mount Gay Rum" - Var DrinkDescription = "Lychee juice, Pineaple juice, -Ice, Mount Gay Rum" + Var DrinkDescriptionTH = "Lychee juice, Pineaple juice, Ice, Mount Gay Rum" + Var DrinkDescription = "Lychee juice, Pineaple juice, Ice, Mount Gay Rum" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Alcohol_Forever_Love.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml index 7ca0dcc5..cf45777c 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -1043,8 +1043,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "DOUBLE -ESPRESSO" + Var NameDrink = "DOUBLE ESPRESSO" Var NameDrinkTH = "ดับเบิลเอสเพรสโซ่" Var DrinkDescriptionTH = "กาแฟ (60 ml)" Var DrinkDescription = "Espresso (60 ml)" @@ -1295,8 +1294,7 @@ ESPRESSO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "DOUBLE -ESPRESSO" + Var NameDrink = "DOUBLE ESPRESSO" Var NameDrinkTH = "ดับเบิลเอสเพรสโซ่" Var DrinkDescriptionTH = "กาแฟ (60 ml)" Var DrinkDescription = "Espresso (60 ml)" @@ -2049,14 +2047,10 @@ ESPRESSO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "ESPRESSO -ETHIOPAI GUJI" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต -Guji Queen Berry" - Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) -หอมสตรอว์เบอร์รี ส้ม และดอกไม้" - Var DrinkDescription = "Light roast natural process: -Strawberry, Orange, Floral" + Var NameDrink = "ESPRESSO ETHIOPAI GUJI" + Var NameDrinkTH = "เอสเพรสโซ่ช็อต Guji Queen Berry" + Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" + Var DrinkDescription = "Light roast natural process: Strawberry, Orange, Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0013.Price @@ -2309,14 +2303,10 @@ Strawberry, Orange, Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "BLUE DADDY -ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต -BLUE DADDY" - Var DrinkDescriptionTH = "Washed process -หอมบลูเบอร์รี และดอกไม้" - Var DrinkDescription = "Washed process -Note: Blue Berry & Floral" + Var NameDrink = "BLUE DADDY ESPRESSO" + Var NameDrinkTH = "เอสเพรสโซ่ช็อต BLUE DADDY" + Var DrinkDescriptionTH = "Washed process หอมบลูเบอร์รี และดอกไม้" + Var DrinkDescription = "Washed process Note: Blue Berry & Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_bluedaddy.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0020.Price @@ -2569,14 +2559,10 @@ Note: Blue Berry & Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "CHOPIN -ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต -CHOPIN" - Var DrinkDescriptionTH = "Raisin Honey process -หอมสตรอว์เบอร์รี กุหลาบ มะลิ" - Var DrinkDescription = "Raisin Honey process -Note: Strawberry & Floral" + Var NameDrink = "CHOPIN ESPRESSO" + Var NameDrinkTH = "เอสเพรสโซ่ช็อต CHOPIN" + Var DrinkDescriptionTH = "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" + Var DrinkDescription = "Raisin Honey process Note: Strawberry & Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_chopin.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0043.Price @@ -2829,10 +2815,8 @@ Note: Strawberry & Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MANDARINE -ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต -MANDARINE" + Var NameDrink = "MANDARINE ESPRESSO" + Var NameDrinkTH = "เอสเพรสโซ่ช็อต MANDARINE" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: ดอกส้ม น้ำผึ้ง คาราเมล ช็อกโกแล็ต" Var DrinkDescription = "Light Roast. Note: Orange Blossom, Honey, Caramel, Chocolate Bar." Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_Mandarine.png" @@ -3085,10 +3069,8 @@ ESPRESSO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "OPUS ONE -ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต -OPUS ONE" + Var NameDrink = "OPUS ONE ESPRESSO" + Var NameDrinkTH = "เอสเพรสโซ่ช็อต OPUS ONE" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น" Var DrinkDescription = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_opus_one.png" @@ -3341,14 +3323,10 @@ ESPRESSO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MOZART -ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต -MOZART " - Var DrinkDescriptionTH = "Raisin Honey process -หอมสตรอว์เบอร์รี กุหลาบ มะลิ" - Var DrinkDescription = "Raisin Honey process -Note: Strawberry & Floral" + Var NameDrink = "MOZART ESPRESSO" + Var NameDrinkTH = "เอสเพรสโซ่ช็อต MOZART " + Var DrinkDescriptionTH = "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" + Var DrinkDescription = "Raisin Honey process Note: Strawberry & Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_mozart.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0022.Price @@ -3601,14 +3579,10 @@ Note: Strawberry & Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "SNOWWHITE -ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต -SNOWWHITE" - Var DrinkDescriptionTH = "Anaerobic process -หอมมะลิ น้ำผึ้ง เมเปิล" - Var DrinkDescription = "Anaerobic process -Note: Jasmine & Honey" + Var NameDrink = "SNOWWHITE ESPRESSO" + Var NameDrinkTH = "เอสเพรสโซ่ช็อต SNOWWHITE" + Var DrinkDescriptionTH = "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" + Var DrinkDescription = "Anaerobic process Note: Jasmine & Honey" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_snowwhite.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0024.Price @@ -3861,14 +3835,10 @@ Note: Jasmine & Honey" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "WHISKY DUDE -ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต -WHISKY DUDE" - Var DrinkDescriptionTH = "Washed Sherry cask ferment -หอมวิสกี้ ช็อกโกแลต วนิลา" - Var DrinkDescription = "Washed Sherry cask ferment -Note: Whisky & Vanilla" + Var NameDrink = "WHISKY DUDE ESPRESSO" + Var NameDrinkTH = "เอสเพรสโซ่ช็อต WHISKY DUDE" + Var DrinkDescriptionTH = "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" + Var DrinkDescription = "Washed Sherry cask ferment Note: Whisky & Vanilla" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_whiskydude.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0026.Price @@ -4121,14 +4091,10 @@ Note: Whisky & Vanilla" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PEACHER -ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต -PEACHER" - Var DrinkDescriptionTH = "Barrel-aged process -หอมพีช, ชา, ช็อกโกแลต" - Var DrinkDescription = "Barrel-aged process -Note: Peach, tea, chocolate" + Var NameDrink = "PEACHER ESPRESSO" + Var NameDrinkTH = "เอสเพรสโซ่ช็อต PEACHER" + Var DrinkDescriptionTH = "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" + Var DrinkDescription = "Barrel-aged process Note: Peach, tea, chocolate" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_peacher.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0028.Price @@ -4381,12 +4347,9 @@ Note: Peach, tea, chocolate" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PURE BEAUTY -ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต -PURE BEAUTY" - Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) -กลิ่นดอกไม้ ผลไม้เขตร้อน" + Var NameDrink = "PURE BEAUTY ESPRESSO" + Var NameDrinkTH = "เอสเพรสโซ่ช็อต PURE BEAUTY" + Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_pure_beauty.png" Var OpenFromXML = CurrentXMLFileName2 @@ -4640,8 +4603,7 @@ ESPRESSO" SoundVolume Var NameDrink = "GEISHA ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต -GEISHA" + Var NameDrinkTH = "เอสเพรสโซ่ช็อต GEISHA" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" Var DrinkDescription = "Light Roast (natural process) Lemon, Peach, Honey, Jasmin" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_geisha.png" @@ -4894,12 +4856,9 @@ GEISHA" SoundVolume Var NameDrink = "ROSALYN ESPRESSO" - Var NameDrinkTH = "เอสเพรสโซ่ช็อต -ROSALYN" - Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process) -กลิ่นกุหลาบ และ เบอร์รี่" - Var DrinkDescription = "Light Roast (natural process) -Pink​ Rose & Berry" + Var NameDrinkTH = "เอสเพรสโซ่ช็อต ROSALYN" + Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" + Var DrinkDescription = "Light Roast (natural process) Pink​ Rose & Berry" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_rosalyn.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0037.Price @@ -5644,14 +5603,10 @@ Pink​ Rose & Berry" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "AMERICANO -ETHIOPAI GUJI" - Var NameDrinkTH = "อเมริกาโน -Guji Queen Berry" - Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) -หอมสตรอว์เบอร์รี ส้ม และดอกไม้" - Var DrinkDescription = "Light roast natural process: -Strawberry, Orange, Floral" + Var NameDrink = "AMERICANO ETHIOPAI GUJI" + Var NameDrinkTH = "อเมริกาโน Guji Queen Berry" + Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" + Var DrinkDescription = "Light roast natural process: Strawberry, Orange, Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0014.Price @@ -5904,14 +5859,10 @@ Strawberry, Orange, Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "BLUE DADDY -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -BLUE DADDY" - Var DrinkDescriptionTH = "Washed process -หอมบลูเบอร์รี และดอกไม้" - Var DrinkDescription = "Washed process -Note: Blue Berry & Floral" + Var NameDrink = "BLUE DADDY AMERICANO" + Var NameDrinkTH = "อเมริกาโน BLUE DADDY" + Var DrinkDescriptionTH = "Washed process หอมบลูเบอร์รี และดอกไม้" + Var DrinkDescription = "Washed process Note: Blue Berry & Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_bluedaddy.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0019.Price @@ -6164,14 +6115,10 @@ Note: Blue Berry & Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "CHOPIN -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -CHOPIN" - Var DrinkDescriptionTH = "Raisin Honey process -หอมสตรอว์เบอร์รี กุหลาบ มะลิ" - Var DrinkDescription = "Raisin Honey process -Note: Strawberry & Floral" + Var NameDrink = "CHOPIN AMERICANO" + Var NameDrinkTH = "อเมริกาโน CHOPIN" + Var DrinkDescriptionTH = "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" + Var DrinkDescription = "Raisin Honey process Note: Strawberry & Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_chopin.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0044.Price @@ -6424,10 +6371,8 @@ Note: Strawberry & Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MANDARINE -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -MANDARINE" + Var NameDrink = "MANDARINE AMERICANO" + Var NameDrinkTH = "อเมริกาโน MANDARINE" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: ดอกส้ม น้ำผึ้ง คาราเมล ช็อกโกแล็ต" Var DrinkDescription = "Light Roast. Note: Orange Blossom, Honey, Caramel, Chocolate Bar." Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_Mandarine.png" @@ -6680,10 +6625,8 @@ AMERICANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "OPUS ONE -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -OPUS ONE" + Var NameDrink = "OPUS ONE AMERICANO" + Var NameDrinkTH = "อเมริกาโน OPUS ONE" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น" Var DrinkDescription = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_chopin.png" @@ -6936,14 +6879,10 @@ AMERICANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MOZART -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -MOZART" - Var DrinkDescriptionTH = "Raisin Honey process -หอมสตรอว์เบอร์รี กุหลาบ มะลิ" - Var DrinkDescription = "Raisin Honey process -Note: Strawberry & Floral" + Var NameDrink = "MOZART AMERICANO" + Var NameDrinkTH = "อเมริกาโน MOZART" + Var DrinkDescriptionTH = "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" + Var DrinkDescription = "Raisin Honey process Note: Strawberry & Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_mozart.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0021.Price @@ -7196,14 +7135,10 @@ Note: Strawberry & Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "WHISKY DUDE -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -WHISKY DUDE" - Var DrinkDescriptionTH = "Washed Sherry cask ferment -หอมวิสกี้ ช็อกโกแลต วนิลา" - Var DrinkDescription = "Washed Sherry cask ferment -Note: Whisky & Vanilla" + Var NameDrink = "WHISKY DUDE AMERICANO" + Var NameDrinkTH = "อเมริกาโน WHISKY DUDE" + Var DrinkDescriptionTH = "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" + Var DrinkDescription = "Washed Sherry cask ferment Note: Whisky & Vanilla" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_whiskydude.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0025.Price @@ -7456,14 +7391,10 @@ Note: Whisky & Vanilla" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "SNOWWHITE -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -SNOWWHITE" - Var DrinkDescriptionTH = "Anaerobic process -หอมมะลิ น้ำผึ้ง เมเปิล" - Var DrinkDescription = "Anaerobic process -Note: Jasmine & Honey" + Var NameDrink = "SNOWWHITE AMERICANO" + Var NameDrinkTH = "อเมริกาโน SNOWWHITE" + Var DrinkDescriptionTH = "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" + Var DrinkDescription = "Anaerobic process Note: Jasmine & Honey" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_snowwhite.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0023.Price @@ -7716,14 +7647,10 @@ Note: Jasmine & Honey" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PEACHER -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -PEACHER" - Var DrinkDescriptionTH = "Barrel-aged process -หอมพีช, ชา, ช็อกโกแลต" - Var DrinkDescription = "Barrel-aged process -Note: Peach, tea, chocolate" + Var NameDrink = "PEACHER AMERICANO" + Var NameDrinkTH = "อเมริกาโน PEACHER" + Var DrinkDescriptionTH = "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" + Var DrinkDescription = "Barrel-aged process Note: Peach, tea, chocolate" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_peacher.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0027.Price @@ -7976,12 +7903,9 @@ Note: Peach, tea, chocolate" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PURE BEAUTY -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -PURE BEAUTY" - Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) -กลิ่นดอกไม้ ผลไม้เขตร้อน" + Var NameDrink = "PURE BEAUTY AMERICANO" + Var NameDrinkTH = "อเมริกาโน PURE BEAUTY" + Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_pure_beauty.png" Var OpenFromXML = CurrentXMLFileName2 @@ -8234,10 +8158,8 @@ AMERICANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "GEISHA -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -GEISHA" + Var NameDrink = "GEISHA AMERICANO" + Var NameDrinkTH = "อเมริกาโน GEISHA" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" Var DrinkDescription = "Light Roast (natural process) Lemon, Peach, Honey, Jasmin" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_geisha.png" @@ -8490,14 +8412,10 @@ AMERICANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "ROSALYN -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -ROSALYN" - Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process) -กลิ่นกุหลาบ และ เบอร์รี่" - Var DrinkDescription = "Light Roast (natural process) -Pink​ Rose & Berry" + Var NameDrink = "ROSALYN AMERICANO" + Var NameDrinkTH = "อเมริกาโน ROSALYN" + Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" + Var DrinkDescription = "Light Roast (natural process) Pink​ Rose & Berry" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_rosalyn.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0038.Price @@ -8750,14 +8668,10 @@ Pink​ Rose & Berry" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "BLUE DADDY -ALMOST DIRTY" - Var NameDrinkTH = "BLUE DADDY -ALMOST DIRTY" - Var DrinkDescriptionTH = "Washed process -หอมบลูเบอร์รี และดอกไม้" - Var DrinkDescription = "Washed process -Note: Blue Berry & Floral" + Var NameDrink = "BLUE DADDY ALMOST DIRTY" + Var NameDrinkTH = "BLUE DADDY ALMOST DIRTY" + Var DrinkDescriptionTH = "Washed process หอมบลูเบอร์รี และดอกไม้" + Var DrinkDescription = "Washed process Note: Blue Berry & Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_bluedaddy.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -9006,14 +8920,10 @@ Note: Blue Berry & Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MOZART -ALMOST DIRTY" - Var NameDrinkTH = "MOZART -ALMOST DIRTY" - Var DrinkDescriptionTH = "Raisin Honey process -หอมสตรอว์เบอร์รี กุหลาบ มะลิ" - Var DrinkDescription = "Raisin Honey process -Note: Strawberry & Floral" + Var NameDrink = "MOZART ALMOST DIRTY" + Var NameDrinkTH = "MOZART ALMOST DIRTY" + Var DrinkDescriptionTH = "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" + Var DrinkDescription = "Raisin Honey process Note: Strawberry & Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_mozart.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -9262,14 +9172,10 @@ Note: Strawberry & Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "CHOPIN -ALMOST DIRTY" - Var NameDrinkTH = "CHOPIN -ALMOST DIRTY" - Var DrinkDescriptionTH = "Raisin Honey process -หอมสตรอว์เบอร์รี กุหลาบ มะลิ" - Var DrinkDescription = "Raisin Honey process -Note: Strawberry & Floral" + Var NameDrink = "CHOPIN ALMOST DIRTY" + Var NameDrinkTH = "CHOPIN ALMOST DIRTY" + Var DrinkDescriptionTH = "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" + Var DrinkDescription = "Raisin Honey process Note: Strawberry & Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_chopin.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -9518,10 +9424,8 @@ Note: Strawberry & Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MANDARINE -ALMOST DIRTY" - Var NameDrinkTH = "MANDARINE -ALMOST DIRTY" + Var NameDrink = "MANDARINE ALMOST DIRTY" + Var NameDrinkTH = "MANDARINE ALMOST DIRTY" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: ดอกส้ม น้ำผึ้ง คาราเมล ช็อกโกแล็ต" Var DrinkDescription = "Light Roast. Note: Orange Blossom, Honey, Caramel, Chocolate Bar." Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_Mandarine.png" @@ -9770,10 +9674,8 @@ ALMOST DIRTY" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "OPUS ONE -ALMOST DIRTY" - Var NameDrinkTH = "OPUS ONE -ALMOST DIRTY" + Var NameDrink = "OPUS ONE ALMOST DIRTY" + Var NameDrinkTH = "OPUS ONE ALMOST DIRTY" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น" Var DrinkDescription = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_opus_one.png" @@ -10022,14 +9924,10 @@ ALMOST DIRTY" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "WHISKY DUDE -ALMOST DIRTY" - Var NameDrinkTH = "WHISKY DUDE -ALMOST DIRTY" - Var DrinkDescriptionTH = "Washed Sherry cask ferment -หอมวิสกี้ ช็อกโกแลต วนิลา" - Var DrinkDescription = "Washed Sherry cask ferment -Note: Whisky & Vanilla" + Var NameDrink = "WHISKY DUDE ALMOST DIRTY" + Var NameDrinkTH = "WHISKY DUDE ALMOST DIRTY" + Var DrinkDescriptionTH = "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" + Var DrinkDescription = "Washed Sherry cask ferment Note: Whisky & Vanilla" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_whiskydude.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -10278,14 +10176,10 @@ Note: Whisky & Vanilla" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "SNOWWHITE -ALMOST DIRTY" - Var NameDrinkTH = "SNOWWHITE -ALMOST DIRTY" - Var DrinkDescriptionTH = "Anaerobic process -หอมมะลิ น้ำผึ้ง เมเปิล" - Var DrinkDescription = "Anaerobic process -Note: Jasmine & Honey" + Var NameDrink = "SNOWWHITE ALMOST DIRTY" + Var NameDrinkTH = "SNOWWHITE ALMOST DIRTY" + Var DrinkDescriptionTH = "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" + Var DrinkDescription = "Anaerobic process Note: Jasmine & Honey" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light__snowwhite.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -10534,14 +10428,10 @@ Note: Jasmine & Honey" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "QUEEN BERRY -ALMOST DIRTY" - Var NameDrinkTH = "QUEEN BERRY -ALMOST DIRTY" - Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process) -หอมสตรอว์เบอร์รี ส้ม และดอกไม้" - Var DrinkDescription = "Light roast natural process: -Strawberry, Orange, Floral" + Var NameDrink = "QUEEN BERRY ALMOST DIRTY" + Var NameDrinkTH = "QUEEN BERRY ALMOST DIRTY" + Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" + Var DrinkDescription = "Light roast natural process: Strawberry, Orange, Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -10790,14 +10680,10 @@ Strawberry, Orange, Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PEACHER -ALMOST DIRTY" - Var NameDrinkTH = "PEACHER -ALMOST DIRTY" - Var DrinkDescriptionTH = "Barrel-aged process -หอมพีช, ชา, ช็อกโกแลต" - Var DrinkDescription = "Barrel-aged process -Note: Peach, tea, chocolate" + Var NameDrink = "PEACHER ALMOST DIRTY" + Var NameDrinkTH = "PEACHER ALMOST DIRTY" + Var DrinkDescriptionTH = "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" + Var DrinkDescription = "Barrel-aged process Note: Peach, tea, chocolate" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light__peacher.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -11046,12 +10932,9 @@ Note: Peach, tea, chocolate" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PURE BEAUTY -ALMOST DIRTY" - Var NameDrinkTH = "PURE BEAUTY -ALMOST DIRTY" - Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) -กลิ่นดอกไม้ ผลไม้เขตร้อน" + Var NameDrink = "PURE BEAUTY ALMOST DIRTY" + Var NameDrinkTH = "PURE BEAUTY ALMOST DIRTY" + Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_pure_beauty.png" Var OpenFromXML = CurrentXMLFileName2 @@ -11300,10 +11183,8 @@ ALMOST DIRTY" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "GEISHA -ALMOST DIRTY" - Var NameDrinkTH = "GEISHA -ALMOST DIRTY" + Var NameDrink = "GEISHA ALMOST DIRTY" + Var NameDrinkTH = "GEISHA ALMOST DIRTY" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" Var DrinkDescription = "Light Roast (natural process) Lemon, Peach, Honey, Jasmin" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_geisha.png" @@ -11552,14 +11433,10 @@ ALMOST DIRTY" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "ROSALYN -ALMOST DIRTY" - Var NameDrinkTH = "ROSALYN -ALMOST DIRTY" - Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process) -กลิ่นกุหลาบ และ เบอร์รี่" - Var DrinkDescription = "Light Roast (natural process) -Pink​ Rose & Berry" + Var NameDrink = "ROSALYN ALMOST DIRTY" + Var NameDrinkTH = "ROSALYN ALMOST DIRTY" + Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" + Var DrinkDescription = "Light Roast (natural process) Pink​ Rose & Berry" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_rosalyn.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -11808,8 +11685,7 @@ Pink​ Rose & Berry" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "THAI -ICED ESPRESSO" + Var NameDrink = "THAI ICED ESPRESSO" Var NameDrinkTH = "เอสเย็นแบบไทยๆ" Var DrinkDescriptionTH = "กาแฟ นม และ น้ำแข็ง " Var DrinkDescription = "Espresso, Milk, Sugar,Ice" @@ -12056,8 +11932,7 @@ ICED ESPRESSO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "THAI -ICED ESPRESSO" + Var NameDrink = "THAI ICED ESPRESSO" Var NameDrinkTH = "เอสเย็นแบบไทยๆ" Var DrinkDescriptionTH = "กาแฟ นม และ น้ำแข็ง " Var DrinkDescription = "Espresso, Milk, Sugar,Ice" @@ -13810,10 +13685,8 @@ ICED ESPRESSO" Var NameDrink = "CARAMEL LATTE" Var NameDrinkTH = "คาราเมลลาเต้" - Var DrinkDescriptionTH = "กาแฟ นม และ นม -น้ำเชื่อมคาราเมล" - Var DrinkDescription = "Espresso, Milk, -Caramel Syrup" + Var DrinkDescriptionTH = "กาแฟ นม และ นม น้ำเชื่อมคาราเมล" + Var DrinkDescription = "Espresso, Milk, Caramel Syrup" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0007.Price @@ -14064,10 +13937,8 @@ Caramel Syrup" Var NameDrink = "CARAMEL LATTE" Var NameDrinkTH = "คาราเมลลาเต้" - Var DrinkDescriptionTH = "กาแฟ นม และ นม -น้ำเชื่อมคาราเมล" - Var DrinkDescription = "Espresso, Milk, -Caramel Syrup" + Var DrinkDescriptionTH = "กาแฟ นม และ นม น้ำเชื่อมคาราเมล" + Var DrinkDescription = "Espresso, Milk, Caramel Syrup" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-21-01-0007.Price @@ -14317,11 +14188,9 @@ Caramel Syrup" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MATCHA -CAFÉ LATTE" + Var NameDrink = "MATCHA CAFÉ LATTE" Var NameDrinkTH = "กาแฟมัทฉะลาเต้" - Var DrinkDescriptionTH = "กาแฟ นม ชาเขียวมัทฉะ -และ นม" + Var DrinkDescriptionTH = "กาแฟ นม ชาเขียวมัทฉะ และ นม" Var DrinkDescription = "Espresso, Matcha, Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_greenteacoffee_lattle.png" Var OpenFromXML = CurrentXMLFileName2 @@ -14571,11 +14440,9 @@ CAFÉ LATTE" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MATCHA -CAFÉ LATTE" + Var NameDrink = "MATCHA CAFÉ LATTE" Var NameDrinkTH = "กาแฟมัทฉะลาเต้" - Var DrinkDescriptionTH = "กาแฟ นม ชาเขียวมัทฉะ -และ นม" + Var DrinkDescriptionTH = "กาแฟ นม ชาเขียวมัทฉะ และ นม" Var DrinkDescription = "Espresso, Matcha, Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_greenteacoffee_lattle.png" Var OpenFromXML = CurrentXMLFileName2 @@ -14826,11 +14693,9 @@ CAFÉ LATTE" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MATCHA -CAFÉ LATTE" + Var NameDrink = "MATCHA CAFÉ LATTE" Var NameDrinkTH = "กาแฟมัทฉะลาเต้" - Var DrinkDescriptionTH = "กาแฟ นม ชาเขียวมัทฉะ -และ นม" + Var DrinkDescriptionTH = "กาแฟ นม ชาเขียวมัทฉะ และ นม" Var DrinkDescription = "Espresso, Matcha, Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_greenteacoffee_lattle.png" Var OpenFromXML = CurrentXMLFileName2 @@ -15080,11 +14945,9 @@ CAFÉ LATTE" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MATCHA -CAFÉ LATTE" + Var NameDrink = "MATCHA CAFÉ LATTE" Var NameDrinkTH = "กาแฟมัทฉะลาเต้" - Var DrinkDescriptionTH = "กาแฟ นม ชาเขียวมัทฉะ -และ นม" + Var DrinkDescriptionTH = "กาแฟ นม ชาเขียวมัทฉะ และ นม" Var DrinkDescription = "Espresso, Matcha, Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_greenteacoffee_lattle.png" Var OpenFromXML = CurrentXMLFileName2 @@ -15335,13 +15198,10 @@ CAFÉ LATTE" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "BROWN -SUGAR LATTE" + Var NameDrink = "BROWN SUGAR LATTE" Var NameDrinkTH = "บราวน์ชูการ์ลาเต้" - Var DrinkDescriptionTH = "กาแฟ น้ำเชื่อมน้ำตาลแดง -และ นม" - Var DrinkDescription = "Espresso, Milk, -Kokuto syrup" + Var DrinkDescriptionTH = "กาแฟ น้ำเชื่อมน้ำตาลแดง และ นม" + Var DrinkDescription = "Espresso, Milk, Kokuto syrup" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_kuromitsu_coffee.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0011.Price @@ -15591,13 +15451,10 @@ Kokuto syrup" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "BROWN -SUGAR LATTE" + Var NameDrink = "BROWN SUGAR LATTE" Var NameDrinkTH = "บราวน์ชูการ์ลาเต้" - Var DrinkDescriptionTH = "กาแฟ น้ำเชื่อมน้ำตาลแดง -และ นม" - Var DrinkDescription = "Espresso, Milk, -Kokuto syrup" + Var DrinkDescriptionTH = "กาแฟ น้ำเชื่อมน้ำตาลแดง และ นม" + Var DrinkDescription = "Espresso, Milk, Kokuto syrup" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_kuromitsu_coffee.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-21-01-0011.Price @@ -15848,11 +15705,9 @@ Kokuto syrup" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MELON -CAFÉ LATTE" + Var NameDrink = "MELON CAFÉ LATTE" Var NameDrinkTH = "กาแฟเมล่อนลาเต้" - Var DrinkDescriptionTH = "กาแฟ เมล่อน น้ำตาล -และ นม" + Var DrinkDescriptionTH = "กาแฟ เมล่อน น้ำตาล และ นม" Var DrinkDescription = "Espresso, Melon, Milk, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_melon_americano.png" Var OpenFromXML = CurrentXMLFileName2 @@ -16102,11 +15957,9 @@ CAFÉ LATTE" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MELON -CAFÉ LATTE" + Var NameDrink = "MELON CAFÉ LATTE" Var NameDrinkTH = "กาแฟเมล่อนลาเต้" - Var DrinkDescriptionTH = "กาแฟ เมล่อน น้ำตาล -และ นม" + Var DrinkDescriptionTH = "กาแฟ เมล่อน น้ำตาล และ นม" Var DrinkDescription = "Espresso, Melon, Milk, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_melon_americano.png" Var OpenFromXML = CurrentXMLFileName2 @@ -16357,13 +16210,10 @@ CAFÉ LATTE" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "TAIWANESE TEA -CAFÉ LATTE" + Var NameDrink = "TAIWANESE TEA CAFÉ LATTE" Var NameDrinkTH = "กาแฟชานมไต้หวัน" - Var DrinkDescriptionTH = "กาแฟ ชาไต้หวัน น้ำตาล -และ นม" - Var DrinkDescription = "Espresso, Taiwanese Tea, -Milk, Sugar" + Var DrinkDescriptionTH = "กาแฟ ชาไต้หวัน น้ำตาล และ นม" + Var DrinkDescription = "Espresso, Taiwanese Tea, Milk, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_taiwantea_macchiato.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0009.Price @@ -16613,13 +16463,10 @@ Milk, Sugar" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "TAIWANESE TEA -CAFÉ LATTE" + Var NameDrink = "TAIWANESE TEA CAFÉ LATTE" Var NameDrinkTH = "กาแฟชานมไต้หวัน" - Var DrinkDescriptionTH = "กาแฟ ชาไต้หวัน น้ำตาล -และ นม" - Var DrinkDescription = "Espresso, Taiwanese Tea, -Milk, Sugar" + Var DrinkDescriptionTH = "กาแฟ ชาไต้หวัน น้ำตาล และ นม" + Var DrinkDescription = "Espresso, Taiwanese Tea, Milk, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_taiwantea_macchiato.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-21-01-0009.Price @@ -16870,8 +16717,7 @@ Milk, Sugar" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "THAI TEA -CAFÉ LATTE" + Var NameDrink = "THAI TEA CAFÉ LATTE" Var NameDrinkTH = "กาแฟชาไทย" Var DrinkDescriptionTH = "กาแฟ ชาไทย นม น้ำตาล" Var DrinkDescription = "Espresso, Thai tea, Milk, Sugar" @@ -17122,8 +16968,7 @@ CAFÉ LATTE" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "THAI TEA -CAFÉ LATTE" + Var NameDrink = "THAI TEA CAFÉ LATTE" Var NameDrinkTH = "กาแฟชาไทย" Var DrinkDescriptionTH = "กาแฟ ชาไทย นม น้ำตาล" Var DrinkDescription = "Espresso, Thai tea, Milk, Sugar" @@ -17375,13 +17220,10 @@ CAFÉ LATTE" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "TAIWANESE TEA -CAFÉ LATTE" + Var NameDrink = "TAIWANESE TEA CAFÉ LATTE" Var NameDrinkTH = "กาแฟชานมไต้หวัน" - Var DrinkDescriptionTH = "กาแฟ ชาไต้หวัน น้ำตาล -และ นม" - Var DrinkDescription = "Espresso, Taiwanese Tea, -Milk, Sugar" + Var DrinkDescriptionTH = "กาแฟ ชาไต้หวัน น้ำตาล และ นม" + Var DrinkDescription = "Espresso, Taiwanese Tea, Milk, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_taiwantea_macchiato.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0030.Price @@ -17631,13 +17473,10 @@ Milk, Sugar" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "TAIWANESE TEA -CAFÉ LATTE" + Var NameDrink = "TAIWANESE TEA CAFÉ LATTE" Var NameDrinkTH = "กาแฟชานมไต้หวัน" - Var DrinkDescriptionTH = "กาแฟ ชาไต้หวัน น้ำตาล -และ นม" - Var DrinkDescription = "Espresso, Taiwanese Tea, -Milk, Sugar" + Var DrinkDescriptionTH = "กาแฟ ชาไต้หวัน น้ำตาล และ นม" + Var DrinkDescription = "Espresso, Taiwanese Tea, Milk, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_taiwantea_macchiato.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-21-01-0030.Price @@ -17891,8 +17730,7 @@ Milk, Sugar" Var NameDrink = "LYCHEECANO" Var NameDrinkTH = "ลิ้นจี่กาโน่" Var DrinkDescriptionTH = "กาแฟ น้ำ และ ลิ้นจี่" - Var DrinkDescription = "Espresso, Lychee, -Sugar, Water" + Var DrinkDescription = "Espresso, Lychee, Sugar, Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lychee_espresso.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0017.Price @@ -18143,8 +17981,7 @@ Sugar, Water" Var NameDrink = "LYCHEECANO" Var NameDrinkTH = "ลิ้นจี่กาโน่" Var DrinkDescriptionTH = "กาแฟ น้ำ และ ลิ้นจี่" - Var DrinkDescription = "Espresso, Lychee, -Sugar, Water" + Var DrinkDescription = "Espresso, Lychee, Sugar, Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lychee_espresso.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-21-01-0017.Price @@ -18396,8 +18233,7 @@ Sugar, Water" Var NameDrink = "YUZUCANO" Var NameDrinkTH = "ยูซุกาโน่" Var DrinkDescriptionTH = "กาแฟ น้ำ และ ยูซุ" - Var DrinkDescription = "Espresso, Yuzu, -Sugar, Water" + Var DrinkDescription = "Espresso, Yuzu, Sugar, Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Yuzu_americano.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0040.Price @@ -18648,8 +18484,7 @@ Sugar, Water" Var NameDrink = "YUZUCANO" Var NameDrinkTH = "ยูซุกาโน่" Var DrinkDescriptionTH = "กาแฟ น้ำ และ ยูซุ" - Var DrinkDescription = "Espresso, Yuzu, -Sugar, Water" + Var DrinkDescription = "Espresso, Yuzu, Sugar, Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Yuzu_americano.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-21-01-0040.Price @@ -18898,12 +18733,10 @@ Sugar, Water" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "TOKYO BANANA -LATTE" + Var NameDrink = "TOKYO BANANA LATTE" Var NameDrinkTH = "ลาเต้โตเกียวบานาน่า" Var DrinkDescriptionTH = "กาแฟ น้ำ นม และ กล้วย" - Var DrinkDescription = "Espresso, Tokyo Banana Syrup, -Sugar, Water" + Var DrinkDescription = "Espresso, Tokyo Banana Syrup, Sugar, Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_Banana_cafe_latte.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0042.Price @@ -19152,12 +18985,10 @@ Sugar, Water" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "TOKYO BANANA -LATTE" + Var NameDrink = "TOKYO BANANA LATTE" Var NameDrinkTH = "ลาเต้โตเกียวบานาน่า" Var DrinkDescriptionTH = "กาแฟ น้ำ นม และ กล้วย" - Var DrinkDescription = "Espresso, Tokyo Banana Syrup, -Sugar, Water" + Var DrinkDescription = "Espresso, Tokyo Banana Syrup, Sugar, Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_Banana_cafe_latte.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-21-01-0042.Price diff --git a/xml/page_catalog_group_forkid.xml b/xml/page_catalog_group_forkid.xml index 32b28c2f..e34f169e 100644 --- a/xml/page_catalog_group_forkid.xml +++ b/xml/page_catalog_group_forkid.xml @@ -1056,8 +1056,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "BROWN SUGAR -MILK" + Var NameDrink = "BROWN SUGAR MILK" Var NameDrinkTH = "นมบราวน์ชูการ์ " Var DrinkDescriptionTH = "นม และ น้ำเชื่อมน้ำตาลแดง" Var DrinkDescription = "Milk, Kokuto syrup" @@ -1312,8 +1311,7 @@ MILK" Var NameDrink = "PINK MILK" Var NameDrinkTH = "นมชมพู " - Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ นม -น้ำตาล " + Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ นม น้ำตาล " Var DrinkDescription = "Salak Syrup, Milk, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_pink_milk.png" Var OpenFromXML = CurrentXMLFileName2 @@ -2064,11 +2062,9 @@ MILK" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "STRAWCOCOA -SMOOTHIE" + Var NameDrink = "STRAWCOCOA SMOOTHIE" Var NameDrinkTH = "โกโก้สตอเบอร์รี่ปั่น" - Var DrinkDescriptionTH = "นม น้ำเชื่อมสตอเบอร์รี่ -โกโก้ และน้ำแข็ง" + Var DrinkDescriptionTH = "นม น้ำเชื่อมสตอเบอร์รี่ โกโก้ และน้ำแข็ง" Var DrinkDescription = "Milk, Cocoa, Strawberry Syrup" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberrycocoa_smoothie.png" Var OpenFromXML = CurrentXMLFileName2 @@ -2316,8 +2312,7 @@ SMOOTHIE" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "OVALTINE SMOOTHIE -VOLCANO" + Var NameDrink = "OVALTINE SMOOTHIE VOLCANO" Var NameDrinkTH = "โอวัลตินปั่นภูเขาไฟ" Var DrinkDescriptionTH = "โอวัลติน น้ำตาล และ นม" Var DrinkDescription = "Ovaltine, Sugar, milk" @@ -2566,8 +2561,7 @@ VOLCANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "COCOA OVALTINE -VOLCANO" + Var NameDrink = "COCOA OVALTINE VOLCANO" Var NameDrinkTH = "โกโก้โอดิบภูเขาไฟ" Var DrinkDescriptionTH = "โกโก้ โอวัลติน น้ำตาล และ นม" Var DrinkDescription = "Ovaltine, Cocoa, Sugar, milk" @@ -3314,8 +3308,7 @@ VOLCANO" Var NameDrink = "MELON SODA" Var NameDrinkTH = "เมล่อนโซดา" - Var DrinkDescriptionTH = "น้ำเชื่อมเมล่อน โซดา -และน้ำแข็ง" + Var DrinkDescriptionTH = "น้ำเชื่อมเมล่อน โซดา และน้ำแข็ง" Var DrinkDescription = "Melon Syrup, Soda, Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_melon_soda.png" Var OpenFromXML = CurrentXMLFileName2 @@ -3564,8 +3557,7 @@ VOLCANO" Var NameDrink = "YUZU SODA" Var NameDrinkTH = "ยูซุโซดา" - Var DrinkDescriptionTH = "น้ำเชื่อมยูซุ โซดา -และน้ำแข็ง" + Var DrinkDescriptionTH = "น้ำเชื่อมยูซุ โซดา และน้ำแข็ง" Var DrinkDescription = "Yuzu Syrup, Soda, Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_yuzu_soda.png" Var OpenFromXML = CurrentXMLFileName2 @@ -3806,19 +3798,17 @@ VOLCANO" Flag( 12-03-03-0009.Button,$Sum1203030009) - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "เอสเพรสโซ่" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "กาแฟ (30 ml)" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "ESPRESSO" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Espresso (30 ml)" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $12-21-01-0001.Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $12-21-01-0001.Button - StringFmt( $12-21-01-0001.Price , DisplayFormat, PreScaleConvertShow) ; test + $12-03-03-0032.Button + StringFmt( $12-03-03-0032.Price , DisplayFormat, PreScaleConvertShow) ; test 81 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" + + eval( + If ICE_PROCESS_STATUS = 2 Then + + Var ice_tab_process_show = "Invisible" + + Else + Var ice_tab_process_show = "Invisible" + EndIf + Var return = ice_tab_process_show + ) + + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png" + "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png" - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - "Invisible" + 49 + 117 + + eval( + If $Sum1203030032 = "Disable" Then + STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $12-03-03-0032.TAG tag3_is_disable + Var return = "Invisible" + If tag1_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag2_is_disable = "true" Then + Var return = "Enable" + EndIf + If tag3_is_disable = "true" Then + Var return = "Enable" + EndIf + Else + Var return = "Invisible" + EndIf + ) + + "ROOT/taobin_project/image//img_menu_err2.png" - 183 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test + 84 + 266 + 10 + OpunMediumTTF + 0xDE794E + ice_tab_process_show + ice_show_open + + + 48 + 116 + 32 + 128 + 64 + MITRegularTTF + 0x5A5A5A + "disable-show" + $Sum1203030032 + text_unavailable + center-vertical-horizontal - - ; - - - ; ==================> Len = 16 @@ -1940,11 +1825,9 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "OREO SMOOTHIE -VOLCANO" + Var NameDrink = "OREO SMOOTHIE VOLCANO" Var NameDrinkTH = "โอริโอ้ปั่นภูเขาไฟ" - Var DrinkDescriptionTH = "นม น้ำตาล โอริโอ้ - " + Var DrinkDescriptionTH = "นม น้ำตาล โอริโอ้ " Var DrinkDescription = "Milk, Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_oreo.png" Var OpenFromXML = CurrentXMLFileName2 @@ -2192,8 +2075,7 @@ VOLCANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "OVALTINE SMOOTHIE -VOLCANO" + Var NameDrink = "OVALTINE SMOOTHIE VOLCANO" Var NameDrinkTH = "โอวัลตินปั่นภูเขาไฟ" Var DrinkDescriptionTH = "โอวัลติน น้ำตาล และ นม" Var DrinkDescription = "Ovaltine, Sugar, milk" @@ -3951,14 +3833,10 @@ VOLCANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "AMERICANO -ETHIOPAI GUJI" - Var NameDrinkTH = "อเมริกาโน -Guji Queen Berry" - Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) -หอมสตรอว์เบอร์รี ส้ม และดอกไม้" - Var DrinkDescription = "กาแฟคั่วอ่อน (natural process) -หอมสตรอว์เบอร์รี ส้ม และดอกไม้" + Var NameDrink = "AMERICANO ETHIOPAI GUJI" + Var NameDrinkTH = "อเมริกาโน Guji Queen Berry" + Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" + Var DrinkDescription = "กาแฟคั่วอ่อน (natural process) หอมสตรอว์เบอร์รี ส้ม และดอกไม้" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0014.Price @@ -4211,14 +4089,10 @@ ETHIOPAI GUJI" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "BLUE DADDY -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -BLUE DADDY" - Var DrinkDescriptionTH = "Washed process -หอมบลูเบอร์รี และดอกไม้" - Var DrinkDescription = "Washed process -Note: Blue Berry & Floral" + Var NameDrink = "BLUE DADDY AMERICANO" + Var NameDrinkTH = "อเมริกาโน BLUE DADDY" + Var DrinkDescriptionTH = "Washed process หอมบลูเบอร์รี และดอกไม้" + Var DrinkDescription = "Washed process Note: Blue Berry & Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_bluedaddy.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0019.Price @@ -4471,14 +4345,10 @@ Note: Blue Berry & Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MOZART -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -MOZART" - Var DrinkDescriptionTH = "Raisin Honey process -หอมสตรอว์เบอร์รี กุหลาบ มะลิ" - Var DrinkDescription = "Raisin Honey process -Note: Strawberry & Floral" + Var NameDrink = "MOZART AMERICANO" + Var NameDrinkTH = "อเมริกาโน MOZART" + Var DrinkDescriptionTH = "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" + Var DrinkDescription = "Raisin Honey process Note: Strawberry & Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_mozart.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0021.Price @@ -4731,14 +4601,10 @@ Note: Strawberry & Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "WHISKY DUDE -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -WHISKY DUDE" - Var DrinkDescriptionTH = "Washed Sherry cask ferment -หอมวิสกี้ ช็อกโกแลต วนิลา" - Var DrinkDescription = "Washed Sherry cask ferment -Note: Whisky & Vanilla" + Var NameDrink = "WHISKY DUDE AMERICANO" + Var NameDrinkTH = "อเมริกาโน WHISKY DUDE" + Var DrinkDescriptionTH = "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา" + Var DrinkDescription = "Washed Sherry cask ferment Note: Whisky & Vanilla" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_whiskydude.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0025.Price @@ -4991,14 +4857,10 @@ Note: Whisky & Vanilla" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "SNOWWHITE -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -SNOWWHITE" - Var DrinkDescriptionTH = "Anaerobic process -หอมมะลิ น้ำผึ้ง เมเปิล" - Var DrinkDescription = "Anaerobic process -Note: Jasmine & Honey" + Var NameDrink = "SNOWWHITE AMERICANO" + Var NameDrinkTH = "อเมริกาโน SNOWWHITE" + Var DrinkDescriptionTH = "Anaerobic process หอมมะลิ น้ำผึ้ง เมเปิล" + Var DrinkDescription = "Anaerobic process Note: Jasmine & Honey" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_snowwhite.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0023.Price @@ -5251,14 +5113,10 @@ Note: Jasmine & Honey" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PEACHER -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -PEACHER" - Var DrinkDescriptionTH = "Barrel-aged process -หอมพีช, ชา, ช็อกโกแลต" - Var DrinkDescription = "Barrel-aged process -Note: Peach, tea, chocolate" + Var NameDrink = "PEACHER AMERICANO" + Var NameDrinkTH = "อเมริกาโน PEACHER" + Var DrinkDescriptionTH = "Barrel-aged process หอมพีช, ชา, ช็อกโกแลต" + Var DrinkDescription = "Barrel-aged process Note: Peach, tea, chocolate" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_peacher.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0027.Price @@ -5511,12 +5369,9 @@ Note: Peach, tea, chocolate" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PURE BEAUTY -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -PURE BEAUTY" - Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) -กลิ่นดอกไม้ ผลไม้เขตร้อน" + Var NameDrink = "PURE BEAUTY AMERICANO" + Var NameDrinkTH = "อเมริกาโน PURE BEAUTY" + Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่นดอกไม้ ผลไม้เขตร้อน" Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_pure_beauty.png" Var OpenFromXML = CurrentXMLFileName2 @@ -5769,10 +5624,8 @@ AMERICANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "GEISHA -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -GEISHA" + Var NameDrink = "GEISHA AMERICANO" + Var NameDrinkTH = "อเมริกาโน GEISHA" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process) กลิ่น เลม่อน พีช น้ำผึ้งและดอกมะลิ" Var DrinkDescription = "Light Roast (natural process) Lemon, Peach, Honey, Jasmin" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_geisha.png" @@ -6025,14 +5878,10 @@ AMERICANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "ROSALYN -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -ROSALYN" - Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process) -กลิ่นกุหลาบ และ เบอร์รี่" - Var DrinkDescription = "Light Roast (natural process) -Pink​ Rose & Berry" + Var NameDrink = "ROSALYN AMERICANO" + Var NameDrinkTH = "อเมริกาโน ROSALYN" + Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process) กลิ่นกุหลาบ และ เบอร์รี่" + Var DrinkDescription = "Light Roast (natural process) Pink​ Rose & Berry" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_rosalyn.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0038.Price @@ -6285,14 +6134,10 @@ Pink​ Rose & Berry" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "CHOPIN -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -CHOPIN" - Var DrinkDescriptionTH = "Raisin Honey process -หอมสตรอว์เบอร์รี กุหลาบ มะลิ" - Var DrinkDescription = "Raisin Honey process -Note: Strawberry & Floral" + Var NameDrink = "CHOPIN AMERICANO" + Var NameDrinkTH = "อเมริกาโน CHOPIN" + Var DrinkDescriptionTH = "Raisin Honey process หอมสตรอว์เบอร์รี กุหลาบ มะลิ" + Var DrinkDescription = "Raisin Honey process Note: Strawberry & Floral" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_chopin.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0044.Price @@ -6545,10 +6390,8 @@ Note: Strawberry & Floral" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MANDARINE -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -MANDARINE" + Var NameDrink = "MANDARINE AMERICANO" + Var NameDrinkTH = "อเมริกาโน MANDARINE" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: ดอกส้ม น้ำผึ้ง คาราเมล ช็อกโกแล็ต" Var DrinkDescription = "Light Roast. Note: Orange Blossom, Honey, Caramel, Chocolate Bar." Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_Mandarine.png" @@ -6801,10 +6644,8 @@ AMERICANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "OPUS ONE -AMERICANO" - Var NameDrinkTH = "อเมริกาโน -OPUS ONE" + Var NameDrink = "OPUS ONE AMERICANO" + Var NameDrinkTH = "อเมริกาโน OPUS ONE" Var DrinkDescriptionTH = "กาแฟคั่วอ่อน โน๊ต: เยลลี่องุ่น แอ๊ปเปิ้ลพาย มิ้น" Var DrinkDescription = "Light Roast. Note: Grape Jelly, Apple Pie, Walnut, Mint." Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_opus_one.png" @@ -7060,8 +6901,7 @@ AMERICANO" Var NameDrink = "LATTE" Var NameDrinkTH = "ลาเต้" Var DrinkDescriptionTH = "กาแฟ นม และ นม" - Var DrinkDescription = "Espresso, Milk, - milk" + Var DrinkDescription = "Espresso, Milk, milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_latte.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-0004.Price @@ -7565,10 +7405,8 @@ AMERICANO" Var NameDrink = "PINK MILK" Var NameDrinkTH = "นมชมพู " - Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ นม -น้ำตาล " - Var DrinkDescription = "Salak Syrup, Milk, -Sugar" + Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ นม น้ำตาล " + Var DrinkDescription = "Salak Syrup, Milk, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_pink_milk.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -7815,11 +7653,9 @@ Sugar" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "STRAWMILK -SMOOTHIE" + Var NameDrink = "STRAWMILK SMOOTHIE" Var NameDrinkTH = "นมสตอเบอร์รี่ปั่น" - Var DrinkDescriptionTH = "นม น้ำเชื่อมสตอเบอร์รี่ -และน้ำแข็ง" + Var DrinkDescriptionTH = "นม น้ำเชื่อมสตอเบอร์รี่ และน้ำแข็ง" Var DrinkDescription = "Milk, Strawberry Syrup " Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberrymilk_smoothie.png" Var OpenFromXML = CurrentXMLFileName2 @@ -8563,8 +8399,7 @@ SMOOTHIE" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "TAO POWER -DRINK SODA" + Var NameDrink = "TAO POWER DRINK SODA" Var NameDrinkTH = "เต่าทรงพลังโซดา" Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง โซดา " Var DrinkDescription = "Medicine drink, Soda" @@ -8813,8 +8648,7 @@ DRINK SODA" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PLUM -LIMENADE SODA" + Var NameDrink = "PLUM LIMENADE SODA" Var NameDrinkTH = "บ๊วยมะนาวโซดา" Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย มะนาว โซดา" Var DrinkDescription = "Ume Syrup, Limenade, Soda" diff --git a/xml/page_catalog_group_songkran.xml b/xml/page_catalog_group_songkran.xml index 32e6e48e..de6e72ef 100644 --- a/xml/page_catalog_group_songkran.xml +++ b/xml/page_catalog_group_songkran.xml @@ -537,12 +537,10 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "SEXY DANCE -AMERICANO" + Var NameDrink = "SEXY DANCE AMERICANO" Var NameDrinkTH = "โอเลี้ยงจ้ำบ๊ะ" Var DrinkDescriptionTH = "กาแฟ น้ำ และ น้ำแดง" - Var DrinkDescription = "Espresso, Salak Syrup, -water" + Var DrinkDescription = "Espresso, Salak Syrup, water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_sexy_dance_americano.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -789,12 +787,10 @@ water" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "SNAKE WIFE -AMERICANO" + Var NameDrink = "SNAKE WIFE AMERICANO" Var NameDrinkTH = "โอยั๊วะเมียงู" Var DrinkDescriptionTH = "กาแฟ น้ำ และ กล้วย" - Var DrinkDescription = "Espresso, Tokyo Banana Syrup, - Water" + Var DrinkDescription = "Espresso, Tokyo Banana Syrup, Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_snake_wife_americano.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -1537,8 +1533,7 @@ AMERICANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MATCHA HAUNTED -HOUSE " + Var NameDrink = "MATCHA HAUNTED HOUSE " Var NameDrinkTH = "ชาเขียวบ้านผีปอบ " Var DrinkDescriptionTH = "ชาเขียว น้ำเชื่อมสตรอเบอรี โซดา" Var DrinkDescription = "Match, Strawberry Syrup,Soda" @@ -2035,8 +2030,7 @@ HOUSE " "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "BUCKET POPSICLE -PEPSI" + Var NameDrink = "BUCKET POPSICLE PEPSI" Var NameDrinkTH = "เป๊ปซี่ไอติมหลอด" Var DrinkDescriptionTH = "เป๊ปซี่ น้ำแดงกลิ่นสละ โซดา" Var DrinkDescription = "Pepsi, Salak ryrup, soda" diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index ee0976a3..8efecba9 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -1804,8 +1804,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "LIME -GINGER TEA" + Var NameDrink = "LIME GINGER TEA" Var NameDrinkTH = "ชาขิงมะนาว " Var DrinkDescriptionTH = "ขิง มะนาว และน้ำ " Var DrinkDescription = "Ginger, Lime & Water " @@ -2058,8 +2057,7 @@ GINGER TEA" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "LIME -GINGER TEA" + Var NameDrink = "LIME GINGER TEA" Var NameDrinkTH = "ชาขิงมะนาว " Var DrinkDescriptionTH = "ขิง มะนาว และน้ำ " Var DrinkDescription = "Ginger, Lime & Water " @@ -4328,10 +4326,8 @@ GINGER TEA" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MATCHA -LIMENADE" - Var NameDrinkTH = "ชาเขียวญี่ปุ่นมะนาว - " + Var NameDrink = "MATCHA LIMENADE" + Var NameDrinkTH = "ชาเขียวญี่ปุ่นมะนาว " Var DrinkDescriptionTH = "ชาเชียว มะนาว " Var DrinkDescription = "Matcha, Limenade, Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lime_Matcha.png" @@ -4836,10 +4832,8 @@ LIMENADE" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "MATCHA -LIMENADE" - Var NameDrinkTH = "ชาเขียวญี่ปุ่นมะนาว - " + Var NameDrink = "MATCHA LIMENADE" + Var NameDrinkTH = "ชาเขียวญี่ปุ่นมะนาว " Var DrinkDescriptionTH = "ชาเชียว น้ำ มะนาว " Var DrinkDescription = "Matcha, Limenade, Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lime_Matcha.png" @@ -5092,11 +5086,9 @@ LIMENADE" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "BROWN SUGAR -TEA" + Var NameDrink = "BROWN SUGAR TEA" Var NameDrinkTH = "ชาบราวน์ชูการ์ " - Var DrinkDescriptionTH = "ชาไทย น้ำเชื่อมน้ำตาลแดง - นม " + Var DrinkDescriptionTH = "ชาไทย น้ำเชื่อมน้ำตาลแดง นม " Var DrinkDescription = "Thai tea, Milk, Kokuto syrup" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_Black_Sugar_Milk_Tea.png" Var OpenFromXML = CurrentXMLFileName2 @@ -5854,10 +5846,8 @@ TEA" Var NameDrink = "STRAWBERRY TEA" Var NameDrinkTH = "ชาสตอเบอร์รี่ " - Var DrinkDescriptionTH = "ชาไทย น้ำเชื่อมสตอเบอร์รี่ - " - Var DrinkDescription = "Thai tea, Strawberry Syrup, -Water" + Var DrinkDescriptionTH = "ชาไทย น้ำเชื่อมสตอเบอร์รี่ " + Var DrinkDescription = "Thai tea, Strawberry Syrup, Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_strawberry_thai_tea.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-02-02-0009.Price @@ -6110,10 +6100,8 @@ Water" Var NameDrink = "STRAWBERRY TEA" Var NameDrinkTH = "ชาสตอเบอร์รี่ " - Var DrinkDescriptionTH = "ชาไทย น้ำเชื่อมสตอเบอร์รี่ - " - Var DrinkDescription = "Thai tea, Strawberry Syrup, -Water" + Var DrinkDescriptionTH = "ชาไทย น้ำเชื่อมสตอเบอร์รี่ " + Var DrinkDescription = "Thai tea, Strawberry Syrup, Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_strawberry_tea.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-02-01-0022.Price @@ -6868,8 +6856,7 @@ Water" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "THAI TEA -LIMENADE" + Var NameDrink = "THAI TEA LIMENADE" Var NameDrinkTH = "ชาดำมะนาว" Var DrinkDescriptionTH = "ชาไทย น้ำ มะนาว " Var DrinkDescription = "Thai tea, Limenade, Water" @@ -7122,8 +7109,7 @@ LIMENADE" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "TAIWANESE - BLACK TEA" + Var NameDrink = "TAIWANESE BLACK TEA" Var NameDrinkTH = "ชาดำไต้หวัน" Var DrinkDescriptionTH = "ชาไต้หวัน น้ำ " Var DrinkDescription = "Taiwanese tea, Water" @@ -7376,12 +7362,10 @@ LIMENADE" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "TAIWANESE -LIME TEA" + Var NameDrink = "TAIWANESE LIME TEA" Var NameDrinkTH = "ชาดำไต้หวันมะนาว" Var DrinkDescriptionTH = "ชาไต้หวัน น้ำ มะนาว " - Var DrinkDescription = "Taiwanese tea, Limenade, -Water" + Var DrinkDescription = "Taiwanese tea, Limenade, Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lime_Oolong_tea.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-02-01-0032.Price diff --git a/xml/page_catalog_group_whey.xml b/xml/page_catalog_group_whey.xml index c56407c2..e69d7411 100644 --- a/xml/page_catalog_group_whey.xml +++ b/xml/page_catalog_group_whey.xml @@ -550,8 +550,7 @@ Var NameDrink = "MATCHA SHAKE" Var NameDrinkTH = "มัทฉะโปรตีน" Var DrinkDescriptionTH = "เวย์โปรตีน ชาเชียว นม" - Var DrinkDescription = "Whey protein, -Matcha, & Milk" + Var DrinkDescription = "Whey protein, Matcha, & Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Matcha.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -800,8 +799,7 @@ Matcha, & Milk" Var NameDrink = "MATCHA SHAKE" Var NameDrinkTH = "มัทฉะโปรตีน" Var DrinkDescriptionTH = "เวย์โปรตีน ชาเชียว นม" - Var DrinkDescription = "Whey protein, -Matcha, & Milk" + Var DrinkDescription = "Whey protein, Matcha, & Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Matcha.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -1050,8 +1048,7 @@ Matcha, & Milk" Var NameDrink = "CHOCOLATE SHAKE" Var NameDrinkTH = "โกโก้โปรตีน" Var DrinkDescriptionTH = "เวย์โปรตีน โกโก้ นม" - Var DrinkDescription = "Whey protein, -Cocoa, & Milk" + Var DrinkDescription = "Whey protein, Cocoa, & Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Chocolate.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -1297,13 +1294,10 @@ Cocoa, & Milk" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "STRAWBERRY -SHAKE" + Var NameDrink = "STRAWBERRY SHAKE" Var NameDrinkTH = "สตอเบอร์รี่โปรตีน" - Var DrinkDescriptionTH = "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่ -นม" - Var DrinkDescription = "Whey protein,Milk, -Strawberry Syrup" + Var DrinkDescriptionTH = "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่ นม" + Var DrinkDescription = "Whey protein,Milk, Strawberry Syrup" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Strawberry.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -1551,13 +1545,10 @@ Strawberry Syrup" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "STRAWBERRY -SHAKE" + Var NameDrink = "STRAWBERRY SHAKE" Var NameDrinkTH = "สตอเบอร์รี่โปรตีน" - Var DrinkDescriptionTH = "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่ -นม" - Var DrinkDescription = "Whey protein,Milk, -Strawberry Syrup" + Var DrinkDescriptionTH = "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่ นม" + Var DrinkDescription = "Whey protein,Milk, Strawberry Syrup" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Strawberry.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -1807,10 +1798,8 @@ Strawberry Syrup" Var NameDrink = "MELON SHAKE" Var NameDrinkTH = "เมล่อนโปรตีน" - Var DrinkDescriptionTH = "เวย์โปรตีน น้ำเชื่อมเมล่อน -นม" - Var DrinkDescription = "Whey protein,Milk, -Melon Syrup" + Var DrinkDescriptionTH = "เวย์โปรตีน น้ำเชื่อมเมล่อน นม" + Var DrinkDescription = "Whey protein,Milk, Melon Syrup" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_melon.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -2060,8 +2049,7 @@ Melon Syrup" Var NameDrink = "ESPRESSO SHAKE" Var NameDrinkTH = "เอสเพรสโซ่โปรตีน" Var DrinkDescriptionTH = "เวย์โปรตีน กาแฟ นม" - Var DrinkDescription = "Whey protein, Espresso -& Milk" + Var DrinkDescription = "Whey protein, Espresso & Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_espresso.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -2310,8 +2298,7 @@ Melon Syrup" Var NameDrink = "THAI TEA SHAKE" Var NameDrinkTH = "ชานมไทยโปรตีน" Var DrinkDescriptionTH = "เวย์โปรตีน ชาไทย นม" - Var DrinkDescription = "Whey protein, -Thai Tea, & Milk" + Var DrinkDescription = "Whey protein, Thai Tea, & Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Thaitea.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -2560,8 +2547,7 @@ Thai Tea, & Milk" Var NameDrink = "THAI TEA SHAKE" Var NameDrinkTH = "ชานมไทยโปรตีน" Var DrinkDescriptionTH = "เวย์โปรตีน ชาไทย นม" - Var DrinkDescription = "Whey protein, -Thai Tea, & Milk" + Var DrinkDescription = "Whey protein, Thai Tea, & Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Thaitea.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -2807,13 +2793,10 @@ Thai Tea, & Milk" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "BROWN SUGAR -SHAKE" + Var NameDrink = "BROWN SUGAR SHAKE" Var NameDrinkTH = "บราวน์ชูการ์โปรตีน" - Var DrinkDescriptionTH = "เวย์โปรตีน นม -น้ำเชื่อมน้ำตาลแดง" - Var DrinkDescription = "Whey protein, Milk, -Kokuto syrup" + Var DrinkDescriptionTH = "เวย์โปรตีน นม น้ำเชื่อมน้ำตาลแดง" + Var DrinkDescription = "Whey protein, Milk, Kokuto syrup" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_kokuto.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -3061,13 +3044,10 @@ Kokuto syrup" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "TAIWANESE TEA -SHAKE" + Var NameDrink = "TAIWANESE TEA SHAKE" Var NameDrinkTH = "ชาไต้หวันโปรตีน" - Var DrinkDescriptionTH = "เวย์โปรตีน นม -ชาไต้หวัน" - Var DrinkDescription = "Whey protein, Milk, -Taiwanese Tea, Sugar" + Var DrinkDescriptionTH = "เวย์โปรตีน นม ชาไต้หวัน" + Var DrinkDescription = "Whey protein, Milk, Taiwanese Tea, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Taiwantea.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -3315,13 +3295,10 @@ Taiwanese Tea, Sugar" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "TAIWANESE TEA -SHAKE" + Var NameDrink = "TAIWANESE TEA SHAKE" Var NameDrinkTH = "ชาไต้หวันโปรตีน" - Var DrinkDescriptionTH = "เวย์โปรตีน นม -ชาไต้หวัน" - Var DrinkDescription = "Whey protein, Milk, -Taiwanese Tea, Sugar" + Var DrinkDescriptionTH = "เวย์โปรตีน นม ชาไต้หวัน" + Var DrinkDescription = "Whey protein, Milk, Taiwanese Tea, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Taiwantea.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -3571,10 +3548,8 @@ Taiwanese Tea, Sugar" Var NameDrink = "CARAMEL SHAKE" Var NameDrinkTH = "คาราเมลโปรตีน" - Var DrinkDescriptionTH = "เวย์โปรตีน นม -น้ำเชื่อมคาราเมล" - Var DrinkDescription = "Whey protein, Milk, -Caramel Syrup" + Var DrinkDescriptionTH = "เวย์โปรตีน นม น้ำเชื่อมคาราเมล" + Var DrinkDescription = "Whey protein, Milk, Caramel Syrup" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_caramel.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price diff --git a/xml/page_identity_verification.xml b/xml/page_identity_verification.xml index e1fad699..6e56712e 100644 --- a/xml/page_identity_verification.xml +++ b/xml/page_identity_verification.xml @@ -98,6 +98,12 @@ EndIf EndIf + + 09:59:35 [X]Var IDCardState=PRESENT +09:59:35 [X]Var Timeout=112 +09:59:35 [X]Var LivenessResult= +09:59:36 [X]Var IDCardStatus=ERROR + If IDCardStatus = "OK" Then If IDCardReady = "OK" Then If IDCardData = "ERROR" Then @@ -239,6 +245,17 @@ EndIf EndIf + + If IDCardState = "PRESENT" Then + If IDCardStatus = "ERROR" Then + Var load_gif_stage = "Invisible" + Var IDcardStageText = "Enable" + Var IDcardTextStatus = "อ่านบัตรไม่ได้อะ" + Refresh + EndIf + EndIf + + Refresh TimerReset @@ -417,6 +434,13 @@ EventEvaluate "EventLivenessState" + + Var IDCardState = "PRESENT" + Var IDCardStatus = "ERROR" + Var IDCardReady = "ERROR" + Var IDCardData = "ERROR" + + diff --git a/xml/page_show_error.xml b/xml/page_show_error.xml index a6875044..853bb51b 100644 --- a/xml/page_show_error.xml +++ b/xml/page_show_error.xml @@ -141,9 +141,7 @@ 1000 - ;DEBUGVAR EmergencyStop DEBUGVAR NETCORE_LOST_CNT - ;DEBUGVAR DoorCupPosition DEBUGVAR MachineStage Var EmergencyStop = "-" @@ -213,8 +211,8 @@ If MachineStage = "drink-failed" Then Var FirstOpen = 1 Var LEDSet = "true" - Open "ROOT/taobin_project/xml/page_show_error.xml" - + ;Open "ROOT/taobin_project/xml/page_show_error.xml" + Refresh EndIf If FirstOpen = 1 Then @@ -222,7 +220,8 @@ If MachineStage = "close-maintenance" Then Var LEDSet = "true" - Open "ROOT/taobin_project/xml/page_show_error.xml" + ;Open "ROOT/taobin_project/xml/page_show_error.xml" + Refresh EndIf EndIf @@ -235,6 +234,8 @@ Open "ROOT/taobin_project/xml/page_show_error.xml" EndIf + + EndIf diff --git a/xml_main/startup.xml b/xml_main/startup.xml index 2b15e5f7..e374c512 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "7.14" - Var XMLPageVersionInt = 714 + Var XMLPageVersion = "7.15" + Var XMLPageVersionInt = 715