...

2022-04-20 18:01:35 +07:00 · 2022-04-20 18:01:35 +07:00 · d58d495834
commit d58d495834
parent 5cea4408a0 c89165ded8
34 changed files with 1148 additions and 383 deletions
--- a/image/consent/img_popup2.png
+++ b/image/consent/img_popup2.png
--- a/image/consent_en/img_popup2.png
+++ b/image/consent_en/img_popup2.png
--- a/image/main_page/bn_remove_cup.png
+++ b/image/main_page/bn_remove_cup.png
--- a/image/main_page/bp_remove_cup.png
+++ b/image/main_page/bp_remove_cup.png
--- a/image/page_drink/bn_iced_thai_milk_tea_tacc.png
+++ b/image/page_drink/bn_iced_thai_milk_tea_tacc.png
--- a/image/page_drink_disable/bn_iced_thai_milk_tea_tacc.png
+++ b/image/page_drink_disable/bn_iced_thai_milk_tea_tacc.png
--- a/image/page_drink_select/bn_iced_thai_milk_tea_tacc.png
+++ b/image/page_drink_select/bn_iced_thai_milk_tea_tacc.png
--- a/video/taobin_save_world1.mp4
+++ b/video/taobin_save_world1.mp4
--- a/video/taobin_save_world2.mp4
+++ b/video/taobin_save_world2.mp4
--- a/video/taobin_save_world3.mp4
+++ b/video/taobin_save_world3.mp4
--- a/video/taobin_thank1.mp4
+++ b/video/taobin_thank1.mp4
--- a/video/taobin_thank2.mp4
+++ b/video/taobin_thank2.mp4
--- a/xml/menu_new_layout_gen.py
+++ b/xml/menu_new_layout_gen.py
@ -128,9 +128,6 @@
      out_xml( '\t\tVar DrinkDescriptionTH = "' + spl[2].replace("\\n", " ") + '"\r\n')
      out_xml( '\t\tVar DrinkDescription = "' + spl[3].replace("\\n", " ") + '"\r\n')
      
-
-      out_xml( '\t\tTopping "Load" "'+ spl[5] +'"\r\n')
-
      out_xml( '\t\tVar PictureDrink = "' + new_default_dir2 + '" + \"' + menu_img + '\"\r\n')
            
      out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n')
@ -149,15 +146,19 @@

      out_xml( '\t\tIf PD_STAGE_2 = "Enable" Then\r\n')
      out_xml( '\t\t\tVar PD_STAGE_2 = "PressForever"\r\n')
+      out_xml( '\t\t\tTopping "Load" "'+ spl[5] +'"\r\n')
      out_xml( '\t\tElse\r\n')
      out_xml( '\t\t\tIf PD_STAGE_1 = "Enable" Then\r\n')
      out_xml( '\t\t\t\tVar PD_STAGE_1 = "PressForever"\r\n')
+      out_xml( '\t\t\tTopping "Load" "'+ spl[4] +'"\r\n')
      out_xml( '\t\t\tElse\r\n')
      out_xml( '\t\t\t\tVar PD_STAGE_3 = "PressForever"\r\n')
+      out_xml( '\t\t\tTopping "Load" "'+ spl[6] +'"\r\n')
      out_xml( '\t\t\tEndIf\r\n')
      out_xml( '\t\tEndIf\r\n')


+
      out_xml( '\t\tVar menu_name_eng_hot = $' + pd_code_1 + '.NameE\r\n')
      out_xml( '\t\tVar menu_desc_eng_hot = $' + pd_code_1 + '.descriptionE\r\n')
      out_xml( '\t\tVar menu_name_thai_hot = $' + pd_code_1 + '.Name\r\n')
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -415,6 +415,17 @@
 	;READ_FILE "/mnt/sdcard/spiral" SpiralOnline

 	READ_FILE "/mnt/sdcard/new_layout" new_layout
+		
+
+	DEBUGVAR JXMLVersionInt
+
+
+	If JXMLVersionInt > 389 Then
+		Var new_layout = "true"
+	EndIf
+
+	DEBUGVAR new_layout
+
 	If new_layout = "true" Then
 		Machine MenuLayoutNew
 	Else
--- a/xml/page_catalog.xml
+++ b/xml/page_catalog.xml
@ -141,8 +141,7 @@
 	
 	EndIf

-	READ_FILE "/mnt/sdcard/new_layout" new_layout
-
+	
 	Var menu_name_eng_hot = ""
 	Var menu_desc_eng_hot = ""
 	Var menu_name_thai_hot = ""
--- a/xml/page_catalog_choose_drink3.pml
+++ b/xml/page_catalog_choose_drink3.pml
@ -7,6 +7,7 @@
 product_code = []
 product_code.append('12-02-01-0001')
 product_code.append('12-02-01-0002')
+ product_code.append('12-02-01-0024')
 
 product_code.append('12-02-01-0020')
 
@ -22,6 +23,8 @@
 
 product_code.append('12-02-01-0021')
 
+
+
 product_code.append('12-02-01-0007')
 product_code.append('12-02-01-0008')
 product_code.append('12-02-01-0019')
@ -46,8 +49,9 @@

 product_code.append('12-02-02-0004')
 product_code.append('12-02-02-0026')
-
+ #12-02-02-0024
 product_code.append('12-02-02-0005')
+ product_code.append('12-02-02-0024')
 product_code.append('12-02-02-0006')
 product_code.append('12-02-02-0007')

--- a/xml/page_catalog_choose_drink3.xml
+++ b/xml/page_catalog_choose_drink3.xml
@ -787,7 +787,113 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=3 12-02-01-0020 
+	; button i=3 12-02-01-0024 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-02-01-0024.Button  </State> 
+	<Button>
+	<State> $12-02-01-0024.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-02-01-0024.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-02-01-0024.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-02-01-0024.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-02-01-0024.Self
+		Var NameDrink = $12-02-01-0024.NameE
+		Var NameDrinkTH = $12-02-01-0024.Name
+		Var DrinkDescriptionTH = $12-02-01-0024.description
+		Var DrinkDescription = $12-02-01-0024.descriptionE
+		Var PriceDrink = $12-02-01-0024.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-02-01-0024.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-01-0024.Button IsSmoRet
+		Open "ROOT/taobin_project/xml/page_topping_select.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-02-01-0024.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-02-01-0024.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-02-01-0024.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-02-01-0024.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-02-01-0024.descriptionE </Value>
+	</Text>
+	<Image>
+	<X> 2 </X>
+	<Y> 2 </Y>
+	<State> eval( STRCONTAIN "Smoothie" $12-02-01-0024.Button SmoRet 
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+  EndIf
+)  </State> 
+	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
+	</Image>
+</Block>
+	; button i=4 12-02-01-0020 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -893,7 +999,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=4 12-02-01-0003 
+	; button i=5 12-02-01-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -999,7 +1105,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=5 12-02-01-0025 
+	; button i=6 12-02-01-0025 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1105,7 +1211,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=6 12-02-01-0004 
+	; button i=7 12-02-01-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1211,7 +1317,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=7 12-02-01-0026 
+	; button i=8 12-02-01-0026 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1317,7 +1423,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=8 12-02-01-0006 
+	; button i=9 12-02-01-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1423,7 +1529,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=9 12-02-01-0021 
+	; button i=10 12-02-01-0021 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1529,7 +1635,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=10 12-02-01-0007 
+	; button i=11 12-02-01-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1635,7 +1741,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=11 12-02-01-0008 
+	; button i=12 12-02-01-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1741,7 +1847,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=12 12-02-01-0019 
+	; button i=13 12-02-01-0019 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1847,7 +1953,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=13 12-02-01-0009 
+	; button i=14 12-02-01-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -1953,7 +2059,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=14 12-02-01-0022 
+	; button i=15 12-02-01-0022 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -2059,7 +2165,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=15 12-02-01-0010 
+	; button i=16 12-02-01-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -2165,7 +2271,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=16 12-02-01-0011 
+	; button i=17 12-02-01-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -2271,7 +2377,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=17 12-02-01-0027 
+	; button i=18 12-02-01-0027 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -2377,7 +2483,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=18 12-02-01-0012 
+	; button i=19 12-02-01-0012 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -2483,7 +2589,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=19 12-02-01-0028 
+	; button i=20 12-02-01-0028 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -2589,7 +2695,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=20 12-02-01-0017 
+	; button i=21 12-02-01-0017 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -2695,7 +2801,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=21 12-02-01-0031 
+	; button i=22 12-02-01-0031 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -2801,7 +2907,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=22 12-02-01-0032 
+	; button i=23 12-02-01-0032 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -2907,7 +3013,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=23 12-02-02-0020 
+	; button i=24 12-02-02-0020 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3013,7 +3119,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=24 12-02-02-0001 
+	; button i=25 12-02-02-0001 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3119,7 +3225,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=25 12-02-02-0002 
+	; button i=26 12-02-02-0002 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3225,7 +3331,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=26 12-02-02-0003 
+	; button i=27 12-02-02-0003 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3331,7 +3437,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=27 12-02-02-0025 
+	; button i=28 12-02-02-0025 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3437,7 +3543,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=28 12-02-02-0004 
+	; button i=29 12-02-02-0004 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3543,7 +3649,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=29 12-02-02-0026 
+	; button i=30 12-02-02-0026 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3649,7 +3755,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=30 12-02-02-0005 
+	; button i=31 12-02-02-0005 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3755,7 +3861,113 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=31 12-02-02-0006 
+	; button i=32 12-02-02-0024 
+<Block>
+	<MarginLeft> 33 </MarginLeft>
+	<MarginTop> 22 </MarginTop>
+	<Width> 225 </Width>
+	<Height> 296 </Height>
+	<State> $12-02-02-0024.Button  </State> 
+	<Button>
+	<State> $12-02-02-0024.Button  </State> 
+	<Filename> Var( "ROOT/taobin_project/image/page_drink/" + $12-02-02-0024.image ) </Filename>
+	<FilenamePress> Var( "ROOT/taobin_project/image/page_drink_press/" + $12-02-02-0024.image ) " </FilenamePress>
+	<FilenameDisable> Var( "ROOT/taobin_project/image/page_drink_disable/" + $12-02-02-0024.image ) " </FilenameDisable>
+	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+	<Volume> SoundVolume </Volume>
+	<EventOnClick> 
+		Var SelectDrink = $12-02-02-0024.Self
+		Var NameDrink = $12-02-02-0024.NameE
+		Var NameDrinkTH = $12-02-02-0024.Name
+		Var DrinkDescriptionTH = $12-02-02-0024.description
+		Var DrinkDescription = $12-02-02-0024.descriptionE
+		Var PriceDrink = $12-02-02-0024.Price
+		Var PictureDrink = "ROOT/taobin_project/image/page_drink_select/" + $12-02-02-0024.image
+		Topping "Load" SelectDrink
+		SAVELOG NameDrink
+		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
+		STRCONTAIN "Smoothie" $12-02-02-0024.Button IsSmoRet
+		Open "ROOT/taobin_project/xml/page_topping_select.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-02-02-0024.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-02-02-0024.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-02-02-0024.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-02-02-0024.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-02-02-0024.descriptionE </Value>
+	</Text>
+	<Image>
+	<X> 2 </X>
+	<Y> 2 </Y>
+	<State> eval( STRCONTAIN "Smoothie" $12-02-02-0024.Button SmoRet 
+ If SmoRet = "true" Then
+ Var return = "Enable"
+ Else
+ Var return = "Invisible"
+  EndIf
+)  </State> 
+	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
+	</Image>
+</Block>
+	; button i=33 12-02-02-0006 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3861,7 +4073,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=32 12-02-02-0007 
+	; button i=34 12-02-02-0007 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -3967,7 +4179,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=33 12-02-02-0008 
+	; button i=35 12-02-02-0008 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -4073,7 +4285,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=34 12-02-02-0019 
+	; button i=36 12-02-02-0019 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -4179,7 +4391,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=35 12-02-02-0009 
+	; button i=37 12-02-02-0009 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -4285,7 +4497,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=36 12-02-02-0022 
+	; button i=38 12-02-02-0022 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -4391,7 +4603,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=37 12-02-02-0010 
+	; button i=39 12-02-02-0010 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -4497,7 +4709,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=38 12-02-02-0011 
+	; button i=40 12-02-02-0011 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -4603,7 +4815,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=39 12-02-02-0027 
+	; button i=41 12-02-02-0027 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -4709,7 +4921,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=40 12-02-02-0012 
+	; button i=42 12-02-02-0012 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -4815,7 +5027,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=41 12-02-02-0028 
+	; button i=43 12-02-02-0028 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -4921,7 +5133,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=42 12-05-02-0027 
+	; button i=44 12-05-02-0027 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -5027,7 +5239,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=43 12-02-02-0031 
+	; button i=45 12-02-02-0031 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
@ -5133,7 +5345,7 @@
 	<Filename> "ROOT/taobin_project/image/topping2/blender_icon.png" </Filename>
 	</Image>
 </Block>
-	; button i=44 12-02-02-0032 
+	; button i=46 12-02-02-0032 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
--- a/xml/page_catalog_group_coffee.skt
+++ b/xml/page_catalog_group_coffee.skt
@ -41,25 +41,11 @@



-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-</EventClick>
-</Button>
-
-

 <?hurr 
    #include=menu_new_layout_gen.py
 ?>


+
 </Popup>
--- a/xml/page_catalog_group_coffee.xml
+++ b/xml/page_catalog_group_coffee.xml
@ -578,21 +578,6 @@



-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-</EventClick>
-</Button>
-
-

 <FrameScroll> 
 <X> 10 </X>
@ -625,7 +610,6 @@
 		Var NameDrinkTH = "เอสเพรสโซ่"
 		Var DrinkDescriptionTH = "กาแฟ (30 ml)"
 		Var DrinkDescription = "Espresso (30 ml)"
-		Topping "Load" "-"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0001.Price
@ -639,11 +623,14 @@
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0001"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0001.NameE
@ -787,11 +774,10 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "DOUBLE ESPRESSO"
+		Var NameDrink = "DOUBLE  ESPRESSO"
 		Var NameDrinkTH = "ดับเบิลเอสเพรสโซ่"
 		Var DrinkDescriptionTH = "กาแฟ (60 ml)"
 		Var DrinkDescription = "Espresso (60 ml)"
-		Topping "Load" "-"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_double_espresso.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-11-01-0001.Price
@ -805,11 +791,14 @@
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-11-01-0001"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-11-01-0001.NameE
@ -866,7 +855,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "DOUBLE ESPRESSO" </Value>
+	<Value> "DOUBLE 
+ESPRESSO" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -957,7 +947,6 @@
 		Var NameDrinkTH = "กาแฟดำ(อเมริกาโน)"
 		Var DrinkDescriptionTH = "กาแฟ และน้ำ "
 		Var DrinkDescription = "Espresso, Water"
-		Topping "Load" "12-01-02-0001"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_america_no.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0003.Price
@ -971,11 +960,14 @@
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0001"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0003"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0003.NameE
@ -1123,7 +1115,6 @@
 		Var NameDrinkTH = "เอสเพรสโซ่ช็อต  Guji Queen Berry"
 		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process)  หอมสตรอว์เบอร์รี ส้ม และดอกไม้"
 		Var DrinkDescription = "Light roast natural process:  Strawberry, Orange, Floral"
-		Topping "Load" "-"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0013.Price
@ -1137,11 +1128,14 @@
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0013"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0013.NameE
@ -1293,7 +1287,6 @@ Strawberry, Orange, Floral" </Value>
 		Var NameDrinkTH = "เอสเพรสโซ่ช็อต   BLUE DADDY"
 		Var DrinkDescriptionTH = "Washed process  หอมบลูเบอร์รี และดอกไม้"
 		Var DrinkDescription = "Washed process  Note: Blue Berry and Floral"
-		Topping "Load" "-"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_bluedaddy.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0020.Price
@ -1307,11 +1300,14 @@ Strawberry, Orange, Floral" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0020"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0020.NameE
@ -1463,7 +1459,6 @@ Note: Blue Berry and Floral" </Value>
 		Var NameDrinkTH = "เอสเพรสโซ่ช็อต   MOZART "
 		Var DrinkDescriptionTH = "Raisin Honey process  หอมสตรอว์เบอร์รี กุหลาบ มะลิ"
 		Var DrinkDescription = "Raisin Honey process   Note: Strawberry & Floral"
-		Topping "Load" "-"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_mozart.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0022.Price
@ -1477,11 +1472,14 @@ Note: Blue Berry and Floral" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0022"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0022.NameE
@ -1633,7 +1631,6 @@ Note: Strawberry & Floral" </Value>
 		Var NameDrinkTH = "เอสเพรสโซ่ช็อต   SNOWWHITE"
 		Var DrinkDescriptionTH = "Anaerobic process  หอมมะลิ น้ำผึ้ง เมเปิล"
 		Var DrinkDescription = "Anaerobic process   Note: Jasmine & Honey"
-		Topping "Load" "-"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_snowwhite.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0024.Price
@ -1647,11 +1644,14 @@ Note: Strawberry & Floral" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0024"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0024.NameE
@ -1803,7 +1803,6 @@ Note: Jasmine & Honey" </Value>
 		Var NameDrinkTH = "เอสเพรสโซ่ช็อต   WHISKY DUDE"
 		Var DrinkDescriptionTH = "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา"
 		Var DrinkDescription = "Washed Sherry cask ferment  Note: Whisky & Vanilla"
-		Topping "Load" "-"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_whiskydude.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0026.Price
@ -1817,11 +1816,14 @@ Note: Jasmine & Honey" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0026"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0026.NameE
@ -1973,7 +1975,6 @@ Note: Whisky & Vanilla" </Value>
 		Var NameDrinkTH = "เอสเพรสโซ่ช็อต   PEACHER"
 		Var DrinkDescriptionTH = "Barrel-aged process   หอมพีช, ชา, ช็อกโกแลต"
 		Var DrinkDescription = "Barrel-aged process  Note: Peach, tea, chocolate"
-		Topping "Load" "-"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_peacher.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0028.Price
@ -1987,11 +1988,14 @@ Note: Whisky & Vanilla" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0028"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0028.NameE
@ -2143,7 +2147,6 @@ Note: Peach, tea, chocolate" </Value>
 		Var NameDrinkTH = "เอสเพรสโซ่ช็อต   PURE BEAUTY"
 		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process)  กลิ่นดอกไม้ ผลไม้เขตร้อน"
 		Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit"
-		Topping "Load" "-"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_espresso_light_pure_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0033.Price
@ -2157,11 +2160,14 @@ Note: Peach, tea, chocolate" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0033"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0033.NameE
@ -2312,7 +2318,6 @@ ESPRESSO" </Value>
 		Var NameDrinkTH = "อเมริกาโน   Guji Queen Berry"
 		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process)  หอมสตรอว์เบอร์รี ส้ม และดอกไม้"
 		Var DrinkDescription = "Light roast natural process:  Strawberry, Orange, Floral"
-		Topping "Load" "12-01-02-0011"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0014.Price
@ -2326,11 +2331,14 @@ ESPRESSO" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0011"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0014"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0014.NameE
@ -2482,7 +2490,6 @@ Strawberry, Orange, Floral" </Value>
 		Var NameDrinkTH = "อเมริกาโน   BLUE DADDY"
 		Var DrinkDescriptionTH = "Washed process  หอมบลูเบอร์รี และดอกไม้"
 		Var DrinkDescription = "Washed process  Note: Blue Berry and Floral"
-		Topping "Load" "12-01-02-0019"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_bluedaddy.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0019.Price
@ -2496,11 +2503,14 @@ Strawberry, Orange, Floral" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0019"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0019"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0019.NameE
@ -2652,7 +2662,6 @@ Note: Blue Berry and Floral" </Value>
 		Var NameDrinkTH = "อเมริกาโน  MOZART"
 		Var DrinkDescriptionTH = "Raisin Honey process  หอมสตรอว์เบอร์รี กุหลาบ มะลิ"
 		Var DrinkDescription = "Raisin Honey process   Note: Strawberry & Floral"
-		Topping "Load" "12-01-02-0021"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_mozart.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0021.Price
@ -2666,11 +2675,14 @@ Note: Blue Berry and Floral" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0021"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0021"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0021.NameE
@ -2822,7 +2834,6 @@ Note: Strawberry & Floral" </Value>
 		Var NameDrinkTH = "อเมริกาโน  WHISKY DUDE"
 		Var DrinkDescriptionTH = "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา"
 		Var DrinkDescription = "Washed Sherry cask ferment  Note: Whisky & Vanilla"
-		Topping "Load" "12-01-02-0025"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_whiskydude.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0025.Price
@ -2836,11 +2847,14 @@ Note: Strawberry & Floral" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0025"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0025"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0025.NameE
@ -2992,7 +3006,6 @@ Note: Whisky & Vanilla" </Value>
 		Var NameDrinkTH = "อเมริกาโน SNOWWHITE"
 		Var DrinkDescriptionTH = "Anaerobic process  หอมมะลิ น้ำผึ้ง เมเปิล"
 		Var DrinkDescription = "Anaerobic process   Note: Jasmine & Honey"
-		Topping "Load" "12-01-02-0023"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_snowwhite.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0023.Price
@ -3006,11 +3019,14 @@ Note: Whisky & Vanilla" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0023"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0023"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0023.NameE
@ -3162,7 +3178,6 @@ Note: Jasmine & Honey" </Value>
 		Var NameDrinkTH = "อเมริกาโน    PEACHER"
 		Var DrinkDescriptionTH = "Barrel-aged process  หอมพีช, ชา, ช็อกโกแลต"
 		Var DrinkDescription = "Barrel-aged process  Note: Peach, tea, chocolate"
-		Topping "Load" "12-01-02-0027"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_peacher.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0027.Price
@ -3176,11 +3191,14 @@ Note: Jasmine & Honey" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0027"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0027"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0027.NameE
@ -3332,7 +3350,6 @@ Note: Peach, tea, chocolate" </Value>
 		Var NameDrinkTH = "อเมริกาโน  PURE BEAUTY"
 		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process)  กลิ่นดอกไม้ ผลไม้เขตร้อน"
 		Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit"
-		Topping "Load" "12-01-02-0032"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_americano_light_pure_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0032.Price
@ -3346,11 +3363,14 @@ Note: Peach, tea, chocolate" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0032"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0032"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0032.NameE
@ -3501,7 +3521,6 @@ AMERICANO" </Value>
 		Var NameDrinkTH = "BLUE DADDY  ALMOST DIRTY"
 		Var DrinkDescriptionTH = "Washed process  หอมบลูเบอร์รี และดอกไม้"
 		Var DrinkDescription = "Washed process  Note: Blue Berry and Floral"
-		Topping "Load" "12-01-02-0020"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_bluedaddy.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -3515,11 +3534,14 @@ AMERICANO" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0020"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -3671,7 +3693,6 @@ Note: Blue Berry and Floral" </Value>
 		Var NameDrinkTH = "MOZART  ALMOST DIRTY"
 		Var DrinkDescriptionTH = "Raisin Honey process  หอมสตรอว์เบอร์รี กุหลาบ มะลิ"
 		Var DrinkDescription = "Raisin Honey process   Note: Strawberry & Floral"
-		Topping "Load" "12-01-02-0022"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_mozart.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -3685,11 +3706,14 @@ Note: Blue Berry and Floral" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0022"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -3841,7 +3865,6 @@ Note: Strawberry & Floral" </Value>
 		Var NameDrinkTH = "WHISKY DUDE  ALMOST DIRTY"
 		Var DrinkDescriptionTH = "Washed Sherry cask ferment หอมวิสกี้ ช็อกโกแลต วนิลา"
 		Var DrinkDescription = "Washed Sherry cask ferment  Note: Whisky & Vanilla"
-		Topping "Load" "12-01-02-0026"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_whiskydude.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -3855,11 +3878,14 @@ Note: Strawberry & Floral" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0026"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -4011,7 +4037,6 @@ Note: Whisky & Vanilla" </Value>
 		Var NameDrinkTH = "SNOWWHITE   ALMOST DIRTY"
 		Var DrinkDescriptionTH = "Anaerobic process  หอมมะลิ น้ำผึ้ง เมเปิล"
 		Var DrinkDescription = "Anaerobic process   Note: Jasmine & Honey"
-		Topping "Load" "12-01-02-0024"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light__snowwhite.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -4025,11 +4050,14 @@ Note: Whisky & Vanilla" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0024"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -4181,7 +4209,6 @@ Note: Jasmine & Honey" </Value>
 		Var NameDrinkTH = "QUEEN BERRY  ALMOST DIRTY"
 		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (washed process)  หอมสตรอว์เบอร์รี ส้ม และดอกไม้"
 		Var DrinkDescription = "Light roast natural process:  Strawberry, Orange, Floral"
-		Topping "Load" "12-01-02-0018"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -4195,11 +4222,14 @@ Note: Jasmine & Honey" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0018"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -4351,7 +4381,6 @@ Strawberry, Orange, Floral" </Value>
 		Var NameDrinkTH = "PEACHER  ALMOST DIRTY"
 		Var DrinkDescriptionTH = "Barrel-aged process  หอมพีช, ชา, ช็อกโกแลต"
 		Var DrinkDescription = "Barrel-aged process  Note: Peach, tea, chocolate"
-		Topping "Load" "12-01-02-0028"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light__peacher.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -4365,11 +4394,14 @@ Strawberry, Orange, Floral" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0028"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -4521,7 +4553,6 @@ Note: Peach, tea, chocolate" </Value>
 		Var NameDrinkTH = "PURE BEAUTY  ALMOST DIRTY"
 		Var DrinkDescriptionTH = "กาแฟคั่วอ่อน (natural process)  กลิ่นดอกไม้ ผลไม้เขตร้อน"
 		Var DrinkDescription = "Light roast (natural process) Note: Floral & Tropical fruit"
-		Topping "Load" "12-01-02-0033"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_pure_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -4535,11 +4566,14 @@ Note: Peach, tea, chocolate" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0033"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -4690,7 +4724,6 @@ ALMOST DIRTY" </Value>
 		Var NameDrinkTH = "เอสเย็นแบบไทยๆ"
 		Var DrinkDescriptionTH = "กาแฟ นม และ น้ำแข็ง "
 		Var DrinkDescription = "Espresso, Milk, Sugar,Ice"
-		Topping "Load" "12-11-02-0001"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_epsresso.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -4704,11 +4737,14 @@ ALMOST DIRTY" </Value>
 		Var PD_STAGE_3 = $12-11-03-0001.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-11-02-0001"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-11-03-0001"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -4857,7 +4893,6 @@ ICED ESPRESSO" </Value>
 		Var NameDrinkTH = "ลาเต้"
 		Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม"
 		Var DrinkDescription = "Espresso, Milk, Foamed milk"
-		Topping "Load" "12-01-02-0002"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_latte.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0004.Price
@ -4871,11 +4906,14 @@ ICED ESPRESSO" </Value>
 		Var PD_STAGE_3 = $12-01-03-0002.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0002"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0004"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-01-03-0002"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0004.NameE
@ -4942,8 +4980,7 @@ ICED ESPRESSO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Espresso, Milk,
-Foamed milk" </Value>
+	<Value> "Espresso, Milk, Foamed milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -5024,7 +5061,6 @@ Foamed milk" </Value>
 		Var NameDrinkTH = "คาปูชิโน่"
 		Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม"
 		Var DrinkDescription = "Espresso, Milk, Foamed milk"
-		Topping "Load" "12-11-02-0002"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_cappuccino.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0005.Price
@ -5038,11 +5074,14 @@ Foamed milk" </Value>
 		Var PD_STAGE_3 = $12-11-03-0002.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-11-02-0002"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0005"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-11-03-0002"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0005.NameE
@ -5109,8 +5148,7 @@ Foamed milk" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Espresso, Milk,
-Foamed milk" </Value>
+	<Value> "Espresso, Milk, Foamed milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -5189,9 +5227,8 @@ Foamed milk" </Value>
 	<EventOnClick> 
 		Var NameDrink = "MOCHA"
 		Var NameDrinkTH = "มอคค่า"
-		Var DrinkDescriptionTH = "กาแฟ นม ผสมช็อกโกแลต น้ำตาล"
+		Var DrinkDescriptionTH = "กาแฟ นม โกโก้ และ น้ำตาล"
 		Var DrinkDescription = "Espresso, Cocoa, Milk, Sugar"
-		Topping "Load" "12-01-02-0003"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_mocha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0006.Price
@ -5205,11 +5242,14 @@ Foamed milk" </Value>
 		Var PD_STAGE_3 = $12-01-03-0003.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0003"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0006"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-01-03-0003"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0006.NameE
@ -5255,8 +5295,7 @@ Foamed milk" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม ผสมช็อกโกแลต
-น้ำตาล" </Value>
+	<Value> "กาแฟ นม โกโก้ และ น้ำตาล" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -5277,8 +5316,7 @@ Foamed milk" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Espresso, Cocoa,
-Milk, Sugar" </Value>
+	<Value> "Espresso, Cocoa, Milk, Sugar" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -5359,7 +5397,6 @@ Milk, Sugar" </Value>
 		Var NameDrinkTH = "คาราเมลลาเต้"
 		Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม น้ำเชื่อมคาราเมล"
 		Var DrinkDescription = "Espresso, Milk, Caramel Syrup"
-		Topping "Load" "12-01-02-0004"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0007.Price
@ -5373,11 +5410,14 @@ Milk, Sugar" </Value>
 		Var PD_STAGE_3 = $12-01-03-0004.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0004"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0007"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-01-03-0004"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0007.NameE
@ -5527,7 +5567,6 @@ Caramel Syrup" </Value>
 		Var NameDrinkTH = "กาแฟมัทฉะลาเต้"
 		Var DrinkDescriptionTH = "กาแฟ นม ชาเขียวมัทฉะ  และ ฟองนม"
 		Var DrinkDescription = "Espresso, Matcha, Milk"
-		Topping "Load" "12-01-02-0031"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_greenteacoffee_lattle.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0031.Price
@ -5541,11 +5580,14 @@ Caramel Syrup" </Value>
 		Var PD_STAGE_3 = $12-01-03-0031.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0031"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0031"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-01-03-0031"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0031.NameE
@ -5695,7 +5737,6 @@ CAFÉ LATTE" </Value>
 		Var NameDrinkTH = "กาแฟมัทฉะลาเต้"
 		Var DrinkDescriptionTH = "กาแฟ นม ชาเขียวมัทฉะ  และ ฟองนม"
 		Var DrinkDescription = "Espresso, Matcha, Milk"
-		Topping "Load" "12-01-02-0005"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_greenteacoffee_lattle.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0008.Price
@ -5709,11 +5750,14 @@ CAFÉ LATTE" </Value>
 		Var PD_STAGE_3 = $12-01-03-0005.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0005"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0008"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-01-03-0005"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0008.NameE
@ -5863,7 +5907,6 @@ CAFÉ LATTE" </Value>
 		Var NameDrinkTH = "บราวน์ชูการ์ลาเต้"
 		Var DrinkDescriptionTH = "กาแฟ น้ำเชื่อมน้ำตาลแดง  และ ฟองนม"
 		Var DrinkDescription = "Espresso, Milk, Kokuto syrup"
-		Topping "Load" "12-01-02-0008"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_kuromitsu_coffee.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0011.Price
@ -5877,11 +5920,14 @@ CAFÉ LATTE" </Value>
 		Var PD_STAGE_3 = $12-01-03-0008.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0008"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0011"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-01-03-0008"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0011.NameE
@ -6032,7 +6078,6 @@ Kokuto syrup" </Value>
 		Var NameDrinkTH = "กาแฟชานมไต้หวัน"
 		Var DrinkDescriptionTH = "กาแฟ ชาไต้หวัน น้ำตาล  และ ฟองนม"
 		Var DrinkDescription = "Espresso, Taiwanese Tea, Milk, Sugar"
-		Topping "Load" "12-01-02-0006"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_taiwantea_macchiato.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0009.Price
@ -6046,11 +6091,14 @@ Kokuto syrup" </Value>
 		Var PD_STAGE_3 = $12-01-03-0006.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0006"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0009"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-01-03-0006"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0009.NameE
@ -6197,11 +6245,10 @@ Milk, Sugar" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "LYCHEE AMERICANO"
+		Var NameDrink = "LYCHEE  AMERICANO"
 		Var NameDrinkTH = "อเมริกาโนลิ้นจี่"
 		Var DrinkDescriptionTH = "กาแฟ น้ำ และ ลิ้นจี่"
 		Var DrinkDescription = "Espresso, Lychee, Sugar, Water"
-		Topping "Load" "12-01-02-0009"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lychee_espresso.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0012.Price
@ -6215,11 +6262,14 @@ Milk, Sugar" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0009"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0012"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0012.NameE
@ -6276,7 +6326,8 @@ Milk, Sugar" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LYCHEE AMERICANO" </Value>
+	<Value> "LYCHEE 
+AMERICANO" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -6364,11 +6415,10 @@ Sugar, Water" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "LYCHEE AMERICANO"
+		Var NameDrink = "LYCHEE  AMERICANO"
 		Var NameDrinkTH = "อเมริกาโนลิ้นจี่"
 		Var DrinkDescriptionTH = "กาแฟ น้ำ และ ลิ้นจี่"
 		Var DrinkDescription = "Espresso, Lychee, Sugar, Water"
-		Topping "Load" "12-01-02-0017"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lychee_espresso.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0017.Price
@ -6382,11 +6432,14 @@ Sugar, Water" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0017"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0017"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0017.NameE
@ -6443,7 +6496,8 @@ Sugar, Water" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "LYCHEE AMERICANO" </Value>
+	<Value> "LYCHEE 
+AMERICANO" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -6535,7 +6589,6 @@ Sugar, Water" </Value>
 		Var NameDrinkTH = "กาแฟชาไทย"
 		Var DrinkDescriptionTH = "กาแฟ ชาไทย นม น้ำตาล  และ ฟองนม"
 		Var DrinkDescription = "Espresso, Thai tea, Milk, Sugar"
-		Topping "Load" "12-01-02-0007"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_coffee_thai_milk_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0010.Price
@ -6549,11 +6602,14 @@ Sugar, Water" </Value>
 		Var PD_STAGE_3 = $12-01-03-0007.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0007"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0010"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-01-03-0007"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0010.NameE
@ -6703,7 +6759,6 @@ CAFÉ LATTE" </Value>
 		Var NameDrinkTH = "กาแฟชาไทย"
 		Var DrinkDescriptionTH = "กาแฟ ชาไทย นม น้ำตาล"
 		Var DrinkDescription = "Espresso, Thai tea, Milk,\ Sugar"
-		Topping "Load" "12-01-02-0029"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_coffee_thai_milk_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0029.Price
@ -6717,11 +6772,14 @@ CAFÉ LATTE" </Value>
 		Var PD_STAGE_3 = $12-01-03-0029.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0029"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0029"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-01-03-0029"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0029.NameE
@ -6870,7 +6928,6 @@ CAFÉ LATTE" </Value>
 		Var NameDrinkTH = "กาแฟชานมไต้หวัน"
 		Var DrinkDescriptionTH = "กาแฟ ชาไต้หวัน น้ำตาล  และ ฟองนม"
 		Var DrinkDescription = "Espresso, Taiwanese Tea, Milk, Sugar"
-		Topping "Load" "12-01-02-0030"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_taiwantea_macchiato.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-01-01-0030.Price
@ -6884,11 +6941,14 @@ CAFÉ LATTE" </Value>
 		Var PD_STAGE_3 = $12-01-03-0030.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-01-02-0030"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-01-01-0030"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-01-03-0030"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-01-01-0030.NameE
@ -7037,4 +7097,5 @@ Milk, Sugar" </Value>



+
 </Popup>
--- a/xml/page_catalog_group_milk.skt
+++ b/xml/page_catalog_group_milk.skt
@ -41,22 +41,6 @@



-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-</EventClick>
-</Button>
-
-
-
 <?hurr 
    #include=menu_new_layout_gen.py
 ?>
--- a/xml/page_catalog_group_milk.xml
+++ b/xml/page_catalog_group_milk.xml
@ -578,22 +578,6 @@



-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-</EventClick>
-</Button>
-
-
-
 <FrameScroll> 
 <X> 10 </X>
 <Y> 497 </Y>
@ -625,7 +609,6 @@
 		Var NameDrinkTH = "นม "
 		Var DrinkDescriptionTH = "นม"
 		Var DrinkDescription = "Milk"
-		Topping "Load" "12-03-02-0005"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_milk.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-03-01-0005.Price
@ -639,11 +622,14 @@
 		Var PD_STAGE_3 = $12-03-03-0005.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-03-02-0005"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-03-01-0005"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-03-03-0005"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-03-01-0005.NameE
@ -791,7 +777,6 @@
 		Var NameDrinkTH = "นมคาราเมล "
 		Var DrinkDescriptionTH = "นม น้ำเชื่อมคาราเมล  "
 		Var DrinkDescription = "Milk, Caramel Syrup, Ice"
-		Topping "Load" "12-03-02-0001"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_caramel.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-03-01-0001.Price
@ -805,11 +790,14 @@
 		Var PD_STAGE_3 = $12-03-03-0001.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-03-02-0001"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-03-01-0001"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-03-03-0001"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-03-01-0001.NameE
@ -957,7 +945,6 @@
 		Var NameDrinkTH = "ชาสตอเบอร์รี่ "
 		Var DrinkDescriptionTH = "ชาไทย น้ำเชื่อมสตอเบอร์รี่   "
 		Var DrinkDescription = "Thai tea, Strawberry Syrup, Water, Ice"
-		Topping "Load" "12-02-01-0009"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_strawberry_thai_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-02-0009.Price
@ -971,11 +958,14 @@
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-01-0009"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-02-0009"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-02-0009.NameE
@ -1125,7 +1115,6 @@ Water, Ice" </Value>
 		Var NameDrinkTH = "คาราเมลโกโก้ "
 		Var DrinkDescriptionTH = "โกโก้ นม น้ำตาล  น้ำเชื่อมคาราเมล"
 		Var DrinkDescription = "Cocoa, Milk,Sugar, Caramel Syrup"
-		Topping "Load" "12-03-02-0004"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_caramel_cocoa.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-03-01-0004.Price
@ -1139,11 +1128,14 @@ Water, Ice" </Value>
 		Var PD_STAGE_3 = $12-03-03-0004.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-03-02-0004"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-03-01-0004"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-03-03-0004"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-03-01-0004.NameE
@ -1293,7 +1285,6 @@ Caramel Syrup" </Value>
 		Var NameDrinkTH = "นมบราวน์ชูการ์ "
 		Var DrinkDescriptionTH = "นม และ น้ำเชื่อมน้ำตาลแดง"
 		Var DrinkDescription = "Milk, Kokuto syrup"
-		Topping "Load" "12-03-02-0003"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Black_Sugar_Milk.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-03-01-0003.Price
@ -1307,11 +1298,14 @@ Caramel Syrup" </Value>
 		Var PD_STAGE_3 = $12-03-03-0003.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-03-02-0003"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-03-01-0003"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-03-03-0003"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-03-01-0003.NameE
@ -1460,7 +1454,6 @@ MILK" </Value>
 		Var NameDrinkTH = "นมชมพู "
 		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ นม นมข้น  น้ำตาล "
 		Var DrinkDescription = "Salak Syrup, Milk, Sugar, Ice"
-		Topping "Load" "12-03-02-0006"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_pink_milk.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1474,11 +1467,14 @@ MILK" </Value>
 		Var PD_STAGE_3 = $12-03-03-0006.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-03-02-0006"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-03-03-0006"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -1628,7 +1624,6 @@ Sugar, Ice" </Value>
 		Var NameDrinkTH = "โกโก้ "
 		Var DrinkDescriptionTH = "โกโก้ นมและน้ำตาล"
 		Var DrinkDescription = "Milk, Cocoa, Sugar"
-		Topping "Load" "12-03-02-0002"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_cocoa.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-03-01-0002.Price
@ -1642,11 +1637,14 @@ Sugar, Ice" </Value>
 		Var PD_STAGE_3 = $12-03-03-0002.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-03-02-0002"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-03-01-0002"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-03-03-0002"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-03-01-0002.NameE
@ -1794,7 +1792,6 @@ Sugar, Ice" </Value>
 		Var NameDrinkTH = "โกโก้สตอเบอร์รี่ปั่น"
 		Var DrinkDescriptionTH = "นม น้ำเชื่อมสตอเบอร์รี่  โกโก้ และน้ำแข็ง"
 		Var DrinkDescription = "Milk, Mango Syrup, and Iced"
-		Topping "Load" "-"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberrycocoa_smoothie.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1808,11 +1805,14 @@ Sugar, Ice" </Value>
 		Var PD_STAGE_3 = $12-03-03-0010.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-03-03-0010"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -1962,7 +1962,6 @@ SMOOTHIE" </Value>
 		Var NameDrinkTH = "นมสตอเบอร์รี่ปั่น"
 		Var DrinkDescriptionTH = "นม น้ำเชื่อมสตอเบอร์รี่  และน้ำแข็ง"
 		Var DrinkDescription = "Milk, Strawberry Syrup, and  Iced"
-		Topping "Load" "-"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberrymilk_smoothie.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1976,11 +1975,14 @@ SMOOTHIE" </Value>
 		Var PD_STAGE_3 = $12-03-03-0011.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-03-03-0011"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -2131,7 +2133,6 @@ Iced" </Value>
 		Var NameDrinkTH = "โอริโอ้ปั่นภูเขาไฟ"
 		Var DrinkDescriptionTH = "นม น้ำตาล โอริโอ้   "
 		Var DrinkDescription = "Milk, Sugar, Oreo, Ice"
-		Topping "Load" "-"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_smoothie_oreo.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2145,11 +2146,14 @@ Iced" </Value>
 		Var PD_STAGE_3 = $12-03-03-0009.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-03-03-0009"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
--- a/xml/page_catalog_group_other.skt
+++ b/xml/page_catalog_group_other.skt
@ -39,21 +39,6 @@



-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-</EventClick>
-</Button>
-
-

 <?hurr 
    #include=menu_new_layout_gen.py
--- a/xml/page_catalog_group_other.xml
+++ b/xml/page_catalog_group_other.xml
@ -576,21 +576,6 @@



-<Button>
-<X> 780 </X>
-<Y> 500 </Y>
-<State> buttonRemoveCup </State>
-;<Color> "0x00BDFF" </Color>
-<Interval> 500 </Interval>
-<Filename> "ROOT/taobin_project/image/main_page/bn_remove_cup.png" </Filename>
-<Filename> "ROOT/taobin_project/image/main_page/bp_remove_cup.png" </Filename>
-<EventClick> 
-    Machine RemoveCup
-    Machine DoorLidOpen
-</EventClick>
-</Button>
-
-

 <FrameScroll> 
 <X> 10 </X>
@ -623,7 +608,6 @@
 		Var NameDrinkTH = "เป็ปซี่น้ำแข็ง"
 		Var DrinkDescriptionTH = "เป๊ปซี่  "
 		Var DrinkDescription = "Pepsi, Ice"
-		Topping "Load" "12-05-02-0007"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -637,11 +621,14 @@
 		Var PD_STAGE_3 = $12-05-03-0007.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0007"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0007"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -789,7 +776,6 @@
 		Var NameDrinkTH = "โค้ก"
 		Var DrinkDescriptionTH = "โค้ก  "
 		Var DrinkDescription = "Coke, Ice"
-		Topping "Load" "12-05-02-0019"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Cokecola.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -803,11 +789,14 @@
 		Var PD_STAGE_3 = $12-05-03-0019.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0019"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0019"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -955,7 +944,6 @@
 		Var NameDrinkTH = "สไปรท์"
 		Var DrinkDescriptionTH = "สไปรท์  "
 		Var DrinkDescription = "Sprite and Ice"
-		Topping "Load" "12-05-02-0020"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_sprite.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -969,11 +957,14 @@
 		Var PD_STAGE_3 = $12-05-03-0020.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0020"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0020"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -1121,7 +1112,6 @@
 		Var NameDrinkTH = "เต่าทรงพลังโซดา"
 		Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง  โซดา  "
 		Var DrinkDescription = "Medicine drink, Soda, Ice"
-		Topping "Load" "12-05-02-0035"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1135,11 +1125,14 @@
 		Var PD_STAGE_3 = $12-05-03-0035.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0035"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0035"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -1288,7 +1281,6 @@ DRINK SODA" </Value>
 		Var NameDrinkTH = "น้ำมะนาวโซดา"
 		Var DrinkDescriptionTH = "มะนาว โซดา  "
 		Var DrinkDescription = "Limenade, Sugar, Soda, Ice"
-		Topping "Load" "12-05-02-0010"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_lemonade_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1302,11 +1294,14 @@ DRINK SODA" </Value>
 		Var PD_STAGE_3 = $12-05-03-0010.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0010"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0010"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -1455,7 +1450,6 @@ SODA" </Value>
 		Var NameDrinkTH = "น้ำลิ้นจี่โซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ โซดา  "
 		Var DrinkDescription = "Lychee, Sugar, Soda, Ice"
-		Topping "Load" "12-05-02-0033"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Lychee_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1469,11 +1463,14 @@ SODA" </Value>
 		Var PD_STAGE_3 = $12-05-03-0033.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0033"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0033"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -1621,7 +1618,6 @@ SODA" </Value>
 		Var NameDrinkTH = "น้ำลิ้นจี่โซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ โซดา  "
 		Var DrinkDescription = "Lychee, Sugar, Soda, Ice"
-		Topping "Load" "12-05-02-0011"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Lychee_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1635,11 +1631,14 @@ SODA" </Value>
 		Var PD_STAGE_3 = $12-05-03-0011.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0011"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0011"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -1787,7 +1786,6 @@ SODA" </Value>
 		Var NameDrinkTH = "ลิ้นจี่มะนาวโซดา "
 		Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ มะนาว  โซดา  "
 		Var DrinkDescription = "Strawberry Syrup, Limenade,Soda, Ice"
-		Topping "Load" "12-05-02-0022"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Lychee_lime_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1801,11 +1799,14 @@ SODA" </Value>
 		Var PD_STAGE_3 = $12-05-03-0022.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0022"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0022"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -1956,7 +1957,6 @@ Limenade,Soda, Ice" </Value>
 		Var NameDrinkTH = "กัญชาโซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมกัญชา (ช่วยผ่อนคลาย)  โซดา  "
 		Var DrinkDescription = "Cannabis Syrup, Soda, Ice"
-		Topping "Load" "12-05-02-0028"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_hemp_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1970,11 +1970,14 @@ Limenade,Soda, Ice" </Value>
 		Var PD_STAGE_3 = $12-05-03-0028.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0028"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0028"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -2123,7 +2126,6 @@ Limenade,Soda, Ice" </Value>
 		Var NameDrinkTH = "มะนาวกัญชาโซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมกัญชา (ช่วยผ่อนคลาย)  มะนาว โซดา  "
 		Var DrinkDescription = "Cannabis Syrup, Limenade,  Soda, Ice"
-		Topping "Load" "12-05-02-0029"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_hemp_lime_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2137,11 +2139,14 @@ Limenade,Soda, Ice" </Value>
 		Var PD_STAGE_3 = $12-05-03-0029.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0029"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0029"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -2292,7 +2297,6 @@ Soda, Ice" </Value>
 		Var NameDrinkTH = "สตอเบอร์รี่โซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ โซดา   "
 		Var DrinkDescription = "Strawberry Syrup, Soda, Ice"
-		Topping "Load" "12-05-02-0012"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberry_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2306,11 +2310,14 @@ Soda, Ice" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0012"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -2459,7 +2466,6 @@ Soda, Ice" </Value>
 		Var NameDrinkTH = "สตอเบอร์รี่โซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ โซดา   "
 		Var DrinkDescription = "Strawberry Syrup, Soda, Ice"
-		Topping "Load" "12-05-02-0041"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberry_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2473,11 +2479,14 @@ Soda, Ice" </Value>
 		Var PD_STAGE_3 = $12-05-03-0041.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0041"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0041"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -2626,7 +2635,6 @@ Soda, Ice" </Value>
 		Var NameDrinkTH = "น้ำแดงโซดา"
 		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ โซดา   "
 		Var DrinkDescription = "Salak Syrup, Soda, Ice"
-		Topping "Load" "12-05-02-0008"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_sala_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2640,11 +2648,14 @@ Soda, Ice" </Value>
 		Var PD_STAGE_3 = $12-05-03-0008.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0008"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0008"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -2793,7 +2804,6 @@ Soda, Ice" </Value>
 		Var NameDrinkTH = "น้ำแดงมะนาวโซดา"
 		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ มะนาว โซดา   "
 		Var DrinkDescription = "Salak Syrup, Limenade,Soda, Ice"
-		Topping "Load" "12-05-02-0009"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_sala_lime_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2807,11 +2817,14 @@ Soda, Ice" </Value>
 		Var PD_STAGE_3 = $12-05-03-0009.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0009"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0009"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -2962,7 +2975,6 @@ Limenade,Soda, Ice" </Value>
 		Var NameDrinkTH = "บ๊วยโซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย โซดา  "
 		Var DrinkDescription = "Ume Syrup, Soda, Ice"
-		Topping "Load" "12-05-02-0024"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_ume_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2976,11 +2988,14 @@ Limenade,Soda, Ice" </Value>
 		Var PD_STAGE_3 = $12-05-03-0024.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0024"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0024"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -3128,7 +3143,6 @@ Limenade,Soda, Ice" </Value>
 		Var NameDrinkTH = "บ๊วยมะนาวโซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย มะนาว โซดา   "
 		Var DrinkDescription = "Ume Syrup, Limenade, Soda,  Ice"
-		Topping "Load" "12-05-02-0025"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_ume_lime_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -3142,11 +3156,14 @@ Limenade,Soda, Ice" </Value>
 		Var PD_STAGE_3 = $12-05-03-0025.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0025"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0025"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -3297,7 +3314,6 @@ Ice" </Value>
 		Var NameDrinkTH = "ขิงโซดา"
 		Var DrinkDescriptionTH = "ขิง โซดา  "
 		Var DrinkDescription = "Ginger, Soda and Ice"
-		Topping "Load" "12-05-02-0038"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Ginger_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -3311,11 +3327,14 @@ Ice" </Value>
 		Var PD_STAGE_3 = $12-05-03-0038.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0038"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0038"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -3463,7 +3482,6 @@ Ice" </Value>
 		Var NameDrinkTH = "ขิงมะนาวโซดา"
 		Var DrinkDescriptionTH = "ขิง มะนาว โซดา  "
 		Var DrinkDescription = "Ginger, Lime, Soda and Ice"
-		Topping "Load" "12-05-02-0039"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Gingerlime_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -3477,11 +3495,14 @@ Ice" </Value>
 		Var PD_STAGE_3 = $12-05-03-0039.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0039"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0039"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -3630,7 +3651,6 @@ SODA" </Value>
 		Var NameDrinkTH = "โซดา"
 		Var DrinkDescriptionTH = "โซดา"
 		Var DrinkDescription = "Soda"
-		Topping "Load" "12-05-02-0014"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -3644,11 +3664,14 @@ SODA" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0014"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -3796,7 +3819,6 @@ SODA" </Value>
 		Var NameDrinkTH = "โซดาน้ำแข็ง"
 		Var DrinkDescriptionTH = "โซดา  "
 		Var DrinkDescription = "Soda, Ice"
-		Topping "Load" "12-05-02-0015"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -3810,11 +3832,14 @@ SODA" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0015"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -3962,7 +3987,6 @@ SODA" </Value>
 		Var NameDrinkTH = "เต่าทรงพลัง"
 		Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง  "
 		Var DrinkDescription = "Medicine drink, Ice"
-		Topping "Load" "12-05-02-0034"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -3976,11 +4000,14 @@ SODA" </Value>
 		Var PD_STAGE_3 = $12-05-03-0034.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0034"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0034"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -4128,7 +4155,6 @@ SODA" </Value>
 		Var NameDrinkTH = "น้ำแดงมะนาว "
 		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ น้ำมะนาว   "
 		Var DrinkDescription = "Salak Syrup, Limenade, Water, Ice"
-		Topping "Load" "12-05-02-0003"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_sala_lime.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -4142,11 +4168,14 @@ SODA" </Value>
 		Var PD_STAGE_3 = $12-05-03-0003.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0003"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0003"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -4296,7 +4325,6 @@ Water, Ice" </Value>
 		Var NameDrinkTH = "น้ำลิ้นจี่ "
 		Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ น้ำ  "
 		Var DrinkDescription = "Lychee, Sugar, Water, Ice"
-		Topping "Load" "12-05-02-0004"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Lychee.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -4310,11 +4338,14 @@ Water, Ice" </Value>
 		Var PD_STAGE_3 = $12-05-03-0004.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0004"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0004"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -4463,7 +4494,6 @@ Water, Ice" </Value>
 		Var NameDrinkTH = "น้ำแดง"
 		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ   "
 		Var DrinkDescription = "Salak Syrup, Ice"
-		Topping "Load" "12-05-02-0002"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_sala.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -4477,11 +4507,14 @@ Water, Ice" </Value>
 		Var PD_STAGE_3 = $12-05-03-0002.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0002"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0002"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -4630,7 +4663,6 @@ Water, Ice" </Value>
 		Var NameDrinkTH = "น้ำสตอเบอร์รี่ "
 		Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ น้ำ   "
 		Var DrinkDescription = "Strawberry Syrup, Water, Ice"
-		Topping "Load" "12-05-02-0005"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberry.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -4644,11 +4676,14 @@ Water, Ice" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0005"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -4798,7 +4833,6 @@ Water, Ice" </Value>
 		Var NameDrinkTH = "น้ำมะนาว "
 		Var DrinkDescriptionTH = "น้ำมะนาว น้ำตาล"
 		Var DrinkDescription = "Limenade, Sugar"
-		Topping "Load" "12-05-02-0001"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_lemonade.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-05-01-0001.Price
@ -4812,11 +4846,14 @@ Water, Ice" </Value>
 		Var PD_STAGE_3 = $12-05-03-0001.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0001"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-05-01-0001"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0001"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-05-01-0001.NameE
@ -4964,7 +5001,6 @@ Water, Ice" </Value>
 		Var NameDrinkTH = "น้ำบ๊วย "
 		Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย น้ำ  "
 		Var DrinkDescription = "Ume Syrup, Water, Ice"
-		Topping "Load" "12-05-02-0026"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_ume_drink.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -4978,11 +5014,14 @@ Water, Ice" </Value>
 		Var PD_STAGE_3 = $12-05-03-0026.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0026"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0026"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -5130,7 +5169,6 @@ Water, Ice" </Value>
 		Var NameDrinkTH = "น้ำลิ้นจี่ "
 		Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ น้ำ  "
 		Var DrinkDescription = "Lychee, Sugar, Water, Ice"
-		Topping "Load" "12-05-02-0032"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Lychee.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -5144,11 +5182,14 @@ Water, Ice" </Value>
 		Var PD_STAGE_3 = $12-05-03-0032.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0032"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0032"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -5297,7 +5338,6 @@ Water, Ice" </Value>
 		Var NameDrinkTH = "น้ำสตอเบอร์รี่ "
 		Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ น้ำ "
 		Var DrinkDescription = "Strawberry Syrup, Water, Ice"
-		Topping "Load" "12-05-02-0040"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberry.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -5311,11 +5351,14 @@ Water, Ice" </Value>
 		Var PD_STAGE_3 = $12-05-03-0040.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0040"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0040"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -5460,11 +5503,10 @@ Water, Ice" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "CHICKEN CONGEE"
-		Var NameDrinkTH = "โจ๊กไก่"
-		Var DrinkDescriptionTH = "ข้าว ไก่ น้ำ"
-		Var DrinkDescription = "Rice, chicken, Water"
-		Topping "Load" "-"
+		Var NameDrink = "CONGEE WITH  PLANT PROTEIN"
+		Var NameDrinkTH = "โจ๊กใส่โปรตีนจากพืช"
+		Var DrinkDescriptionTH = "ข้าว ผัก โปรตีนจากพืช น้ำ"
+		Var DrinkDescription = "Rice, Plant-based protein, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Congee.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-06-01-0001.Price
@ -5478,11 +5520,14 @@ Water, Ice" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-06-01-0001"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-06-01-0001.NameE
@ -5518,7 +5563,7 @@ Water, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showthaiText </State>
-	<Value> "โจ๊กไก่" </Value>
+	<Value> "โจ๊กใส่โปรตีนจากพืช" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -5528,7 +5573,7 @@ Water, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "ข้าว ไก่ น้ำ" </Value>
+	<Value> "ข้าว ผัก โปรตีนจากพืช น้ำ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -5539,7 +5584,8 @@ Water, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "CHICKEN CONGEE" </Value>
+	<Value> "CONGEE WITH 
+PLANT PROTEIN" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -5549,7 +5595,7 @@ Water, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Rice, chicken, Water" </Value>
+	<Value> "Rice, Plant-based protein, Water" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -5630,7 +5676,6 @@ Water, Ice" </Value>
 		Var NameDrinkTH = "น้ำแข็ง"
 		Var DrinkDescriptionTH = "น้ำแข็ง"
 		Var DrinkDescription = "Ice"
-		Topping "Load" "12-05-02-0017"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -5644,11 +5689,14 @@ Water, Ice" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0017"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -5796,7 +5844,6 @@ Water, Ice" </Value>
 		Var NameDrinkTH = "น้ำดื่ม"
 		Var DrinkDescriptionTH = "น้ำ"
 		Var DrinkDescription = "Water"
-		Topping "Load" "12-05-02-0016"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_water_roomtemp.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -5810,11 +5857,14 @@ Water, Ice" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0016"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -5962,7 +6012,6 @@ Water, Ice" </Value>
 		Var NameDrinkTH = "น้ำ "
 		Var DrinkDescriptionTH = "น้ำ"
 		Var DrinkDescription = "Water"
-		Topping "Load" "12-05-02-0018"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_water_roomtemp.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-05-01-0002.Price
@ -5976,11 +6025,14 @@ Water, Ice" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0018"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-05-01-0002"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-05-01-0002.NameE
--- a/xml/page_catalog_group_recommend.skt
+++ b/xml/page_catalog_group_recommend.skt
@ -40,6 +40,9 @@
 ?>


+<?hurr 
+    #include=menu_new_layout_gen.py
+?>

 <Button>
 <X> 780 </X>
@ -57,9 +60,6 @@



-<?hurr 
-    #include=menu_new_layout_gen.py
-?>


 </Popup>
--- a/xml/page_catalog_group_recommend.xml
+++ b/xml/page_catalog_group_recommend.xml
--- a/xml/page_catalog_group_tea.xml
+++ b/xml/page_catalog_group_tea.xml
@ -625,7 +625,6 @@
 		Var NameDrinkTH = "เก็กฮวย "
 		Var DrinkDescriptionTH = "น้ำเก๊กฮวย น้ำตาล"
 		Var DrinkDescription = "Chrysanthemum, Sugar  and   water"
-		Topping "Load" "12-02-02-0001"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_chrysanthemum_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0001.Price
@ -639,11 +638,14 @@
 		Var PD_STAGE_3 = $12-02-03-0001.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0001"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0001"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0001"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0001.NameE
@ -792,7 +794,6 @@ and   water" </Value>
 		Var NameDrinkTH = "ชาขิง "
 		Var DrinkDescriptionTH = "ขิง และน้ำ "
 		Var DrinkDescription = "Ginger and   water"
-		Topping "Load" "12-02-02-0020"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_Ginger_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0020.Price
@ -806,11 +807,14 @@ and   water" </Value>
 		Var PD_STAGE_3 = $12-02-03-0020.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0020"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0020"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0020"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0020.NameE
@ -958,7 +962,6 @@ and   water" </Value>
 		Var NameDrinkTH = "ชามะนาว "
 		Var DrinkDescriptionTH = "ชาไทย มะนาว"
 		Var DrinkDescription = "Thai Tea, Limenade, Sugar  and   water"
-		Topping "Load" "12-02-02-0007"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lime_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0007.Price
@ -972,11 +975,14 @@ and   water" </Value>
 		Var PD_STAGE_3 = $12-02-03-0007.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0007"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0007"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0007"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0007.NameE
@ -1125,7 +1131,6 @@ and   water" </Value>
 		Var NameDrinkTH = "ชาไทยนม "
 		Var DrinkDescriptionTH = "ชาไทย นม นมข้น  "
 		Var DrinkDescription = "Thai tea, Milk, Sugar, Ice"
-		Topping "Load" "12-02-02-0002"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_thai_milk_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0002.Price
@ -1139,11 +1144,14 @@ and   water" </Value>
 		Var PD_STAGE_3 = $12-02-03-0002.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0002"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0002"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0002"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0002.NameE
@ -1291,7 +1299,6 @@ and   water" </Value>
 		Var NameDrinkTH = "ชาขิงมะนาว "
 		Var DrinkDescriptionTH = "ขิง มะนาว และน้ำ "
 		Var DrinkDescription = "Ginger, Lime and   water"
-		Topping "Load" "-"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_Ginger_lemon_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0021.Price
@ -1305,11 +1312,14 @@ and   water" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "-"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0021"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0021.NameE
@ -1458,7 +1468,6 @@ GINGER TEA" </Value>
 		Var NameDrinkTH = "ชานมไทย "
 		Var DrinkDescriptionTH = "ชาไทย และ นมอุ่น"
 		Var DrinkDescription = "Thai tea, Sugar, Warm milk"
-		Topping "Load" "12-02-02-0024"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_thai_milk_tea_tacc.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0024.Price
@ -1472,11 +1481,14 @@ GINGER TEA" </Value>
 		Var PD_STAGE_3 = $12-02-03-0024.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0024"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0024"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0024"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0024.NameE
@ -1624,7 +1636,6 @@ GINGER TEA" </Value>
 		Var NameDrinkTH = "ชานมไต้หวัน "
 		Var DrinkDescriptionTH = "ชาไต้หวัน และ นมอุ่น"
 		Var DrinkDescription = "Taiwanese Tea, Sugar,  and Warm milk"
-		Topping "Load" "12-02-02-0025"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_taiwan_milk_tea_Jason.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0025.Price
@ -1638,11 +1649,14 @@ GINGER TEA" </Value>
 		Var PD_STAGE_3 = $12-02-03-0025.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0025"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0025"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0025"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0025.NameE
@ -1791,7 +1805,6 @@ and Warm milk" </Value>
 		Var NameDrinkTH = "มัทฉะลาเต้ "
 		Var DrinkDescriptionTH = "ชาเขียวมัทฉะ และ นมอุ่น"
 		Var DrinkDescription = "Matcha and Warm milk"
-		Topping "Load" "12-02-02-0026"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_matcha_milk_tea_sing.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0026.Price
@ -1805,11 +1818,14 @@ and Warm milk" </Value>
 		Var PD_STAGE_3 = $12-02-03-0026.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0026"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0026"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0026"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0026.NameE
@ -1957,7 +1973,6 @@ and Warm milk" </Value>
 		Var NameDrinkTH = "ชาเขียวญี่ปุ่น "
 		Var DrinkDescriptionTH = "ชาเชียว และน้ำ"
 		Var DrinkDescription = "Matcha and   water"
-		Topping "Load" "12-02-02-0027"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_matcha_tea_sing.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0027.Price
@ -1971,11 +1986,14 @@ and Warm milk" </Value>
 		Var PD_STAGE_3 = $12-02-03-0027.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0027"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0027"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0027"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0027.NameE
@ -2123,7 +2141,6 @@ and Warm milk" </Value>
 		Var NameDrinkTH = "ชาเขียวญี่ปุ่นมะนาว  "
 		Var DrinkDescriptionTH = "ชาเชียว มะนาว "
 		Var DrinkDescription = "Matcha, Limenade,  and   water"
-		Topping "Load" "12-02-02-0028"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lime_Matcha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0028.Price
@ -2137,11 +2154,14 @@ and Warm milk" </Value>
 		Var PD_STAGE_3 = $12-02-03-0028.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0028"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0028"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0028"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0028.NameE
@ -2292,7 +2312,6 @@ and   water" </Value>
 		Var NameDrinkTH = "ชาเขียวญี่ปุ่น "
 		Var DrinkDescriptionTH = "ชาเชียว และน้ำ"
 		Var DrinkDescription = "Matcha and   water"
-		Topping "Load" "12-02-02-0011"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_matcha_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0011.Price
@ -2306,11 +2325,14 @@ and   water" </Value>
 		Var PD_STAGE_3 = $12-02-03-0011.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0011"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0011"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0011"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0011.NameE
@ -2458,7 +2480,6 @@ and   water" </Value>
 		Var NameDrinkTH = "ชาเขียวญี่ปุ่นมะนาว  "
 		Var DrinkDescriptionTH = "ชาเชียว น้ำ มะนาว  "
 		Var DrinkDescription = "Matcha, Limenade, Water, and Ice"
-		Topping "Load" "12-02-02-0012"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lime_tea_Matcha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0012.Price
@ -2472,11 +2493,14 @@ and   water" </Value>
 		Var PD_STAGE_3 = $12-02-03-0012.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0012"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0012"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0012"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0012.NameE
@ -2626,7 +2650,6 @@ LIMENADE" </Value>
 		Var NameDrinkTH = "ชาบราวน์ชูการ์ "
 		Var DrinkDescriptionTH = "ชาไทย น้ำเชื่อมน้ำตาลแดง  นม  "
 		Var DrinkDescription = "Thai tea, Milk  Kokuto syrup, Ice"
-		Topping "Load" "12-02-02-0006"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_Black_Sugar_Milk_Tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0006.Price
@ -2640,11 +2663,14 @@ LIMENADE" </Value>
 		Var PD_STAGE_3 = $12-02-03-0006.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0006"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0006"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0006"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0006.NameE
@ -2791,11 +2817,10 @@ TEA" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "TAIWANESE TEA"
+		Var NameDrink = "TAIWANESE"
 		Var NameDrinkTH = "ชานมไต้หวัน"
 		Var DrinkDescriptionTH = "ชาไต้หวัน นม  "
 		Var DrinkDescription = "Taiwan Tea, Milk, Sugar, Ice"
-		Topping "Load" "12-02-02-0003"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_taiwan_milk_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0003.Price
@ -2809,11 +2834,14 @@ TEA" </Value>
 		Var PD_STAGE_3 = $12-02-03-0003.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0003"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0003"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0003"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0003.NameE
@ -2870,7 +2898,7 @@ TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "TAIWANESE TEA" </Value>
+	<Value> "TAIWANESE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2961,7 +2989,6 @@ TEA" </Value>
 		Var NameDrinkTH = "มัทฉะลาเต้ "
 		Var DrinkDescriptionTH = "ชาเชียว นม  "
 		Var DrinkDescription = "Green Tea, Milk, Sugar, Ice"
-		Topping "Load" "12-02-02-0004"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_matcha_milk_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0004.Price
@ -2975,11 +3002,14 @@ TEA" </Value>
 		Var PD_STAGE_3 = $12-02-03-0004.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0004"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0004"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0004"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0004.NameE
@ -3127,7 +3157,6 @@ TEA" </Value>
 		Var NameDrinkTH = "ชาลิ้นจี่ "
 		Var DrinkDescriptionTH = "ชาไทย น้ำเชื่อมลิ้นจี่  "
 		Var DrinkDescription = "Thai tea, Lychee, Sugar, Water, Ice"
-		Topping "Load" "12-02-02-0008"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_lychee_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0008.Price
@ -3141,11 +3170,14 @@ TEA" </Value>
 		Var PD_STAGE_3 = $12-02-03-0008.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0008"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0008"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0008"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0008.NameE
@ -3294,7 +3326,6 @@ Sugar, Water, Ice" </Value>
 		Var NameDrinkTH = "ชาเขียวญี่ปุ่น "
 		Var DrinkDescriptionTH = "ชาเชียว และน้ำ"
 		Var DrinkDescription = "Matcha and   water"
-		Topping "Load" "12-02-02-0011"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_matcha_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0011.Price
@ -3308,11 +3339,14 @@ Sugar, Water, Ice" </Value>
 		Var PD_STAGE_3 = $12-02-03-0011.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0011"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0011"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0011"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0011.NameE
@ -3460,7 +3494,6 @@ Sugar, Water, Ice" </Value>
 		Var NameDrinkTH = "ชาเขียวญี่ปุ่นมะนาว  "
 		Var DrinkDescriptionTH = "ชาเชียว น้ำ มะนาว  "
 		Var DrinkDescription = "Matcha, Limenade, Water, and Ice"
-		Topping "Load" "12-02-02-0012"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lime_tea_Matcha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0012.Price
@ -3474,11 +3507,14 @@ Sugar, Water, Ice" </Value>
 		Var PD_STAGE_3 = $12-02-03-0012.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0012"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0012"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0012"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0012.NameE
@ -3628,7 +3664,6 @@ LIMENADE" </Value>
 		Var NameDrinkTH = "ชาลิ้นจี่ "
 		Var DrinkDescriptionTH = "ชาไทย น้ำเชื่อมลิ้นจี่"
 		Var DrinkDescription = "Thai tea, Lychee, Sugar, Water"
-		Topping "Load" "12-02-02-0019"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lychee_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0019.Price
@ -3642,11 +3677,14 @@ LIMENADE" </Value>
 		Var PD_STAGE_3 = $12-02-03-0019.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0019"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0019"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0019"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0019.NameE
@ -3794,7 +3832,6 @@ LIMENADE" </Value>
 		Var NameDrinkTH = "ชาสตอเบอร์รี่ "
 		Var DrinkDescriptionTH = "ชาไทย น้ำเชื่อมสตอเบอร์รี่   "
 		Var DrinkDescription = "Thai tea, Strawberry Syrup, Water, Ice"
-		Topping "Load" "12-02-02-0022"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_strawberry_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0022.Price
@ -3808,11 +3845,14 @@ LIMENADE" </Value>
 		Var PD_STAGE_3 = $12-02-03-0022.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0022"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0022"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0022"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0022.NameE
@ -3962,7 +4002,6 @@ Water, Ice" </Value>
 		Var NameDrinkTH = "น้ำกัญชา "
 		Var DrinkDescriptionTH = "น้ำเชื่อมกัญชา (ช่วยผ่อนคลาย)"
 		Var DrinkDescription = "Cannabis Syrup and    water"
-		Topping "Load" "12-05-02-0027"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_marijuana_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0017.Price
@ -3976,11 +4015,14 @@ Water, Ice" </Value>
 		Var PD_STAGE_3 = $12-05-03-0027.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-05-02-0027"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0017"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-05-03-0027"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0017.NameE
@ -4129,7 +4171,6 @@ Water, Ice" </Value>
 		Var NameDrinkTH = "ชาดำ "
 		Var DrinkDescriptionTH = "ชาไทย น้ำ  "
 		Var DrinkDescription = "Thai tea, Water, and Ice"
-		Topping "Load" "12-02-02-0029"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_thai_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -4143,11 +4184,14 @@ Water, Ice" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0029"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -4295,7 +4339,6 @@ Water, Ice" </Value>
 		Var NameDrinkTH = "ชาดำมะนาว"
 		Var DrinkDescriptionTH = "ชาไทย น้ำ มะนาว  "
 		Var DrinkDescription = "Thai tea, Limenade, Water, and Ice"
-		Topping "Load" "12-02-02-0030"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_lime_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -4309,11 +4352,14 @@ Water, Ice" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0030"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -4462,7 +4508,6 @@ LIMENADE" </Value>
 		Var NameDrinkTH = "ชาอู่หลง "
 		Var DrinkDescriptionTH = "ชาอู่หลงไต้หวัน น้ำ มะนาว   "
 		Var DrinkDescription = "Taiwan oolong tea, Water, and Ice"
-		Topping "Load" "12-02-02-0031"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_oolong_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0031.Price
@ -4476,11 +4521,14 @@ LIMENADE" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0031"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0031"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0031.NameE
@ -4629,7 +4677,6 @@ LIMENADE" </Value>
 		Var NameDrinkTH = "ชาอู่หลงมะนาว"
 		Var DrinkDescriptionTH = "ชาอู่หลงไต้หวัน น้ำ มะนาว   "
 		Var DrinkDescription = "Taiwan oolong tea, Limenade,  Water, and Ice"
-		Topping "Load" "12-02-02-0032"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_lime_Oolong_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0032.Price
@ -4643,11 +4690,14 @@ LIMENADE" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0032"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0032"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0032.NameE
@ -4798,7 +4848,6 @@ Water, and Ice" </Value>
 		Var NameDrinkTH = "ชาบ๊วย "
 		Var DrinkDescriptionTH = "ชาไทย น้ำเชื่อมบ๊วย"
 		Var DrinkDescription = "Thai tea, Ume Syrup,  and   water"
-		Topping "Load" "12-02-02-0017"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_ume_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-02-01-0016.Price
@ -4812,11 +4861,14 @@ Water, and Ice" </Value>
 		Var PD_STAGE_3 = $12-02-03-0017.Button
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-02-02-0017"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "12-02-01-0016"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "12-02-03-0017"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $12-02-01-0016.NameE
--- a/xml/page_catalog_group_whey.xml
+++ b/xml/page_catalog_group_whey.xml
@ -638,7 +638,6 @@
 		Var NameDrinkTH = "มัทฉะโปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน ชาเชียว นม"
 		Var DrinkDescription = "Whey protein, Matcha, and Milk"
-		Topping "Load" "12-04-02-0001"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Matcha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -652,11 +651,14 @@
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-04-02-0001"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -805,7 +807,6 @@ Matcha, and Milk" </Value>
 		Var NameDrinkTH = "มัทฉะโปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน ชาเชียว นม"
 		Var DrinkDescription = "Whey protein, Matcha, and Milk"
-		Topping "Load" "12-04-02-0016"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Matcha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -819,11 +820,14 @@ Matcha, and Milk" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-04-02-0016"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -972,7 +976,6 @@ Matcha, and Milk" </Value>
 		Var NameDrinkTH = "โกโก้โปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน โกโก้ นม"
 		Var DrinkDescription = "Whey protein, Cocoa, and Milk"
-		Topping "Load" "12-04-02-0002"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Chocolate.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -986,11 +989,14 @@ Matcha, and Milk" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-04-02-0002"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -1139,7 +1145,6 @@ Cocoa, and Milk" </Value>
 		Var NameDrinkTH = "สตอเบอร์รี่โปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่  นม"
 		Var DrinkDescription = "Whey protein,Milk,  Strawberry Syrup"
-		Topping "Load" "12-04-02-0003"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Strawberry.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1153,11 +1158,14 @@ Cocoa, and Milk" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-04-02-0003"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -1308,7 +1316,6 @@ Strawberry Syrup" </Value>
 		Var NameDrinkTH = "สตอเบอร์รี่โปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน น้ำเชื่อมสตอเบอร์รี่  นม"
 		Var DrinkDescription = "Whey protein,Milk,  Strawberry Syrup"
-		Topping "Load" "12-04-02-0013"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Strawberry.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1322,11 +1329,14 @@ Strawberry Syrup" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-04-02-0013"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -1477,7 +1487,6 @@ Strawberry Syrup" </Value>
 		Var NameDrinkTH = "เอสเพรสโซ่โปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน กาแฟ นม"
 		Var DrinkDescription = "Whey protein, Espresso and Milk"
-		Topping "Load" "12-04-02-0004"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_espresso.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1491,11 +1500,14 @@ Strawberry Syrup" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-04-02-0004"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -1644,7 +1656,6 @@ and Milk" </Value>
 		Var NameDrinkTH = "ชานมไทยโปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน ชาไทย นม"
 		Var DrinkDescription = "Whey protein, Thai Tea, and Milk"
-		Topping "Load" "12-04-02-0005"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Thaitea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1658,11 +1669,14 @@ and Milk" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-04-02-0005"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -1811,7 +1825,6 @@ Thai Tea, and Milk" </Value>
 		Var NameDrinkTH = "ชานมไทยโปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน ชาไทย นม"
 		Var DrinkDescription = "Whey protein, Thai Tea, and Milk"
-		Topping "Load" "12-04-02-0015"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Thaitea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1825,11 +1838,14 @@ Thai Tea, and Milk" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-04-02-0015"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -1978,7 +1994,6 @@ Thai Tea, and Milk" </Value>
 		Var NameDrinkTH = "บราวน์ชูการ์โปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน นม  น้ำเชื่อมน้ำตาลแดง"
 		Var DrinkDescription = "Whey protein, Milk, Kokuto syrup"
-		Topping "Load" "12-04-02-0006"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_kokuto.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -1992,11 +2007,14 @@ Thai Tea, and Milk" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-04-02-0006"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -2147,7 +2165,6 @@ Kokuto syrup" </Value>
 		Var NameDrinkTH = "บลูเบอร์รี่โปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน นม  น้ำเชื่อมบลูเบอร์รี่"
 		Var DrinkDescription = "Whey protein, Blueberry Syrup and Milk"
-		Topping "Load" "12-04-02-0007"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Blueberry.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2161,11 +2178,14 @@ Kokuto syrup" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-04-02-0007"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -2315,7 +2335,6 @@ Blueberry Syrup and Milk" </Value>
 		Var NameDrinkTH = "ชาไต้หวันโปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน นม  ชาไต้หวัน"
 		Var DrinkDescription = "Whey protein, Milk, Taiwanese Tea, Sugar"
-		Topping "Load" "12-04-02-0008"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Taiwantea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2329,11 +2348,14 @@ Blueberry Syrup and Milk" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-04-02-0008"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -2484,7 +2506,6 @@ Taiwanese Tea, Sugar" </Value>
 		Var NameDrinkTH = "ชาไต้หวันโปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน นม  ชาไต้หวัน"
 		Var DrinkDescription = "Whey protein, Milk, Taiwanese Tea, Sugar"
-		Topping "Load" "12-04-02-0017"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Taiwantea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2498,11 +2519,14 @@ Taiwanese Tea, Sugar" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-04-02-0017"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -2653,7 +2677,6 @@ Taiwanese Tea, Sugar" </Value>
 		Var NameDrinkTH = "คาราเมลโปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน นม  น้ำเชื่อมคาราเมล"
 		Var DrinkDescription = "Whey protein, Milk, Caramel Syrup"
-		Topping "Load" "12-04-02-0009"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_caramel.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2667,11 +2690,14 @@ Taiwanese Tea, Sugar" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-04-02-0009"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -2821,7 +2847,6 @@ Caramel Syrup" </Value>
 		Var NameDrinkTH = "นมโปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน นม"
 		Var DrinkDescription = "Whey protein and Milk"
-		Topping "Load" "12-04-02-0010"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_milk.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -2835,11 +2860,14 @@ Caramel Syrup" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-04-02-0010"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
@ -2987,7 +3015,6 @@ Caramel Syrup" </Value>
 		Var NameDrinkTH = "โปรตีนเปล่า"
 		Var DrinkDescriptionTH = "เวย์โปรตีน น้ำ  "
 		Var DrinkDescription = "Whey protein, Water, and Ice"
-		Topping "Load" "12-04-02-0011"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_isolated.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@ -3001,11 +3028,14 @@ Caramel Syrup" </Value>
 		Var PD_STAGE_3 = "Disable2"
 		If PD_STAGE_2 = "Enable" Then
 			Var PD_STAGE_2 = "PressForever"
+			Topping "Load" "12-04-02-0011"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 				Var PD_STAGE_1 = "PressForever"
+			Topping "Load" "-"
 			Else
 				Var PD_STAGE_3 = "PressForever"
+			Topping "Load" "-"
 			EndIf
 		EndIf
 		Var menu_name_eng_hot = $##-##-##-####.NameE
--- a/xml/page_drinkok.xml
+++ b/xml/page_drinkok.xml
@ -282,8 +282,10 @@

 						DEBUGVAR HaveCup
 						DEBUGVAR CHECKCUP
+						DEBUGVAR CupChecking
+						DEBUGVAR MaybeHaveCup
 						If HaveCup = "false" Then 
-							If CHECKCUP = "true" Then
+							If MaybeHaveCup = "true" Then
 								
 							Else
 								Var NextOrder = "false"
@ -355,9 +357,7 @@
 	EndIf

 	If CupChecking = "true" Then
-		If DelayButton > 2 Then
-			Var buttonRemoveCup = "Enable"
-		EndIf
+		

 		Var DelayButton = DelayButton + 1
 	EndIf 
@ -380,6 +380,16 @@
 		EndIf
 	EndIf

+	If DelayButton > 1 Then
+		
+		Var DelayButton = DelayButton + 1
+		
+		If DelayButton > 8 Then
+			Var buttonRemoveCup = "Enable"
+		EndIf
+
+	EndIf
+
 	TimerReset
 	Refresh

--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@ -162,10 +162,12 @@
 		Var ReadyForBrew = "false"
 	EndIf

-	If MachineStage = "remove-cup" Then
-		SAVELOG "MachineStage = remove-cup 2"
-		Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+	If Seeker = "curr" Then
+		If MachineStage = "remove-cup" Then
+			SAVELOG "MachineStage = remove-cup 2"
+			Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"

+		EndIf
 	EndIf
 	
 	If CupChecking = "false" Then
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@ -22,6 +22,8 @@
 	Var GotoStoreCredit0 = 0
 	Var StoreCreditAmount = 0

+	Var buttonRemoveCup = "Invisible"
+
 	Var MachineState_Result = 0

 	Var FailedCount = 0
@ -101,8 +103,42 @@
 		If LedLidBlink = "no" Then
 			Var SaveTheWorldST = "Enable"
 		EndIf
+
+		Var video_id_to_ran = 3
+		Var video_name_to_play = "taobin_save_world"
+		Random video_id_to_ran
+		Var ThankyouST = "Invisible"
+	Else
+
+		Var video_id_to_ran = 2
+		Var video_name_to_play = "taobin_thank"
+		Random video_id_to_ran
+		Var ThankyouST = "Enable"
 	EndIf

+
+	If new_layout = "true" Then
+
+		DEBUGVAR video_id_to_ran
+
+		Var show_video = 1
+		Var SaveTheWorldST = "Invisible" 
+		Var video_file_name = "ROOT/taobin_project/video/" + video_name_to_play 
+		Var video_file_name = video_file_name + video_id_to_ran 
+		Var video_file_name = video_file_name + ".mp4" 
+
+
+		DEBUGVAR video_file_name
+		
+		Var VideoFileNameStage = "Enable"
+		Var TimeoutToNext = 5
+		Var ThankyouST = "Invisible"
+	Else
+		Var show_video = 0
+		Var VideoFileNameStage = "Invisible"
+		Var TimeoutToNext = 3
+
+	EndIf
 	

 </EventOpen>
@ -112,7 +148,7 @@
 	Var CountDownThankyou = CountDownThankyou - 1

 	Var Timeout = Timeout + 1 
-	If Timeout = 3 Then
+	If Timeout = TimeoutToNext Then

 		If 	CART_INDEX = 0  Then   
 		Else
@ -242,9 +278,21 @@



+;<Video>
+;<X> 0 </X>
+;<Y> 392 </Y>
+;<Width> 1080</Width>
+;<Height> 1528 </Height>
+;<State>VideoFileNameStage</State>
+;<Filename> video_file_name </Filename>
+;</Video>
+
+
+
 <Image>
 <X> 89 </X>
 <Y> 700 </Y>
+<State>ThankyouST</State>
 <Filename> "ROOT/taobin_project/image/page_thankyou/img1.png" </Filename>
 </Image>

--- a/xml/page_thankyouConti.xml
+++ b/xml/page_thankyouConti.xml
@ -19,6 +19,8 @@
 	Var ChangeTimeout = 0
 	Var ChangeOK = 0
 	
+	Var buttonRemoveCup = "Invisible"
+	
 	Var MachineState_Result = 0

 	Var FailedCount = 0
@ -64,6 +66,8 @@
 	DEBUGVAR TelephoneNumber
 	DEBUGVAR Seeker.StoreCreditFlag

+	Var SaveTheWorldST = "Invisible"
+	Var SaveTheWorldCount = 0

    If Seeker = "curr" Then
    	SAVELOG "Call from thankyou Conti"
@ -72,11 +76,13 @@
    	If Seeker.get_a_straw  = "Press" Then
 			Machine StrawOrder	
 			Var LedLidBlink = "true"
+			Var SaveTheWorldCount = SaveTheWorldCount + 1
 		EndIf

 		If Seeker.get_a_lid = "Press" Then
 			Machine LidOrder	
 			Var LedLidBlink = "true"
+			Var SaveTheWorldCount = SaveTheWorldCount + 1
 		EndIf

 		Topping "Select" Seeker.selected_a_drink
@ -99,6 +105,49 @@
 	EndIf


+
+	If SaveTheWorldCount = 2 Then
+	
+		If LedLidBlink = "no" Then
+			Var SaveTheWorldST = "Enable"
+		EndIf
+
+		Var video_id_to_ran = 3
+		Var video_name_to_play = "taobin_save_world"
+		Random video_id_to_ran
+		Var ThankyouST = "Invisible"
+	Else
+
+		Var video_id_to_ran = 2
+		Var video_name_to_play = "taobin_thank"
+		Random video_id_to_ran
+		Var ThankyouST = "Enable"
+	EndIf
+
+
+	If new_layout = "true" Then
+
+		DEBUGVAR video_id_to_ran
+
+		Var show_video = 1
+		Var SaveTheWorldST = "Invisible" 
+		Var video_file_name = "ROOT/taobin_project/video/" + video_name_to_play 
+		Var video_file_name = video_file_name + video_id_to_ran 
+		Var video_file_name = video_file_name + ".mp4" 
+
+
+		DEBUGVAR video_file_name
+		
+		Var VideoFileNameStage = "Enable"
+		Var TimeoutToNext = 5
+		Var ThankyouST = "Invisible"
+	Else
+		Var show_video = 0
+		Var VideoFileNameStage = "Invisible"
+		Var TimeoutToNext = 3
+
+	EndIf
+
 	DEBUGVAR LastMakeDrinkResult
 	DEBUGVAR MachineStage
 	DEBUGVAR NextOrderStatus
--- a/xml/page_topping_select4.xml
+++ b/xml/page_topping_select4.xml
@ -546,6 +546,8 @@
 			

 		;PressForever
+		Var sugar_default_flag = 0
+		
 		If TOPPING1 = "Sugar" Then
 			
 			If sugarKeto = "true" Then
@ -564,24 +566,32 @@

 			If toppingID1index1 = toppingID1Default Then
 				Var SugarState1 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf
 			
 			If toppingID1index2 = toppingID1Default Then
 				Var SugarState2 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf
 			
 			If toppingID1index3 = toppingID1Default Then
 				Var SugarState3 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf

 			If toppingID1index4 = toppingID1Default Then
 				Var SugarState4 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf

 			If toppingID1index5 = toppingID1Default Then
 				Var SugarState5 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf

+			If sugar_default_flag = 0 Then
+				Var SugarState1 = "PressForever"
+			EndIf
 		EndIf
 		
 		If TOPPING1 = "Powder Sugar" Then
@ -603,24 +613,32 @@

 			If toppingID1index1 = toppingID1Default Then
 				Var SugarState1 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf
 			
 			If toppingID1index2 = toppingID1Default Then
 				Var SugarState2 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf
 			
 			If toppingID1index3 = toppingID1Default Then
 				Var SugarState3 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf

 			If toppingID1index4 = toppingID1Default Then
 				Var SugarState4 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf

 			If toppingID1index5 = toppingID1Default Then
 				Var SugarState5 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf

+			If sugar_default_flag = 0 Then
+				Var SugarState1 = "PressForever"
+			EndIf
 		EndIf
 		

@ -635,20 +653,28 @@
 			
 			If toppingID1index1 = toppingID1Default Then
 				Var SugarState2 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf
 			
 			If toppingID1index2 = toppingID1Default Then
 				Var SugarState3 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf

 			If toppingID1index3 = toppingID1Default Then
 				Var SugarState4 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf

 			If toppingID1index4 = toppingID1Default Then
 				Var SugarState5 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf
 			
+			If sugar_default_flag = 0 Then
+				Var SugarState2 = "PressForever"
+			EndIf
+
 		EndIf

 		If TOPPING1 = "Powder Sugar Premix 50" Then
@ -662,16 +688,23 @@
 			
 			If toppingID1index1 = toppingID1Default Then
 				Var SugarState3 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf

 			If toppingID1index2 = toppingID1Default Then
 				Var SugarState4 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf

 			If toppingID1index3 = toppingID1Default Then
 				Var SugarState5 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf
-			
+
+			If sugar_default_flag = 0 Then
+				Var SugarState3 = "PressForever"
+			EndIf
+
 		EndIf

 		If TOPPING1 = "Powder Sugar Premix 25" Then
@ -684,20 +717,27 @@
 			
 			If toppingID1index1 = toppingID1Default Then
 				Var SugarState2 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf
 			
 			If toppingID1index2 = toppingID1Default Then
 				Var SugarState3 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf

 			If toppingID1index3 = toppingID1Default Then
 				Var SugarState4 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf

 			If toppingID1index4 = toppingID1Default Then
 				Var SugarState5 = "PressForever"
+				Var sugar_default_flag = 1
 			EndIf
 			
+			If sugar_default_flag = 0 Then
+				Var SugarState2 = "PressForever"
+			EndIf
 		EndIf


--- a/xml_main/startup.xml
+++ b/xml_main/startup.xml
@ -95,8 +95,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0

-	Var XMLPageVersion = "6.23"
-	Var XMLPageVersionInt = 623
+	Var XMLPageVersion = "6.26"
+	Var XMLPageVersionInt = 626
 </EventOpen>

 <Text>
--- a/xml_main/startup.xml_new_layout
+++ b/xml_main/startup.xml_new_layout
@ -0,0 +1,154 @@
+<BeginX>28</BeginX>
+<BeginY>255</BeginY>
+<OverrideBackground> "ROOT/ui/bg_main_menu2.png"</OverrideBackground>
+<Page>
+
+<Width> 1024 </Width>
+<Height> 600 </Height>
+<Background> "/ROOT/pictures/startup.bmp" </Background>
+<Timeout> 3000 </Timeout>
+<EventTimeout> 
+	Open "/ROOT/xml/main.xml" 
+</EventTimeout>
+<EventOpen>
+	Var video_main_0 = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_00.mp4"
+	Var video_menu_0 = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu_00.mp4"
+	Var video_menu_1 = "/mnt/sdcard/coffeevending/taobin_project/adv/taobin_adv_menu2_00.mp4"
+	Var MenuLangTH = 1
+	Var VendingCampaign = 0
+	Var VendingDiscount = 0
+	Var VendingClass = ""
+	TopView "hide"
+	Var NetworkStatus = "DOWN"
+	Var MachineErrorDetail = ""
+	Var SetVideo = 1
+	Var AdvSoundWorking  = ""
+	Var AdvSoundWorking = "/ROOT/sounds/adv_working_01.wav"
+	Var AdvIndex = 1
+	Var SetSoundPlay = 0
+	Var CheckAutoZero = 0.0
+	Var DeffZero = 0.0
+	Var CountZero = 0
+	Var AdvWorking = ""
+	Var AdvCoin = ""
+	Var AdvAmount = ""
+	Var AdvMobile = ""
+	Var AdvId = "00"
+	;Var AdvertiseProfile = "00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00/00"
+	Var AdvertiseProfile1 = "00"
+	Var AdvertiseProfile2 = "00"
+	Var AdvertiseProfile3 = "00"
+	Var AdvertiseProfile4 = "00"
+	Var AdvertiseProfile5 = "00"
+	Var AdvertiseProfile6 = "00"
+	Var AdvertiseProfile7 = "00"
+	Var AdvertiseProfile8 = "00"
+	Var AdvertiseProfile9 = "00"
+	Var AdvertiseProfile10 = "00"
+	Var AdvertiseProfile11 = "00"
+	Var AdvertiseProfile12 = "00"
+	Var AdvertiseProfile13 = "00"
+	Var AdvertiseProfile14 = "00"
+	Var AdvertiseProfile15 = "00"
+	Var AdvertiseProfile16 = "00"
+	Var AdvertiseProfile17 = "00"
+	Var AdvertiseProfile18 = "00"
+	
+	Var ExtSlot1 = ""
+	Var ExtSlot2 = ""
+	Var ExtSlot3 = ""
+	Var ExtSlot4 = ""
+	Var ExtSlot5 = ""
+	Var ExtSlot6 = ""
+	
+	Var AdvExt1 = ".mp4"
+	Var AdvExt2 = ".mp4"
+	Var AdvExt3 = ".mp4"
+	Var AdvExt4 = ".bmp"
+	Var AdvExt5 = ".bmp"
+	Var AdvExt6 = ".bmp"
+	Var AdvExt7 = ".mp4"
+	Var AdvExt8 = ".mp4"
+	Var AdvExt9 = ".bmp"
+	Var AdvExt10 = ".bmp"
+	Var AdvExt11 = ".mp4"
+	Var AdvExt12 = ".bmp"
+	Var AdvExt13 = ".bmp"
+	Var AdvExt14 = ".bmp"
+	Var AdvExt15 = ".bmp"
+	Var AdvExt16 = ".mp4"
+	Var AdvExt17 = ".mp4"
+	Var AdvExt18 = ".bmp"
+	Var AdvExt19 = ".mp4"
+	Var AdvExt20 = ".bmp"
+
+;Dtac		
+	Var RandomPromotion = 0
+;true_move
+	Var RandomPromotion1 = 0
+	Var RandomPromotionAIS = 0
+	Var RandomPromotionCAT = 0
+	Var RandomPromotionOper168 = 0
+	Var RandomPromotionImobile = 0
+	Var RandomPromotionWhitespace = 0
+	Var RandomPromotionTOT = 0
+	Var RandomPromotionMyworld = 0
+	Var RandomSalePackage = 0
+
+	Var XMLPageVersion = "6.40"
+	Var XMLPageVersionInt = 640
+</EventOpen>
+
+<Text>
+	<X> 644 </X>
+	<Y> 350 </Y>
+	<Size> 20 </Size>
+	<Font> fontType1 </Font>
+	<Color> 0xEA068A </Color>
+	<Transparent> 0 </Transparent>
+	<Value> "Engine" </Value>
+</Text>
+
+<Text>
+	<X> 724 </X>
+	<Y> 350 </Y>
+	<Size> 20 </Size>
+	<Font> fontType1 </Font>
+	<Color> 0xEA068A </Color>
+	<Transparent> 0 </Transparent>
+	<Value> SoftwareVersion </Value>
+</Text>
+
+<Text>
+	<X> 628 </X>
+	<Y> 380 </Y>
+	<Size> 20 </Size>
+	<Font> fontType1 </Font>
+	<Color> 0xEA068A </Color>
+	<Transparent> 0 </Transparent>
+	<Value> "Software version" </Value>
+</Text>
+
+<Text>
+	<X> 802 </X>
+	<Y> 380 </Y>
+	<Size> 20 </Size>
+	<Font> fontType1 </Font>
+	<Color> 0xEA068A </Color>
+	<Transparent> 0 </Transparent>
+	<Value> XMLPageVersion </Value>
+</Text>
+
+<TextRunner>
+	<Visible> False </Visible>
+	<Y> 430 </Y>
+	<Size> 50 </Size>
+	<Size> 20 </Size>
+	<Font> fontType1 </Font>
+	<Repeat> True </Repeat>
+	<Color> 0xFFFF00 </Color>
+	<BgColor> 0x0000A0 </BgColor>
+	<Filename> "/ROOT/text/runner.txt" </Filename>
+</TextRunner>
+
+</Page>