From 9375729a27d4ecc5068af92e4c14ec278ea879da Mon Sep 17 00:00:00 2001
From: kong <wanlop@forth.co.th>
Date: Mon, 25 Oct 2021 15:53:30 +0700
Subject: [PATCH] add mozart

---
 sheet/best_seller.tsv              |   1 +
 xml/page_board.xml                 |   4 +-
 xml/page_catalog_choose_drink2.pml |  10 +-
 xml/page_catalog_choose_drink2.xml | 430 +++++++++++++++++++++++++++--
 xml/page_payment_multi.xml         |  79 +-----
 xml/page_show_error.xml            |  89 +++++-
 xml/page_tel_number_mask.xml       |  84 ++----
 xml/page_topping_select2.xml       |  33 ++-
 xml_main/startup.xml               |   2 +-
 9 files changed, 557 insertions(+), 175 deletions(-)

diff --git a/sheet/best_seller.tsv b/sheet/best_seller.tsv
index a0653641..76e49c6e 100644
--- a/sheet/best_seller.tsv
+++ b/sheet/best_seller.tsv
@@ -4,6 +4,7 @@
 12-02-03-0004
 12-05-03-0007
 12-05-03-0019
+12-01-01-0021
 12-01-01-0001
 12-01-01-0004
 12-01-02-0020
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 011af9c6..47dbfb03 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -486,7 +486,7 @@
 <State> ShowButtonClick </State>
 ;<Color> "0x00BDFF" </Color>
 <FilenamePress> "ROOT/taobin_project/image/main_page/bp_main_page_start.png" </FilenamePress>
-<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
@@ -610,7 +610,7 @@
 <Height> 50 </Height>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Var countClick = countClick + 1
+	;Var countClick = countClick + 1
 	If countClick = 3 Then
 
 		;Var TestLoopMakeDrink = 1
diff --git a/xml/page_catalog_choose_drink2.pml b/xml/page_catalog_choose_drink2.pml
index 38c3d561..de4b9877 100644
--- a/xml/page_catalog_choose_drink2.pml
+++ b/xml/page_catalog_choose_drink2.pml
@@ -8,13 +8,17 @@
 
  product_code = []
  product_code.append('12-01-01-0001')
+ # esp
  product_code.append('12-01-01-0013')
  product_code.append('12-01-01-0020')
+ product_code.append('12-01-01-0022')
 
  product_code.append('12-11-01-0001')
  product_code.append('12-01-01-0003')
+ # hot ameri
  product_code.append('12-01-01-0014')
  product_code.append('12-01-01-0019')
+ product_code.append('12-01-01-0021')
 
  product_code.append('12-01-01-0004')
 
@@ -28,14 +32,18 @@
  product_code.append('12-01-01-0011')
  product_code.append('12-01-01-0012')
  product_code.append('12-01-01-0017')
+ # Dirty
  product_code.append('12-01-02-0018')
  product_code.append('12-01-02-0020')
- 
+ product_code.append('12-01-02-0022')
 
  product_code.append('12-11-02-0001')
  product_code.append('12-01-02-0001')
+
+ # Ice ameri
  product_code.append('12-01-02-0011')
  product_code.append('12-01-02-0019')
+ product_code.append('12-01-02-0021')
 
  product_code.append('12-01-02-0002')
  product_code.append('12-11-02-0002')
diff --git a/xml/page_catalog_choose_drink2.xml b/xml/page_catalog_choose_drink2.xml
index 7a3c3a65..19f4dbc0 100644
--- a/xml/page_catalog_choose_drink2.xml
+++ b/xml/page_catalog_choose_drink2.xml
@@ -544,7 +544,100 @@
 	<Value> $12-01-01-0020.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=4 12-11-01-0001 
+	; button i=4 12-01-01-0022 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-01-0022.Button  </State> 
+	<Button>
+	<State> $12-01-01-0022.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-01-0022.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-01-0022.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-01-0022.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-01-0022.Self
+		Var NameDrink = $12-01-01-0022.NameE
+		Var NameDrinkTH = $12-01-01-0022.Name
+		Var DrinkDescriptionTH = $12-01-01-0022.description
+		Var DrinkDescription = $12-01-01-0022.descriptionE
+		Var PriceDrink = $12-01-01-0022.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-01-0022.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-01-01-0022.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-01-0022.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-01-0022.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-01-01-0022.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-01-01-0022.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=5 12-11-01-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -637,7 +730,7 @@
 	<Value> $12-11-01-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=5 12-01-01-0003 
+	; button i=6 12-01-01-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -730,7 +823,7 @@
 	<Value> $12-01-01-0003.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=6 12-01-01-0014 
+	; button i=7 12-01-01-0014 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -823,7 +916,7 @@
 	<Value> $12-01-01-0014.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=7 12-01-01-0019 
+	; button i=8 12-01-01-0019 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -916,7 +1009,100 @@
 	<Value> $12-01-01-0019.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=8 12-01-01-0004 
+	; button i=9 12-01-01-0021 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-01-0021.Button  </State> 
+	<Button>
+	<State> $12-01-01-0021.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-01-0021.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-01-0021.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-01-0021.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-01-0021.Self
+		Var NameDrink = $12-01-01-0021.NameE
+		Var NameDrinkTH = $12-01-01-0021.Name
+		Var DrinkDescriptionTH = $12-01-01-0021.description
+		Var DrinkDescription = $12-01-01-0021.descriptionE
+		Var PriceDrink = $12-01-01-0021.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-01-0021.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-01-01-0021.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-01-0021.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-01-0021.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-01-01-0021.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-01-01-0021.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=10 12-01-01-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1009,7 +1195,7 @@
 	<Value> $12-01-01-0004.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=9 12-01-01-0005 
+	; button i=11 12-01-01-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1102,7 +1288,7 @@
 	<Value> $12-01-01-0005.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=10 12-01-01-0006 
+	; button i=12 12-01-01-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1195,7 +1381,7 @@
 	<Value> $12-01-01-0006.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=11 12-01-01-0007 
+	; button i=13 12-01-01-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1288,7 +1474,7 @@
 	<Value> $12-01-01-0007.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=12 12-01-01-0009 
+	; button i=14 12-01-01-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1381,7 +1567,7 @@
 	<Value> $12-01-01-0009.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=13 12-01-01-0010 
+	; button i=15 12-01-01-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1474,7 +1660,7 @@
 	<Value> $12-01-01-0010.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=14 12-01-01-0011 
+	; button i=16 12-01-01-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1567,7 +1753,7 @@
 	<Value> $12-01-01-0011.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=15 12-01-01-0012 
+	; button i=17 12-01-01-0012 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1660,7 +1846,7 @@
 	<Value> $12-01-01-0012.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=16 12-01-01-0017 
+	; button i=18 12-01-01-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1753,7 +1939,7 @@
 	<Value> $12-01-01-0017.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=17 12-01-02-0018 
+	; button i=19 12-01-02-0018 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1846,7 +2032,7 @@
 	<Value> $12-01-02-0018.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=18 12-01-02-0020 
+	; button i=20 12-01-02-0020 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -1939,7 +2125,100 @@
 	<Value> $12-01-02-0020.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=19 12-11-02-0001 
+	; button i=21 12-01-02-0022 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-02-0022.Button  </State> 
+	<Button>
+	<State> $12-01-02-0022.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-02-0022.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-02-0022.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-02-0022.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-02-0022.Self
+		Var NameDrink = $12-01-02-0022.NameE
+		Var NameDrinkTH = $12-01-02-0022.Name
+		Var DrinkDescriptionTH = $12-01-02-0022.description
+		Var DrinkDescription = $12-01-02-0022.descriptionE
+		Var PriceDrink = $12-01-02-0022.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-02-0022.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-01-02-0022.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-02-0022.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-02-0022.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-01-02-0022.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-01-02-0022.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=22 12-11-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2032,7 +2311,7 @@
 	<Value> $12-11-02-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=20 12-01-02-0001 
+	; button i=23 12-01-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2125,7 +2404,7 @@
 	<Value> $12-01-02-0001.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=21 12-01-02-0011 
+	; button i=24 12-01-02-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2218,7 +2497,7 @@
 	<Value> $12-01-02-0011.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=22 12-01-02-0019 
+	; button i=25 12-01-02-0019 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2311,7 +2590,100 @@
 	<Value> $12-01-02-0019.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=23 12-01-02-0002 
+	; button i=26 12-01-02-0021 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-01-02-0021.Button  </State> 
+	<Button>
+	<State> $12-01-02-0021.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-01-02-0021.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-01-02-0021.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-01-02-0021.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-01-02-0021.Self
+		Var NameDrink = $12-01-02-0021.NameE
+		Var NameDrinkTH = $12-01-02-0021.Name
+		Var DrinkDescriptionTH = $12-01-02-0021.description
+		Var DrinkDescription = $12-01-02-0021.descriptionE
+		Var PriceDrink = $12-01-02-0021.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-01-02-0021.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
+	</EventOnClick>
+	</Button>
+	<Text>
+	<X> 182 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Align> "Hurr" </Align>
+	<Width>150</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> $12-01-02-0021.Price </Value>
+	</Text>
+	<Text>
+	<X> 164 </X>
+	<Y> 12 </Y>
+	<State> ShowPrice </State>
+	<Width>20</Width>
+	<Size> 27 </Size>
+	<Font> KanitTTF </Font>
+	<Color> 0xB78F24 </Color>
+	<Value> "฿"" </Value>
+	</Text>
+	<Text>
+	<X>  16   </X>
+	<Y>  190  </Y>
+	<Size> 24 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-02-0021.Name </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showthaiText </State>
+	<Value> $12-01-02-0021.description </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 190 </Y>
+	<Size> 22 </Size>
+	<Width>220</Width>
+	<Mode> "multi2" </Mode>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x322B26 </Color>
+	<State> showengText </State>
+	<Value> $12-01-02-0021.NameE </Value>
+	</Text>
+	<Text>
+	<X> 16 </X>
+	<Y> 246 </Y>
+	<Size> 14 </Size>
+	<Width>220</Width>
+	<Font> KanitMediumTTF </Font>
+	<Color> 0x6F5F51 </Color>
+	<State> showengText </State>
+	<Value> $12-01-02-0021.descriptionE </Value>
+	</Text>
+</Block>
+	; button i=27 12-01-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2404,7 +2776,7 @@
 	<Value> $12-01-02-0002.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=24 12-11-02-0002 
+	; button i=28 12-11-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2497,7 +2869,7 @@
 	<Value> $12-11-02-0002.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=25 12-01-02-0003 
+	; button i=29 12-01-02-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2590,7 +2962,7 @@
 	<Value> $12-01-02-0003.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=26 12-01-02-0004 
+	; button i=30 12-01-02-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2683,7 +3055,7 @@
 	<Value> $12-01-02-0004.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=27 12-01-02-0005 
+	; button i=31 12-01-02-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2776,7 +3148,7 @@
 	<Value> $12-01-02-0005.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=28 12-01-02-0007 
+	; button i=32 12-01-02-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2869,7 +3241,7 @@
 	<Value> $12-01-02-0007.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=29 12-01-02-0008 
+	; button i=33 12-01-02-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -2962,7 +3334,7 @@
 	<Value> $12-01-02-0008.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=30 12-01-02-0009 
+	; button i=34 12-01-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3055,7 +3427,7 @@
 	<Value> $12-01-02-0009.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=31 12-01-02-0017 
+	; button i=35 12-01-02-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@@ -3148,7 +3520,7 @@
 	<Value> $12-01-02-0017.descriptionE </Value>
 	</Text>
 </Block>
-	; button i=32 11-01-02-0009 
+	; button i=36 11-01-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
diff --git a/xml/page_payment_multi.xml b/xml/page_payment_multi.xml
index 65320e15..ed4f0e8c 100644
--- a/xml/page_payment_multi.xml
+++ b/xml/page_payment_multi.xml
@@ -100,80 +100,13 @@
 	DEBUGVAR CART2_PRICE
 	DEBUGVAR CART3_PRICE
 
-
+Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+	
 	
 </EventOpen>
-<Timeout> 900 </Timeout>
+<Timeout> 5000 </Timeout>
 <EventTimeout> 
-	
-	If ReadyForBrew = "false" Then
-		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-		Var ReadyForBrew = "false"
-	EndIf
-
-	If MachineStage = "remove-cup" Then
-		Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
-
-	EndIf
-
-	Var CountStepPackPayment = CountStepPackPayment + 1
-	If CountStepPackPayment = 1 Then
-
-		
-
-		SAVELOG ExtendData
-
-		If GetPayInfoFlag = 0 Then
-			If RoadShow = "false" Then
-				;CoinVending ON
-				CoinVending XBILL
-			EndIf
-
-			
-			Var RemainAmount = 0
-
-
-
-			Var SessionID2 = SelectSlot + ":"
-			Var SessionID2 = SessionID2 + ExtendData
-
-			Var CreditAmount1 = ""
-			Var ServiceAmountFlow = ""
-			Var TelephoneNumberQR = "0899999999"
-			Var ServiceType = "coffee"
-			Var ECommerceQR = ""
-			Var ECommerceQR = ECommerceQR + PriceDrink
-			Var ECommerceQR =	ECommerceQR + "/"
-			Var ECommerceQR =	ECommerceQR + DiscountDrink 
-			Var ECommerceQR =	ECommerceQR + "/"
-			Var ECommerceQR =	ECommerceQR + SessionID2 
-			Var ECommerceQR =	ECommerceQR + "/"
-			Var ECommerceQR =	ECommerceQR + SelectDrink 
-			Var ECommerceQR =	ECommerceQR + "/"
-			Var ECommerceQR =	ECommerceQR + "KBA:2"
-			Var ServiceParameter = "max"
-			Var ServiceCharge = 0
-			Var AccountType = "new"
-			Var testservice = "kbank"
-			Var tc = ""
-			Var GetScore = ""
-			Var OperatorName = ""
-			Var SessionID = ""
-
-
-			GetPayInfo TelephoneNumberQR ECommerceQR ServiceType ServiceParameter SessionID OperatorName CreditAmount1 ServiceAmountFlow GetScore tc
-			Var Timeout = 0
-			Var GetPayInfoFlag = 1
-			Var ReqPayInfoFlag = 1
-
-		EndIf
-
-		; Reset
-		Var MachineState_Result = 0
-		Open "ROOT/taobin_project/xml/page_payment_cash.xml"
-	
-	EndIf
-
+	Open "ROOT/taobin_project/xml/page_back_to_main.xml"
 	TimerReset
 	Refresh
 </EventTimeout> 
@@ -201,6 +134,10 @@
 <Width> 331 </Width>
 <Height> 435 </Height>
 <Filename> PictureDrink </Filename>
+<EventClick>
+	Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+		
+</EventClick>
 </Image>
 
 <Text>
diff --git a/xml/page_show_error.xml b/xml/page_show_error.xml
index a3c9251f..55e7643f 100644
--- a/xml/page_show_error.xml
+++ b/xml/page_show_error.xml
@@ -11,13 +11,51 @@
 	Var countClick2 = 0
 
 
-	If show_eng = "true" Then 
-		Var DirImage = "ROOT/taobin_project/image/close_en/"
-		
-	Else
-		Var DirImage = "ROOT/taobin_project/image/close_th"
+	;DEBUGVAR MachineStage
+	;DEBUGVAR stop_now
+
+	Var show_error_normal = "Invisible"
+	Var show_error_sp1 = "Enable"
+	
+	If MachineStage = "mcu-upgrade" Then
+		If show_eng = "true" Then 
+			Var DirImage = "ROOT/taobin_project/image/vending_error_en/"
+		Else
+			Var DirImage = "ROOT/taobin_project/image/vending_error"
+		EndIf
 	EndIf
 
+	If NeedUpgrade = "true" Then
+		If show_eng = "true" Then 
+			Var DirImage = "ROOT/taobin_project/image/vending_error_en/"
+			
+		Else
+			Var DirImage = "ROOT/taobin_project/image/vending_error"
+		EndIf
+	EndIf
+
+
+	If MachineStage = "close-maintenance" Then
+		If stop_now = "true" Then
+			If show_eng = "true" Then 
+				Var DirImage = "ROOT/taobin_project/image/vending_error_en/"
+				
+			Else
+				Var DirImage = "ROOT/taobin_project/image/vending_error"
+			EndIf
+		Else
+			Var show_error_normal = "Enable"
+			Var show_error_sp1 = "Invisible"
+			If show_eng = "true" Then 
+				Var DirImage = "ROOT/taobin_project/image/close_en/"
+				
+			Else
+				Var DirImage = "ROOT/taobin_project/image/close_th"
+			EndIf
+		EndIf
+	EndIf
+
+
 	StopLongPlay
 
 	If LEDSet = "true" Then
@@ -70,17 +108,58 @@
 </EventTimeout>
 
 <Image>
+<State> show_error_normal </State>
 <X> 127 </X>
 <Y> 688 </Y>
 <Filename> Var(DirImage + "/img1.png") </Filename>
 </Image>
 
 <Image>
+<State> show_error_normal </State>
 <X> 0 </X>
 <Y> 924 </Y>
 <Filename> RandomImage </Filename>
 </Image>
 
+<Image>
+<State> show_error_sp1 </State>
+<X> 0 </X>
+<Y> 897 </Y>
+<Filename> Var(DirImage + "/img1.png") </Filename>
+</Image>
+
+<Image>
+<State> show_error_sp1 </State>
+<X> 0 </X>
+<Y> 694 </Y>
+<Filename> Var(DirImage + "/text1.png") </Filename>
+</Image>
+
+<Image>
+<State> show_error_sp1 </State>
+<X> 0 </X>
+<Y> 1685 </Y>
+<Filename> Var(DirImage + "/text2.png") </Filename>
+</Image>
+
+
+<Button>
+<X> 990 </X>
+<Y> 640 </Y>
+<Filename> show_btn </Filename>
+<FilenamePress> show_btp  </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; eng
+	If show_eng = "true" Then 
+		Var show_eng = "false"
+	Else
+		Var show_eng = "true"
+	EndIf
+	Open "ROOT/taobin_project/xml/page_show_error.xml"
+</EventClick>
+
 <Button>
 <X> 0 </X>
 <Y> 1860 </Y>
diff --git a/xml/page_tel_number_mask.xml b/xml/page_tel_number_mask.xml
index 4d08e15b..b6ac2714 100644
--- a/xml/page_tel_number_mask.xml
+++ b/xml/page_tel_number_mask.xml
@@ -9,6 +9,26 @@
 <Refresh> "Partial" </Refresh>
 <EventOpen>
 
+	DEBUGVAR CART1_PICTURE
+	DEBUGVAR CART2_PICTURE
+	DEBUGVAR CART3_PICTURE
+
+	DEBUGVAR CART1_PDCODE
+	DEBUGVAR CART2_PDCODE
+	DEBUGVAR CART3_PDCODE
+
+	DEBUGVAR CART1_NAME_ENG
+	DEBUGVAR CART2_NAME_ENG
+	DEBUGVAR CART3_NAME_ENG
+
+	DEBUGVAR CART1_NAME_THAI
+	DEBUGVAR CART2_NAME_THAI
+	DEBUGVAR CART3_NAME_THAI
+
+
+	DEBUGVAR CART1_PRICE
+	DEBUGVAR CART2_PRICE
+	DEBUGVAR CART3_PRICE
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -115,36 +135,9 @@
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Var Timeout = 0
-	StrLen TelephoneNumber TelNumLen
-	If TelNumLen < 10 Then 
-	Var TelephoneNumber = TelephoneNumber + "7"
-	Var ShowTextNumber = "Invisible"
-	Trim TelephoneNumber 10
-	TimerReset
-	Refresh
-	StrLen TelephoneNumber TelNumLen
-	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
-	EndIf
-	Var ShowErrorText = "Invisible"
-
-	If TelNumLen = 7 Then
-		Var number7 = "7"
-	EndIf
-
-	If TelNumLen = 8 Then
-		Var number8 = "7"
-	EndIf
-
-	If TelNumLen = 9 Then
-		Var number9 = "7"
-	EndIf
-
-	If TelNumLen = 10 Then
-		Var number10 = "7"
-	EndIf
-	EndIf
+	Var ahash = ""
+	GenHashWithTimeStamp ahash
+	DEBUGVAR ahash
 </EventClick>
 </Button>
 
@@ -197,36 +190,7 @@
 <Sound> "ROOT/sounds/codebuttom.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Var Timeout = 0
-	StrLen TelephoneNumber TelNumLen
-	If TelNumLen < 10 Then 
-	Var TelephoneNumber = TelephoneNumber + "9"
-	Var ShowTextNumber = "Invisible"
-	Trim TelephoneNumber 10
-	TimerReset
-	Refresh
-	StrLen TelephoneNumber TelNumLen
-	If TelNumLen >= 10 Then 
-		Var Tel_Confirm_State = "Enable"
-	EndIf
-	Var ShowErrorText = "Invisible"
-
-	If TelNumLen = 7 Then
-		Var number7 = "9"
-	EndIf
-
-	If TelNumLen = 8 Then
-		Var number8 = "9"
-	EndIf
-
-	If TelNumLen = 9 Then
-		Var number9 = "9"
-	EndIf
-
-	If TelNumLen = 10 Then
-		Var number10 = "9"
-	EndIf
-	EndIf
+	Cart "DeleteMenuID" 2
 </EventClick>
 </Button>
 
diff --git a/xml/page_topping_select2.xml b/xml/page_topping_select2.xml
index 1564cf8b..07167955 100644
--- a/xml/page_topping_select2.xml
+++ b/xml/page_topping_select2.xml
@@ -86,6 +86,14 @@
 	Var bg_straw_only = DirImage + "/bg_straw_only.png"
 	Var bg_lid_only = DirImage + "/bg_lid_only.png"
 	
+
+
+	Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png"
+	Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png"
+	
+	Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png"
+	Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png"
+
 	; Move to catalog.
 	;Machine DoorClose
 	
@@ -99,12 +107,6 @@
 
 	Var  ShiftSugarStep = 1
 
-
-	Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png"
-	Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png"
-	
-	Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png"
-	Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png"
 		
 	CRLFToSpace showname
 	CRLFToSpace showdesc
@@ -192,8 +194,19 @@
 	Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png"
 	Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png"
 	
+	Var bg_strawlid = DirImage + "/bg_strawlid.png"
+	Var bg_straw_only = DirImage + "/bg_straw_only.png"
+	Var bg_lid_only = DirImage + "/bg_lid_only.png"
+	
 
 
+	Var backGroundAddExtra = DirImage + "/bg_add_shot_coffee_only.png"
+	Var backGroundAddExtra2 = DirImage + "/bg_add_shot_coffee_only.png"
+	
+	Var backGroundAddShotPremium = DirImage + "/bg_add_shot_coffee2_only.png"
+	Var backGroundAddShotPremiumWith = DirImage + "/bg_add_shot_coffee_only.png"
+	
+
 	CRLFToSpace showname
 	CRLFToSpace showdesc
 	
@@ -544,6 +557,14 @@
 			Var ShotCoffeePremium = "Enable"
 			Var showShotEnable = "Enable"
 
+			DEBUGVAR TOPPING2
+			Refresh
+		EndIf
+	If TOPPING2 = "shot coffee 1008" Then
+	
+			Var ShotCoffeePremium = "Enable"
+			Var showShotEnable = "Enable"
+
 			DEBUGVAR TOPPING2
 			Refresh
 		EndIf
diff --git a/xml_main/startup.xml b/xml_main/startup.xml
index 4710e883..844c4cee 100644
--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@@ -95,7 +95,7 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "5.62"
+	Var XMLPageVersion = "5.63"
 
 </EventOpen>