All topping

2021-05-05 23:06:49 +07:00 · 2021-05-05 23:06:49 +07:00 · feda304652
commit feda304652
parent 9a6d51ff78
12 changed files with 170 additions and 4 deletions
--- a/xml/menu_gen.py
+++ b/xml/menu_gen.py
@ -38,6 +38,8 @@
      out_xml( '\t\tSAVELOG NameDrink\r\n')
      out_xml( '\t\tVar PriceShowValue = charOfBaht + PriceDrink\r\n')  
      #out_xml( '\t\tVar PriceShowValue = "Free"\r\n')
+
+      out_xml( '\t\tVar OpenFromXML = CurrentXMLFileName2\r\n')
      out_xml( '\t\tOpen "ROOT/taobin_project/xml/page_topping_alter.xml"\r\n')
  
      out_xml( '\t</EventOnClick>\r\n')
--- a/xml/page_catalog_choose_drink.xml
+++ b/xml/page_catalog_choose_drink.xml
@ -286,6 +286,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -378,6 +379,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -470,6 +472,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -562,6 +565,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -654,6 +658,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -746,6 +751,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -838,6 +844,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -930,6 +937,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1022,6 +1030,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1114,6 +1123,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1206,6 +1216,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1298,6 +1309,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1390,6 +1402,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1482,6 +1495,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1574,6 +1588,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1666,6 +1681,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
--- a/xml/page_catalog_choose_drink1.xml
+++ b/xml/page_catalog_choose_drink1.xml
@ -286,6 +286,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -378,6 +379,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -470,6 +472,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -562,6 +565,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -654,6 +658,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -746,6 +751,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -838,6 +844,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -930,6 +937,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1022,6 +1030,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1114,6 +1123,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1206,6 +1216,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1298,6 +1309,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1390,6 +1402,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1482,6 +1495,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1574,6 +1588,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1666,6 +1681,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
--- a/xml/page_catalog_choose_drink2.xml
+++ b/xml/page_catalog_choose_drink2.xml
@ -287,6 +287,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -379,6 +380,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -471,6 +473,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -563,6 +566,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -655,6 +659,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -747,6 +752,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -839,6 +845,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -931,6 +938,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1023,6 +1031,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1115,6 +1124,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1207,6 +1217,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1299,6 +1310,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1391,6 +1403,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1483,6 +1496,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1575,6 +1589,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1667,6 +1682,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1759,6 +1775,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1851,6 +1868,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1943,6 +1961,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2035,6 +2054,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2127,6 +2147,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2219,6 +2240,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2311,6 +2333,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2403,6 +2426,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
--- a/xml/page_catalog_choose_drink3.xml
+++ b/xml/page_catalog_choose_drink3.xml
@ -286,6 +286,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -378,6 +379,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -470,6 +472,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -562,6 +565,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -654,6 +658,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -746,6 +751,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -838,6 +844,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -930,6 +937,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1022,6 +1030,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1114,6 +1123,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1206,6 +1216,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1298,6 +1309,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1390,6 +1402,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1482,6 +1495,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1574,6 +1588,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1666,6 +1681,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1758,6 +1774,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1850,6 +1867,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1942,6 +1960,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2034,6 +2053,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2126,6 +2146,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2218,6 +2239,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2310,6 +2332,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2402,6 +2425,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2494,6 +2518,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2586,6 +2611,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
--- a/xml/page_catalog_choose_drink4.xml
+++ b/xml/page_catalog_choose_drink4.xml
@ -287,6 +287,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -379,6 +380,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -471,6 +473,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -563,6 +566,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -655,6 +659,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -747,6 +752,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -839,6 +845,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -931,6 +938,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1023,6 +1031,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1115,6 +1124,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1207,6 +1217,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
--- a/xml/page_catalog_choose_drink5.xml
+++ b/xml/page_catalog_choose_drink5.xml
@ -287,6 +287,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -379,6 +380,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -471,6 +473,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -563,6 +566,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -655,6 +659,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -747,6 +752,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -839,6 +845,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
--- a/xml/page_catalog_choose_drink6.xml
+++ b/xml/page_catalog_choose_drink6.xml
@ -288,6 +288,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -380,6 +381,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -472,6 +474,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -564,6 +567,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -656,6 +660,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -748,6 +753,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -840,6 +846,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -932,6 +939,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1024,6 +1032,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1116,6 +1125,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1208,6 +1218,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1300,6 +1311,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1392,6 +1404,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1484,6 +1497,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1576,6 +1590,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1668,6 +1683,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1760,6 +1776,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1852,6 +1869,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1944,6 +1962,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2036,6 +2055,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2128,6 +2148,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2220,6 +2241,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2312,6 +2334,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2404,6 +2427,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2496,6 +2520,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2588,6 +2613,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2680,6 +2706,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -2772,6 +2799,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
--- a/xml/page_catalog_choose_drink7.xml
+++ b/xml/page_catalog_choose_drink7.xml
@ -287,6 +287,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -379,6 +380,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -471,6 +473,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -563,6 +566,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -655,6 +659,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -747,6 +752,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -839,6 +845,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -931,6 +938,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1023,6 +1031,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1115,6 +1124,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1207,6 +1217,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
--- a/xml/page_catalog_choose_drink8.xml
+++ b/xml/page_catalog_choose_drink8.xml
@ -288,6 +288,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -380,6 +381,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -472,6 +474,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -564,6 +567,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -656,6 +660,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -748,6 +753,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -840,6 +846,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -932,6 +939,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1024,6 +1032,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
@ -1116,6 +1125,7 @@
 		Topping "Load" SelectDrink
 		SAVELOG NameDrink
 		Var PriceShowValue = charOfBaht + PriceDrink
+		Var OpenFromXML = CurrentXMLFileName2
 		Open "ROOT/taobin_project/xml/page_topping_alter.xml"
 	</EventOnClick>
 	</Button>
--- a/xml/page_lid_straw.xml
+++ b/xml/page_lid_straw.xml
@ -82,6 +82,14 @@

 	If lidAndStrawOldPageIgnore = "true" Then
 		Var lidAndStrawOldPageIgnore = "false"
+		If StarwState = "Press" Then
+			Machine Straw
+			LED LedDoorLid Blink 255 255 255 255
+		EndIf
+		If LidState = "Press" Then
+			Machine Lid
+			LED LedDoorLid Blink 255 255 255 255
+		EndIf
 		Open "ROOT/taobin_project/xml/page_brewing3.xml"  
 	EndIf

--- a/xml/page_topping_select.xml
+++ b/xml/page_topping_select.xml
@ -166,7 +166,8 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	;Open PreviseXMLFileName2
-	Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	DEBUGVAR OpenFromXML
+	Open OpenFromXML
 	
 </EventClick>
 </Button>
@ -226,6 +227,12 @@
 			EndIf
 		EndIf
 		
+		If Service_LidStraw = "Disable" Then
+			Var ShowLidStraw = "Invisible" 
+			Var ShowLidOnly = "Invisible" 
+		
+		EndIf
+
 		;PressForever
 		If TOPPING1 = "Sugar" Then
 			Var ShiftSugarStep = 1
@ -319,15 +326,15 @@
 			Var SugarState4 = "Enable"
 			Var SugarState5 = "Enable"
 			
-			If toppingID1index1 = toppingID1Default Then
+			If toppingID1index3 = toppingID1Default Then
 				Var SugarState3 = "PressForever"
 			EndIf

-			If toppingID1index2 = toppingID1Default Then
+			If toppingID1index4 = toppingID1Default Then
 				Var SugarState4 = "PressForever"
 			EndIf

-			If toppingID1index3 = toppingID1Default Then
+			If toppingID1index5 = toppingID1Default Then
 				Var SugarState5 = "PressForever"
 			EndIf