diff --git a/adv/sync_1.file b/adv/sync_1.file index 5416b83e..3713e7c6 100644 --- a/adv/sync_1.file +++ b/adv/sync_1.file @@ -1,5 +1,5 @@ -total 260156 --rw-rw---- 1 root sdcard_rw 0 2021-03-18 16:47 sync_1.file +total 242172 +-rw-rw---- 1 root sdcard_rw 0 2023-04-03 11:06 sync_1.file -rw-rw---- 1 root sdcard_rw 3772465 2021-07-07 16:02 taobin_adv_00.mp4 -rw-rw---- 1 root sdcard_rw 3647528 2021-07-06 15:30 taobin_adv_01.mp4 -rw-rw---- 1 root sdcard_rw 3184464 2021-06-22 14:08 taobin_adv_02.mp4 @@ -7,19 +7,18 @@ total 260156 -rw-rw---- 1 root sdcard_rw 3064661 2021-09-27 13:44 taobin_adv_04.mp4 -rw-rw---- 1 root sdcard_rw 2211917 2021-09-23 10:57 taobin_adv_05.mp4 -rw-rw---- 1 root sdcard_rw 3772465 2021-07-07 16:02 taobin_adv_06.mp4 --rw-rw---- 1 root sdcard_rw 8056466 2023-02-06 09:12 taobin_adv_07.mp4 +-rw-rw---- 1 root sdcard_rw 8054503 2023-03-15 10:43 taobin_adv_07.mp4 -rw-rw---- 1 root sdcard_rw 8448989 2023-01-17 11:44 taobin_adv_08.mp4 -rw-rw---- 1 root sdcard_rw 2461527 2022-06-10 14:31 taobin_adv_09.mp4 -rw-rw---- 1 root sdcard_rw 10011292 2022-12-19 15:25 taobin_adv_10.mp4 --rw-rw---- 1 root sdcard_rw 4001486 2021-03-18 15:00 taobin_adv_10_.mp4 -rw-rw---- 1 root sdcard_rw 2734331 2023-01-09 17:30 taobin_adv_11.mp4 --rw-rw---- 1 root sdcard_rw 2671705 2022-06-10 17:22 taobin_adv_12.mp4 +-rw-rw---- 1 root sdcard_rw 260278 2023-03-15 10:45 taobin_adv_12.mp4 -rw-rw---- 1 root sdcard_rw 381590 2023-03-17 17:43 taobin_adv_13.mp4 -rw-rw---- 1 root sdcard_rw 3796147 2022-09-16 09:01 taobin_adv_14.mp4 -rw-rw---- 1 root sdcard_rw 941300 2023-02-17 11:23 taobin_adv_15.mp4 --rw-rw---- 1 root sdcard_rw 6086338 2022-10-10 11:29 taobin_adv_16.mp4 +-rw-rw---- 1 root sdcard_rw 2229541 2023-03-15 13:33 taobin_adv_16.mp4 -rw-rw---- 1 root sdcard_rw 18918525 2022-07-25 14:47 taobin_adv_17.mp4 --rw-rw---- 1 root sdcard_rw 2691879 2022-10-10 11:32 taobin_adv_18.mp4 +-rw-rw---- 1 root sdcard_rw 2526278 2023-03-15 13:32 taobin_adv_18.mp4 -rw-rw---- 1 root sdcard_rw 2726476 2022-11-15 10:43 taobin_adv_19.mp4 -rw-rw---- 1 root sdcard_rw 9937574 2022-11-15 13:05 taobin_adv_20.mp4 -rw-rw---- 1 root sdcard_rw 2622440 2021-07-07 16:55 taobin_adv_menu2_00.mp4 @@ -29,18 +28,18 @@ total 260156 -rw-rw---- 1 root sdcard_rw 2809964 2021-09-27 13:43 taobin_adv_menu2_04.mp4 -rw-rw---- 1 root sdcard_rw 1809071 2021-09-23 10:57 taobin_adv_menu2_05.mp4 -rw-rw---- 1 root sdcard_rw 2622440 2021-07-07 16:55 taobin_adv_menu2_06.mp4 --rw-rw---- 1 root sdcard_rw 5370235 2023-02-06 09:12 taobin_adv_menu2_07.mp4 +-rw-rw---- 1 root sdcard_rw 5416135 2023-03-15 10:43 taobin_adv_menu2_07.mp4 -rw-rw---- 1 root sdcard_rw 5359752 2023-01-17 11:44 taobin_adv_menu2_08.mp4 -rw-rw---- 1 root sdcard_rw 2197656 2022-06-10 14:34 taobin_adv_menu2_09.mp4 -rw-rw---- 1 root sdcard_rw 6392776 2022-12-19 15:25 taobin_adv_menu2_10.mp4 -rw-rw---- 1 root sdcard_rw 2599149 2023-01-09 17:30 taobin_adv_menu2_11.mp4 --rw-rw---- 1 root sdcard_rw 1801226 2022-06-10 17:21 taobin_adv_menu2_12.mp4 +-rw-rw---- 1 root sdcard_rw 182977 2023-03-15 10:45 taobin_adv_menu2_12.mp4 -rw-rw---- 1 root sdcard_rw 251935 2023-03-17 17:41 taobin_adv_menu2_13.mp4 -rw-rw---- 1 root sdcard_rw 3043427 2022-09-16 09:01 taobin_adv_menu2_14.mp4 -rw-rw---- 1 root sdcard_rw 754668 2023-02-17 11:23 taobin_adv_menu2_15.mp4 --rw-rw---- 1 root sdcard_rw 3897011 2022-10-10 11:29 taobin_adv_menu2_16.mp4 +-rw-rw---- 1 root sdcard_rw 1663856 2023-03-15 13:33 taobin_adv_menu2_16.mp4 -rw-rw---- 1 root sdcard_rw 18108788 2022-07-25 14:47 taobin_adv_menu2_17.mp4 --rw-rw---- 1 root sdcard_rw 2277074 2022-10-10 11:32 taobin_adv_menu2_18.mp4 +-rw-rw---- 1 root sdcard_rw 2062164 2023-03-15 13:28 taobin_adv_menu2_18.mp4 -rw-rw---- 1 root sdcard_rw 1976512 2022-11-15 10:43 taobin_adv_menu2_19.mp4 -rw-rw---- 1 root sdcard_rw 6232352 2022-11-15 13:04 taobin_adv_menu2_20.mp4 -rw-rw---- 1 root sdcard_rw 2625751 2021-07-07 16:01 taobin_adv_menu_00.mp4 @@ -50,17 +49,17 @@ total 260156 -rw-rw---- 1 root sdcard_rw 2929148 2021-09-27 13:44 taobin_adv_menu_04.mp4 -rw-rw---- 1 root sdcard_rw 1885128 2021-09-23 10:57 taobin_adv_menu_05.mp4 -rw-rw---- 1 root sdcard_rw 2625751 2021-07-07 16:01 taobin_adv_menu_06.mp4 --rw-rw---- 1 root sdcard_rw 5893022 2023-02-06 09:12 taobin_adv_menu_07.mp4 +-rw-rw---- 1 root sdcard_rw 5921499 2023-03-15 10:43 taobin_adv_menu_07.mp4 -rw-rw---- 1 root sdcard_rw 5359752 2023-01-17 11:44 taobin_adv_menu_08.mp4 -rw-rw---- 1 root sdcard_rw 1954754 2022-06-10 14:37 taobin_adv_menu_09.mp4 -rw-rw---- 1 root sdcard_rw 6688846 2022-12-19 15:25 taobin_adv_menu_10.mp4 -rw-rw---- 1 root sdcard_rw 2201341 2023-01-09 17:30 taobin_adv_menu_11.mp4 --rw-rw---- 1 root sdcard_rw 1911441 2022-06-10 17:21 taobin_adv_menu_12.mp4 +-rw-rw---- 1 root sdcard_rw 187513 2023-03-15 10:45 taobin_adv_menu_12.mp4 -rw-rw---- 1 root sdcard_rw 258907 2023-03-17 17:45 taobin_adv_menu_13.mp4 -rw-rw---- 1 root sdcard_rw 2782199 2022-09-16 09:01 taobin_adv_menu_14.mp4 -rw-rw---- 1 root sdcard_rw 800836 2023-02-17 11:23 taobin_adv_menu_15.mp4 --rw-rw---- 1 root sdcard_rw 3964953 2022-10-10 11:29 taobin_adv_menu_16.mp4 +-rw-rw---- 1 root sdcard_rw 1716437 2023-03-15 13:33 taobin_adv_menu_16.mp4 -rw-rw---- 1 root sdcard_rw 18310974 2022-07-25 14:47 taobin_adv_menu_17.mp4 --rw-rw---- 1 root sdcard_rw 2176162 2022-10-10 11:32 taobin_adv_menu_18.mp4 +-rw-rw---- 1 root sdcard_rw 2165663 2023-03-15 13:31 taobin_adv_menu_18.mp4 -rw-rw---- 1 root sdcard_rw 2210819 2022-11-15 10:43 taobin_adv_menu_19.mp4 -rw-rw---- 1 root sdcard_rw 6378066 2022-11-15 13:03 taobin_adv_menu_20.mp4 diff --git a/adv/taobin_adv_07.mp4 b/adv/taobin_adv_07.mp4 index 88077246..e2635ed8 100644 Binary files a/adv/taobin_adv_07.mp4 and b/adv/taobin_adv_07.mp4 differ diff --git a/adv/taobin_adv_12.mp4 b/adv/taobin_adv_12.mp4 index 834416d4..8c5b191f 100644 Binary files a/adv/taobin_adv_12.mp4 and b/adv/taobin_adv_12.mp4 differ diff --git a/adv/taobin_adv_16.mp4 b/adv/taobin_adv_16.mp4 index f7031adb..5ea89b11 100644 Binary files a/adv/taobin_adv_16.mp4 and b/adv/taobin_adv_16.mp4 differ diff --git a/adv/taobin_adv_18.mp4 b/adv/taobin_adv_18.mp4 index d72d9189..cec2c11c 100644 Binary files a/adv/taobin_adv_18.mp4 and b/adv/taobin_adv_18.mp4 differ diff --git a/adv/taobin_adv_menu2_07.mp4 b/adv/taobin_adv_menu2_07.mp4 index 37aea826..d9fd12e9 100644 Binary files a/adv/taobin_adv_menu2_07.mp4 and b/adv/taobin_adv_menu2_07.mp4 differ diff --git a/adv/taobin_adv_menu2_12.mp4 b/adv/taobin_adv_menu2_12.mp4 index f2c58170..c972ed35 100644 Binary files a/adv/taobin_adv_menu2_12.mp4 and b/adv/taobin_adv_menu2_12.mp4 differ diff --git a/adv/taobin_adv_menu2_16.mp4 b/adv/taobin_adv_menu2_16.mp4 index 5be73523..ff894dec 100644 Binary files a/adv/taobin_adv_menu2_16.mp4 and b/adv/taobin_adv_menu2_16.mp4 differ diff --git a/adv/taobin_adv_menu2_18.mp4 b/adv/taobin_adv_menu2_18.mp4 index 19db6422..0089c730 100644 Binary files a/adv/taobin_adv_menu2_18.mp4 and b/adv/taobin_adv_menu2_18.mp4 differ diff --git a/adv/taobin_adv_menu_07.mp4 b/adv/taobin_adv_menu_07.mp4 index a1fb39f0..bcd15548 100644 Binary files a/adv/taobin_adv_menu_07.mp4 and b/adv/taobin_adv_menu_07.mp4 differ diff --git a/adv/taobin_adv_menu_12.mp4 b/adv/taobin_adv_menu_12.mp4 index df3ff74e..b6ab3311 100644 Binary files a/adv/taobin_adv_menu_12.mp4 and b/adv/taobin_adv_menu_12.mp4 differ diff --git a/adv/taobin_adv_menu_16.mp4 b/adv/taobin_adv_menu_16.mp4 index 9ab3091e..9a192825 100644 Binary files a/adv/taobin_adv_menu_16.mp4 and b/adv/taobin_adv_menu_16.mp4 differ diff --git a/adv/taobin_adv_menu_18.mp4 b/adv/taobin_adv_menu_18.mp4 index 110a80e6..18628651 100644 Binary files a/adv/taobin_adv_menu_18.mp4 and b/adv/taobin_adv_menu_18.mp4 differ diff --git a/animation01/play_list.tsv b/animation01/play_list.tsv index 093e2eb1..e66d9657 100644 --- a/animation01/play_list.tsv +++ b/animation01/play_list.tsv @@ -361,14 +361,14 @@ CHOPIN ALMOST DIRTY 12-01-02-0045 1 7 57 2 3 4 5 24 49 1 23 อเมริกาโนเย็นCHOPIN 12-01-02-0044 1 2 57 3 4 5 23 16 24 49 1 23 เอสเพรสโซ่ช็อต CHOPIN 12-01-01-0043 1 2 57 3 3 5 24 49 1 23 24 49 1 23 -MANDARINE-DIRTY 12-01-02-0048 1 7 58 2 3 4 5 24 49 1 23 -MANDARINE-AMERI 12-01-01-0047 1 2 58 3 4 5 16 24 49 1 23 -MANDARINE-AMERI 12-01-02-0047 1 2 58 3 4 5 23 16 24 49 1 23 -MANDARINE-ESP 12-01-01-0046 1 2 58 3 3 5 24 49 1 23 -OPUS-ONE-DIRTY 12-01-02-0051 1 7 59 2 3 4 5 24 49 1 23 -OPUS-ONE-AMERI 12-01-01-0050 1 2 59 3 4 5 16 24 49 1 23 -OPUS-ONE-AMERI 12-01-02-0050 1 2 59 3 4 5 23 16 24 49 1 23 -OPUS-ONE-ESP 12-01-01-0049 1 2 59 3 3 5 24 49 1 23 +MANDARINE-DIRTY 12-01-02-0048 1 7 2 3 4 5 24 49 1 23 +MANDARINE-AMERI 12-01-01-0047 1 2 3 4 5 16 24 49 1 23 +MANDARINE-AMERI 12-01-02-0047 1 2 3 4 5 23 16 24 49 1 23 +MANDARINE-ESP 12-01-01-0046 1 2 3 3 5 24 49 1 23 +OPUS-ONE-DIRTY 12-01-02-0051 1 7 2 3 4 5 24 49 1 23 +OPUS-ONE-AMERI 12-01-01-0050 1 2 3 4 5 16 24 49 1 23 +OPUS-ONE-AMERI 12-01-02-0050 1 2 3 4 5 23 16 24 49 1 23 +OPUS-ONE-ESP 12-01-01-0049 1 2 3 3 5 24 49 1 23 diff --git a/image/bn_songkran1.png b/image/bn_songkran1.png deleted file mode 100644 index 91ebedcd..00000000 Binary files a/image/bn_songkran1.png and /dev/null differ diff --git a/image/bp_songkran1.png b/image/bp_songkran1.png deleted file mode 100644 index e908df44..00000000 Binary files a/image/bp_songkran1.png and /dev/null differ diff --git a/image/bp_songkran1_en.png b/image/bp_songkran1_en.png deleted file mode 100644 index 82fe46a5..00000000 Binary files a/image/bp_songkran1_en.png and /dev/null differ diff --git a/image/page3/bn_songkran1.png b/image/page3/bn_songkran1.png index d20c975f..6957b5cf 100644 Binary files a/image/page3/bn_songkran1.png and b/image/page3/bn_songkran1.png differ diff --git a/image/bn_songkran1_en.png b/image/page3/bn_songkran1_en.png similarity index 79% rename from image/bn_songkran1_en.png rename to image/page3/bn_songkran1_en.png index 9c584ed1..7c641ab3 100644 Binary files a/image/bn_songkran1_en.png and b/image/page3/bn_songkran1_en.png differ diff --git a/image/page3/bp_songkran1.png b/image/page3/bp_songkran1.png index f7cc2aa3..832d7101 100644 Binary files a/image/page3/bp_songkran1.png and b/image/page3/bp_songkran1.png differ diff --git a/image/page3/bp_songkran1_en.png b/image/page3/bp_songkran1_en.png new file mode 100644 index 00000000..c0576205 Binary files /dev/null and b/image/page3/bp_songkran1_en.png differ diff --git a/spiral/xml/page_catalog_vending_machine.xml b/spiral/xml/page_catalog_vending_machine.xml index 1e0f9e54..a8f4b512 100644 --- a/spiral/xml/page_catalog_vending_machine.xml +++ b/spiral/xml/page_catalog_vending_machine.xml @@ -250,8 +250,17 @@ SAVELOG "Click rec" Var NextPage = "-" - Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + + If ShowPromoitonOreo = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + If SongkranEnable = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf + EndIf diff --git a/xml/menu_new_layout_gen.py b/xml/menu_new_layout_gen.py index ecab7762..cafc3647 100644 --- a/xml/menu_new_layout_gen.py +++ b/xml/menu_new_layout_gen.py @@ -91,6 +91,7 @@ if spl[0].startswith("TAG"): out_xml( '\t;' + spl[0] + '\r\n') + continue out_xml( '\t; ==================> Len = ' + str(len(spl)) + '\r\n') diff --git a/xml/page_board.xml b/xml/page_board.xml index 1d4b69a4..320ef470 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -786,8 +786,11 @@ Var SongkranEnable = 0 If BoxID = 173149 Then Var SongkranEnable = 1 + Var PromotionOreoVolcanoEnable = 0 + Var PromotionOreoToppingFreeEnable = 0 + Var ShowPromoitonOreo = 0 EndIf - + If BoxID = 200001 Then Var SongkranEnable = 1 EndIf diff --git a/xml/page_catalog_group_appfast.xml b/xml/page_catalog_group_appfast.xml index b4e10b07..1fa0a3d1 100644 --- a/xml/page_catalog_group_appfast.xml +++ b/xml/page_catalog_group_appfast.xml @@ -555,9 +555,12 @@ 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,8 +810,10 @@ 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 @@ -1055,10 +1060,13 @@ 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 @@ -1306,10 +1314,13 @@ 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 @@ -1557,10 +1568,13 @@ 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 3466b9a1..626ec53c 100644 --- a/xml/page_catalog_group_cocktail.xml +++ b/xml/page_catalog_group_cocktail.xml @@ -547,8 +547,10 @@ 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 @@ -1045,8 +1047,10 @@ 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 @@ -1296,7 +1300,8 @@ 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 @@ -1544,8 +1549,10 @@ 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 @@ -2290,8 +2297,10 @@ 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 @@ -2540,8 +2549,10 @@ 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 @@ -2790,8 +2801,10 @@ 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 d5746091..a870ad58 100644 --- a/xml/page_catalog_group_coffee.xml +++ b/xml/page_catalog_group_coffee.xml @@ -1046,7 +1046,8 @@ "/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)" @@ -1297,7 +1298,8 @@ 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)" @@ -2050,10 +2052,14 @@ 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 @@ -2306,10 +2312,14 @@ 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 @@ -2562,10 +2572,14 @@ 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 @@ -2818,8 +2832,10 @@ 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" @@ -3072,8 +3088,10 @@ 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" @@ -3326,10 +3344,14 @@ 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 @@ -3582,10 +3604,14 @@ 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 @@ -3838,10 +3864,14 @@ 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 @@ -4094,10 +4124,14 @@ 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 @@ -4350,9 +4384,12 @@ 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 @@ -4606,7 +4643,8 @@ 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" @@ -4859,9 +4897,12 @@ 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 @@ -5113,7 +5154,8 @@ Pink​ Rose & Berry" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "ICED AMERICANO SODA" + Var NameDrink = "ICED AMERICANO + SODA" Var NameDrinkTH = "อเมริกาโซดา" Var DrinkDescriptionTH = "กาแฟ และ โซดา" Var DrinkDescription = "Espresso & Soda" @@ -5360,7 +5402,8 @@ Pink​ Rose & Berry" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "ICED AMERICANO SODA" + Var NameDrink = "ICED AMERICANO + SODA" Var NameDrinkTH = "อเมริกาโซดา" Var DrinkDescriptionTH = "กาแฟ และ โซดา" Var DrinkDescription = "Espresso & Soda" @@ -5608,10 +5651,14 @@ 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 @@ -5864,10 +5911,14 @@ 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 @@ -6120,10 +6171,14 @@ 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 @@ -6376,8 +6431,10 @@ 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" @@ -6630,8 +6687,10 @@ 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" @@ -6884,10 +6943,14 @@ 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 @@ -7140,10 +7203,14 @@ 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 @@ -7396,10 +7463,14 @@ 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 @@ -7652,10 +7723,14 @@ 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 @@ -7908,9 +7983,12 @@ 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 @@ -8163,8 +8241,10 @@ 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" @@ -8417,10 +8497,14 @@ 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 @@ -8673,10 +8757,14 @@ 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 @@ -8925,10 +9013,14 @@ 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 @@ -9177,10 +9269,14 @@ 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 @@ -9429,8 +9525,10 @@ 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" @@ -9679,8 +9777,10 @@ 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" @@ -9929,10 +10029,14 @@ 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 @@ -10181,10 +10285,14 @@ 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 @@ -10433,10 +10541,14 @@ 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 @@ -10685,10 +10797,14 @@ 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 @@ -10937,9 +11053,12 @@ 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 @@ -11188,8 +11307,10 @@ 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" @@ -11438,10 +11559,14 @@ 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 @@ -11690,7 +11815,8 @@ 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" @@ -11937,7 +12063,8 @@ 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" @@ -13690,8 +13817,10 @@ 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 @@ -13942,8 +14071,10 @@ 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 @@ -14193,9 +14324,11 @@ 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 @@ -14445,9 +14578,11 @@ 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 @@ -14698,9 +14833,11 @@ 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 @@ -14950,9 +15087,11 @@ 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 @@ -15203,10 +15342,13 @@ 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 @@ -15456,10 +15598,13 @@ 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 @@ -15710,9 +15855,11 @@ 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 @@ -15962,9 +16109,11 @@ 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 @@ -16215,10 +16364,13 @@ 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 @@ -16468,10 +16620,13 @@ 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 @@ -16722,7 +16877,8 @@ 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" @@ -16973,7 +17129,8 @@ 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" @@ -17225,10 +17382,13 @@ 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 @@ -17478,10 +17638,13 @@ 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 @@ -17732,10 +17895,12 @@ Milk, Sugar" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "LYCHEE AMERICANO" + Var NameDrink = "LYCHEE +AMERICANO" 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 @@ -17984,10 +18149,12 @@ Sugar, Water" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "LYCHEE AMERICANO" + Var NameDrink = "LYCHEE +AMERICANO" 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 @@ -18237,10 +18404,12 @@ Sugar, Water" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "YUZU AMERICANO" + Var NameDrink = "YUZU +AMERICANO" 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 @@ -18489,10 +18658,12 @@ Sugar, Water" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "YUZU AMERICANO" + Var NameDrink = "YUZU +AMERICANO" 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 @@ -18742,10 +18913,12 @@ 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 @@ -18994,10 +19167,12 @@ 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 2ca1ec81..b5ffb1a7 100644 --- a/xml/page_catalog_group_forkid.xml +++ b/xml/page_catalog_group_forkid.xml @@ -1059,7 +1059,8 @@ "/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" @@ -1314,7 +1315,8 @@ 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 @@ -2065,9 +2067,11 @@ 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 @@ -2315,7 +2319,8 @@ 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" @@ -2564,7 +2569,8 @@ 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" @@ -3311,7 +3317,8 @@ 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 @@ -3560,7 +3567,8 @@ 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 @@ -3807,9 +3815,11 @@ VOLCANO" "/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, Ice" Var PictureDrink = bn_oreo_vo_get1_full_path Var OpenFromXML = CurrentXMLFileName2 @@ -4057,7 +4067,8 @@ VOLCANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "TOKYO BANANA MILK" + Var NameDrink = "TOKYO +BANANA MILK" Var NameDrinkTH = "นมโตเกียวบานาน่า" Var DrinkDescriptionTH = "น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล" Var DrinkDescription = "Tokyo Banana Syrup, Milk, Sugar" @@ -4310,8 +4321,10 @@ BANANA MILK" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "CHOCO TOKYO BANANA MILK" - Var NameDrinkTH = "นมช็อกโกโตเกียว บานาน่า" + Var NameDrink = "CHOCO TOKYO +BANANA MILK" + Var NameDrinkTH = "นมช็อกโกโตเกียว +บานาน่า" Var DrinkDescriptionTH = "โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล" Var DrinkDescription = "Tokyo Banana Syrup, Milk, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ChocoBanana_milk.png" diff --git a/xml/page_catalog_group_health.xml b/xml/page_catalog_group_health.xml index ae39d1e1..2689e9b9 100644 --- a/xml/page_catalog_group_health.xml +++ b/xml/page_catalog_group_health.xml @@ -543,8 +543,10 @@ SoundVolume Var NameDrink = "AMERICANO" - Var NameDrinkTH = "กาแฟดำ (อเมริกาโน)" - Var DrinkDescriptionTH = "กาแฟ และน้ำร้อน (อเมริกาโน)" + Var NameDrinkTH = "กาแฟดำ +(อเมริกาโน)" + Var DrinkDescriptionTH = "กาแฟ และน้ำร้อน +(อเมริกาโน)" Var DrinkDescription = "Espresso, Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no_Healthy.png" Var OpenFromXML = CurrentXMLFileName2 @@ -795,8 +797,10 @@ SoundVolume Var NameDrink = "AMERICANO" - Var NameDrinkTH = "กาแฟดำ (อเมริกาโน)" - Var DrinkDescriptionTH = "กาแฟ และน้ำร้อน (อเมริกาโน)" + Var NameDrinkTH = "กาแฟดำ +(อเมริกาโน)" + Var DrinkDescriptionTH = "กาแฟ และน้ำร้อน +(อเมริกาโน)" Var DrinkDescription = "Espresso, Water" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no_Healthy.png" Var OpenFromXML = CurrentXMLFileName2 @@ -1050,7 +1054,8 @@ Var NameDrink = "CAFE' LATTE" Var NameDrinkTH = "ลาเต้" Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม" - Var DrinkDescription = "Espresso, Milk, Foamed milk" + Var DrinkDescription = "Espresso, Milk, +Foamed milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_latte_Healthy.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-1004.Price @@ -1301,7 +1306,8 @@ Foamed milk" Var NameDrink = "CAFE' LATTE" Var NameDrinkTH = "ลาเต้" Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม" - Var DrinkDescription = "Espresso, Milk, Foamed milk" + Var DrinkDescription = "Espresso, Milk, +Foamed milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_latte_Healthy.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-21-01-1004.Price @@ -1552,8 +1558,10 @@ Foamed milk" Var NameDrink = "MOCHA" Var NameDrinkTH = "มอคค่า" - Var DrinkDescriptionTH = "กาแฟ นม ผสมช็อกโกแลต น้ำตาล" - Var DrinkDescription = "Espresso, Cocoa, Milk, Sugar" + Var DrinkDescriptionTH = "กาแฟ นม ผสมช็อกโกแลต +น้ำตาล" + Var DrinkDescription = "Espresso, Cocoa, +Milk, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_Mocha_Healthy.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-1006.Price @@ -1804,8 +1812,10 @@ Milk, Sugar" Var NameDrink = "MOCHA" Var NameDrinkTH = "มอคค่า" - Var DrinkDescriptionTH = "กาแฟ นม ผสมช็อกโกแลต น้ำตาล" - Var DrinkDescription = "Espresso, Cocoa, Milk, Sugar" + Var DrinkDescriptionTH = "กาแฟ นม ผสมช็อกโกแลต +น้ำตาล" + Var DrinkDescription = "Espresso, Cocoa, +Milk, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_Mocha_Healthy.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-21-01-1006.Price @@ -2058,7 +2068,8 @@ Milk, Sugar" Var NameDrink = "CAPPUCCINO" Var NameDrinkTH = "คาปูชิโน่" Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม" - Var DrinkDescription = "Espresso, Milk, Foamed milk" + Var DrinkDescription = "Espresso, Milk, +Foamed milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_Cappu_Healthy.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-01-01-1099.Price @@ -2309,7 +2320,8 @@ Foamed milk" Var NameDrink = "CAPPUCCINO" Var NameDrinkTH = "คาปูชิโน่" Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม" - Var DrinkDescription = "Espresso, Milk, Foamed milk" + Var DrinkDescription = "Espresso, Milk, +Foamed milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_Cappu_Healthy.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-21-01-1099.Price @@ -2810,10 +2822,12 @@ Foamed milk" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "TAIWANESE MILK TEA" + Var NameDrink = "TAIWANESE +MILK TEA" Var NameDrinkTH = "ชานมไต้หวัน" Var DrinkDescriptionTH = "ชาไต้หวัน และ นมอุ่น" - Var DrinkDescription = "Taiwanese Tea, Sugar, and Milk" + Var DrinkDescription = "Taiwanese Tea, Sugar, +and Milk" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_taiwan_milk_tea_Jason_Healthy.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-02-01-1025.Price @@ -3820,7 +3834,8 @@ and Milk" "/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 and Water" @@ -4325,10 +4340,13 @@ LIMENADE" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "TAIWANESE LBLACK TEA" - Var NameDrinkTH = "ชาดำไต้หวัน มะนาว" + Var NameDrink = "TAIWANESE +LBLACK TEA" + Var NameDrinkTH = "ชาดำไต้หวัน +มะนาว" Var DrinkDescriptionTH = "ชาอู่หลงไต้หวัน น้ำ มะนาว" - Var DrinkDescription = "Taiwan tea, Limenade, Water, and Ice" + Var DrinkDescription = "Taiwan tea, Limenade, +Water, and Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lime_Oolong_tea_Healthy.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-02-01-1032.Price @@ -5588,7 +5606,8 @@ Water, and Ice" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "ICED LIMENADE SODA" + Var NameDrink = "ICED LIMENADE +SODA" Var NameDrinkTH = "น้ำมะนาวโซดา" Var DrinkDescriptionTH = "มะนาว โซดา และน้ำแข็ง" Var DrinkDescription = "Limenade, Sugar, Soda, Ice" diff --git a/xml/page_catalog_group_milk.xml b/xml/page_catalog_group_milk.xml index 5fbe2245..db4268c4 100644 --- a/xml/page_catalog_group_milk.xml +++ b/xml/page_catalog_group_milk.xml @@ -1048,8 +1048,10 @@ Var NameDrink = "CARAMEL COCOA" Var NameDrinkTH = "คาราเมลโกโก้ " - Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล น้ำเชื่อมคาราเมล" - Var DrinkDescription = "Cocoa, Milk,Sugar, Caramel Syrup" + Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล +น้ำเชื่อมคาราเมล" + Var DrinkDescription = "Cocoa, Milk,Sugar, +Caramel Syrup" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_caramel_cocoa.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $12-03-01-0004.Price @@ -1300,7 +1302,8 @@ Caramel Syrup" "/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" @@ -1555,7 +1558,8 @@ 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 @@ -2054,9 +2058,11 @@ 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 @@ -2304,9 +2310,11 @@ SMOOTHIE" "/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 @@ -2554,9 +2562,11 @@ SMOOTHIE" "/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, Ice" Var PictureDrink = bn_oreo_vo_get1_full_path Var OpenFromXML = CurrentXMLFileName2 @@ -3056,7 +3066,8 @@ 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" @@ -3305,7 +3316,8 @@ 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" @@ -4058,10 +4070,14 @@ VOLCANO" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PINK MILK OREO VOLCANO" - Var NameDrinkTH = "นมชมพูปั่น โอริโอ้ภูเขาไฟ" - Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ นม น้ำตาล Oreo" - Var DrinkDescription = "Salak Syrup, Milk, Sugar Oreo" + Var NameDrink = "PINK MILK +OREO VOLCANO" + Var NameDrinkTH = "นมชมพูปั่น +โอริโอ้ภูเขาไฟ" + Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ นม น้ำตาล + Oreo" + Var DrinkDescription = "Salak Syrup, Milk, +Sugar Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_PinkOreo_smoothie.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -4310,7 +4326,8 @@ Sugar Oreo" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "TOKYO BANANA MILK" + Var NameDrink = "TOKYO +BANANA MILK" Var NameDrinkTH = "นมโตเกียวบานาน่า" Var DrinkDescriptionTH = "น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล" Var DrinkDescription = "Tokyo Banana Syrup, Milk, Sugar" @@ -4563,8 +4580,10 @@ BANANA MILK" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "CHOCO TOKYO BANANA MILK" - Var NameDrinkTH = "นมช็อกโกโตเกียว บานาน่า" + Var NameDrink = "CHOCO TOKYO +BANANA MILK" + Var NameDrinkTH = "นมช็อกโกโตเกียว +บานาน่า" Var DrinkDescriptionTH = "โกโก้ น้ำเชื่อมโตเกียวบานาน่า นมและน้ำตาล" Var DrinkDescription = "Tokyo Banana Syrup, Milk, Sugar" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ChocoBanana_milk.png" diff --git a/xml/page_catalog_group_oreo.xml b/xml/page_catalog_group_oreo.xml index 7f675cb1..60dad372 100644 --- a/xml/page_catalog_group_oreo.xml +++ b/xml/page_catalog_group_oreo.xml @@ -523,7 +523,7 @@ Var block_index_override = 0 Var block_index_move = 0 -; menu_new_list 10 +; menu_new_list 9 ; ==================> Len = 16 ; - - 12-03-03-0009 @@ -540,9 +540,11 @@ "/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, Ice" Var PictureDrink = bn_oreo_vo_get1_full_path Var OpenFromXML = CurrentXMLFileName2 @@ -772,258 +774,6 @@ VOLCANO" text_unavailable center-vertical-horizontal - - ; - - - - ; ==================> Len = 16 - ; - - 12-03-03-0026 - - 33 - 22 - 225 - 296 - Flag( 12-03-03-0026.Button,$Sum1203030026) - - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "นมชมพูปั่น -โอริโอ้ภูเขาไฟ" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "น้ำแดงกลิ่นสละ นม น้ำตาล - Oreo" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "PINK MILK -OREO VOLCANO" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Salak Syrup, Milk, -Sugar, Oreo" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-03-03-0026.Button - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-03-0026.Button - StringFmt( $12-03-03-0026.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - 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" - - - 49 - 117 - - eval( - If $Sum1203030026 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $12-03-03-0026.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" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1203030026 - text_unavailable - center-vertical-horizontal - ; - - - ; ==================> Len = 15 @@ -1042,10 +792,14 @@ Sugar, Oreo" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "STRAWBERRY MILK OREO VOLCANO" - Var NameDrinkTH = "สตอเบอร์รี่ปั่น โอริโอ้ภูเขาไฟ" - Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ นม น้ำตาล Oreo" - Var DrinkDescription = "Strawberry Syrup, Milk, Sugar, Oreo" + Var NameDrink = "STRAWBERRY MILK +OREO VOLCANO" + Var NameDrinkTH = "สตอเบอร์รี่ปั่น +โอริโอ้ภูเขาไฟ" + Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ นม น้ำตาล + Oreo" + Var DrinkDescription = "Strawberry Syrup, Milk, +Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_StrawberrOreo_smoothie.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -1295,9 +1049,12 @@ Sugar, Oreo" SoundVolume Var NameDrink = "MELON MILK OREO VOLCANO" - Var NameDrinkTH = "เมล่อนปั่น โอริโอ้ภูเขาไฟ" - Var DrinkDescriptionTH = "น้ำเชื่อมเมล่อน นม น้ำตาล Oreo" - Var DrinkDescription = "Melon Syrup, Milk, Sugar, Oreo" + Var NameDrinkTH = "เมล่อนปั่น +โอริโอ้ภูเขาไฟ" + Var DrinkDescriptionTH = "น้ำเชื่อมเมล่อน นม น้ำตาล + Oreo" + Var DrinkDescription = "Melon Syrup, Milk, +Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_MelonOreo_smoothie.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -1545,10 +1302,13 @@ Sugar, Oreo" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "BANANA MILK OREO VOLCANO" - Var NameDrinkTH = "นมกล้วยปั่น โอริโอ้ภูเขาไฟ" + Var NameDrink = "BANANA MILK OREO +VOLCANO" + Var NameDrinkTH = "นมกล้วยปั่น +โอริโอ้ภูเขาไฟ" Var DrinkDescriptionTH = "น้ำเชื่อมกล้วย นม น้ำตาล Oreo" - Var DrinkDescription = "Banana Syrup, Milk, Sugar, Oreo" + Var DrinkDescription = "Banana Syrup, Milk, +Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_BananaOreo_smoothie.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -1797,9 +1557,12 @@ Sugar, Oreo" SoundVolume Var NameDrink = "CHOCO OREO VOLCANO" - Var NameDrinkTH = "โกโก้ปั่น โอริโอ้ภูเขาไฟ" - Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล Oreo" - Var DrinkDescription = "Cocoa, Milk, Sugar, Oreo" + Var NameDrinkTH = "โกโก้ปั่น +โอริโอ้ภูเขาไฟ" + Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล + Oreo" + Var DrinkDescription = "Cocoa, Milk, +Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ChocoOreo_smoothie.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -2048,9 +1811,12 @@ Sugar, Oreo" SoundVolume Var NameDrink = "12-01-01-0043" - Var NameDrinkTH = "นมคาราเมลปั่น โอริโอ้ภูเขาไฟ" - Var DrinkDescriptionTH = "น้ำเชื่อมคาราเมล นม น้ำตาล Oreo" - Var DrinkDescription = "Caramel Syrup, Milk, Sugar, Oreo" + Var NameDrinkTH = "นมคาราเมลปั่น +โอริโอ้ภูเขาไฟ" + Var DrinkDescriptionTH = "น้ำเชื่อมคาราเมล นม น้ำตาล + Oreo" + Var DrinkDescription = "Caramel Syrup, Milk, +Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_CaramelOreo_smoothie.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -2299,9 +2065,12 @@ Sugar, Oreo" SoundVolume Var NameDrink = "HOJICHA OREO VOLCANO" - Var NameDrinkTH = "โฮจิฉะ โอริโอ้ภูเขาไฟ" - Var DrinkDescriptionTH = "โฮจิฉะ นม น้ำตาล Oreo" - Var DrinkDescription = "Hojicha, Milk, Sugar, Oreo" + Var NameDrinkTH = "โฮจิฉะ +โอริโอ้ภูเขาไฟ" + Var DrinkDescriptionTH = "โฮจิฉะ นม น้ำตาล + Oreo" + Var DrinkDescription = "Hojicha, Milk, +Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_HojichaOreo_smoothie.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -2550,9 +2319,12 @@ Sugar, Oreo" SoundVolume Var NameDrink = "THAI MILK TEA OREO VOLCANO" - Var NameDrinkTH = "ชานมไทย โอริโอ้ภูเขาไฟ" - Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล Oreo" - Var DrinkDescription = "Thai Tea, Milk, Sugar, Oreo" + Var NameDrinkTH = "ชานมไทย +โอริโอ้ภูเขาไฟ" + Var DrinkDescriptionTH = "ชาไทย นม น้ำตาล + Oreo" + Var DrinkDescription = "Thai Tea, Milk, +Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_ThaiTeaOreo_smoothie.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -2801,9 +2573,12 @@ Sugar, Oreo" SoundVolume Var NameDrink = "CAFE LATTE OREO VOLCANO" - Var NameDrinkTH = "ลาเต้ปั่น โอริโอ้ภูเขาไฟ" - Var DrinkDescriptionTH = "กาแฟ นม น้ำตาล Oero" - Var DrinkDescription = "Coffee, Milk, Sugar, Oreo" + Var NameDrinkTH = "ลาเต้ปั่น + โอริโอ้ภูเขาไฟ" + Var DrinkDescriptionTH = "กาแฟ นม น้ำตาล + Oero" + Var DrinkDescription = "Coffee, Milk, +Sugar, Oreo" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Cafe_Latte_Oreo_smoothie.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price diff --git a/xml/page_catalog_group_other.xml b/xml/page_catalog_group_other.xml index 74c1975e..996484b2 100644 --- a/xml/page_catalog_group_other.xml +++ b/xml/page_catalog_group_other.xml @@ -792,9 +792,11 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "TAO POWER DRINK SODA" + Var NameDrink = "TAO POWER +DRINK SODA" Var NameDrinkTH = "เต่าทรงพลังโซดา" - Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง โซดา (มีคาเฟอีน)" + Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง โซดา +(มีคาเฟอีน)" Var DrinkDescription = "Medicine drink, Soda & Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda.png" Var OpenFromXML = CurrentXMLFileName2 @@ -1044,7 +1046,8 @@ DRINK SODA" 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 @@ -1293,7 +1296,8 @@ DRINK SODA" 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 @@ -1540,7 +1544,8 @@ DRINK SODA" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "LIMENADE SODA" + Var NameDrink = "LIMENADE +SODA" Var NameDrinkTH = "น้ำมะนาวโซดา" Var DrinkDescriptionTH = "มะนาว โซดา " Var DrinkDescription = "Limenade, Sugar, Soda & Ice" @@ -2037,10 +2042,13 @@ SODA" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "LYCHEE LIMENADE SODA" + Var NameDrink = "LYCHEE +LIMENADE SODA" Var NameDrinkTH = "ลิ้นจี่มะนาวโซดา " - Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ มะนาว โซดา " - Var DrinkDescription = "Strawberry Syrup, Limenade, Soda & Ice" + Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ มะนาว +โซดา " + Var DrinkDescription = "Strawberry Syrup, +Limenade, Soda & Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Lychee_lime_soda.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -2290,7 +2298,8 @@ Limenade, Soda & Ice" Var NameDrink = "CANNABIS SODA" Var NameDrinkTH = "กัญชาโซดา" - Var DrinkDescriptionTH = "น้ำเชื่อมกัญชา โซดา (อายุมากกว่า 20+ เท่านั้น)" + Var DrinkDescriptionTH = "น้ำเชื่อมกัญชา โซดา +(อายุมากกว่า 20+ เท่านั้น)" Var DrinkDescription = "Cannabis Syrup, Soda & Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_hemp_soda.png" Var OpenFromXML = CurrentXMLFileName2 @@ -2537,10 +2546,13 @@ Limenade, Soda & Ice" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "LIMENADE CANNABIS SODA" + Var NameDrink = "LIMENADE +CANNABIS SODA" Var NameDrinkTH = "มะนาวกัญชาโซดา" - Var DrinkDescriptionTH = "น้ำเชื่อมกัญชา มะนาว โซดา (อายุ 20+ เท่านั้น)" - Var DrinkDescription = "Cannabis Syrup, Limenade, Soda & Ice" + Var DrinkDescriptionTH = "น้ำเชื่อมกัญชา มะนาว โซดา +(อายุ 20+ เท่านั้น)" + Var DrinkDescription = "Cannabis Syrup, Limenade, +Soda & Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_hemp_lime_soda.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -3532,10 +3544,12 @@ Soda & Ice" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "LIME SALAK SODA" + Var NameDrink = "LIME +SALAK SODA" Var NameDrinkTH = "น้ำแดงมะนาวโซดา" Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ มะนาว โซดา " - Var DrinkDescription = "Salak Syrup, Limenade, Soda & Ice" + Var DrinkDescription = "Salak Syrup, Limenade, +Soda & Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_sala_lime_soda.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -4030,10 +4044,12 @@ Soda & Ice" "/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 & Ice" + Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย มะนาว โซดา " + Var DrinkDescription = "Ume Syrup, Limenade, +Soda & Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_ume_lime_soda.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -4112,8 +4128,7 @@ Soda & Ice" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมบ๊วย มะนาว โซดา - " + "น้ำเชื่อมบ๊วย มะนาว โซดา " 16 @@ -5521,7 +5536,8 @@ Soda & Ice" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "GINGER LIME SODA" + Var NameDrink = "GINGER LIME +SODA" Var NameDrinkTH = "ขิงมะนาวโซดา" Var DrinkDescriptionTH = "ขิง มะนาว โซดา " Var DrinkDescription = "Ginger, Lime, Soda & Ice" @@ -6268,7 +6284,8 @@ SODA" Var NameDrink = "TAO POWER DRINK" Var NameDrinkTH = "เต่าทรงพลัง" - Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง (มีคาเฟอีน)" + Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง +(มีคาเฟอีน)" Var DrinkDescription = "Medicine drink & Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink.png" Var OpenFromXML = CurrentXMLFileName2 @@ -6517,8 +6534,10 @@ SODA" Var NameDrink = "LIME SALAK" Var NameDrinkTH = "น้ำแดงมะนาว " - Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ น้ำมะนาว " - Var DrinkDescription = "Salak Syrup, Limenade, Water & Ice" + Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ น้ำมะนาว + " + Var DrinkDescription = "Salak Syrup, Limenade, +Water & Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_sala_lime.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -6768,7 +6787,8 @@ Water & Ice" Var NameDrink = "LYCHEE DRINK" Var NameDrinkTH = "น้ำลิ้นจี่ " Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ น้ำ " - Var DrinkDescription = "Lychee Syrup, Sugar, Water & Ice" + Var DrinkDescription = "Lychee Syrup, Sugar, +Water & Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Lychee.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -7016,7 +7036,8 @@ Water & Ice" Var NameDrink = "SALAK DRINK" Var NameDrinkTH = "น้ำแดง" - Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ " + Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ + " Var DrinkDescription = "Salak Syrup & Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_sala.png" Var OpenFromXML = CurrentXMLFileName2 @@ -7265,8 +7286,10 @@ Water & Ice" Var NameDrink = "STRAWBERRY " Var NameDrinkTH = "น้ำสตอเบอร์รี่ " - Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ น้ำ " - Var DrinkDescription = "Strawberry Syrup, Water & Ice" + Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ น้ำ + " + Var DrinkDescription = "Strawberry Syrup, +Water & Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberry.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -8016,7 +8039,8 @@ Water & Ice" Var NameDrink = "LYCHEE DRINK" Var NameDrinkTH = "น้ำลิ้นจี่ " Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ น้ำ " - Var DrinkDescription = "Lychee Syrup, Sugar, Water & Ice" + Var DrinkDescription = "Lychee Syrup, Sugar, +Water & Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Lychee.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -8265,7 +8289,8 @@ Water & Ice" Var NameDrink = "STRAWBERRY DRINK" Var NameDrinkTH = "น้ำสตอเบอร์รี่ " Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ น้ำ " - Var DrinkDescription = "Strawberry Syrup, Water, Ice" + Var DrinkDescription = "Strawberry Syrup, +Water, Ice" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberry.png" Var OpenFromXML = CurrentXMLFileName2 Var PriceD1 = $-.Price @@ -8511,7 +8536,8 @@ Water, Ice" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "CONGEE WITH PLANT PROTEIN" + Var NameDrink = "CONGEE WITH +PLANT PROTEIN" Var NameDrinkTH = "โจ๊กใส่โปรตีนจากพืช" Var DrinkDescriptionTH = "ข้าว ผัก โปรตีนจากพืช น้ำ" Var DrinkDescription = "Rice, Plant-based protein, Water" diff --git a/xml/page_catalog_group_recommend.xml b/xml/page_catalog_group_recommend.xml index c232bca8..add19bd3 100644 --- a/xml/page_catalog_group_recommend.xml +++ b/xml/page_catalog_group_recommend.xml @@ -579,7 +579,7 @@ ;dummy_layout.inc -; menu_new_list 44 +; menu_new_list 45 ; ==================> Len = 16 ; 12-06-01-0001 - - @@ -596,7 +596,8 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "CONGEE WITH PLANT PROTEIN" + Var NameDrink = "CONGEE WITH +PLANT PROTEIN" Var NameDrinkTH = "โจ๊กใส่โปรตีนจากพืช" Var DrinkDescriptionTH = "ข้าว ผัก โปรตีนจากพืช น้ำ" Var DrinkDescription = "Rice, Plant-based protein, Water" @@ -1101,9 +1102,11 @@ PLANT PROTEIN" "/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 @@ -1335,37 +1338,38 @@ VOLCANO" ; - - - + ;TAGESP ; ==================> Len = 16 - ; - - 12-03-03-0026 + ; 12-01-01-0001 - - 33 22 225 296 - Flag( 12-03-03-0026.Button,Disable=Invisible,$Sum1203030026) + Flag( 12-01-01-0001.Button,Disable=Invisible,$Sum1201010001) - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "TAGESP" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "เอสเพรสโซ่" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "ESPRESSO" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - $กาแฟ (30 ml).Button - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $กาแฟ (30 ml).Button - StringFmt( $กาแฟ (30 ml).Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - $Espresso (30 ml).Button - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - $Espresso (30 ml).Button - StringFmt( $Espresso (30 ml).Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-01-01-0001.Button - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-01-01-0001.Button - StringFmt( $12-01-01-0001.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - eval( - If ICE_PROCESS_STATUS = 2 Then - - If $Sumกาแฟ (30 ml)Espresso (30 ml)1201010001 = "Disable" Then + If $Sum1201010001 = "Disable" Then Var ice_tab_process_show = "Disable" Else Var ice_tab_process_show = "Enable" @@ -1795,10 +1546,10 @@ Sugar Oreo" 117 eval( - If $Sumกาแฟ (30 ml)Espresso (30 ml)1201010001 = "Disable" Then - STRCONTAIN "ERR" $กาแฟ (30 ml).TAG tag1_is_disable - STRCONTAIN "ERR" $Espresso (30 ml).TAG tag2_is_disable - STRCONTAIN "ERR" $12-01-01-0001.TAG tag3_is_disable + If $Sum1201010001 = "Disable" Then + STRCONTAIN "ERR" $12-01-01-0001.TAG tag1_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable + STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable Var return = "Invisible" If tag1_is_disable = "true" Then Var return = "Enable" @@ -1834,41 +1585,41 @@ Sugar Oreo" MITRegularTTF 0x5A5A5A "disable-show" - $Sumกาแฟ (30 ml)Espresso (30 ml)1201010001 + $Sum1201010001 text_unavailable center-vertical-horizontal - ; - bn_hot_espresso.png 12-21-01-0001 + ; 12-21-01-0001 - - 33 22 225 296 - Flag( bn_hot_espresso.png.Button,12-21-01-0001.Button,Disable=Invisible,$Sumbn_hot_espresso.png1221010001) + Flag( 12-21-01-0001.Button,Disable=Invisible,$Sum1221010001) - - 16 - 164 - 24 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showthaiText - "นมชมพูปั่น -โอริโอ้ภูเขาไฟ" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showthaiText - "น้ำแดงกลิ่นสละ นม น้ำตาล - Oreo" - - - 16 - 164 - 22 - 220 - "multi2" - KanitMediumTTF - 0x322B26 - showengText - "Pink milk -Oreo volcano" - - - 16 - 220 - 14 - 220 - KanitMediumTTF - 0x6F5F51 - showengText - "Salak Syrup, Milk, -Sugar Oreo" - - - 16 - 264 - Var( DirImage2 + "option_deactive.png" ) - - - 16 - 264 - "Invisible" - Var( DirImage2 + "hot.png" ) - Var( DirImage2 + "hot_db.png" ) - - - 50 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - Var( DirImage2 + "cold.png" ) - Var( DirImage2 + "cold_db.png" ) - "Invisible" - - - 115 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitMediumTTF - 0x6F5F51 - 0xEAE6E1 - "Invisible" - StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 146 - 264 - Var( DirImage2 + "blend.png" ) - Var( DirImage2 + "blend_db.png" ) - $12-03-03-0026.Button - - - 180 - TextPriceMenuY - TextPriceMenuSize - 220 - KanitRegularTTF - 0x6F5F51 - 0xEAE6E1 - $12-03-03-0026.Button - StringFmt( $12-03-03-0026.Price , DisplayFormat, PreScaleConvertShow) ; test - - - 81 - 264 - - 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" - - - 49 - 117 - - eval( - If $Sum1203030026 = "Disable" Then - STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable - STRCONTAIN "ERR" $##-##-##-####.TAG tag2_is_disable - STRCONTAIN "ERR" $12-03-03-0026.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" - - - 84 - 266 - 10 - OpunMediumTTF - 0xDE794E - ice_tab_process_show - ice_show_open - - - 48 - 116 - 32 - 128 - 64 - MITRegularTTF - 0x5A5A5A - "disable-show" - $Sum1203030026 - text_unavailable - center-vertical-horizontal - ; -;TAGESP ; ==================> Len = 16 @@ -3451,10 +3202,14 @@ Sugar Oreo" "/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 @@ -3707,10 +3462,14 @@ 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 @@ -3963,10 +3722,14 @@ Note: Blue Berry & Floral" "/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 @@ -4219,10 +3982,14 @@ 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 @@ -4475,10 +4242,14 @@ 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 @@ -4731,10 +4502,14 @@ 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 @@ -4987,9 +4762,12 @@ 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 @@ -5243,7 +5021,8 @@ 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" @@ -5496,9 +5275,12 @@ 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 @@ -5750,10 +5532,14 @@ Pink​ Rose & Berry" "/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 @@ -6006,8 +5792,10 @@ 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" @@ -6260,8 +6048,10 @@ 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" @@ -6514,10 +6304,14 @@ ESPRESSO" "/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 @@ -6770,10 +6564,14 @@ 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 @@ -7026,10 +6824,14 @@ 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 @@ -7282,10 +7084,14 @@ 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 @@ -7538,10 +7344,14 @@ 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 @@ -7794,10 +7604,14 @@ 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 @@ -8050,9 +7864,12 @@ 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 @@ -8305,8 +8122,10 @@ 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" @@ -8559,10 +8378,14 @@ 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 @@ -8815,10 +8638,14 @@ 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 @@ -9071,8 +8898,10 @@ 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" @@ -9325,8 +9154,10 @@ 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" @@ -9582,7 +9413,8 @@ 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 @@ -11094,8 +10926,10 @@ 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 @@ -11342,9 +11176,11 @@ 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 @@ -11844,7 +11680,8 @@ 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" @@ -12589,7 +12426,8 @@ VOLCANO" "/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" @@ -12838,9 +12676,10 @@ DRINK SODA" "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "PLUM LIMENADE SODA" + Var NameDrink = "PLUM +LIMENADE SODA" Var NameDrinkTH = "บ๊วยมะนาวโซดา" - Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย มะนาว โซดา " + Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย มะนาว โซดา" Var DrinkDescription = "Ume Syrup, Limenade, Soda" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_ume_lime_soda.png" Var OpenFromXML = CurrentXMLFileName2 @@ -12920,8 +12759,7 @@ DRINK SODA" KanitMediumTTF 0x6F5F51 showthaiText - "น้ำเชื่อมบ๊วย มะนาว โซดา - " + "น้ำเชื่อมบ๊วย มะนาว โซดา" 16 diff --git a/xml/page_catalog_group_songkran.xml b/xml/page_catalog_group_songkran.xml index ed23db8d..81466316 100644 --- a/xml/page_catalog_group_songkran.xml +++ b/xml/page_catalog_group_songkran.xml @@ -540,10 +540,12 @@ "/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 @@ -633,7 +635,8 @@ KanitMediumTTF 0x322B26 showengText - "SEXY DANCE AMERICANO" + "SEXY DANCE +AMERICANO" 16 @@ -789,10 +792,12 @@ 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 @@ -882,7 +887,8 @@ water" KanitMediumTTF 0x322B26 showengText - "SNAKE WIFE AMERICANO" + "SNAKE WIFE +AMERICANO" 16 @@ -1534,7 +1540,8 @@ water" "/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" @@ -2031,8 +2038,9 @@ HOUSE " "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var NameDrink = "BUCKET POPSICLE PEPSI" - Var NameDrinkTH = "เป๊ปซี่ไอติมแท่ง" + Var NameDrink = "BUCKET POPSICLE +PEPSI" + Var NameDrinkTH = "เป๊ปซี่ไอติมหลอด" Var DrinkDescriptionTH = "เป๊ปซี่ น้ำแดงกลิ่นสละ โซดา" Var DrinkDescription = "Pepsi, Salak ryrup, soda" Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_bucket_popsicle_pepsi.png" @@ -2103,7 +2111,7 @@ HOUSE " KanitMediumTTF 0x322B26 showthaiText - "เป๊ปซี่ไอติมแท่ง" + "เป๊ปซี่ไอติมหลอด" 16 @@ -2124,7 +2132,8 @@ HOUSE " KanitMediumTTF 0x322B26 showengText - "BUCKET POPSICLE PEPSI" + "BUCKET POPSICLE +PEPSI" 16 diff --git a/xml/page_catalog_group_tea.xml b/xml/page_catalog_group_tea.xml index 6d0a7e8e..77e28551 100644 --- a/xml/page_catalog_group_tea.xml +++ b/xml/page_catalog_group_tea.xml @@ -1555,7 +1555,8 @@ "/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 " @@ -3824,8 +3825,10 @@ 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" @@ -4330,8 +4333,10 @@ 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" @@ -4584,9 +4589,11 @@ 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 @@ -5344,8 +5351,10 @@ 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 @@ -5598,8 +5607,10 @@ 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 @@ -6354,7 +6365,8 @@ 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" @@ -6607,7 +6619,8 @@ 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" @@ -6860,10 +6873,12 @@ 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 29d5b1de..c4ba39e8 100644 --- a/xml/page_catalog_group_whey.xml +++ b/xml/page_catalog_group_whey.xml @@ -553,7 +553,8 @@ 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 @@ -802,7 +803,8 @@ 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 @@ -1051,7 +1053,8 @@ 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,10 +1300,13 @@ 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 @@ -1548,10 +1554,13 @@ 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 @@ -1801,8 +1810,10 @@ 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 @@ -2052,7 +2063,8 @@ 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 @@ -2301,7 +2313,8 @@ 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 @@ -2550,7 +2563,8 @@ 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 @@ -2796,10 +2810,13 @@ 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 @@ -3047,10 +3064,13 @@ 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 @@ -3298,10 +3318,13 @@ 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 @@ -3551,8 +3574,10 @@ 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_catalog_with_vending.xml b/xml/page_catalog_with_vending.xml index a3fd165c..d6c07b4a 100644 --- a/xml/page_catalog_with_vending.xml +++ b/xml/page_catalog_with_vending.xml @@ -291,7 +291,16 @@ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" ; eng - Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + If ShowPromoitonOreo = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_recommend2.xml" + Else + + If SongkranEnable = 1 Then + Open "ROOT/taobin_project/xml/page_catalog_group_recommend3.xml" + Else + Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" + EndIf + EndIf diff --git a/xml/page_face_compare.xml b/xml/page_face_compare.xml new file mode 100644 index 00000000..22553e99 --- /dev/null +++ b/xml/page_face_compare.xml @@ -0,0 +1,166 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + Var CamFlag = 0 + Var CamCount = 0 + Var Timeout = 0 + + Var LOADING_STATE = "Enable" + + DEBUGVAR LOADING_STATE + + + + + SAVELOG "EventActionOk" + Var AdultFlag = 0 + CoinVending XBILL + Open "ROOT/taobin_project/xml/page_payment_cash.xml" + + + + + SAVELOG "EventActionError" + Open "ROOT/taobin_project/xml/page_catalog2.xml" + + + + + 1000 + + DEBUGVAR Timeout + Var Timeout = Timeout + 1 + + If Timeout = 1 Then + FaceCompare 30 + EndIf + + If Timeout > 31 Then + Open "ROOT/taobin_project/xml/page_catalog2.xml" + EndIf + + Refresh + TimerReset + + + + + + + 144 + 413 + pay_with_chanel_text + + + +; back + + + + 375 + 623 + 331 + 435 + PictureDrink + + + + + 375 + 623 + eval( + If IsSmoRet = "true" Then + Var return = "Enable" + Else + Var return = "Invisible" + EndIf +) + + "ROOT/taobin_project/image/topping2/blender_icon.png" + + + + + 0 + 1065 + 1080 + Center + 72 + KanitMediumTTF + 0xB78F24 + showRemaining + + + + + + 0 + 938 + 1080 + Center + 72 + KanitMediumTTF + 0x513C2F + showname + + + + 0 + 1022 + 1080 + Center + 24 + KanitLightTTF + 0x6F5F51 + showdesc + + + + + 0 + 380 + "Enable" + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + + + 837 + 1255 + 94 + 94 + LOADING_STATE + Var( DirImage + "/loading.gif" ) + + + + diff --git a/xml/page_identity_verification.xml b/xml/page_identity_verification.xml new file mode 100644 index 00000000..ccf82b25 --- /dev/null +++ b/xml/page_identity_verification.xml @@ -0,0 +1,329 @@ + + "Enable" + 1080 + 1920 + "0xeae6e1" + SoundVolume + + + Var CamFlag = 0 + Var CamCount = 0 + Var Timeout = 0 + Var ShutterResult = "-" + + Var AdultFlag = 1 + + If AdultFlag = 1 Then + + Var AdultFlag = 0 + + DEBUGVAR SystemDate + Var sdate = "" + Var sdate = SystemDate + Var sdateday = "" + Var sdatemonth = "" + Var sdateyear = "" + SPLIT sdate "/" 1 sdateday + SPLIT sdate "/" 2 sdatemonth + SPLIT sdate "/" 3 sdateyear + INT sdateday + INT sdatemonth + INT sdateyear + READCARDID + + Var AdultState = "Enable" + Var AdultState1 = "Enable" + + Var countAdultS2 = 0 + Var AdultFlag2 = 1 + EndIf + + If show_eng = "true" Then + Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + + Else + Var DirImage = "ROOT/taobin_project/image/page_payment" + Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend" + Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png" + EndIf + + + If CameraCount = 1 Then + + EndIf + + + Var CountDownDelayReadCardID = 5 + DEBUGVAR CameraCount + + + + + + + + + + + + DEBUGVAR IDCardStatus + DEBUGVAR IDCardReady + DEBUGVAR IDCardData + DEBUGVAR IDBirthdate + + If AdultFlag2 = 1 Then + + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "START" Then + + Var AdultState2 = "Enable" + Var AdultState1 = "Invisible" + Var AdultState3 = "Invisible" + + Refresh + EndIf + EndIf + EndIf + + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "ERROR" Then + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + + Refresh + EndIf + EndIf + EndIf + + If IDCardStatus = "ERROR" Then + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + + Refresh + EndIf + + If IDCardStatus = "OK" Then + If IDCardReady = "OK" Then + If IDCardData = "DONE" Then + + ;Var birthDate = IDBirthdate + Var StrYear = "" + Var StrMon = "" + Var StrDay = "" + + SUBSTRING IDBirthdate 0 4 StrYear + SUBSTRING IDBirthdate 4 6 StrMon + SUBSTRING IDBirthdate 6 8 StrDay + + INT StrYear + INT StrMon + INT StrDay + + Var Adult20 = 0 + + + DEBUGVAR StrYear + DEBUGVAR StrMon + DEBUGVAR StrDay + + DEBUGVAR sdatemonth + DEBUGVAR sdateday + + Var sdateyear = sdateyear + 543 + Var AgeNumber = sdateyear - StrYear + DEBUGVAR AgeNumber + + If AgeNumber >= 20 Then + + If AgeNumber = 20 Then + If sdatemonth > StrMon Then + Var Adult20 = 1 + Else + If sdatemonth = StrMon Then + If sdateday >= StrDay Then + Var Adult20 = 1 + EndIf + EndIf + EndIf + Else + Var Adult20 = 1 + EndIf + + If Adult20 = 1 Then + Var AdultState3 = "Invisible" + Var AdultState2 = "Invisible" + Var AdultState1 = "Invisible" + Var AdultState = "Invisible" + Refresh + + Else + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + Refresh + EndIf + + Else + Var AdultState2 = "Invisible" + Var AdultState3 = "Enable" + Refresh + EndIf + + + Var AdultFlag2 = 1 + + EndIf + EndIf + EndIf + + + EndIf + + + + + + + 1000 + + DEBUGVAR IDCardStatus + DEBUGVAR IDCardReady + DEBUGVAR IDCardData + DEBUGVAR IDBirthdate + DEBUGVAR CountDownDelayReadCardID + DEBUGVAR ShutterResult + + + If IDBirthdate = "" Then + Var CountDownDelayReadCardID = CountDownDelayReadCardID - 1 + If CountDownDelayReadCardID = 0 Then + READCARDID + Var CountDownDelayReadCardID = 10 + EndIf + EndIf + + DEBUGVAR Timeout + Var Timeout = Timeout + 1 + + If Timeout > 30 Then + Open "ROOT/taobin_project/xml/page_catalog2.xml" + EndIf + + If ShutterResult = "ok" Then + Open "ROOT/taobin_project/xml/page_face_compare.xml" + EndIf + + Refresh + TimerReset + + + + + + + 144 + 413 + pay_with_chanel_text + + + +; back + + + + 0 + 1065 + 1080 + Center + 72 + KanitMediumTTF + 0xB78F24 + showRemaining + + + + + + 0 + 380 + "Enable" + "ROOT/taobin_project/image/page_payment/alpha.png" + + + + 689 + 875 + "Enable" + Var( DirImage + "/img_popup6.png" ) + + + + + + 1032 + 875 + 48 + 48 + "/mnt/sdcard/coffeevending/wav/click.wav" + SoundVolume + + Open "ROOT/taobin_project/xml/page_catalog2.xml" + + + + + 0 + 381 +"usbfront" + 700 + 394 + + + + + DEBUGVAR BugFlag + If BugFlag = 0 Then + Var BugFlag = 1 + EndIf + + + + + DEBUGVAR IDCardStatus + DEBUGVAR IDCardReady + DEBUGVAR IDCardData + DEBUGVAR IDBirthdate + + diff --git a/xml/page_payment.xml b/xml/page_payment.xml index cb25f638..9e8e4aee 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -260,28 +260,29 @@ If Seeker = "curr" Then If web_ready = "false" Then + If Delay = 0 Then + If MachineStage = "remove-cup" Then + SAVELOG "MachineStage = remove-cup" + If HaveCup = "true" Then + Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" + EndIf - If MachineStage = "remove-cup" Then - SAVELOG "MachineStage = remove-cup" - If HaveCup = "true" Then - Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" + EndIf + + If CupChecking = "true" Then + If HaveCup = "true" Then + SAVELOG "Have cup" + Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" + EndIf EndIf - EndIf - - If CupChecking = "true" Then - If HaveCup = "true" Then - SAVELOG "Have cup" + If DoorCupPosition = "bottom" Then + + Else + SAVELOG "DoorCupPosition not bottom" Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" EndIf EndIf - - If DoorCupPosition = "bottom" Then - - Else - SAVELOG "DoorCupPosition not bottom" - Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml" - EndIf EndIf Else @@ -360,35 +361,6 @@ Var SessionID2 = SelectSlot + ":" Var SessionID2 = SessionID2 + Seeker.ExtendData - ;Var CreditAmount1 = "" - ;Var ServiceAmountFlow = "" - ;Var TelephoneNumberQR = "0899999999" - ;Var ServiceType = "coffee" - ;Var ECommerceQR = "" - ;Var ECommerceQR = ECommerceQR + PriceDrink - ;Var ECommerceQR = ECommerceQR + "/" - ;Var ECommerceQR = ECommerceQR + DiscountDrink - ;Var ECommerceQR = ECommerceQR + "/" - ;Var ECommerceQR = ECommerceQR + SessionID2 - ;Var ECommerceQR = ECommerceQR + "/" - ;Var ECommerceQR = ECommerceQR + SelectDrink - ;Var ECommerceQR = ECommerceQR + "/" - ;Var ECommerceQR = ECommerceQR + "KBA:2" - ;Var ServiceParameter = "max" - ;Var ServiceCharge = 0 - ;Var AccountType = "new" - ;Var testservice = "kbank" - ;Var tc = "" - ;Var GetScore = "" - ;Var OperatorName = "" - ;Var SessionID = "" - - - ;GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc - ;Var Timeout = 0 - ;Var GetPayInfoFlag = 1 - ;Var ReqPayInfoFlag = 1 - EndIf ; Reset diff --git a/xml/page_thankyouConti.xml b/xml/page_thankyouConti.xml index 2bbfc0f3..f5d650b1 100644 --- a/xml/page_thankyouConti.xml +++ b/xml/page_thankyouConti.xml @@ -138,17 +138,16 @@ Var CountDownBrewing = CountDownBrewing - 1 DEBUGVAR MachineStage - DEBUGVAR stop_now - DEBUGVAR CupOnArm DEBUGVAR HaveCup DEBUGVAR CHECKCUP DEBUGVAR CupChecking DEBUGVAR MaybeHaveCup DEBUGVAR DoorCupPosition DEBUGVAR CountUpDoorCupOpen + DEBUGVAR Timeout DEBUGVAR Timeout2 - DEBUGVAR MakeContinue + If PaySuccessWithDaemonTask = 1 Then If MakeContinue = 1 Then Var MakeContinue = 0 @@ -214,7 +213,7 @@ Else If CupChecking = "true" Then - Else + Else Var buttonRemoveCup = "Enable" Var txtDrinkOKState = "Enable" EndIf @@ -236,6 +235,8 @@ Else Var buttonRemoveCup = "Invisible" + Var Timeout = 0 + Var CountUpDoorCupOpen = CountUpDoorCupOpen + 1 If CountUpDoorCupOpen > 80 Then Var CountUpDoorCupOpen = 60 @@ -283,7 +284,7 @@ Var LastMakeDrinkResult = "fail" Else - Var CountDownThankyou = 0 + Var CountDownThankyou = 0 EndIf Else ;Cart "MakeID" CART_INDEX @@ -299,6 +300,7 @@ ; reset all var DEBUGVAR MachineStage + SAVELOG "CountDownThankyou = 0" Var CountDownBrewing = BrewTime Var CountUpBrewing = 0 diff --git a/xml/vending_info.xml b/xml/vending_info.xml index 9b69fbb8..a2c643f0 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -509,7 +509,6 @@ info_9Y "ROOT/taobin_project/image/tab_1.png" - CameraService "Start" @@ -548,7 +547,11 @@ info_10Y "ROOT/taobin_project/image/tab_1.png" + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml" + OpenInst 2 "ROOT/taobin_project/xml/page_identity_verification.xml" + TopView "show" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" @@ -567,7 +570,12 @@ info_10Y "ROOT/taobin_project/image/tab_1.png" - Open "ROOT/taobin_project/xml/test_qr.xml" + If CameraCount = 1 Then + + CameraSetting "usbfront" "default" "Rotate=90,Resolution=1280x720,scaleX=1.0,scaleY=1.0" + EndIf + + ;Open "ROOT/taobin_project/xml/test_qr.xml" diff --git a/xml_main/startup.xml b/xml_main/startup.xml index b76186f4..e04d9309 100644 --- a/xml_main/startup.xml +++ b/xml_main/startup.xml @@ -108,8 +108,8 @@ Var RandomPromotionMyworld = 0 Var RandomSalePackage = 0 - Var XMLPageVersion = "7.06" - Var XMLPageVersionInt = 706 + Var XMLPageVersion = "7.07" + Var XMLPageVersionInt = 707