diff --git a/animation01/Menu Description - Sheet1.tsv b/animation01/Menu Description - Sheet1.tsv
index 5aff906f..fab55cfc 100644
--- a/animation01/Menu Description - Sheet1.tsv
+++ b/animation01/Menu Description - Sheet1.tsv
@@ -177,6 +177,53 @@ Congee 12-06-01-0001 1 46 24 65 1:05 61
เอสเพรสโซ่ช็อต
+Hot Thai Tea café Latte 12-01-01-0029 1 2 3 4 5 6 7 10 24 161 2:41 22
+Hot Taiwanese Tea café Latte 12-01-01-0030 1 2 3 4 5 10 24 136 2:16 26
+Hot Matcha café Latte 12-01-01-0031 1 2 3 4 5 8 9 7 24 140 2:20 19
+Iced Thai Tea café Latte 12-01-02-0029 1 2 3 4 5 6 7 10 23 24 190 3:10 23
+Iced Taiwanese Tea café Latte 12-01-02-0030 1 2 3 4 5 10 23 24 178 2:58 29
+Iced Matcha café Latte 12-01-02-0031 1 2 3 4 5 8 9 7 23 24 204 3:24 25
+Iced Thai Tea café Latte 12-01-03-0029 2 3 4 5 6 7 10 23 41 24 190 3:10 23
+Iced Taiwanese Tea café Latte 12-01-03-0030 1 2 3 4 5 10 23 41 24 178 2:58 29
+Iced Matcha café Latte 12-01-03-0031 2 3 4 5 8 9 7 23 41 24 204 3:24 25
+Hot thai milk tea 12-02-01-0024 1 6 7 10 24 78 1:18 25
+Hot Taiwanese Tea 12-02-01-0025 1 6 7 10 24 90 1:30 29
+Hot matcha latte 12-02-01-0026 1 6 7 8 9 24 149 2:29 36
+HOT MATCHA 12-02-01-0027 1 16 8 9 24 100 14:40 32
+HOT MATCHA LIMENADE 12-02-01-0028 1 8 9 12 16 24 1 1 32
+Iced Thai milk Tea 12-02-02-0024 1 6 7 10 23 24 165 2:45 40
+Iced Taiwanese Tea 12-02-02-0025 1 6 7 10 23 24 104 1:44 25
+Iced matcha latte 12-02-02-0026 1 6 7 8 9 23 24 175 2:55 34
+ICED MATCHA 12-02-02-0027 1 16 8 9 23 24 100 15:40 32
+ICED MATCHA LIMENADE 12-02-02-0028 1 8 9 12 23 24 1 1 32
+ICED MATCHA 12-02-02-0029 1 16 8 9 23 24 100 15:40 32
+ICED MATCHA LIMENADE 12-02-02-0030 1 8 9 12 23 24 1 1 32
+ICED MATCHA 12-02-02-0031 1 16 8 9 23 24 100 15:40 32
+ICED MATCHA LIMENADE 12-02-02-0032 1 8 9 12 23 24 1 1 32
+Iced Thai milk Tea 12-02-03-0024 1 6 7 10 23 41 24 165 2:45 40
+Iced Taiwanese Tea 12-02-03-0025 1 6 7 10 23 41 24 104 1:44 25
+Iced matcha latte 12-02-03-0026 1 6 7 8 9 23 41 24 175 2:55 34
+ICED MATCHA 12-02-03-0027 1 16 8 9 23 41 24 100 15:40 32
+ICED MATCHA LIMENADE 12-02-03-0028 1 8 9 12 23 41 24 1 1 32
+THAI TEA SHAKE 12-04-02-0015 1 25 26 6 7 10 23 24 223 3:43 37
+MATCHA SHAKE 12-04-02-0016 1 25 26 9 6 7 23 24 181 3:01 30
+TAIWANESE TEA SHAKE 12-04-02-0017 1 25 26 10 17 23 24 197 3:17 39
+PLAIN PROTEIN 12-04-02-1018 1 25 26 23 24 100 1:40 32
+ESPRESSO SHAKE 12-04-02-1019 1 25 26 2 3 4 5 17 23 24 230 3:50 28
+CHOCOLATE SHAKE 12-04-02-1020 1 25 26 6 7 15 23 24 219 3:39 36
+THAI TEA SHAKE 12-04-02-1021 1 25 26 6 7 10 23 24 223 3:43 37
+
+
+
+
+
+
+
+
+
+
+
+
Coke 12-05-02-0019 1 23 37 13 24 49 0:49 23
Coke 12-05-03-0019 1 23 37 13 41 24 49 0:49 23
diff --git a/image/page_doing/txt_6.png b/image/page_doing/txt_6.png
index a4e364fe..74400a40 100644
Binary files a/image/page_doing/txt_6.png and b/image/page_doing/txt_6.png differ
diff --git a/image/page_doing/txt_6_en.png b/image/page_doing/txt_6_en.png
index 7ebe420b..da18d1c5 100644
Binary files a/image/page_doing/txt_6_en.png and b/image/page_doing/txt_6_en.png differ
diff --git a/xml/page_catalog_choose_drink2.pml b/xml/page_catalog_choose_drink2.pml
index 93cf59c1..e393d425 100644
--- a/xml/page_catalog_choose_drink2.pml
+++ b/xml/page_catalog_choose_drink2.pml
@@ -33,6 +33,8 @@
product_code.append('12-01-01-0005')
product_code.append('12-01-01-0006')
product_code.append('12-01-01-0007')
+ product_code.append('12-01-01-0008')
+ product_code.append('12-01-01-0031')
product_code.append('12-01-01-0009')
product_code.append('12-01-01-0010')
@@ -67,6 +69,7 @@
product_code.append('12-01-02-0003')
product_code.append('12-01-02-0004')
product_code.append('12-01-02-0005')
+ product_code.append('12-01-02-0031')
product_code.append('12-01-02-0007')
product_code.append('12-01-02-0008')
diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml
index ea930fe6..947f7ae3 100644
--- a/xml/page_catalog_choose_drink2.xml
+++ b/xml/page_catalog_choose_drink2.xml
@@ -2308,7 +2308,219 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=20 12-01-01-0009
+ ; button i=20 12-01-01-0008
+
+ 33
+ 22
+ 225
+ 296
+ $12-01-01-0008.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-01-01-0008.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-01-01-0008.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-01-01-0008.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-01-01-0008.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-01-01-0008.descriptionE
+
+
+ 2
+ 2
+ eval( STRCONTAIN "Smoothie" $12-01-01-0008.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
+)
+ "ROOT/taobin_project/image/topping2/blender_icon.png"
+
+
+ ; button i=21 12-01-01-0031
+
+ 33
+ 22
+ 225
+ 296
+ $12-01-01-0031.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-01-01-0031.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-01-01-0031.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-01-01-0031.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-01-01-0031.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-01-01-0031.descriptionE
+
+
+ 2
+ 2
+ eval( STRCONTAIN "Smoothie" $12-01-01-0031.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
+)
+ "ROOT/taobin_project/image/topping2/blender_icon.png"
+
+
+ ; button i=22 12-01-01-0009
33
22
@@ -2414,7 +2626,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=21 12-01-01-0010
+ ; button i=23 12-01-01-0010
33
22
@@ -2520,7 +2732,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=22 12-01-01-0011
+ ; button i=24 12-01-01-0011
33
22
@@ -2626,7 +2838,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=23 12-01-01-0012
+ ; button i=25 12-01-01-0012
33
22
@@ -2732,7 +2944,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=24 12-01-01-0017
+ ; button i=26 12-01-01-0017
33
22
@@ -2838,7 +3050,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=25 12-01-02-0018
+ ; button i=27 12-01-02-0018
33
22
@@ -2944,7 +3156,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=26 12-01-02-0020
+ ; button i=28 12-01-02-0020
33
22
@@ -3050,7 +3262,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=27 12-01-02-0022
+ ; button i=29 12-01-02-0022
33
22
@@ -3156,7 +3368,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=28 12-01-02-0026
+ ; button i=30 12-01-02-0026
33
22
@@ -3262,7 +3474,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=29 12-01-02-0024
+ ; button i=31 12-01-02-0024
33
22
@@ -3368,7 +3580,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=30 12-01-02-0028
+ ; button i=32 12-01-02-0028
33
22
@@ -3474,7 +3686,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=31 12-11-02-0001
+ ; button i=33 12-11-02-0001
33
22
@@ -3580,7 +3792,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=32 12-01-02-0001
+ ; button i=34 12-01-02-0001
33
22
@@ -3686,7 +3898,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=33 12-01-02-0011
+ ; button i=35 12-01-02-0011
33
22
@@ -3792,7 +4004,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=34 12-01-02-0019
+ ; button i=36 12-01-02-0019
33
22
@@ -3898,7 +4110,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=35 12-01-02-0021
+ ; button i=37 12-01-02-0021
33
22
@@ -4004,7 +4216,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=36 12-01-02-0025
+ ; button i=38 12-01-02-0025
33
22
@@ -4110,7 +4322,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=37 12-01-02-0023
+ ; button i=39 12-01-02-0023
33
22
@@ -4216,7 +4428,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=38 12-01-02-0027
+ ; button i=40 12-01-02-0027
33
22
@@ -4322,7 +4534,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=39 12-01-02-0002
+ ; button i=41 12-01-02-0002
33
22
@@ -4428,7 +4640,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=40 12-11-02-0002
+ ; button i=42 12-11-02-0002
33
22
@@ -4534,7 +4746,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=41 12-01-02-0003
+ ; button i=43 12-01-02-0003
33
22
@@ -4640,7 +4852,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=42 12-01-02-0004
+ ; button i=44 12-01-02-0004
33
22
@@ -4746,7 +4958,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=43 12-01-02-0005
+ ; button i=45 12-01-02-0005
33
22
@@ -4852,7 +5064,113 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=44 12-01-02-0007
+ ; button i=46 12-01-02-0031
+
+ 33
+ 22
+ 225
+ 296
+ $12-01-02-0031.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-01-02-0031.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-01-02-0031.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-01-02-0031.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-01-02-0031.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-01-02-0031.descriptionE
+
+
+ 2
+ 2
+ eval( STRCONTAIN "Smoothie" $12-01-02-0031.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
+)
+ "ROOT/taobin_project/image/topping2/blender_icon.png"
+
+
+ ; button i=47 12-01-02-0007
33
22
@@ -4958,7 +5276,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=45 12-01-02-0008
+ ; button i=48 12-01-02-0008
33
22
@@ -5064,7 +5382,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=46 12-01-02-0009
+ ; button i=49 12-01-02-0009
33
22
@@ -5170,7 +5488,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=47 12-01-02-0017
+ ; button i=50 12-01-02-0017
33
22
@@ -5276,7 +5594,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=48 12-01-02-0006
+ ; button i=51 12-01-02-0006
33
22
diff --git a/xml/page_catalog_choose_drink3.pml b/xml/page_catalog_choose_drink3.pml
index e5bf9c0b..8b58fdaa 100644
--- a/xml/page_catalog_choose_drink3.pml
+++ b/xml/page_catalog_choose_drink3.pml
@@ -12,6 +12,7 @@
product_code.append('12-02-01-0003')
product_code.append('12-02-01-0004')
+ product_code.append('12-02-01-0026')
#product_code.append('12-02-01-0005') #HOT BLACK TEA
@@ -26,7 +27,9 @@
product_code.append('12-02-01-0022')
product_code.append('12-02-01-0010')
product_code.append('12-02-01-0011')
+ product_code.append('12-02-01-0027')
product_code.append('12-02-01-0012')
+ product_code.append('12-02-01-0028')
product_code.append('12-02-01-0017')
product_code.append('12-02-02-0020')
@@ -35,6 +38,8 @@
product_code.append('12-02-02-0002')
product_code.append('12-02-02-0003')
product_code.append('12-02-02-0004')
+ product_code.append('12-02-02-0026')
+
product_code.append('12-02-02-0005')
product_code.append('12-02-02-0006')
product_code.append('12-02-02-0007')
@@ -45,7 +50,9 @@
product_code.append('12-02-02-0022')
product_code.append('12-02-02-0010')
product_code.append('12-02-02-0011')
+ product_code.append('12-02-02-0027')
product_code.append('12-02-02-0012')
+ product_code.append('12-02-02-0028')
product_code.append('12-05-02-0027')
menu_count = len( product_code)
diff --git a/xml/page_catalog_choose_drink3.xml b/xml/page_catalog_choose_drink3.xml
index 3955c0e8..9beb5ad9 100644
--- a/xml/page_catalog_choose_drink3.xml
+++ b/xml/page_catalog_choose_drink3.xml
@@ -820,7 +820,113 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=6 12-02-01-0006
+ ; button i=6 12-02-01-0026
+
+ 33
+ 22
+ 225
+ 296
+ $12-02-01-0026.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-02-01-0026.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-02-01-0026.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-02-01-0026.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-02-01-0026.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-02-01-0026.descriptionE
+
+
+ 2
+ 2
+ eval( STRCONTAIN "Smoothie" $12-02-01-0026.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
+)
+ "ROOT/taobin_project/image/topping2/blender_icon.png"
+
+
+ ; button i=7 12-02-01-0006
33
22
@@ -926,7 +1032,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=7 12-02-01-0021
+ ; button i=8 12-02-01-0021
33
22
@@ -1032,7 +1138,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=8 12-02-01-0007
+ ; button i=9 12-02-01-0007
33
22
@@ -1138,7 +1244,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=9 12-02-01-0008
+ ; button i=10 12-02-01-0008
33
22
@@ -1244,7 +1350,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=10 12-02-01-0019
+ ; button i=11 12-02-01-0019
33
22
@@ -1350,7 +1456,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=11 12-02-01-0009
+ ; button i=12 12-02-01-0009
33
22
@@ -1456,7 +1562,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=12 12-02-01-0022
+ ; button i=13 12-02-01-0022
33
22
@@ -1562,7 +1668,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=13 12-02-01-0010
+ ; button i=14 12-02-01-0010
33
22
@@ -1668,7 +1774,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=14 12-02-01-0011
+ ; button i=15 12-02-01-0011
33
22
@@ -1774,7 +1880,113 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=15 12-02-01-0012
+ ; button i=16 12-02-01-0027
+
+ 33
+ 22
+ 225
+ 296
+ $12-02-01-0027.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-02-01-0027.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-02-01-0027.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-02-01-0027.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-02-01-0027.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-02-01-0027.descriptionE
+
+
+ 2
+ 2
+ eval( STRCONTAIN "Smoothie" $12-02-01-0027.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
+)
+ "ROOT/taobin_project/image/topping2/blender_icon.png"
+
+
+ ; button i=17 12-02-01-0012
33
22
@@ -1880,7 +2092,113 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=16 12-02-01-0017
+ ; button i=18 12-02-01-0028
+
+ 33
+ 22
+ 225
+ 296
+ $12-02-01-0028.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-02-01-0028.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-02-01-0028.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-02-01-0028.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-02-01-0028.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-02-01-0028.descriptionE
+
+
+ 2
+ 2
+ eval( STRCONTAIN "Smoothie" $12-02-01-0028.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
+)
+ "ROOT/taobin_project/image/topping2/blender_icon.png"
+
+
+ ; button i=19 12-02-01-0017
33
22
@@ -1986,7 +2304,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=17 12-02-02-0020
+ ; button i=20 12-02-02-0020
33
22
@@ -2092,7 +2410,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=18 12-02-02-0001
+ ; button i=21 12-02-02-0001
33
22
@@ -2198,7 +2516,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=19 12-02-02-0002
+ ; button i=22 12-02-02-0002
33
22
@@ -2304,7 +2622,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=20 12-02-02-0003
+ ; button i=23 12-02-02-0003
33
22
@@ -2410,7 +2728,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=21 12-02-02-0004
+ ; button i=24 12-02-02-0004
33
22
@@ -2516,7 +2834,113 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=22 12-02-02-0005
+ ; button i=25 12-02-02-0026
+
+ 33
+ 22
+ 225
+ 296
+ $12-02-02-0026.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-02-02-0026.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-02-02-0026.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-02-02-0026.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-02-02-0026.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-02-02-0026.descriptionE
+
+
+ 2
+ 2
+ eval( STRCONTAIN "Smoothie" $12-02-02-0026.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
+)
+ "ROOT/taobin_project/image/topping2/blender_icon.png"
+
+
+ ; button i=26 12-02-02-0005
33
22
@@ -2622,7 +3046,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=23 12-02-02-0006
+ ; button i=27 12-02-02-0006
33
22
@@ -2728,7 +3152,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=24 12-02-02-0007
+ ; button i=28 12-02-02-0007
33
22
@@ -2834,7 +3258,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=25 12-02-02-0008
+ ; button i=29 12-02-02-0008
33
22
@@ -2940,7 +3364,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=26 12-02-02-0019
+ ; button i=30 12-02-02-0019
33
22
@@ -3046,7 +3470,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=27 12-02-02-0009
+ ; button i=31 12-02-02-0009
33
22
@@ -3152,7 +3576,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=28 12-02-02-0022
+ ; button i=32 12-02-02-0022
33
22
@@ -3258,7 +3682,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=29 12-02-02-0010
+ ; button i=33 12-02-02-0010
33
22
@@ -3364,7 +3788,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=30 12-02-02-0011
+ ; button i=34 12-02-02-0011
33
22
@@ -3470,7 +3894,113 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=31 12-02-02-0012
+ ; button i=35 12-02-02-0027
+
+ 33
+ 22
+ 225
+ 296
+ $12-02-02-0027.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-02-02-0027.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-02-02-0027.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-02-02-0027.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-02-02-0027.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-02-02-0027.descriptionE
+
+
+ 2
+ 2
+ eval( STRCONTAIN "Smoothie" $12-02-02-0027.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
+)
+ "ROOT/taobin_project/image/topping2/blender_icon.png"
+
+
+ ; button i=36 12-02-02-0012
33
22
@@ -3576,7 +4106,113 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=32 12-05-02-0027
+ ; button i=37 12-02-02-0028
+
+ 33
+ 22
+ 225
+ 296
+ $12-02-02-0028.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-02-02-0028.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-02-02-0028.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-02-02-0028.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-02-02-0028.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-02-02-0028.descriptionE
+
+
+ 2
+ 2
+ eval( STRCONTAIN "Smoothie" $12-02-02-0028.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
+)
+ "ROOT/taobin_project/image/topping2/blender_icon.png"
+
+
+ ; button i=38 12-05-02-0027
33
22
diff --git a/xml/page_catalog_choose_drink7.pml b/xml/page_catalog_choose_drink7.pml
index 993699b7..f7d7f7fb 100644
--- a/xml/page_catalog_choose_drink7.pml
+++ b/xml/page_catalog_choose_drink7.pml
@@ -7,6 +7,7 @@
product_code = []
product_code.append('12-04-02-0001')
+ product_code.append('12-04-02-0016')
product_code.append('12-04-02-0002')
product_code.append('12-04-02-0003')
product_code.append('12-04-02-0013')
diff --git a/xml/page_catalog_choose_drink7.xml b/xml/page_catalog_choose_drink7.xml
index 13529bb7..cd09fe6f 100644
--- a/xml/page_catalog_choose_drink7.xml
+++ b/xml/page_catalog_choose_drink7.xml
@@ -397,7 +397,113 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=2 12-04-02-0002
+ ; button i=2 12-04-02-0016
+
+ 33
+ 22
+ 225
+ 296
+ $12-04-02-0016.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-04-02-0016.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-04-02-0016.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-04-02-0016.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-04-02-0016.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-04-02-0016.descriptionE
+
+
+ 2
+ 2
+ eval( STRCONTAIN "Smoothie" $12-04-02-0016.Button SmoRet
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+ EndIf
+)
+ "ROOT/taobin_project/image/topping2/blender_icon.png"
+
+
+ ; button i=3 12-04-02-0002
33
22
@@ -503,7 +609,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=3 12-04-02-0003
+ ; button i=4 12-04-02-0003
33
22
@@ -609,7 +715,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=4 12-04-02-0013
+ ; button i=5 12-04-02-0013
33
22
@@ -715,7 +821,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=5 12-04-02-0004
+ ; button i=6 12-04-02-0004
33
22
@@ -821,7 +927,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=6 12-04-02-0005
+ ; button i=7 12-04-02-0005
33
22
@@ -927,7 +1033,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=7 12-04-02-0006
+ ; button i=8 12-04-02-0006
33
22
@@ -1033,7 +1139,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=8 12-04-02-0007
+ ; button i=9 12-04-02-0007
33
22
@@ -1139,7 +1245,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=9 12-04-02-0008
+ ; button i=10 12-04-02-0008
33
22
@@ -1245,7 +1351,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=10 12-04-02-0009
+ ; button i=11 12-04-02-0009
33
22
@@ -1351,7 +1457,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=11 12-04-02-0010
+ ; button i=12 12-04-02-0010
33
22
@@ -1457,7 +1563,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=12 12-04-02-0011
+ ; button i=13 12-04-02-0011
33
22
@@ -1563,7 +1669,7 @@
"ROOT/taobin_project/image/topping2/blender_icon.png"
- ; button i=13 12-04-02-0014
+ ; button i=14 12-04-02-0014
33
22