diff --git a/image/page_drink_disable_n2/bn_TAOTIM_Banana.png b/image/page_drink_disable_n2/bn_TAOTIM_Banana.png
new file mode 100644
index 00000000..e022b088
Binary files /dev/null and b/image/page_drink_disable_n2/bn_TAOTIM_Banana.png differ
diff --git a/image/page_drink_disable_n2/bn_TAOTIM_Biskit.png b/image/page_drink_disable_n2/bn_TAOTIM_Biskit.png
new file mode 100644
index 00000000..1d034e0a
Binary files /dev/null and b/image/page_drink_disable_n2/bn_TAOTIM_Biskit.png differ
diff --git a/image/page_drink_disable_n2/bn_TAOTIM_Caramel.png b/image/page_drink_disable_n2/bn_TAOTIM_Caramel.png
new file mode 100644
index 00000000..9dc1881f
Binary files /dev/null and b/image/page_drink_disable_n2/bn_TAOTIM_Caramel.png differ
diff --git a/image/page_drink_disable_n2/bn_TAOTIM_Coffee.png b/image/page_drink_disable_n2/bn_TAOTIM_Coffee.png
new file mode 100644
index 00000000..36b733f5
Binary files /dev/null and b/image/page_drink_disable_n2/bn_TAOTIM_Coffee.png differ
diff --git a/image/page_drink_disable_n2/bn_TAOTIM_Ginger.png b/image/page_drink_disable_n2/bn_TAOTIM_Ginger.png
new file mode 100644
index 00000000..6305f39f
Binary files /dev/null and b/image/page_drink_disable_n2/bn_TAOTIM_Ginger.png differ
diff --git a/image/page_drink_disable_n2/bn_TAOTIM_Jasmine.png b/image/page_drink_disable_n2/bn_TAOTIM_Jasmine.png
new file mode 100644
index 00000000..fdbb964a
Binary files /dev/null and b/image/page_drink_disable_n2/bn_TAOTIM_Jasmine.png differ
diff --git a/image/page_drink_disable_n2/bn_TAOTIM_Lime.png b/image/page_drink_disable_n2/bn_TAOTIM_Lime.png
new file mode 100644
index 00000000..a9a3182e
Binary files /dev/null and b/image/page_drink_disable_n2/bn_TAOTIM_Lime.png differ
diff --git a/image/page_drink_disable_n2/bn_TAOTIM_Lychee.png b/image/page_drink_disable_n2/bn_TAOTIM_Lychee.png
new file mode 100644
index 00000000..72b8ab0d
Binary files /dev/null and b/image/page_drink_disable_n2/bn_TAOTIM_Lychee.png differ
diff --git a/image/page_drink_disable_n2/bn_TAOTIM_Matcha.png b/image/page_drink_disable_n2/bn_TAOTIM_Matcha.png
new file mode 100644
index 00000000..d578b7b5
Binary files /dev/null and b/image/page_drink_disable_n2/bn_TAOTIM_Matcha.png differ
diff --git a/image/page_drink_disable_n2/bn_TAOTIM_Melon.png b/image/page_drink_disable_n2/bn_TAOTIM_Melon.png
new file mode 100644
index 00000000..46d3abd0
Binary files /dev/null and b/image/page_drink_disable_n2/bn_TAOTIM_Melon.png differ
diff --git a/image/page_drink_disable_n2/bn_TAOTIM_Mint.png b/image/page_drink_disable_n2/bn_TAOTIM_Mint.png
new file mode 100644
index 00000000..3f762716
Binary files /dev/null and b/image/page_drink_disable_n2/bn_TAOTIM_Mint.png differ
diff --git a/image/page_drink_disable_n2/bn_TAOTIM_Orange.png b/image/page_drink_disable_n2/bn_TAOTIM_Orange.png
new file mode 100644
index 00000000..59127a6e
Binary files /dev/null and b/image/page_drink_disable_n2/bn_TAOTIM_Orange.png differ
diff --git a/image/page_drink_disable_n2/bn_TAOTIM_Oreo.png b/image/page_drink_disable_n2/bn_TAOTIM_Oreo.png
new file mode 100644
index 00000000..18098781
Binary files /dev/null and b/image/page_drink_disable_n2/bn_TAOTIM_Oreo.png differ
diff --git a/image/page_drink_disable_n2/bn_TAOTIM_Original-1.png b/image/page_drink_disable_n2/bn_TAOTIM_Original-1.png
new file mode 100644
index 00000000..af489039
Binary files /dev/null and b/image/page_drink_disable_n2/bn_TAOTIM_Original-1.png differ
diff --git a/image/page_drink_disable_n2/bn_TAOTIM_Original.png b/image/page_drink_disable_n2/bn_TAOTIM_Original.png
new file mode 100644
index 00000000..20fd8b10
Binary files /dev/null and b/image/page_drink_disable_n2/bn_TAOTIM_Original.png differ
diff --git a/image/page_drink_disable_n2/bn_TAOTIM_Peach.png b/image/page_drink_disable_n2/bn_TAOTIM_Peach.png
new file mode 100644
index 00000000..fa8033ee
Binary files /dev/null and b/image/page_drink_disable_n2/bn_TAOTIM_Peach.png differ
diff --git a/image/page_drink_disable_n2/bn_TAOTIM_Thai_Tea.png b/image/page_drink_disable_n2/bn_TAOTIM_Thai_Tea.png
new file mode 100644
index 00000000..54e1d701
Binary files /dev/null and b/image/page_drink_disable_n2/bn_TAOTIM_Thai_Tea.png differ
diff --git a/image/page_drink_disable_n2/bn_TAOTIM_strawberry.png b/image/page_drink_disable_n2/bn_TAOTIM_strawberry.png
new file mode 100644
index 00000000..b4716f89
Binary files /dev/null and b/image/page_drink_disable_n2/bn_TAOTIM_strawberry.png differ
diff --git a/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Banana.png b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Banana.png
new file mode 100644
index 00000000..15118ac3
Binary files /dev/null and b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Banana.png differ
diff --git a/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Biskit.png b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Biskit.png
new file mode 100644
index 00000000..05e85103
Binary files /dev/null and b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Biskit.png differ
diff --git a/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Caramel.png b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Caramel.png
new file mode 100644
index 00000000..92e889be
Binary files /dev/null and b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Caramel.png differ
diff --git a/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Coffee.png b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Coffee.png
new file mode 100644
index 00000000..3fb16044
Binary files /dev/null and b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Coffee.png differ
diff --git a/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Ginger.png b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Ginger.png
new file mode 100644
index 00000000..5d684314
Binary files /dev/null and b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Ginger.png differ
diff --git a/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Jasmine.png b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Jasmine.png
new file mode 100644
index 00000000..b164e33c
Binary files /dev/null and b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Jasmine.png differ
diff --git a/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Lime.png b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Lime.png
new file mode 100644
index 00000000..0b7313c7
Binary files /dev/null and b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Lime.png differ
diff --git a/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Lychee.png b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Lychee.png
new file mode 100644
index 00000000..d161eff1
Binary files /dev/null and b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Lychee.png differ
diff --git a/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Matcha.png b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Matcha.png
new file mode 100644
index 00000000..36a58af0
Binary files /dev/null and b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Matcha.png differ
diff --git a/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Melon.png b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Melon.png
new file mode 100644
index 00000000..40737cf2
Binary files /dev/null and b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Melon.png differ
diff --git a/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Mint.png b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Mint.png
new file mode 100644
index 00000000..3ec9cd8e
Binary files /dev/null and b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Mint.png differ
diff --git a/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Orange.png b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Orange.png
new file mode 100644
index 00000000..26cbeeb7
Binary files /dev/null and b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Orange.png differ
diff --git a/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Oreo.png b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Oreo.png
new file mode 100644
index 00000000..f431c6eb
Binary files /dev/null and b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Oreo.png differ
diff --git a/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Original-1.png b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Original-1.png
new file mode 100644
index 00000000..294eafd2
Binary files /dev/null and b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Original-1.png differ
diff --git a/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Original.png b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Original.png
new file mode 100644
index 00000000..1cdbb97c
Binary files /dev/null and b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Original.png differ
diff --git a/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Peach.png b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Peach.png
new file mode 100644
index 00000000..9db58033
Binary files /dev/null and b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Peach.png differ
diff --git a/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Thai_Tea.png b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Thai_Tea.png
new file mode 100644
index 00000000..e2f92a0e
Binary files /dev/null and b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_Thai_Tea.png differ
diff --git a/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_strawberry.png b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_strawberry.png
new file mode 100644
index 00000000..039a84d3
Binary files /dev/null and b/image/page_drink_disable_n2/page_drink_disable_n2/bn_TAOTIM_strawberry.png differ
diff --git a/image/page_drink_n/bn_TAOTIM_Banana.png b/image/page_drink_n/bn_TAOTIM_Banana.png
new file mode 100644
index 00000000..e7a96c5c
Binary files /dev/null and b/image/page_drink_n/bn_TAOTIM_Banana.png differ
diff --git a/image/page_drink_n/bn_TAOTIM_Biskit.png b/image/page_drink_n/bn_TAOTIM_Biskit.png
new file mode 100644
index 00000000..9fbfd1f9
Binary files /dev/null and b/image/page_drink_n/bn_TAOTIM_Biskit.png differ
diff --git a/image/page_drink_n/bn_TAOTIM_Caramel.png b/image/page_drink_n/bn_TAOTIM_Caramel.png
new file mode 100644
index 00000000..49fa8ef3
Binary files /dev/null and b/image/page_drink_n/bn_TAOTIM_Caramel.png differ
diff --git a/image/page_drink_n/bn_TAOTIM_Coffee.png b/image/page_drink_n/bn_TAOTIM_Coffee.png
new file mode 100644
index 00000000..68cf0a58
Binary files /dev/null and b/image/page_drink_n/bn_TAOTIM_Coffee.png differ
diff --git a/image/page_drink_n/bn_TAOTIM_Ginger.png b/image/page_drink_n/bn_TAOTIM_Ginger.png
new file mode 100644
index 00000000..d7a848ce
Binary files /dev/null and b/image/page_drink_n/bn_TAOTIM_Ginger.png differ
diff --git a/image/page_drink_n/bn_TAOTIM_Jasmine.png b/image/page_drink_n/bn_TAOTIM_Jasmine.png
new file mode 100644
index 00000000..7031a158
Binary files /dev/null and b/image/page_drink_n/bn_TAOTIM_Jasmine.png differ
diff --git a/image/page_drink_n/bn_TAOTIM_Lime.png b/image/page_drink_n/bn_TAOTIM_Lime.png
new file mode 100644
index 00000000..08b90238
Binary files /dev/null and b/image/page_drink_n/bn_TAOTIM_Lime.png differ
diff --git a/image/page_drink_n/bn_TAOTIM_Lychee.png b/image/page_drink_n/bn_TAOTIM_Lychee.png
new file mode 100644
index 00000000..215682bb
Binary files /dev/null and b/image/page_drink_n/bn_TAOTIM_Lychee.png differ
diff --git a/image/page_drink_n/bn_TAOTIM_Matcha.png b/image/page_drink_n/bn_TAOTIM_Matcha.png
new file mode 100644
index 00000000..7606f637
Binary files /dev/null and b/image/page_drink_n/bn_TAOTIM_Matcha.png differ
diff --git a/image/page_drink_n/bn_TAOTIM_Melon.png b/image/page_drink_n/bn_TAOTIM_Melon.png
new file mode 100644
index 00000000..7c00d0eb
Binary files /dev/null and b/image/page_drink_n/bn_TAOTIM_Melon.png differ
diff --git a/image/page_drink_n/bn_TAOTIM_Mint.png b/image/page_drink_n/bn_TAOTIM_Mint.png
new file mode 100644
index 00000000..05f32612
Binary files /dev/null and b/image/page_drink_n/bn_TAOTIM_Mint.png differ
diff --git a/image/page_drink_n/bn_TAOTIM_Orange.png b/image/page_drink_n/bn_TAOTIM_Orange.png
new file mode 100644
index 00000000..d0b63561
Binary files /dev/null and b/image/page_drink_n/bn_TAOTIM_Orange.png differ
diff --git a/image/page_drink_n/bn_TAOTIM_Oreo.png b/image/page_drink_n/bn_TAOTIM_Oreo.png
new file mode 100644
index 00000000..873421f0
Binary files /dev/null and b/image/page_drink_n/bn_TAOTIM_Oreo.png differ
diff --git a/image/page_drink_n/bn_TAOTIM_Original-1.png b/image/page_drink_n/bn_TAOTIM_Original-1.png
new file mode 100644
index 00000000..3d322a4e
Binary files /dev/null and b/image/page_drink_n/bn_TAOTIM_Original-1.png differ
diff --git a/image/page_drink_n/bn_TAOTIM_Original.png b/image/page_drink_n/bn_TAOTIM_Original.png
new file mode 100644
index 00000000..a15123b0
Binary files /dev/null and b/image/page_drink_n/bn_TAOTIM_Original.png differ
diff --git a/image/page_drink_n/bn_TAOTIM_Peach.png b/image/page_drink_n/bn_TAOTIM_Peach.png
new file mode 100644
index 00000000..dc49d8c6
Binary files /dev/null and b/image/page_drink_n/bn_TAOTIM_Peach.png differ
diff --git a/image/page_drink_n/bn_TAOTIM_Thai_Tea.png b/image/page_drink_n/bn_TAOTIM_Thai_Tea.png
new file mode 100644
index 00000000..3e5a65db
Binary files /dev/null and b/image/page_drink_n/bn_TAOTIM_Thai_Tea.png differ
diff --git a/image/page_drink_n/bn_TAOTIM_strawberry.png b/image/page_drink_n/bn_TAOTIM_strawberry.png
new file mode 100644
index 00000000..e86e186b
Binary files /dev/null and b/image/page_drink_n/bn_TAOTIM_strawberry.png differ
diff --git a/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Banana.png b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Banana.png
new file mode 100644
index 00000000..e7a96c5c
Binary files /dev/null and b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Banana.png differ
diff --git a/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Biskit.png b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Biskit.png
new file mode 100644
index 00000000..9fbfd1f9
Binary files /dev/null and b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Biskit.png differ
diff --git a/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Caramel.png b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Caramel.png
new file mode 100644
index 00000000..49fa8ef3
Binary files /dev/null and b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Caramel.png differ
diff --git a/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Coffee.png b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Coffee.png
new file mode 100644
index 00000000..68cf0a58
Binary files /dev/null and b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Coffee.png differ
diff --git a/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Ginger.png b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Ginger.png
new file mode 100644
index 00000000..d7a848ce
Binary files /dev/null and b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Ginger.png differ
diff --git a/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Jasmine.png b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Jasmine.png
new file mode 100644
index 00000000..7031a158
Binary files /dev/null and b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Jasmine.png differ
diff --git a/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Lime.png b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Lime.png
new file mode 100644
index 00000000..08b90238
Binary files /dev/null and b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Lime.png differ
diff --git a/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Lychee.png b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Lychee.png
new file mode 100644
index 00000000..215682bb
Binary files /dev/null and b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Lychee.png differ
diff --git a/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Matcha.png b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Matcha.png
new file mode 100644
index 00000000..7606f637
Binary files /dev/null and b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Matcha.png differ
diff --git a/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Melon.png b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Melon.png
new file mode 100644
index 00000000..7c00d0eb
Binary files /dev/null and b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Melon.png differ
diff --git a/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Mint.png b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Mint.png
new file mode 100644
index 00000000..05f32612
Binary files /dev/null and b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Mint.png differ
diff --git a/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Orange.png b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Orange.png
new file mode 100644
index 00000000..d0b63561
Binary files /dev/null and b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Orange.png differ
diff --git a/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Oreo.png b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Oreo.png
new file mode 100644
index 00000000..873421f0
Binary files /dev/null and b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Oreo.png differ
diff --git a/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Original-1.png b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Original-1.png
new file mode 100644
index 00000000..3d322a4e
Binary files /dev/null and b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Original-1.png differ
diff --git a/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Original.png b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Original.png
new file mode 100644
index 00000000..a15123b0
Binary files /dev/null and b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Original.png differ
diff --git a/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Peach.png b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Peach.png
new file mode 100644
index 00000000..dc49d8c6
Binary files /dev/null and b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Peach.png differ
diff --git a/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Thai_Tea.png b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Thai_Tea.png
new file mode 100644
index 00000000..3e5a65db
Binary files /dev/null and b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_Thai_Tea.png differ
diff --git a/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_strawberry.png b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_strawberry.png
new file mode 100644
index 00000000..e86e186b
Binary files /dev/null and b/image/page_drink_n/page_drink_disable_n2/bn_TAOTIM_strawberry.png differ
diff --git a/image/page_drink_picture2_n/bn_TAOTIM_Banana.png b/image/page_drink_picture2_n/bn_TAOTIM_Banana.png
new file mode 100644
index 00000000..1baeae0a
Binary files /dev/null and b/image/page_drink_picture2_n/bn_TAOTIM_Banana.png differ
diff --git a/image/page_drink_picture2_n/bn_TAOTIM_Biskit.png b/image/page_drink_picture2_n/bn_TAOTIM_Biskit.png
new file mode 100644
index 00000000..e454cccd
Binary files /dev/null and b/image/page_drink_picture2_n/bn_TAOTIM_Biskit.png differ
diff --git a/image/page_drink_picture2_n/bn_TAOTIM_Caramel.png b/image/page_drink_picture2_n/bn_TAOTIM_Caramel.png
new file mode 100644
index 00000000..98994b27
Binary files /dev/null and b/image/page_drink_picture2_n/bn_TAOTIM_Caramel.png differ
diff --git a/image/page_drink_picture2_n/bn_TAOTIM_Coffee.png b/image/page_drink_picture2_n/bn_TAOTIM_Coffee.png
new file mode 100644
index 00000000..1a949c67
Binary files /dev/null and b/image/page_drink_picture2_n/bn_TAOTIM_Coffee.png differ
diff --git a/image/page_drink_picture2_n/bn_TAOTIM_Ginger.png b/image/page_drink_picture2_n/bn_TAOTIM_Ginger.png
new file mode 100644
index 00000000..a35cba0a
Binary files /dev/null and b/image/page_drink_picture2_n/bn_TAOTIM_Ginger.png differ
diff --git a/image/page_drink_picture2_n/bn_TAOTIM_Jasmine.png b/image/page_drink_picture2_n/bn_TAOTIM_Jasmine.png
new file mode 100644
index 00000000..cbccb3a0
Binary files /dev/null and b/image/page_drink_picture2_n/bn_TAOTIM_Jasmine.png differ
diff --git a/image/page_drink_picture2_n/bn_TAOTIM_Lime.png b/image/page_drink_picture2_n/bn_TAOTIM_Lime.png
new file mode 100644
index 00000000..d3dc2271
Binary files /dev/null and b/image/page_drink_picture2_n/bn_TAOTIM_Lime.png differ
diff --git a/image/page_drink_picture2_n/bn_TAOTIM_Lychee.png b/image/page_drink_picture2_n/bn_TAOTIM_Lychee.png
new file mode 100644
index 00000000..75389273
Binary files /dev/null and b/image/page_drink_picture2_n/bn_TAOTIM_Lychee.png differ
diff --git a/image/page_drink_picture2_n/bn_TAOTIM_Matcha.png b/image/page_drink_picture2_n/bn_TAOTIM_Matcha.png
new file mode 100644
index 00000000..189355dd
Binary files /dev/null and b/image/page_drink_picture2_n/bn_TAOTIM_Matcha.png differ
diff --git a/image/page_drink_picture2_n/bn_TAOTIM_Melon.png b/image/page_drink_picture2_n/bn_TAOTIM_Melon.png
new file mode 100644
index 00000000..6b570ea3
Binary files /dev/null and b/image/page_drink_picture2_n/bn_TAOTIM_Melon.png differ
diff --git a/image/page_drink_picture2_n/bn_TAOTIM_Mint.png b/image/page_drink_picture2_n/bn_TAOTIM_Mint.png
new file mode 100644
index 00000000..9acd7b0e
Binary files /dev/null and b/image/page_drink_picture2_n/bn_TAOTIM_Mint.png differ
diff --git a/image/page_drink_picture2_n/bn_TAOTIM_Orange.png b/image/page_drink_picture2_n/bn_TAOTIM_Orange.png
new file mode 100644
index 00000000..03b29ddd
Binary files /dev/null and b/image/page_drink_picture2_n/bn_TAOTIM_Orange.png differ
diff --git a/image/page_drink_picture2_n/bn_TAOTIM_Oreo.png b/image/page_drink_picture2_n/bn_TAOTIM_Oreo.png
new file mode 100644
index 00000000..4be83ae8
Binary files /dev/null and b/image/page_drink_picture2_n/bn_TAOTIM_Oreo.png differ
diff --git a/image/page_drink_picture2_n/bn_TAOTIM_Original-1.png b/image/page_drink_picture2_n/bn_TAOTIM_Original-1.png
new file mode 100644
index 00000000..b02c2035
Binary files /dev/null and b/image/page_drink_picture2_n/bn_TAOTIM_Original-1.png differ
diff --git a/image/page_drink_picture2_n/bn_TAOTIM_Original.png b/image/page_drink_picture2_n/bn_TAOTIM_Original.png
new file mode 100644
index 00000000..626fc233
Binary files /dev/null and b/image/page_drink_picture2_n/bn_TAOTIM_Original.png differ
diff --git a/image/page_drink_picture2_n/bn_TAOTIM_Peach.png b/image/page_drink_picture2_n/bn_TAOTIM_Peach.png
new file mode 100644
index 00000000..74de0af5
Binary files /dev/null and b/image/page_drink_picture2_n/bn_TAOTIM_Peach.png differ
diff --git a/image/page_drink_picture2_n/bn_TAOTIM_Thai_Tea.png b/image/page_drink_picture2_n/bn_TAOTIM_Thai_Tea.png
new file mode 100644
index 00000000..bd95bf31
Binary files /dev/null and b/image/page_drink_picture2_n/bn_TAOTIM_Thai_Tea.png differ
diff --git a/image/page_drink_picture2_n/bn_TAOTIM_strawberry.png b/image/page_drink_picture2_n/bn_TAOTIM_strawberry.png
new file mode 100644
index 00000000..ba2ffdd0
Binary files /dev/null and b/image/page_drink_picture2_n/bn_TAOTIM_strawberry.png differ
diff --git a/image/page_drink_press_n/bn_TAOTIM_Banana.png b/image/page_drink_press_n/bn_TAOTIM_Banana.png
new file mode 100644
index 00000000..15118ac3
Binary files /dev/null and b/image/page_drink_press_n/bn_TAOTIM_Banana.png differ
diff --git a/image/page_drink_press_n/bn_TAOTIM_Biskit.png b/image/page_drink_press_n/bn_TAOTIM_Biskit.png
new file mode 100644
index 00000000..05e85103
Binary files /dev/null and b/image/page_drink_press_n/bn_TAOTIM_Biskit.png differ
diff --git a/image/page_drink_press_n/bn_TAOTIM_Caramel.png b/image/page_drink_press_n/bn_TAOTIM_Caramel.png
new file mode 100644
index 00000000..92e889be
Binary files /dev/null and b/image/page_drink_press_n/bn_TAOTIM_Caramel.png differ
diff --git a/image/page_drink_press_n/bn_TAOTIM_Coffee.png b/image/page_drink_press_n/bn_TAOTIM_Coffee.png
new file mode 100644
index 00000000..3fb16044
Binary files /dev/null and b/image/page_drink_press_n/bn_TAOTIM_Coffee.png differ
diff --git a/image/page_drink_press_n/bn_TAOTIM_Ginger.png b/image/page_drink_press_n/bn_TAOTIM_Ginger.png
new file mode 100644
index 00000000..5d684314
Binary files /dev/null and b/image/page_drink_press_n/bn_TAOTIM_Ginger.png differ
diff --git a/image/page_drink_press_n/bn_TAOTIM_Jasmine.png b/image/page_drink_press_n/bn_TAOTIM_Jasmine.png
new file mode 100644
index 00000000..b164e33c
Binary files /dev/null and b/image/page_drink_press_n/bn_TAOTIM_Jasmine.png differ
diff --git a/image/page_drink_press_n/bn_TAOTIM_Lime.png b/image/page_drink_press_n/bn_TAOTIM_Lime.png
new file mode 100644
index 00000000..0b7313c7
Binary files /dev/null and b/image/page_drink_press_n/bn_TAOTIM_Lime.png differ
diff --git a/image/page_drink_press_n/bn_TAOTIM_Lychee.png b/image/page_drink_press_n/bn_TAOTIM_Lychee.png
new file mode 100644
index 00000000..d161eff1
Binary files /dev/null and b/image/page_drink_press_n/bn_TAOTIM_Lychee.png differ
diff --git a/image/page_drink_press_n/bn_TAOTIM_Matcha.png b/image/page_drink_press_n/bn_TAOTIM_Matcha.png
new file mode 100644
index 00000000..36a58af0
Binary files /dev/null and b/image/page_drink_press_n/bn_TAOTIM_Matcha.png differ
diff --git a/image/page_drink_press_n/bn_TAOTIM_Melon.png b/image/page_drink_press_n/bn_TAOTIM_Melon.png
new file mode 100644
index 00000000..40737cf2
Binary files /dev/null and b/image/page_drink_press_n/bn_TAOTIM_Melon.png differ
diff --git a/image/page_drink_press_n/bn_TAOTIM_Mint.png b/image/page_drink_press_n/bn_TAOTIM_Mint.png
new file mode 100644
index 00000000..3ec9cd8e
Binary files /dev/null and b/image/page_drink_press_n/bn_TAOTIM_Mint.png differ
diff --git a/image/page_drink_press_n/bn_TAOTIM_Orange.png b/image/page_drink_press_n/bn_TAOTIM_Orange.png
new file mode 100644
index 00000000..26cbeeb7
Binary files /dev/null and b/image/page_drink_press_n/bn_TAOTIM_Orange.png differ
diff --git a/image/page_drink_press_n/bn_TAOTIM_Oreo.png b/image/page_drink_press_n/bn_TAOTIM_Oreo.png
new file mode 100644
index 00000000..f431c6eb
Binary files /dev/null and b/image/page_drink_press_n/bn_TAOTIM_Oreo.png differ
diff --git a/image/page_drink_press_n/bn_TAOTIM_Original-1.png b/image/page_drink_press_n/bn_TAOTIM_Original-1.png
new file mode 100644
index 00000000..294eafd2
Binary files /dev/null and b/image/page_drink_press_n/bn_TAOTIM_Original-1.png differ
diff --git a/image/page_drink_press_n/bn_TAOTIM_Original.png b/image/page_drink_press_n/bn_TAOTIM_Original.png
new file mode 100644
index 00000000..1cdbb97c
Binary files /dev/null and b/image/page_drink_press_n/bn_TAOTIM_Original.png differ
diff --git a/image/page_drink_press_n/bn_TAOTIM_Peach.png b/image/page_drink_press_n/bn_TAOTIM_Peach.png
new file mode 100644
index 00000000..9db58033
Binary files /dev/null and b/image/page_drink_press_n/bn_TAOTIM_Peach.png differ
diff --git a/image/page_drink_press_n/bn_TAOTIM_Thai_Tea.png b/image/page_drink_press_n/bn_TAOTIM_Thai_Tea.png
new file mode 100644
index 00000000..e2f92a0e
Binary files /dev/null and b/image/page_drink_press_n/bn_TAOTIM_Thai_Tea.png differ
diff --git a/image/page_drink_press_n/bn_TAOTIM_strawberry.png b/image/page_drink_press_n/bn_TAOTIM_strawberry.png
new file mode 100644
index 00000000..039a84d3
Binary files /dev/null and b/image/page_drink_press_n/bn_TAOTIM_strawberry.png differ
diff --git a/menu/new-layout.tsv b/menu/new-layout.tsv
index 6f33e2d1..6f076df5 100644
--- a/menu/new-layout.tsv
+++ b/menu/new-layout.tsv
@@ -111,10 +111,10 @@ Name=Coffee,file=page_catalog_group_coffee.skt
ยูซุกาโน่ YUZUCANO กาแฟ น้ำ และ ยูซุ Espresso, Yuzu,\nSugar, Water 12-01-01-0040 12-01-02-0040 - bn_Yuzu_americano.png 12-21-01-0040 12-21-02-0040 - posi1 ฿30.00 ฿35.00 - TRUE NN
posi1
ลาเต้โตเกียวบานาน่า TOKYO BANANA \nLATTE กาแฟ น้ำ นม และ กล้วย Espresso, Tokyo Banana Syrup,\nSugar, Water 12-01-01-0042 12-01-02-0042 12-01-03-0042 bn_hot_Banana_cafe_latte.png 12-21-01-0042 12-21-02-0042 12-21-03-0042 posi1 ฿40.00 ฿45.00 ฿50.00 TRUE TRUE
- กาแฟมินต์ลาเต้ MINT CAFE LATTE กาแฟ น้ำ นม และ มินต์ Espresso, Mint Syrup,\nSugar, Milk 12-01-01-0057 12-01-02-0057 12-01-03-0057 bn_Mint_cafe_Latte.png 12-21-01-0057 12-21-02-0057 12-21-03-0057 posi1
+ กาแฟมินต์ลาเต้ MINT CAFE LATTE กาแฟ น้ำ นม และ มินต์ Espresso, Mint Syrup,\nSugar, Milk 12-01-01-0057 12-01-02-0057 12-01-03-0057 bn_Mint_cafe_Latte.png 12-21-01-0057 12-21-02-0057 12-21-03-0057 posi1
มินต์กาโน่ MINTCANO กาแฟ น้ำ และ มินต์ Espresso, Mint Syrup,\nSugar, Water 12-01-01-0058 12-01-02-0058 - bn_Mint_Americano.png 12-21-01-0058 12-21-02-0058 - posi1
- พีชกาโน่ PEACH AMERICANO กาแฟ น้ำ และ พีช Espresso, Peach Syrup ,\nSugar, Water 12-01-01-0059 12-01-02-0059 - - - - - posi1
- กาแฟพีชลาเต้ PEACH CAFE LATTE กาแฟ น้ำ นม และ พีช Espresso, Peach Syrup,\nSugar, Milk 12-01-01-0060 12-01-02-0060 12-01-03-0060 - - - - posi1
+ พีชกาโน่ PEACH AMERICANO กาแฟ น้ำ และ พีช Espresso, Peach Syrup ,\nSugar, Water 12-01-01-0059 12-01-02-0059 - bn_hot_americano_peach.png 12-01-01-0059 12-01-02-0059 - posi1
+ กาแฟพีชลาเต้ PEACH CAFE LATTE กาแฟ น้ำ นม และ พีช Espresso, Peach Syrup,\nSugar, Milk 12-01-01-0060 12-01-02-0060 12-01-03-0060 bn_hot_peach_latte.png 12-21-01-0060 12-21-02-0060 12-21-03-0060 posi1
Name=Milk,file=page_catalog_group_oreo.skt
โอริโอ้ปั่นภูเขาไฟ OREO SMOOTHIE \nVOLCANO นม น้ำตาล โอริโอ้ \n Milk, Sugar, Oreo, Ice - - 12-03-03-0009 bn_smoothie_oreo.png - - - posi1 - - ฿55.00 NN NN
@@ -129,7 +129,7 @@ Name=Milk,file=page_catalog_group_oreo.skt
นมชมพูปั่น\nโอริโอ้ภูเขาไฟ PINK MILK\nOREO VOLCANO น้ำแดงกลิ่นสละ นม น้ำตาล \n Oreo Salak Syrup, Milk,\nSugar Oreo - - 12-03-03-0026 bn_PinkOreo_smoothie.png - - - posi1 - - ฿50.00 NN NN
ชานมไทย\nโอริโอ้ภูเขาไฟ THAI MILK TEA OREO VOLCANO ชาไทย นม น้ำตาล \n Oreo Thai Tea, Milk,\nSugar, Oreo - - 12-02-03-0045 bn_ThaiTeaOreo_smoothie.png - - - posi1 - - #REF! NN #REF!
มินต์โอริโอ้ภูเขาไฟ MINT OREO VOLCANO น้ำเชื่อมมินต์ นม น้ำตาล \n Oreo Mint Syrup, Milk,\nSugar, Oreo - - 12-03-03-0034 bn_Mint_Oreo_smoothie.png - - - posi1
- พีชโอริโอ้ภูเขาไฟ PEACH OREO น้ำเชื่อมพีช นม น้ำตาล \n Oreo Peach Syrup, Milk,\nSugar, Oreo - - 12-03-03-0040 posi1
+ พีชโอริโอ้ภูเขาไฟ PEACH OREO น้ำเชื่อมพีช นม น้ำตาล \n Oreo Peach Syrup, Milk,\nSugar, Oreo - - 12-03-03-0040 bn_peach_Oreo_smoothie.png posi1
Name=Milk,file=page_catalog_group_milk.skt
นม MILK นม Milk 12-03-01-0005 12-03-02-0005 12-03-03-0005 bn_iced_milk.png - - - posi1 ฿25.00 ฿30.00 ฿35.00 TRUE TRUE
@@ -158,9 +158,12 @@ Name=Milk,file=page_catalog_group_milk.skt
โกโก้มินต์ COCOA MINT น้ำเชื่อมมินต์ นม น้ำตาล และโกโก้ Mint Syrup, Milk,\nSugar, Cocoa 12-03-01-0035 12-03-02-0035 12-03-03-0035 bn_Mint_Cocoa.png - - - posi1
นมมินต์ MINT MILK น้ำเชื่อมมินต์ และนม Mint Syrup and Milk 12-03-01-0036 12-03-02-0036 12-03-03-0036 bn_Mint_Milk.png - - - posi1
นมสตรอเบอร์รี่มินต์ STRAWBERRY\nMINT MILK น้ำเชื่อมมินต์ น้ำเชื่อมสตรอเบอร์รี่ นมและน้ำตาล Mint Syrup, Milk,\nStrawberry Syrup - 12-03-02-0037 12-03-03-0037 bn_Mint_Milk_Straw.png - - - posi1
- นมพีช PEACH MILK น้ำเชื่อมพีช และนม Mint Syrup and Milk 12-03-01-0038 12-03-02-0038 12-03-03-0038 - - - - posi1
- โกโก้พีช PEACH COCAO MILK น้ำเชื่อมพีช นม น้ำตาล และโกโก้ Mint Syrup, Milk,\nSugar, Cocoa - 12-03-02-0039 12-03-03-0039 - - - - posi1
- พีชโอริโอ้ภูเขาไฟ PEACH OREO น้ำเชื่อมพีช นม น้ำตาล \n Oreo Peach Syrup, Milk,\nSugar, Oreo - - 12-03-03-0040 - - - - posi1
+ นมพีช PEACH MILK น้ำเชื่อมพีช และนม Mint Syrup and Milk 12-03-01-0038 12-03-02-0038 12-03-03-0038 bn_peach_Milk.png - - - posi1
+ โกโก้พีช PEACH COCAO MILK น้ำเชื่อมพีช นม น้ำตาล และโกโก้ Mint Syrup, Milk,\nSugar, Cocoa - 12-03-02-0039 12-03-03-0039 bn_peach_Cocoa.png - - - posi1
+ พีชโอริโอ้ภูเขาไฟ PEACH OREO น้ำเชื่อมพีช นม น้ำตาล \n Oreo Peach Syrup, Milk,\nSugar, Oreo - - 12-03-03-0040 bn_peach_Oreo_smoothie.png - - - posi1
+IGNORE CARAMEL MILK BISCOFF 12-03-03-0041
+IGNORE STRAWBERRY MILK BISCOFF 12-03-03-0042
+IGNORE MINT MILK BISCOFF 12-03-03-0043
@@ -188,8 +191,8 @@ Name=Tea,file=page_catalog_group_tea.skt
ชามะลิ JASMINE TEA ชามะลิ น้ำ Jasmine Tea ,Water 12-02-01-0045 12-02-02-0045 12-02-03-0046 bn_jasmine_tea.png - - - posi1
ชานมมะลิ JASMINE MILK TEA ชามะลิ และนม Jasmine Tea & Milk 12-02-01-0046 12-02-02-0046 12-02-03-0047 bn_jasmine_milk_tea.png - - - posi1
มัทฉะลาเต้มินต์ MATCHA LATTE MINT ชาเขียวมัทฉะ น้ำเชื่อมมินต์ และนมอุ่น Matcha, Mint Syrup &Milk 12-02-01-0050 12-02-02-0050 12-02-03-0050 bn_Mint_Matcha_Latte.png - - - posi1 #N/A #N/A #REF! #N/A #N/A
- ชาพีช PEACH TEA ชาไทย และน้ำเชื่อมพีช Thai Tea, Peach Syrup & Water 12-02-01-0051 12-02-02-0051 12-02-03-0051 - - - - posi1
- ชามะลิพีช PEACH JASMINE TEA ชามะลิ และน้ำเชื่อมพีช Jasmine Tea, Peach Syrup &Milk - 12-02-02-0052 - - - - - posi1
+ ชาพีช PEACH TEA ชาไทย และน้ำเชื่อมพีช Thai Tea, Peach Syrup & Water 12-02-01-0051 12-02-02-0051 12-02-03-0051 bn_hot_peach_tea.png - - - posi1
+ ชามะลิพีช PEACH JASMINE TEA ชามะลิ และน้ำเชื่อมพีช Jasmine Tea, Peach Syrup &Milk - 12-02-02-0052 - bn_hot_peach_jasmine_tea.png - - - posi1
ชาบราวน์ชูการ์ BROWN SUGAR \nTEA ชาไทย น้ำเชื่อมน้ำตาลแดง\n นม Thai tea, Milk, Kokuto syrup 12-02-01-0006 12-02-02-0006 12-02-03-0006 bn_hot_Black_Sugar_Milk_Tea.png - - - posi1 ฿35.00 ฿40.00 ฿45.00 TRUE TRUE
@@ -257,11 +260,11 @@ IGNORE PEPSI MAX 12-05-02-0062 12-05-03-0062 posi1
บ๊วยมะนาว\nมินต์โซดา PLUM LIMENADE\nMINT SODA น้ำเชื่อมมินต์ น้ำเชื่อมบ๊วย มะนาว และโซดา Mint Syrup, Ume Syrup, Lime, Soda & Ice - 12-05-02-0065 - bn_Mint_Plum_limenade_Soda.png - - - posi1
มินต์ลิ้นจี่\nมะนาวโซดา MINT LYCHEE\nLEMON SODA น้ำเชื่อมมินต์ น้ำเชื่อมลิ้นจี่ มะนาว และโซดา Mint Syrup,Lychee Syrup, Lime, Soda & Ice - 12-05-02-0066 - bn_Mint_Lychee_lime_soda.png - - - posi1
เป๊ปซี่มินต์ PEPSI MINT เป๊ปซี่ น้ำเชื่อมมินต์ และโซดา Pepsi, Mint Syrup& Ice - 12-05-02-0067 - bn_Mint_pepsi.png - - - posi1
- พีชโซดา PEACH SODA น้ำเชื่อมพีช และโซดา Peach Syrup& Ice - 12-05-02-0069 - - - - posi1
- พีชมิ้นท์โซดา PEACH MINT SODA น้ำเชื่อมพีช น้ำเชื่อมมิ้นท์ และโซดา Peach Syrup, Mint Syrup& Ice - - - - - - posi1
- พีชมะนาวโซดา PEACH LIME SODA น้ำเชื่อมพีท มะนาว และโซดา Peach Syrup, Lime, Soda & Ice - 12-05-02-0071 - - - - posi1
- เป๊ปซี่พีช PEPSI PEACH เป๊ปซี่ น้ำเชื่อมพีช และโซดา Pepsi, Peach Syrup& Ice - 12-05-02-0072 - - - - posi1
- พีชสตรอเบอร์รี่โซดา PEACH STRAWBERRY SODA น้ำเชื่อมพีช น้ำเชื่อมสตรอเบอร์รี่ และโซดา Peach Syrup, Strawberry Syrup,Soda & Ice - 12-05-02-0073 - - - - posi1
+ พีชโซดา PEACH SODA น้ำเชื่อมพีช และโซดา Peach Syrup& Ice - 12-05-02-0069 - bn_iced_peach_soda.png - - - posi1
+ พีชมิ้นท์โซดา PEACH MINT SODA น้ำเชื่อมพีช น้ำเชื่อมมิ้นท์ และโซดา Peach Syrup, Mint Syrup& Ice - - - bn_Mint_peach_soda.png - - - posi1
+ พีชมะนาวโซดา PEACH LIME SODA น้ำเชื่อมพีท มะนาว และโซดา Peach Syrup, Lime, Soda & Ice - 12-05-02-0071 - bn_Mint_peach_lime_soda.png - - - posi1
+ เป๊ปซี่พีช PEPSI PEACH เป๊ปซี่ น้ำเชื่อมพีช และโซดา Pepsi, Peach Syrup& Ice - 12-05-02-0072 - bn_peach_pepsi.png - - - posi1
+ พีชสตรอเบอร์รี่โซดา PEACH STRAWBERRY SODA น้ำเชื่อมพีช น้ำเชื่อมสตรอเบอร์รี่ และโซดา Peach Syrup, Strawberry Syrup,Soda & Ice - 12-05-02-0073 - bn_peach_Strawberry_Soda.png - - - posi1
- - -
โซดา SODA โซดา Soda - 12-05-02-0014 - bn_soda.png - - - posi1 - ฿10.00 - NN NN
โซดาน้ำแข็ง ICE & SODA โซดา Soda & Ice - 12-05-02-0015 - bn_iced_soda.png - - - posi1 - ฿10.00 - NN NN
@@ -282,7 +285,7 @@ IGNORE PEPSI MAX 12-05-02-0062 12-05-03-0062 posi1
- - -
น้ำสตอเบอร์รี่ STRAWBERRY DRINK น้ำเชื่อมสตอเบอร์รี่ น้ำ Strawberry Syrup,\nWater, Ice - - 12-05-03-0040 bn_iced_strawberry.png - - - posi1 - - ฿35.00 NN NN
- - -
- น้ำพีช PEACH DRINK น้ำเชื่อมพีช น้ำ Peach Syrup, Water & Ice - 12-05-02-0068 - - - -
+ น้ำพีช PEACH DRINK น้ำเชื่อมพีช น้ำ Peach Syrup, Water & Ice - 12-05-02-0068 - bn_iced_peach.png - - -
- - - posi1
- - -
โจ๊กใส่โปรตีนจากพืช CONGEE WITH \nPLANT PROTEIN ข้าว ผัก โปรตีนจากพืช น้ำ Rice, Plant-based protein, Water 12-06-01-0001 - - bn_Congee.png - - - posi1 #N/A - - #N/A NN
@@ -314,36 +317,36 @@ Name=Whey,file=page_catalog_group_whey.skt
โปรตีนเปล่า PLAIN PROTEIN เวย์โปรตีน น้ำ Whey protein, Water - 12-04-02-0011 - bn_protein_isolated.png - - - posi1 - ฿60.00 - NN NN
Name=SoftServe,file=page_catalog_group_soft_serve.skt
- เต่าติมออริจินอล 12-41-03-0001 bn_TAOTIM_Original.png
- เต่าติมโอริโอ้ 12-41-03-0002 bn_TAOTIM_Oreo.png
- เต่าติมบิสคอฟ 12-41-03-0003 bn_TAOTIM_Biskit.png
- เต่าติมสตอเบอร์รี่ 12-41-03-0004 bn_TAOTIM_strawberry.png
- เต่าติมโกโก้ 12-41-03-0005 bn_TAOTIM_Original-1.png
- เต่าติมชาเขียว 12-41-03-0006 bn_TAOTIM_Matcha.png
- เต่าติมเมล่อน 12-41-03-0007 bn_TAOTIM_Melon.png
- เต่าติมคาราเมล 12-41-03-0008 bn_TAOTIM_Caramel.png
- เต่าติมยูซุ 12-41-03-0009 bn_TAOTIM_Orange.png
- เต่าติมมินต์ 12-41-03-0010 bn_TAOTIM_Mint.png
- เต่าติมพีช 12-41-03-0011 bn_TAOTIM_Peach.png
- เต่าติมเอสเพรสโซ่ 12-41-03-0012 bn_TAOTIM_Coffee.png
- เต่าติมชาไทย 12-41-03-0013 bn_TAOTIM_Thai_Tea.png
- เต่าติมโอวัลติน 12-41-03-0014
- เต่าติมโกโก้มินต์ 12-41-03-0015
- เต่าติมมะนาว 12-41-03-0016 bn_TAOTIM_Lime.png
- เต่าติมทรงพลัง 12-41-03-0017
- เต่าติมสลัชชี่ 12-41-03-0018
- เต่าติมสละ 12-41-03-0019
- เต่าติมบ๊วย 12-41-03-0020
- เต่าติมลิ้นจี่ 12-41-03-0021 bn_TAOTIM_Lychee.png
- เต่าติมโตเกียวบานาน่า 12-41-03-0022 bn_TAOTIM_Banana.png
- เต่าติมชามะลิ 12-41-03-0023 bn_TAOTIM_Jasmine.png
- เต่าติมโฮจิฉะ 12-41-03-0024
+ เต่าติมออริจินอล Tao Tim Original - - 12-41-03-0001 bn_TAOTIM_Original.png - - - posi1 - - NN NN
+ เต่าติมโอริโอ้ Tao Tim OREO - - 12-41-03-0002 bn_TAOTIM_Oreo.png - - - posi1 - - NN NN
+ เต่าติมบิสคอฟ Tao Tim Biscoff - - 12-41-03-0003 bn_TAOTIM_Biskit.png - - - posi1 - - NN NN
+ เต่าติมสตอเบอร์รี่ Tao Tim Strawberry - - 12-41-03-0004 bn_TAOTIM_strawberry.png - - - posi1 - - NN NN
+ เต่าติมโกโก้ Tao Tim Cocoa - - 12-41-03-0005 bn_TAOTIM_Original-1.png - - - posi1 - - NN NN
+ เต่าติมชาเขียว Tao Tim Matcha - - 12-41-03-0006 bn_TAOTIM_Matcha.png - - - posi1 - - NN NN
+ เต่าติมเมล่อน Tao Tim Melon - - 12-41-03-0007 bn_TAOTIM_Melon.png - - - posi1 - - NN NN
+ เต่าติมคาราเมล Tao Tim Caramel - - 12-41-03-0008 bn_TAOTIM_Caramel.png - - - posi1 - - NN NN
+ เต่าติมยูซุ Tao Tim Yuzu - - 12-41-03-0009 bn_TAOTIM_Orange.png - - - posi1 - - NN NN
+ เต่าติมมินต์ Tao Tim Mint - - 12-41-03-0010 bn_TAOTIM_Mint.png - - - posi1 - - NN NN
+ เต่าติมพีช Tao Tim Peach - - 12-41-03-0011 bn_TAOTIM_Peach.png - - - posi1 - - NN NN
+ เต่าติมเอสเพรสโซ่ Tao Tim Espresso - - 12-41-03-0012 bn_TAOTIM_Coffee.png - - - posi1 - - NN NN
+ เต่าติมชาไทย Tao Tim Thai Tea - - 12-41-03-0013 bn_TAOTIM_Thai_Tea.png - - - posi1 - - NN NN
+IGNORE เต่าติมโอวัลติน Tao Tim Ovaltine - - 12-41-03-0014 bn_soda.png - - - posi1 - - NN NN
+IGNORE เต่าติมโกโก้มินต์ Tao Tim Cocoa Mint - - 12-41-03-0015 bn_soda.png - - - posi1 - - NN NN
+ เต่าติมมะนาว Tao Tim Lime - - 12-41-03-0016 bn_TAOTIM_Lime.png - - - posi1 - - NN NN
+IGNORE เต่าติมทรงพลัง Tao Time SuperPower - - 12-41-03-0017 bn_soda.png - - - posi1 - - NN NN
+IGNORE เต่าติมสลัชชี่ Tao Tim Slushy - - 12-41-03-0018 bn_soda.png - - - posi1 - - NN NN
+IGNORE เต่าติมสละ Tao Time Sala - - 12-41-03-0019 bn_soda.png - - - posi1 - - NN NN
+IGNORE เต่าติมบ๊วย Tao Tim Plum - - 12-41-03-0020 bn_soda.png - - - posi1 - - NN NN
+ เต่าติมลิ้นจี่ Tao Tim Lynchee - - 12-41-03-0021 bn_TAOTIM_Lychee.png - - - posi1 - - NN NN
+ เต่าติมโตเกียวบานาน่า Tao Tim Tokyo Banana - - 12-41-03-0022 bn_TAOTIM_Banana.png - - - posi1 - - NN NN
+ เต่าติมชามะลิ Tao Time Jasmin Tea - - 12-41-03-0023 bn_TAOTIM_Jasmine.png - - - posi1 - - NN NN
+IGNORE เต่าติมโฮจิฉะ Tao Tim Hojicha - - 12-41-03-0024 bn_soda.png - - - posi1 - - NN NN
- CARAMEL MILK BISCOFF 12-03-03-0041
- STRAWBERRY MILK BISCOFF 12-03-03-0042
- MINT MILK BISCOFF 12-03-03-0043
+IGNORE CARAMEL MILK BISCOFF 12-03-03-0041
+IGNORE STRAWBERRY MILK BISCOFF 12-03-03-0042
+IGNORE MINT MILK BISCOFF 12-03-03-0043
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 51910618..fa48ac26 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -282,29 +282,7 @@
DEBUGVAR SystemDateMonthInt
DEBUGVAR SystemDateDayInt
- ; Zone set video main page.
-
- Var adver_brewing_en = 1
-
- If CountryName = "Australia" Then
- TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/video/script_video.ev"
- EndIf
- If CountryName = "Malaysia" Then
- TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/video/script_video.ev"
- EndIf
-
- If CountryName = "Thailand" Then
- TRY "/mnt/sdcard/coffeevending/taobin_project/video/script1.ev"
- EndIf
-
- If CountryName = "USANewYork" Then
- TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/video/script_video.ev"
- EndIf
-
-
- DEBUGVAR CountDownShowButton
- DEBUGVAR EventTurnOn
EndIf
If TaobinOnlineX = "false" Then
@@ -746,8 +724,34 @@
EndIf
+ ; Zone set video main page.
+
+ Var adver_brewing_en = 1
+
+ If CountryName = "Australia" Then
+ TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/video/script_video.ev"
+ EndIf
+
+ If CountryName = "Malaysia" Then
+ TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/video/script_video.ev"
+ EndIf
+
+ If CountryName = "Thailand" Then
+ TRY "/mnt/sdcard/coffeevending/taobin_project/video/script1.ev"
+ EndIf
+
+ If CountryName = "USANewYork" Then
+ TRY "/mnt/sdcard/coffeevending/taobin_project/inter/usaNY/video/script_video.ev"
+ EndIf
+
+
+ DEBUGVAR CountDownShowButton
+ DEBUGVAR EventTurnOn
If CountryName = "Malaysia" Then
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/inter/mys/video/script_video.ev"
+
Var WebAppShow = "Invisible"
EnableLanguage "ENG"
;EnableLanguage "THAI"
@@ -787,6 +791,8 @@
EndIf
If CountryName = "Indonesia" Then
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/inter/idr/video/script_video.ev"
Var TextPriceMenuSize = 14
Var show_eng_button_stage = "Invisible"
Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png"
@@ -805,6 +811,9 @@
EndIf
If CountryName = "Australia" Then
+
+ TRY "/mnt/sdcard/coffeevending/taobin_project/inter/aus/video/script_video.ev"
+
Var WebAppShow = "Invisible"
EnableLanguage "ENG"
SetLanguage "ENG"
@@ -842,6 +851,47 @@
EndIf
+ If CountryName = "USANewYork" Then
+ TRY "/mnt/sdcard/coffeevending/taobin_project/inter/usaNY/video/script_video.ev"
+
+
+ Var WebAppShow = "Invisible"
+ EnableLanguage "ENG"
+ SetLanguage "ENG"
+ LanguageControl "UpdateList" "-"
+
+ Var InternationalEnable = 1
+ Var show_eng = "true"
+ ;Var VideoMainPage = "ROOT/taobin_project/inter/usaNY/video/video_main.mp4"
+ Var img_press_main_page = "ROOT/taobin_project/image/main_page_en/bp_main_page_start.png"
+
+ Var ShowNetworkProblemText = "Network error. Payment Cash only."
+
+ Var CountryRootPath = "ROOT/taobin_project/inter/usaNY/"
+
+ ar TextPriceMenuSize = 12
+ Var TextPriceMenuY = 264
+ Var TextPriceMenuBlendX = 180
+ Var TextPriceMenuHotX = 48
+ Var ShowButtonClick2 = "Enable"
+ Var ButtontoTopupMenu = "Invisible"
+
+ Var PriceUnitText = ""
+
+ Var MemberButtonFileName = "ROOT/taobin_project/image/main_page_en/bp_main_page_member.png"
+ Var show_eng_button_stage = "Invisible"
+
+ Var CountDownShowButton = 35
+
+ Var XButtonMember = 212
+ Var YButtonMember = 1695
+
+ If Not#LanguageLoaded = "" Then
+ LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/usaNY/menu/lang.tsv"
+ EndIf
+
+ EndIf
+
DEBUGVAR InternationalEnable
diff --git a/xml/page_catalog_group_coffee.xml b/xml/page_catalog_group_coffee.xml
index dcb928fd..cc4157d7 100644
--- a/xml/page_catalog_group_coffee.xml
+++ b/xml/page_catalog_group_coffee.xml
@@ -19760,7 +19760,7 @@ Sugar, Water"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = " MINT CAFE LATTE"
+ Var NameDrink = "MINT CAFE LATTE"
Var NameDrinkTH = "กาแฟมินต์ลาเต้"
Var DrinkDescriptionTH = "กาแฟ น้ำ นม และ มินต์"
Var DrinkDescription = "Espresso, Mint Syrup, Sugar, Milk"
@@ -19853,7 +19853,7 @@ Sugar, Water"
KanitMediumTTF
0x322B26
showengText
- " MINT CAFE LATTE"
+ "MINT CAFE LATTE"
16
@@ -20011,7 +20011,7 @@ Sugar, Milk"
"/mnt/sdcard/coffeevending/wav/click.wav"
SoundVolume
- Var NameDrink = " MINT CAFE LATTE"
+ Var NameDrink = "MINT CAFE LATTE"
Var NameDrinkTH = "กาแฟมินต์ลาเต้"
Var DrinkDescriptionTH = "กาแฟ น้ำ นม และ มินต์"
Var DrinkDescription = "Espresso, Mint Syrup, Sugar, Milk"
@@ -20104,7 +20104,7 @@ Sugar, Milk"
KanitMediumTTF
0x322B26
showengText
- " MINT CAFE LATTE"
+ "MINT CAFE LATTE"
16
@@ -20760,9 +20760,9 @@ Sugar, Water"
Flag( 12-01-01-0059.Button,12-01-02-0059.Button,$Sum12010100591201020059)
- ; - - -
+ ; 12-01-01-0059 12-01-02-0059 -
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-01-01-0059.Button,12-01-02-0059.Button,$Sum12010100591201020059)
+
+
+ 16
+ 164
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ "พีชกาโน่"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ "กาแฟ น้ำ และ พีช"
+
+
+ 16
+ 164
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ "PEACH AMERICANO "
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ "Espresso, Peach Syrup ,
+Sugar, Water"
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ $12-01-01-0059.Button
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ 50
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-01-01-0059.Button
+ StringFmt( $12-01-01-0059.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+ Var( DirImage2 + "cold.png" )
+ Var( DirImage2 + "cold_db.png" )
+ $12-01-02-0059.Button
+
+
+ 115
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-01-02-0059.Button
+ StringFmt( $12-01-02-0059.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ "Invisible"
+
+
+ 183
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ "Invisible"
+ StringFmt( $-.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+
+ eval(
+ If ICE_PROCESS_STATUS = 2 Then
+
+ If $Sum12010100591201020059 = "Disable" Then
+ Var ice_tab_process_show = "Disable"
+ Else
+ Var ice_tab_process_show = "Enable"
+ EndIf
+
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+ Var return = ice_tab_process_show
+ )
+
+ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png"
+ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png"
+
+
+ 49
+ 117
+
+ eval(
+ If $Sum12010100591201020059 = "Disable" Then
+ STRCONTAIN "ERR" $12-01-01-0059.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-01-02-0059.TAG tag2_is_disable
+ STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
+ Var return = "Invisible"
+ If tag1_is_disable = "true" Then
+ Var return = "Enable"
+ EndIf
+ If tag2_is_disable = "true" Then
+ Var return = "Enable"
+ EndIf
+ If tag3_is_disable = "true" Then
+ Var return = "Enable"
+ EndIf
+ Else
+ Var return = "Invisible"
+ EndIf
+ )
+
+ "ROOT/taobin_project/image//img_menu_err2.png"
+
+
+ 84
+ 266
+ 10
+ OpunMediumTTF
+ 0xDE794E
+ ice_tab_process_show
+ ice_show_open
+
+
+ 48
+ 116
+ 32
+ 128
+ 64
+ MITRegularTTF
+ 0x5A5A5A
+ "disable-show"
+ $Sum12010100591201020059
+ text_unavailable
+ center-vertical-horizontal
+
+
; ==================> Len = 12
; 12-01-01-0060 12-01-02-0060 12-01-03-0060
@@ -21013,17 +21263,17 @@ Sugar, Water"
Flag( 12-01-01-0060.Button,12-01-02-0060.Button,12-01-03-0060.Button,$Sum120101006012010200601201030060)
- ; - - -
+ ; 12-21-01-0060 12-21-02-0060 12-21-03-0060
+
+ 33
+ 22
+ 225
+ 296
+ Flag( 12-21-01-0060.Button,12-21-02-0060.Button,12-21-03-0060.Button,$Sum122101006012210200601221030060)
+
+
+ 16
+ 164
+ 24
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showthaiText
+ "กาแฟพีชลาเต้"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showthaiText
+ "กาแฟ น้ำ นม และ พีช"
+
+
+ 16
+ 164
+ 22
+ 220
+ "multi2"
+ KanitMediumTTF
+ 0x322B26
+ showengText
+ "PEACH CAFE LATTE"
+
+
+ 16
+ 220
+ 14
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ showengText
+ "Espresso, Peach Syrup,
+Sugar, Milk"
+
+
+ 16
+ 264
+ Var( DirImage2 + "option_deactive.png" )
+
+
+ 16
+ 264
+ $12-21-01-0060.Button
+ Var( DirImage2 + "hot.png" )
+ Var( DirImage2 + "hot_db.png" )
+
+
+ 50
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-21-01-0060.Button
+ StringFmt( $12-21-01-0060.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+ Var( DirImage2 + "cold.png" )
+ Var( DirImage2 + "cold_db.png" )
+ $12-21-02-0060.Button
+
+
+ 115
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-21-02-0060.Button
+ StringFmt( $12-21-02-0060.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 146
+ 264
+ Var( DirImage2 + "blend.png" )
+ Var( DirImage2 + "blend_db.png" )
+ $12-21-03-0060.Button
+
+
+ 183
+ TextPriceMenuY
+ TextPriceMenuSize
+ 220
+ KanitMediumTTF
+ 0x6F5F51
+ 0xEAE6E1
+ $12-21-03-0060.Button
+ StringFmt( $12-21-03-0060.Price , DisplayFormat, PreScaleConvertShow) ; test
+
+
+ 81
+ 264
+
+ eval(
+ If ICE_PROCESS_STATUS = 2 Then
+
+ If $Sum122101006012210200601221030060 = "Disable" Then
+ Var ice_tab_process_show = "Disable"
+ Else
+ Var ice_tab_process_show = "Enable"
+ EndIf
+
+ Else
+ Var ice_tab_process_show = "Invisible"
+ EndIf
+ Var return = ice_tab_process_show
+ )
+
+ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible.png"
+ "ROOT/taobin_project/image/drink_option/ice_tab_unavalible_dis.png"
+
+
+ 49
+ 117
+
+ eval(
+ If $Sum122101006012210200601221030060 = "Disable" Then
+ STRCONTAIN "ERR" $12-21-01-0060.TAG tag1_is_disable
+ STRCONTAIN "ERR" $12-21-02-0060.TAG tag2_is_disable
+ STRCONTAIN "ERR" $12-21-03-0060.TAG tag3_is_disable
+ Var return = "Invisible"
+ If tag1_is_disable = "true" Then
+ Var return = "Enable"
+ EndIf
+ If tag2_is_disable = "true" Then
+ Var return = "Enable"
+ EndIf
+ If tag3_is_disable = "true" Then
+ Var return = "Enable"
+ EndIf
+ Else
+ Var return = "Invisible"
+ EndIf
+ )
+
+ "ROOT/taobin_project/image//img_menu_err2.png"
+
+
+ 84
+ 266
+ 10
+ OpunMediumTTF
+ 0xDE794E
+ ice_tab_process_show
+ ice_show_open
+
+
+ 48
+ 116
+ 32
+ 128
+ 64
+ MITRegularTTF
+ 0x5A5A5A
+ "disable-show"
+ $Sum122101006012210200601221030060
+ text_unavailable
+ center-vertical-horizontal
+
+
; Cart