Release 6.49

animation01/sync_4.file

@@ -1,6 +1,4 @@
-total 196576
+total 196512
--rw-rw---- 1 root sdcard_rw    27106 2022-05-24 18:41 Menu Description - Sheet1.tsv
--rw-rw---- 1 root sdcard_rw    27080 2022-05-24 18:30 Menu Description - Sheet1_.tsv
 -rw-rw---- 1 root sdcard_rw 948282 2020-11-15 19:54 TaoBin2_draft02_art1.mp4
 -rw-rw---- 1 root sdcard_rw 3603060 2020-11-15 20:03 TaoBin2_draft02_art10.mp4
 -rw-rw---- 1 root sdcard_rw 3166935 2020-11-15 20:03 TaoBin2_draft02_art11.mp4
@@ -49,8 +47,8 @@ total 196576
 -rw-rw---- 1 root sdcard_rw 3740266 2020-11-15 19:57 TaoBin2_draft02_art7.mp4
 -rw-rw---- 1 root sdcard_rw 3998856 2020-11-15 20:01 TaoBin2_draft02_art8.mp4
 -rw-rw---- 1 root sdcard_rw 3616423 2020-11-15 20:01 TaoBin2_draft02_art9.mp4
--rw-rw---- 1 root sdcard_rw 27106 2022-05-24 21:41 playlist.tsv
+-rw-rw---- 1 root sdcard_rw 27827 2022-06-09 22:46 play_list.tsv
 -rw-rw---- 1 root sdcard_rw 3431 2022-01-17 11:20 sync_1.file
 -rw-rw---- 1 root sdcard_rw 3905 2022-04-26 17:47 sync_2.file
 -rw-rw---- 1 root sdcard_rw 4236 2022-06-06 16:36 sync_3.file
--rw-rw---- 1 root sdcard_rw        0 2022-06-06 17:59 sync_4.file
+-rw-rw---- 1 root sdcard_rw        0 2022-06-10 10:04 sync_4.file

xml/page_board.xml

@@ -123,6 +123,10 @@
 		Var WheyShow = "false"
 		Var CocktailShow = "true"
 		Var RoadShow = "true"
+	Else
+		Var WheyShow = "true"
+		Var CocktailShow = "false"
+		Var RoadShow = "false"
 	EndIf
 
 	
@@ -143,6 +147,7 @@
 		Var WheyButtonState = "Enable"
 	EndIf
 
+
 	Var TaobinOnlineX = "true"
 	
 	DEBUGVAR AppFastEnable
@@ -444,6 +449,10 @@
 
 	DEBUGVAR AdvertiseProfile
 
+	If RoadShow = "true" Then
+		;Var new_layout = "false"
+	EndIf
+
 </EventOpen>
 
 <Timeout> 1000 </Timeout>

xml/page_brewing3.xml

@@ -227,6 +227,11 @@
 	Var bg_strawProblem_ST = "Invisible"
 	Var StrawStateX = "Invisible"
 	Var LidStateX = "Invisible"
+
+	If RoadShow = "true" Then
+		Var EnableSelectMenuBetweenBrewBlink = "Invisible"  
+	EndIf
+			
 	
 </EventOpen>
 
@@ -951,6 +956,10 @@
 		EndIf
 	EndIf
 	
+	If RoadShow = "true" Then
+		Var EnableSelectMenuBetweenBrewBlink = "Invisible"  
+	EndIf
+		
 
 	Refresh
 	TimerReset

xml/page_catalog.xml

@@ -356,18 +356,6 @@
 </Button>
 
 
-; menu row 3
-;<Button>
-;<X> 205 </X>
-;<Y> 1533 </Y>
-;<Filename> Var(DirImage + "/bn_fruit.png") </Filename>
-;<FilenamePress> Var(DirImage + "/bp_fruit.png") </FilenamePress>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick> 
-;	Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml" 
-;</EventClick>
-;</Button>
 
 <Button>
 <X> 205 </X>

xml/page_catalog_cocktail.xml

@@ -2,12 +2,19 @@
 <Cache> "Enable" </Cache>
 <Width> 1080 </Width>
 <Height> 1920 </Height>
-<Background> "0xeae6e1" </Background>
+;<Background> "0xeae6e1" </Background>
 <Volume> SoundVolume </Volume>
 <EventOpen>
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+	
 	TopView "show"
 	; On open
 
+	Var NextPage = "-"
+
+	Var Seeker.thankLidFlag = 0
+	Var Seeker.thankStrawFlag = 0
+
 	WEB "DISABLE"
 
 	Var web_readyOK = "false"
@@ -22,6 +29,7 @@
 	Var countDownRetrun = 30
 
 	CoinVending OFF
+
 	
 	; Clear value
 	Topping "clear" "-"
@@ -54,18 +62,20 @@
 		Var ShowButtonClick2 = "Enable"
 	Else
 		Var ShowButtonClick2 = "Invisible"
+		Var ButtontoTopupMenu = "Invisible"
 	EndIf
 
 	If NetworkStatus = "ACTIVATE" Then
 		Var ShowNetworkProblem = "Invisible"
 		Var ShowNetworkProblemText = ""
 
-		GenHashWithTimeStamp QRCODE99
+		;GenHashWithTimeStamp QRCODE99x
 		WEB "ENABLE"
 		
 	Else
 		Var ShowNetworkProblem = "Enable"
 		Var ShowButtonClick2 = "Invisible"
+		Var ButtontoTopupMenu = "Invisible"
 		Var ShowNetworkProblemText = "การสื่อสารขัดข้อง ชำระเงินได้เฉพาะเงินสด"
 
 		Var QRCODE99 = ""
@@ -117,6 +127,37 @@
 
     EndIf
 
+	If Seeker = "next" Then
+		Var ShowButtonClick2 = "Invisible"
+		Var ButtontoTopupMenu = "Invisible"
+	EndIf
+
+
+	If XMLProfile = "taobin_notopup" Then
+		Var ButtontoTopupMenu = "Disable"
+	
+	EndIf
+
+	
+	Var menu_name_eng_hot = ""
+	Var menu_desc_eng_hot = ""
+	Var menu_name_thai_hot = ""
+	Var menu_desc_thai_hot = ""
+
+	Var menu_name_eng_cold = ""
+	Var menu_desc_eng_cold = ""
+	Var menu_name_thai_cold = ""
+	Var menu_desc_thai_cold = ""
+
+
+	Var menu_name_eng_blender = ""
+	Var menu_desc_eng_blender = ""
+	Var menu_name_thai_blender = ""
+	Var menu_desc_thai_blender = ""
+
+
+	
+	
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -128,7 +169,11 @@
 	EndIf
 
 	If countDownRetrun = 0 Then
-		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+		 If  Seeker = "next" Then 
+            Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+        Else
+            Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+        EndIf
 	EndIf
 
 	
@@ -162,16 +207,25 @@
  
 </EventWebApp>
 
-
+<Image>
-<Video>
 <X> 0 </X>
-<Y> 0 </Y>
+<Y> 380 </Y>
-<Width> 1080</Width>
+<Width> 1080 </Width>
-<Height> 380 </Height>
+<Height> 1540 </Height>
-<Loop> "true" </Loop>
+<Color> "0xeae6e1" </Color>
-<Filename> video_menu_0 </Filename>
+</Image>
 
-</Video>
+
+
+;<Video>
+;<X> 0 </X>
+;<Y> 0 </Y>
+;<Width> 1080</Width>
+;<Height> 380 </Height>
+;<Loop> "true" </Loop>
+;<Filename> video_menu_0 </Filename>
+;
+;</Video>
 
 
 
@@ -184,8 +238,11 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_back_to_main.xml" 
+	If  Seeker = "next" Then 
-	
+        Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+    Else
+        Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+    EndIf
 </EventClick>
 </Button>
 
@@ -227,9 +284,14 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	; eng
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
-	Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
 	
+	; eng
+	If new_layout = "true" Then
+        Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+    Else
+        Open "ROOT/taobin_project/xml/page_catalog_choose_drink1.xml" 
+    EndIf	
 </EventClick>
 </Button>
 
@@ -241,7 +303,12 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	If new_layout = "true" Then
+		Open "ROOT/taobin_project/xml/page_catalog_group_coffee.xml" 
+	Else
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink2.xml" 
+	EndIf
 </EventClick>
 </Button>
 
@@ -254,7 +321,12 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	If new_layout = "true" Then
+		Open "ROOT/taobin_project/xml/page_catalog_group_tea.xml" 
+	Else
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink3.xml" 
+	EndIf
 </EventClick>
 </Button>
 
@@ -266,37 +338,55 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	If new_layout = "true" Then
+		Open "ROOT/taobin_project/xml/page_catalog_group_milk.xml" 
+	Else
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink4.xml" 
+
+	EndIf
 </EventClick>
 </Button>
 
 
-; menu row 3
-;<Button>
-;<X> 205 </X>
-;<Y> 1533 </Y>
-;<Filename> Var(DirImage + "/bn_fruit.png") </Filename>
-;<FilenamePress> Var(DirImage + "/bp_fruit.png") </FilenamePress>
-;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
-;<Volume> SoundVolume </Volume>
-;<EventClick> 
-;	Open "ROOT/taobin_project/xml/page_catalog_choose_drink5.xml" 
-;</EventClick>
-;</Button>
-
 
 <Button>
 <X> 205 </X>
 <Y> 1533 </Y>
+<State>WheyButtonState</State>
 <Filename> Var(DirImage + "/bn_cocktail.png") </Filename>
 <FilenamePress> Var(DirImage + "/bp_cocktail.png") </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog_choose_drink8.xml" 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	If new_layout = "true" Then
+		Open "ROOT/taobin_project/xml/page_catalog_group_cocktail.xml" 
+	Else
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink7.xml" 
+	EndIf
 </EventClick>
 </Button>
 
+<Button>
+<X> 205 </X>
+<Y> 1533 </Y>
+<State>AppFastButtonState</State>
+<Filename> Var(DirImage + "/bn_appfast.png") </Filename>
+<FilenamePress> Var(DirImage + "/bp_appfast.png") </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	If new_layout = "true" Then
+		Open "ROOT/taobin_project/xml/page_catalog_group_appfast.xml" 
+	Else
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink11.xml" 
+	EndIf
+</EventClick>
+</Button>
+
+
 <Button>
 <X> 579 </X>
 <Y> 1533 </Y>
@@ -305,7 +395,12 @@
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+	OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+	If new_layout = "true" Then
+		Open "ROOT/taobin_project/xml/page_catalog_group_other.xml" 
+	Else
+		Open "ROOT/taobin_project/xml/page_catalog_choose_drink6.xml" 
+	EndIf
 </EventClick>
 </Button>
 
@@ -328,13 +423,15 @@
 <Button>
 <X> 696 </X>
 <Y> 424 </Y>
-<State> ShowButtonClick2 </State>
+<State> ButtontoTopupMenu </State>
 <Filename> Var(DirImage + "/bn_main_page_topup.png") </Filename>
 <FilenamePress> Var(DirImage + "/bp_main_page_topup.png") </FilenamePress>
+<FilenameDisable> Var(DirImage + "/bp_main_page_topup.png") </FilenameDisable>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	; eng
+	Var PayDetail=""
 	Open "ROOT/taobin_project/xml/page_back_to_topup.xml" 
 	
 </EventClick>

xml/page_catalog_group_coffee.xml

@@ -1600,7 +1600,7 @@ Strawberry, Orange, Floral" </Value>
 		Var NameDrink = "BLUE DADDY  ESPRESSO"
 		Var NameDrinkTH = "เอสเพรสโซ่ช็อต   BLUE DADDY"
 		Var DrinkDescriptionTH = "Washed process  หอมบลูเบอร์รี และดอกไม้"
-		Var DrinkDescription = "Washed process  Note: Blue Berry and Floral"
+		Var DrinkDescription = "Washed process  Note: Blue Berry & Floral"
 		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
@@ -1703,7 +1703,7 @@ ESPRESSO" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
 	<Value> "Washed process 
-Note: Blue Berry and Floral" </Value>
+Note: Blue Berry & Floral" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -3755,7 +3755,7 @@ Strawberry, Orange, Floral" </Value>
 		Var NameDrink = "BLUE DADDY  AMERICANO"
 		Var NameDrinkTH = "อเมริกาโน   BLUE DADDY"
 		Var DrinkDescriptionTH = "Washed process  หอมบลูเบอร์รี และดอกไม้"
-		Var DrinkDescription = "Washed process  Note: Blue Berry and Floral"
+		Var DrinkDescription = "Washed process  Note: Blue Berry & Floral"
 		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
@@ -3858,7 +3858,7 @@ AMERICANO" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
 	<Value> "Washed process 
-Note: Blue Berry and Floral" </Value>
+Note: Blue Berry & Floral" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -5672,7 +5672,7 @@ Pink​ Rose & Berry" </Value>
 		Var NameDrink = "BLUE DADDY  ALMOST DIRTY"
 		Var NameDrinkTH = "BLUE DADDY  ALMOST DIRTY"
 		Var DrinkDescriptionTH = "Washed process  หอมบลูเบอร์รี และดอกไม้"
-		Var DrinkDescription = "Washed process  Note: Blue Berry and Floral"
+		Var DrinkDescription = "Washed process  Note: Blue Berry & Floral"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_dirty_light_bluedaddy.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -5775,7 +5775,7 @@ ALMOST DIRTY" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
 	<Value> "Washed process 
-Note: Blue Berry and Floral" </Value>
+Note: Blue Berry & Floral" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -8025,7 +8025,7 @@ ICED ESPRESSO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "LATTE"
 		Var NameDrinkTH = "ลาเต้"
-		Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม"
+		Var DrinkDescriptionTH = "กาแฟ นม และ นม"
 		Var DrinkDescription = "Espresso, Milk, Foamed milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_latte.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -8104,7 +8104,7 @@ ICED ESPRESSO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม และ ฟองนม" </Value>
+	<Value> "กาแฟ นม และ นม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -8261,7 +8261,7 @@ ICED ESPRESSO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "CAPPUCINO"
 		Var NameDrinkTH = "คาปูชิโน่"
-		Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม"
+		Var DrinkDescriptionTH = "กาแฟ นม และ นม"
 		Var DrinkDescription = "Espresso, Milk, Foamed milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_cappuccino.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -8340,7 +8340,7 @@ ICED ESPRESSO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม และ ฟองนม" </Value>
+	<Value> "กาแฟ นม และ นม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -8733,7 +8733,7 @@ ICED ESPRESSO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "CARAMEL LATTE"
 		Var NameDrinkTH = "คาราเมลลาเต้"
-		Var DrinkDescriptionTH = "กาแฟ นม และ ฟองนม น้ำเชื่อมคาราเมล"
+		Var DrinkDescriptionTH = "กาแฟ นม และ นม น้ำเชื่อมคาราเมล"
 		Var DrinkDescription = "Espresso, Milk, Caramel Syrup"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_caramel_latte.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -8812,7 +8812,7 @@ ICED ESPRESSO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "กาแฟ นม และ ฟองนม
+	<Value> "กาแฟ นม และ นม
 น้ำเชื่อมคาราเมล" </Value>
 	</Text>
 	<Text>
@@ -8971,7 +8971,7 @@ Caramel Syrup" </Value>
 	<EventOnClick> 
 		Var NameDrink = "MATCHA  CAFÉ LATTE"
 		Var NameDrinkTH = "กาแฟมัทฉะลาเต้"
-		Var DrinkDescriptionTH = "กาแฟ นม ชาเขียวมัทฉะ  และ ฟองนม"
+		Var DrinkDescriptionTH = "กาแฟ นม ชาเขียวมัทฉะ  และ นม"
 		Var DrinkDescription = "Espresso, Matcha, Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_greenteacoffee_lattle.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -9051,7 +9051,7 @@ Caramel Syrup" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
 	<Value> "กาแฟ นม ชาเขียวมัทฉะ 
-และ ฟองนม" </Value>
+และ นม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -9209,7 +9209,7 @@ CAFÉ LATTE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "MATCHA  CAFÉ LATTE"
 		Var NameDrinkTH = "กาแฟมัทฉะลาเต้"
-		Var DrinkDescriptionTH = "กาแฟ นม ชาเขียวมัทฉะ  และ ฟองนม"
+		Var DrinkDescriptionTH = "กาแฟ นม ชาเขียวมัทฉะ  และ นม"
 		Var DrinkDescription = "Espresso, Matcha, Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_greenteacoffee_lattle.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -9289,7 +9289,7 @@ CAFÉ LATTE" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
 	<Value> "กาแฟ นม ชาเขียวมัทฉะ 
-และ ฟองนม" </Value>
+และ นม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -9447,7 +9447,7 @@ CAFÉ LATTE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "BROWN  SUGAR LATTE"
 		Var NameDrinkTH = "บราวน์ชูการ์ลาเต้"
-		Var DrinkDescriptionTH = "กาแฟ น้ำเชื่อมน้ำตาลแดง  และ ฟองนม"
+		Var DrinkDescriptionTH = "กาแฟ น้ำเชื่อมน้ำตาลแดง  และ นม"
 		Var DrinkDescription = "Espresso, Milk, Kokuto syrup"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_kuromitsu_coffee.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -9527,7 +9527,7 @@ CAFÉ LATTE" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
 	<Value> "กาแฟ น้ำเชื่อมน้ำตาลแดง 
-และ ฟองนม" </Value>
+และ นม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -9686,7 +9686,7 @@ Kokuto syrup" </Value>
 	<EventOnClick> 
 		Var NameDrink = "TAIWANESE TEA CAFÉ LATTE"
 		Var NameDrinkTH = "กาแฟชานมไต้หวัน"
-		Var DrinkDescriptionTH = "กาแฟ ชาไต้หวัน น้ำตาล  และ ฟองนม"
+		Var DrinkDescriptionTH = "กาแฟ ชาไต้หวัน น้ำตาล  และ นม"
 		Var DrinkDescription = "Espresso, Taiwanese Tea, Milk, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_taiwantea_macchiato.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -9766,7 +9766,7 @@ Kokuto syrup" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
 	<Value> "กาแฟ ชาไต้หวัน น้ำตาล 
-และ ฟองนม" </Value>
+และ นม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -10401,7 +10401,7 @@ Sugar, Water" </Value>
 	<EventOnClick> 
 		Var NameDrink = "THAI TEA CAFÉ LATTE"
 		Var NameDrinkTH = "กาแฟชาไทย"
-		Var DrinkDescriptionTH = "กาแฟ ชาไทย นม น้ำตาล  และ ฟองนม"
+		Var DrinkDescriptionTH = "กาแฟ ชาไทย นม น้ำตาล  และ นม"
 		Var DrinkDescription = "Espresso, Thai tea, Milk, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_coffee_thai_milk_tea.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -10481,7 +10481,7 @@ Sugar, Water" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
 	<Value> "กาแฟ ชาไทย นม น้ำตาล 
-และ ฟองนม" </Value>
+และ นม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -10640,7 +10640,7 @@ CAFÉ LATTE" </Value>
 		Var NameDrink = "THAI TEA CAFÉ LATTE"
 		Var NameDrinkTH = "กาแฟชาไทย"
 		Var DrinkDescriptionTH = "กาแฟ ชาไทย นม น้ำตาล"
-		Var DrinkDescription = "Espresso, Thai tea, Milk,\ Sugar"
+		Var DrinkDescription = "Espresso, Thai tea, Milk, Sugar"
 		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
@@ -10740,7 +10740,7 @@ CAFÉ LATTE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Espresso, Thai tea, Milk,\ Sugar" </Value>
+	<Value> "Espresso, Thai tea, Milk, Sugar" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -10876,7 +10876,7 @@ CAFÉ LATTE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "TAIWANESE TEA CAFÉ LATTE"
 		Var NameDrinkTH = "กาแฟชานมไต้หวัน"
-		Var DrinkDescriptionTH = "กาแฟ ชาไต้หวัน น้ำตาล  และ ฟองนม"
+		Var DrinkDescriptionTH = "กาแฟ ชาไต้หวัน น้ำตาล  และ นม"
 		Var DrinkDescription = "Espresso, Taiwanese Tea, Milk, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_taiwantea_macchiato.png"
 		Var OpenFromXML = CurrentXMLFileName2
@@ -10956,7 +10956,7 @@ CAFÉ LATTE" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
 	<Value> "กาแฟ ชาไต้หวัน น้ำตาล 
-และ ฟองนม" </Value>
+และ นม" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>

xml/page_catalog_group_milk.xml

@@ -1597,7 +1597,7 @@ MILK" </Value>
 		Var NameDrink = "PINK MILK"
 		Var NameDrinkTH = "นมชมพู "
 		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ นม  น้ำตาล "
-		Var DrinkDescription = "Salak Syrup, Milk, Sugar, Ice"
+		Var DrinkDescription = "Salak Syrup, Milk, Sugar"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_pink_milk.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -1697,8 +1697,7 @@ MILK" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Salak Syrup, Milk,
+	<Value> "Salak Syrup, Milk, Sugar" </Value>
-Sugar, Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -2067,7 +2066,7 @@ Sugar, Ice" </Value>
 		Var NameDrink = "STRAWCOCOA  SMOOTHIE"
 		Var NameDrinkTH = "โกโก้สตอเบอร์รี่ปั่น"
 		Var DrinkDescriptionTH = "นม น้ำเชื่อมสตอเบอร์รี่  โกโก้ และน้ำแข็ง"
-		Var DrinkDescription = "Milk, Mango Syrup, and Iced"
+		Var DrinkDescription = "Milk, Mango Syrup"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberrycocoa_smoothie.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -2168,7 +2167,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Milk, Mango Syrup, and Iced" </Value>
+	<Value> "Milk, Mango Syrup" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -2301,7 +2300,7 @@ SMOOTHIE" </Value>
 		Var NameDrink = "STRAWMILK  SMOOTHIE"
 		Var NameDrinkTH = "นมสตอเบอร์รี่ปั่น"
 		Var DrinkDescriptionTH = "นม น้ำเชื่อมสตอเบอร์รี่  และน้ำแข็ง"
-		Var DrinkDescription = "Milk, Strawberry Syrup, and  Iced"
+		Var DrinkDescription = "Milk, Strawberry Syrup"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberrymilk_smoothie.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -2402,8 +2401,7 @@ SMOOTHIE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Milk, Strawberry Syrup, and 
+	<Value> "Milk, Strawberry Syrup" </Value>
-Iced" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>

xml/page_catalog_group_other.xml

@@ -649,7 +649,7 @@
 		Var NameDrink = "PEPSI"
 		Var NameDrinkTH = "เป็ปซี่น้ำแข็ง"
 		Var DrinkDescriptionTH = "เป๊ปซี่  "
-		Var DrinkDescription = "Pepsi, Ice"
+		Var DrinkDescription = "Pepsi & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -748,7 +748,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Pepsi, Ice" </Value>
+	<Value> "Pepsi & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -881,7 +881,7 @@
 		Var NameDrink = "COKE"
 		Var NameDrinkTH = "โค้ก"
 		Var DrinkDescriptionTH = "โค้ก  "
-		Var DrinkDescription = "Coke, Ice"
+		Var DrinkDescription = "Coke & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Cokecola.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -980,7 +980,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Coke, Ice" </Value>
+	<Value> "Coke & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -1113,7 +1113,7 @@
 		Var NameDrink = "Sprite"
 		Var NameDrinkTH = "สไปรท์"
 		Var DrinkDescriptionTH = "สไปรท์  "
-		Var DrinkDescription = "Sprite and Ice"
+		Var DrinkDescription = "Sprite & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_sprite.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -1212,7 +1212,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Sprite and Ice" </Value>
+	<Value> "Sprite & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -1344,8 +1344,8 @@
 	<EventOnClick> 
 		Var NameDrink = "TAO POWER  DRINK SODA"
 		Var NameDrinkTH = "เต่าทรงพลังโซดา"
-		Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง  โซดา  "
+		Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง โซดา  (มีคาเฟอีน)"
-		Var DrinkDescription = "Medicine drink, Soda, Ice"
+		Var DrinkDescription = "Medicine drink, Soda & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -1423,7 +1423,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "เครื่องดื่มเต่าทรงพลัง  โซดา  " </Value>
+	<Value> "เครื่องดื่มเต่าทรงพลัง โซดา 
+(มีคาเฟอีน)" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -1445,7 +1446,7 @@ DRINK SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Medicine drink, Soda, Ice" </Value>
+	<Value> "Medicine drink, Soda & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -1578,7 +1579,7 @@ DRINK SODA" </Value>
 		Var NameDrink = "LIMENADE  SODA"
 		Var NameDrinkTH = "น้ำมะนาวโซดา"
 		Var DrinkDescriptionTH = "มะนาว โซดา  "
-		Var DrinkDescription = "Limenade, Sugar, Soda, Ice"
+		Var DrinkDescription = "Limenade, Sugar, Soda & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_lemonade_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -1678,7 +1679,7 @@ SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Limenade, Sugar, Soda, Ice" </Value>
+	<Value> "Limenade, Sugar, Soda & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -1811,7 +1812,7 @@ SODA" </Value>
 		Var NameDrink = "LYCHEE SODA"
 		Var NameDrinkTH = "น้ำลิ้นจี่โซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ โซดา  "
-		Var DrinkDescription = "Lychee, Sugar, Soda, Ice"
+		Var DrinkDescription = "Lychee Syrup, Soda & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Lychee_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -1910,7 +1911,7 @@ SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Lychee, Sugar, Soda, Ice" </Value>
+	<Value> "Lychee Syrup, Soda & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -2043,7 +2044,7 @@ SODA" </Value>
 		Var NameDrink = "LYCHEE SODA"
 		Var NameDrinkTH = "น้ำลิ้นจี่โซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ โซดา  "
-		Var DrinkDescription = "Lychee, Sugar, Soda, Ice"
+		Var DrinkDescription = "Lychee Syrup, Soda & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Lychee_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -2142,7 +2143,7 @@ SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Lychee, Sugar, Soda, Ice" </Value>
+	<Value> "Lychee Syrup, Soda & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -2275,7 +2276,7 @@ SODA" </Value>
 		Var NameDrink = "LYCHEE  LIMENADE SODA"
 		Var NameDrinkTH = "ลิ้นจี่มะนาวโซดา "
 		Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ มะนาว  โซดา  "
-		Var DrinkDescription = "Strawberry Syrup, Limenade,Soda, Ice"
+		Var DrinkDescription = "Strawberry Syrup, Limenade, Soda & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Lychee_lime_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -2377,7 +2378,7 @@ LIMENADE SODA" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
 	<Value> "Strawberry Syrup,
-Limenade,Soda, Ice" </Value>
+Limenade, Soda & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -2510,7 +2511,7 @@ Limenade,Soda, Ice" </Value>
 		Var NameDrink = "CANNABIS SODA"
 		Var NameDrinkTH = "กัญชาโซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมกัญชา (ช่วยผ่อนคลาย)  โซดา  "
-		Var DrinkDescription = "Cannabis Syrup, Soda, Ice"
+		Var DrinkDescription = "Cannabis Syrup, Soda & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_hemp_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -2610,7 +2611,7 @@ Limenade,Soda, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Cannabis Syrup, Soda, Ice" </Value>
+	<Value> "Cannabis Syrup, Soda & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -2743,7 +2744,7 @@ Limenade,Soda, Ice" </Value>
 		Var NameDrink = "LIMENADE  CANNABIS SODA"
 		Var NameDrinkTH = "มะนาวกัญชาโซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมกัญชา (ช่วยผ่อนคลาย)  มะนาว โซดา  "
-		Var DrinkDescription = "Cannabis Syrup, Limenade,  Soda, Ice"
+		Var DrinkDescription = "Cannabis Syrup, Limenade,  Soda & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_hemp_lime_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -2845,7 +2846,7 @@ CANNABIS SODA" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
 	<Value> "Cannabis Syrup, Limenade, 
-Soda, Ice" </Value>
+Soda & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -2977,8 +2978,8 @@ Soda, Ice" </Value>
 	<EventOnClick> 
 		Var NameDrink = "STRAWBERRY SODA"
 		Var NameDrinkTH = "สตอเบอร์รี่โซดา"
-		Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ โซดา   "
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ โซดา "
-		Var DrinkDescription = "Strawberry Syrup, Soda, Ice"
+		Var DrinkDescription = "Strawberry Syrup, Soda & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberry_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -3056,8 +3057,7 @@ Soda, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมสตอเบอร์รี่ โซดา 
+	<Value> "น้ำเชื่อมสตอเบอร์รี่ โซดา " </Value>
- " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3078,7 +3078,7 @@ Soda, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Strawberry Syrup, Soda, Ice" </Value>
+	<Value> "Strawberry Syrup, Soda & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -3210,8 +3210,8 @@ Soda, Ice" </Value>
 	<EventOnClick> 
 		Var NameDrink = "STRAWBERRY SODA"
 		Var NameDrinkTH = "สตอเบอร์รี่โซดา"
-		Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ โซดา   "
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ โซดา"
-		Var DrinkDescription = "Strawberry Syrup, Soda, Ice"
+		Var DrinkDescription = "Strawberry Syrup, Soda & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberry_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -3289,8 +3289,7 @@ Soda, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำเชื่อมสตอเบอร์รี่ โซดา 
+	<Value> "น้ำเชื่อมสตอเบอร์รี่ โซดา" </Value>
- " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3311,7 +3310,7 @@ Soda, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Strawberry Syrup, Soda, Ice" </Value>
+	<Value> "Strawberry Syrup, Soda & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -3443,8 +3442,8 @@ Soda, Ice" </Value>
 	<EventOnClick> 
 		Var NameDrink = "SALAK SODA"
 		Var NameDrinkTH = "น้ำแดงโซดา"
-		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ โซดา   "
+		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ โซดา "
-		Var DrinkDescription = "Salak Syrup, Soda, Ice"
+		Var DrinkDescription = "Salak Syrup, Soda & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_sala_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -3522,8 +3521,7 @@ Soda, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำแดงกลิ่นสละ โซดา 
+	<Value> "น้ำแดงกลิ่นสละ โซดา " </Value>
- " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3544,7 +3542,7 @@ Soda, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Salak Syrup, Soda, Ice" </Value>
+	<Value> "Salak Syrup, Soda & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -3676,8 +3674,8 @@ Soda, Ice" </Value>
 	<EventOnClick> 
 		Var NameDrink = "LIME SALAK SODA"
 		Var NameDrinkTH = "น้ำแดงมะนาวโซดา"
-		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ มะนาว โซดา   "
+		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ มะนาว โซดา "
-		Var DrinkDescription = "Salak Syrup, Limenade,Soda, Ice"
+		Var DrinkDescription = "Salak Syrup, Limenade,  Soda & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_sala_lime_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -3755,8 +3753,7 @@ Soda, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "น้ำแดงกลิ่นสละ มะนาว โซดา 
+	<Value> "น้ำแดงกลิ่นสละ มะนาว โซดา " </Value>
- " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -3778,8 +3775,8 @@ SALAK SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Salak Syrup,
+	<Value> "Salak Syrup, Limenade, 
-Limenade,Soda, Ice" </Value>
+Soda & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -3912,7 +3909,7 @@ Limenade,Soda, Ice" </Value>
 		Var NameDrink = "PLUM SODA"
 		Var NameDrinkTH = "บ๊วยโซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย โซดา  "
-		Var DrinkDescription = "Ume Syrup, Soda, Ice"
+		Var DrinkDescription = "Ume Syrup, Soda & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_ume_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -4011,7 +4008,7 @@ Limenade,Soda, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Ume Syrup, Soda, Ice" </Value>
+	<Value> "Ume Syrup, Soda & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -4144,7 +4141,7 @@ Limenade,Soda, Ice" </Value>
 		Var NameDrink = "PLUM  LIMENADE SODA"
 		Var NameDrinkTH = "บ๊วยมะนาวโซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย มะนาว โซดา   "
-		Var DrinkDescription = "Ume Syrup, Limenade, Soda,  Ice"
+		Var DrinkDescription = "Ume Syrup, Limenade,  Soda & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_ume_lime_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -4245,8 +4242,8 @@ LIMENADE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Ume Syrup, Limenade, Soda, 
+	<Value> "Ume Syrup, Limenade, 
-Ice" </Value>
+Soda & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -4379,7 +4376,7 @@ Ice" </Value>
 		Var NameDrink = "GINGER SODA"
 		Var NameDrinkTH = "ขิงโซดา"
 		Var DrinkDescriptionTH = "ขิง โซดา  "
-		Var DrinkDescription = "Ginger, Soda and Ice"
+		Var DrinkDescription = "Ginger, Soda & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Ginger_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -4478,7 +4475,7 @@ Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Ginger, Soda and Ice" </Value>
+	<Value> "Ginger, Soda & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -4611,7 +4608,7 @@ Ice" </Value>
 		Var NameDrink = "GINGER LIME  SODA"
 		Var NameDrinkTH = "ขิงมะนาวโซดา"
 		Var DrinkDescriptionTH = "ขิง มะนาว โซดา  "
-		Var DrinkDescription = "Ginger, Lime, Soda and Ice"
+		Var DrinkDescription = "Ginger, Lime, Soda & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Gingerlime_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -4711,7 +4708,7 @@ SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Ginger, Lime, Soda and Ice" </Value>
+	<Value> "Ginger, Lime, Soda & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -5076,7 +5073,7 @@ SODA" </Value>
 		Var NameDrink = "ICE & SODA"
 		Var NameDrinkTH = "โซดาน้ำแข็ง"
 		Var DrinkDescriptionTH = "โซดา  "
-		Var DrinkDescription = "Soda, Ice"
+		Var DrinkDescription = "Soda & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_soda.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -5175,7 +5172,7 @@ SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Soda, Ice" </Value>
+	<Value> "Soda & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -5307,8 +5304,8 @@ SODA" </Value>
 	<EventOnClick> 
 		Var NameDrink = "TAO POWER DRINK"
 		Var NameDrinkTH = "เต่าทรงพลัง"
-		Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง  "
+		Var DrinkDescriptionTH = "เครื่องดื่มเต่าทรงพลัง   (มีคาเฟอีน)"
-		Var DrinkDescription = "Medicine drink, Ice"
+		Var DrinkDescription = "Medicine drink & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_energy_drink.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -5386,7 +5383,8 @@ SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "เครื่องดื่มเต่าทรงพลัง  " </Value>
+	<Value> "เครื่องดื่มเต่าทรงพลัง  
+(มีคาเฟอีน)" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -5407,7 +5405,7 @@ SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Medicine drink, Ice" </Value>
+	<Value> "Medicine drink & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -5540,7 +5538,7 @@ SODA" </Value>
 		Var NameDrink = "LIME SALAK"
 		Var NameDrinkTH = "น้ำแดงมะนาว "
 		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ น้ำมะนาว   "
-		Var DrinkDescription = "Salak Syrup, Limenade, Water, Ice"
+		Var DrinkDescription = "Salak Syrup, Limenade, Water & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_sala_lime.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -5641,7 +5639,7 @@ SODA" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
 	<Value> "Salak Syrup, Limenade,
-Water, Ice" </Value>
+Water & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -5774,7 +5772,7 @@ Water, Ice" </Value>
 		Var NameDrink = "LYCHEE DRINK"
 		Var NameDrinkTH = "น้ำลิ้นจี่ "
 		Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ น้ำ  "
-		Var DrinkDescription = "Lychee, Sugar, Water, Ice"
+		Var DrinkDescription = "Lychee Syrup, Sugar, Water & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Lychee.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -5873,8 +5871,8 @@ Water, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Lychee, Sugar,
+	<Value> "Lychee Syrup, Sugar,
-Water, Ice" </Value>
+Water & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -6007,7 +6005,7 @@ Water, Ice" </Value>
 		Var NameDrink = "SALAK DRINK"
 		Var NameDrinkTH = "น้ำแดง"
 		Var DrinkDescriptionTH = "น้ำแดงกลิ่นสละ   "
-		Var DrinkDescription = "Salak Syrup, Ice"
+		Var DrinkDescription = "Salak Syrup & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_sala.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -6107,7 +6105,7 @@ Water, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Salak Syrup, Ice" </Value>
+	<Value> "Salak Syrup & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -6240,7 +6238,7 @@ Water, Ice" </Value>
 		Var NameDrink = "STRAWBERRY "
 		Var NameDrinkTH = "น้ำสตอเบอร์รี่ "
 		Var DrinkDescriptionTH = "น้ำเชื่อมสตอเบอร์รี่ น้ำ   "
-		Var DrinkDescription = "Strawberry Syrup, Water, Ice"
+		Var DrinkDescription = "Strawberry Syrup, Water & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_strawberry.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -6341,7 +6339,7 @@ Water, Ice" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
 	<Value> "Strawberry Syrup,
-Water, Ice" </Value>
+Water & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -6474,7 +6472,7 @@ Water, Ice" </Value>
 		Var NameDrink = "LIMENADE"
 		Var NameDrinkTH = "น้ำมะนาว "
 		Var DrinkDescriptionTH = "น้ำมะนาว น้ำตาล"
-		Var DrinkDescription = "Limenade, Sugar"
+		Var DrinkDescription = "Limenade, Sugar "
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_lemonade.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $12-05-01-0001.Price
@@ -6573,7 +6571,7 @@ Water, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Limenade, Sugar" </Value>
+	<Value> "Limenade, Sugar " </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -6710,7 +6708,7 @@ Water, Ice" </Value>
 		Var NameDrink = "PLUM DRINK"
 		Var NameDrinkTH = "น้ำบ๊วย "
 		Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย น้ำ  "
-		Var DrinkDescription = "Ume Syrup, Water, Ice"
+		Var DrinkDescription = "Ume Syrup, Water & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_ume_drink.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -6809,7 +6807,7 @@ Water, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Ume Syrup, Water, Ice" </Value>
+	<Value> "Ume Syrup, Water & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -6942,7 +6940,7 @@ Water, Ice" </Value>
 		Var NameDrink = "LYCHEE DRINK"
 		Var NameDrinkTH = "น้ำลิ้นจี่ "
 		Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ น้ำ  "
-		Var DrinkDescription = "Lychee, Sugar, Water, Ice"
+		Var DrinkDescription = "Lychee Syrup, Sugar, Water & Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Lychee.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -7041,8 +7039,8 @@ Water, Ice" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Lychee, Sugar,
+	<Value> "Lychee Syrup, Sugar,
-Water, Ice" </Value>
+Water & Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>

xml/page_catalog_group_whey.xml

@@ -665,7 +665,7 @@
 		Var NameDrink = "MATCHA SHAKE"
 		Var NameDrinkTH = "มัทฉะโปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน ชาเชียว นม"
-		Var DrinkDescription = "Whey protein, Matcha, and Milk"
+		Var DrinkDescription = "Whey protein, Matcha, & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Matcha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -765,7 +765,7 @@
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
 	<Value> "Whey protein,
-Matcha, and Milk" </Value>
+Matcha, & Milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -898,7 +898,7 @@ Matcha, and Milk" </Value>
 		Var NameDrink = "MATCHA SHAKE"
 		Var NameDrinkTH = "มัทฉะโปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน ชาเชียว นม"
-		Var DrinkDescription = "Whey protein, Matcha, and Milk"
+		Var DrinkDescription = "Whey protein, Matcha, & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Matcha.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -998,7 +998,7 @@ Matcha, and Milk" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
 	<Value> "Whey protein,
-Matcha, and Milk" </Value>
+Matcha, & Milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -1131,7 +1131,7 @@ Matcha, and Milk" </Value>
 		Var NameDrink = "CHOCOLATE SHAKE"
 		Var NameDrinkTH = "โกโก้โปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน โกโก้ นม"
-		Var DrinkDescription = "Whey protein, Cocoa, and Milk"
+		Var DrinkDescription = "Whey protein, Cocoa, & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Chocolate.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -1231,7 +1231,7 @@ Matcha, and Milk" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
 	<Value> "Whey protein,
-Cocoa, and Milk" </Value>
+Cocoa, & Milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -1834,7 +1834,7 @@ Strawberry Syrup" </Value>
 		Var NameDrink = "ESPRESSO SHAKE"
 		Var NameDrinkTH = "เอสเพรสโซ่โปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน กาแฟ นม"
-		Var DrinkDescription = "Whey protein, Espresso and Milk"
+		Var DrinkDescription = "Whey protein, Espresso & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_espresso.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -1934,7 +1934,7 @@ Strawberry Syrup" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
 	<Value> "Whey protein, Espresso
-and Milk" </Value>
+& Milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -2067,7 +2067,7 @@ and Milk" </Value>
 		Var NameDrink = "THAI TEA SHAKE"
 		Var NameDrinkTH = "ชานมไทยโปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน ชาไทย นม"
-		Var DrinkDescription = "Whey protein, Thai Tea, and Milk"
+		Var DrinkDescription = "Whey protein, Thai Tea, & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Thaitea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -2167,7 +2167,7 @@ and Milk" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
 	<Value> "Whey protein,
-Thai Tea, and Milk" </Value>
+Thai Tea, & Milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -2300,7 +2300,7 @@ Thai Tea, and Milk" </Value>
 		Var NameDrink = "THAI TEA SHAKE"
 		Var NameDrinkTH = "ชานมไทยโปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน ชาไทย นม"
-		Var DrinkDescription = "Whey protein, Thai Tea, and Milk"
+		Var DrinkDescription = "Whey protein, Thai Tea, & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Thaitea.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -2400,7 +2400,7 @@ Thai Tea, and Milk" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
 	<Value> "Whey protein,
-Thai Tea, and Milk" </Value>
+Thai Tea, & Milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -2768,7 +2768,7 @@ Kokuto syrup" </Value>
 		Var NameDrink = "BLUEBERRY SHAKE"
 		Var NameDrinkTH = "บลูเบอร์รี่โปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน นม  น้ำเชื่อมบลูเบอร์รี่"
-		Var DrinkDescription = "Whey protein, Blueberry Syrup and Milk"
+		Var DrinkDescription = "Whey protein, Blueberry Syrup & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_Blueberry.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -2869,7 +2869,7 @@ Kokuto syrup" </Value>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
 	<Value> "Whey protein,
-Blueberry Syrup and Milk" </Value>
+Blueberry Syrup & Milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -3706,7 +3706,7 @@ Caramel Syrup" </Value>
 		Var NameDrink = "MILK SHAKE"
 		Var NameDrinkTH = "นมโปรตีน"
 		Var DrinkDescriptionTH = "เวย์โปรตีน นม"
-		Var DrinkDescription = "Whey protein and Milk"
+		Var DrinkDescription = "Whey protein & Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_milk.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -3805,7 +3805,7 @@ Caramel Syrup" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Whey protein and Milk" </Value>
+	<Value> "Whey protein & Milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@@ -3938,7 +3938,7 @@ Caramel Syrup" </Value>
 		Var NameDrink = "PLAIN PROTEIN"
 		Var NameDrinkTH = "โปรตีนเปล่า"
 		Var DrinkDescriptionTH = "เวย์โปรตีน น้ำ  "
-		Var DrinkDescription = "Whey protein, Water, and Ice"
+		Var DrinkDescription = "Whey protein, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_protein_isolated.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -4037,7 +4037,7 @@ Caramel Syrup" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Whey protein, Water, and Ice" </Value>
+	<Value> "Whey protein, Water" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>

xml/page_payment.xml

@@ -130,6 +130,12 @@
 
 	Var Delay = 0
 	Var DelayCount = 0
+
+	DEBUGVAR SelectDrink
+	If RoadShow = "true" Then
+		MakeDrinkV1  SelectDrink SelectSugarID
+		Open "ROOT/taobin_project/xml/page_thankyou.xml"  
+	EndIf
 				
 	
 </EventOpen>

xml/page_topping_select4.xml

@@ -18,6 +18,8 @@
 
 	DEBUGVAR SelectDrink
 	DEBUGVAR PictureDrink
+
+	DEBUGVAR new_layout
 	
 	If new_layout = "true" Then
 
@@ -149,8 +151,11 @@
 
 	If RoadShow = "true" Then
 		Var PriceDrinkTmp = "Free"
+		Var SaveSelectDrinkRoadShow = SelectDrink
 	EndIf
 
+	DEBUGVAR SaveSelectDrinkRoadShow
+
 	If ShowPrice = "Invisible" Then
 		Var PriceDrinkTmpShow = "Free"
 	EndIf
@@ -268,6 +273,9 @@
 
 
 	Var topping_price_refresh = 1
+
+	Var StrawState = "Enable"
+	Var LidState = "Enable"
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -540,17 +548,20 @@
 
 		Else
 			Var ShowLidStraw = "Enable" 
-
+			If StrawState = "Enable" Then
-			If MAT_ID_9701 = "Enable" Then
+				If MAT_ID_9701 = "Enable" Then
-				Var StrawState = MAT_ID_9701
+					Var StrawState = MAT_ID_9701
-			Else
+				Else
-				Var StrawState = MAT_ID_9701
+					Var StrawState = MAT_ID_9701
+				EndIf
 			EndIf
 		
-			If MAT_ID_9601 = "Enable" Then
+			If LidState = "Enable" Then
-				Var LidState = MAT_ID_9601
+				If MAT_ID_9601 = "Enable" Then
-			Else
+					Var LidState = MAT_ID_9601
-				Var LidState = MAT_ID_9601
+				Else
+					Var LidState = MAT_ID_9601
+				EndIf
 			EndIf
 			
 		EndIf
@@ -570,14 +581,22 @@
 		If StrawState = "Enable" Then
 			Var StrawDeactiveButton = "Invisible" 
 		Else
-			Var StrawDeactiveButton = "Enable" 
+			If StrawState = "Press" Then
+				Var StrawDeactiveButton = "Invisible" 
+			Else
+				Var StrawDeactiveButton = "Enable" 
+			EndIf
 		EndIf
 		
 
 		If LidState = "Enable" Then
 			Var LidDeactiveButton = "Invisible" 
 		Else
-			Var LidDeactiveButton = "Enable" 
+			If LidState = "Press" Then
+				Var LidDeactiveButton = "Invisible" 
+			Else
+				Var LidDeactiveButton = "Enable" 
+			EndIf
 		EndIf
 		
 			
@@ -2240,27 +2259,30 @@
 	DEBUGVAR LidState
 	DEBUGVAR StrawState
 	DEBUGVAR UserSelectProductCode
-	DEBUGVAR HAVE_UV_DOOR_LID
+	; DEBUGVAR HAVE_UV_DOOR_LID obsolete.
 
-	If HAVE_UV_DOOR_LID = "true" Then
 
-		If StrawState = "Press" Then
+	If StrawState = "Press" Then
-			Machine StrawOrder	
+		Machine StrawOrder	
-			Var LedLidBlink = "true"
+		Var LedLidBlink = "true"
-		EndIf
-
-		If LidState = "Press" Then
-			Machine LidOrder	
-			Var LedLidBlink = "true"
-		EndIf
-
-		Var StrawState = "Enable"
-		Var LidState = "Enable"
-		; 
-		
 	EndIf
 
-	Var SelectDrink = UserSelectProductCode
+	If LidState = "Press" Then
+		Machine LidOrder	
+		Var LedLidBlink = "true"
+	EndIf
+
+	Var StrawState = "Enable"
+	Var LidState = "Enable"
+	; 
+	
+	If RoadShow = "true" Then
+		Var SelectDrink = SaveSelectDrinkRoadShow
+	Else
+		Var SelectDrink = UserSelectProductCode
+	EndIf
+
+	
 	
 	Var Seeker.selected_a_drink = UserSelectProductCode
 	DEBUGVAR Seeker.selected_a_drink
@@ -2362,6 +2384,11 @@
 		EndIf
 	EndIf
 
+	If RoadShow = "true" Then
+		Var PriceDrinkTmp = "Free"
+		Var SaveSelectDrinkRoadShow = UserSelectProductCode
+	EndIf
+	
 	DEBUGVAR UserSelectProductCode
 
 	

xml_main/startup.xml_new_layout

@@ -95,8 +95,8 @@
 	Var RandomPromotionMyworld = 0
 	Var RandomSalePackage = 0
 
-	Var XMLPageVersion = "6.48"
+	Var XMLPageVersion = "6.49"
-	Var XMLPageVersionInt = 648
+	Var XMLPageVersionInt = 649
 </EventOpen>
 
 <Text>