diff --git a/xml/page_catalog_choose_drink6.pml b/xml/page_catalog_choose_drink6.pml
index 7c8b546b..a9276c98 100644
--- a/xml/page_catalog_choose_drink6.pml
+++ b/xml/page_catalog_choose_drink6.pml
@@ -23,6 +23,7 @@
product_code.append('12-05-02-0008')
product_code.append('12-05-02-0009')
+ product_code.append('12-05-02-0024')
product_code.append('12-05-02-0029')
@@ -35,7 +36,8 @@
product_code.append('12-05-02-0005')
product_code.append('12-05-02-0006')
- product_code.append('12-05-02-0024')
+ product_code.append('12-05-02-0026')
+
product_code.append('12-05-02-0030')
product_code.append('12-05-02-0002')
diff --git a/xml/page_catalog_choose_drink6.xml b/xml/page_catalog_choose_drink6.xml
index d2bbdb4f..6c30dc9d 100644
--- a/xml/page_catalog_choose_drink6.xml
+++ b/xml/page_catalog_choose_drink6.xml
@@ -1275,743 +1275,7 @@
$12-05-02-0009.descriptionE
- ; button i=12 12-05-02-0029
-
- 33
- 22
- 225
- 296
- $12-05-02-0029.Button
-
-
- 182
- 12
- ShowPrice
- "Hurr"
- 150
- 27
- KanitTTF
- 0xB78F24
- $12-05-02-0029.Price
-
-
- 164
- 12
- ShowPrice
- 20
- 27
- KanitTTF
- 0xB78F24
- "฿""
-
-
- 16
- 190
- 24
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showthaiText
- $12-05-02-0029.Name
-
-
- 16
- 246
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showthaiText
- $12-05-02-0029.description
-
-
- 16
- 190
- 22
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showengText
- $12-05-02-0029.NameE
-
-
- 16
- 246
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showengText
- $12-05-02-0029.descriptionE
-
-
- ; button i=13 12-05-02-0014
-
- 33
- 22
- 225
- 296
- $12-05-02-0014.Button
-
-
- 182
- 12
- ShowPrice
- "Hurr"
- 150
- 27
- KanitTTF
- 0xB78F24
- $12-05-02-0014.Price
-
-
- 164
- 12
- ShowPrice
- 20
- 27
- KanitTTF
- 0xB78F24
- "฿""
-
-
- 16
- 190
- 24
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showthaiText
- $12-05-02-0014.Name
-
-
- 16
- 246
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showthaiText
- $12-05-02-0014.description
-
-
- 16
- 190
- 22
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showengText
- $12-05-02-0014.NameE
-
-
- 16
- 246
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showengText
- $12-05-02-0014.descriptionE
-
-
- ; button i=14 12-05-02-0015
-
- 33
- 22
- 225
- 296
- $12-05-02-0015.Button
-
-
- 182
- 12
- ShowPrice
- "Hurr"
- 150
- 27
- KanitTTF
- 0xB78F24
- $12-05-02-0015.Price
-
-
- 164
- 12
- ShowPrice
- 20
- 27
- KanitTTF
- 0xB78F24
- "฿""
-
-
- 16
- 190
- 24
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showthaiText
- $12-05-02-0015.Name
-
-
- 16
- 246
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showthaiText
- $12-05-02-0015.description
-
-
- 16
- 190
- 22
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showengText
- $12-05-02-0015.NameE
-
-
- 16
- 246
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showengText
- $12-05-02-0015.descriptionE
-
-
- ; button i=15 12-05-01-0001
-
- 33
- 22
- 225
- 296
- $12-05-01-0001.Button
-
-
- 182
- 12
- ShowPrice
- "Hurr"
- 150
- 27
- KanitTTF
- 0xB78F24
- $12-05-01-0001.Price
-
-
- 164
- 12
- ShowPrice
- 20
- 27
- KanitTTF
- 0xB78F24
- "฿""
-
-
- 16
- 190
- 24
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showthaiText
- $12-05-01-0001.Name
-
-
- 16
- 246
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showthaiText
- $12-05-01-0001.description
-
-
- 16
- 190
- 22
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showengText
- $12-05-01-0001.NameE
-
-
- 16
- 246
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showengText
- $12-05-01-0001.descriptionE
-
-
- ; button i=16 12-05-02-0001
-
- 33
- 22
- 225
- 296
- $12-05-02-0001.Button
-
-
- 182
- 12
- ShowPrice
- "Hurr"
- 150
- 27
- KanitTTF
- 0xB78F24
- $12-05-02-0001.Price
-
-
- 164
- 12
- ShowPrice
- 20
- 27
- KanitTTF
- 0xB78F24
- "฿""
-
-
- 16
- 190
- 24
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showthaiText
- $12-05-02-0001.Name
-
-
- 16
- 246
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showthaiText
- $12-05-02-0001.description
-
-
- 16
- 190
- 22
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showengText
- $12-05-02-0001.NameE
-
-
- 16
- 246
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showengText
- $12-05-02-0001.descriptionE
-
-
- ; button i=17 12-05-02-0004
-
- 33
- 22
- 225
- 296
- $12-05-02-0004.Button
-
-
- 182
- 12
- ShowPrice
- "Hurr"
- 150
- 27
- KanitTTF
- 0xB78F24
- $12-05-02-0004.Price
-
-
- 164
- 12
- ShowPrice
- 20
- 27
- KanitTTF
- 0xB78F24
- "฿""
-
-
- 16
- 190
- 24
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showthaiText
- $12-05-02-0004.Name
-
-
- 16
- 246
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showthaiText
- $12-05-02-0004.description
-
-
- 16
- 190
- 22
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showengText
- $12-05-02-0004.NameE
-
-
- 16
- 246
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showengText
- $12-05-02-0004.descriptionE
-
-
- ; button i=18 12-05-02-0005
-
- 33
- 22
- 225
- 296
- $12-05-02-0005.Button
-
-
- 182
- 12
- ShowPrice
- "Hurr"
- 150
- 27
- KanitTTF
- 0xB78F24
- $12-05-02-0005.Price
-
-
- 164
- 12
- ShowPrice
- 20
- 27
- KanitTTF
- 0xB78F24
- "฿""
-
-
- 16
- 190
- 24
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showthaiText
- $12-05-02-0005.Name
-
-
- 16
- 246
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showthaiText
- $12-05-02-0005.description
-
-
- 16
- 190
- 22
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showengText
- $12-05-02-0005.NameE
-
-
- 16
- 246
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showengText
- $12-05-02-0005.descriptionE
-
-
- ; button i=19 12-05-02-0006
-
- 33
- 22
- 225
- 296
- $12-05-02-0006.Button
-
-
- 182
- 12
- ShowPrice
- "Hurr"
- 150
- 27
- KanitTTF
- 0xB78F24
- $12-05-02-0006.Price
-
-
- 164
- 12
- ShowPrice
- 20
- 27
- KanitTTF
- 0xB78F24
- "฿""
-
-
- 16
- 190
- 24
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showthaiText
- $12-05-02-0006.Name
-
-
- 16
- 246
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showthaiText
- $12-05-02-0006.description
-
-
- 16
- 190
- 22
- 220
- "multi2"
- KanitMediumTTF
- 0x322B26
- showengText
- $12-05-02-0006.NameE
-
-
- 16
- 246
- 14
- 220
- KanitMediumTTF
- 0x6F5F51
- showengText
- $12-05-02-0006.descriptionE
-
-
- ; button i=20 12-05-02-0024
+ ; button i=12 12-05-02-0024
33
22
@@ -2103,7 +1367,835 @@
$12-05-02-0024.descriptionE
- ; button i=21 12-05-02-0030
+ ; button i=13 12-05-02-0029
+
+ 33
+ 22
+ 225
+ 296
+ $12-05-02-0029.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-05-02-0029.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-05-02-0029.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-05-02-0029.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-05-02-0029.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-05-02-0029.descriptionE
+
+
+ ; button i=14 12-05-02-0014
+
+ 33
+ 22
+ 225
+ 296
+ $12-05-02-0014.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-05-02-0014.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-05-02-0014.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-05-02-0014.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-05-02-0014.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-05-02-0014.descriptionE
+
+
+ ; button i=15 12-05-02-0015
+
+ 33
+ 22
+ 225
+ 296
+ $12-05-02-0015.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-05-02-0015.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-05-02-0015.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-05-02-0015.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-05-02-0015.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-05-02-0015.descriptionE
+
+
+ ; button i=16 12-05-01-0001
+
+ 33
+ 22
+ 225
+ 296
+ $12-05-01-0001.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-05-01-0001.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-05-01-0001.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-05-01-0001.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-05-01-0001.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-05-01-0001.descriptionE
+
+
+ ; button i=17 12-05-02-0001
+
+ 33
+ 22
+ 225
+ 296
+ $12-05-02-0001.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-05-02-0001.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-05-02-0001.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-05-02-0001.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-05-02-0001.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-05-02-0001.descriptionE
+
+
+ ; button i=18 12-05-02-0004
+
+ 33
+ 22
+ 225
+ 296
+ $12-05-02-0004.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-05-02-0004.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-05-02-0004.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-05-02-0004.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-05-02-0004.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-05-02-0004.descriptionE
+
+
+ ; button i=19 12-05-02-0005
+
+ 33
+ 22
+ 225
+ 296
+ $12-05-02-0005.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-05-02-0005.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-05-02-0005.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-05-02-0005.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-05-02-0005.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-05-02-0005.descriptionE
+
+
+ ; button i=20 12-05-02-0006
+
+ 33
+ 22
+ 225
+ 296
+ $12-05-02-0006.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-05-02-0006.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-05-02-0006.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-05-02-0006.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-05-02-0006.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-05-02-0006.descriptionE
+
+
+ ; button i=21 12-05-02-0026
+
+ 33
+ 22
+ 225
+ 296
+ $12-05-02-0026.Button
+
+
+ 182
+ 12
+ ShowPrice
+ "Hurr"
+ 150
+ 27
+ KanitTTF
+ 0xB78F24
+ $12-05-02-0026.Price
+
+
+ 164
+ 12
+ ShowPrice
+ 20
+ 27
+ KanitTTF
+ 0xB78F24
+ "฿""
+
+
+ 16
+ 190
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ $12-05-02-0026.Name
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ $12-05-02-0026.description
+
+
+ 16
+ 190
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ $12-05-02-0026.NameE
+
+
+ 16
+ 246
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ $12-05-02-0026.descriptionE
+
+
+ ; button i=22 12-05-02-0030
33
22
@@ -2195,7 +2287,7 @@
$12-05-02-0030.descriptionE
- ; button i=22 12-05-02-0002
+ ; button i=23 12-05-02-0002
33
22
@@ -2287,7 +2379,7 @@
$12-05-02-0002.descriptionE
- ; button i=23 12-05-02-0003
+ ; button i=24 12-05-02-0003
33
22
@@ -2379,7 +2471,7 @@
$12-05-02-0003.descriptionE
- ; button i=24 12-05-02-0016
+ ; button i=25 12-05-02-0016
33
22
@@ -2471,7 +2563,7 @@
$12-05-02-0016.descriptionE
- ; button i=25 12-05-02-0017
+ ; button i=26 12-05-02-0017
33
22
@@ -2563,7 +2655,7 @@
$12-05-02-0017.descriptionE
- ; button i=26 12-05-02-0018
+ ; button i=27 12-05-02-0018
33
22
@@ -2655,7 +2747,7 @@
$12-05-02-0018.descriptionE
- ; button i=27 12-05-01-0002
+ ; button i=28 12-05-01-0002
33
22