diff --git a/image/page_drink/bn_grass_jelly.png b/image/page_drink/bn_grass_jelly.png new file mode 100644 index 00000000..9eb5a3cc Binary files /dev/null and b/image/page_drink/bn_grass_jelly.png differ diff --git a/image/page_drink/bn_hot_lime_Matcha.png b/image/page_drink/bn_hot_lime_Matcha.png new file mode 100644 index 00000000..2a98e90c Binary files /dev/null and b/image/page_drink/bn_hot_lime_Matcha.png differ diff --git a/image/page_drink/bn_hot_matcha_tea.png b/image/page_drink/bn_hot_matcha_tea.png new file mode 100644 index 00000000..96db1750 Binary files /dev/null and b/image/page_drink/bn_hot_matcha_tea.png differ diff --git a/image/page_drink/bn_iced_lime_tea_Matcha.png b/image/page_drink/bn_iced_lime_tea_Matcha.png new file mode 100644 index 00000000..ecdb2543 Binary files /dev/null and b/image/page_drink/bn_iced_lime_tea_Matcha.png differ diff --git a/image/page_drink/bn_matcha_tea.png b/image/page_drink/bn_matcha_tea.png new file mode 100644 index 00000000..bb35fabb Binary files /dev/null and b/image/page_drink/bn_matcha_tea.png differ diff --git a/image/page_drink_disable/bn_blueberry_tea.png b/image/page_drink_disable/bn_blueberry_tea.png index ac11f39e..95af3d41 100644 Binary files a/image/page_drink_disable/bn_blueberry_tea.png and b/image/page_drink_disable/bn_blueberry_tea.png differ diff --git a/image/page_drink_disable/bn_chrysanthemum_tea.png b/image/page_drink_disable/bn_chrysanthemum_tea.png index e36a979c..4996bcf7 100644 Binary files a/image/page_drink_disable/bn_chrysanthemum_tea.png and b/image/page_drink_disable/bn_chrysanthemum_tea.png differ diff --git a/image/page_drink_disable/bn_grass_jelly.png b/image/page_drink_disable/bn_grass_jelly.png new file mode 100644 index 00000000..339158cf Binary files /dev/null and b/image/page_drink_disable/bn_grass_jelly.png differ diff --git a/image/page_drink_disable/bn_hot_Black_Sugar_Milk_Tea.png b/image/page_drink_disable/bn_hot_Black_Sugar_Milk_Tea.png index 2c8ddeeb..4835c301 100644 Binary files a/image/page_drink_disable/bn_hot_Black_Sugar_Milk_Tea.png and b/image/page_drink_disable/bn_hot_Black_Sugar_Milk_Tea.png differ diff --git a/image/page_drink_disable/bn_hot_blueberry_tea.png b/image/page_drink_disable/bn_hot_blueberry_tea.png index 3c5da2be..6dfd182d 100644 Binary files a/image/page_drink_disable/bn_hot_blueberry_tea.png and b/image/page_drink_disable/bn_hot_blueberry_tea.png differ diff --git a/image/page_drink_disable/bn_hot_chrysanthemum_tea.png b/image/page_drink_disable/bn_hot_chrysanthemum_tea.png index ba2fe27d..71b4a387 100644 Binary files a/image/page_drink_disable/bn_hot_chrysanthemum_tea.png and b/image/page_drink_disable/bn_hot_chrysanthemum_tea.png differ diff --git a/image/page_drink_disable/bn_hot_double_espresso.png b/image/page_drink_disable/bn_hot_double_espresso.png index edfa8aff..09980689 100644 Binary files a/image/page_drink_disable/bn_hot_double_espresso.png and b/image/page_drink_disable/bn_hot_double_espresso.png differ diff --git a/image/page_drink_disable/bn_hot_lemonate.png b/image/page_drink_disable/bn_hot_lemonate.png index 70dc34c1..e2b00699 100644 Binary files a/image/page_drink_disable/bn_hot_lemonate.png and b/image/page_drink_disable/bn_hot_lemonate.png differ diff --git a/image/page_drink_disable/bn_hot_lime_Matcha.png b/image/page_drink_disable/bn_hot_lime_Matcha.png new file mode 100644 index 00000000..912c5369 Binary files /dev/null and b/image/page_drink_disable/bn_hot_lime_Matcha.png differ diff --git a/image/page_drink_disable/bn_hot_lime_tea.png b/image/page_drink_disable/bn_hot_lime_tea.png index 4efbd7d0..bd34be0b 100644 Binary files a/image/page_drink_disable/bn_hot_lime_tea.png and b/image/page_drink_disable/bn_hot_lime_tea.png differ diff --git a/image/page_drink_disable/bn_hot_lychee_espresso.png b/image/page_drink_disable/bn_hot_lychee_espresso.png index b3a624b6..3fe5da56 100644 Binary files a/image/page_drink_disable/bn_hot_lychee_espresso.png and b/image/page_drink_disable/bn_hot_lychee_espresso.png differ diff --git a/image/page_drink_disable/bn_hot_lychee_tea.png b/image/page_drink_disable/bn_hot_lychee_tea.png index 20c5cb84..b3a79f6e 100644 Binary files a/image/page_drink_disable/bn_hot_lychee_tea.png and b/image/page_drink_disable/bn_hot_lychee_tea.png differ diff --git a/image/page_drink_disable/bn_hot_matcha_milk_tea.png b/image/page_drink_disable/bn_hot_matcha_milk_tea.png index 007108f0..a055d688 100644 Binary files a/image/page_drink_disable/bn_hot_matcha_milk_tea.png and b/image/page_drink_disable/bn_hot_matcha_milk_tea.png differ diff --git a/image/page_drink_disable/bn_hot_matcha_tea.png b/image/page_drink_disable/bn_hot_matcha_tea.png new file mode 100644 index 00000000..30542355 Binary files /dev/null and b/image/page_drink_disable/bn_hot_matcha_tea.png differ diff --git a/image/page_drink_disable/bn_hot_strawberry_tea.png b/image/page_drink_disable/bn_hot_strawberry_tea.png index 44b4e4b6..aa16e00f 100644 Binary files a/image/page_drink_disable/bn_hot_strawberry_tea.png and b/image/page_drink_disable/bn_hot_strawberry_tea.png differ diff --git a/image/page_drink_disable/bn_hot_taiwan_milk_tea.png b/image/page_drink_disable/bn_hot_taiwan_milk_tea.png index 90ca823a..ec2e6893 100644 Binary files a/image/page_drink_disable/bn_hot_taiwan_milk_tea.png and b/image/page_drink_disable/bn_hot_taiwan_milk_tea.png differ diff --git a/image/page_drink_disable/bn_hot_thai_milk_tea.png b/image/page_drink_disable/bn_hot_thai_milk_tea.png index c6dcdfdc..dad5aa9e 100644 Binary files a/image/page_drink_disable/bn_hot_thai_milk_tea.png and b/image/page_drink_disable/bn_hot_thai_milk_tea.png differ diff --git a/image/page_drink_disable/bn_hot_thai_tea.png b/image/page_drink_disable/bn_hot_thai_tea.png index 19e95296..351d4ab2 100644 Binary files a/image/page_drink_disable/bn_hot_thai_tea.png and b/image/page_drink_disable/bn_hot_thai_tea.png differ diff --git a/image/page_drink_disable/bn_hot_water.png b/image/page_drink_disable/bn_hot_water.png index ddd658bd..398cf17c 100644 Binary files a/image/page_drink_disable/bn_hot_water.png and b/image/page_drink_disable/bn_hot_water.png differ diff --git a/image/page_drink_disable/bn_iced.png b/image/page_drink_disable/bn_iced.png index e1e64da7..adc0b3cc 100644 Binary files a/image/page_drink_disable/bn_iced.png and b/image/page_drink_disable/bn_iced.png differ diff --git a/image/page_drink_disable/bn_iced_7up.png b/image/page_drink_disable/bn_iced_7up.png index f5e1bfff..a25a8e90 100644 Binary files a/image/page_drink_disable/bn_iced_7up.png and b/image/page_drink_disable/bn_iced_7up.png differ diff --git a/image/page_drink_disable/bn_iced_Black_Sugar_Milk_Tea.png b/image/page_drink_disable/bn_iced_Black_Sugar_Milk_Tea.png index af0fa53f..0d93aac1 100644 Binary files a/image/page_drink_disable/bn_iced_Black_Sugar_Milk_Tea.png and b/image/page_drink_disable/bn_iced_Black_Sugar_Milk_Tea.png differ diff --git a/image/page_drink_disable/bn_iced_Cokecola.png b/image/page_drink_disable/bn_iced_Cokecola.png index 68555674..44355a79 100644 Binary files a/image/page_drink_disable/bn_iced_Cokecola.png and b/image/page_drink_disable/bn_iced_Cokecola.png differ diff --git a/image/page_drink_disable/bn_iced_black_tea.png b/image/page_drink_disable/bn_iced_black_tea.png index c4615f16..5fbc3053 100644 Binary files a/image/page_drink_disable/bn_iced_black_tea.png and b/image/page_drink_disable/bn_iced_black_tea.png differ diff --git a/image/page_drink_disable/bn_iced_blueberry.png b/image/page_drink_disable/bn_iced_blueberry.png index 789011b9..8ecf982f 100644 Binary files a/image/page_drink_disable/bn_iced_blueberry.png and b/image/page_drink_disable/bn_iced_blueberry.png differ diff --git a/image/page_drink_disable/bn_iced_blueberry_soda.png b/image/page_drink_disable/bn_iced_blueberry_soda.png index 2349ea8c..0a983854 100644 Binary files a/image/page_drink_disable/bn_iced_blueberry_soda.png and b/image/page_drink_disable/bn_iced_blueberry_soda.png differ diff --git a/image/page_drink_disable/bn_iced_lemonade.png b/image/page_drink_disable/bn_iced_lemonade.png index 61965eb6..17188872 100644 Binary files a/image/page_drink_disable/bn_iced_lemonade.png and b/image/page_drink_disable/bn_iced_lemonade.png differ diff --git a/image/page_drink_disable/bn_iced_lemonade_soda.png b/image/page_drink_disable/bn_iced_lemonade_soda.png index 8a0fba8a..b81d63e7 100644 Binary files a/image/page_drink_disable/bn_iced_lemonade_soda.png and b/image/page_drink_disable/bn_iced_lemonade_soda.png differ diff --git a/image/page_drink_disable/bn_iced_lime_tea_Matcha.png b/image/page_drink_disable/bn_iced_lime_tea_Matcha.png new file mode 100644 index 00000000..6e68378a Binary files /dev/null and b/image/page_drink_disable/bn_iced_lime_tea_Matcha.png differ diff --git a/image/page_drink_disable/bn_iced_lychee_espresso.png b/image/page_drink_disable/bn_iced_lychee_espresso.png index ba545519..b91942d5 100644 Binary files a/image/page_drink_disable/bn_iced_lychee_espresso.png and b/image/page_drink_disable/bn_iced_lychee_espresso.png differ diff --git a/image/page_drink_disable/bn_iced_matcha_milk_tea.png b/image/page_drink_disable/bn_iced_matcha_milk_tea.png index 06bfeeaa..72ae0a2a 100644 Binary files a/image/page_drink_disable/bn_iced_matcha_milk_tea.png and b/image/page_drink_disable/bn_iced_matcha_milk_tea.png differ diff --git a/image/page_drink_disable/bn_iced_milk.png b/image/page_drink_disable/bn_iced_milk.png index f226924f..349a39aa 100644 Binary files a/image/page_drink_disable/bn_iced_milk.png and b/image/page_drink_disable/bn_iced_milk.png differ diff --git a/image/page_drink_disable/bn_iced_soda.png b/image/page_drink_disable/bn_iced_soda.png index c2380b67..ad13f6d1 100644 Binary files a/image/page_drink_disable/bn_iced_soda.png and b/image/page_drink_disable/bn_iced_soda.png differ diff --git a/image/page_drink_disable/bn_iced_sprite.png b/image/page_drink_disable/bn_iced_sprite.png index 6b2de505..390dfdea 100644 Binary files a/image/page_drink_disable/bn_iced_sprite.png and b/image/page_drink_disable/bn_iced_sprite.png differ diff --git a/image/page_drink_disable/bn_iced_strawberry_soda.png b/image/page_drink_disable/bn_iced_strawberry_soda.png index cd1c35b1..91632faf 100644 Binary files a/image/page_drink_disable/bn_iced_strawberry_soda.png and b/image/page_drink_disable/bn_iced_strawberry_soda.png differ diff --git a/image/page_drink_disable/bn_iced_taiwan_milk_tea.png b/image/page_drink_disable/bn_iced_taiwan_milk_tea.png index 13ccf1a3..0f379aa9 100644 Binary files a/image/page_drink_disable/bn_iced_taiwan_milk_tea.png and b/image/page_drink_disable/bn_iced_taiwan_milk_tea.png differ diff --git a/image/page_drink_disable/bn_iced_thai_milk_tea.png b/image/page_drink_disable/bn_iced_thai_milk_tea.png index 7f2c4496..dc2ac8a4 100644 Binary files a/image/page_drink_disable/bn_iced_thai_milk_tea.png and b/image/page_drink_disable/bn_iced_thai_milk_tea.png differ diff --git a/image/page_drink_disable/bn_lime_tea.png b/image/page_drink_disable/bn_lime_tea.png index b0b49682..c91b00e6 100644 Binary files a/image/page_drink_disable/bn_lime_tea.png and b/image/page_drink_disable/bn_lime_tea.png differ diff --git a/image/page_drink_disable/bn_lychee_tea.png b/image/page_drink_disable/bn_lychee_tea.png index 51b33d82..74e94388 100644 Binary files a/image/page_drink_disable/bn_lychee_tea.png and b/image/page_drink_disable/bn_lychee_tea.png differ diff --git a/image/page_drink_disable/bn_matcha_tea.png b/image/page_drink_disable/bn_matcha_tea.png new file mode 100644 index 00000000..319c5083 Binary files /dev/null and b/image/page_drink_disable/bn_matcha_tea.png differ diff --git a/image/page_drink_disable/bn_protein_Blueberry.png b/image/page_drink_disable/bn_protein_Blueberry.png index 139681f4..d71509c7 100644 Binary files a/image/page_drink_disable/bn_protein_Blueberry.png and b/image/page_drink_disable/bn_protein_Blueberry.png differ diff --git a/image/page_drink_disable/bn_protein_Chocolate.png b/image/page_drink_disable/bn_protein_Chocolate.png index 81c250c2..b18d631f 100644 Binary files a/image/page_drink_disable/bn_protein_Chocolate.png and b/image/page_drink_disable/bn_protein_Chocolate.png differ diff --git a/image/page_drink_disable/bn_protein_Matcha.png b/image/page_drink_disable/bn_protein_Matcha.png index c1cb8b0a..35b27b5f 100644 Binary files a/image/page_drink_disable/bn_protein_Matcha.png and b/image/page_drink_disable/bn_protein_Matcha.png differ diff --git a/image/page_drink_disable/bn_protein_Strawberry.png b/image/page_drink_disable/bn_protein_Strawberry.png index d1b871bb..5a398e04 100644 Binary files a/image/page_drink_disable/bn_protein_Strawberry.png and b/image/page_drink_disable/bn_protein_Strawberry.png differ diff --git a/image/page_drink_disable/bn_protein_Taiwantea.png b/image/page_drink_disable/bn_protein_Taiwantea.png index af7f42af..a0d2881b 100644 Binary files a/image/page_drink_disable/bn_protein_Taiwantea.png and b/image/page_drink_disable/bn_protein_Taiwantea.png differ diff --git a/image/page_drink_disable/bn_protein_Thaitea.png b/image/page_drink_disable/bn_protein_Thaitea.png index 1c07f0e5..cceed7de 100644 Binary files a/image/page_drink_disable/bn_protein_Thaitea.png and b/image/page_drink_disable/bn_protein_Thaitea.png differ diff --git a/image/page_drink_disable/bn_protein_caramel.png b/image/page_drink_disable/bn_protein_caramel.png index 29c5f00f..ad969d73 100644 Binary files a/image/page_drink_disable/bn_protein_caramel.png and b/image/page_drink_disable/bn_protein_caramel.png differ diff --git a/image/page_drink_disable/bn_protein_espresso.png b/image/page_drink_disable/bn_protein_espresso.png index 97e3d2cb..00abdaad 100644 Binary files a/image/page_drink_disable/bn_protein_espresso.png and b/image/page_drink_disable/bn_protein_espresso.png differ diff --git a/image/page_drink_disable/bn_protein_isolated.png b/image/page_drink_disable/bn_protein_isolated.png index 6e9d365f..5cc23ef6 100644 Binary files a/image/page_drink_disable/bn_protein_isolated.png and b/image/page_drink_disable/bn_protein_isolated.png differ diff --git a/image/page_drink_disable/bn_protein_kokuto.png b/image/page_drink_disable/bn_protein_kokuto.png index 35ea1615..79857d6c 100644 Binary files a/image/page_drink_disable/bn_protein_kokuto.png and b/image/page_drink_disable/bn_protein_kokuto.png differ diff --git a/image/page_drink_disable/bn_protein_milk.png b/image/page_drink_disable/bn_protein_milk.png index dd2b75c1..e168fabe 100644 Binary files a/image/page_drink_disable/bn_protein_milk.png and b/image/page_drink_disable/bn_protein_milk.png differ diff --git a/image/page_drink_disable/bn_sala_soda.png b/image/page_drink_disable/bn_sala_soda.png index dcdd1757..0a960e65 100644 Binary files a/image/page_drink_disable/bn_sala_soda.png and b/image/page_drink_disable/bn_sala_soda.png differ diff --git a/image/page_drink_disable/bn_soda.png b/image/page_drink_disable/bn_soda.png index ce1155a8..1aec8ba6 100644 Binary files a/image/page_drink_disable/bn_soda.png and b/image/page_drink_disable/bn_soda.png differ diff --git a/image/page_drink_disable/bn_strawberry_thai_tea.png b/image/page_drink_disable/bn_strawberry_thai_tea.png index 73f4d991..6d8fbb52 100644 Binary files a/image/page_drink_disable/bn_strawberry_thai_tea.png and b/image/page_drink_disable/bn_strawberry_thai_tea.png differ diff --git a/image/page_drink_disable/bn_water_cool.png b/image/page_drink_disable/bn_water_cool.png index 54e775a6..1d1f3a39 100644 Binary files a/image/page_drink_disable/bn_water_cool.png and b/image/page_drink_disable/bn_water_cool.png differ diff --git a/image/page_drink_disable/bn_water_roomtemp.png b/image/page_drink_disable/bn_water_roomtemp.png index f3fc4829..c634a71c 100644 Binary files a/image/page_drink_disable/bn_water_roomtemp.png and b/image/page_drink_disable/bn_water_roomtemp.png differ diff --git a/image/page_drink_press/bn_grass_jelly.png b/image/page_drink_press/bn_grass_jelly.png new file mode 100644 index 00000000..62e15ceb Binary files /dev/null and b/image/page_drink_press/bn_grass_jelly.png differ diff --git a/image/page_drink_press/bn_hot_lime_Matcha.png b/image/page_drink_press/bn_hot_lime_Matcha.png new file mode 100644 index 00000000..2e31a9c7 Binary files /dev/null and b/image/page_drink_press/bn_hot_lime_Matcha.png differ diff --git a/image/page_drink_press/bn_hot_matcha_tea.png b/image/page_drink_press/bn_hot_matcha_tea.png new file mode 100644 index 00000000..a55cc106 Binary files /dev/null and b/image/page_drink_press/bn_hot_matcha_tea.png differ diff --git a/image/page_drink_press/bn_iced_lime_tea_Matcha.png b/image/page_drink_press/bn_iced_lime_tea_Matcha.png new file mode 100644 index 00000000..2540398a Binary files /dev/null and b/image/page_drink_press/bn_iced_lime_tea_Matcha.png differ diff --git a/image/page_drink_press/bn_matcha_tea.png b/image/page_drink_press/bn_matcha_tea.png new file mode 100644 index 00000000..91b505ee Binary files /dev/null and b/image/page_drink_press/bn_matcha_tea.png differ diff --git a/image/page_drink_select/bn_grass_jelly.png b/image/page_drink_select/bn_grass_jelly.png new file mode 100644 index 00000000..bdd8d1bf Binary files /dev/null and b/image/page_drink_select/bn_grass_jelly.png differ diff --git a/image/page_drink_select/bn_hot_lime_Matcha.png b/image/page_drink_select/bn_hot_lime_Matcha.png new file mode 100644 index 00000000..7f79b27c Binary files /dev/null and b/image/page_drink_select/bn_hot_lime_Matcha.png differ diff --git a/image/page_drink_select/bn_hot_matcha_tea.png b/image/page_drink_select/bn_hot_matcha_tea.png new file mode 100644 index 00000000..9f906c2a Binary files /dev/null and b/image/page_drink_select/bn_hot_matcha_tea.png differ diff --git a/image/page_drink_select/bn_iced_lime_tea_Matcha.png b/image/page_drink_select/bn_iced_lime_tea_Matcha.png new file mode 100644 index 00000000..2b1e3aff Binary files /dev/null and b/image/page_drink_select/bn_iced_lime_tea_Matcha.png differ diff --git a/image/page_drink_select/bn_matcha_tea.png b/image/page_drink_select/bn_matcha_tea.png new file mode 100644 index 00000000..9ded5dd8 Binary files /dev/null and b/image/page_drink_select/bn_matcha_tea.png differ diff --git a/image/topping/add_grass.png b/image/topping/add_grass.png new file mode 100644 index 00000000..f3b7852b Binary files /dev/null and b/image/topping/add_grass.png differ diff --git a/image/topping/add_grass_2.png b/image/topping/add_grass_2.png new file mode 100644 index 00000000..086e4caf Binary files /dev/null and b/image/topping/add_grass_2.png differ diff --git a/sheet/Menu-Discription-Sheet5.tsv b/sheet/Menu-Discription-Sheet5.tsv new file mode 100644 index 00000000..68cdcf7b --- /dev/null +++ b/sheet/Menu-Discription-Sheet5.tsv @@ -0,0 +1,108 @@ +Menu Code name Thai_name_14 charactor NameMenu Thai_name Description Thai_Description Price Trial Price + Coffee your way ชงตามใจ Build your favorite\ncoffee your own way สร้างสรรค์กาแฟแก้วโปรด ในแบบของคุณเอง ฿30+ #N/A +11-99-01-0001 ESPRESSO เอสเพรสโซ่ร้อน 64 Espresso เอสเพรสโซ่ Espresso กาแฟ ฿30 25 +11-99-01-0101 DOUBLE ESPRESSO ดับเบิลเอสเพรสโซ่ Double Espresso ดับเบิลเอสเพรสโซ่ Espresso กาแฟ ฿45 40 +11-99-01-0002 HOT AMERICANO กาแฟดำร้อน\n(อเมริกาโน) 88 Hot Americano กาแฟดำร้อน (อเมริกาโน) Espresso, Water กาแฟ และน้ำร้อน\n(อเมริกาโน) ฿30 35 +11-99-01-0003 HOT CAFE' LATTE ลาเต้ร้อน Hot café Latte ลาเต้ร้อน Espresso, Milk,\nSmall Layer of foam milk กาแฟ นม และ ฟองนม ฿40 35 +11-99-01-0004 HOT CAPPUCINO คาปูชิโน่ร้อน 136 Hot Cappucino คาปูชิโน่ร้อน Espresso, Milk,\nFoamed milk กาแฟ นม และ ฟองนมบางๆ ฿40 40 +11-99-01-0005 HOT MOCHA มอคค่าร้อน Hot Mocha มอคค่าร้อน Espresso, Cocoa,\nMilk, Sugar กาแฟ นม ผสมช็อกโกแลต\nน้ำตาล ฿40 45 +11-99-01-0006 HOT \n CARAMEL LATTE คาราเมลลาเต้ร้อน Hot Caramel Latte คาราเมลลาเต้ร้อน Espresso, Milk,\nCaramel Syrup กาแฟ นม และ ฟองนม\nน้ำเชื่อมคาราเมล ฿40 45 +11-99-01-0007 HOT MATCHA\nCAFÉ LATTE กาแฟ\n มัทฉะลาเต้ร้อน Hot Matcha café Latte กาแฟ มัทฉะลาเต้ร้อน Espresso, Matcha, Milk,\nCondense Milk กาแฟ นม นมข้นหวาน\nชาเขียวมัทฉะ และ ฟองนม ฿40 35 +11-99-01-0008 HOT TAIWANESE TEA\nCAFÉ LATTE กาแฟ\n ชานมไต้หวันร้อน Hot Taiwanese Tea café Latte กาแฟ ชานมไต้หวันร้อน Espresso, Taiwanese Tea,\nMilk, Sugar กาแฟ ชาไต้หวัน \nน้ำตาลและ ฟองนม ฿40 45 +11-99-01-0009 HOT THAI TEA\nCAFÉ LATTE กาแฟชาไทยร้อน Hot Thai Tea café Latte กาแฟ ชาไทยร้อน Espresso, Thai tea, Milk,\nCondensed milk, Sugar กาแฟ ชาไทย นม นมข้นหวาน\nน้ำตาลและ ฟองนม ฿40 45 +11-99-01-0010 HOT KOKUTO\nCAFÉ LATTE โคคุโตะลาเต้ร้อน Hot Kokuto café Latte โคคุโตะลาเต้ร้อน Espresso, Milk,\nBlack sugar syrup กาแฟ น้ำเชื่อมน้ำตาลดำ \nและ ฟองนม ฿40 30 +11-99-01-0011 HOT\nLYCHEE AMERICANO อเมริกาโนลิ้นจี่ร้อน Hot Lychee Americano อเมริกาโนลิ้นจี่ร้อน Espresso, Lychee,\nSugar, Water กาแฟ น้ำ และ ลิ้นจี่ ฿35 45 +11-99-02-0001 ICED ESPRESSO เอสเพรสโซ่เย็น Iced Espresso เอสเพรสโซ่เย็น Espresso, Condensed milk,\nMilk, Sugar,Ice กาแฟ นม นมข้นหวาน \nและ น้ำแข็ง ฿45 30 +11-99-02-0002 ICED AMERICANO กาแฟดำเย็น\n(อเมริกาโน) Iced Americano กาแฟดำเย็น (อเมริกาโน) Espresso, Water, Ice กาแฟ น้ำ และ น้ำแข็ง\n(อเมริกาโน) ฿40 35 +11-99-02-0003 ICED CAFE LATTE ลาเต้เย็น Iced café Latte Espresso,\nMilk, Sugar, Ice กาแฟ นม ฟองนม น้ำตาลและ น้ำแข็ง ฿45 40 +11-99-02-0004 ICED CAPPUCCINO คาปูชิโน่เย็น Iced Cappuccino คาปูชิโน่เย็น Espresso,\nMilk, Foamed milk, Ice กาแฟ นม ฟองนม และ น้ำแข็ง ฿45 40 +11-99-02-0005 ICED MOCHA มอคค่าเย็น 167 Iced Mocha มอคค่าเย็น Espresso, Cocoa,\nMilk, Condense milk, Ice กาแฟ นม ผสมช็อกโกแลต \nฟองนม และ น้ำแข็ง ฿45 45 +11-99-02-0006 ICED CARAMEL CAFÉ LATTE คาราเมลลาเต้เย็น 172 Iced Caramel café Latte คาราเมลลาเต้เย็น Espresso, Milk,\nCaramel Syrup, Ice กาแฟ นม น้ำเชื่อมคาราเมล \nฟองนม และ น้ำแข็ง ฿45 45 +11-99-02-0008 ICED TAIWANESE TEA\nCAFÉ LATTE กาแฟ\nชานมไต้หวันเย็น Iced Taiwanese Tea café Latte กาแฟ ชานมไต้หวันเย็น Espresso, Taiwanese Tea,\nMilk, Sugar, Ice กาแฟ ชาไต้หวัน นม และ น้ำแข็ง ฿45 50 +11-99-02-0007 ICED MATCHA\nCAFÉ LATTE กาแฟ\nมัทฉะลาเต้เย็น 209 Iced Matcha café Latte กาแฟ มัทฉะลาเต้เย็น Espresso, Matcha, Milk,\nCondense Milk, Sugar, Ice กาแฟ ชาเขียวมัทฉะ นม \nนมข้นหวานและ น้ำแข็ง ฿45 40 +11-99-02-0009 ICED THAI TEA\nCAFÉ LATTE กาแฟชาไทยเย็น Iced Thai Tea café Latte กาแฟชาไทยเย็น Espresso, Thai tea, Milk,\nCondensed milk, Sugar,Ice ลาเต้เย็น ฿45 50 +11-99-02-0010 ICED KOKUTO\nCAFÉ LATTE กาแฟโคคุโตะ\nลาเต้เย็น Iced Kokuto café Latte กาแฟโคคุโตะลาเต้เย็น Espresso, Milk,\nBlack sugar syrup, Ice กาแฟ นม \nน้ำเชื่อมน้ำตาลดำ และ น้ำแข็ง ฿45 50 +11-99-02-0011 ICED LYCHEE\nAMERICANO อเมริกาโนลิ้นจี่เย็น Iced Lychee Americano อเมริกาโนลิ้นจี่เย็น Espresso, Lychee,\nWater, Sugar, Ice กาแฟ น้ำเชื่อมลิ้นจี่ น้ำ\nและ น้ำแข็ง ฿40 35 +11-99-01-0012 HOT\nCARAMEL MILK นมคาราเมลร้อน Hot Caramel milk นมคาราเมลร้อน Milk, Caramel Syrup นม และน้ำเชื่อมคาราเมล ฿40 30 +11-99-01-0013 HOT COCOA โกโก้ร้อน Hot Cocoa โกโก้ร้อน Milk, Cocoa, Sugar โกโก้ นมและน้ำตาล ฿40 30 +11-99-01-0014 HOT KOKUTO MILK นมโคคุโตะร้อน Hot Kokuto Milk นมโคคุโตะร้อน Milk, Black sugar syrup นม และ น้ำเชื่อมน้ำตาลดำ ฿40 30 +11-99-01-0015 HOT\nCARAMEL COCOA คาราเมลโกโก้ร้อน Hot Caramel cocoa คาราเมลโกโก้ร้อน Cocoa, Milk,Sugar,\nCaramel Syrup โกโก้ นม น้ำตาล \nน้ำเชื่อมคาราเมล ฿40 35 +11-99-01-0016 WARM MILK นมร้อน WARM MILK นมร้อน Milk นม ฿40 25 +11-99-02-0012 ICED CARAMEL MILK นมคาราเมลเย็น Ice Caramel Milk นมคาราเมลเย็น Milk, Caramel Syrup, Ice นม น้ำเชื่อมคาราเมล และน้ำแข็ง ฿40 35 +11-99-02-0013 ICED COCOA โกโก้เย็น Ice Cocoa โกโก้เย็น Milk, Cocoa, Sugar, Ice โกโก้ นม และน้ำแข็ง ฿40 35 +11-99-02-0014 ICED KOKUTO MILK นมโคคุโตะเย็น Ice Kokuto Milk นมโคคุโตะเย็น Milk, Black sugar syrup, Ice นม น้ำเชื่อมน้ำตาลดำ และน้ำแข็ง ฿40 35 +11-99-02-0015 ICED\nCARAMEL COCOA คาราเมลโกโก้เย็น Ice Caramel Cocoa คาราเมลโกโก้เย็น Cocoa, Milk, Sugar,\nCaramel Syrup โกโก้ นม น้ำตาล \nน้ำเชื่อมคาราเมล และน้ำแข็ง ฿40 40 +11-99-02-0016 MILK WITH ICED นมเย็น Ice Milk นมเย็น Milk, Ice นม และน้ำแข็ง ฿40 30 +11-99-03-0002 ICED PINK MILK นมชมพูเย็น Ice (Pink) Milk นมชมพูเย็น Salak Syrup, Milk,\nCondensed milk, Sugar, Ice น้ำแดงกลิ่นสละ นม นมข้น \nน้ำตาลและน้ำแข็ง ฿40 30 +11-99-01-0017 HOT\nCHRYSANTHS TEA เก็กฮวยร้อน hot chrysanths tea เก็กฮวยร้อน Chrysanthemum,\nSugar,Water น้ำเก๊กฮวย น้ำตาล ฿30 20 +11-99-01-0018 HOT THAI MILK TEA ชาไทยร้อน Hot thai milk tea ชาไทยร้อน Thai tea, Milk,\nCondensed milk, Sugar ชาไทย นม และนมข้น ฿35 30 +11-99-01-0019 HOT\nTAIWANESE TEA ชานมไต้หวันร้อน Hot Taiwanese Tea ชานมไต้หวันร้อน Taiwanese Tea, Milk,\nSugar ชาไต้หวัน นม และนมข้น ฿35 30 +11-99-01-0020 HOT\nMATCHA LATTE มัทฉะลาเต้ร้อน Hot matcha latte มัทฉะลาเต้ร้อน Matcha, Milk,\nCondense Milk ชาเขียวมัทฉะ นม และนมข้น ฿35 40 +11-99-01-0021 HOT BLACK TEA ชาดำร้อน Hot black tea ชาดำร้อน Tea, Sugar, Water ชาดำ ฿35 +11-99-01-0022 HOT KOKUTO TEA ชาโคคุโตะร้อน Hot Kokuto Tea ชาโคคุโตะร้อน Thai Tea, Milk,\nBlack sugar syrup ชาดำ น้ำเชื่อมน้ำตาลดำ ฿35 35 +11-99-01-0023 HOT LIME TEA ชามะนาวร้อน Hot Lime tea ชามะนาวร้อน Thai Tea, Limenade,\nSugar, Water ชาดำ มะนาว ฿35 30 +11-99-01-0024 HOT LYCHEE TEA ชาลิ้นจี่ร้อน Hot Lychee tea ชาลิ้นจี่ร้อน Thai tea, Lychee,\nSugar, Water ชาดำ น้ำเชื่อมลิ้นจี่ ฿35 30 +11-99-01-0025 HOT\nSTRAWBERRY TEA ชาสตอเบอร์รี่ร้อน Hot strawberry tea ชาสตอเบอร์รี่ร้อน Thai tea,\nStrawberry Syrup, Water ชาดำ น้ำเชื่อมสตรอว์เบอร์รี่ ฿35 30 +11-99-01-0026 HOT \nBLUEBERRY TEA ชาบลูเบอร์รี่ร้อน Hot blueberry tea ชาบลูเบอร์รี่ร้อน Thai tea,\nBlueberry Syrup, Water ชาดำ น้ำเชื่อมบลูเบอร์รี่ ฿35 30 +11-99-02-0017 ICED\nCHRYSANTHS TEA เก็กฮวยเย็น Ice Chrysanthemum tea เก็กฮวยเย็น Chrysanthemum, Sugar,\nWater, Ice น้ำเก๊กฮวย ฿40 25 +11-99-02-0018 ICED\nTHAI MILK TEA ชาไทยเย็น Thai Ice Tea ชาไทยเย็น Thai tea, Milk,\nCondensed milk, Sugar, Ice ชาไทย นม นมข้น และน้ำแข็ง ฿40 35 +11-99-02-0019 ICED\nTAIWANESE TEA ชานมไต้หวัน Ice Taiwan Milk Tea ชานมไต้หวัน Taiwan Tea,\nMilk, Sugar, Ice ชาไต้หวัน นม และน้ำแข็ง ฿40 35 +11-99-02-0020 ICED\nMATCHA LATTE มัทฉะลาเต้เย็น Ice Matcha Latte มัทฉะลาเต้เย็น Green Tea, Milk,/nCondense milk, Sugar, Ice ชาเชียว นม และน้ำแข็ง ฿40 45 +11-99-02-0021 ICED BLACK TEA ชาดำเย็น Ice Black Tea ชาดำเย็น Tea, Sugar, Water, Ice ชาดำ และน้ำแข็ง ฿40 +11-99-02-0022 ICE\n KOKUTO TEA ชาโคคุโตะเย็น Ice Kokuto Tea ชาโคคุโตะเย็น Thai tea, Milk\n Black sugar syrup, Ice ชาดำ น้ำเชื่อมน้ำตาลดำ\n และน้ำแข็ง ฿40 40 +11-99-02-0023 ICED LIME TEA ชามะนาวเย็น Ice Lime Tea ชามะนาวเย็น Tea, Limenade, \nSugar, Water, Ice ชาดำ มะนาว และน้ำแข็ง ฿40 35 +11-99-02-0024 ICED LYCHEE TEA ชาลิ้นจี่เย็น Ice Lychee Tea ชาลิ้นจี่เย็น Thai tea, Lychee,\nSugar, Water, Ice ชาดำ น้ำเชื่อมลิ้นจี่ และน้ำแข็ง ฿40 35 +11-99-02-0025 ICED \n STRAWBERRY TEA ชาสตอเบอร์รี่เย็น Ice strawberry Tea ชาสตอเบอร์รี่เย็น Thai tea, Strawberry Syrup,\nWater, Ice ชาดำ น้ำเชื่อมสตรอว์เบอร์รี่ \nและน้ำแข็ง ฿40 35 +11-99-02-0026 ICED\nBLUEBERRY TEA ชาบลููเบอร์รี่เย็น Ice Blueberry Tea ชาบลูเบอร์รี่เย็น Thai tea, Blueberry Syrup,\nWater, Ice ชาดำ น้ำเชื่อมบลูเบอร์รี่ \nและน้ำแข็ง ฿40 35 +11-99-01-0027 HOT LIMENADE น้ำมะนาวร้อน Hot Limeade น้ำมะนาวร้อน Limenade, Sugar น้ำมะนาว น้ำตาล ฿25 20 +11-99-02-0027 ICED LIMENADE น้ำมะนาวเย็น Ice Limeade น้ำมะนาวเย็น Limenade,Sugar, Ice นำมะนาว น้ำตาล น้ำแข็ง ฿25 20 +11-99-02-0028 ICED SALAK น้ำแดงสละเย็น Ice Sala น้ำแดงเย็น Salak Syrup, Water, Ice น้ำแดงกลิ่นสละ น้ำ และน้ำแข็ง ฿25 20 +11-99-02-0029 ICED LIME SALAK น้ำแดงสละ\nมะนาวเย็น Ice Limeade Sala น้ำแดงมะนาวเย็น Salak Syrup, Limenade,\nWater, Ice น้ำแดงกลิ่นสละ น้ำมะนาว \nและน้ำแข็ง ฿25 25 +11-99-02-0030 ICED LYCHEE น้ำลิ้นจี่เย็น Ice Lychee น้ำลิ้นจี่เย็น Lychee, Sugar,\nWater, Ice น้ำเชื่อมลิ้นจี่ น้ำ และน้ำแข็ง ฿25 20 +11-99-02-0031 ICED\nSTRAWBERRY น้ำสตอเบอร์รี่เย็น Ice Strawberry น้ำสตอเบอร์รี่เย็น Strawberry Syrup,\nWater, Ice น้ำเชื่อมสตรอว์เบอร์รี่ น้ำ \nและน้ำแข็ง ฿25 35 +11-99-02-0032 ICED\nBLUEBERRY น้ำบลูเบอร์รี่เย็น Ice Blueberry น้ำบลูเบอร์รี่เย็น Blueberry Syrup,\nWater, Ice น้ำเชื่อมบลูเบอร์รี่ น้ำ \n และน้ำแข็ง ฿25 35 +11-99-02-0033 PEPSI เป็ปซี่น้ำเข็ง Pepsi เป็ปซี่ Pepsi, Ice เป๊ปซี่ และน้ำแข็ง ฿20 20 +11-99-02-0034 ICED SALAK SODA น้ำแดงสละโซดา Ice Sala Soda น้ำแดงโซดา Salak Syrup, Soda, Ice น้ำแดงกลิ่นสละ โซดา \nและน้ำแข็ง ฿35 25 +11-99-02-0035 ICED LIME\nSALAK SODA น้ำแดงสละ\nมะนาวโซดา Ice Limenade Sala Soda น้ำแดงมะนาวโซดา Salak Syrup,\nLimenade,Soda, Ice น้ำแดงกลิ่นสละ มะนาว โซดา \nและน้ำแข็ง ฿35 30 +11-99-02-0036 ICED LIMENADE \nSODA น้ำมะนาวโซดา Ice Limenade Soda น้ำมะนาวโซดา Limenade, Sugar, Soda, Ice มะนาว โซดา และน้ำแข็ง ฿25 25 +11-99-02-0037 ICED\nLYCHEE SODA น้ำลิ้นจี่โซดา Ice Lychee Soda น้ำลิ้นจี่โซดา Lychee, Sugar, Soda, Ice น้ำเชื่อมลิ้นจี่ โซดา และน้ำแข็ง ฿25 25 +11-99-02-0038 ICED\nSTRAWBERRY SODA สตอเบอร์รี่โซดา Ice Strawberry Soda สตอเบอร์รี่โซดา Strawberry Syrup, Soda, Ice น้ำเชื่อมสตรอว์เบอร์รี่ โซดา \nและน้ำแข็ง ฿40 40 +11-99-02-0039 ICED\nBLUEBERRY SODA บลูเบอร์รี่โซดา Ice Blueberry Soda บลูเบอร์รี่โซดา Blueberry Syrup, Soda, Ice น้ำเชื่อมบลูเบอร์รี่ โซดา \nและน้ำแข็ง ฿40 40 +11-99-02-0040 SODA โซดา Soda Water โซดา Soda โซดา ฿10 10 +11-99-02-0041 ICE SODA โซดาน้ำแข็ง Ice Soda Water โซดาน้ำแข็ง Soda, Ice โซดา และน้ำแข็ง ฿10 15 +11-99-02-0042 DRINKING WATER น้ำดื่ม Water น้ำดื่ม Water น้ำ ฿10 10 +11-99-02-0043 ICE น้ำแข็ง Ice น้ำแข็ง Ice น้ำแข็ง ฿10 10 +11-99-02-0044 ICED WATER น้ำ+น้ำแข็ง Ice Water น้ำดื่ม Water, Ice น้ำ และน้ำแข็ง ฿10 10 +11-99-01-0045 HOT WATER น้ำร้อน Hot water น้ำร้อน Water น้ำ ฿10 10 +11-99-02-0045 COKE โค้ก Coke, Ice โค้ก และน้ำแข็ง 20 +11-99-02-0046 SPRITE สไปรท์ Sprite, Ice สไปรท์ และน้ำแข็ง 20 +11-99-01-0051 7UP 7อัพ 7 up 7อัพ 7 up, Ice เซเว่นอัพ และน้ำแข็ง ฿20 ฿20 +11-99-04-0000 MATCHA SHAKE มัทฉะโปรตีน Matcha shake มัทฉะโปรตีน Whey protein,\nMatcha, Milk and Iced เวย์โปรตีน ชาเชียว นม \nและน้ำแข็ง ฿60 ฿60 +11-99-04-0001 CHOCOLATE SHAKE โกโก้โปรตีน Chocolate shake โกโก้โปรตีน Whey protein,\nCocoa, Milk and Iced เวย์โปรตีน โกโก้ นม \nและน้ำแข็ง ฿60 ฿60 +11-99-04-0002 STRAWBERRY SHAKE สตอเบอร์รี่โปรตีน Strawberry shake สตอเบอร์รี่โปรตีน Whey protein,Milk, \nStrawberry Syrup, and Iced เวย์โปรตีน น้ำเชื่อมสตรอว์เบอร์รี่ \nนม และน้ำแข็ง ฿60 ฿60 +11-99-04-0003 ESPRESSO SHAKE เอสเพรสโซ่โปรตีน Espresso shake เอสเพรสโซ่โปรตีน Whey protein, Espresso\nMilk, Condense Milk, Iced เวย์โปรตีน กาแฟ นม นมข้นหวาน \nและน้ำแข็ง ฿60 ฿60 +11-99-04-0004 THAI TEA SHAKE ชานมไทยโปรตีน Thai Tea shake ชานมไทยโปรตีน Whey protein,\nThai Tea, Milk and Ice เวย์โปรตีน ชาไทย นม นมข้นหวาน \nและน้ำแข็ง ฿60 ฿60 +11-99-04-0005 KOKUTO SHAKE โคคุโตะโปรตีน Kokuto shake โคคุโตะโปรตีน Whey protein, Milk,\nBlack sugar syrup, and Ice เวย์โปรตีน นม \nน้ำเชื่อมน้ำตาลดำ และน้ำแข็ง ฿60 ฿60 +11-99-04-0006 BLUEBERRY SHAKE บลูเบอร์รี่โปรตีน Blueberry shake บลูเบอร์รี่โปรตีน Whey protein,\nBlueberry Syrup, Milk and Ice เวย์โปรตีน นม \nน้ำเชื่อมบลูเบอร์รี่ และน้ำแข็ง ฿60 ฿60 +11-99-04-0007 TAIWANESE TEA SHAKE ชาไต้หวันโปรตีน Taiwanese Tea shake ชาไต้หวันโปรตีน Whey protein, Milk,\nTaiwanese Tea, Sugar and Ice เวย์โปรตีน นม \nชาไต้หวัน และน้ำแข็ง ฿60 ฿60 +11-99-04-0008 CARAMEL SHAKE คาราเมลโปรตีน Caramel shake คาราเมลโปรตีน Whey protein, Milk,\nCaramel Syrup and Ice เวย์โปรตีน นม \nน้ำเชื่อมคาราเมล และน้ำแข็ง ฿60 ฿60 +11-99-04-0009 MILK SHAKE นมโปรตีน Milk shake นมโปรตีน Whey protein, Milk, and Ice เวย์โปรตีน นม และน้ำแข็ง ฿60 ฿60 +11-99-04-0010 PLAIN PROTEIN โปรตีนเปล่า Plain protein โปรตีนเปล่า Whey protein, Water, and Ice เวย์โปรตีน น้ำ และน้ำแข็ง ฿60 ฿60 + +12-02-01-0011 Hot Matcha ชาเขียวญี่ปุ่นร้อน Hot Matcha ชาเขียวญี่ปุ่นร้อน Matcha, Water ชาเชียว และน้ำ ฿30 ฿30 +12-02-01-0012 Hot Matcha Limenade ชาเขียวญี่ปุ่นมะนาว\nร้อน Hot Matcha Limenade ชาเขียวญี่ปุ่นมะนาวร้อน Matcha, Limenade, Water ชาเชียว มะนาว และน้ำ ฿35 ฿35 +12-02-02-0011 Iced Matcha ชาเขียวญี่ปุ่นเย็น Iced Matcha ชาเขียวญี่ปุ่นเย็น Matcha, Water, and Ice ชาเชียว น้ำ และน้ำแข็ง ฿35 ฿35 +12-02-02-0012 Iced Matcha Limenade ชาเขียวญี่ปุ่นมะนาวเย็น Iced Matcha\nLimenade ชาเขียวญี่ปุ่นมะนาวเย็น Matcha, Limenade, Water, and Ice ชาเชียว น้ำ มะนาว และน้ำแข็ง ฿40 ฿40 + + + +11-99-05-0001 ILYSB ILYSB ILYSB ILYSB Pineapple juice, Limeade, \nSoda, Ice, Malibu Pineapple juice, Limeade, \nSoda, Ice, Malibu ฿10 10 +11-99-05-0002 Gale Jail Gale Jail Gale Jail Gale Jail Mint syrup, Limeade, Ice, \nMount Gay Rum Mint syrup, Limeade, Ice, \nMount Gay Rum ฿10 10 +11-99-05-0003 Third Behind Bars Third Behind Bars Third Behind Bars Third Behind Bars Strawberry syrup, Limeade, \nSoda, Malibu Strawberry syrup, Limeade, \nSoda, Malibu ฿10 10 +11-99-05-0004 Pinky Promise Pinky Promise Pinky Promise Pinky Promise Lychee, Limeade, Soda, \nMount Gay Rum Lychee, Limeade, Soda, \nMount Gay Rum ฿10 10 +11-99-05-0005 Love Potion Love Potion Love Potion Love Potion Pineapple juice, Limeade, \nSoda, Ice, Mount Gay Rum Pineapple juice, Limeade, \nSoda, Ice, Mount Gay Rum ฿10 10 +11-99-05-0006 Bedroom Story Bedroom Story Bedroom Story Bedroom Story Coffee, Milk Ice, Mount Gay \nRum Coffee, Milk Ice, Mount Gay \nRum ฿10 10 +11-99-05-0007 Oriental Kink Oriental Kink Oriental Kink Oriental Kink Chrysanthemum, Mount Gay \nRum Chrysanthemum, Mount Gay \nRum ฿10 10 +11-99-05-0008 Long Night Long Night Long Night Long Night Strawberry syrup, Pineaple \njuice Ice, Malibu Strawberry syrup, Pineaple \njuice Ice, Malibu ฿10 10 +11-99-05-0009 Good Night Kiss Good Night Kiss Good Night Kiss Good Night Kiss Black sugar syrup, Milk, Ice, \nMount Gay Rum Black sugar syrup, Milk, Ice, \nMount Gay Rum ฿10 10 +11-99-05-0010 Forever Love Forever Love Forever Love Forever Love Lychee juice, Pineaple juice, \nIce, Mount Gay Rum Lychee juice, Pineaple juice, \nIce, Mount Gay Rum ฿10 10 \ No newline at end of file diff --git a/sheet/TAO-BIN-Recipe_Cost-Cost-per-drink3.tsv b/sheet/TAO-BIN-Recipe_Cost-Cost-per-drink3.tsv new file mode 100644 index 00000000..5324b4ae --- /dev/null +++ b/sheet/TAO-BIN-Recipe_Cost-Cost-per-drink3.tsv @@ -0,0 +1,102 @@ + Menu Fix Cost Water Dark Midium Light Topping Sugar (Fix Cost) น้ำตาล นม นมข้นหวานผง Cocoa เวย์โปรตีน มะนาว ชาไทย ชาไต้หวัน ลิ้นจี่ เก็กฮวย Matcha Hales BB Caramel Syrup Blueberry Concentrate Strawberry Concentrate Kokuto Syrup Pepsi Co2 Total cost %Margin Margin (THB) Retail Price K-bank กำไรรวมต่อเมนูการขาย Total Profit/ Month Total Revenue/ Mth +Coffee Espresso 12-01-01-0001 1.97 0.06 1.74 3.41 0.80 7.98 276% 22.02 30.00 +Coffee Double espresso 12-11-01-0001 1.97 0.11 3.49 6.82 0.80 13.19 241% 31.81 45.00 +Coffee Hot Americano 12-01-01-0003 3.90 0.28 1.74 3.41 0.80 10.13 245% 24.87 35.00 +Coffee Hot Latte 12-01-01-0004 3.90 0.30 1.74 3.41 0.80 5.94 16.10 148% 23.90 40.00 +Coffee Hot Cappucino 12-01-01-0005 3.90 0.28 1.74 3.41 0.80 4.95 15.09 165% 24.91 40.00 +Coffee Hot Mocha 12-01-01-0006 3.90 0.28 1.74 3.41 0.80 0.19 4.95 0.55 15.83 153% 24.17 40.00 +Coffee Hot Caramel Latte 12-01-01-0007 3.90 0.28 1.74 3.41 0.80 5.94 6.07 22.15 103% 22.85 45.00 +Coffee Hot Matcha café Latte 12-01-01-0008 3.90 0.28 1.74 3.41 0.80 5.94 0.83 4.86 21.77 107% 23.23 45.00 +Coffee Hot Taiwanese Tea café Latte 12-01-01-0009 3.90 0.28 1.74 3.41 0.80 1.98 4.23 16.35 175% 28.65 45.00 +Coffee Hot Thai Tea café Latte 12-01-01-0010 3.90 0.30 1.74 3.41 0.80 0.10 3.57 1.24 4.86 19.92 126% 25.08 45.00 +Coffee Hot Kokuto café Latte (check สูตรหน้าตู้อีกครั้ง) 12-01-01-0011 3.90 0.28 1.74 3.41 0.80 5.94 3.43 19.51 131% 25.49 45.00 +Coffee Lychee Americano 12-01-01-0012 3.90 0.30 1.74 3.41 0.80 0.80 10.96 265% 29.04 40.00 +Coffee Iced Espresso 12-11-02-0001 3.10 0.67 3.49 6.82 0.80 0.19 2.97 2.32 20.37 121% 24.63 45.00 +Coffee Iced Americano 12-01-02-0001 3.10 0.74 1.74 3.41 0.80 9.80 308% 30.20 40.00 + Iced Americano(Light Roasted) วิธีการชงไม่เหมือนกับ Dark & Medium Roasted 3.10 0.65 7.70 0.80 12.25 267% 32.75 45.00 +Coffee Iced Cafe Latte 12-01-02-0002 3.10 0.67 5.23 0.80 0.19 3.96 13.95 222% 31.05 45.00 +Coffee Iced Cappuccino 12-11-02-0002 3.10 0.65 3.49 6.82 0.80 0.19 2.38 0.75 18.18 148% 26.82 45.00 +Coffee Iced Mocha 12-01-02-0003 3.10 0.65 5.23 0.80 0.13 3.96 1.24 0.73 15.84 184% 29.16 45.00 +Coffee Iced Caramel café Latte 12-01-02-0004 3.10 0.61 5.23 0.80 0.13 3.96 3.37 17.21 191% 32.79 50.00 +Coffee Iced Matcha café Latte 12-01-02-0005 3.10 0.67 5.23 0.80 0.13 3.96 1.24 8.50 23.64 112% 26.36 50.00 +Coffee Iced Taiwanese Tea café Latte 12-01-02-0006 3.10 0.63 5.12 0.80 0.10 7.76 17.50 186% 32.50 50.00 +Coffee Iced Thai Tea café Latte 12-01-02-0007 3.10 0.63 5.23 0.80 0.13 3.96 1.24 7.29 22.39 123% 27.61 50.00 +Coffee Iced Kokuto café Latte 12-01-02-0008 3.10 0.65 5.23 0.80 0.10 3.57 2.29 15.73 218% 34.27 50.00 +Coffee Iced Lychee Americano 12-01-02-0009 3.10 0.74 1.74 3.41 0.80 0.60 10.40 333% 34.60 45.00 +Milk Hot Caramel milk 12-03-01-0001 3.90 0.28 0.80 5.75 5.06 15.78 153% 24.22 40.00 +Milk Hot Cocoa 12-03-01-0002 3.90 0.28 0.80 0.32 3.76 2.55 11.61 245% 28.39 40.00 +Milk Hot Kokuto Milk 12-03-01-0003 3.90 0.26 0.80 5.15 4.34 14.45 177% 25.55 40.00 +Milk Hot Caramel cocoa 12-03-01-0004 3.90 0.28 0.80 0.16 3.76 2.55 6.74 18.19 120% 21.81 40.00 +Milk Hot Milk 12-03-01-0005 3.90 0.26 0.80 4.95 9.91 203% 20.09 30.00 +Milk Iced Caramel milk 12-03-02-0001 3.10 0.67 0.80 4.95 3.37 12.89 210% 27.11 40.00 +Milk Iced Cocoa 12-03-02-0002 3.10 0.70 0.80 0.29 2.77 2.18 9.85 306% 30.15 40.00 +Milk Iced Kokuto Milk 12-03-02-0003 3.10 0.63 0.80 4.95 4.34 13.83 189% 26.17 40.00 +Milk Iced Caramel cocoa 12-03-02-0004 3.10 0.63 0.80 0.16 3.76 2.00 6.74 17.20 133% 22.80 40.00 +Milk Milk with Iced 12-03-02-0005 3.10 0.63 0.80 4.95 9.48 269% 25.52 35.00 +Milk Iced Pink milk 12-03-02-0006 3.10 0.67 0.80 0.10 3.96 1.24 1.49 11.36 252% 28.64 40.00 +Tea hot chrysanths tea 12-02-01-0001 3.90 0.28 0.80 1.61 6.59 204% 13.41 20.00 +Tea Hot thai milk tea 12-02-01-0002 3.90 0.28 0.80 3.76 1.24 4.86 14.85 136% 20.15 35.00 +Tea Hot Taiwanese Tea 12-02-01-0003 3.90 0.28 0.80 6.35 11.32 253% 28.68 40.00 +Tea Hot matcha latte 12-02-01-0004 3.90 0.24 0.80 5.55 1.24 8.50 20.24 122% 24.76 45.00 + Hot black tea 12-02-01-0005 3.90 0.30 0.80 5.00 -100% -5 +Tea Hot Kokuto Tea 12-02-01-0006 3.90 0.28 0.80 3.76 0.83 1.21 2.74 13.53 196% 26.47 40.00 +Tea Hot Lime tea 12-02-01-0007 3.90 0.28 0.80 0.64 0.76 2.43 8.81 184% 16.19 25.00 +Tea Hot Lychee tea 12-02-01-0008 3.90 0.28 0.80 2.43 2.01 9.42 165% 15.58 25.00 +Tea Hot strawberry tea 12-02-01-0009 3.90 0.28 0.80 2.43 5.00 12.41 222% 27.59 40.00 +Tea Hot blueberry tea 12-02-01-0010 3.90 0.28 0.80 2.43 5.00 12.41 222% 27.59 40.00 +Tea 0.90 0.90 -100% -1 +Tea Iced Chrysanths Tea 12-02-02-0001 3.10 0.61 0.80 2.82 7.33 173% 12.67 20.00 +Tea Iced Thai milk Tea 12-02-02-0002 3.10 0.65 0.80 0.19 3.17 1.24 7.29 16.45 143% 23.55 40.00 +Tea Iced Taiwanese Tea 12-02-02-0003 3.10 0.70 0.80 6.35 10.95 311% 34.05 45.00 +Tea Iced matcha latte 12-02-02-0004 3.10 0.57 0.80 0.13 4.95 1.24 8.50 19.31 133% 25.69 45.00 +Tea Iced black tea รอเทสชาดำใหม่ 12-02-02-0005 3.10 0.54 0.80 4.44 -100% -4 +Tea Iced Kokuto Tea 12-02-02-0006 3.10 0.68 0.80 3.57 1.21 5.71 15.07 199% 29.93 45.00 +Tea Iced Lime tea 12-02-02-0007 3.10 0.63 0.80 0.67 0.76 2.43 8.39 198% 16.61 25.00 +Tea Iced Lychee tea (สูตรแก้วร้อน ลดน้ำจาก 60+50 เป็น 50+40 12-02-02-0008 3.10 0.63 0.80 2.43 2.01 8.97 234% 21.03 30.00 +Tea Iced strawberrry tea 12-02-02-0009 3.10 0.65 0.80 2.43 5.00 11.98 276% 33.02 45.00 +Tea Iced blueberry tea 12-02-02-0010 3.10 0.65 0.80 2.43 5.00 11.98 276% 33.02 45.00 +Fruity HOT LIMENADE 12-05-01-0001 3.90 0.28 0.80 0.80 1.71 7.49 167% 12.51 20.00 +Fruity ICED LIMENADE 12-05-02-0001 3.10 0.72 0.80 0.96 1.52 7.10 182% 12.90 20.00 +Fruity ICED SALAK 12-05-02-0002 3.10 0.84 0.80 2.82 7.57 164% 12.43 20.00 +Fruity ICED LIME SALAK 12-05-02-0003 3.10 0.84 0.80 0.57 2.82 8.14 146% 11.86 20.00 +Fruity ICED LYCHEE 12-05-02-0004 3.10 0.74 0.80 2.41 7.05 184% 12.95 20.00 +Fruity ICED STRAWBERRY 12-05-02-0005 3.10 0.65 0.80 10.00 14.55 175% 25.45 40.00 +Fruity ICED BLUEBERRY 12-05-02-0006 3.10 0.65 0.80 10.00 14.55 175% 25.45 40.00 +Soda & Other Pepsi 12-05-02-0007 3.10 0.81 5.40 9.31 61% 5.69 15.00 +Soda & Other SALAK SODA 12-05-02-0008 3.10 0.82 0.80 2.82 7.55 165% 12.45 20.00 +Soda & Other LIME SALAK SODA 12-05-02-0009 3.10 0.67 0.80 0.57 2.82 7.96 151% 12.04 20.00 +Soda & Other LIMENADE SODA 12-05-02-0010 3.10 0.69 0.80 1.12 1.52 7.23 177% 12.77 20.00 +Soda & Other ICED LYCHEE SODA 12-05-02-0011 3.10 0.74 0.80 3.22 7.86 218% 17.14 25.00 +Soda & Other ICED STRAWBERRY SODA 12-05-02-0012 3.10 0.70 0.80 10.00 14.60 174% 25.40 40.00 +Soda & Other ICED BLUEBERRY SODA 12-05-02-0013 3.10 0.70 0.80 10.00 14.60 174% 25.40 40.00 +Soda & Other Soda (แก้วร้อนลดเวลาโซดาจาก 10 เป็น 6 วิ) 12-05-02-0014 3.10 0.70 3.80 163% 6.20 10.00 +Soda & Other Ice Soda (แก้วร้อนลดเวลาโซดาจาก 6 เป็น 4 วิ) 12-05-02-0015 3.10 0.80 3.90 285% 11.10 15.00 +Soda & Other DRINKING WATER 12-05-02-0016 3.10 0.70 3.80 163% 6.20 10.00 +Soda & Other Ice 12-05-02-0017 3.10 0.52 3.62 176% 6.38 10.00 +Soda & Other Iced water 12-05-02-0018 3.10 0.74 3.84 160% 6.16 10.00 +Soda & Other Hot Water 12-05-01-0002 3.90 0.46 4.36 129% 5.64 10.00 +Soda & Other Coke 12-05-02-0019 3.10 0.76 3.86 159% 6.14 10.00 + Sprite 12-05-02-0020 3.10 0.76 3.86 289% 11.14 15.00 + 7UP 12-05-02-0021 3.10 0.81 5.40 9.31 61% 5.69 15.00 +Protein Matcha shake 12-04-02-0001 3.10 0.59 0.80 0.22 1.98 0.41 5.00 4.86 16.97 254% 43.03 60.00 +Protein Chocolate shake 12-04-02-0002 3.10 0.59 0.80 0.22 1.98 0.41 0.73 5.00 12.84 367% 47.16 60.00 +Protein Strawberry shake 12-04-02-0003 3.10 0.59 0.80 1.98 0.41 5.00 7.50 19.39 209% 40.61 60.00 +Protein Espresso shake 12-04-02-0004 3.10 0.61 5.23 0.80 0.38 0.99 0.83 5.00 16.95 254% 43.05 60.00 +Protein Thai Tea shake 12-04-02-0005 3.10 0.59 0.80 0.22 1.98 0.41 5.00 2.43 14.54 313% 45.46 60.00 +Protein Kokuto shake 12-04-02-0006 3.10 0.62 0.80 2.97 5.00 4.11 16.61 261% 43.39 60.00 +Protein Blueberry shake 12-04-02-0007 3.10 0.65 0.80 1.98 5.00 7.50 19.03 215% 40.97 60.00 +Protein Taiwanese Tea shake 12-04-02-0008 3.10 0.65 0.80 0.83 5.00 3.53 13.90 332% 46.10 60.00 +Protein Caramel shake 12-04-02-0009 3.10 0.67 0.80 1.98 0.83 5.00 3.37 15.75 281% 44.25 60.00 +Protein Milk shake 12-04-02-0010 3.10 0.65 0.80 2.97 0.83 5.00 13.35 312% 41.65 55.00 +Protein Plain protein 12-04-02-0011 3.10 0.65 0.80 0.99 0.25 5.00 10.79 363% 39.21 50.00 + Hot Matcha 12-02-01-0011 3.90 0.30 0.80 1.21 6.21 383% 23.79 30 + Hot Matcha Limenade 12-02-01-0012 3.90 0.30 0.80 0.38 1.21 6.59 431% 28.41 35 + Iced Matcha 12-02-02-0011 3.10 0.65 0.80 1.21 5.76 507% 29.24 35 + Iced Matcha Limenade 12-02-02-0012 3.10 0.65 0.80 0.38 1.21 6.14 551% 33.86 40 + Iced Grass Jelly 12-02-02-0013 3.10 0.65 0.80 4.55 560% 25.45 30 + Iced Lychee Limenade Soda 12-03-02-0007 3.10 0.74 0.95 1.13 5.92 829% 49.08 55 + Iced Strawberry Limenade Soda 12-05-02-0022 3.10 0.74 0.95 10.00 14.79 204% 30.21 45 + Iced Strawberry Milk 12-05-02-0023 3.10 0.61 0.80 4.95 7.50 16.96 77% 13.04 30 + Iced Strawberry Matcha Latte 12-05-02-0024 3.10 0.52 0.80 0.13 4.95 1.24 8.50 7.50 26.75 68% 18.25 45 + + #REF! #REF! #REF! #REF! #REF! #REF! #REF! \ No newline at end of file diff --git a/sheet/best_seller.tsv b/sheet/best_seller.tsv new file mode 100644 index 00000000..ed093509 --- /dev/null +++ b/sheet/best_seller.tsv @@ -0,0 +1,78 @@ +17/1/21 +12-01-01-0003 76 +12-05-02-0007 73 +12-02-02-0002 72 +12-05-02-0010 67 +12-01-01-0001 64 +12-01-02-0001 53 +12-02-02-0001 48 +12-01-01-0004 45 +12-03-02-0006 43 +12-05-02-0009 43 +12-02-02-0007 39 +12-11-02-0002 37 +12-03-02-0002 36 +12-05-02-0011 34 +12-05-02-0012 32 +12-05-02-0001 32 +12-02-01-0001 29 +12-11-01-0001 28 +12-11-02-0001 28 +12-05-02-0008 27 +12-05-02-0004 26 +12-03-02-0004 26 +12-01-02-0002 25 +12-05-02-0013 22 +12-02-02-0004 22 +12-01-01-0005 22 +12-02-02-0008 19 +12-02-02-0003 17 +12-02-02-0012 17 +12-05-01-0001 14 +12-04-02-0002 13 +12-03-01-0002 11 +12-05-02-0021 11 +12-01-02-0003 10 +12-05-02-0003 10 +12-03-02-0001 10 +12-03-02-0003 10 +12-05-02-0017 8 +12-01-02-0004 8 +12-03-01-0003 8 +12-05-02-0015 7 +12-04-02-0003 7 +12-04-02-0001 7 +12-05-02-0002 7 +12-01-02-0005 6 +12-02-01-0002 6 +12-01-02-0009 6 +12-01-02-0008 5 +12-03-02-0005 5 +12-03-01-0004 5 +12-05-02-0005 4 +12-01-01-0007 4 +12-04-02-0004 4 +12-03-01-0001 4 +12-01-01-0011 4 +12-02-01-0004 4 +12-04-02-0006 4 +12-05-02-0014 3 +12-01-01-0012 3 +12-04-02-0010 3 +12-01-01-0006 3 +12-02-02-0009 3 +12-03-01-0005 3 +12-02-01-0007 3 +12-02-01-0006 2 +12-04-02-0007 2 +12-05-02-0006 2 +12-01-02-0007 2 +12-02-02-0006 2 +12-05-01-0002 1 +12-04-02-0005 1 +12-02-02-0010 1 +12-01-01-0009 1 +12-02-01-0003 1 +12-04-02-0008 1 +12-02-02-0011 1 +Grand Total 1342 \ No newline at end of file diff --git a/sound_thai/dontforget_number.mp3 b/sound_thai/dontforget_number.mp3 new file mode 100644 index 00000000..f65c96c0 Binary files /dev/null and b/sound_thai/dontforget_number.mp3 differ diff --git a/sound_thai/drinkfinish.mp3 b/sound_thai/drinkfinish.mp3 new file mode 100644 index 00000000..28be5dba Binary files /dev/null and b/sound_thai/drinkfinish.mp3 differ diff --git a/sound_thai/payment.mp3 b/sound_thai/payment.mp3 new file mode 100644 index 00000000..f46f9e01 Binary files /dev/null and b/sound_thai/payment.mp3 differ diff --git a/sound_thai/remove_cup.mp3 b/sound_thai/remove_cup.mp3 new file mode 100644 index 00000000..4ed70c41 Binary files /dev/null and b/sound_thai/remove_cup.mp3 differ diff --git a/sound_thai/select_level.mp3 b/sound_thai/select_level.mp3 new file mode 100644 index 00000000..cf5e7fac Binary files /dev/null and b/sound_thai/select_level.mp3 differ diff --git a/sound_thai/taobin_sawade.mp3 b/sound_thai/taobin_sawade.mp3 new file mode 100644 index 00000000..dcf62758 Binary files /dev/null and b/sound_thai/taobin_sawade.mp3 differ diff --git a/sound_thai/thankyou.mp3 b/sound_thai/thankyou.mp3 new file mode 100644 index 00000000..a115e86b Binary files /dev/null and b/sound_thai/thankyou.mp3 differ diff --git a/sounds/Papov-Yung-Logos.mp3 b/sounds/Papov-Yung-Logos.mp3 new file mode 100644 index 00000000..07f7ae70 Binary files /dev/null and b/sounds/Papov-Yung-Logos.mp3 differ diff --git a/sounds/music1.mp3 b/sounds/music1.mp3 new file mode 100644 index 00000000..f0b675c7 Binary files /dev/null and b/sounds/music1.mp3 differ diff --git a/xml/menu_catalog.xml b/xml/menu_catalog.xml index b29749b2..044614fe 100644 --- a/xml/menu_catalog.xml +++ b/xml/menu_catalog.xml @@ -1,4 +1,27 @@ + 1000 + + If NextPage = "-" Then + + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + + If Timeout > 60 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + ; ; 0 @@ -76,6 +99,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" @@ -89,6 +113,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" @@ -102,6 +127,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" @@ -115,6 +141,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" @@ -128,6 +155,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" @@ -142,6 +170,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" @@ -170,6 +199,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" diff --git a/xml/menu_gen.py b/xml/menu_gen.py index 835318eb..b6a07f66 100644 --- a/xml/menu_gen.py +++ b/xml/menu_gen.py @@ -27,7 +27,7 @@ out_xml( '\t SoundVolume \r\n') out_xml( '\t \r\n') - out_xml( '\t\tVar SelectDrink = "'+ product_code[i] +'"\r\n') + out_xml( '\t\tVar SelectDrink = $'+ product_code[i] +'.Self\r\n') out_xml( '\t\tVar NameDrink = $' + product_code[i] + '.NameE\r\n') out_xml( '\t\tVar NameDrinkTH = $' + product_code[i] + '.Name\r\n') out_xml( '\t\tVar DrinkDescriptionTH = $' + product_code[i] + '.description\r\n') diff --git a/xml/page_board.xml b/xml/page_board.xml index 03902635..1fcddb81 100644 --- a/xml/page_board.xml +++ b/xml/page_board.xml @@ -11,7 +11,7 @@ OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/topview_button_back_main.xml" Var FileNumber = 1 - Var taobin_version = "1.13" + Var taobin_version = "1.15" ; 1.00 is ; On open @@ -20,7 +20,6 @@ Var charOfBaht = "฿" Var KanitTTF = "ROOT/taobin_project/font/Kanit/Kanit-Light.ttf" Var KanitMediaTTF = "ROOT/taobin_project/font/Kanit/Kanit-Medium.ttf" - Var KanitBoldTTF = "ROOT/taobin_project/font/Kanit/Kanit-Bold.ttf" Var RobotoBold = "ROOT/taobin_project/font/Roboto/Roboto-Bold.ttf" @@ -46,7 +45,7 @@ Var ShowButtonClick = "Enable" Var ShowButtonClickFull = "Invisible" - SAVELOG DisplayType + ;SAVELOG DisplayType If DisplayType = "2" Then Var XPosiShowCountDownBrew = 693 @@ -64,14 +63,17 @@ EndIf + If NeedUpgrade = "true" Then + Open "ROOT/taobin_project/xml/page_show_error.xml" + EndIf Var TestLoopMakeDrink = 0 Var TestLoopSuccess = 0 Var TestLoopFailed = 0 - Var IgnoreNetCore = "false" - SAVELOG SaleProfile + ;Var IgnoreNetCore = "false" + ;SAVELOG SaleProfile STRCONTAIN "whey" SaleProfile WheyShow STRCONTAIN "cocktail" SaleProfile CocktailShow @@ -83,13 +85,25 @@ Var ShowPrice = "Invisible" EndIf - SAVELOG WheyShow - SAVELOG CocktailShow - SAVELOG RoadShow - SAVELOG ShowPrice + ;SAVELOG WheyShow + ;SAVELOG CocktailShow + ;SAVELOG RoadShow + ;SAVELOG ShowPrice Var CountDownShowButton = 35 + Var CountDownPauseVideo = 0 + Var NextPage = "-" + + If StartUpExt = "false" Then + + Else + Machine Initial + Var StartUpExt = "false" + EndIf + + StopLongPlay + 1000 @@ -128,9 +142,15 @@ EndIf - Var CountDownShowButton = CountDownShowButton - 1 - + If NeedUpgrade = "true" Then + Open "ROOT/taobin_project/xml/page_show_error.xml" + EndIf + If CountDownShowButton > 0 Then + Var CountDownShowButton = CountDownShowButton - 1 + EndIf + + ;SAVELOG MachineStage ;SAVELOG CountDownShowButton ;SAVELOG ShowButtonClickFull @@ -147,13 +167,29 @@ Refresh EndIf + If CountDownPauseVideo > 0 Then + + Var CountDownPauseVideo = CountDownPauseVideo - 1 + If CountDownPauseVideo = 0 Then + + Var NextPage = "ROOT/taobin_project/xml/page_back_to_main.xml" + + OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml" + OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog_choose_drink1.xml" + + TopView "show" + Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml" + + EndIf + EndIf TimerReset - SAVELOG ShowButtonClick - Var CountDownShowButton = 35 + ;SAVELOG ShowButtonClick + ;Var CountDownShowButton = 35 + Var CountDownPauseVideo = 6 Refresh @@ -173,7 +209,6 @@ 0 0 ; 80 - "true" "ROOT/taobin_project/video/main_page.mp4" diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml index c358c2de..81dfe20a 100644 --- a/xml/page_brewing3.xml +++ b/xml/page_brewing3.xml @@ -21,6 +21,7 @@ Play "ROOT/taobin_project/sound_eng/Wait_a_moment.mp3" Else ;Var DirImage = "ROOT/taobin_project/image/collect_point1" + Play "ROOT/taobin_project/sound_thai/thankyou.mp3" EndIf @@ -133,6 +134,11 @@ Var Timeout = Timeout + 1 Var CountDownBrewing = CountDownBrewing - 1 + + + If Timeout = 4 Then + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/music1.mp3" + EndIf ; run test; ;If CountDownBrewing = 40 Then diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml index 240c5002..63e6bd4e 100644 --- a/xml/page_catalog.xml +++ b/xml/page_catalog.xml @@ -31,11 +31,12 @@ Var DirImage = "ROOT/taobin_project/image/page2" Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" - Play "/mnt/sdcard/coffeevending/sounds/selectDrink.wav" - Var PlaySoundLag = "/mnt/sdcard/coffeevending/sounds/selectDrink.wav" + Var PlaySoundLag = "/mnt/sdcard/coffeevending/taobin_project/sound_thai/taobin_sawade.mp3" + Play PlaySoundLag EndIf + 1000 diff --git a/xml/page_catalog_choose_drink.pml b/xml/page_catalog_choose_drink.pml index 8627eb6a..ca0c4932 100644 --- a/xml/page_catalog_choose_drink.pml +++ b/xml/page_catalog_choose_drink.pml @@ -1,42 +1,31 @@ + + @@ -46,173 +35,50 @@ "0xeae6e1" SoundVolume - ; On open - + ; On open + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + EndIf + + Var Menu1Selected = "PressForever" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 - 1000 - - TimerReset - - - 0 - 0 - "ROOT/taobin_project/image/page2/ad_blank1.png" - + -; under line - - 0 - 517 - "ROOT/taobin_project/image/page3/tab_line_bottom.png" - - - -; under line - - 0 - 380 - "ROOT/taobin_project/image/page3/bg1.png" - - - -; back - - - - - -;bn_bestseller - - - - - - - - - - - - -\r\n') - out_xml( '\t ' + str(x_button[i]) + ' \r\n') - out_xml( '\t ' + str(y_button[i]) + ' \r\n') - out_xml( '\t "' + default_dir + ''+ bt_pic[i].replace('#','n') +'" \r\n') - out_xml( '\t "' + default_dir + ''+ bt_pic[i].replace('#','p') +'" \r\n') - out_xml( '\t "/mnt/sdcard/coffeevending/wav/click.wav" \r\n') - out_xml( '\t SoundVolume \r\n') - out_xml( '\t \r\n') - - out_xml( '\t\tVar SelectDrink = "'+ product_code[i] +'"\r\n') - out_xml( '\t\tVar NameDrink = ' + product_code[i] + '.Name\r\n') - out_xml( '\t\tVar NameDrinkTH = ' + product_code[i] + '.Name2\r\n') - out_xml( '\t\tVar PriceDrink = ' + product_code[i] + '.Price\r\n') - out_xml( '\t\tVar PictureDrink = "' + default_dir + '/' + bt_pic[i].replace('#','p') + '"\r\n') - out_xml( '\t\tTopping "Load" SelectDrink\r\n') - out_xml( '\t\tSAVELOG SelectDrink\r\n') - out_xml( '\t\tVar PriceShowValue = charOfBaht + PriceDrink\r\n') - out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_alter.xml"\r\n') - - out_xml( '\t\r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t ' + str(x_button[i] + 184) + ' \r\n') - out_xml( '\t ' + str(y_button[i] + 12) + ' \r\n') - out_xml( '\t 27 \r\n') - out_xml( '\t KanitTTF \r\n') - out_xml( '\t 0xB78F24 \r\n') - out_xml( '\t $' + product_code[i] + '.Price \r\n') - out_xml( '\t\r\n') - - out_xml( '\t\r\n') - out_xml( '\t ' + str(x_button[i] + 164) + ' \r\n') - out_xml( '\t ' + str(y_button[i] + 12) + ' \r\n') - out_xml( '\t 27 \r\n') - out_xml( '\t KanitTTF \r\n') - out_xml( '\t 0xB78F24 \r\n') - out_xml( '\t "฿"" \r\n') - out_xml( '\t\r\n') + diff --git a/xml/page_catalog_choose_drink.xml b/xml/page_catalog_choose_drink.xml index d0f444c0..568e93d6 100644 --- a/xml/page_catalog_choose_drink.xml +++ b/xml/page_catalog_choose_drink.xml @@ -1,5 +1,7 @@ + + "Enable" 1080 @@ -7,26 +9,88 @@ "0xeae6e1" SoundVolume - ; On open - + ; On open + + If show_eng = "true" Then + Var showthaiText = "Invisible" + Var showengText = "Enable" + Var DirImage = "ROOT/taobin_project/image/page3_en" + Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png" + Else + Var showengText = "Invisible" + Var showthaiText = "Enable" + + Var DirImage = "ROOT/taobin_project/image/page3" + Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png" + Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png" + EndIf + + Var Menu1Selected = "PressForever" + Var Menu2Selected = "Enable" + Var Menu3Selected = "Enable" + Var Menu4Selected = "Enable" + Var Menu5Selected = "Invisible" + Var Menu6Selected = "Enable" + Var Menu7Selected = "Enable" + Var Menu8Selected = "Invisible" + + If CocktailShow = "true" Then + Var Menu7Selected = "Invisible" + Var Menu8Selected = "Enable" + EndIf + + SAVELOG PreviseXMLFileName2 + + Var Timeout = 0 + + + 1000 - TimerReset + If NextPage = "-" Then + + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + + If Timeout > 60 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset - +; +; 0 +; 0 +; "ROOT/taobin_project/image/ad_medium_2.png" +; + + ; under line 0 - 517 + 494 "ROOT/taobin_project/image/page3/tab_line_bottom.png" @@ -34,7 +98,7 @@ ; under line 0 - 380 + 358 "ROOT/taobin_project/image/page3/bg1.png" @@ -42,7 +106,7 @@ ; back +; -;bn_bestseller + - ; button i=1 ##-##-##-#### +; obselete +; + + + + + + + 10 + 497 + 1080 + "auto" + "Vertical" + 4 + ; button i=1 best_seller_1 + + 33 + 22 + 225 + 296 + $best_seller_1.Button - 228 - 583 + 182 + 12 + ShowPrice + "Hurr" + 150 27 KanitTTF 0xB78F24 - $##-##-##-####.Price + $best_seller_1.Price - 208 - 583 + 164 + 12 + ShowPrice + 20 27 KanitTTF 0xB78F24 "฿"" - ; button i=2 11-99-01-0010 + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $best_seller_1.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $best_seller_1.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $best_seller_1.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $best_seller_1.descriptionE + + + ; button i=2 12-01-01-0003 + + 33 + 22 + 225 + 296 + $12-01-01-0003.Button - 485 - 583 + 182 + 12 + ShowPrice + "Hurr" + 150 27 KanitTTF 0xB78F24 - $11-99-01-0010.Price + $12-01-01-0003.Price - 465 - 583 + 164 + 12 + ShowPrice + 20 27 KanitTTF 0xB78F24 "฿"" + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-01-01-0003.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-01-01-0003.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-01-01-0003.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-01-01-0003.descriptionE + + + ; button i=3 12-01-01-0004 + + 33 + 22 + 225 + 296 + $12-01-01-0004.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-01-01-0004.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-01-01-0004.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-01-01-0004.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-01-01-0004.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-01-01-0004.descriptionE + + + ; button i=4 12-01-02-0003 + + 33 + 22 + 225 + 296 + $12-01-02-0003.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-01-02-0003.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-01-02-0003.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-01-02-0003.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-01-02-0003.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-01-02-0003.descriptionE + + + ; button i=5 12-03-02-0002 + + 33 + 22 + 225 + 296 + $12-03-02-0002.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-03-02-0002.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-03-02-0002.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-03-02-0002.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-03-02-0002.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-03-02-0002.descriptionE + + + ; button i=6 12-03-02-0004 + + 33 + 22 + 225 + 296 + $12-03-02-0004.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-03-02-0004.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-03-02-0004.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-03-02-0004.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-03-02-0004.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-03-02-0004.descriptionE + + + ; button i=7 12-02-02-0002 + + 33 + 22 + 225 + 296 + $12-02-02-0002.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-02-02-0002.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-02-02-0002.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-02-02-0002.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-02-02-0002.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-02-02-0002.descriptionE + + + ; button i=8 12-02-02-0004 + + 33 + 22 + 225 + 296 + $12-02-02-0004.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-02-02-0004.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-02-02-0004.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-02-02-0004.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-02-02-0004.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-02-02-0004.descriptionE + + + ; button i=9 12-02-02-0001 + + 33 + 22 + 225 + 296 + $12-02-02-0001.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-02-02-0001.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-02-02-0001.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-02-02-0001.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-02-02-0001.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-02-02-0001.descriptionE + + + ; button i=10 12-02-02-0007 + + 33 + 22 + 225 + 296 + $12-02-02-0007.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-02-02-0007.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-02-02-0007.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-02-02-0007.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-02-02-0007.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-02-02-0007.descriptionE + + + ; button i=11 12-02-02-0008 + + 33 + 22 + 225 + 296 + $12-02-02-0008.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-02-02-0008.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-02-02-0008.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-02-02-0008.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-02-02-0008.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-02-02-0008.descriptionE + + + ; button i=12 12-05-02-0007 + + 33 + 22 + 225 + 296 + $12-05-02-0007.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-05-02-0007.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-05-02-0007.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-05-02-0007.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-05-02-0007.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-05-02-0007.descriptionE + + + ; button i=13 12-05-02-0021 + + 33 + 22 + 225 + 296 + $12-05-02-0021.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-05-02-0021.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-05-02-0021.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-05-02-0021.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-05-02-0021.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-05-02-0021.descriptionE + + + ; button i=14 12-05-02-0013 + + 33 + 22 + 225 + 296 + $12-05-02-0013.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-05-02-0013.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-05-02-0013.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-05-02-0013.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-05-02-0013.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-05-02-0013.descriptionE + + + ; button i=15 12-05-02-0012 + + 33 + 22 + 225 + 296 + $12-05-02-0012.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-05-02-0012.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-05-02-0012.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-05-02-0012.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-05-02-0012.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-05-02-0012.descriptionE + + + ; button i=16 12-05-02-0009 + + 33 + 22 + 225 + 296 + $12-05-02-0009.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-05-02-0009.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-05-02-0009.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-05-02-0009.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-05-02-0009.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-05-02-0009.descriptionE + + + diff --git a/xml/page_catalog_choose_drink1.pml b/xml/page_catalog_choose_drink1.pml index e99ddbba..522b9a31 100644 --- a/xml/page_catalog_choose_drink1.pml +++ b/xml/page_catalog_choose_drink1.pml @@ -6,25 +6,23 @@ product_code = [] - product_code.append('12-01-01-0001') - product_code.append('12-01-01-0003') - product_code.append('12-01-01-0004') - product_code.append('12-01-02-0003') + product_code.append('best_seller_1') + product_code.append('best_seller_2') + product_code.append('best_seller_3') + product_code.append('best_seller_4') + product_code.append('best_seller_5') + product_code.append('best_seller_6') + product_code.append('best_seller_7') + product_code.append('best_seller_8') + product_code.append('best_seller_9') + product_code.append('best_seller_10') + product_code.append('best_seller_11') + product_code.append('best_seller_12') + product_code.append('best_seller_13') + product_code.append('best_seller_14') + product_code.append('best_seller_15') + product_code.append('best_seller_16') - product_code.append('12-03-02-0002') - product_code.append('12-03-02-0004') - product_code.append('12-02-02-0002') - product_code.append('12-02-02-0004') - - product_code.append('12-02-02-0001') - product_code.append('12-02-02-0007') - product_code.append('12-02-02-0008') - product_code.append('12-05-02-0007') - product_code.append('12-05-02-0021') - product_code.append('12-05-02-0013') - product_code.append('12-05-02-0012') - product_code.append('12-05-02-0009') - menu_count = len( product_code) ?> @@ -69,12 +67,9 @@ SAVELOG PreviseXMLFileName2 + Var Timeout = 0 - 60000 - - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - TimerReset - + - 60000 - - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - TimerReset - + 1000 + + If NextPage = "-" Then + + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + + If Timeout > 60 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset + + + ; ; 0 ; 0 @@ -128,6 +148,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" @@ -141,6 +162,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" @@ -154,6 +176,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" @@ -167,6 +190,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" @@ -180,6 +204,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" @@ -194,6 +219,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" @@ -222,6 +248,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" @@ -234,28 +261,28 @@ "auto" "Vertical" 4 - ; button i=1 12-01-01-0001 + ; button i=1 best_seller_1 33 22 225 296 - $12-01-01-0001.Button + $best_seller_1.Button @@ -142,6 +162,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" @@ -155,6 +176,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" @@ -168,6 +190,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" @@ -181,6 +204,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" @@ -195,6 +219,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" @@ -223,6 +248,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" @@ -251,7 +277,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-01-01-0001" + Var SelectDrink = $12-01-01-0001.Self Var NameDrink = $12-01-01-0001.NameE Var NameDrinkTH = $12-01-01-0001.Name Var DrinkDescriptionTH = $12-01-01-0001.description @@ -343,7 +369,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-11-01-0001" + Var SelectDrink = $12-11-01-0001.Self Var NameDrink = $12-11-01-0001.NameE Var NameDrinkTH = $12-11-01-0001.Name Var DrinkDescriptionTH = $12-11-01-0001.description @@ -435,7 +461,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-01-01-0003" + Var SelectDrink = $12-01-01-0003.Self Var NameDrink = $12-01-01-0003.NameE Var NameDrinkTH = $12-01-01-0003.Name Var DrinkDescriptionTH = $12-01-01-0003.description @@ -527,7 +553,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-01-01-0004" + Var SelectDrink = $12-01-01-0004.Self Var NameDrink = $12-01-01-0004.NameE Var NameDrinkTH = $12-01-01-0004.Name Var DrinkDescriptionTH = $12-01-01-0004.description @@ -619,7 +645,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-01-01-0005" + Var SelectDrink = $12-01-01-0005.Self Var NameDrink = $12-01-01-0005.NameE Var NameDrinkTH = $12-01-01-0005.Name Var DrinkDescriptionTH = $12-01-01-0005.description @@ -711,7 +737,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-01-01-0006" + Var SelectDrink = $12-01-01-0006.Self Var NameDrink = $12-01-01-0006.NameE Var NameDrinkTH = $12-01-01-0006.Name Var DrinkDescriptionTH = $12-01-01-0006.description @@ -803,7 +829,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-01-01-0007" + Var SelectDrink = $12-01-01-0007.Self Var NameDrink = $12-01-01-0007.NameE Var NameDrinkTH = $12-01-01-0007.Name Var DrinkDescriptionTH = $12-01-01-0007.description @@ -895,7 +921,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-01-01-0009" + Var SelectDrink = $12-01-01-0009.Self Var NameDrink = $12-01-01-0009.NameE Var NameDrinkTH = $12-01-01-0009.Name Var DrinkDescriptionTH = $12-01-01-0009.description @@ -987,7 +1013,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-01-01-0010" + Var SelectDrink = $12-01-01-0010.Self Var NameDrink = $12-01-01-0010.NameE Var NameDrinkTH = $12-01-01-0010.Name Var DrinkDescriptionTH = $12-01-01-0010.description @@ -1079,7 +1105,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-01-01-0011" + Var SelectDrink = $12-01-01-0011.Self Var NameDrink = $12-01-01-0011.NameE Var NameDrinkTH = $12-01-01-0011.Name Var DrinkDescriptionTH = $12-01-01-0011.description @@ -1171,7 +1197,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-01-01-0012" + Var SelectDrink = $12-01-01-0012.Self Var NameDrink = $12-01-01-0012.NameE Var NameDrinkTH = $12-01-01-0012.Name Var DrinkDescriptionTH = $12-01-01-0012.description @@ -1263,7 +1289,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-11-02-0001" + Var SelectDrink = $12-11-02-0001.Self Var NameDrink = $12-11-02-0001.NameE Var NameDrinkTH = $12-11-02-0001.Name Var DrinkDescriptionTH = $12-11-02-0001.description @@ -1355,7 +1381,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-01-02-0001" + Var SelectDrink = $12-01-02-0001.Self Var NameDrink = $12-01-02-0001.NameE Var NameDrinkTH = $12-01-02-0001.Name Var DrinkDescriptionTH = $12-01-02-0001.description @@ -1447,7 +1473,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-01-02-0002" + Var SelectDrink = $12-01-02-0002.Self Var NameDrink = $12-01-02-0002.NameE Var NameDrinkTH = $12-01-02-0002.Name Var DrinkDescriptionTH = $12-01-02-0002.description @@ -1539,7 +1565,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-11-02-0002" + Var SelectDrink = $12-11-02-0002.Self Var NameDrink = $12-11-02-0002.NameE Var NameDrinkTH = $12-11-02-0002.Name Var DrinkDescriptionTH = $12-11-02-0002.description @@ -1631,7 +1657,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-01-02-0003" + Var SelectDrink = $12-01-02-0003.Self Var NameDrink = $12-01-02-0003.NameE Var NameDrinkTH = $12-01-02-0003.Name Var DrinkDescriptionTH = $12-01-02-0003.description @@ -1723,7 +1749,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-01-02-0004" + Var SelectDrink = $12-01-02-0004.Self Var NameDrink = $12-01-02-0004.NameE Var NameDrinkTH = $12-01-02-0004.Name Var DrinkDescriptionTH = $12-01-02-0004.description @@ -1815,7 +1841,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-01-02-0005" + Var SelectDrink = $12-01-02-0005.Self Var NameDrink = $12-01-02-0005.NameE Var NameDrinkTH = $12-01-02-0005.Name Var DrinkDescriptionTH = $12-01-02-0005.description @@ -1907,7 +1933,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-01-02-0007" + Var SelectDrink = $12-01-02-0007.Self Var NameDrink = $12-01-02-0007.NameE Var NameDrinkTH = $12-01-02-0007.Name Var DrinkDescriptionTH = $12-01-02-0007.description @@ -1999,7 +2025,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-01-02-0008" + Var SelectDrink = $12-01-02-0008.Self Var NameDrink = $12-01-02-0008.NameE Var NameDrinkTH = $12-01-02-0008.Name Var DrinkDescriptionTH = $12-01-02-0008.description @@ -2091,7 +2117,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-01-02-0009" + Var SelectDrink = $12-01-02-0009.Self Var NameDrink = $12-01-02-0009.NameE Var NameDrinkTH = $12-01-02-0009.Name Var DrinkDescriptionTH = $12-01-02-0009.description diff --git a/xml/page_catalog_choose_drink3.pml b/xml/page_catalog_choose_drink3.pml index 99dbb599..c1d0932f 100644 --- a/xml/page_catalog_choose_drink3.pml +++ b/xml/page_catalog_choose_drink3.pml @@ -19,6 +19,8 @@ product_code.append('12-02-01-0008') product_code.append('12-02-01-0009') product_code.append('12-02-01-0010') + product_code.append('12-02-01-0011') + product_code.append('12-02-01-0012') product_code.append('12-02-02-0001') product_code.append('12-02-02-0002') @@ -31,6 +33,8 @@ product_code.append('12-02-02-0008') product_code.append('12-02-02-0009') product_code.append('12-02-02-0010') + product_code.append('12-02-02-0011') + product_code.append('12-02-02-0012') menu_count = len( product_code) @@ -76,13 +80,9 @@ Var Menu8Selected = "Enable" EndIf - + Var Timeout = 0 - 60000 - - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - TimerReset - + - 60000 + + + + + 1000 - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - TimerReset + If NextPage = "-" Then + + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + + If Timeout > 60 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset - - ; ; 0 ; 0 @@ -128,6 +147,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" @@ -141,6 +161,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" @@ -154,6 +175,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" @@ -167,6 +189,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" @@ -180,6 +203,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" @@ -194,6 +218,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" @@ -222,6 +247,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" @@ -250,7 +276,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-01-0001" + Var SelectDrink = $12-02-01-0001.Self Var NameDrink = $12-02-01-0001.NameE Var NameDrinkTH = $12-02-01-0001.Name Var DrinkDescriptionTH = $12-02-01-0001.description @@ -342,7 +368,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-01-0002" + Var SelectDrink = $12-02-01-0002.Self Var NameDrink = $12-02-01-0002.NameE Var NameDrinkTH = $12-02-01-0002.Name Var DrinkDescriptionTH = $12-02-01-0002.description @@ -434,7 +460,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-01-0003" + Var SelectDrink = $12-02-01-0003.Self Var NameDrink = $12-02-01-0003.NameE Var NameDrinkTH = $12-02-01-0003.Name Var DrinkDescriptionTH = $12-02-01-0003.description @@ -526,7 +552,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-01-0004" + Var SelectDrink = $12-02-01-0004.Self Var NameDrink = $12-02-01-0004.NameE Var NameDrinkTH = $12-02-01-0004.Name Var DrinkDescriptionTH = $12-02-01-0004.description @@ -618,7 +644,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-01-0005" + Var SelectDrink = $12-02-01-0005.Self Var NameDrink = $12-02-01-0005.NameE Var NameDrinkTH = $12-02-01-0005.Name Var DrinkDescriptionTH = $12-02-01-0005.description @@ -710,7 +736,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-01-0006" + Var SelectDrink = $12-02-01-0006.Self Var NameDrink = $12-02-01-0006.NameE Var NameDrinkTH = $12-02-01-0006.Name Var DrinkDescriptionTH = $12-02-01-0006.description @@ -802,7 +828,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-01-0007" + Var SelectDrink = $12-02-01-0007.Self Var NameDrink = $12-02-01-0007.NameE Var NameDrinkTH = $12-02-01-0007.Name Var DrinkDescriptionTH = $12-02-01-0007.description @@ -894,7 +920,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-01-0008" + Var SelectDrink = $12-02-01-0008.Self Var NameDrink = $12-02-01-0008.NameE Var NameDrinkTH = $12-02-01-0008.Name Var DrinkDescriptionTH = $12-02-01-0008.description @@ -986,7 +1012,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-01-0009" + Var SelectDrink = $12-02-01-0009.Self Var NameDrink = $12-02-01-0009.NameE Var NameDrinkTH = $12-02-01-0009.Name Var DrinkDescriptionTH = $12-02-01-0009.description @@ -1078,7 +1104,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-01-0010" + Var SelectDrink = $12-02-01-0010.Self Var NameDrink = $12-02-01-0010.NameE Var NameDrinkTH = $12-02-01-0010.Name Var DrinkDescriptionTH = $12-02-01-0010.description @@ -1155,7 +1181,191 @@ $12-02-01-0010.descriptionE - ; button i=11 12-02-02-0001 + ; button i=11 12-02-01-0011 + + 33 + 22 + 225 + 296 + $12-02-01-0011.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-02-01-0011.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-02-01-0011.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-02-01-0011.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-02-01-0011.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-02-01-0011.descriptionE + + + ; button i=12 12-02-01-0012 + + 33 + 22 + 225 + 296 + $12-02-01-0012.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-02-01-0012.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-02-01-0012.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-02-01-0012.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-02-01-0012.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-02-01-0012.descriptionE + + + ; button i=13 12-02-02-0001 33 22 @@ -1170,7 +1380,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-02-0001" + Var SelectDrink = $12-02-02-0001.Self Var NameDrink = $12-02-02-0001.NameE Var NameDrinkTH = $12-02-02-0001.Name Var DrinkDescriptionTH = $12-02-02-0001.description @@ -1247,7 +1457,7 @@ $12-02-02-0001.descriptionE - ; button i=12 12-02-02-0002 + ; button i=14 12-02-02-0002 33 22 @@ -1262,7 +1472,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-02-0002" + Var SelectDrink = $12-02-02-0002.Self Var NameDrink = $12-02-02-0002.NameE Var NameDrinkTH = $12-02-02-0002.Name Var DrinkDescriptionTH = $12-02-02-0002.description @@ -1339,7 +1549,7 @@ $12-02-02-0002.descriptionE - ; button i=13 12-02-02-0003 + ; button i=15 12-02-02-0003 33 22 @@ -1354,7 +1564,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-02-0003" + Var SelectDrink = $12-02-02-0003.Self Var NameDrink = $12-02-02-0003.NameE Var NameDrinkTH = $12-02-02-0003.Name Var DrinkDescriptionTH = $12-02-02-0003.description @@ -1431,7 +1641,7 @@ $12-02-02-0003.descriptionE - ; button i=14 12-02-02-0004 + ; button i=16 12-02-02-0004 33 22 @@ -1446,7 +1656,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-02-0004" + Var SelectDrink = $12-02-02-0004.Self Var NameDrink = $12-02-02-0004.NameE Var NameDrinkTH = $12-02-02-0004.Name Var DrinkDescriptionTH = $12-02-02-0004.description @@ -1523,7 +1733,7 @@ $12-02-02-0004.descriptionE - ; button i=15 12-02-02-0005 + ; button i=17 12-02-02-0005 33 22 @@ -1538,7 +1748,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-02-0005" + Var SelectDrink = $12-02-02-0005.Self Var NameDrink = $12-02-02-0005.NameE Var NameDrinkTH = $12-02-02-0005.Name Var DrinkDescriptionTH = $12-02-02-0005.description @@ -1615,7 +1825,7 @@ $12-02-02-0005.descriptionE - ; button i=16 12-02-02-0006 + ; button i=18 12-02-02-0006 33 22 @@ -1630,7 +1840,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-02-0006" + Var SelectDrink = $12-02-02-0006.Self Var NameDrink = $12-02-02-0006.NameE Var NameDrinkTH = $12-02-02-0006.Name Var DrinkDescriptionTH = $12-02-02-0006.description @@ -1707,7 +1917,7 @@ $12-02-02-0006.descriptionE - ; button i=17 12-02-02-0007 + ; button i=19 12-02-02-0007 33 22 @@ -1722,7 +1932,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-02-0007" + Var SelectDrink = $12-02-02-0007.Self Var NameDrink = $12-02-02-0007.NameE Var NameDrinkTH = $12-02-02-0007.Name Var DrinkDescriptionTH = $12-02-02-0007.description @@ -1799,7 +2009,7 @@ $12-02-02-0007.descriptionE - ; button i=18 12-02-02-0008 + ; button i=20 12-02-02-0008 33 22 @@ -1814,7 +2024,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-02-0008" + Var SelectDrink = $12-02-02-0008.Self Var NameDrink = $12-02-02-0008.NameE Var NameDrinkTH = $12-02-02-0008.Name Var DrinkDescriptionTH = $12-02-02-0008.description @@ -1891,7 +2101,7 @@ $12-02-02-0008.descriptionE - ; button i=19 12-02-02-0009 + ; button i=21 12-02-02-0009 33 22 @@ -1906,7 +2116,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-02-0009" + Var SelectDrink = $12-02-02-0009.Self Var NameDrink = $12-02-02-0009.NameE Var NameDrinkTH = $12-02-02-0009.Name Var DrinkDescriptionTH = $12-02-02-0009.description @@ -1983,7 +2193,7 @@ $12-02-02-0009.descriptionE - ; button i=20 12-02-02-0010 + ; button i=22 12-02-02-0010 33 22 @@ -1998,7 +2208,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-02-02-0010" + Var SelectDrink = $12-02-02-0010.Self Var NameDrink = $12-02-02-0010.NameE Var NameDrinkTH = $12-02-02-0010.Name Var DrinkDescriptionTH = $12-02-02-0010.description @@ -2074,6 +2284,190 @@ showengText $12-02-02-0010.descriptionE + + ; button i=23 12-02-02-0011 + + 33 + 22 + 225 + 296 + $12-02-02-0011.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-02-02-0011.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-02-02-0011.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-02-02-0011.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-02-02-0011.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-02-02-0011.descriptionE + + + ; button i=24 12-02-02-0012 + + 33 + 22 + 225 + 296 + $12-02-02-0012.Button + + + 182 + 12 + ShowPrice + "Hurr" + 150 + 27 + KanitTTF + 0xB78F24 + $12-02-02-0012.Price + + + 164 + 12 + ShowPrice + 20 + 27 + KanitTTF + 0xB78F24 + "฿"" + + + 16 + 190 + 24 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showthaiText + $12-02-02-0012.Name + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showthaiText + $12-02-02-0012.description + + + 16 + 190 + 22 + 220 + "multi2" + KanitMediumTTF + 0x322B26 + showengText + $12-02-02-0012.NameE + + + 16 + 246 + 14 + 220 + KanitMediumTTF + 0x6F5F51 + showengText + $12-02-02-0012.descriptionE + diff --git a/xml/page_catalog_choose_drink4.pml b/xml/page_catalog_choose_drink4.pml index 62255d47..be7a0e2b 100644 --- a/xml/page_catalog_choose_drink4.pml +++ b/xml/page_catalog_choose_drink4.pml @@ -66,13 +66,9 @@ Var Menu8Selected = "Enable" EndIf - + Var Timeout = 0 - 60000 - - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - TimerReset - + - 60000 + + + + + 1000 - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - TimerReset + If NextPage = "-" Then + + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + + If Timeout > 60 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset - - ; ; 0 ; 0 @@ -128,6 +147,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" @@ -141,6 +161,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" @@ -154,6 +175,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" @@ -167,6 +189,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" @@ -180,6 +203,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" @@ -194,6 +218,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" @@ -222,6 +247,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" @@ -251,7 +277,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-03-01-0001" + Var SelectDrink = $12-03-01-0001.Self Var NameDrink = $12-03-01-0001.NameE Var NameDrinkTH = $12-03-01-0001.Name Var DrinkDescriptionTH = $12-03-01-0001.description @@ -343,7 +369,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-03-01-0002" + Var SelectDrink = $12-03-01-0002.Self Var NameDrink = $12-03-01-0002.NameE Var NameDrinkTH = $12-03-01-0002.Name Var DrinkDescriptionTH = $12-03-01-0002.description @@ -435,7 +461,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-03-01-0003" + Var SelectDrink = $12-03-01-0003.Self Var NameDrink = $12-03-01-0003.NameE Var NameDrinkTH = $12-03-01-0003.Name Var DrinkDescriptionTH = $12-03-01-0003.description @@ -527,7 +553,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-03-01-0004" + Var SelectDrink = $12-03-01-0004.Self Var NameDrink = $12-03-01-0004.NameE Var NameDrinkTH = $12-03-01-0004.Name Var DrinkDescriptionTH = $12-03-01-0004.description @@ -619,7 +645,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-03-01-0005" + Var SelectDrink = $12-03-01-0005.Self Var NameDrink = $12-03-01-0005.NameE Var NameDrinkTH = $12-03-01-0005.Name Var DrinkDescriptionTH = $12-03-01-0005.description @@ -711,7 +737,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-03-02-0001" + Var SelectDrink = $12-03-02-0001.Self Var NameDrink = $12-03-02-0001.NameE Var NameDrinkTH = $12-03-02-0001.Name Var DrinkDescriptionTH = $12-03-02-0001.description @@ -803,7 +829,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-03-02-0002" + Var SelectDrink = $12-03-02-0002.Self Var NameDrink = $12-03-02-0002.NameE Var NameDrinkTH = $12-03-02-0002.Name Var DrinkDescriptionTH = $12-03-02-0002.description @@ -895,7 +921,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-03-02-0003" + Var SelectDrink = $12-03-02-0003.Self Var NameDrink = $12-03-02-0003.NameE Var NameDrinkTH = $12-03-02-0003.Name Var DrinkDescriptionTH = $12-03-02-0003.description @@ -987,7 +1013,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-03-02-0004" + Var SelectDrink = $12-03-02-0004.Self Var NameDrink = $12-03-02-0004.NameE Var NameDrinkTH = $12-03-02-0004.Name Var DrinkDescriptionTH = $12-03-02-0004.description @@ -1079,7 +1105,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-03-02-0006" + Var SelectDrink = $12-03-02-0006.Self Var NameDrink = $12-03-02-0006.NameE Var NameDrinkTH = $12-03-02-0006.Name Var DrinkDescriptionTH = $12-03-02-0006.description @@ -1171,7 +1197,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-03-02-0005" + Var SelectDrink = $12-03-02-0005.Self Var NameDrink = $12-03-02-0005.NameE Var NameDrinkTH = $12-03-02-0005.Name Var DrinkDescriptionTH = $12-03-02-0005.description diff --git a/xml/page_catalog_choose_drink5.pml b/xml/page_catalog_choose_drink5.pml index 882d846c..242bfbe0 100644 --- a/xml/page_catalog_choose_drink5.pml +++ b/xml/page_catalog_choose_drink5.pml @@ -57,12 +57,9 @@ Var Menu7Selected = "Invisible" Var Menu8Selected = "Enable" EndIf + + Var Timeout = 0 - 60000 - - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - TimerReset - - 60000 + + + + 1000 - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - TimerReset + If NextPage = "-" Then + + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + + If Timeout > 60 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset - - ; ; 0 ; 0 @@ -127,6 +147,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" @@ -140,6 +161,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" @@ -153,6 +175,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" @@ -166,6 +189,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" @@ -179,6 +203,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" @@ -193,6 +218,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" @@ -221,6 +247,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" @@ -250,7 +277,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-01-0001" + Var SelectDrink = $12-05-01-0001.Self Var NameDrink = $12-05-01-0001.NameE Var NameDrinkTH = $12-05-01-0001.Name Var DrinkDescriptionTH = $12-05-01-0001.description @@ -342,7 +369,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0001" + Var SelectDrink = $12-05-02-0001.Self Var NameDrink = $12-05-02-0001.NameE Var NameDrinkTH = $12-05-02-0001.Name Var DrinkDescriptionTH = $12-05-02-0001.description @@ -434,7 +461,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0002" + Var SelectDrink = $12-05-02-0002.Self Var NameDrink = $12-05-02-0002.NameE Var NameDrinkTH = $12-05-02-0002.Name Var DrinkDescriptionTH = $12-05-02-0002.description @@ -526,7 +553,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0003" + Var SelectDrink = $12-05-02-0003.Self Var NameDrink = $12-05-02-0003.NameE Var NameDrinkTH = $12-05-02-0003.Name Var DrinkDescriptionTH = $12-05-02-0003.description @@ -618,7 +645,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0004" + Var SelectDrink = $12-05-02-0004.Self Var NameDrink = $12-05-02-0004.NameE Var NameDrinkTH = $12-05-02-0004.Name Var DrinkDescriptionTH = $12-05-02-0004.description @@ -710,7 +737,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0005" + Var SelectDrink = $12-05-02-0005.Self Var NameDrink = $12-05-02-0005.NameE Var NameDrinkTH = $12-05-02-0005.Name Var DrinkDescriptionTH = $12-05-02-0005.description @@ -802,7 +829,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0006" + Var SelectDrink = $12-05-02-0006.Self Var NameDrink = $12-05-02-0006.NameE Var NameDrinkTH = $12-05-02-0006.Name Var DrinkDescriptionTH = $12-05-02-0006.description diff --git a/xml/page_catalog_choose_drink6.pml b/xml/page_catalog_choose_drink6.pml index b87e3091..0d734be2 100644 --- a/xml/page_catalog_choose_drink6.pml +++ b/xml/page_catalog_choose_drink6.pml @@ -81,12 +81,8 @@ Var Menu8Selected = "Enable" EndIf + Var Timeout = 0 - 60000 - - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - TimerReset - - 60000 + + + + 1000 - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - TimerReset + If NextPage = "-" Then + + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + + If Timeout > 60 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset - - ; ; 0 ; 0 @@ -127,6 +146,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" @@ -140,6 +160,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" @@ -153,6 +174,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" @@ -166,6 +188,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" @@ -179,6 +202,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" @@ -193,6 +217,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" @@ -221,6 +246,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" @@ -252,7 +278,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0007" + Var SelectDrink = $12-05-02-0007.Self Var NameDrink = $12-05-02-0007.NameE Var NameDrinkTH = $12-05-02-0007.Name Var DrinkDescriptionTH = $12-05-02-0007.description @@ -344,7 +370,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0021" + Var SelectDrink = $12-05-02-0021.Self Var NameDrink = $12-05-02-0021.NameE Var NameDrinkTH = $12-05-02-0021.Name Var DrinkDescriptionTH = $12-05-02-0021.description @@ -436,7 +462,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0010" + Var SelectDrink = $12-05-02-0010.Self Var NameDrink = $12-05-02-0010.NameE Var NameDrinkTH = $12-05-02-0010.Name Var DrinkDescriptionTH = $12-05-02-0010.description @@ -528,7 +554,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0011" + Var SelectDrink = $12-05-02-0011.Self Var NameDrink = $12-05-02-0011.NameE Var NameDrinkTH = $12-05-02-0011.Name Var DrinkDescriptionTH = $12-05-02-0011.description @@ -620,7 +646,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0012" + Var SelectDrink = $12-05-02-0012.Self Var NameDrink = $12-05-02-0012.NameE Var NameDrinkTH = $12-05-02-0012.Name Var DrinkDescriptionTH = $12-05-02-0012.description @@ -712,7 +738,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0013" + Var SelectDrink = $12-05-02-0013.Self Var NameDrink = $12-05-02-0013.NameE Var NameDrinkTH = $12-05-02-0013.Name Var DrinkDescriptionTH = $12-05-02-0013.description @@ -804,7 +830,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0008" + Var SelectDrink = $12-05-02-0008.Self Var NameDrink = $12-05-02-0008.NameE Var NameDrinkTH = $12-05-02-0008.Name Var DrinkDescriptionTH = $12-05-02-0008.description @@ -896,7 +922,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0009" + Var SelectDrink = $12-05-02-0009.Self Var NameDrink = $12-05-02-0009.NameE Var NameDrinkTH = $12-05-02-0009.Name Var DrinkDescriptionTH = $12-05-02-0009.description @@ -988,7 +1014,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0014" + Var SelectDrink = $12-05-02-0014.Self Var NameDrink = $12-05-02-0014.NameE Var NameDrinkTH = $12-05-02-0014.Name Var DrinkDescriptionTH = $12-05-02-0014.description @@ -1080,7 +1106,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0015" + Var SelectDrink = $12-05-02-0015.Self Var NameDrink = $12-05-02-0015.NameE Var NameDrinkTH = $12-05-02-0015.Name Var DrinkDescriptionTH = $12-05-02-0015.description @@ -1172,7 +1198,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-01-0001" + Var SelectDrink = $12-05-01-0001.Self Var NameDrink = $12-05-01-0001.NameE Var NameDrinkTH = $12-05-01-0001.Name Var DrinkDescriptionTH = $12-05-01-0001.description @@ -1264,7 +1290,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0001" + Var SelectDrink = $12-05-02-0001.Self Var NameDrink = $12-05-02-0001.NameE Var NameDrinkTH = $12-05-02-0001.Name Var DrinkDescriptionTH = $12-05-02-0001.description @@ -1356,7 +1382,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0004" + Var SelectDrink = $12-05-02-0004.Self Var NameDrink = $12-05-02-0004.NameE Var NameDrinkTH = $12-05-02-0004.Name Var DrinkDescriptionTH = $12-05-02-0004.description @@ -1448,7 +1474,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0005" + Var SelectDrink = $12-05-02-0005.Self Var NameDrink = $12-05-02-0005.NameE Var NameDrinkTH = $12-05-02-0005.Name Var DrinkDescriptionTH = $12-05-02-0005.description @@ -1540,7 +1566,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0006" + Var SelectDrink = $12-05-02-0006.Self Var NameDrink = $12-05-02-0006.NameE Var NameDrinkTH = $12-05-02-0006.Name Var DrinkDescriptionTH = $12-05-02-0006.description @@ -1632,7 +1658,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0002" + Var SelectDrink = $12-05-02-0002.Self Var NameDrink = $12-05-02-0002.NameE Var NameDrinkTH = $12-05-02-0002.Name Var DrinkDescriptionTH = $12-05-02-0002.description @@ -1724,7 +1750,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0003" + Var SelectDrink = $12-05-02-0003.Self Var NameDrink = $12-05-02-0003.NameE Var NameDrinkTH = $12-05-02-0003.Name Var DrinkDescriptionTH = $12-05-02-0003.description @@ -1816,7 +1842,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0016" + Var SelectDrink = $12-05-02-0016.Self Var NameDrink = $12-05-02-0016.NameE Var NameDrinkTH = $12-05-02-0016.Name Var DrinkDescriptionTH = $12-05-02-0016.description @@ -1908,7 +1934,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0017" + Var SelectDrink = $12-05-02-0017.Self Var NameDrink = $12-05-02-0017.NameE Var NameDrinkTH = $12-05-02-0017.Name Var DrinkDescriptionTH = $12-05-02-0017.description @@ -2000,7 +2026,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-02-0018" + Var SelectDrink = $12-05-02-0018.Self Var NameDrink = $12-05-02-0018.NameE Var NameDrinkTH = $12-05-02-0018.Name Var DrinkDescriptionTH = $12-05-02-0018.description @@ -2092,7 +2118,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-05-01-0002" + Var SelectDrink = $12-05-01-0002.Self Var NameDrink = $12-05-01-0002.NameE Var NameDrinkTH = $12-05-01-0002.Name Var DrinkDescriptionTH = $12-05-01-0002.description diff --git a/xml/page_catalog_choose_drink7.pml b/xml/page_catalog_choose_drink7.pml index ad74bbaf..bd040598 100644 --- a/xml/page_catalog_choose_drink7.pml +++ b/xml/page_catalog_choose_drink7.pml @@ -62,12 +62,8 @@ Var Menu8Selected = "Enable" EndIf + Var Timeout = 0 - 60000 - - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - TimerReset - - 60000 + + + + 1000 - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - TimerReset + If NextPage = "-" Then + + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + + If Timeout > 60 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset - - ; ; 0 ; 0 @@ -126,6 +145,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" @@ -139,6 +159,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" @@ -152,6 +173,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" @@ -165,6 +187,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" @@ -178,6 +201,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" @@ -192,6 +216,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" @@ -220,6 +245,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" @@ -251,7 +277,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-04-02-0001" + Var SelectDrink = $12-04-02-0001.Self Var NameDrink = $12-04-02-0001.NameE Var NameDrinkTH = $12-04-02-0001.Name Var DrinkDescriptionTH = $12-04-02-0001.description @@ -343,7 +369,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-04-02-0002" + Var SelectDrink = $12-04-02-0002.Self Var NameDrink = $12-04-02-0002.NameE Var NameDrinkTH = $12-04-02-0002.Name Var DrinkDescriptionTH = $12-04-02-0002.description @@ -435,7 +461,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-04-02-0003" + Var SelectDrink = $12-04-02-0003.Self Var NameDrink = $12-04-02-0003.NameE Var NameDrinkTH = $12-04-02-0003.Name Var DrinkDescriptionTH = $12-04-02-0003.description @@ -527,7 +553,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-04-02-0004" + Var SelectDrink = $12-04-02-0004.Self Var NameDrink = $12-04-02-0004.NameE Var NameDrinkTH = $12-04-02-0004.Name Var DrinkDescriptionTH = $12-04-02-0004.description @@ -619,7 +645,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-04-02-0005" + Var SelectDrink = $12-04-02-0005.Self Var NameDrink = $12-04-02-0005.NameE Var NameDrinkTH = $12-04-02-0005.Name Var DrinkDescriptionTH = $12-04-02-0005.description @@ -711,7 +737,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-04-02-0006" + Var SelectDrink = $12-04-02-0006.Self Var NameDrink = $12-04-02-0006.NameE Var NameDrinkTH = $12-04-02-0006.Name Var DrinkDescriptionTH = $12-04-02-0006.description @@ -803,7 +829,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-04-02-0007" + Var SelectDrink = $12-04-02-0007.Self Var NameDrink = $12-04-02-0007.NameE Var NameDrinkTH = $12-04-02-0007.Name Var DrinkDescriptionTH = $12-04-02-0007.description @@ -895,7 +921,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-04-02-0008" + Var SelectDrink = $12-04-02-0008.Self Var NameDrink = $12-04-02-0008.NameE Var NameDrinkTH = $12-04-02-0008.Name Var DrinkDescriptionTH = $12-04-02-0008.description @@ -987,7 +1013,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-04-02-0009" + Var SelectDrink = $12-04-02-0009.Self Var NameDrink = $12-04-02-0009.NameE Var NameDrinkTH = $12-04-02-0009.Name Var DrinkDescriptionTH = $12-04-02-0009.description @@ -1079,7 +1105,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-04-02-0010" + Var SelectDrink = $12-04-02-0010.Self Var NameDrink = $12-04-02-0010.NameE Var NameDrinkTH = $12-04-02-0010.Name Var DrinkDescriptionTH = $12-04-02-0010.description @@ -1171,7 +1197,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "12-04-02-0011" + Var SelectDrink = $12-04-02-0011.Self Var NameDrink = $12-04-02-0011.NameE Var NameDrinkTH = $12-04-02-0011.Name Var DrinkDescriptionTH = $12-04-02-0011.description diff --git a/xml/page_catalog_choose_drink8.pml b/xml/page_catalog_choose_drink8.pml index 7c61c295..b2db03b0 100644 --- a/xml/page_catalog_choose_drink8.pml +++ b/xml/page_catalog_choose_drink8.pml @@ -61,12 +61,8 @@ Var Menu8Selected = "PressForever" EndIf + Var Timeout = 0 - 60000 - - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - TimerReset - - 60000 + + + + 1000 - Open "ROOT/taobin_project/xml/page_back_to_main.xml" - TimerReset + If NextPage = "-" Then + + Else + If Timeout > 30 Then + Open NextPage + EndIf + EndIf + + If Timeout > 60 Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + EndIf + + If BrewCommand = "RefreshAll" Then + Var BrewCommand = "-" + Open CurrentXMLFileName2 + EndIf + + Var Timeout = Timeout + 1 + TimerReset - - ; ; 0 ; 0 @@ -127,6 +146,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" @@ -140,6 +160,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" @@ -153,6 +174,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" @@ -166,6 +188,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" @@ -179,6 +202,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" @@ -193,6 +217,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" @@ -221,6 +246,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume + Var NextPage = "-" Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" @@ -252,7 +278,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "11-99-05-0001" + Var SelectDrink = $11-99-05-0001.Self Var NameDrink = $11-99-05-0001.NameE Var NameDrinkTH = $11-99-05-0001.Name Var DrinkDescriptionTH = $11-99-05-0001.description @@ -344,7 +370,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "11-99-05-0002" + Var SelectDrink = $11-99-05-0002.Self Var NameDrink = $11-99-05-0002.NameE Var NameDrinkTH = $11-99-05-0002.Name Var DrinkDescriptionTH = $11-99-05-0002.description @@ -436,7 +462,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "11-99-05-0003" + Var SelectDrink = $11-99-05-0003.Self Var NameDrink = $11-99-05-0003.NameE Var NameDrinkTH = $11-99-05-0003.Name Var DrinkDescriptionTH = $11-99-05-0003.description @@ -528,7 +554,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "11-99-05-0004" + Var SelectDrink = $11-99-05-0004.Self Var NameDrink = $11-99-05-0004.NameE Var NameDrinkTH = $11-99-05-0004.Name Var DrinkDescriptionTH = $11-99-05-0004.description @@ -620,7 +646,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "11-99-05-0005" + Var SelectDrink = $11-99-05-0005.Self Var NameDrink = $11-99-05-0005.NameE Var NameDrinkTH = $11-99-05-0005.Name Var DrinkDescriptionTH = $11-99-05-0005.description @@ -712,7 +738,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "11-99-05-0006" + Var SelectDrink = $11-99-05-0006.Self Var NameDrink = $11-99-05-0006.NameE Var NameDrinkTH = $11-99-05-0006.Name Var DrinkDescriptionTH = $11-99-05-0006.description @@ -804,7 +830,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "11-99-05-0007" + Var SelectDrink = $11-99-05-0007.Self Var NameDrink = $11-99-05-0007.NameE Var NameDrinkTH = $11-99-05-0007.Name Var DrinkDescriptionTH = $11-99-05-0007.description @@ -896,7 +922,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "11-99-05-0008" + Var SelectDrink = $11-99-05-0008.Self Var NameDrink = $11-99-05-0008.NameE Var NameDrinkTH = $11-99-05-0008.Name Var DrinkDescriptionTH = $11-99-05-0008.description @@ -988,7 +1014,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "11-99-05-0009" + Var SelectDrink = $11-99-05-0009.Self Var NameDrink = $11-99-05-0009.NameE Var NameDrinkTH = $11-99-05-0009.Name Var DrinkDescriptionTH = $11-99-05-0009.description @@ -1080,7 +1106,7 @@ "/mnt/sdcard/coffeevending/wav/click.wav" SoundVolume - Var SelectDrink = "11-99-05-0010" + Var SelectDrink = $11-99-05-0010.Self Var NameDrink = $11-99-05-0010.NameE Var NameDrinkTH = $11-99-05-0010.Name Var DrinkDescriptionTH = $11-99-05-0010.description diff --git a/xml/page_collect_point_1.xml b/xml/page_collect_point_1.xml index ccf2ef74..919f2f4f 100644 --- a/xml/page_collect_point_1.xml +++ b/xml/page_collect_point_1.xml @@ -18,6 +18,7 @@ Play "ROOT/taobin_project/sound_eng/Reward_final.mp3" Else Var DirImage = "ROOT/taobin_project/image/collect_point1" + Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3" EndIf diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml index fbf277a3..a7479e5d 100644 --- a/xml/page_drinkok.xml +++ b/xml/page_drinkok.xml @@ -23,6 +23,8 @@ Var VideoPlayFile = VideoPlayFile + "24" Var VideoPlayFile = VideoPlayFile + VideoFileEnd Var Timeout = 0 + + StopLongPlay 500 @@ -40,7 +42,7 @@ If show_eng = "true" Then Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Straw.mp3" Else - + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/drinkfinish.mp3" EndIf EndIf diff --git a/xml/page_lid_straw.xml b/xml/page_lid_straw.xml index d29bb97b..bea2c2d7 100644 --- a/xml/page_lid_straw.xml +++ b/xml/page_lid_straw.xml @@ -18,7 +18,8 @@ Var PicturePath = "/mnt/sdcard/coffeevending/taobin_project/image/page_doing/" Var PictureBegin = "txt_" - + + If show_eng = "true" Then Var DirImage = "ROOT/taobin_project/image/page_lid_straw_en" @@ -55,17 +56,17 @@ Var StepVideo = 1 Var PreviseStepVideo = 90 - SAVELOG CountUpBrewing + ;SAVELOG CountUpBrewing - SAVELOG AnimationOn - SAVELOG AnimationVideoPlayTime - SAVELOG VideoID1 - SAVELOG VideoID2 - SAVELOG VideoID3 - SAVELOG VideoID4 - SAVELOG VideoID5 - SAVELOG VideoID6 - SAVELOG VideoAnimationCount + ;SAVELOG AnimationOn + ;SAVELOG AnimationVideoPlayTime + ;SAVELOG VideoID1 + ;SAVELOG VideoID2 + ;SAVELOG VideoID3 + ;SAVELOG VideoID4 + ;SAVELOG VideoID5 + ;SAVELOG VideoID6 + ;SAVELOG VideoAnimationCount Var VideoPlayFile = VideoPath Var VideoPlayFile = VideoPlayFile + VideoFileBegin @@ -77,7 +78,10 @@ Var PictureFile = PictureFile + "1" Var PictureFile = PictureFile + PictureEnd - + + If Service_LidStraw = "Disable" Then + Open "ROOT/taobin_project/xml/page_brewing3.xml" + EndIf @@ -111,18 +115,18 @@ Else If PreviseStepVideo = SlotVideo Then - SAVELOG SlotVideo + ;SAVELOG SlotVideo Else Var PreviseStepVideo = SlotVideo - SAVELOG PreviseStepVideo - SAVELOG SlotVideo - SAVELOG CountUpBrewing + ;SAVELOG PreviseStepVideo + ;SAVELOG SlotVideo + ;SAVELOG CountUpBrewing ;Var CountDownVideoTime = CountDownVideoTimeReload Var StepVideo = SlotVideo + 2 - SAVELOG StepVideo + ;SAVELOG StepVideo If StepVideo = 1 Then Var videoID = VideoID1 @@ -146,7 +150,7 @@ Var videoID = VideoID7 EndIf - SAVELOG videoID + ;SAVELOG videoID If videoID = 0 Then diff --git a/xml/page_payment.xml b/xml/page_payment.xml index cd649e70..656bc737 100644 --- a/xml/page_payment.xml +++ b/xml/page_payment.xml @@ -44,13 +44,13 @@ Else Var DirImage = "ROOT/taobin_project/image/page_payment" - Var PlaySoundLag = "ROOT/sounds/selectPayment.wav" + Var PlaySoundLag = "ROOT/taobin_project/sound_thai/payment.mp3" EndIf SAVELOG MachineStage - If MachineStage = "close-maintenance" Then - Open "ROOT/taobin_project/xml/page_show_error.xml" + If ReadyForBrew = "false" Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" EndIf diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml index 7cbd6864..caec5c60 100644 --- a/xml/page_payment_cash.xml +++ b/xml/page_payment_cash.xml @@ -265,6 +265,11 @@ 1000 + If ReadyForBrew = "false" Then + Open "ROOT/taobin_project/xml/page_back_to_main.xml" + + EndIf + Var Timeout = Timeout + 1 diff --git a/xml/page_remove_cup.xml b/xml/page_remove_cup.xml index 9aeba38f..8633b758 100644 --- a/xml/page_remove_cup.xml +++ b/xml/page_remove_cup.xml @@ -7,6 +7,7 @@ "0xEFEDEA" SoundVolume + Var Timeout = 0 Var countClick = 0 Var countClick2 = 0 @@ -23,7 +24,7 @@ EndIf - 5000 + 2000 ;SAVELOG MachineErrorDetail Var MachineErrorDetailAll = MachineErrorDetail + " / " @@ -39,6 +40,16 @@ EndIf + If Timeout = 0 Then + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/remove_cup.mp3" + EndIf + + Var Timeout = Timeout + 1 + + If Timeout > 15 Then + Var Timeout = 0 + EndIf + Refresh TimerReset diff --git a/xml/page_show_error.xml b/xml/page_show_error.xml index 3b694d67..dacddce4 100644 --- a/xml/page_show_error.xml +++ b/xml/page_show_error.xml @@ -18,6 +18,7 @@ Var DirImage = "ROOT/taobin_project/image/close_th" EndIf + StopLongPlay 5000 diff --git a/xml/page_topping_alter.xml b/xml/page_topping_alter.xml index 42586c77..995808f7 100644 --- a/xml/page_topping_alter.xml +++ b/xml/page_topping_alter.xml @@ -126,7 +126,7 @@ If show_eng = "true" Then Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" Else - Play "/mnt/sdcard/coffeevending/sounds/selectSugar.wav" + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" EndIf RefreshAll @@ -229,7 +229,7 @@ If show_eng = "true" Then Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" Else - Play "/mnt/sdcard/coffeevending/sounds/selectSugar.wav" + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" EndIf Refresh @@ -332,7 +332,10 @@ Var PriceDrink = PriceDrinkTmp - SAVELOG topping2 + DEBUGVAR topping1 + DEBUGVAR topping2 + DEBUGVAR topping3 + ; Set drink Topping "Select" SelectDrink diff --git a/xml/page_topping_premix25percent.xml b/xml/page_topping_premix25percent.xml index a29ed9b0..cf0e7701 100644 --- a/xml/page_topping_premix25percent.xml +++ b/xml/page_topping_premix25percent.xml @@ -101,7 +101,7 @@ If show_eng = "true" Then Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" Else - Play "/mnt/sdcard/coffeevending/sounds/selectSugar.wav" + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" EndIf diff --git a/xml/page_topping_premix25percent_no.xml b/xml/page_topping_premix25percent_no.xml index b62073fe..630cdc2b 100644 --- a/xml/page_topping_premix25percent_no.xml +++ b/xml/page_topping_premix25percent_no.xml @@ -101,9 +101,10 @@ If show_eng = "true" Then Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" Else - Play "/mnt/sdcard/coffeevending/sounds/selectSugar.wav" + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" EndIf + 30000 diff --git a/xml/page_topping_premix50percent.xml b/xml/page_topping_premix50percent.xml index 982308d6..e448b0d3 100644 --- a/xml/page_topping_premix50percent.xml +++ b/xml/page_topping_premix50percent.xml @@ -73,9 +73,10 @@ If show_eng = "true" Then Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" Else - Play "/mnt/sdcard/coffeevending/sounds/selectSugar.wav" + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" EndIf + 30000 diff --git a/xml/page_topping_sugar_sufficiency.xml b/xml/page_topping_sugar_sufficiency.xml index 0c84cc80..d803ba70 100644 --- a/xml/page_topping_sugar_sufficiency.xml +++ b/xml/page_topping_sugar_sufficiency.xml @@ -62,9 +62,10 @@ If show_eng = "true" Then Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" Else - Play "/mnt/sdcard/coffeevending/sounds/selectSugar.wav" + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" EndIf + ;SAVELOG showname diff --git a/xml/page_topping_with_barista.xml b/xml/page_topping_with_barista.xml index 377fe321..f7cff9c6 100644 --- a/xml/page_topping_with_barista.xml +++ b/xml/page_topping_with_barista.xml @@ -133,10 +133,11 @@ If show_eng = "true" Then Play "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Sweet.mp3" Else - Play "/mnt/sdcard/coffeevending/sounds/selectSugar.wav" + Play "/mnt/sdcard/coffeevending/taobin_project/sound_thai/select_level.mp3" EndIf + 30000 @@ -379,6 +380,9 @@ Var PriceDrink = PriceDrinkTmp + DEBUGVAR topping1 + DEBUGVAR topping2 + DEBUGVAR topping3 ; Below this. Process get ExtendData 1:_____ len 5 diff --git a/xml/test_video_loop.xml b/xml/test_video_loop.xml index f3f2ac6e..96deddf2 100644 --- a/xml/test_video_loop.xml +++ b/xml/test_video_loop.xml @@ -42,7 +42,7 @@ SoundVolume OpenInst 0 "//mnt/sdcard/coffeevending/taobin_project/xml/vending_info.xml" - ;Open "//mnt/sdcard/coffeevending/taobin_project/xml/page_remove_cup.xml" + ;OpenInst 0 "//mnt/sdcard/coffeevending/taobin_project/xml/page_remove_cup.xml" diff --git a/xml/vending_info.xml b/xml/vending_info.xml index 8e9e53f7..dc75b275 100644 --- a/xml/vending_info.xml +++ b/xml/vending_info.xml @@ -15,6 +15,8 @@ Var info_5Y = 530 Var info_6Y = 600 Var info_7Y = 670 + Var info_8Y = 740 + Var info_text_startX = info_startX + 22 Var info_text_1Y = info_1Y + 18 @@ -24,6 +26,7 @@ Var info_text_5Y = info_5Y + 18 Var info_text_6Y = info_6Y + 18 Var info_text_7Y = info_7Y + 18 + Var info_text_8Y = info_8Y + 18 Var info2_startX = 550 @@ -64,8 +67,15 @@ Var Timeout = 0 Var IDFullNameEng = "เสียบบัตร" - Var Text1_6 = "Door/Lid/Straw = " + Service_LidStraw - Var Text2_6 = "ฝา = " + Lid1Status + Var Text1_6 = "Door/Lid/Straw : " + Service_LidStraw + Var Text2_6 = "ฝา : " + Lid1Status + + var Text1_7 = "CellSite :" + CellSite + var Text2_7 = "ระดับสัญญาณ :" + SignalStrengthStr + var Text2_7 = Text2_7 + " [" + var Text2_7 = Text2_7 + SignalStrengthLevel + var Text2_7 = Text2_7 + "]" + 1000 @@ -148,6 +158,7 @@ "ROOT/taobin_project/image/tab_1.png" Throw + ; FINISH @@ -155,12 +166,18 @@ info2_startX info_3Y "ROOT/taobin_project/image/tab_1.png" + + PlayLong "/mnt/sdcard/coffeevending/taobin_project/sounds/Papov-Yung-Logos.mp3" + info2_startX info_4Y "ROOT/taobin_project/image/tab_1.png" + + StopLongPlay + @@ -304,6 +321,20 @@ Text2_6 + + info1_startX + info_7Y + "ROOT/taobin_project/image/tab_1.png" + + + + + info2_startX + info_7Y + "ROOT/taobin_project/image/tab_1.png" + + + info_text_startX @@ -323,6 +354,8 @@ Text2_7 + +