diff --git a/xml/menu_catalog_choose_drink1.pml b/xml/menu_catalog_choose_drink1.pml
index f38e800a..052d98e2 100644
--- a/xml/menu_catalog_choose_drink1.pml
+++ b/xml/menu_catalog_choose_drink1.pml
@@ -2,17 +2,46 @@
default_dir = 'ROOT/taobin_project/image/menu_drink/'
- menu_count = 3
+ menu_count = 15
x1 = 44
x2 = 301
x3 = 558
x4 = 815
+ ystep = 899 - 571
y1 = 571
- y1 = 571
- y1 = 571
- y1 = 571
+ y2 = y1 + ystep*1
+ y3 = y1 + ystep*2
+ y4 = y1 + ystep*3
+ y5 = y1 + ystep*4
+
+
x_button = [
+ x1,
+ x2,
+ x3,
+ x4,
+
+ x1,
+ x2,
+ x3,
+ x4,
+
+ x1,
+ x2,
+ x3,
+ x4,
+
+ x1,
+ x2,
+ x3,
+ x4,
+
+ x1,
+ x2,
+ x3,
+ x4,
+
x1,
x2,
x3,
@@ -23,7 +52,28 @@
y1,
y1,
y1,
- y1
+ y1,
+
+ y2,
+ y2,
+ y2,
+ y2,
+
+ y3,
+ y3,
+ y3,
+ y3,
+
+ y4,
+ y4,
+ y4,
+ y4,
+
+ y5,
+ y5,
+ y5,
+ y5
+
]
@@ -32,12 +82,45 @@
bt_pic.append('b#_diy.png')
bt_pic.append('b#_hot_espresso.png')
bt_pic.append('b#_hot_double_espresso.png')
+ bt_pic.append('b#_hot_latte.png')
+
+ bt_pic.append('b#_hot_america_no.png')
+ bt_pic.append('b#_hot_mocha.png')
+ bt_pic.append('b#_hot_caramel_macchiato.png')
+ bt_pic.append('b#_hot_cappuccino.png')
+
+ bt_pic.append('b#_iced_epsresso.png')
+ bt_pic.append('b#_iced_thai_black_coffee.png')
+ bt_pic.append('b#_iced_lattle.png')
+ bt_pic.append('b#_iced_america_no.png')
+
+ bt_pic.append('b#_iced_mocha.png')
+ bt_pic.append('b#_iced_caramel_macchiato.png')
+ bt_pic.append('b#_iced_cappuccino.png')
+ bt_pic.append('b#.png')
product_code = []
product_code.append('##-##-##-####')
product_code.append('11-99-01-0010')
product_code.append('11-99-01-0001')
+ product_code.append('11-99-01-0002')
+
+ product_code.append('11-99-01-0004')
+ product_code.append('11-99-01-0007')
+ product_code.append('11-99-01-1001')
+ product_code.append('11-99-01-0003')
+
+ product_code.append('11-01-02-0006')
+ product_code.append('11-99-02-0024')
+ product_code.append('11-99-02-0001')
+ product_code.append('11-99-02-0003')
+
+ product_code.append('11-99-02-0007')
+ product_code.append('11-99-02-1000')
+ product_code.append('11-99-02-0002')
+ product_code.append('')
+
?>
diff --git a/xml/menu_catalog_choose_drink1.xml b/xml/menu_catalog_choose_drink1.xml
index d4f3f4f2..20bdd8e0 100644
--- a/xml/menu_catalog_choose_drink1.xml
+++ b/xml/menu_catalog_choose_drink1.xml
@@ -262,6 +262,534 @@
0x322B26
$11-99-01-0001.Name2
+ ; button i=4 11-99-01-0002
+
+
+ 997
+ 583
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-01-0002.Price
+
+
+ 979
+ 583
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 831
+ 785
+ 24
+ RobotoBold
+ 0x322B26
+ $11-99-01-0002.Name2
+
+ ; button i=5 11-99-01-0004
+
+
+ 226
+ 911
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-01-0004.Price
+
+
+ 208
+ 911
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 60
+ 1113
+ 24
+ RobotoBold
+ 0x322B26
+ $11-99-01-0004.Name2
+
+ ; button i=6 11-99-01-0007
+
+
+ 483
+ 911
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-01-0007.Price
+
+
+ 465
+ 911
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 317
+ 1113
+ 24
+ RobotoBold
+ 0x322B26
+ $11-99-01-0007.Name2
+
+ ; button i=7 11-99-01-1001
+
+
+ 740
+ 911
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-01-1001.Price
+
+
+ 722
+ 911
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 574
+ 1113
+ 24
+ RobotoBold
+ 0x322B26
+ $11-99-01-1001.Name2
+
+ ; button i=8 11-99-01-0003
+
+
+ 997
+ 911
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-01-0003.Price
+
+
+ 979
+ 911
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 831
+ 1113
+ 24
+ RobotoBold
+ 0x322B26
+ $11-99-01-0003.Name2
+
+ ; button i=9 11-01-02-0006
+
+
+ 226
+ 1239
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-01-02-0006.Price
+
+
+ 208
+ 1239
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 60
+ 1441
+ 24
+ RobotoBold
+ 0x322B26
+ $11-01-02-0006.Name2
+
+ ; button i=10 11-99-02-0024
+
+
+ 483
+ 1239
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-02-0024.Price
+
+
+ 465
+ 1239
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 317
+ 1441
+ 24
+ RobotoBold
+ 0x322B26
+ $11-99-02-0024.Name2
+
+ ; button i=11 11-99-02-0001
+
+
+ 740
+ 1239
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-02-0001.Price
+
+
+ 722
+ 1239
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 574
+ 1441
+ 24
+ RobotoBold
+ 0x322B26
+ $11-99-02-0001.Name2
+
+ ; button i=12 11-99-02-0003
+
+
+ 997
+ 1239
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-02-0003.Price
+
+
+ 979
+ 1239
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 831
+ 1441
+ 24
+ RobotoBold
+ 0x322B26
+ $11-99-02-0003.Name2
+
+ ; button i=13 11-99-02-0007
+
+
+ 226
+ 1567
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-02-0007.Price
+
+
+ 208
+ 1567
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 60
+ 1769
+ 24
+ RobotoBold
+ 0x322B26
+ $11-99-02-0007.Name2
+
+ ; button i=14 11-99-02-1000
+
+
+ 483
+ 1567
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-02-1000.Price
+
+
+ 465
+ 1567
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 317
+ 1769
+ 24
+ RobotoBold
+ 0x322B26
+ $11-99-02-1000.Name2
+
+ ; button i=15 11-99-02-0002
+
+
+ 740
+ 1567
+ 27
+ KanitTTF
+ 0xB78F24
+ $11-99-02-0002.Price
+
+
+ 722
+ 1567
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 574
+ 1769
+ 24
+ RobotoBold
+ 0x322B26
+ $11-99-02-0002.Name2
+