From 6cfb3d9d9a86ffcd8a2cdd9abdda39b57a3bc02c Mon Sep 17 00:00:00 2001
From: Wanlop <wanlop@forth.co.th>
Date: Mon, 28 Sep 2020 18:29:11 +0700
Subject: [PATCH] Do topping alternate

---
 image/topping/bn_brew1.png             | Bin 2082 -> 3817 bytes
 image/topping/bn_brew2.png             | Bin 2081 -> 3237 bytes
 image/topping/bp_brew1.png             | Bin 2099 -> 3510 bytes
 image/topping/bp_brew2.png             | Bin 2081 -> 3534 bytes
 xml/menu_catalog_choose_drink1.xml     | 170 ++++++++++----
 xml/menu_catalog_choose_drink2.xml     | 238 ++++++++++++++-----
 xml/menu_catalog_choose_drink2_ext.xml | 306 +++++++++++++++++++------
 xml/menu_catalog_choose_drink3.xml     | 102 +++++++--
 xml/menu_catalog_choose_drink4.xml     |  68 ++++--
 xml/menu_catalog_choose_drink5.xml     | 136 ++++++++---
 xml/menu_catalog_choose_drink6.xml     |  85 +++++--
 xml/menu_gen.py                        |   7 +-
 xml/menu_payment_cash.xml              |   2 +-
 xml/menu_topping_alter.xml             |  58 +----
 xml/menu_topping_with_barista.xml      | 195 ++++++++++------
 15 files changed, 975 insertions(+), 392 deletions(-)

diff --git a/image/topping/bn_brew1.png b/image/topping/bn_brew1.png
index bb2795261fb484aafcb1f269c91b0121eec76441..9bb9258bdcd12168495bb4f0ea61e3323fa701ca 100644
GIT binary patch
delta 3803
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
R_tgLZ002ovPDHLkV1m(VU<v>L

delta 2054
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

diff --git a/image/topping/bn_brew2.png b/image/topping/bn_brew2.png
index 59fb3d242d02e34e6b5ed6b8195ea8d3ca1978cb..dd93a1fd011cd5a44c9bc35b4a172c1cfba3a8cf 100644
GIT binary patch
delta 3218
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
Ef}Su>WB>pF

delta 2053
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

diff --git a/image/topping/bp_brew1.png b/image/topping/bp_brew1.png
index ab8c452ed2710cceb94e7f87c1b724baa8f12ace..775d98f29c111157bd29c0b04988eb57f2770a21 100644
GIT binary patch
delta 3493
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
TpyZ%Q00000NkvXXu0mjfQE!wY

delta 2071
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
B{sRC2

diff --git a/image/topping/bp_brew2.png b/image/topping/bp_brew2.png
index 58888e5fa7404299faa94edbd4d0071b293c46b6..0156ac35a41f3583523adc42677f673e7bfd439c 100644
GIT binary patch
delta 3518
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

delta 2053
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

diff --git a/xml/menu_catalog_choose_drink1.xml b/xml/menu_catalog_choose_drink1.xml
index 3262f489..e6d95259 100644
--- a/xml/menu_catalog_choose_drink1.xml
+++ b/xml/menu_catalog_choose_drink1.xml
@@ -160,7 +160,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_epsresso.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -183,7 +183,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_lattle.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -206,7 +206,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_america_no.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -229,7 +229,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_mocha.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -252,7 +252,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_cappuccino.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -275,7 +275,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_america_no.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -298,7 +298,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_sala.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -321,7 +321,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_lemonade_soda.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -344,7 +344,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_milk_caramel.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -367,20 +367,29 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_cola.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -401,15 +410,24 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -430,15 +448,24 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -459,15 +486,24 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -488,15 +524,24 @@
 	<Value> $11-99-02-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -517,15 +562,24 @@
 	<Value> $11-99-02-0002.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0004.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
@@ -546,15 +600,24 @@
 	<Value> $11-99-01-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0020.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
@@ -575,15 +638,24 @@
 	<Value> $11-99-02-0020.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
@@ -604,15 +676,24 @@
 	<Value> $11-99-02-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 924 </Y>
@@ -633,15 +714,24 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0018.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 924 </Y>
diff --git a/xml/menu_catalog_choose_drink2.xml b/xml/menu_catalog_choose_drink2.xml
index e35abfae..0c17adf3 100644
--- a/xml/menu_catalog_choose_drink2.xml
+++ b/xml/menu_catalog_choose_drink2.xml
@@ -161,7 +161,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_espresso.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -184,7 +184,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_double_espresso.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -207,7 +207,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_latte.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -230,7 +230,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_america_no.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -253,7 +253,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_mocha.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -276,7 +276,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_caramel_macchiato.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -299,7 +299,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_cappuccino.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -322,7 +322,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_epsresso.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -345,7 +345,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_thai_black_coffee.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -368,7 +368,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_lattle.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -391,7 +391,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_america_no.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -414,7 +414,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_mocha.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -437,7 +437,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_caramel_macchiato.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -460,20 +460,29 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_cappuccino.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0010.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -494,15 +503,24 @@
 	<Value> $11-99-01-0010.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -523,15 +541,24 @@
 	<Value> $11-99-01-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -552,15 +579,24 @@
 	<Value> $11-99-01-0002.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0004.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -581,15 +617,24 @@
 	<Value> $11-99-01-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -610,15 +655,24 @@
 	<Value> $11-99-01-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
@@ -639,15 +693,24 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
@@ -668,15 +731,24 @@
 	<Value> $11-99-01-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
@@ -697,15 +769,24 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0024.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 924 </Y>
@@ -726,15 +807,24 @@
 	<Value> $11-99-02-0024.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 924 </Y>
@@ -755,15 +845,24 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 924 </Y>
@@ -784,15 +883,24 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 924 </Y>
@@ -813,15 +921,24 @@
 	<Value> $11-99-02-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0030.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 1252 </Y>
@@ -842,15 +959,24 @@
 	<Value> $11-99-02-0030.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 1252 </Y>
diff --git a/xml/menu_catalog_choose_drink2_ext.xml b/xml/menu_catalog_choose_drink2_ext.xml
index 5dd8fbb3..6b4131e9 100644
--- a/xml/menu_catalog_choose_drink2_ext.xml
+++ b/xml/menu_catalog_choose_drink2_ext.xml
@@ -159,7 +159,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_espresso.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -182,7 +182,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_double_espresso.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -205,7 +205,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_latte.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -228,7 +228,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_america_no.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -251,7 +251,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_mocha.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -274,7 +274,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_caramel_macchiato.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -297,7 +297,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_cappuccino.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -320,7 +320,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_epsresso.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -343,7 +343,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_thai_black_coffee.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -366,7 +366,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_lattle.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -389,7 +389,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_america_no.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -412,7 +412,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_epsresso.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -435,7 +435,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_thai_black_coffee.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -458,7 +458,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_lattle.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -481,7 +481,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_america_no.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -504,7 +504,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_mocha.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -527,7 +527,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_caramel_macchiato.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -550,20 +550,29 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_cappuccino.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0010.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -584,15 +593,24 @@
 	<Value> $11-99-01-0010.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -613,15 +631,24 @@
 	<Value> $11-99-01-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -642,15 +669,24 @@
 	<Value> $11-99-01-0002.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0004.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -671,15 +707,24 @@
 	<Value> $11-99-01-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -700,15 +745,24 @@
 	<Value> $11-99-01-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
@@ -729,15 +783,24 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
@@ -758,15 +821,24 @@
 	<Value> $11-99-01-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
@@ -787,15 +859,24 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0024.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 924 </Y>
@@ -816,15 +897,24 @@
 	<Value> $11-99-02-0024.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 924 </Y>
@@ -845,15 +935,24 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 924 </Y>
@@ -874,15 +973,24 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 722 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 722 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 924 </Y>
@@ -903,15 +1011,24 @@
 	<Value> $11-99-02-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0024.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 1252 </Y>
@@ -932,15 +1049,24 @@
 	<Value> $11-99-02-0024.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0001.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 1252 </Y>
@@ -961,15 +1087,24 @@
 	<Value> $11-99-02-0001.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0003.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 1252 </Y>
@@ -990,15 +1125,24 @@
 	<Value> $11-99-02-0003.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 1050 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0007.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 1050 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 1252 </Y>
@@ -1019,15 +1163,24 @@
 	<Value> $11-99-02-0007.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 1378 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0030.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 1378 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 1580 </Y>
@@ -1048,15 +1201,24 @@
 	<Value> $11-99-02-0030.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 1378 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0002.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 1378 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 1580 </Y>
diff --git a/xml/menu_catalog_choose_drink3.xml b/xml/menu_catalog_choose_drink3.xml
index e9b02057..ea8d4df3 100644
--- a/xml/menu_catalog_choose_drink3.xml
+++ b/xml/menu_catalog_choose_drink3.xml
@@ -160,7 +160,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_ginger_tea.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -183,7 +183,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_lemon_tea.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -206,7 +206,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_taiwan_milk_tea.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -229,7 +229,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_thai_milk_tea.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -252,7 +252,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_coffee_thai_milk_tea.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -275,20 +275,29 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_taiwan_milk_tea.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0014.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -309,15 +318,24 @@
 	<Value> $11-99-01-0014.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0012.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -338,15 +356,24 @@
 	<Value> $11-99-01-0012.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0011.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -367,15 +394,24 @@
 	<Value> $11-99-01-0011.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0004.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -396,15 +432,24 @@
 	<Value> $11-99-02-0004.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0014.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -425,15 +470,24 @@
 	<Value> $11-99-02-0014.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0010.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
diff --git a/xml/menu_catalog_choose_drink4.xml b/xml/menu_catalog_choose_drink4.xml
index 03cdf676..5b92a367 100644
--- a/xml/menu_catalog_choose_drink4.xml
+++ b/xml/menu_catalog_choose_drink4.xml
@@ -161,7 +161,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_cocoa.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -184,7 +184,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_milk_caramel.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -207,7 +207,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_cocoa.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -230,20 +230,29 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_caramel.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0006.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -264,15 +273,24 @@
 	<Value> $11-99-01-0006.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -293,15 +311,24 @@
 	<Value> $11-99-01-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0005.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -322,15 +349,24 @@
 	<Value> $11-99-02-0005.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0031.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
diff --git a/xml/menu_catalog_choose_drink5.xml b/xml/menu_catalog_choose_drink5.xml
index ed53e470..b75fc613 100644
--- a/xml/menu_catalog_choose_drink5.xml
+++ b/xml/menu_catalog_choose_drink5.xml
@@ -161,7 +161,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_hot_lemonate.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -184,7 +184,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_lemonade.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -207,7 +207,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_lemonade_soda.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -230,7 +230,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_sala.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -253,7 +253,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_sala_lemon_juice.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -276,7 +276,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_sala_soda.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -299,7 +299,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_sala_lemon_soda.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -322,20 +322,29 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_pink_milk.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-01-0009.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -356,15 +365,24 @@
 	<Value> $11-99-01-0009.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0016.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
@@ -385,15 +403,24 @@
 	<Value> $11-99-02-0016.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0017.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -414,15 +441,24 @@
 	<Value> $11-99-02-0017.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0020.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -443,15 +479,24 @@
 	<Value> $11-99-02-0020.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0021.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
@@ -472,15 +517,24 @@
 	<Value> $11-99-02-0021.description </Value>
 	</Text>
 	<Text>
-	<X> 465 </X>
+	<X> 483 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0023.Price </Value>
 	</Text>
 	<Text>
+	<X> 465 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 317 </X>
 	<Y> 596 </Y>
@@ -501,15 +555,24 @@
 	<Value> $11-99-02-0023.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0022.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 596 </Y>
@@ -530,15 +593,24 @@
 	<Value> $11-99-02-0022.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0011.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 596 </Y>
diff --git a/xml/menu_catalog_choose_drink6.xml b/xml/menu_catalog_choose_drink6.xml
index d3e57c13..3b325055 100644
--- a/xml/menu_catalog_choose_drink6.xml
+++ b/xml/menu_catalog_choose_drink6.xml
@@ -160,7 +160,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_cola.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -183,7 +183,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_cola_zero.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -206,7 +206,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_sprite.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -229,7 +229,7 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_soda.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@@ -252,20 +252,29 @@
 		Var PictureDrink = "ROOT/taobin_project/image/menu_drink_select//bn_iced_soda.png"
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
-		Var PriceShowValue = "Free"r
+		Var PriceShowValue = charOfBaht + PriceDrink
 		Open "ROOT/taobin_project/xml/menu_topping_alter.xml"
 	</EventOnClick>
 	</Button>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0018.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 268 </Y>
@@ -286,16 +295,25 @@
 	<Value> $11-99-02-0018.description </Value>
 	</Text>
 	<Text>
+	<X> 483 </X>
+	<Y> 66 </Y>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $11-99-02-0018.Price </Value>
+	</Text>
+	<Text>
 	<X> 465 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Width>20</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> "฿"" </Value>
 	</Text>
 	<Text>
-	<Text>
 	<X> 317 </X>
 	<Y> 268 </Y>
 	<Size> 26 </Size>
@@ -315,15 +333,24 @@
 	<Value> $11-99-02-0018.description </Value>
 	</Text>
 	<Text>
-	<X> 722 </X>
+	<X> 740 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0025.Price </Value>
 	</Text>
 	<Text>
+	<X> 722 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 574 </X>
 	<Y> 268 </Y>
@@ -344,15 +371,24 @@
 	<Value> $11-99-02-0025.description </Value>
 	</Text>
 	<Text>
-	<X> 979 </X>
+	<X> 997 </X>
 	<Y> 66 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0032.Price </Value>
 	</Text>
 	<Text>
+	<X> 979 </X>
+	<Y> 66 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 831 </X>
 	<Y> 268 </Y>
@@ -373,15 +409,24 @@
 	<Value> $11-99-02-0032.description </Value>
 	</Text>
 	<Text>
-	<X> 208 </X>
+	<X> 226 </X>
 	<Y> 394 </Y>
-	<Width>200</Width>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
 	<Size> 27 </Size>
 	<Font> KanitTTF </Font>
 	<Color> 0xB78F24 </Color>
-	<Value> "Free" </Value>
+	<Value> $11-99-02-0026.Price </Value>
 	</Text>
 	<Text>
+	<X> 208 </X>
+	<Y> 394 </Y>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
 	<Text>
 	<X> 60 </X>
 	<Y> 596 </Y>
diff --git a/xml/menu_gen.py b/xml/menu_gen.py
index c8b662df..9cc36fac 100644
--- a/xml/menu_gen.py
+++ b/xml/menu_gen.py
@@ -35,15 +35,15 @@
       out_xml( '\t\tVar PictureDrink = "' + default_dir2 + '/' + bt_pic[i].replace('#','n') + '"\r\n')
       out_xml( '\t\tTopping "Load" SelectDrink\r\n')
       out_xml( '\t\tSAVELOG NameDrink\r\n')
-      #out_xml( '\t\tVar PriceShowValue = charOfBaht + PriceDrink\r\n')
-      out_xml( '\t\tVar PriceShowValue = "Free"r\n')
+      out_xml( '\t\tVar PriceShowValue = charOfBaht + PriceDrink\r\n')
+      #out_xml( '\t\tVar PriceShowValue = "Free"\r\n')
       out_xml( '\t\tOpen "ROOT/taobin_project/xml/menu_topping_alter.xml"\r\n')
   
       out_xml( '\t</EventOnClick>\r\n')
       out_xml( '\t</Button>\r\n')
  
   for i in range( menu_count):
-    if True :
+    if False :
       out_xml( '\t<Text>\r\n')
       out_xml( '\t<X> ' + str(x_button[i] + 164) + ' </X>\r\n')
       out_xml( '\t<Y> ' + str(y_button[i] + 12) + ' </Y>\r\n')
@@ -55,6 +55,7 @@
       out_xml( '\t</Text>\r\n')
       out_xml( '\t<Text>\r\n')
     else:
+      out_xml( '\t<Text>\r\n')
       out_xml( '\t<X> ' + str(x_button[i] + 182) + ' </X>\r\n')
       out_xml( '\t<Y> ' + str(y_button[i] + 12) + ' </Y>\r\n')
       out_xml( '\t<Align> "Hurr" </Align>\r\n')
diff --git a/xml/menu_payment_cash.xml b/xml/menu_payment_cash.xml
index fbbee777..3e7ff841 100644
--- a/xml/menu_payment_cash.xml
+++ b/xml/menu_payment_cash.xml
@@ -10,7 +10,7 @@
 	SAVELOG NameDrink
 	SAVELOG NameDrinkTH
 	SAVELOG DrinkDescription
-	SAVELOG PriceDrink<Text>
+	SAVELOG PriceDrink
 
 
 	; On open
diff --git a/xml/menu_topping_alter.xml b/xml/menu_topping_alter.xml
index b2c40857..e8d04e76 100644
--- a/xml/menu_topping_alter.xml
+++ b/xml/menu_topping_alter.xml
@@ -12,10 +12,6 @@
 	Var SugarState4 = "Invisible"
 	Var SugarState5 = "Invisible"
 
-	Var BGSubmenu = "Invisible"
-	Var NormalMenu = "Invisible"
-	Var BaristaMenu = "Invisible"
-
 	;Var SugarState1 = "Enable"
 	;Var SugarState2 = "Enable"
 	;Var SugarState3 = "Enable"
@@ -53,48 +49,6 @@
 <Filename> "ROOT/taobin_project/image/ad_medium_2.png" </Filename>
 </Image>
 
-
-
-<Image>
-<X> 44 </X>
-<Y> 977 </Y>
-<State> BGSubmenu </State>
-<Filename> "ROOT/taobin_project/image/topping/img2.png" </Filename>
-</Image>
-
-<Button>
-<X> 702 </X>
-<Y> 1004 </Y>
-<State> NormalMenu </State>
-<Filename> "ROOT/taobin_project/image/topping/bn_brew1.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/topping/bp_brew1.png" </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Mode> "NO" </Mode>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	Var NormalMenu = "PressForever"
-	Var BaristaMenu = "Enable"
-	Refresh
-</EventClick>
-</Button>
-
-<Button>
-<X> 844 </X>
-<Y> 1004 </Y>
-<State> BaristaMenu </State>
-<Filename> "ROOT/taobin_project/image/topping/bn_brew2.png" </Filename>
-<FilenamePress> "ROOT/taobin_project/image/topping/bp_brew2.png" </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-<Mode> "NO" </Mode>
-<Volume> SoundVolume </Volume>
-<EventClick> 
-	Var NormalMenu = "Enable"
-	Var BaristaMenu = "PressForever"
-	Refresh
-</EventClick>
-</Button>
-
-
 ; back
 <Button>
 <X> 19 </X>
@@ -135,17 +89,7 @@
 
 	Else
 		If MenuCodeName = "barista1" Then
-			Var BGSubmenu = "Enable"
-			Var BaristaMenu = "Enable"
-			Var NormalMenu = "PressForever"
-			Var y_topping_bg = y2_topping_bg
-			Var y_topping = y2_topping
-			Var BugFlag = 1
-			SAVELOG y_topping_bg
-			SAVELOG y_topping
-			SAVELOG y2_topping_bg
-			SAVELOG y2_topping
-			Refresh
+			Open "ROOT/taobin_project/xml/menu_topping_with_barista.xml"
 
 		EndIf
 		If TOPPING1 = "Powder Sugar" Then
diff --git a/xml/menu_topping_with_barista.xml b/xml/menu_topping_with_barista.xml
index a7b37767..3ca48058 100644
--- a/xml/menu_topping_with_barista.xml
+++ b/xml/menu_topping_with_barista.xml
@@ -16,24 +16,50 @@
 	Var NormalMenu = "Invisible"
 	Var BaristaMenu = "Invisible"
 
-	;Var SugarState1 = "Enable"
-	;Var SugarState2 = "Enable"
-	;Var SugarState3 = "Enable"
-	;Var SugarState4 = "Enable"
-	;Var SugarState5 = "Enable"
+	Var BGSubmenu = "Enable"
+	Var BaristaMenu = "Enable"
+	Var NormalMenu = "PressForever"
+	Var y_topping_bg = y2_topping_bg
+	Var y_topping = y2_topping
+
 	Var BGSugar = "Invisible"
 
 	SAVELOG TOPPING1
 	SAVELOG TOPPING2
+	SAVELOG PreviseXMLFileName2
 	
-	Var y_block = 105
+	
+	Var y_sugar_block = 105
+	Var y_block = 206
 
 	Var y_topping_bg = 912
-	Var y_topping = 912 + y_block
+	Var y_topping = 912 + y_sugar_block
+	
+	Var y2_topping_bg = y_topping_bg + y_block
+	Var y2_topping = y_topping + y_block
 	
 	Var y_submenu_bg = 912
 
 	Var BugFlag = 0
+
+	Var y_topping_bg = y2_topping_bg
+	Var y_topping = y2_topping
+	Var BugFlag = 1
+	SAVELOG y_topping_bg
+	SAVELOG y_topping
+	SAVELOG y2_topping_bg
+	SAVELOG y2_topping
+
+	If TOPPING1 = "Powder Sugar" Then
+		Var SugarState1 = "PressForever"
+		Var SugarState2 = "Enable"
+		Var SugarState3 = "Enable"
+		Var SugarState4 = "Enable"
+		Var SugarState5 = "Enable"
+		Var BGSugar = "Enable"
+	EndIf
+	
+
 </EventOpen>
 <Timeout> 30000 </Timeout>
 <EventTimeout> 
@@ -51,21 +77,14 @@
 
 <Image>
 <X> 44 </X>
-<Y> y_topping_bg </Y>
-<State> BGSugar </State>
-<Filename> "ROOT/taobin_project/image/topping/img1.png" </Filename>
-</Image>
-
-<Image>
-<X> 44 </X>
-<Y> y_submenu_bg </Y>
+<Y> 938 </Y>
 <State> BGSubmenu </State>
 <Filename> "ROOT/taobin_project/image/topping/img2.png" </Filename>
 </Image>
 
 <Button>
-<X> 702 </X>
-<Y> 1004 </Y>
+<X> 550 </X>
+<Y> 963 </Y>
 <State> NormalMenu </State>
 <Filename> "ROOT/taobin_project/image/topping/bn_brew1.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/topping/bp_brew1.png" </FilenamePress>
@@ -75,13 +94,15 @@
 <EventClick> 
 	Var NormalMenu = "PressForever"
 	Var BaristaMenu = "Enable"
+	Var BugFlag = 1
+	Topping "Load" SelectDrink
 	Refresh
 </EventClick>
 </Button>
 
 <Button>
-<X> 702 </X>
-<Y> 1004 </Y>
+<X> 774 </X>
+<Y> 963 </Y>
 <State> BaristaMenu </State>
 <Filename> "ROOT/taobin_project/image/topping/bn_brew2.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/topping/bp_brew2.png" </FilenamePress>
@@ -91,6 +112,8 @@
 <EventClick> 
 	Var NormalMenu = "Enable"
 	Var BaristaMenu = "PressForever"
+	Var BugFlag = 1
+	Topping "Load" SubMenuProductCode1
 	Refresh
 </EventClick>
 </Button>
@@ -105,43 +128,19 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/menu_catalog.xml" 
+	Open PreviseXMLFileName2
+	;Open "ROOT/taobin_project/xml/menu_catalog.xml" 
 	
 </EventClick>
 </Button>
 
 <EventMachine>
-	;Open "ROOT/xml/menu_topping_sugar_only.xml"
-		
-	;SAVELOG TOPPING1
-	;SAVELOG TOPPING2
-	;If TOPPING1 = "Powder Sugar" Then
-	;	If TOPPING2 = "Hot water 3 step" Then
-	;		If SubMenuProductCode1 = "-" Then
-	;			Open "ROOT/xml/menu_topping_hot_menu.xml"
-	;		Else
-	;			Open "ROOT/xml/menu_topping_hot_menu_coffee.xml"
-	;		EndIf
-	;	Else
-	;		Open "ROOT/xml/menu_topping_sugar_only.xml"
-	;	EndIf
-	;EndIf
-	;Open "ROOT/xml/menu_page3_alter.xml"
-	
+	SAVELOG PriceDrink
 	SAVELOG TOPPING1
-
+	SAVELOG TOPPING2
+	SAVELOG MenuCodeName
+	
 	If BugFlag = 1 Then
-
-	Else
-		If SubMenuCodeName = "barista1" Then
-			Var BaristaMenu = "Enable"
-			Var NormalMenu = "PressForever"
-			Var y_topping_bg = 1017
-			Var y_topping = 1017 + y_block
-			Var BugFlag = 1
-			Refresh
-
-		EndIf
 		If TOPPING1 = "Powder Sugar" Then
 			Var SugarState1 = "PressForever"
 			Var SugarState2 = "Enable"
@@ -149,14 +148,23 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			Var BGSugar = "Enable"
-			Var BugFlag = 1
+			Var PriceShowValue = charOfBaht + PriceDrink
 			Refresh
-		Else
-			Open "ROOT/taobin_project/xml/menu_payment_cash.xml"
 		EndIf
 		
-	EndIf
+		If TOPPING1 = "Powder Sugar Premix 25" Then
+			Var SugarState1 = "Invisible"
+			Var SugarState2 = "Invisible"
+			Var SugarState3 = "PressForever"
+			Var SugarState4 = "Enable"
+			Var SugarState5 = "Enable"
+			Var BGSugar = "Enable"
+			Var PriceShowValue = charOfBaht + SubMenuPrice1
+			Refresh
+		EndIf
 
+		Var BugFlag = 0
+	EndIf
 
 </EventMachine>
 
@@ -218,14 +226,14 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	//
-	If BaristaMenu = "PressForever" Then
-		Var SelectDrink = SubMenuProductCode1
-		Var NameDrink = SubMenuProductCode1.Name2
-		Var NameDrinkTH = SubMenuProductCode1.Name
-		Var DrinkDescription = SubMenuProductCode1.description
-		Var PriceDrink = SubMenuProductCode1.Price
-	EndIf
+	
+	;If BaristaMenu = "PressForever" Then
+	;	Var SelectDrink = SubMenuProductCode1
+	;	Var NameDrink = SubMenuName11
+	;	Var NameDrinkTH = SubMenuName21
+	;	Var DrinkDescription = SubMenuDescript1
+	;	Var PriceDrink = SubMenuPrice1
+	;EndIf
 
 	Open "ROOT/taobin_project/xml/menu_payment_cash.xml" 
 </EventClick>
@@ -243,6 +251,15 @@
 </Text>
 
 
+
+; sugar layout
+<Image>
+<X> 44 </X>
+<Y> y_topping_bg </Y>
+<State> BGSugar </State>
+<Filename> "ROOT/taobin_project/image/topping/img1.png" </Filename>
+</Image>
+
 ; sugar1
 <Button>
 <X> 181 </X>
@@ -253,13 +270,21 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Var SugarState1 = "PressForever"
-	Var SugarState2 = "Enable"
+	
+	If TOPPING1 = "Powder Sugar Premix 25" Then
+		Var SugarState1 = "Invisible"
+		Var SugarState2 = "Invisible"
+	Else
+		Var SugarState1 = "PressForever"
+		Var SugarState2 = "Enable"
+	EndIf
+	
 	Var SugarState3 = "Enable"
 	Var SugarState4 = "Enable"
 	Var SugarState5 = "Enable"
 	Var topping1 = "1"
 	Refresh
+
 </EventClick>
 </Button>
 
@@ -273,13 +298,20 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Var SugarState1 = "Enable"
-	Var SugarState2 = "PressForever"
+	
+	If TOPPING1 = "Powder Sugar Premix 25" Then
+		Var SugarState1 = "Invisible"
+		Var SugarState2 = "Invisible"
+	Else
+		Var SugarState1 = "Enable"
+		Var SugarState2 = "PressForever"
+	EndIf
 	Var SugarState3 = "Enable"
 	Var SugarState4 = "Enable"
 	Var SugarState5 = "Enable"
 	Var topping1 = "2"
 	Refresh
+
 </EventClick>
 </Button>
 
@@ -294,8 +326,15 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Var SugarState1 = "Enable"
-	Var SugarState2 = "Enable"
+
+	If TOPPING1 = "Powder Sugar Premix 25" Then
+		Var SugarState1 = "Invisible"
+		Var SugarState2 = "Invisible"
+	Else
+		Var SugarState1 = "Enable"
+		Var SugarState2 = "Enable"
+	EndIf
+
 	Var SugarState3 = "PressForever"
 	Var SugarState4 = "Enable"
 	Var SugarState5 = "Enable"
@@ -314,8 +353,15 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Var SugarState1 = "Enable"
-	Var SugarState2 = "Enable"
+	
+	If TOPPING1 = "Powder Sugar Premix 25" Then
+		Var SugarState1 = "Invisible"
+		Var SugarState2 = "Invisible"
+	Else
+		Var SugarState1 = "Enable"
+		Var SugarState2 = "Enable"
+	EndIf
+
 	Var SugarState3 = "Enable"
 	Var SugarState4 = "PressForever"
 	Var SugarState5 = "Enable"
@@ -334,8 +380,15 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Var SugarState1 = "Enable"
-	Var SugarState2 = "Enable"
+	
+	If TOPPING1 = "Powder Sugar Premix 25" Then
+		Var SugarState1 = "Invisible"
+		Var SugarState2 = "Invisible"
+	Else
+		Var SugarState1 = "Enable"
+		Var SugarState2 = "Enable"
+	EndIf
+
 	Var SugarState3 = "Enable"
 	Var SugarState4 = "Enable"
 	Var SugarState5 = "PressForever"