diff --git a/image/page2/bn_protein.png b/image/page2/bn_protein.png
new file mode 100644
index 00000000..02458934
Binary files /dev/null and b/image/page2/bn_protein.png differ
diff --git a/image/page2/bp_protein.png b/image/page2/bp_protein.png
new file mode 100644
index 00000000..c9fa09b5
Binary files /dev/null and b/image/page2/bp_protein.png differ
diff --git a/image/page2_en/page2/bn_protein.png b/image/page2_en/page2/bn_protein.png
new file mode 100644
index 00000000..7a8dcb39
Binary files /dev/null and b/image/page2_en/page2/bn_protein.png differ
diff --git a/image/page2_en/page2/bp_protein.png b/image/page2_en/page2/bp_protein.png
new file mode 100644
index 00000000..dd497f1d
Binary files /dev/null and b/image/page2_en/page2/bp_protein.png differ
diff --git a/image/page3/bn_protein.png b/image/page3/bn_protein.png
new file mode 100644
index 00000000..8b98b478
Binary files /dev/null and b/image/page3/bn_protein.png differ
diff --git a/image/page3/bp_protein.png b/image/page3/bp_protein.png
new file mode 100644
index 00000000..2c1ad036
Binary files /dev/null and b/image/page3/bp_protein.png differ
diff --git a/image/page3_en/bn_protein.png b/image/page3_en/bn_protein.png
new file mode 100644
index 00000000..42b8e748
Binary files /dev/null and b/image/page3_en/bn_protein.png differ
diff --git a/image/page3_en/bp_protein.png b/image/page3_en/bp_protein.png
new file mode 100644
index 00000000..efdf8b8b
Binary files /dev/null and b/image/page3_en/bp_protein.png differ
diff --git a/image/page_doing/text_bottom_thai.png b/image/page_doing/text_bottom_thai.png
new file mode 100644
index 00000000..a7a1f7aa
Binary files /dev/null and b/image/page_doing/text_bottom_thai.png differ
diff --git a/image/page_doing/text_bottom_thai2.png b/image/page_doing/text_bottom_thai2.png
index 88d67622..c4919b29 100644
Binary files a/image/page_doing/text_bottom_thai2.png and b/image/page_doing/text_bottom_thai2.png differ
diff --git a/image/page_doing/txt_1.png b/image/page_doing/txt_1.png
index ecef3470..93490ca2 100644
Binary files a/image/page_doing/txt_1.png and b/image/page_doing/txt_1.png differ
diff --git a/image/page_drink/bn_hot_double_espresso.png b/image/page_drink/bn_hot_double_espresso.png
index 850261d3..637bc737 100644
Binary files a/image/page_drink/bn_hot_double_espresso.png and b/image/page_drink/bn_hot_double_espresso.png differ
diff --git a/image/page_drink/bn_iced_Cokecola.png b/image/page_drink/bn_iced_Cokecola.png
new file mode 100644
index 00000000..bb50ca3a
Binary files /dev/null and b/image/page_drink/bn_iced_Cokecola.png differ
diff --git a/image/page_drink/bn_iced_sprite.png b/image/page_drink/bn_iced_sprite.png
index 580ee5ee..723aacc4 100644
Binary files a/image/page_drink/bn_iced_sprite.png and b/image/page_drink/bn_iced_sprite.png differ
diff --git a/image/page_drink/bn_protein_Blueberry.png b/image/page_drink/bn_protein_Blueberry.png
new file mode 100644
index 00000000..33745b22
Binary files /dev/null and b/image/page_drink/bn_protein_Blueberry.png differ
diff --git a/image/page_drink/bn_protein_Chocolate.png b/image/page_drink/bn_protein_Chocolate.png
new file mode 100644
index 00000000..6b6b1897
Binary files /dev/null and b/image/page_drink/bn_protein_Chocolate.png differ
diff --git a/image/page_drink/bn_protein_Matcha.png b/image/page_drink/bn_protein_Matcha.png
new file mode 100644
index 00000000..d6fd6922
Binary files /dev/null and b/image/page_drink/bn_protein_Matcha.png differ
diff --git a/image/page_drink/bn_protein_Strawberry.png b/image/page_drink/bn_protein_Strawberry.png
new file mode 100644
index 00000000..765e5ec3
Binary files /dev/null and b/image/page_drink/bn_protein_Strawberry.png differ
diff --git a/image/page_drink/bn_protein_Taiwantea.png b/image/page_drink/bn_protein_Taiwantea.png
new file mode 100644
index 00000000..4fa4a911
Binary files /dev/null and b/image/page_drink/bn_protein_Taiwantea.png differ
diff --git a/image/page_drink/bn_protein_Thaitea.png b/image/page_drink/bn_protein_Thaitea.png
new file mode 100644
index 00000000..b0e47ac4
Binary files /dev/null and b/image/page_drink/bn_protein_Thaitea.png differ
diff --git a/image/page_drink/bn_protein_caramel.png b/image/page_drink/bn_protein_caramel.png
new file mode 100644
index 00000000..6057865b
Binary files /dev/null and b/image/page_drink/bn_protein_caramel.png differ
diff --git a/image/page_drink/bn_protein_espresso.png b/image/page_drink/bn_protein_espresso.png
new file mode 100644
index 00000000..37f47527
Binary files /dev/null and b/image/page_drink/bn_protein_espresso.png differ
diff --git a/image/page_drink/bn_protein_isolated.png b/image/page_drink/bn_protein_isolated.png
new file mode 100644
index 00000000..58dad4f4
Binary files /dev/null and b/image/page_drink/bn_protein_isolated.png differ
diff --git a/image/page_drink/bn_protein_kokuto.png b/image/page_drink/bn_protein_kokuto.png
new file mode 100644
index 00000000..6270d7dc
Binary files /dev/null and b/image/page_drink/bn_protein_kokuto.png differ
diff --git a/image/page_drink/bn_protein_milk.png b/image/page_drink/bn_protein_milk.png
new file mode 100644
index 00000000..6446cf46
Binary files /dev/null and b/image/page_drink/bn_protein_milk.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 46bad73e..edfa8aff 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_iced_Cokecola.png b/image/page_drink_disable/bn_iced_Cokecola.png
new file mode 100644
index 00000000..8d7fa7b0
Binary files /dev/null and b/image/page_drink_disable/bn_iced_Cokecola.png differ
diff --git a/image/page_drink_disable/bn_iced_sprite.png b/image/page_drink_disable/bn_iced_sprite.png
index fb58a6e6..e42d9d45 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_protein_Blueberry.png b/image/page_drink_disable/bn_protein_Blueberry.png
new file mode 100644
index 00000000..49eb43eb
Binary files /dev/null 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
new file mode 100644
index 00000000..b18d631f
Binary files /dev/null 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
new file mode 100644
index 00000000..35b27b5f
Binary files /dev/null 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
new file mode 100644
index 00000000..5a398e04
Binary files /dev/null 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
new file mode 100644
index 00000000..a0d2881b
Binary files /dev/null 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
new file mode 100644
index 00000000..cceed7de
Binary files /dev/null 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
new file mode 100644
index 00000000..ad969d73
Binary files /dev/null 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
new file mode 100644
index 00000000..00abdaad
Binary files /dev/null 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
new file mode 100644
index 00000000..5cc23ef6
Binary files /dev/null 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
new file mode 100644
index 00000000..79857d6c
Binary files /dev/null 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
new file mode 100644
index 00000000..e168fabe
Binary files /dev/null and b/image/page_drink_disable/bn_protein_milk.png differ
diff --git a/image/page_drink_press/bn_hot_double_espresso.png b/image/page_drink_press/bn_hot_double_espresso.png
index 598eebd6..1b9a787d 100644
Binary files a/image/page_drink_press/bn_hot_double_espresso.png and b/image/page_drink_press/bn_hot_double_espresso.png differ
diff --git a/image/page_drink_press/bn_iced_Cokecola.png b/image/page_drink_press/bn_iced_Cokecola.png
new file mode 100644
index 00000000..8ff411e3
Binary files /dev/null and b/image/page_drink_press/bn_iced_Cokecola.png differ
diff --git a/image/page_drink_press/bn_iced_sprite.png b/image/page_drink_press/bn_iced_sprite.png
index d9fbd4bc..663b9863 100644
Binary files a/image/page_drink_press/bn_iced_sprite.png and b/image/page_drink_press/bn_iced_sprite.png differ
diff --git a/image/page_drink_press/bn_protein_Blueberry.png b/image/page_drink_press/bn_protein_Blueberry.png
new file mode 100644
index 00000000..e0d70275
Binary files /dev/null and b/image/page_drink_press/bn_protein_Blueberry.png differ
diff --git a/image/page_drink_press/bn_protein_Chocolate.png b/image/page_drink_press/bn_protein_Chocolate.png
new file mode 100644
index 00000000..e8992785
Binary files /dev/null and b/image/page_drink_press/bn_protein_Chocolate.png differ
diff --git a/image/page_drink_press/bn_protein_Matcha.png b/image/page_drink_press/bn_protein_Matcha.png
new file mode 100644
index 00000000..8818bdef
Binary files /dev/null and b/image/page_drink_press/bn_protein_Matcha.png differ
diff --git a/image/page_drink_press/bn_protein_Strawberry.png b/image/page_drink_press/bn_protein_Strawberry.png
new file mode 100644
index 00000000..06e78247
Binary files /dev/null and b/image/page_drink_press/bn_protein_Strawberry.png differ
diff --git a/image/page_drink_press/bn_protein_Taiwantea.png b/image/page_drink_press/bn_protein_Taiwantea.png
new file mode 100644
index 00000000..d8461f4c
Binary files /dev/null and b/image/page_drink_press/bn_protein_Taiwantea.png differ
diff --git a/image/page_drink_press/bn_protein_Thaitea.png b/image/page_drink_press/bn_protein_Thaitea.png
new file mode 100644
index 00000000..1f9bd817
Binary files /dev/null and b/image/page_drink_press/bn_protein_Thaitea.png differ
diff --git a/image/page_drink_press/bn_protein_caramel.png b/image/page_drink_press/bn_protein_caramel.png
new file mode 100644
index 00000000..b7591d94
Binary files /dev/null and b/image/page_drink_press/bn_protein_caramel.png differ
diff --git a/image/page_drink_press/bn_protein_espresso.png b/image/page_drink_press/bn_protein_espresso.png
new file mode 100644
index 00000000..4265d072
Binary files /dev/null and b/image/page_drink_press/bn_protein_espresso.png differ
diff --git a/image/page_drink_press/bn_protein_isolated.png b/image/page_drink_press/bn_protein_isolated.png
new file mode 100644
index 00000000..f0bb2a50
Binary files /dev/null and b/image/page_drink_press/bn_protein_isolated.png differ
diff --git a/image/page_drink_press/bn_protein_kokuto.png b/image/page_drink_press/bn_protein_kokuto.png
new file mode 100644
index 00000000..9f5b18aa
Binary files /dev/null and b/image/page_drink_press/bn_protein_kokuto.png differ
diff --git a/image/page_drink_press/bn_protein_milk.png b/image/page_drink_press/bn_protein_milk.png
new file mode 100644
index 00000000..77477774
Binary files /dev/null and b/image/page_drink_press/bn_protein_milk.png differ
diff --git a/image/page_drink_select/bn_hot_double_espresso.png b/image/page_drink_select/bn_hot_double_espresso.png
index 842a8fa7..7e608911 100644
Binary files a/image/page_drink_select/bn_hot_double_espresso.png and b/image/page_drink_select/bn_hot_double_espresso.png differ
diff --git a/image/page_drink_select/bn_iced_Cokecola.png b/image/page_drink_select/bn_iced_Cokecola.png
new file mode 100644
index 00000000..6d9b4441
Binary files /dev/null and b/image/page_drink_select/bn_iced_Cokecola.png differ
diff --git a/image/page_drink_select/bn_iced_sprite.png b/image/page_drink_select/bn_iced_sprite.png
index 143704a3..4b64a8af 100644
Binary files a/image/page_drink_select/bn_iced_sprite.png and b/image/page_drink_select/bn_iced_sprite.png differ
diff --git a/image/page_drink_select/bn_protein_Blueberry.png b/image/page_drink_select/bn_protein_Blueberry.png
new file mode 100644
index 00000000..76d9754b
Binary files /dev/null and b/image/page_drink_select/bn_protein_Blueberry.png differ
diff --git a/image/page_drink_select/bn_protein_Chocolate.png b/image/page_drink_select/bn_protein_Chocolate.png
new file mode 100644
index 00000000..1b2d1077
Binary files /dev/null and b/image/page_drink_select/bn_protein_Chocolate.png differ
diff --git a/image/page_drink_select/bn_protein_Matcha.png b/image/page_drink_select/bn_protein_Matcha.png
new file mode 100644
index 00000000..335b80d9
Binary files /dev/null and b/image/page_drink_select/bn_protein_Matcha.png differ
diff --git a/image/page_drink_select/bn_protein_Strawberry.png b/image/page_drink_select/bn_protein_Strawberry.png
new file mode 100644
index 00000000..81663ff7
Binary files /dev/null and b/image/page_drink_select/bn_protein_Strawberry.png differ
diff --git a/image/page_drink_select/bn_protein_Taiwantea.png b/image/page_drink_select/bn_protein_Taiwantea.png
new file mode 100644
index 00000000..115fe3f4
Binary files /dev/null and b/image/page_drink_select/bn_protein_Taiwantea.png differ
diff --git a/image/page_drink_select/bn_protein_Thaitea.png b/image/page_drink_select/bn_protein_Thaitea.png
new file mode 100644
index 00000000..760ca70c
Binary files /dev/null and b/image/page_drink_select/bn_protein_Thaitea.png differ
diff --git a/image/page_drink_select/bn_protein_caramel.png b/image/page_drink_select/bn_protein_caramel.png
new file mode 100644
index 00000000..10ae886f
Binary files /dev/null and b/image/page_drink_select/bn_protein_caramel.png differ
diff --git a/image/page_drink_select/bn_protein_espresso.png b/image/page_drink_select/bn_protein_espresso.png
new file mode 100644
index 00000000..03a83ac1
Binary files /dev/null and b/image/page_drink_select/bn_protein_espresso.png differ
diff --git a/image/page_drink_select/bn_protein_isolated.png b/image/page_drink_select/bn_protein_isolated.png
new file mode 100644
index 00000000..f570ec55
Binary files /dev/null and b/image/page_drink_select/bn_protein_isolated.png differ
diff --git a/image/page_drink_select/bn_protein_kokuto.png b/image/page_drink_select/bn_protein_kokuto.png
new file mode 100644
index 00000000..a32e9e21
Binary files /dev/null and b/image/page_drink_select/bn_protein_kokuto.png differ
diff --git a/image/page_drink_select/bn_protein_milk.png b/image/page_drink_select/bn_protein_milk.png
new file mode 100644
index 00000000..8e01f0df
Binary files /dev/null and b/image/page_drink_select/bn_protein_milk.png differ
diff --git a/image/topping/Group 149.png b/image/topping/Group 149.png
new file mode 100644
index 00000000..24d77e53
Binary files /dev/null and b/image/topping/Group 149.png differ
diff --git a/image/topping/add_shot_img.png b/image/topping/add_shot_img.png
new file mode 100644
index 00000000..3eb1a10d
Binary files /dev/null and b/image/topping/add_shot_img.png differ
diff --git a/image/topping/add_shot_img_2.png b/image/topping/add_shot_img_2.png
new file mode 100644
index 00000000..1f9409c9
Binary files /dev/null and b/image/topping/add_shot_img_2.png differ
diff --git a/image/topping/cb_ch.png b/image/topping/cb_ch.png
new file mode 100644
index 00000000..8e632445
Binary files /dev/null and b/image/topping/cb_ch.png differ
diff --git a/image/topping/cb_nch.png b/image/topping/cb_nch.png
new file mode 100644
index 00000000..e3401d66
Binary files /dev/null and b/image/topping/cb_nch.png differ
diff --git a/image/topping/extra_img_1.png b/image/topping/extra_img_1.png
new file mode 100644
index 00000000..56eb92ca
Binary files /dev/null and b/image/topping/extra_img_1.png differ
diff --git a/image/topping_en/add_shot_img.png b/image/topping_en/add_shot_img.png
new file mode 100644
index 00000000..338f072c
Binary files /dev/null and b/image/topping_en/add_shot_img.png differ
diff --git a/image/topping_en/add_shot_img_2.png b/image/topping_en/add_shot_img_2.png
new file mode 100644
index 00000000..008c7148
Binary files /dev/null and b/image/topping_en/add_shot_img_2.png differ
diff --git a/image/topping_en/cb_ch.png b/image/topping_en/cb_ch.png
new file mode 100644
index 00000000..8e632445
Binary files /dev/null and b/image/topping_en/cb_ch.png differ
diff --git a/image/topping_en/cb_nch.png b/image/topping_en/cb_nch.png
new file mode 100644
index 00000000..e3401d66
Binary files /dev/null and b/image/topping_en/cb_nch.png differ
diff --git a/image/topping_en/extra_img_1.png b/image/topping_en/extra_img_1.png
new file mode 100644
index 00000000..447eea45
Binary files /dev/null and b/image/topping_en/extra_img_1.png differ
diff --git a/image/user_take_cup_en/img5.png b/image/user_take_cup_en/img5.png
index 3fb46f26..6eca307a 100644
Binary files a/image/user_take_cup_en/img5.png and b/image/user_take_cup_en/img5.png differ
diff --git a/image/user_take_cup_th/img5.png b/image/user_take_cup_th/img5.png
index 7a352578..639c4734 100644
Binary files a/image/user_take_cup_th/img5.png and b/image/user_take_cup_th/img5.png differ
diff --git a/sheet/MenuDiscription-Sheet1.tsv b/sheet/MenuDiscription-Sheet1.tsv
new file mode 100644
index 00000000..a8fe1389
--- /dev/null
+++ b/sheet/MenuDiscription-Sheet1.tsv
@@ -0,0 +1,90 @@
+Menu Code name Thai_name_14 charactor NameMenu Thai_name Description Thai_Description Price
+ Coffee your way ชงตามใจ Build your favorite\ncoffee your own way สร้างสรรค์กาแฟแก้วโปรด ในแบบของคุณเอง ฿30+
+11-99-01-0001 ESPRESSO เอสเพรสโซ่ร้อน 64 Espresso เอสเพรสโซ่ Espresso กาแฟ ฿30
+11-99-01-0101 DOUBLE ESPRESSO ดับเบิลเอสเพรสโซ่ Double Espresso ดับเบิลเอสเพรสโซ่ Espresso กาแฟ ฿45
+11-99-01-0002 HOT AMERICANO กาแฟดำร้อน\n(อเมริกาโน) 88 Hot Americano กาแฟดำร้อน (อเมริกาโน) Espresso, Water กาแฟ และน้ำร้อน\n(อเมริกาโน) ฿30
+11-99-01-0003 HOT CAFE' LATTE ลาเต้ร้อน Hot café Latte ลาเต้ร้อน Espresso, Milk,\nSmall Layer of foam milk กาแฟ นม และ ฟองนม ฿40
+11-99-01-0004 HOT CAPPUCINO คาปูชิโน่ร้อน 136 Hot Cappucino คาปูชิโน่ร้อน Espresso, Milk,\nFoamed milk กาแฟ นม และ ฟองนมบางๆ ฿40
+11-99-01-0005 HOT MOCHA มอคค่าร้อน Hot Mocha มอคค่าร้อน Espresso, Cocoa,\nMilk, Sugar กาแฟ นม ผสมช็อกโกแลต\nน้ำตาล ฿40
+11-99-01-0006 HOT \n CARAMEL LATTE คาราเมลลาเต้ร้อน Hot Caramel Latte คาราเมลลาเต้ร้อน Espresso, Milk,\nCaramel Syrup กาแฟ นม และ ฟองนม\nน้ำเชื่อมคาราเมล ฿40
+11-99-01-0007 HOT MATCHA\nCAFÉ LATTE กาแฟ\n มัทฉะลาเต้ร้อน Hot Matcha café Latte กาแฟ มัทฉะลาเต้ร้อน Espresso, Matcha, Milk,\nCondense Milk กาแฟ นม นมข้นหวาน\nชาเขียวมัทฉะ และ ฟองนม ฿40
+11-99-01-0008 HOT TAIWANESE TEA\nCAFÉ LATTE กาแฟ\n ชานมไต้หวันร้อน Hot Taiwanese Tea café Latte กาแฟ ชานมไต้หวันร้อน Espresso, Taiwanese Tea,\nMilk, Sugar กาแฟ ชาไต้หวัน \nน้ำตาลและ ฟองนม ฿40
+11-99-01-0009 HOT THAI TEA\nCAFÉ LATTE กาแฟชาไทยร้อน Hot Thai Tea café Latte กาแฟ ชาไทยร้อน Espresso, Thai tea, Milk,\nCondensed milk, Sugar กาแฟ ชาไทย นม นมข้นหวาน\nน้ำตาลและ ฟองนม ฿40
+11-99-01-0010 HOT KOKUTO\nCAFÉ LATTE โคคุโตะลาเต้ร้อน Hot Kokuto café Latte โคคุโตะลาเต้ร้อน Espresso, Milk,\nBlack sugar syrup กาแฟ น้ำเชื่อมน้ำตาลดำ \nและ ฟองนม ฿40
+11-99-01-0011 HOT\nLYCHEE AMERICANO อเมริกาโนลิ้นจี่ร้อน Hot Lychee Americano อเมริกาโนลิ้นจี่ร้อน Espresso, Lychee,\nSugar, Water กาแฟ น้ำ และ ลิ้นจี่ ฿35
+11-99-02-0001 ICED ESPRESSO เอสเพรสโซ่เย็น Iced Espresso เอสเพรสโซ่เย็น Espresso, Condensed milk,\nMilk, Sugar,Ice กาแฟ นม นมข้นหวาน \nและ น้ำแข็ง ฿45
+11-99-02-0002 ICED AMERICANO กาแฟดำเย็น\n(อเมริกาโน) Iced Americano กาแฟดำเย็น (อเมริกาโน) Espresso, Water, Ice กาแฟ น้ำ และ น้ำแข็ง\n(อเมริกาโน) ฿40
+11-99-02-0003 ICED CAFE LATTE ลาเต้เย็น Iced café Latte ลาเต้เย็น Espresso,\nMilk, Sugar, Ice กาแฟ นม ฟองนม น้ำตาลและ น้ำแข็ง ฿45
+11-99-02-0004 ICED CAPPUCCINO คาปูชิโน่เย็น Iced Cappuccino คาปูชิโน่เย็น Espresso,\nMilk, Foamed milk, Ice กาแฟ นม ฟองนม และ น้ำแข็ง ฿45
+11-99-02-0005 ICED MOCHA มอคค่าเย็น 167 Iced Mocha มอคค่าเย็น Espresso, Cocoa,\nMilk, Condense milk, Ice กาแฟ นม ผสมช็อกโกแลต \nฟองนม และ น้ำแข็ง ฿45
+11-99-02-0006 ICED CARAMEL CAFÉ LATTE คาราเมลลาเต้เย็น 172 Iced Caramel café Latte คาราเมลลาเต้เย็น Espresso, Milk,\nCaramel Syrup, Ice กาแฟ นม น้ำเชื่อมคาราเมล \nฟองนม และ น้ำแข็ง ฿45
+11-99-02-0008 ICED TAIWANESE TEA\nCAFÉ LATTE กาแฟ\nชานมไต้หวันเย็น Iced Taiwanese Tea café Latte กาแฟ ชานมไต้หวันเย็น Espresso, Taiwanese Tea,\nMilk, Sugar, Ice กาแฟ ชาไต้หวัน นม และ น้ำแข็ง ฿45
+11-99-02-0007 ICED MATCHA\nCAFÉ LATTE กาแฟ\nมัทฉะลาเต้เย็น 209 Iced Matcha café Latte กาแฟ มัทฉะลาเต้เย็น Espresso, Matcha, Milk,\nCondense Milk, Sugar, Ice กาแฟ ชาเขียวมัทฉะ นม \nนมข้นหวานและ น้ำแข็ง ฿45
+11-99-02-0009 ICED THAI TEA\nCAFÉ LATTE กาแฟชาไทยเย็น Iced Thai Tea café Latte กาแฟชาไทยเย็น Espresso, Thai tea, Milk,\nCondensed milk, Sugar,Ice กาแฟ ชาไทย นม และ น้ำแข็ง ฿45
+11-99-02-0010 ICED KOKUTO\nCAFÉ LATTE กาแฟโคคุโตะ\nลาเต้เย็น Iced Kokuto café Latte กาแฟโคคุโตะลาเต้เย็น Espresso, Milk,\nBlack sugar syrup, Ice กาแฟ นม \nน้ำเชื่อมน้ำตาลดำ และ น้ำแข็ง ฿45
+11-99-02-0011 ICED LYCHEE\nAMERICANO อเมริกาโนลิ้นจี่เย็น Iced Lychee Americano อเมริกาโนลิ้นจี่เย็น Espresso, Lychee,\nWater, Sugar, Ice กาแฟ น้ำเชื่อมลิ้นจี่ น้ำ\nและ น้ำแข็ง ฿40
+11-99-01-0012 HOT\nCARAMEL MILK นมคาราเมลร้อน Hot Caramel milk นมคาราเมลร้อน Milk, Caramel Syrup นม และน้ำเชื่อมคาราเมล ฿40
+11-99-01-0013 HOT COCOA โกโก้ร้อน Hot Cocoa โกโก้ร้อน Milk, Cocoa, Sugar โกโก้ นมและน้ำตาล ฿40
+11-99-01-0014 HOT KOKUTO MILK นมโคคุโตะร้อน Hot Kokuto Milk นมโคคุโตะร้อน Milk, Black sugar syrup นม และ น้ำเชื่อมน้ำตาลดำ ฿40
+11-99-01-0015 HOT\nCARAMEL COCOA คาราเมลโกโก้ร้อน Hot Caramel cocoa คาราเมลโกโก้ร้อน Cocoa, Milk,Sugar,\nCaramel Syrup โกโก้ นม น้ำตาล \nน้ำเชื่อมคาราเมล ฿40
+11-99-01-0016 WARM MILK นมร้อน WARM MILK นมร้อน Milk นม ฿40
+11-99-02-0012 ICED CARAMEL MILK นมคาราเมลเย็น Ice Caramel Milk นมคาราเมลเย็น Milk, Caramel Syrup, Ice นม น้ำเชื่อมคาราเมล และน้ำแข็ง ฿40
+11-99-02-0013 ICED COCOA โกโก้เย็น Ice Cocoa โกโก้เย็น Milk, Cocoa, Sugar, Ice โกโก้ นม และน้ำแข็ง ฿40
+11-99-02-0014 ICED KOKUTO MILK นมโคคุโตะเย็น Ice Kokuto Milk นมโคคุโตะเย็น Milk, Black sugar syrup, Ice นม น้ำเชื่อมน้ำตาลดำ และน้ำแข็ง ฿40
+11-99-02-0015 ICED\nCARAMEL COCOA คาราเมลโกโก้เย็น Ice Caramel Cocoa คาราเมลโกโก้เย็น Cocoa, Milk, Sugar,\nCaramel Syrup โกโก้ นม น้ำตาล \nน้ำเชื่อมคาราเมล และน้ำแข็ง ฿40
+11-99-02-0016 MILK WITH ICED นมเย็น Ice Milk นมเย็น Milk, Ice นม และน้ำแข็ง ฿40
+11-99-03-0002 ICED PINK MILK นมชมพูเย็น Ice (Pink) Milk นมชมพูเย็น Salak Syrup, Milk,\nCondensed milk, Sugar, Ice น้ำแดงกลิ่นสละ นม นมข้น \nน้ำตาลและน้ำแข็ง ฿40
+11-99-01-0017 HOT\nCHRYSANTHS TEA เก็กฮวยร้อน hot chrysanths tea เก็กฮวยร้อน Chrysanthemum,\nSugar,Water น้ำเก๊กฮวย น้ำตาล ฿30
+11-99-01-0018 HOT THAI MILK TEA ชาไทยร้อน Hot thai milk tea ชาไทยร้อน Thai tea, Milk,\nCondensed milk, Sugar ชาไทย นม และนมข้น ฿35
+11-99-01-0019 HOT\nTAIWANESE TEA ชานมไต้หวันร้อน Hot Taiwanese Tea ชานมไต้หวันร้อน Taiwanese Tea, Milk,\nSugar ชาไต้หวัน นม และนมข้น ฿35
+11-99-01-0020 HOT\nMATCHA LATTE มัทฉะลาเต้ร้อน Hot matcha latte มัทฉะลาเต้ร้อน Matcha, Milk,\nCondense Milk ชาเขียวมัทฉะ นม และนมข้น ฿35
+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
+11-99-01-0023 HOT LIME TEA ชามะนาวร้อน Hot Lime tea ชามะนาวร้อน Thai Tea, Limenade,\nSugar, Water ชาดำ มะนาว ฿35
+11-99-01-0024 HOT LYCHEE TEA ชาลิ้นจี่ร้อน Hot Lychee tea ชาลิ้นจี่ร้อน Thai tea, Lychee,\nSugar, Water ชาดำ น้ำเชื่อมลิ้นจี่ ฿35
+11-99-01-0025 HOT\nSTRAWBERRY TEA ชาสตอเบอร์รี่ร้อน Hot strawberry tea ชาสตอเบอร์รี่ร้อน Thai tea,\nStrawberry Syrup, Water ชาดำ น้ำเชื่อมสตรอว์เบอร์รี่ ฿35
+11-99-01-0026 HOT \nBLUEBERRY TEA ชาบลูเบอร์รี่ร้อน Hot blueberry tea ชาบลูเบอร์รี่ร้อน Thai tea,\nBlueberry Syrup, Water ชาดำ น้ำเชื่อมบลูเบอร์รี่ ฿35
+11-99-02-0017 ICED\nCHRYSANTHS TEA เก็กฮวยเย็น Ice Chrysanthemum tea เก็กฮวยเย็น Chrysanthemum, Sugar,\nWater, Ice น้ำเก๊กฮวย ฿40
+11-99-02-0018 ICED\nTHAI MILK TEA ชาไทยเย็น Thai Ice Tea ชาไทยเย็น Thai tea, Milk,\nCondensed milk, Sugar, Ice ชาไทย นม นมข้น และน้ำแข็ง ฿40
+11-99-02-0019 ICED\nTAIWANESE TEA ชานมไต้หวัน Ice Taiwan Milk Tea ชานมไต้หวัน Taiwan Tea,\nMilk, Sugar, Ice ชาไต้หวัน นม และน้ำแข็ง ฿40
+11-99-02-0020 ICED\nMATCHA LATTE มัทฉะลาเต้เย็น Ice Matcha Latte มัทฉะลาเต้เย็น Green Tea, Milk,/nCondense milk, Sugar, Ice ชาเชียว นม และน้ำแข็ง ฿40
+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
+11-99-02-0023 ICED LIME TEA ชามะนาวเย็น Ice Lime Tea ชามะนาวเย็น Tea, Limenade, \nSugar, Water, Ice ชาดำ มะนาว และน้ำแข็ง ฿40
+11-99-02-0024 ICED LYCHEE TEA ชาลิ้นจี่เย็น Ice Lychee Tea ชาลิ้นจี่เย็น Thai tea, Lychee,\nSugar, Water, Ice ชาดำ น้ำเชื่อมลิ้นจี่ และน้ำแข็ง ฿40
+11-99-02-0025 ICED \n STRAWBERRY TEA ชาสตอเบอร์รี่เย็น Ice strawberry Tea ชาสตอเบอร์รี่เย็น Thai tea, Strawberry Syrup,\nWater, Ice ชาดำ น้ำเชื่อมสตรอว์เบอร์รี่ \nและน้ำแข็ง ฿40
+11-99-02-0026 ICED\nBLUEBERRY TEA ชาบลููเบอร์รี่เย็น Ice Blueberry Tea ชาบลูเบอร์รี่เย็น Thai tea, Blueberry Syrup,\nWater, Ice ชาดำ น้ำเชื่อมบลูเบอร์รี่ \nและน้ำแข็ง ฿40
+11-99-01-0027 HOT LIMENADE น้ำมะนาวร้อน Hot Limeade น้ำมะนาวร้อน Limenade, Sugar น้ำมะนาว น้ำตาล ฿25
+11-99-02-0027 ICED LIMENADE น้ำมะนาวเย็น Ice Limeade น้ำมะนาวเย็น Limenade,Sugar, Ice นำมะนาว น้ำตาล น้ำแข็ง ฿25
+11-99-02-0028 ICED SALAK น้ำแดงสละเย็น Ice Sala น้ำแดงเย็น Salak Syrup, Water, Ice น้ำแดงกลิ่นสละ น้ำ และน้ำแข็ง ฿25
+11-99-02-0029 ICED LIME SALAK น้ำแดงสละ\nมะนาวเย็น Ice Limeade Sala น้ำแดงมะนาวเย็น Salak Syrup, Limenade,\nWater, Ice น้ำแดงกลิ่นสละ น้ำมะนาว \nและน้ำแข็ง ฿25
+11-99-02-0030 ICED LYCHEE น้ำลิ้นจี่เย็น Ice Lychee น้ำลิ้นจี่เย็น Lychee, Sugar,\nWater, Ice น้ำเชื่อมลิ้นจี่ น้ำ และน้ำแข็ง ฿25
+11-99-02-0031 ICED\nSTRAWBERRY น้ำสตอเบอร์รี่เย็น Ice Strawberry น้ำสตอเบอร์รี่เย็น Strawberry Syrup,\nWater, Ice น้ำเชื่อมสตรอว์เบอร์รี่ น้ำ \nและน้ำแข็ง ฿25
+11-99-02-0032 ICED\nBLUEBERRY น้ำบลูเบอร์รี่เย็น Ice Blueberry น้ำบลูเบอร์รี่เย็น Blueberry Syrup,\nWater, Ice น้ำเชื่อมบลูเบอร์รี่ น้ำ \n และน้ำแข็ง ฿25
+11-99-02-0033 PEPSI เป็ปซี่น้ำเข็ง Pepsi เป็ปซี่ Pepsi, Ice เป๊ปซี่ และน้ำแข็ง ฿20
+11-99-02-0034 ICED SALAK SODA น้ำแดงสละโซดา Ice Sala Soda น้ำแดงโซดา Salak Syrup, Soda, Ice น้ำแดงกลิ่นสละ โซดา \nและน้ำแข็ง ฿35
+11-99-02-0035 ICED LIME\nSALAK SODA น้ำแดงสละ\nมะนาวโซดา Ice Limenade Sala Soda น้ำแดงมะนาวโซดา Salak Syrup,\nLimenade,Soda, Ice น้ำแดงกลิ่นสละ มะนาว โซดา \nและน้ำแข็ง ฿35
+11-99-02-0036 ICED LIMENADE \nSODA น้ำมะนาวโซดา Ice Limenade Soda น้ำมะนาวโซดา Limenade, Sugar, Soda, Ice มะนาว โซดา และน้ำแข็ง ฿25
+11-99-02-0037 ICED\nLYCHEE SODA น้ำลิ้นจี่โซดา Ice Lychee Soda น้ำลิ้นจี่โซดา Lychee, Sugar, Soda, Ice น้ำเชื่อมลิ้นจี่ โซดา และน้ำแข็ง ฿25
+11-99-02-0038 ICED\nSTRAWBERRY SODA สตอเบอร์รี่โซดา Ice Strawberry Soda สตอเบอร์รี่โซดา Strawberry Syrup, Soda, Ice น้ำเชื่อมสตรอว์เบอร์รี่ โซดา \nและน้ำแข็ง ฿40
+11-99-02-0039 ICED\nBLUEBERRY SODA บลูเบอร์รี่โซดา Ice Blueberry Soda บลูเบอร์รี่โซดา Blueberry Syrup, Soda, Ice น้ำเชื่อมบลูเบอร์รี่ โซดา \nและน้ำแข็ง ฿40
+11-99-02-0040 SODA โซดา Soda Water โซดา Soda โซดา ฿10
+11-99-02-0041 ICE SODA โซดาน้ำแข็ง Ice Soda Water โซดาน้ำแข็ง Soda, Ice โซดา และน้ำแข็ง ฿10
+11-99-01-0042 DRINKING WATER น้ำดื่ม Water น้ำดื่ม Water น้ำ ฿10
+11-99-02-0043 ICE น้ำแข็ง Ice น้ำแข็ง Ice น้ำแข็ง ฿10
+11-99-02-0044 ICED WATER น้ำ+น้ำแข็ง Ice Water น้ำดื่ม Water, Ice น้ำ และน้ำแข็ง ฿10
+11-99-01-0045 HOT WATER น้ำร้อน Hot water น้ำร้อน Water น้ำ ฿10
+11-99-01-0049 COKE โค้ก Coke, Ice โค้ก และน้ำแข็ง
+11-99-01-0050 SPRITE สไปรท์ Sprite, Ice สไปรท์ และน้ำแข็ง
+11-99-01-0051 7UP 7อัพ 7 up 7อัพ 7 up, Ice เซเว่นอัพ และน้ำแข็ง ฿20
+11-99-04-0000 MATCHA SHAKE มัทฉะโปรตีน Matcha shake มัทฉะโปรตีน Whey protein,\nMatcha, Milk and Iced เวย์โปรตีน ชาเชียว นม \nและน้ำแข็ง ฿60
+11-99-04-0001 CHOCOLATE SHAKE โกโก้โปรตีน Chocolate shake โกโก้โปรตีน Whey protein,\nCocoa, Milk and Iced เวย์โปรตีน โกโก้ นม \nและน้ำแข็ง ฿60
+11-99-04-0002 STRAWBERRY SHAKE สตอเบอร์รี่โปรตีน Strawberry shake สตอเบอร์รี่โปรตีน Whey protein,Milk, \nStrawberry Syrup, and Iced เวย์โปรตีน น้ำเชื่อมสตรอว์เบอร์รี่ \nนม และน้ำแข็ง ฿60
+11-99-04-0003 ESPRESSO SHAKE เอสเพรสโซ่โปรตีน Espresso shake เอสเพรสโซ่โปรตีน Whey protein, Espresso\nMilk, Condense Milk, Iced เวย์โปรตีน กาแฟ นม นมข้นหวาน \nและน้ำแข็ง ฿60
+11-99-04-0004 THAI TEA SHAKE ชานมไทยโปรตีน Thai Tea shake ชานมไทยโปรตีน Whey protein,\nThai Tea, Milk and Ice เวย์โปรตีน ชาไทย นม นมข้นหวาน \nและน้ำแข็ง ฿60
+11-99-04-0005 KOKUTO SHAKE โคคุโตะโปรตีน Kokuto shake โคคุโตะโปรตีน Whey protein, Milk,\nBlack sugar syrup, and Ice เวย์โปรตีน นม \nน้ำเชื่อมน้ำตาลดำ และน้ำแข็ง ฿60
+11-99-04-0006 BLUEBERRY SHAKE บลูเบอร์รี่โปรตีน Blueberry shake บลูเบอร์รี่โปรตีน Whey protein,\nBlueberry Syrup, Milk and Ice เวย์โปรตีน นม \nน้ำเชื่อมบลูเบอร์รี่ และน้ำแข็ง ฿60
+11-99-04-0007 TAIWANESE TEA SHAKE ชาไต้หวันโปรตีน Taiwanese Tea shake ชาไต้หวันโปรตีน Whey protein, Milk,\nTaiwanese Tea, Sugar and Ice เวย์โปรตีน นม \nชาไต้หวัน และน้ำแข็ง ฿60
+11-99-04-0008 CARAMEL SHAKE คาราเมลโปรตีน Caramel shake คาราเมลโปรตีน Whey protein, Milk,\nCaramel Syrup and Ice เวย์โปรตีน นม \nน้ำเชื่อมคาราเมล และน้ำแข็ง ฿60
+11-99-04-0009 MILK SHAKE นมโปรตีน Milk shake นมโปรตีน Whey protein, Milk, and Ice เวย์โปรตีน นม และน้ำแข็ง ฿60
+11-99-04-0010 PLAIN PROTEIN โปรตีนเปล่า Plain protein โปรตีนเปล่า Whey protein, Water, and Ice เวย์โปรตีน น้ำ และน้ำแข็ง ฿60
\ No newline at end of file
diff --git a/xml/menu_catalog.xml b/xml/menu_catalog.xml
index 06ccec94..39c8cca9 100644
--- a/xml/menu_catalog.xml
+++ b/xml/menu_catalog.xml
@@ -59,6 +59,8 @@
Else
Var show_eng = "true"
EndIf
+
+
Open CurrentXMLFileName2
@@ -121,15 +123,28 @@
696
395
Menu5Selected
- Var( DirImage + "/bn_fruit.png")
- Var( DirImage + "/bp_fruit.png")
+ Var( DirImage + "/bn_protein.png")
+ Var( DirImage + "/bp_protein.png")
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml"
+ Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
+;
+
diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index 1a067113..f80e10b0 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -119,7 +119,7 @@
- 600
+ 1000
Var Timeout = Timeout + 1
@@ -439,19 +439,35 @@
If StepVideo = 7 Then
Var videoID = VideoID7
EndIf
+ If StepVideo = 8 Then
+ Var videoID = VideoID8
+ EndIf
+ If StepVideo = 9 Then
+ Var videoID = VideoID9
+ EndIf
SAVELOG videoID
If videoID = 0 Then
Else
+ If videoID = "---" Then
- Var VideoPlayFile = VideoPath
- Var VideoPlayFile = VideoPlayFile + VideoFileBegin
- Var VideoPlayFile = VideoPlayFile + videoID
- Var VideoPlayFile = VideoPlayFile + VideoFileEnd
+ Else
- SAVELOG VideoPlayFile
+ Var VideoPlayFile = VideoPath
+ Var VideoPlayFile = VideoPlayFile + VideoFileBegin
+ Var VideoPlayFile = VideoPlayFile + videoID
+ Var VideoPlayFile = VideoPlayFile + VideoFileEnd
+
+ Var PictureFile = PicturePath
+ Var PictureFile = PictureFile + PictureBegin
+ Var PictureFile = PictureFile + videoID
+ Var PictureFile = PictureFile + PictureEnd
+
+ SAVELOG VideoPlayFile
+ SAVELOG PictureFile
+ EndIf
EndIf
EndIf
EndIf
@@ -522,11 +538,18 @@
-;
-; 140
-; 1124
-; "ROOT/taobin_project/image/page_doing/text2.png"
-;
+
+ 60
+ 1290
+ PictureFile
+
+
+
+ 60
+ 1649
+ BottomText
+
+
;
@@ -560,80 +583,80 @@
;
-
- 0
- 1880
- 30
- Center
- 1080
- RobotoBlack
- 0x513C2F
- MachineStage
-
+;
+; 0
+; 1880
+; 30
+; Center
+; 1080
+; KanitThinTTF
+; 0x513C2F
+; MachineStage
+;
-
-
-
- 870
- 1860
- 200
- 50
- "/mnt/sdcard/coffeevending/wav/click.wav"
- SoundVolume
-
- Var countClick2 = countClick2 + 1
- If countClick2 = 3 Then
-
- EndIf
-
- If countClick2 = 5 Then
- Var countClick2 = 0
- Var HaveCup = "true"
- Var MachineStage = "drink-success"
- EndIf
- Refresh
-
-
-
-
- 0
- 1886
- 20
- 1080
- Start
- RobotoBlack
- 0x513C2F
- countClick
-
-
- 0
- 1886
- 20
- 1080
- end
- RobotoBlack
- 0x513C2F
- countClick2
-
+;
+; 870
+; 1860
+; 200
+; 50
+; "/mnt/sdcard/coffeevending/wav/click.wav"
+; SoundVolume
+;
+; Var countClick2 = countClick2 + 1
+; If countClick2 = 3 Then
+;
+; EndIf
+;
+; If countClick2 = 5 Then
+; Var countClick2 = 0
+; Var HaveCup = "true"
+; Var MachineStage = "drink-success"
+; EndIf
+; Refresh
+;
+;
+;
+;
+; 0
+; 1886
+; 20
+; 1080
+; Start
+; KanitThinTTF
+; 0x513C2F
+; countClick
+;
+;
+; 0
+; 1886
+; 20
+; 1080
+; end
+; KanitThinTTF
+; 0x513C2F
+; countClick2
+;
diff --git a/xml/page_catalog.xml b/xml/page_catalog.xml
index 5038693c..2766116d 100644
--- a/xml/page_catalog.xml
+++ b/xml/page_catalog.xml
@@ -181,18 +181,31 @@
; menu row 3
+;
+; 205
+; 1533
+; Var(DirImage + "/bn_fruit.png")
+; Var(DirImage + "/bp_fruit.png")
+; "/mnt/sdcard/coffeevending/wav/click.wav"
+; SoundVolume
+;
+; Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml"
+;
+;
+
205
1533
- Var(DirImage + "/bn_fruit.png")
- Var(DirImage + "/bp_fruit.png")
+ Var(DirImage + "/bn_protein.png")
+ Var(DirImage + "/bp_protein.png")
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml"
+ Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
+
579
1533
diff --git a/xml/page_catalog_choose_drink1.xml b/xml/page_catalog_choose_drink1.xml
index f35fdb38..89c16411 100644
--- a/xml/page_catalog_choose_drink1.xml
+++ b/xml/page_catalog_choose_drink1.xml
@@ -104,6 +104,8 @@
Else
Var show_eng = "true"
EndIf
+
+
Open CurrentXMLFileName2
@@ -166,15 +168,28 @@
696
395
Menu5Selected
- Var( DirImage + "/bn_fruit.png")
- Var( DirImage + "/bp_fruit.png")
+ Var( DirImage + "/bn_protein.png")
+ Var( DirImage + "/bp_protein.png")
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml"
+ Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
+;
+; 696
+; 395
+; Menu5Selected
+; Var( DirImage + "/bn_fruit.png")
+; Var( DirImage + "/bp_fruit.png")
+; "/mnt/sdcard/coffeevending/wav/click.wav"
+; SoundVolume
+;
+; Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml"
+;
+;
+
847
@@ -195,7 +210,7 @@
497
1080
1500
- 1650
+ 1670
"Vertical"
; button i=1 11-99-01-0001
diff --git a/xml/page_catalog_choose_drink2.pml b/xml/page_catalog_choose_drink2.pml
index 497e6f5f..f6fd132c 100644
--- a/xml/page_catalog_choose_drink2.pml
+++ b/xml/page_catalog_choose_drink2.pml
@@ -8,6 +8,7 @@
product_code = []
product_code.append('11-99-01-0001')
+ product_code.append('11-99-01-0101')
product_code.append('11-99-01-0002')
product_code.append('11-99-01-0003')
diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml
index e1d2e34b..91c723a3 100644
--- a/xml/page_catalog_choose_drink2.xml
+++ b/xml/page_catalog_choose_drink2.xml
@@ -105,6 +105,8 @@
Else
Var show_eng = "true"
EndIf
+
+
Open CurrentXMLFileName2
@@ -167,15 +169,28 @@
696
395
Menu5Selected
- Var( DirImage + "/bn_fruit.png")
- Var( DirImage + "/bp_fruit.png")
+ Var( DirImage + "/bn_protein.png")
+ Var( DirImage + "/bp_protein.png")
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml"
+ Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
+;
+; 696
+; 395
+; Menu5Selected
+; Var( DirImage + "/bn_fruit.png")
+; Var( DirImage + "/bp_fruit.png")
+; "/mnt/sdcard/coffeevending/wav/click.wav"
+; SoundVolume
+;
+; Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml"
+;
+;
+
847
@@ -197,7 +212,7 @@
497
1080
1500
- 1650
+ 1670
"Vertical"
; button i=1 11-99-01-0001
@@ -222,10 +237,33 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=2 11-99-01-0002
+ ; button i=2 11-99-01-0101
301
20
+ $11-99-01-0101.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0101.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-01-0101.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-01-0101.image ) "
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SelectDrink = "11-99-01-0101"
+ Var NameDrink = $11-99-01-0101.NameE
+ Var NameDrinkTH = $11-99-01-0101.Name
+ Var DrinkDescriptionTH = $11-99-01-0101.description
+ Var DrinkDescription = $11-99-01-0101.descriptionE
+ Var PriceDrink = $11-99-01-0101.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-01-0101.image
+ Topping "Load" SelectDrink
+ Var PriceShowValue = charOfBaht + PriceDrink
+ Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+
+
+ ; button i=3 11-99-01-0002
+
+ 558
+ 20
$11-99-01-0002.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0002.image )
Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-01-0002.image ) "
@@ -245,9 +283,9 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=3 11-99-01-0003
+ ; button i=4 11-99-01-0003
- 558
+ 815
20
$11-99-01-0003.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0003.image )
@@ -268,10 +306,10 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=4 11-99-01-0004
+ ; button i=5 11-99-01-0004
- 815
- 20
+ 44
+ 348
$11-99-01-0004.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0004.image )
Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-01-0004.image ) "
@@ -291,9 +329,9 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=5 11-99-01-0005
+ ; button i=6 11-99-01-0005
- 44
+ 301
348
$11-99-01-0005.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0005.image )
@@ -314,9 +352,9 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=6 11-99-01-0006
+ ; button i=7 11-99-01-0006
- 301
+ 558
348
$11-99-01-0006.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0006.image )
@@ -337,9 +375,9 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=7 11-99-01-0008
+ ; button i=8 11-99-01-0008
- 558
+ 815
348
$11-99-01-0008.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0008.image )
@@ -360,10 +398,10 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=8 11-99-01-0010
+ ; button i=9 11-99-01-0010
- 815
- 348
+ 44
+ 676
$11-99-01-0010.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0010.image )
Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-01-0010.image ) "
@@ -383,9 +421,9 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=9 11-99-01-0011
+ ; button i=10 11-99-01-0011
- 44
+ 301
676
$11-99-01-0011.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0011.image )
@@ -406,9 +444,9 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=10 11-99-02-0001
+ ; button i=11 11-99-02-0001
- 301
+ 558
676
$11-99-02-0001.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0001.image )
@@ -429,9 +467,9 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=11 11-99-02-0002
+ ; button i=12 11-99-02-0002
- 558
+ 815
676
$11-99-02-0002.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0002.image )
@@ -452,10 +490,10 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=12 11-99-02-0003
+ ; button i=13 11-99-02-0003
- 815
- 676
+ 44
+ 1004
$11-99-02-0003.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0003.image )
Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0003.image ) "
@@ -475,9 +513,9 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=13 11-99-02-0004
+ ; button i=14 11-99-02-0004
- 44
+ 301
1004
$11-99-02-0004.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0004.image )
@@ -498,9 +536,9 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=14 11-99-02-0005
+ ; button i=15 11-99-02-0005
- 301
+ 558
1004
$11-99-02-0005.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0005.image )
@@ -521,9 +559,9 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=15 11-99-02-0006
+ ; button i=16 11-99-02-0006
- 558
+ 815
1004
$11-99-02-0006.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0006.image )
@@ -544,10 +582,10 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=16 11-99-02-0007
+ ; button i=17 11-99-02-0007
- 815
- 1004
+ 44
+ 1332
$11-99-02-0007.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0007.image )
Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0007.image ) "
@@ -567,9 +605,9 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=17 11-99-02-0009
+ ; button i=18 11-99-02-0009
- 44
+ 301
1332
$11-99-02-0009.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0009.image )
@@ -590,9 +628,9 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=18 11-99-02-0011
+ ; button i=19 11-99-02-0011
- 301
+ 558
1332
$11-99-02-0011.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0011.image )
@@ -682,7 +720,7 @@
27
KanitTTF
0xB78F24
- $11-99-01-0002.Price
+ $11-99-01-0101.Price
465
@@ -702,10 +740,71 @@
KanitMediumTTF
0x322B26
showthaiText
+ $11-99-01-0101.Name
+
+
+ 317
+ 266
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-01-0101.description
+
+
+ 317
+ 210
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-01-0101.NameE
+
+
+ 317
+ 266
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-01-0101.descriptionE
+
+
+ 740
+ 32
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-01-0002.Price
+
+
+ 722
+ 32
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 574
+ 210
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
$11-99-01-0002.Name
- 317
+ 574
266
14
220
@@ -715,7 +814,7 @@
$11-99-01-0002.description
- 317
+ 574
210
22
220
@@ -726,7 +825,7 @@
$11-99-01-0002.NameE
- 317
+ 574
266
14
220
@@ -736,7 +835,7 @@
$11-99-01-0002.descriptionE
- 740
+ 997
32
"Hurr"
150
@@ -746,7 +845,7 @@
$11-99-01-0003.Price
- 722
+ 979
32
20
27
@@ -755,7 +854,7 @@
"฿""
- 574
+ 831
210
24
220
@@ -766,7 +865,7 @@
$11-99-01-0003.Name
- 574
+ 831
266
14
220
@@ -776,7 +875,7 @@
$11-99-01-0003.description
- 574
+ 831
210
22
220
@@ -787,7 +886,7 @@
$11-99-01-0003.NameE
- 574
+ 831
266
14
220
@@ -797,67 +896,6 @@
$11-99-01-0003.descriptionE
- 997
- 32
- "Hurr"
- 150
- 27
- KanitTTF
- 0xB78F24
- $11-99-01-0004.Price
-
-
- 979
- 32
- 20
- 27
- KanitTTF
- 0xB78F24
- "฿""
-
-
- 831
- 210
- 24
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showthaiText
- $11-99-01-0004.Name
-
-
- 831
- 266
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showthaiText
- $11-99-01-0004.description
-
-
- 831
- 210
- 22
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showengText
- $11-99-01-0004.NameE
-
-
- 831
- 266
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showengText
- $11-99-01-0004.descriptionE
-
-
226
360
"Hurr"
@@ -865,7 +903,7 @@
27
KanitTTF
0xB78F24
- $11-99-01-0005.Price
+ $11-99-01-0004.Price
208
@@ -885,10 +923,71 @@
KanitMediumTTF
0x322B26
showthaiText
+ $11-99-01-0004.Name
+
+
+ 60
+ 594
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-01-0004.description
+
+
+ 60
+ 538
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-01-0004.NameE
+
+
+ 60
+ 594
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-01-0004.descriptionE
+
+
+ 483
+ 360
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-01-0005.Price
+
+
+ 465
+ 360
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 317
+ 538
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
$11-99-01-0005.Name
- 60
+ 317
594
14
220
@@ -898,7 +997,7 @@
$11-99-01-0005.description
- 60
+ 317
538
22
220
@@ -909,7 +1008,7 @@
$11-99-01-0005.NameE
- 60
+ 317
594
14
220
@@ -919,7 +1018,7 @@
$11-99-01-0005.descriptionE
- 483
+ 740
360
"Hurr"
150
@@ -929,7 +1028,7 @@
$11-99-01-0006.Price
- 465
+ 722
360
20
27
@@ -938,7 +1037,7 @@
"฿""
- 317
+ 574
538
24
220
@@ -949,7 +1048,7 @@
$11-99-01-0006.Name
- 317
+ 574
594
14
220
@@ -959,7 +1058,7 @@
$11-99-01-0006.description
- 317
+ 574
538
22
220
@@ -970,7 +1069,7 @@
$11-99-01-0006.NameE
- 317
+ 574
594
14
220
@@ -980,7 +1079,7 @@
$11-99-01-0006.descriptionE
- 740
+ 997
360
"Hurr"
150
@@ -990,7 +1089,7 @@
$11-99-01-0008.Price
- 722
+ 979
360
20
27
@@ -999,7 +1098,7 @@
"฿""
- 574
+ 831
538
24
220
@@ -1010,7 +1109,7 @@
$11-99-01-0008.Name
- 574
+ 831
594
14
220
@@ -1020,7 +1119,7 @@
$11-99-01-0008.description
- 574
+ 831
538
22
220
@@ -1031,7 +1130,7 @@
$11-99-01-0008.NameE
- 574
+ 831
594
14
220
@@ -1041,67 +1140,6 @@
$11-99-01-0008.descriptionE
- 997
- 360
- "Hurr"
- 150
- 27
- KanitTTF
- 0xB78F24
- $11-99-01-0010.Price
-
-
- 979
- 360
- 20
- 27
- KanitTTF
- 0xB78F24
- "฿""
-
-
- 831
- 538
- 24
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showthaiText
- $11-99-01-0010.Name
-
-
- 831
- 594
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showthaiText
- $11-99-01-0010.description
-
-
- 831
- 538
- 22
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showengText
- $11-99-01-0010.NameE
-
-
- 831
- 594
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showengText
- $11-99-01-0010.descriptionE
-
-
226
688
"Hurr"
@@ -1109,7 +1147,7 @@
27
KanitTTF
0xB78F24
- $11-99-01-0011.Price
+ $11-99-01-0010.Price
208
@@ -1129,10 +1167,71 @@
KanitMediumTTF
0x322B26
showthaiText
+ $11-99-01-0010.Name
+
+
+ 60
+ 922
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-01-0010.description
+
+
+ 60
+ 866
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-01-0010.NameE
+
+
+ 60
+ 922
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-01-0010.descriptionE
+
+
+ 483
+ 688
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-01-0011.Price
+
+
+ 465
+ 688
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 317
+ 866
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
$11-99-01-0011.Name
- 60
+ 317
922
14
220
@@ -1142,7 +1241,7 @@
$11-99-01-0011.description
- 60
+ 317
866
22
220
@@ -1153,7 +1252,7 @@
$11-99-01-0011.NameE
- 60
+ 317
922
14
220
@@ -1163,7 +1262,7 @@
$11-99-01-0011.descriptionE
- 483
+ 740
688
"Hurr"
150
@@ -1173,7 +1272,7 @@
$11-99-02-0001.Price
- 465
+ 722
688
20
27
@@ -1182,7 +1281,7 @@
"฿""
- 317
+ 574
866
24
220
@@ -1193,7 +1292,7 @@
$11-99-02-0001.Name
- 317
+ 574
922
14
220
@@ -1203,7 +1302,7 @@
$11-99-02-0001.description
- 317
+ 574
866
22
220
@@ -1214,7 +1313,7 @@
$11-99-02-0001.NameE
- 317
+ 574
922
14
220
@@ -1224,7 +1323,7 @@
$11-99-02-0001.descriptionE
- 740
+ 997
688
"Hurr"
150
@@ -1234,7 +1333,7 @@
$11-99-02-0002.Price
- 722
+ 979
688
20
27
@@ -1243,7 +1342,7 @@
"฿""
- 574
+ 831
866
24
220
@@ -1254,7 +1353,7 @@
$11-99-02-0002.Name
- 574
+ 831
922
14
220
@@ -1264,7 +1363,7 @@
$11-99-02-0002.description
- 574
+ 831
866
22
220
@@ -1275,7 +1374,7 @@
$11-99-02-0002.NameE
- 574
+ 831
922
14
220
@@ -1285,67 +1384,6 @@
$11-99-02-0002.descriptionE
- 997
- 688
- "Hurr"
- 150
- 27
- KanitTTF
- 0xB78F24
- $11-99-02-0003.Price
-
-
- 979
- 688
- 20
- 27
- KanitTTF
- 0xB78F24
- "฿""
-
-
- 831
- 866
- 24
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showthaiText
- $11-99-02-0003.Name
-
-
- 831
- 922
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showthaiText
- $11-99-02-0003.description
-
-
- 831
- 866
- 22
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showengText
- $11-99-02-0003.NameE
-
-
- 831
- 922
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showengText
- $11-99-02-0003.descriptionE
-
-
226
1016
"Hurr"
@@ -1353,7 +1391,7 @@
27
KanitTTF
0xB78F24
- $11-99-02-0004.Price
+ $11-99-02-0003.Price
208
@@ -1373,7 +1411,7 @@
KanitMediumTTF
0x322B26
showthaiText
- $11-99-02-0004.Name
+ $11-99-02-0003.Name
60
@@ -1383,7 +1421,7 @@
KanitMediumTTF
0x6F5F51
showthaiText
- $11-99-02-0004.description
+ $11-99-02-0003.description
60
@@ -1394,7 +1432,7 @@
KanitMediumTTF
0x322B26
showengText
- $11-99-02-0004.NameE
+ $11-99-02-0003.NameE
60
@@ -1404,7 +1442,7 @@
KanitMediumTTF
0x6F5F51
showengText
- $11-99-02-0004.descriptionE
+ $11-99-02-0003.descriptionE
483
@@ -1414,7 +1452,7 @@
27
KanitTTF
0xB78F24
- $11-99-02-0005.Price
+ $11-99-02-0004.Price
465
@@ -1434,7 +1472,7 @@
KanitMediumTTF
0x322B26
showthaiText
- $11-99-02-0005.Name
+ $11-99-02-0004.Name
317
@@ -1444,7 +1482,7 @@
KanitMediumTTF
0x6F5F51
showthaiText
- $11-99-02-0005.description
+ $11-99-02-0004.description
317
@@ -1455,7 +1493,7 @@
KanitMediumTTF
0x322B26
showengText
- $11-99-02-0005.NameE
+ $11-99-02-0004.NameE
317
@@ -1465,7 +1503,7 @@
KanitMediumTTF
0x6F5F51
showengText
- $11-99-02-0005.descriptionE
+ $11-99-02-0004.descriptionE
740
@@ -1475,7 +1513,7 @@
27
KanitTTF
0xB78F24
- $11-99-02-0006.Price
+ $11-99-02-0005.Price
722
@@ -1495,7 +1533,7 @@
KanitMediumTTF
0x322B26
showthaiText
- $11-99-02-0006.Name
+ $11-99-02-0005.Name
574
@@ -1505,7 +1543,7 @@
KanitMediumTTF
0x6F5F51
showthaiText
- $11-99-02-0006.description
+ $11-99-02-0005.description
574
@@ -1516,7 +1554,7 @@
KanitMediumTTF
0x322B26
showengText
- $11-99-02-0006.NameE
+ $11-99-02-0005.NameE
574
@@ -1526,7 +1564,7 @@
KanitMediumTTF
0x6F5F51
showengText
- $11-99-02-0006.descriptionE
+ $11-99-02-0005.descriptionE
997
@@ -1536,7 +1574,7 @@
27
KanitTTF
0xB78F24
- $11-99-02-0007.Price
+ $11-99-02-0006.Price
979
@@ -1556,7 +1594,7 @@
KanitMediumTTF
0x322B26
showthaiText
- $11-99-02-0007.Name
+ $11-99-02-0006.Name
831
@@ -1566,7 +1604,7 @@
KanitMediumTTF
0x6F5F51
showthaiText
- $11-99-02-0007.description
+ $11-99-02-0006.description
831
@@ -1577,7 +1615,7 @@
KanitMediumTTF
0x322B26
showengText
- $11-99-02-0007.NameE
+ $11-99-02-0006.NameE
831
@@ -1587,7 +1625,7 @@
KanitMediumTTF
0x6F5F51
showengText
- $11-99-02-0007.descriptionE
+ $11-99-02-0006.descriptionE
226
@@ -1597,7 +1635,7 @@
27
KanitTTF
0xB78F24
- $11-99-02-0009.Price
+ $11-99-02-0007.Price
208
@@ -1617,7 +1655,7 @@
KanitMediumTTF
0x322B26
showthaiText
- $11-99-02-0009.Name
+ $11-99-02-0007.Name
60
@@ -1627,7 +1665,7 @@
KanitMediumTTF
0x6F5F51
showthaiText
- $11-99-02-0009.description
+ $11-99-02-0007.description
60
@@ -1638,7 +1676,7 @@
KanitMediumTTF
0x322B26
showengText
- $11-99-02-0009.NameE
+ $11-99-02-0007.NameE
60
@@ -1648,7 +1686,7 @@
KanitMediumTTF
0x6F5F51
showengText
- $11-99-02-0009.descriptionE
+ $11-99-02-0007.descriptionE
483
@@ -1658,7 +1696,7 @@
27
KanitTTF
0xB78F24
- $11-99-02-0011.Price
+ $11-99-02-0009.Price
465
@@ -1678,7 +1716,7 @@
KanitMediumTTF
0x322B26
showthaiText
- $11-99-02-0011.Name
+ $11-99-02-0009.Name
317
@@ -1688,7 +1726,7 @@
KanitMediumTTF
0x6F5F51
showthaiText
- $11-99-02-0011.description
+ $11-99-02-0009.description
317
@@ -1699,7 +1737,7 @@
KanitMediumTTF
0x322B26
showengText
- $11-99-02-0011.NameE
+ $11-99-02-0009.NameE
317
@@ -1709,6 +1747,67 @@
KanitMediumTTF
0x6F5F51
showengText
+ $11-99-02-0009.descriptionE
+
+
+ 740
+ 1344
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-02-0011.Price
+
+
+ 722
+ 1344
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 574
+ 1522
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $11-99-02-0011.Name
+
+
+ 574
+ 1578
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-02-0011.description
+
+
+ 574
+ 1522
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-02-0011.NameE
+
+
+ 574
+ 1578
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
$11-99-02-0011.descriptionE
diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml
index 95348937..8e2510ed 100644
--- a/xml/page_catalog_choose_drink3.xml
+++ b/xml/page_catalog_choose_drink3.xml
@@ -102,6 +102,8 @@
Else
Var show_eng = "true"
EndIf
+
+
Open CurrentXMLFileName2
@@ -164,15 +166,28 @@
696
395
Menu5Selected
- Var( DirImage + "/bn_fruit.png")
- Var( DirImage + "/bp_fruit.png")
+ Var( DirImage + "/bn_protein.png")
+ Var( DirImage + "/bp_protein.png")
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml"
+ Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
+;
+; 696
+; 395
+; Menu5Selected
+; Var( DirImage + "/bn_fruit.png")
+; Var( DirImage + "/bp_fruit.png")
+; "/mnt/sdcard/coffeevending/wav/click.wav"
+; SoundVolume
+;
+; Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml"
+;
+;
+
847
@@ -194,7 +209,7 @@
497
1080
1500
- 1650
+ 1670
"Vertical"
; button i=1 11-99-01-0017
diff --git a/xml/page_catalog_choose_drink4.xml b/xml/page_catalog_choose_drink4.xml
index 7be63b45..342f3cc5 100644
--- a/xml/page_catalog_choose_drink4.xml
+++ b/xml/page_catalog_choose_drink4.xml
@@ -102,6 +102,8 @@
Else
Var show_eng = "true"
EndIf
+
+
Open CurrentXMLFileName2
@@ -164,15 +166,28 @@
696
395
Menu5Selected
- Var( DirImage + "/bn_fruit.png")
- Var( DirImage + "/bp_fruit.png")
+ Var( DirImage + "/bn_protein.png")
+ Var( DirImage + "/bp_protein.png")
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml"
+ Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
+;
+; 696
+; 395
+; Menu5Selected
+; Var( DirImage + "/bn_fruit.png")
+; Var( DirImage + "/bp_fruit.png")
+; "/mnt/sdcard/coffeevending/wav/click.wav"
+; SoundVolume
+;
+; Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml"
+;
+;
+
847
diff --git a/xml/page_catalog_choose_drink5.xml b/xml/page_catalog_choose_drink5.xml
index d186ebaa..37cace31 100644
--- a/xml/page_catalog_choose_drink5.xml
+++ b/xml/page_catalog_choose_drink5.xml
@@ -103,6 +103,8 @@
Else
Var show_eng = "true"
EndIf
+
+
Open CurrentXMLFileName2
@@ -165,15 +167,28 @@
696
395
Menu5Selected
- Var( DirImage + "/bn_fruit.png")
- Var( DirImage + "/bp_fruit.png")
+ Var( DirImage + "/bn_protein.png")
+ Var( DirImage + "/bp_protein.png")
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml"
+ Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
+;
+; 696
+; 395
+; Menu5Selected
+; Var( DirImage + "/bn_fruit.png")
+; Var( DirImage + "/bp_fruit.png")
+; "/mnt/sdcard/coffeevending/wav/click.wav"
+; SoundVolume
+;
+; Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml"
+;
+;
+
847
diff --git a/xml/page_catalog_choose_drink6.pml b/xml/page_catalog_choose_drink6.pml
index f9f97068..edd868af 100644
--- a/xml/page_catalog_choose_drink6.pml
+++ b/xml/page_catalog_choose_drink6.pml
@@ -8,6 +8,8 @@
product_code = []
product_code.append('11-99-02-0033')
product_code.append('11-99-02-0051')
+ #product_code.append('11-99-02-0045')
+ #product_code.append('11-99-02-0046')
product_code.append('11-99-02-0036')
product_code.append('11-99-02-0037')
@@ -19,10 +21,20 @@
product_code.append('11-99-02-0040')
product_code.append('11-99-02-0041')
- product_code.append('11-99-02-0042')
+
+ product_code.append('11-99-01-0027')
+ product_code.append('11-99-02-0027')
+ product_code.append('11-99-02-0030')
+ product_code.append('11-99-02-0031')
+
+ product_code.append('11-99-02-0032')
+ product_code.append('11-99-02-0028')
+ product_code.append('11-99-02-0029')
+ product_code.append('11-99-01-0042')
product_code.append('11-99-02-0043')
product_code.append('11-99-02-0044')
- product_code.append('11-99-02-0045')
+
+ product_code.append('11-99-01-0045')
menu_count = len( product_code)
diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml
index aee64b8c..04f57a55 100644
--- a/xml/page_catalog_choose_drink6.xml
+++ b/xml/page_catalog_choose_drink6.xml
@@ -102,6 +102,8 @@
Else
Var show_eng = "true"
EndIf
+
+
Open CurrentXMLFileName2
@@ -164,15 +166,28 @@
696
395
Menu5Selected
- Var( DirImage + "/bn_fruit.png")
- Var( DirImage + "/bp_fruit.png")
+ Var( DirImage + "/bn_protein.png")
+ Var( DirImage + "/bp_protein.png")
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml"
+ Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
+;
+; 696
+; 395
+; Menu5Selected
+; Var( DirImage + "/bn_fruit.png")
+; Var( DirImage + "/bp_fruit.png")
+; "/mnt/sdcard/coffeevending/wav/click.wav"
+; SoundVolume
+;
+; Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml"
+;
+;
+
847
@@ -197,7 +212,7 @@
497
1080
1500
- 1400
+ 1670
"Vertical"
; button i=1 11-99-02-0033
@@ -429,33 +444,194 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=11 11-99-02-0042
+ ; button i=11 11-99-01-0027
558
676
- $11-99-02-0042.Button
- Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0042.image )
- Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0042.image ) "
- Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-02-0042.image ) "
+ $11-99-01-0027.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0027.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-01-0027.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-01-0027.image ) "
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var SelectDrink = "11-99-02-0042"
- Var NameDrink = $11-99-02-0042.NameE
- Var NameDrinkTH = $11-99-02-0042.Name
- Var DrinkDescriptionTH = $11-99-02-0042.description
- Var DrinkDescription = $11-99-02-0042.descriptionE
- Var PriceDrink = $11-99-02-0042.Price
- Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-02-0042.image
+ Var SelectDrink = "11-99-01-0027"
+ Var NameDrink = $11-99-01-0027.NameE
+ Var NameDrinkTH = $11-99-01-0027.Name
+ Var DrinkDescriptionTH = $11-99-01-0027.description
+ Var DrinkDescription = $11-99-01-0027.descriptionE
+ Var PriceDrink = $11-99-01-0027.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-01-0027.image
Topping "Load" SelectDrink
Var PriceShowValue = charOfBaht + PriceDrink
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=12 11-99-02-0043
+ ; button i=12 11-99-02-0027
815
676
+ $11-99-02-0027.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0027.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0027.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-02-0027.image ) "
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SelectDrink = "11-99-02-0027"
+ Var NameDrink = $11-99-02-0027.NameE
+ Var NameDrinkTH = $11-99-02-0027.Name
+ Var DrinkDescriptionTH = $11-99-02-0027.description
+ Var DrinkDescription = $11-99-02-0027.descriptionE
+ Var PriceDrink = $11-99-02-0027.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-02-0027.image
+ Topping "Load" SelectDrink
+ Var PriceShowValue = charOfBaht + PriceDrink
+ Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+
+
+ ; button i=13 11-99-02-0030
+
+ 44
+ 1004
+ $11-99-02-0030.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0030.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0030.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-02-0030.image ) "
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SelectDrink = "11-99-02-0030"
+ Var NameDrink = $11-99-02-0030.NameE
+ Var NameDrinkTH = $11-99-02-0030.Name
+ Var DrinkDescriptionTH = $11-99-02-0030.description
+ Var DrinkDescription = $11-99-02-0030.descriptionE
+ Var PriceDrink = $11-99-02-0030.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-02-0030.image
+ Topping "Load" SelectDrink
+ Var PriceShowValue = charOfBaht + PriceDrink
+ Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+
+
+ ; button i=14 11-99-02-0031
+
+ 301
+ 1004
+ $11-99-02-0031.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0031.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0031.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-02-0031.image ) "
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SelectDrink = "11-99-02-0031"
+ Var NameDrink = $11-99-02-0031.NameE
+ Var NameDrinkTH = $11-99-02-0031.Name
+ Var DrinkDescriptionTH = $11-99-02-0031.description
+ Var DrinkDescription = $11-99-02-0031.descriptionE
+ Var PriceDrink = $11-99-02-0031.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-02-0031.image
+ Topping "Load" SelectDrink
+ Var PriceShowValue = charOfBaht + PriceDrink
+ Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+
+
+ ; button i=15 11-99-02-0032
+
+ 558
+ 1004
+ $11-99-02-0032.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0032.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0032.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-02-0032.image ) "
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SelectDrink = "11-99-02-0032"
+ Var NameDrink = $11-99-02-0032.NameE
+ Var NameDrinkTH = $11-99-02-0032.Name
+ Var DrinkDescriptionTH = $11-99-02-0032.description
+ Var DrinkDescription = $11-99-02-0032.descriptionE
+ Var PriceDrink = $11-99-02-0032.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-02-0032.image
+ Topping "Load" SelectDrink
+ Var PriceShowValue = charOfBaht + PriceDrink
+ Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+
+
+ ; button i=16 11-99-02-0028
+
+ 815
+ 1004
+ $11-99-02-0028.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0028.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0028.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-02-0028.image ) "
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SelectDrink = "11-99-02-0028"
+ Var NameDrink = $11-99-02-0028.NameE
+ Var NameDrinkTH = $11-99-02-0028.Name
+ Var DrinkDescriptionTH = $11-99-02-0028.description
+ Var DrinkDescription = $11-99-02-0028.descriptionE
+ Var PriceDrink = $11-99-02-0028.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-02-0028.image
+ Topping "Load" SelectDrink
+ Var PriceShowValue = charOfBaht + PriceDrink
+ Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+
+
+ ; button i=17 11-99-02-0029
+
+ 44
+ 1332
+ $11-99-02-0029.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0029.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0029.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-02-0029.image ) "
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SelectDrink = "11-99-02-0029"
+ Var NameDrink = $11-99-02-0029.NameE
+ Var NameDrinkTH = $11-99-02-0029.Name
+ Var DrinkDescriptionTH = $11-99-02-0029.description
+ Var DrinkDescription = $11-99-02-0029.descriptionE
+ Var PriceDrink = $11-99-02-0029.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-02-0029.image
+ Topping "Load" SelectDrink
+ Var PriceShowValue = charOfBaht + PriceDrink
+ Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+
+
+ ; button i=18 11-99-01-0042
+
+ 301
+ 1332
+ $11-99-01-0042.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0042.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-01-0042.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-01-0042.image ) "
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SelectDrink = "11-99-01-0042"
+ Var NameDrink = $11-99-01-0042.NameE
+ Var NameDrinkTH = $11-99-01-0042.Name
+ Var DrinkDescriptionTH = $11-99-01-0042.description
+ Var DrinkDescription = $11-99-01-0042.descriptionE
+ Var PriceDrink = $11-99-01-0042.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-01-0042.image
+ Topping "Load" SelectDrink
+ Var PriceShowValue = charOfBaht + PriceDrink
+ Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+
+
+ ; button i=19 11-99-02-0043
+
+ 558
+ 1332
$11-99-02-0043.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0043.image )
Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0043.image ) "
@@ -475,10 +651,10 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=13 11-99-02-0044
+ ; button i=20 11-99-02-0044
- 44
- 1004
+ 815
+ 1332
$11-99-02-0044.Button
Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0044.image )
Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0044.image ) "
@@ -498,24 +674,24 @@
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
- ; button i=14 11-99-02-0045
+ ; button i=21 11-99-01-0045
- 301
- 1004
- $11-99-02-0045.Button
- Var( "ROOT/taobin_project/image/page_drink/" + $11-99-02-0045.image )
- Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-02-0045.image ) "
- Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-02-0045.image ) "
+ 44
+ 1660
+ $11-99-01-0045.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-01-0045.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-01-0045.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-01-0045.image ) "
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var SelectDrink = "11-99-02-0045"
- Var NameDrink = $11-99-02-0045.NameE
- Var NameDrinkTH = $11-99-02-0045.Name
- Var DrinkDescriptionTH = $11-99-02-0045.description
- Var DrinkDescription = $11-99-02-0045.descriptionE
- Var PriceDrink = $11-99-02-0045.Price
- Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-02-0045.image
+ Var SelectDrink = "11-99-01-0045"
+ Var NameDrink = $11-99-01-0045.NameE
+ Var NameDrinkTH = $11-99-01-0045.Name
+ Var DrinkDescriptionTH = $11-99-01-0045.description
+ Var DrinkDescription = $11-99-01-0045.descriptionE
+ Var PriceDrink = $11-99-01-0045.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-01-0045.image
Topping "Load" SelectDrink
Var PriceShowValue = charOfBaht + PriceDrink
Open "ROOT/taobin_project/xml/page_topping_alter.xml"
@@ -1139,7 +1315,7 @@
27
KanitTTF
0xB78F24
- $11-99-02-0042.Price
+ $11-99-01-0027.Price
722
@@ -1159,7 +1335,7 @@
KanitMediumTTF
0x322B26
showthaiText
- $11-99-02-0042.Name
+ $11-99-01-0027.Name
574
@@ -1169,7 +1345,7 @@
KanitMediumTTF
0x6F5F51
showthaiText
- $11-99-02-0042.description
+ $11-99-01-0027.description
574
@@ -1180,7 +1356,7 @@
KanitMediumTTF
0x322B26
showengText
- $11-99-02-0042.NameE
+ $11-99-01-0027.NameE
574
@@ -1190,7 +1366,7 @@
KanitMediumTTF
0x6F5F51
showengText
- $11-99-02-0042.descriptionE
+ $11-99-01-0027.descriptionE
997
@@ -1200,7 +1376,7 @@
27
KanitTTF
0xB78F24
- $11-99-02-0043.Price
+ $11-99-02-0027.Price
979
@@ -1220,7 +1396,7 @@
KanitMediumTTF
0x322B26
showthaiText
- $11-99-02-0043.Name
+ $11-99-02-0027.Name
831
@@ -1230,7 +1406,7 @@
KanitMediumTTF
0x6F5F51
showthaiText
- $11-99-02-0043.description
+ $11-99-02-0027.description
831
@@ -1241,7 +1417,7 @@
KanitMediumTTF
0x322B26
showengText
- $11-99-02-0043.NameE
+ $11-99-02-0027.NameE
831
@@ -1251,7 +1427,7 @@
KanitMediumTTF
0x6F5F51
showengText
- $11-99-02-0043.descriptionE
+ $11-99-02-0027.descriptionE
226
@@ -1261,7 +1437,7 @@
27
KanitTTF
0xB78F24
- $11-99-02-0044.Price
+ $11-99-02-0030.Price
208
@@ -1281,7 +1457,7 @@
KanitMediumTTF
0x322B26
showthaiText
- $11-99-02-0044.Name
+ $11-99-02-0030.Name
60
@@ -1291,7 +1467,7 @@
KanitMediumTTF
0x6F5F51
showthaiText
- $11-99-02-0044.description
+ $11-99-02-0030.description
60
@@ -1302,7 +1478,7 @@
KanitMediumTTF
0x322B26
showengText
- $11-99-02-0044.NameE
+ $11-99-02-0030.NameE
60
@@ -1312,7 +1488,7 @@
KanitMediumTTF
0x6F5F51
showengText
- $11-99-02-0044.descriptionE
+ $11-99-02-0030.descriptionE
483
@@ -1322,7 +1498,7 @@
27
KanitTTF
0xB78F24
- $11-99-02-0045.Price
+ $11-99-02-0031.Price
465
@@ -1342,7 +1518,7 @@
KanitMediumTTF
0x322B26
showthaiText
- $11-99-02-0045.Name
+ $11-99-02-0031.Name
317
@@ -1352,7 +1528,7 @@
KanitMediumTTF
0x6F5F51
showthaiText
- $11-99-02-0045.description
+ $11-99-02-0031.description
317
@@ -1363,7 +1539,7 @@
KanitMediumTTF
0x322B26
showengText
- $11-99-02-0045.NameE
+ $11-99-02-0031.NameE
317
@@ -1373,7 +1549,434 @@
KanitMediumTTF
0x6F5F51
showengText
- $11-99-02-0045.descriptionE
+ $11-99-02-0031.descriptionE
+
+
+ 740
+ 1016
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-02-0032.Price
+
+
+ 722
+ 1016
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 574
+ 1194
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $11-99-02-0032.Name
+
+
+ 574
+ 1250
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-02-0032.description
+
+
+ 574
+ 1194
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-02-0032.NameE
+
+
+ 574
+ 1250
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-02-0032.descriptionE
+
+
+ 997
+ 1016
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-02-0028.Price
+
+
+ 979
+ 1016
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 831
+ 1194
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $11-99-02-0028.Name
+
+
+ 831
+ 1250
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-02-0028.description
+
+
+ 831
+ 1194
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-02-0028.NameE
+
+
+ 831
+ 1250
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-02-0028.descriptionE
+
+
+ 226
+ 1344
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-02-0029.Price
+
+
+ 208
+ 1344
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 60
+ 1522
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $11-99-02-0029.Name
+
+
+ 60
+ 1578
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-02-0029.description
+
+
+ 60
+ 1522
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-02-0029.NameE
+
+
+ 60
+ 1578
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-02-0029.descriptionE
+
+
+ 483
+ 1344
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-01-0042.Price
+
+
+ 465
+ 1344
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 317
+ 1522
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $11-99-01-0042.Name
+
+
+ 317
+ 1578
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-01-0042.description
+
+
+ 317
+ 1522
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-01-0042.NameE
+
+
+ 317
+ 1578
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-01-0042.descriptionE
+
+
+ 740
+ 1344
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-02-0043.Price
+
+
+ 722
+ 1344
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 574
+ 1522
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $11-99-02-0043.Name
+
+
+ 574
+ 1578
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-02-0043.description
+
+
+ 574
+ 1522
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-02-0043.NameE
+
+
+ 574
+ 1578
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-02-0043.descriptionE
+
+
+ 997
+ 1344
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-02-0044.Price
+
+
+ 979
+ 1344
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 831
+ 1522
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $11-99-02-0044.Name
+
+
+ 831
+ 1578
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-02-0044.description
+
+
+ 831
+ 1522
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-02-0044.NameE
+
+
+ 831
+ 1578
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-02-0044.descriptionE
+
+
+ 226
+ 1672
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-01-0045.Price
+
+
+ 208
+ 1672
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 60
+ 1850
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $11-99-01-0045.Name
+
+
+ 60
+ 1906
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-01-0045.description
+
+
+ 60
+ 1850
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-01-0045.NameE
+
+
+ 60
+ 1906
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-01-0045.descriptionE
diff --git a/xml/page_catalog_choose_drink7.pml b/xml/page_catalog_choose_drink7.pml
new file mode 100644
index 00000000..012144b8
--- /dev/null
+++ b/xml/page_catalog_choose_drink7.pml
@@ -0,0 +1,80 @@
+
+
+
+
+ "Enable"
+ 1080
+ 1920
+ "0xeae6e1"
+ SoundVolume
+ "ROOT/sounds/selectDrink.wav"
+
+ ; 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 = "Enable"
+ Var Menu2Selected = "Enable"
+ Var Menu3Selected = "Enable"
+ Var Menu4Selected = "Enable"
+ Var Menu5Selected = "PressForever"
+ Var Menu6Selected = "Enable"
+
+ 60000
+
+ Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ TimerReset
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/xml/page_catalog_choose_drink7.xml b/xml/page_catalog_choose_drink7.xml
new file mode 100644
index 00000000..feddaa8b
--- /dev/null
+++ b/xml/page_catalog_choose_drink7.xml
@@ -0,0 +1,1064 @@
+
+
+
+
+ "Enable"
+ 1080
+ 1920
+ "0xeae6e1"
+ SoundVolume
+ "ROOT/sounds/selectDrink.wav"
+
+ ; 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 = "Enable"
+ Var Menu2Selected = "Enable"
+ Var Menu3Selected = "Enable"
+ Var Menu4Selected = "Enable"
+ Var Menu5Selected = "PressForever"
+ Var Menu6Selected = "Enable"
+
+ 60000
+
+ Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+ TimerReset
+
+
+
+
+
+;
+; 0
+; 0
+; "ROOT/taobin_project/image/ad_medium_2.png"
+;
+
+
+
+; under line
+
+ 0
+ 494
+ "ROOT/taobin_project/image/page3/tab_line_bottom.png"
+
+
+
+; under line
+
+ 0
+ 358
+ "ROOT/taobin_project/image/page3/bg1.png"
+
+
+
+; back
+
+ 19
+ 397
+ "ROOT/taobin_project/image/page2/bn_back_arrow.png"
+ "ROOT/taobin_project/image/page2/bn_back_arrow.png"
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Open "ROOT/taobin_project/xml/page_catalog.xml"
+
+
+
+
+
+ 1000
+ 415
+ show_btn
+ show_btp
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ ; eng
+ If show_eng = "true" Then
+ Var show_eng = "false"
+ Else
+ Var show_eng = "true"
+ EndIf
+
+
+ Open CurrentXMLFileName2
+
+
+
+;
+
+
+ 92
+ 395
+ Menu1Selected
+ Var( DirImage + "/bn_bestseller.png" )
+ Var( DirImage + "/bp_bestseller.png")
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml"
+
+
+
+
+ 243
+ 395
+ Menu2Selected
+ Var( DirImage + "/bn_coffee.png")
+ Var( DirImage + "/bp_coffee.png")
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml"
+
+
+
+
+ 394
+ 395
+ Menu3Selected
+ Var( DirImage + "/bn_tea.png")
+ Var( DirImage + "/bp_tea.png")
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml"
+
+
+
+
+ 545
+ 395
+ Menu4Selected
+ Var( DirImage + "/bn_cho_ca.png")
+ Var( DirImage + "/bp_cho_ca.png")
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml"
+
+
+
+
+ 696
+ 395
+ Menu5Selected
+ Var( DirImage + "/bn_protein.png")
+ Var( DirImage + "/bp_protein.png")
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml"
+
+
+
+;
+; 696
+; 395
+; Menu5Selected
+; Var( DirImage + "/bn_fruit.png")
+; Var( DirImage + "/bp_fruit.png")
+; "/mnt/sdcard/coffeevending/wav/click.wav"
+; SoundVolume
+;
+; Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml"
+;
+;
+
+
+
+ 847
+ 395
+ Menu6Selected
+ Var( DirImage + "/bn_sodada.png")
+ Var( DirImage + "/bp_sodada.png")
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml"
+
+
+
+
+
+
+
+
+
+ 0
+ 497
+ 1080
+ 1500
+ 1400
+ "Vertical"
+ ; button i=1 11-99-04-0000
+
+ 44
+ 20
+ $11-99-04-0000.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-04-0000.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-04-0000.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-04-0000.image ) "
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SelectDrink = "11-99-04-0000"
+ Var NameDrink = $11-99-04-0000.NameE
+ Var NameDrinkTH = $11-99-04-0000.Name
+ Var DrinkDescriptionTH = $11-99-04-0000.description
+ Var DrinkDescription = $11-99-04-0000.descriptionE
+ Var PriceDrink = $11-99-04-0000.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-04-0000.image
+ Topping "Load" SelectDrink
+ Var PriceShowValue = charOfBaht + PriceDrink
+ Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+
+
+ ; button i=2 11-99-04-0001
+
+ 301
+ 20
+ $11-99-04-0001.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-04-0001.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-04-0001.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-04-0001.image ) "
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SelectDrink = "11-99-04-0001"
+ Var NameDrink = $11-99-04-0001.NameE
+ Var NameDrinkTH = $11-99-04-0001.Name
+ Var DrinkDescriptionTH = $11-99-04-0001.description
+ Var DrinkDescription = $11-99-04-0001.descriptionE
+ Var PriceDrink = $11-99-04-0001.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-04-0001.image
+ Topping "Load" SelectDrink
+ Var PriceShowValue = charOfBaht + PriceDrink
+ Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+
+
+ ; button i=3 11-99-04-0002
+
+ 558
+ 20
+ $11-99-04-0002.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-04-0002.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-04-0002.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-04-0002.image ) "
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SelectDrink = "11-99-04-0002"
+ Var NameDrink = $11-99-04-0002.NameE
+ Var NameDrinkTH = $11-99-04-0002.Name
+ Var DrinkDescriptionTH = $11-99-04-0002.description
+ Var DrinkDescription = $11-99-04-0002.descriptionE
+ Var PriceDrink = $11-99-04-0002.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-04-0002.image
+ Topping "Load" SelectDrink
+ Var PriceShowValue = charOfBaht + PriceDrink
+ Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+
+
+ ; button i=4 11-99-04-0003
+
+ 815
+ 20
+ $11-99-04-0003.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-04-0003.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-04-0003.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-04-0003.image ) "
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SelectDrink = "11-99-04-0003"
+ Var NameDrink = $11-99-04-0003.NameE
+ Var NameDrinkTH = $11-99-04-0003.Name
+ Var DrinkDescriptionTH = $11-99-04-0003.description
+ Var DrinkDescription = $11-99-04-0003.descriptionE
+ Var PriceDrink = $11-99-04-0003.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-04-0003.image
+ Topping "Load" SelectDrink
+ Var PriceShowValue = charOfBaht + PriceDrink
+ Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+
+
+ ; button i=5 11-99-04-0004
+
+ 44
+ 348
+ $11-99-04-0004.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-04-0004.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-04-0004.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-04-0004.image ) "
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SelectDrink = "11-99-04-0004"
+ Var NameDrink = $11-99-04-0004.NameE
+ Var NameDrinkTH = $11-99-04-0004.Name
+ Var DrinkDescriptionTH = $11-99-04-0004.description
+ Var DrinkDescription = $11-99-04-0004.descriptionE
+ Var PriceDrink = $11-99-04-0004.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-04-0004.image
+ Topping "Load" SelectDrink
+ Var PriceShowValue = charOfBaht + PriceDrink
+ Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+
+
+ ; button i=6 11-99-04-0005
+
+ 301
+ 348
+ $11-99-04-0005.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-04-0005.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-04-0005.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-04-0005.image ) "
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SelectDrink = "11-99-04-0005"
+ Var NameDrink = $11-99-04-0005.NameE
+ Var NameDrinkTH = $11-99-04-0005.Name
+ Var DrinkDescriptionTH = $11-99-04-0005.description
+ Var DrinkDescription = $11-99-04-0005.descriptionE
+ Var PriceDrink = $11-99-04-0005.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-04-0005.image
+ Topping "Load" SelectDrink
+ Var PriceShowValue = charOfBaht + PriceDrink
+ Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+
+
+ ; button i=7 11-99-04-0006
+
+ 558
+ 348
+ $11-99-04-0006.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-04-0006.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-04-0006.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-04-0006.image ) "
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SelectDrink = "11-99-04-0006"
+ Var NameDrink = $11-99-04-0006.NameE
+ Var NameDrinkTH = $11-99-04-0006.Name
+ Var DrinkDescriptionTH = $11-99-04-0006.description
+ Var DrinkDescription = $11-99-04-0006.descriptionE
+ Var PriceDrink = $11-99-04-0006.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-04-0006.image
+ Topping "Load" SelectDrink
+ Var PriceShowValue = charOfBaht + PriceDrink
+ Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+
+
+ ; button i=8 11-99-04-0007
+
+ 815
+ 348
+ $11-99-04-0007.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-04-0007.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-04-0007.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-04-0007.image ) "
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SelectDrink = "11-99-04-0007"
+ Var NameDrink = $11-99-04-0007.NameE
+ Var NameDrinkTH = $11-99-04-0007.Name
+ Var DrinkDescriptionTH = $11-99-04-0007.description
+ Var DrinkDescription = $11-99-04-0007.descriptionE
+ Var PriceDrink = $11-99-04-0007.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-04-0007.image
+ Topping "Load" SelectDrink
+ Var PriceShowValue = charOfBaht + PriceDrink
+ Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+
+
+ ; button i=9 11-99-04-0008
+
+ 44
+ 676
+ $11-99-04-0008.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-04-0008.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-04-0008.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-04-0008.image ) "
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SelectDrink = "11-99-04-0008"
+ Var NameDrink = $11-99-04-0008.NameE
+ Var NameDrinkTH = $11-99-04-0008.Name
+ Var DrinkDescriptionTH = $11-99-04-0008.description
+ Var DrinkDescription = $11-99-04-0008.descriptionE
+ Var PriceDrink = $11-99-04-0008.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-04-0008.image
+ Topping "Load" SelectDrink
+ Var PriceShowValue = charOfBaht + PriceDrink
+ Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+
+
+ ; button i=10 11-99-04-0009
+
+ 301
+ 676
+ $11-99-04-0009.Button
+ Var( "ROOT/taobin_project/image/page_drink/" + $11-99-04-0009.image )
+ Var( "ROOT/taobin_project/image/page_drink_press/" + $11-99-04-0009.image ) "
+ Var( "ROOT/taobin_project/image/page_drink_disable/" + $11-99-04-0009.image ) "
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SelectDrink = "11-99-04-0009"
+ Var NameDrink = $11-99-04-0009.NameE
+ Var NameDrinkTH = $11-99-04-0009.Name
+ Var DrinkDescriptionTH = $11-99-04-0009.description
+ Var DrinkDescription = $11-99-04-0009.descriptionE
+ Var PriceDrink = $11-99-04-0009.Price
+ Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $11-99-04-0009.image
+ Topping "Load" SelectDrink
+ Var PriceShowValue = charOfBaht + PriceDrink
+ Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+
+
+
+ 226
+ 32
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-04-0000.Price
+
+
+ 208
+ 32
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 60
+ 210
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $11-99-04-0000.Name
+
+
+ 60
+ 266
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-04-0000.description
+
+
+ 60
+ 210
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-04-0000.NameE
+
+
+ 60
+ 266
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-04-0000.descriptionE
+
+
+ 483
+ 32
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-04-0001.Price
+
+
+ 465
+ 32
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 317
+ 210
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $11-99-04-0001.Name
+
+
+ 317
+ 266
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-04-0001.description
+
+
+ 317
+ 210
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-04-0001.NameE
+
+
+ 317
+ 266
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-04-0001.descriptionE
+
+
+ 740
+ 32
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-04-0002.Price
+
+
+ 722
+ 32
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 574
+ 210
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $11-99-04-0002.Name
+
+
+ 574
+ 266
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-04-0002.description
+
+
+ 574
+ 210
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-04-0002.NameE
+
+
+ 574
+ 266
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-04-0002.descriptionE
+
+
+ 997
+ 32
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-04-0003.Price
+
+
+ 979
+ 32
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 831
+ 210
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $11-99-04-0003.Name
+
+
+ 831
+ 266
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-04-0003.description
+
+
+ 831
+ 210
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-04-0003.NameE
+
+
+ 831
+ 266
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-04-0003.descriptionE
+
+
+ 226
+ 360
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-04-0004.Price
+
+
+ 208
+ 360
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 60
+ 538
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $11-99-04-0004.Name
+
+
+ 60
+ 594
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-04-0004.description
+
+
+ 60
+ 538
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-04-0004.NameE
+
+
+ 60
+ 594
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-04-0004.descriptionE
+
+
+ 483
+ 360
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-04-0005.Price
+
+
+ 465
+ 360
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 317
+ 538
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $11-99-04-0005.Name
+
+
+ 317
+ 594
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-04-0005.description
+
+
+ 317
+ 538
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-04-0005.NameE
+
+
+ 317
+ 594
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-04-0005.descriptionE
+
+
+ 740
+ 360
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-04-0006.Price
+
+
+ 722
+ 360
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 574
+ 538
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $11-99-04-0006.Name
+
+
+ 574
+ 594
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-04-0006.description
+
+
+ 574
+ 538
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-04-0006.NameE
+
+
+ 574
+ 594
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-04-0006.descriptionE
+
+
+ 997
+ 360
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-04-0007.Price
+
+
+ 979
+ 360
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 831
+ 538
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $11-99-04-0007.Name
+
+
+ 831
+ 594
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-04-0007.description
+
+
+ 831
+ 538
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-04-0007.NameE
+
+
+ 831
+ 594
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-04-0007.descriptionE
+
+
+ 226
+ 688
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-04-0008.Price
+
+
+ 208
+ 688
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 60
+ 866
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $11-99-04-0008.Name
+
+
+ 60
+ 922
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-04-0008.description
+
+
+ 60
+ 866
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-04-0008.NameE
+
+
+ 60
+ 922
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-04-0008.descriptionE
+
+
+ 483
+ 688
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-04-0009.Price
+
+
+ 465
+ 688
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 317
+ 866
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $11-99-04-0009.Name
+
+
+ 317
+ 922
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $11-99-04-0009.description
+
+
+ 317
+ 866
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $11-99-04-0009.NameE
+
+
+ 317
+ 922
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $11-99-04-0009.descriptionE
+
+
+
+
+
+
+
+
+
diff --git a/xml/page_drinkok.xml b/xml/page_drinkok.xml
index ce04f2f1..4947a92f 100644
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@@ -22,12 +22,17 @@
Var VideoPlayFile = VideoPlayFile + "24"
Var VideoPlayFile = VideoPlayFile + VideoFileEnd
- 800
+ 1000
If HaveCup = "false" Then
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf
+
+ If MachineStage = "remove-cup" Then
+ Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+
+ EndIf
TimerReset
@@ -50,15 +55,6 @@
-; Old
-;
@@ -135,15 +141,20 @@
SAVELOG TOPPING1
+ SAVELOG TOPPING2
+ SAVELOG TOPPING3
+ SAVELOG TOPPING4
+
SAVELOG MenuCodeName
;SAVELOG toppingID1Default
- Var ToppingGotoPayment = "false"
-
+
If BugFlag = 1 Then
Else
+
If MenuCodeName = "barista1" Then
Open "ROOT/taobin_project/xml/page_topping_with_barista.xml"
+ Var ToppingGotoPayment = "false"
EndIf
If TOPPING1 = "Powder Sugar" Then
@@ -156,19 +167,45 @@
Var BugFlag = 1
Var topping1 = toppingID1Default
+ Var ToppingGotoPayment = "false"
+ Refresh
+ EndIf
+
+ If TOPPING2 = "shot coffee" Then
+ Var backGroundAddExtra = DirImage + "/extra_img_1.png"
+
+ SAVELOG backGroundAddExtra
+ Var ShotCoffeeBG = "Enable"
+ Var y_shot_coffee_bg = y2_topping_bg
+ Var y_shot_coffee_bt = y_shot_coffee_bg + 100
+ Var showShotEnable = "Enable"
Refresh
EndIf
If TOPPING1 = "Powder Sugar Premix 25" Then
+ Var ToppingGotoPayment = "false"
Open "ROOT/taobin_project/xml/page_topping_premix25percent.xml"
EndIf
If TOPPING1 = "Powder Sugar Premix 50" Then
+ Var ToppingGotoPayment = "false"
Open "ROOT/taobin_project/xml/page_topping_premix50percent.xml"
EndIf
+ If TOPPING1 = "Sugar" Then
+ Var ToppingGotoPayment = "false"
+ Open "ROOT/taobin_project/xml/page_topping_sugar_sufficiency.xml"
+ EndIf
+ If TOPPING1 = "Sugar Premix 25" Then
+ Var ToppingGotoPayment = "false"
+ Open "ROOT/taobin_project/xml/page_topping_premix25percent_no.xml"
+ EndIf
+
+
+
+ SAVELOG ToppingGotoPayment
If ToppingGotoPayment = "true" Then
Topping "Select" SelectDrink
; Pack
@@ -276,6 +313,45 @@
PriceShowValue
+; shot layout
+
+
+ 52
+ y_shot_coffee_bg
+ ShotCoffeeBG
+ backGroundAddExtra
+
+
+;
+
+ 100
+ y_shot_coffee_bt
+ showShotEnable
+ Var( DirImage + "/add_shot_img.png" )
+ Var( DirImage + "/add_shot_img_2.png" )
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+
+ Refresh
+
+
+
+;
+
+ 925
+ y_shot_coffee_bt
+ showShotEnable
+ Var( DirImage + "/cb_nch.png" )
+ Var( DirImage + "/cb_ch.png" )
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+
+
+
+
+
; sugar layout
diff --git a/xml/page_topping_premix25percent.xml b/xml/page_topping_premix25percent.xml
index fd43885f..3ec51354 100644
--- a/xml/page_topping_premix25percent.xml
+++ b/xml/page_topping_premix25percent.xml
@@ -65,6 +65,8 @@
EndIf
CRLFToSpace showname
+ CRLFToSpace showdesc
+
;SAVELOG showname
@@ -294,7 +296,9 @@
Var SugarState3 = "Enable"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
- Var topping1 = toppingID1index2
+ Var topping1 = toppingID1index1
+ SAVELOG topping1
+
Refresh
@@ -318,7 +322,9 @@
Var SugarState3 = "PressForever"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
- Var topping1 = toppingID1index3
+ Var topping1 = toppingID1index2
+ SAVELOG SugarState2
+ SAVELOG topping1
Refresh
@@ -341,8 +347,9 @@
Var SugarState3 = "Enable"
Var SugarState4 = "PressForever"
Var SugarState5 = "Enable"
- Var topping1 = toppingID1index4
+ Var topping1 = toppingID1index3
+ SAVELOG topping1
Refresh
@@ -365,7 +372,8 @@
Var SugarState3 = "Enable"
Var SugarState4 = "Enable"
Var SugarState5 = "PressForever"
- Var topping1 = toppingID1index5
+ Var topping1 = toppingID1index4
+ SAVELOG topping1
Refresh
diff --git a/xml/page_topping_premix25percent_no.xml b/xml/page_topping_premix25percent_no.xml
new file mode 100644
index 00000000..3e6a423a
--- /dev/null
+++ b/xml/page_topping_premix25percent_no.xml
@@ -0,0 +1,384 @@
+
+ "Enable"
+ 1080
+ 1920
+ "0xeae6e1"
+ SoundVolume
+
+ ; On open
+ Var SugarState1 = "Invisible"
+ Var SugarState2 = "Invisible"
+ Var SugarState3 = "Invisible"
+ Var SugarState4 = "Invisible"
+ Var SugarState5 = "Invisible"
+
+ ;Var SugarState1 = "Enable"
+
+
+ SAVELOG TOPPING1
+
+ SAVELOG toppingID1Default
+ Var topping1 = toppingID1Default
+ SAVELOG toppingID1index1
+ SAVELOG toppingID1index2
+ SAVELOG toppingID1index3
+ SAVELOG toppingID1index4
+
+ SAVELOG TOPPING2
+ SAVELOG TOPPING3
+ SAVELOG TOPPING4
+
+ Var SugarState2 = "Enable"
+ Var SugarState3 = "Pressforever"
+ Var SugarState4 = "Enable"
+ Var SugarState5 = "Enable"
+ Var BGSugar = "Enable"
+
+ ;SAVELOG PreviseXMLFileName2
+
+
+ Var y_sugar_block = 105
+ Var y_block = 206
+
+ Var y_topping_bg = 912
+ Var y_topping = 912 + y_sugar_block
+
+ Var y2_topping_bg = y_topping_bg + y_block
+ Var y2_topping = y_topping + y_block
+
+ Var BugFlag = 0
+
+ If show_eng = "true" Then
+
+ Var DirImage = "ROOT/taobin_project/image/topping_en"
+ Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+ Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+ Var showname = NameDrink
+ Var showdesc = DrinkDescription
+
+ Else
+ Var DirImage = "ROOT/taobin_project/image/topping"
+ Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+ Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+ Var showname = NameDrinkTH
+ Var showdesc = DrinkDescriptionTH
+ EndIf
+
+ CRLFToSpace showname
+ CRLFToSpace showdesc
+ ;SAVELOG showname
+
+
+ 30000
+
+ Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+
+
+
+
+ 990
+ 438
+ show_btn
+ show_btp
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ ; eng
+ If show_eng = "true" Then
+ Var show_eng = "false"
+ Else
+ Var show_eng = "true"
+ EndIf
+
+ If show_eng = "true" Then
+
+ Var DirImage = "ROOT/taobin_project/image/topping_en/"
+ Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+ Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+ Var showname = NameDrink
+ Var showdesc = DrinkDescription
+
+ Else
+ Var DirImage = "ROOT/taobin_project/image/topping/"
+ Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+ Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+ Var showname = NameDrinkTH
+ Var showdesc = DrinkDescriptionTH
+ EndIf
+ CRLFToSpace showname
+
+ RefreshAll
+
+
+
+;
+; 0
+; 0
+; "ROOT/taobin_project/image/ad_medium_2.png"
+;
+
+
+
+; back
+
+ 19
+ 420
+ "ROOT/taobin_project/image/page2/bn_back_arrow.png"
+ "ROOT/taobin_project/image/page2/bn_back_arrow.png"
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ ;Open PreviseOfPreviseXMLFileName2
+ Open "ROOT/taobin_project/xml/page_catalog.xml"
+
+
+
+
+
+
+
+ SAVELOG TOPPING1
+ SAVELOG MenuCodeName
+ ;SAVELOG toppingID1Default
+
+ If BugFlag = 1 Then
+
+ Else
+
+
+ If RoadShow = "true" Then
+ Var PriceShowValue = "Free"
+ EndIf
+
+ SAVELOG toppingID2price1
+ SAVELOG toppingID2price2
+ SAVELOG toppingID2price3
+ EndIf
+
+
+
+
+
+
+
+
+
+ 374
+ 436
+ 331
+ 436
+ PictureDrink
+
+
+
+ 0
+ 752
+ 1080
+ Center
+ 72
+ KanitMediumTTF
+ 0x513C2F
+ showname
+
+
+
+ 0
+ 836
+ 1080
+ Center
+ 24
+ KanitLightTTF
+ 0x6F5F51
+ showdesc
+
+
+
+; back
+
+ 44
+ 1785
+ Var( DirImage + "/bn_cancel.png" )
+ Var( DirImage + "/bp_cancel.png" )
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Open PreviseOfPreviseXMLFileName2
+ ;"ROOT/taobin_project/xml/page_catalog.xml"
+
+
+
+
+; next
+
+ 447
+ 1785
+ Var( DirImage + "/bn_next.png" )
+ Var( DirImage + "/bp_next.png" )
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+
+
+ ; Set drink
+ Topping "Select" SelectDrink
+
+ ; Set option toppinng and pack
+ Topping "Select1-ID" topping1
+ Topping "Select2-ID" topping2
+ Topping "Select3-ID" topping3
+
+ ; Pack
+ Topping "Pack" ExtendData
+
+
+ Open "ROOT/taobin_project/xml/page_payment.xml"
+
+
+
+
+
+ 924
+ 1804
+ KanitTTF
+ 36
+ 1080
+ 0xFFFFFF
+ PriceShowValue
+
+
+
+
+; sugar layout
+
+ 44
+ y_topping_bg
+ BGSugar
+ "ROOT/taobin_project/image/topping/img1.png"
+
+
+; sugar1
+
+ 181
+ y_topping
+ SugarState1
+ "ROOT/taobin_project/image/topping/bn_sugar1.png"
+ "ROOT/taobin_project/image/topping/bp_sugar1.png"
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+
+
+
+
+
+; sugar2
+
+ 327
+ y_topping
+ SugarState2
+ "ROOT/taobin_project/image/topping/bn_sugar2.png"
+ "ROOT/taobin_project/image/topping/bp_sugar2.png"
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+
+ Var SugarState1 = "Invisible"
+
+ Var SugarState2 = "Pressforever"
+ Var SugarState3 = "Enable"
+ Var SugarState4 = "Enable"
+ Var SugarState5 = "Enable"
+ Var topping1 = toppingID1index1
+ Refresh
+
+
+
+
+
+; sugar3
+
+ 503
+ y_topping
+ SugarState3
+ "ROOT/taobin_project/image/topping/bn_sugar3.png"
+ "ROOT/taobin_project/image/topping/bp_sugar3.png"
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+
+ Var SugarState1 = "Invisible"
+
+ Var SugarState2 = "Enable"
+ Var SugarState3 = "PressForever"
+ Var SugarState4 = "Enable"
+ Var SugarState5 = "Enable"
+ Var topping1 = toppingID1index2
+
+ Refresh
+
+
+
+; sugar4
+
+ 664
+ y_topping
+ SugarState4
+ "ROOT/taobin_project/image/topping/bn_sugar4.png"
+ "ROOT/taobin_project/image/topping/bp_sugar4.png"
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+
+ Var SugarState1 = "Invisible"
+
+ Var SugarState2 = "Enable"
+ Var SugarState3 = "Enable"
+ Var SugarState4 = "PressForever"
+ Var SugarState5 = "Enable"
+ Var topping1 = toppingID1index3
+
+
+ Refresh
+
+
+
+; sugar5
+
+ 836
+ y_topping
+ SugarState5
+ "ROOT/taobin_project/image/topping/bn_sugar5.png"
+ "ROOT/taobin_project/image/topping/bp_sugar5.png"
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+
+ Var SugarState1 = "Invisible"
+
+ Var SugarState2 = "Enable"
+ Var SugarState3 = "Enable"
+ Var SugarState4 = "Enable"
+ Var SugarState5 = "PressForever"
+ Var topping1 = toppingID1index4
+
+ Refresh
+
+
+
+
+
+
+
+
+ Open "/media/bt/xml/security_alarm.xml"
+
+
+
+
diff --git a/xml/page_topping_premix50percent.xml b/xml/page_topping_premix50percent.xml
index e32b8e96..e6aae865 100644
--- a/xml/page_topping_premix50percent.xml
+++ b/xml/page_topping_premix50percent.xml
@@ -28,8 +28,7 @@
SAVELOG TOPPING3
SAVELOG TOPPING4
- Var SugarState2 = "Pressforever"
- Var SugarState3 = "Enable"
+ Var SugarState3 = "Pressforever"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var BGSugar = "Enable"
diff --git a/xml/page_topping_sugar_sufficiency.xml b/xml/page_topping_sugar_sufficiency.xml
new file mode 100644
index 00000000..37871b14
--- /dev/null
+++ b/xml/page_topping_sugar_sufficiency.xml
@@ -0,0 +1,368 @@
+
+ "Enable"
+ 1080
+ 1920
+ "0xeae6e1"
+ SoundVolume
+
+ ; On open
+
+ Var SugarState1 = "Enable"
+ Var SugarState2 = "Enable"
+ Var SugarState3 = "PressForever"
+ Var SugarState4 = "Enable"
+ Var SugarState5 = "Enable"
+ Var BGSugar = "Enable"
+
+ SAVELOG TOPPING1
+ SAVELOG TOPPING2
+ SAVELOG TOPPING3
+ SAVELOG TOPPING4
+
+ ;SAVELOG PreviseXMLFileName2
+
+
+ Var y_sugar_block = 105
+ Var y_block = 206
+
+ Var y_topping_bg = 912
+ Var y_topping = 912 + y_sugar_block
+
+ Var y2_topping_bg = y_topping_bg + y_block
+ Var y2_topping = y_topping + y_block
+
+ Var topping1 = toppingID1Default
+ Var BugFlag = 0
+
+ If show_eng = "true" Then
+
+ Var DirImage = "ROOT/taobin_project/image/topping_en"
+ Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+ Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+ Var showname = NameDrink
+ Var showdesc = DrinkDescription
+
+ Else
+ Var DirImage = "ROOT/taobin_project/image/topping"
+ Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+ Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+ Var showname = NameDrinkTH
+ Var showdesc = DrinkDescriptionTH
+ EndIf
+
+ SAVELOG toppingID1Default
+
+ CRLFToSpace showname
+ CRLFToSpace showdesc
+
+ ;SAVELOG showname
+
+
+ 30000
+
+ Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+
+
+
+
+ 990
+ 438
+ show_btn
+ show_btp
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ ; eng
+ If show_eng = "true" Then
+ Var show_eng = "false"
+ Else
+ Var show_eng = "true"
+ EndIf
+
+ If show_eng = "true" Then
+
+ Var DirImage = "ROOT/taobin_project/image/topping_en/"
+ Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+ Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+ Var showname = NameDrink
+ Var showdesc = DrinkDescription
+
+ Else
+ Var DirImage = "ROOT/taobin_project/image/topping/"
+ Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+ Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+ Var showname = NameDrinkTH
+ Var showdesc = DrinkDescriptionTH
+ EndIf
+ CRLFToSpace showname
+
+ RefreshAll
+
+
+
+;
+; 0
+; 0
+; "ROOT/taobin_project/image/ad_medium_2.png"
+;
+
+
+
+; back
+
+ 19
+ 420
+ "ROOT/taobin_project/image/page2/bn_back_arrow.png"
+ "ROOT/taobin_project/image/page2/bn_back_arrow.png"
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ ;Open PreviseXMLFileName2
+ Open "ROOT/taobin_project/xml/page_catalog.xml"
+
+
+
+
+
+
+
+ SAVELOG TOPPING1
+ SAVELOG MenuCodeName
+ SAVELOG toppingID1Default
+ Var ToppingGotoPayment = "false"
+
+ If BugFlag = 1 Then
+
+ Else
+
+
+ If RoadShow = "true" Then
+ Var PriceShowValue = "Free"
+ EndIf
+
+ SAVELOG toppingID2price1
+ SAVELOG toppingID2price2
+ SAVELOG toppingID2price3
+ EndIf
+
+
+
+
+
+
+
+
+
+ 374
+ 436
+ 331
+ 436
+ PictureDrink
+
+
+
+ 0
+ 752
+ 1080
+ Center
+ 72
+ KanitMediumTTF
+ 0x513C2F
+ showname
+
+
+
+ 0
+ 836
+ 1080
+ Center
+ 24
+ KanitLightTTF
+ 0x6F5F51
+ showdesc
+
+
+
+; back
+
+ 44
+ 1785
+ Var( DirImage + "/bn_cancel.png" )
+ Var( DirImage + "/bp_cancel.png" )
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Open "ROOT/taobin_project/xml/page_catalog.xml"
+
+
+
+
+; next
+
+ 447
+ 1785
+ Var( DirImage + "/bn_next.png" )
+ Var( DirImage + "/bp_next.png" )
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+
+
+ ; Set drink
+ Topping "Select" SelectDrink
+
+ ; Set option toppinng and pack
+ Topping "Select1-ID" topping1
+ Topping "Select2-ID" topping2
+ Topping "Select3-ID" topping3
+
+ ; Pack
+ Topping "Pack" ExtendData
+
+
+ Open "ROOT/taobin_project/xml/page_payment.xml"
+
+
+
+
+
+ 924
+ 1804
+ KanitTTF
+ 36
+ 1080
+ 0xFFFFFF
+ PriceShowValue
+
+
+
+
+; sugar layout
+
+ 44
+ y_topping_bg
+ BGSugar
+ Var( DirImage + "/img_sugar.png" )
+
+
+; sugar1
+
+ 181
+ y_topping
+ SugarState1
+ Var( DirImage + "/bn_sugar1.png" )
+ Var( DirImage + "/bp_sugar1.png" )
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SugarState1 = "PressForever"
+ Var SugarState2 = "Enable"
+ Var SugarState3 = "Enable"
+ Var SugarState4 = "Enable"
+ Var SugarState5 = "Enable"
+ Var topping1 = toppingID1index1
+ SAVELOG topping1
+ Refresh
+
+
+
+; sugar2
+
+ 344
+ y_topping
+ SugarState2
+ Var( DirImage + "/bn_sugar2.png" )
+ Var( DirImage + "/bp_sugar2.png" )
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SugarState1 = "Enable"
+ Var SugarState2 = "PressForever"
+ Var SugarState3 = "Enable"
+ Var SugarState4 = "Enable"
+ Var SugarState5 = "Enable"
+ Var topping1 = toppingID1index2
+ SAVELOG topping1
+ Refresh
+
+
+
+
+; sugar3
+
+ 507
+ y_topping
+ SugarState3
+ Var( DirImage + "/bn_sugar3.png" )
+ Var( DirImage + "/bp_sugar3.png" )
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SugarState1 = "Enable"
+ Var SugarState2 = "Enable"
+ Var SugarState3 = "PressForever"
+ Var SugarState4 = "Enable"
+ Var SugarState5 = "Enable"
+ Var topping1 = toppingID1index3
+ SAVELOG topping1
+ Refresh
+
+
+
+; sugar4
+
+ 670
+ y_topping
+ SugarState4
+ Var( DirImage + "/bn_sugar4.png" )
+ Var( DirImage + "/bp_sugar4.png" )
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SugarState1 = "Enable"
+ Var SugarState2 = "Enable"
+ Var SugarState3 = "Enable"
+ Var SugarState4 = "PressForever"
+ Var SugarState5 = "Enable"
+ Var topping1 = toppingID1index4
+ SAVELOG topping1
+ Refresh
+
+
+
+; sugar5
+
+ 833
+ y_topping
+ SugarState5
+ Var( DirImage + "/bn_sugar5.png" )
+ Var( DirImage + "/bp_sugar5.png" )
+ "/mnt/sdcard/coffeevending/wav/click.wav"
+ SoundVolume
+
+ Var SugarState1 = "Enable"
+ Var SugarState2 = "Enable"
+ Var SugarState3 = "Enable"
+ Var SugarState4 = "Enable"
+ Var SugarState5 = "PressForever"
+ Var topping1 = toppingID1index5
+ SAVELOG topping1
+ Refresh
+
+
+
+
+
+
+ Open "/media/bt/xml/security_alarm.xml"
+
+
+
+
diff --git a/xml/page_topping_with_barista.xml b/xml/page_topping_with_barista.xml
index db2985ce..782693f6 100644
--- a/xml/page_topping_with_barista.xml
+++ b/xml/page_topping_with_barista.xml
@@ -30,8 +30,14 @@
Var BGSugar = "Invisible"
- ;SAVELOG TOPPING1
- ;SAVELOG TOPPING2
+ SAVELOG TOPPING1
+ SAVELOG TOPPING2
+ SAVELOG toppingID1Default
+ SAVELOG toppingID1index1
+ SAVELOG toppingID1index2
+ SAVELOG toppingID1index3
+ SAVELOG toppingID1index4
+ SAVELOG toppingID1index5
;SAVELOG PreviseXMLFileName2
;
@@ -54,18 +60,19 @@
;SAVELOG y2_topping
- If TOPPING1 = "Powder Sugar" Then
- Var SugarState1 = "PressForever"
+ If TOPPING1 = "Sugar" Then
+ Var SugarState1 = "Enable"
Var SugarState2 = "Enable"
- Var SugarState3 = "Enable"
+ Var SugarState3 = "PressForever"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var BGSugar = "Enable"
+ Var topping1 = toppingID1Default
EndIf
- If TOPPING1 = "Powder Sugar Premix 25" Then
+ If TOPPING1 = "Sugar Premix 25" Then
Var SugarState1 = "Invisible"
- Var SugarState2 = "Invisible"
+ Var SugarState2 = "Enable"
Var SugarState3 = "PressForever"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
@@ -184,9 +191,9 @@
If BugFlag = 1 Then
If TOPPING1 = "Powder Sugar" Then
- Var SugarState1 = "PressForever"
+ Var SugarState1 = "Enable"
Var SugarState2 = "Enable"
- Var SugarState3 = "Enable"
+ Var SugarState3 = "PressForever"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var BGSugar = "Enable"
@@ -198,10 +205,10 @@
Refresh
EndIf
- If TOPPING1 = "Powder Sugar Premix 25" Then
+ If TOPPING1 = "Sugar Premix 25" Then
Var SugarState1 = "Invisible"
- Var SugarState2 = "Invisible"
- Var SugarState3 = "PressForever"
+ Var SugarState2 = "PressForever"
+ Var SugarState3 = "Enable"
Var SugarState4 = "Enable"
Var SugarState5 = "Enable"
Var BGSugar = "Enable"
@@ -344,14 +351,15 @@
SoundVolume
- If TOPPING1 = "Powder Sugar Premix 25" Then
+ If TOPPING1 = "Sugar Premix 25" Then
Var SugarState1 = "Invisible"
Var SugarState2 = "Invisible"
- Var topping1 = "1"
+ Var topping1 = toppingID1index1
Else
Var SugarState1 = "PressForever"
Var SugarState2 = "Enable"
- Var topping1 = "1"
+ Var topping1 = toppingID1index1
+
EndIf
Var SugarState3 = "Enable"
@@ -364,7 +372,7 @@
; sugar2
- 327
+ 344
y_topping
SugarState2
"ROOT/taobin_project/image/topping/bn_sugar2.png"
@@ -373,14 +381,16 @@
SoundVolume
- If TOPPING1 = "Powder Sugar Premix 25" Then
+ If TOPPING1 = "Sugar Premix 25" Then
Var SugarState1 = "Invisible"
- Var SugarState2 = "Invisible"
- Var topping1 = "10"
+ Var SugarState2 = "PressForever"
+ Var topping1 = toppingID1index2
+
Else
Var SugarState1 = "Enable"
Var SugarState2 = "PressForever"
- Var topping1 = "2"
+ Var topping1 = toppingID1index2
+
EndIf
Var SugarState3 = "Enable"
Var SugarState4 = "Enable"
@@ -393,7 +403,7 @@
; sugar3
- 503
+ 507
y_topping
SugarState3
"ROOT/taobin_project/image/topping/bn_sugar3.png"
@@ -402,14 +412,16 @@
SoundVolume
- If TOPPING1 = "Powder Sugar Premix 25" Then
+ If TOPPING1 = "Sugar Premix 25" Then
Var SugarState1 = "Invisible"
- Var SugarState2 = "Invisible"
- Var topping1 = "11"
+ Var SugarState2 = "Enable"
+ Var topping1 = toppingID1index3
+
Else
Var SugarState1 = "Enable"
Var SugarState2 = "Enable"
- Var topping1 = "3"
+ Var topping1 = toppingID1index3
+
EndIf
Var SugarState3 = "PressForever"
@@ -422,7 +434,7 @@
; sugar4
- 664
+ 670
y_topping
SugarState4
"ROOT/taobin_project/image/topping/bn_sugar4.png"
@@ -431,14 +443,16 @@
SoundVolume
- If TOPPING1 = "Powder Sugar Premix 25" Then
+ If TOPPING1 = "Sugar Premix 25" Then
Var SugarState1 = "Invisible"
- Var SugarState2 = "Invisible"
- Var topping1 = "12"
+ Var SugarState2 = "Enable"
+ Var topping1 = toppingID1index4
+
Else
Var SugarState1 = "Enable"
Var SugarState2 = "Enable"
- Var topping1 = "4"
+ Var topping1 = toppingID1index4
+
EndIf
Var SugarState3 = "Enable"
@@ -451,7 +465,7 @@
; sugar5
- 836
+ 833
y_topping
SugarState5
"ROOT/taobin_project/image/topping/bn_sugar5.png"
@@ -460,14 +474,16 @@
SoundVolume
- If TOPPING1 = "Powder Sugar Premix 25" Then
+ If TOPPING1 = "Sugar Premix 25" Then
Var SugarState1 = "Invisible"
- Var SugarState2 = "Invisible"
- Var topping1 = "13"
+ Var SugarState2 = "Enable"
+ Var topping1 = toppingID1index5
+
Else
Var SugarState1 = "Enable"
Var SugarState2 = "Enable"
- Var topping1 = "5"
+ Var topping1 = toppingID1index5
+
EndIf
Var SugarState3 = "Enable"
diff --git a/xml/vending_info.xml b/xml/vending_info.xml
index f203fc59..a3f2ef95 100644
--- a/xml/vending_info.xml
+++ b/xml/vending_info.xml
@@ -51,6 +51,8 @@
Var ShowVersionAll = BrewMachineFirmwareVersion + " | "
Var ShowVersionAll = ShowVersionAll + XMLPageVersion
+ Var ShowVersionAll = ShowVersionAll + " | "
+ Var ShowVersionAll = ShowVersionAll + taobin_version
Var IDCardState = "Invisible"
@@ -110,6 +112,9 @@
info_startX
info_5Y
"ROOT/taobin_project/image/tab_1.png"
+
+ Machine DoorClose
+
@@ -118,6 +123,13 @@
info2_startX
info_1Y
"ROOT/taobin_project/image/tab_1.png"
+
+ OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+ OpenInst 2 "/mnt/sdcard/coffeevending/taobin_project/xml/page_catalog.xml"
+
+ TopView "show"
+ Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_main_blank.xml"
+