Merge branch 'masterpiece' into sgp_blue

2024-09-10 09:40:28 +07:00 · 2024-09-10 09:40:28 +07:00 · af16f9aab0
commit af16f9aab0
parent 113a165bea 8d804f76a8
17 changed files with 276 additions and 171 deletions
--- a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml
+++ b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml
@ -219,7 +219,7 @@


            ; Menu 2
-            If Seeker.selected_a_drink = "12-99-05-0059" Then	
+            If Seeker.selected_a_drink = "12-99-05-0073" Then	
               If MenuPoint[1] = 1 then
                
                Else
--- a/xml/event/robinson_beauty/page_collect_point_robinson_beauty_error.xml
+++ b/xml/event/robinson_beauty/page_collect_point_robinson_beauty_error.xml
@ -43,7 +43,7 @@


 	; Menu 2
-	If Seeker.selected_a_drink = "12-99-05-0059" Then	
+	If Seeker.selected_a_drink = "12-99-05-0073" Then	
 		Var newPointIndex = 1
 	EndIf

--- a/xml/event/tricker.ev
+++ b/xml/event/tricker.ev
@ -392,11 +392,10 @@ If BoxID = 200000 Then
 EndIf

 ;
-;If BoxID > 200000 Then
-;	If BoxID < 200030 Then
-;		Var New_Payment = 1
-;		Var NewFlowPaymentCode = 1
-;	EndIf
-;EndIf
-;
+If BoxID > 200000 Then
+	If BoxID < 200015 Then
+		Var New_Payment = 1
+		Var NewFlowPaymentCode = 1
+	EndIf
+EndIf

--- a/xml/menutab/page_catalog_group_pro_robinson_beauty.xml
+++ b/xml/menutab/page_catalog_group_pro_robinson_beauty.xml
@ -603,10 +603,10 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "ICED REVLON STRAW CHEE SODA"
+		Var NameDrink = "REVLON STRAW CHEE SODA SMOOTHIE"
 		Var NameDrinkTH = "เรฟลอนสตรอว์ชี่ โซดา"
-		Var DrinkDescriptionTH = "Straw + Lychee + Soda"
-		Var DrinkDescription = "Straw + Lychee + Soda"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และโซดา"
+		Var DrinkDescription = "Strawberry Syrup, Lychee Syrup &Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Lychee_straw_soda_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
@ -690,7 +690,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Straw + Lychee + Soda" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และโซดา" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -701,8 +701,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "ICED REVLON
-STRAW CHEE SODA" </Value>
+	<Value> "REVLON
+STRAW CHEE SODA SMOOTHIE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -712,7 +712,7 @@ STRAW CHEE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Straw + Lychee + Soda" </Value>
+	<Value> "Strawberry Syrup, Lychee Syrup &Soda" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -842,39 +842,39 @@ STRAW CHEE SODA" </Value>
 </Block>
 	; - - - 
 	; ==================> Len = 12
-	; - 12-99-05-0059 - 
+	; - 12-99-05-0073 - 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-99-05-0059.Button,$Sum1299050059) </State> 
+	<State> Flag( 12-99-05-0073.Button,$Sum1299050073) </State> 
 	<Button>
-	<State> $Sum1299050059 </State> 
+	<State> $Sum1299050073 </State> 
 	<Filename> "ROOT/taobin_project/image/page_drink_n//bn_iced_pepsi_Lychee_Lime_robinson_beauty.png" </Filename>
 	<FilenamePress> "ROOT/taobin_project/image/page_drink_press_n//bn_iced_pepsi_Lychee_Lime_robinson_beauty.png" </FilenamePress>
 	<FilenameDisable> "ROOT/taobin_project/image/page_drink_disable_n2//bn_iced_pepsi_Lychee_Lime_robinson_beauty.png" </FilenameDisable>
-	<OverlayImage> xmlpro( 12-99-05-0059, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
+	<OverlayImage> xmlpro( 12-99-05-0073, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_%s_posi1.png") </OverlayImage>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
 		Var NameDrink = "ICED ARTY PEP LYCHEE SODA"
 		Var NameDrinkTH = "อาร์ตี้เป๊ปลิ้นจี่โซดา"
-		Var DrinkDescriptionTH = "Lychee + Pepsi + Lime"
-		Var DrinkDescription = "Lychee + Pepsi + Lime"
+		Var DrinkDescriptionTH = "น้ำเชื่ื่อมลิ้นจี่ เป๊ปซี่ ผงมะนาว และโซดา"
+		Var DrinkDescription = "Lychee Syrup, Pepsi , Lime &Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_pepsi_Lychee_Lime_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
 		Var PriceD1 = $-.Price
-		Var PriceD2 = $12-99-05-0059.Price
+		Var PriceD2 = $12-99-05-0073.Price
 		Var PriceD3 = $-.Price
 		Var PD_CODE1 = "##-##-##-####"
-		Var PD_CODE2 = "12-99-05-0059"
+		Var PD_CODE2 = "12-99-05-0073"
 		Var PD_CODE3 = "##-##-##-####"
 		Var PD_STAGE_1 = "Disable2"
-		Var PD_STAGE_2 = $12-99-05-0059.Button
+		Var PD_STAGE_2 = $12-99-05-0073.Button
 		Var PD_STAGE_3 = "Disable2"
-		Var OverlayMenuFilter !assigned xmlpro( 12-99-05-0059, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
+		Var OverlayMenuFilter !assigned xmlpro( 12-99-05-0073, "ROOT/taobin_project/image/menu_overlay_set/button_overlay_pic_%s_posi1.png")
 		DEBUGVAR OverlayMenuFilter
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
@ -891,7 +891,7 @@ STRAW CHEE SODA" </Value>
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-99-05-0059"
+			Topping "Load" "12-99-05-0073"
 		Else
 			If PD_STAGE_1 = "Enable" Then
 			Topping "Load" "-"
@ -904,10 +904,10 @@ STRAW CHEE SODA" </Value>
 		Var menu_name_thai_hot = $##-##-##-####.Name
 		Var menu_desc_thai_hot = $##-##-##-####.description
 		
-		Var menu_name_eng_cold = $12-99-05-0059.NameE
-		Var menu_desc_eng_cold = $12-99-05-0059.descriptionE
-		Var menu_name_thai_cold = $12-99-05-0059.Name
-		Var menu_desc_thai_cold = $12-99-05-0059.description
+		Var menu_name_eng_cold = $12-99-05-0073.NameE
+		Var menu_desc_eng_cold = $12-99-05-0073.descriptionE
+		Var menu_name_thai_cold = $12-99-05-0073.Name
+		Var menu_desc_thai_cold = $12-99-05-0073.description
 		
 		Var menu_name_eng_blender = $##-##-##-####.NameE
 		Var menu_desc_eng_blender = $##-##-##-####.descriptionE
@ -944,7 +944,7 @@ STRAW CHEE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Lychee + Pepsi + Lime" </Value>
+	<Value> "น้ำเชื่ื่อมลิ้นจี่ เป๊ปซี่ ผงมะนาว และโซดา" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -966,7 +966,7 @@ LYCHEE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Lychee + Pepsi + Lime" </Value>
+	<Value> "Lychee Syrup, Pepsi , Lime &Soda" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -996,7 +996,7 @@ LYCHEE SODA" </Value>
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> $12-99-05-0059.Button </State>
+	<State> $12-99-05-0073.Button </State>
 	</Image>
 	<Text>
 	<X> 115 </X>
@ -1006,8 +1006,8 @@ LYCHEE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-99-05-0059.Button </State>
-	<Value> Var( "฿" + $12-99-05-0059.Price ) </Value>
+	<State> $12-99-05-0073.Button </State>
+	<Value> Var( "฿" + $12-99-05-0073.Price ) </Value>
 	</Text>
 	<Image>
 	<X> 146 </X>
@ -1050,9 +1050,9 @@ LYCHEE SODA" </Value>
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum1299050059 = "Disable" Then
+			If $Sum1299050073 = "Disable" Then
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-99-05-0059.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-99-05-0073.TAG tag2_is_disable
 				STRCONTAIN "ERR" $##-##-##-####.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
@ -1089,7 +1089,7 @@ LYCHEE SODA" </Value>
 	<Font> MITRegularTTF </Font>
 	<Color> 0x5A5A5A </Color>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum1299050059 </State> 
+	<State> $Sum1299050073 </State> 
 	<Value> text_unavailable </Value>
 	<Align> center-vertical-horizontal </Align>
 	</Text>
@ -1114,8 +1114,8 @@ LYCHEE SODA" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED SIVANNA STRAW CHEE TEA"
 		Var NameDrinkTH = "ซีเวนน่าสตรอว์ ชี่ชาไทย"
-		Var DrinkDescriptionTH = "Straw + lychee + Thai tea"
-		Var DrinkDescription = "Straw + lychee + Thai tea"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และชาไทย"
+		Var DrinkDescription = "Strawberry Syrup, Lychee Syrup, Thai Tea"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Straw_Lychee_Thaitea_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
@ -1199,7 +1199,7 @@ LYCHEE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Straw + lychee + Thai tea" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และชาไทย" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1221,7 +1221,7 @@ STRAW CHEE TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Straw + lychee + Thai tea" </Value>
+	<Value> "Strawberry Syrup, Lychee Syrup, Thai Tea" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -1369,8 +1369,8 @@ STRAW CHEE TEA" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED ESTEE LYCHEE STRAW CANO"
 		Var NameDrinkTH = "เอสเต้ดับเบิ้ลลิ้นจี่ สตอว์กาโน่"
-		Var DrinkDescriptionTH = "Lychee + Straw + Americano"
-		Var DrinkDescription = "Lychee + Straw + Americano"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และกาแฟ"
+		Var DrinkDescription = "Strawberry Syrup, Lychee Syrup, Espresso"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Straw_Lychee_Americano_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
@ -1454,7 +1454,7 @@ STRAW CHEE TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Lychee + Straw + Americano" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และกาแฟ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1476,7 +1476,7 @@ STRAW CANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Lychee + Straw + Americano" </Value>
+	<Value> "Strawberry Syrup, Lychee Syrup, Espresso" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -1622,8 +1622,8 @@ STRAW CANO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED ESTEE LYCHEE STRAW CANO"
 		Var NameDrinkTH = "เอสเต้ดับเบิ้ลลิ้นจี่ สตอว์กาโน่"
-		Var DrinkDescriptionTH = "Lychee + Straw + Americano"
-		Var DrinkDescription = "Lychee + Straw + Americano"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และกาแฟ"
+		Var DrinkDescription = "Strawberry Syrup, Lychee Syrup, Espresso"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Straw_Lychee_Americano_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
@ -1707,7 +1707,7 @@ STRAW CANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Lychee + Straw + Americano" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และกาแฟ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1729,7 +1729,7 @@ STRAW CANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Lychee + Straw + Americano" </Value>
+	<Value> "Strawberry Syrup, Lychee Syrup, Espresso" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -1874,10 +1874,10 @@ STRAW CANO" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "ICED CLARINS PLUM CARA MILK"
+		Var NameDrink = "CLARINS PLUM CARA MILK SMOOTHIE"
 		Var NameDrinkTH = "คลาแรงส์พลัม คารามิลล์"
-		Var DrinkDescriptionTH = "Plum + Caramel + Milk"
-		Var DrinkDescription = "Plum + Caramel + Milk"
+		Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย น้ำเชื่อมคาราเมล นมและน้ำแข็ง"
+		Var DrinkDescription = "Ume Syrup, Caramel Syrup, Milk ,Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Caramel_Plum_Milk_caramel_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
@ -1961,7 +1961,7 @@ STRAW CANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Plum + Caramel + Milk" </Value>
+	<Value> "น้ำเชื่อมบ๊วย น้ำเชื่อมคาราเมล นมและน้ำแข็ง" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1972,8 +1972,8 @@ STRAW CANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "ICED CLARINS
-PLUM CARA MILK" </Value>
+	<Value> "CLARINS
+PLUM CARA MILK SMOOTHIE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1983,7 +1983,7 @@ PLUM CARA MILK" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Plum + Caramel + Milk" </Value>
+	<Value> "Ume Syrup, Caramel Syrup, Milk ,Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -2131,8 +2131,8 @@ PLUM CARA MILK" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED CALVIN KLEIN COCOA CHEE"
 		Var NameDrinkTH = "คลาวิน ไคลน์ โกโก้ชี่"
-		Var DrinkDescriptionTH = "Cocoa + Lychee + Milk"
-		Var DrinkDescription = "Cocoa + Lychee + Milk"
+		Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ โกโก้  และนม "
+		Var DrinkDescription = "Lychee Syrup, Cocoa , Milk "
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_Cocoa_Lychee_Milk_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
@ -2215,7 +2215,7 @@ PLUM CARA MILK" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Cocoa + Lychee + Milk" </Value>
+	<Value> "น้ำเชื่อมลิ้นจี่ โกโก้  และนม " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2237,7 +2237,7 @@ KLEIN COCOA CHEE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Cocoa + Lychee + Milk" </Value>
+	<Value> "Lychee Syrup, Cocoa , Milk " </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -2385,8 +2385,8 @@ KLEIN COCOA CHEE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED RO STRAW MATCHA"
 		Var NameDrinkTH = "โรสตรอว์มัทฉะ"
-		Var DrinkDescriptionTH = "Straw + Matcha + Milk"
-		Var DrinkDescription = "Straw + Matcha + Milk"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ ชาเขียว และนม "
+		Var DrinkDescription = "Strawberry Syrup , Matcha, Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_Straw_Matcha_milk_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
@ -2469,7 +2469,7 @@ KLEIN COCOA CHEE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Straw + Matcha + Milk" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ ชาเขียว และนม " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2491,7 +2491,7 @@ MATCHA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Straw + Matcha + Milk" </Value>
+	<Value> "Strawberry Syrup , Matcha, Milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -2639,8 +2639,8 @@ MATCHA" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED BIN STRAW CAFE LATTE"
 		Var NameDrinkTH = "บินสตรอว์คาเฟ่ลาเต้"
-		Var DrinkDescriptionTH = "Cafe latte + Straw"
-		Var DrinkDescription = "Cafe latte + Straw"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ กาแฟและนม "
+		Var DrinkDescription = "Strawberry Syrup , Espresso, Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_LATTE_Straw_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
@ -2723,7 +2723,7 @@ MATCHA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Cafe latte + Straw" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ กาแฟและนม " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2745,7 +2745,7 @@ CAFE LATTE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Cafe latte + Straw" </Value>
+	<Value> "Strawberry Syrup , Espresso, Milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -2891,8 +2891,8 @@ CAFE LATTE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED BIN STRAW CAFE LATTE"
 		Var NameDrinkTH = "บินสตรอว์คาเฟ่ลาเต้"
-		Var DrinkDescriptionTH = "Cafe latte + Straw"
-		Var DrinkDescription = "Cafe latte + Straw"
+		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ กาแฟและนม "
+		Var DrinkDescription = "Strawberry Syrup , Espresso, Milk"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_hot_LATTE_Straw_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
@ -2975,7 +2975,7 @@ CAFE LATTE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Cafe latte + Straw" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ กาแฟและนม " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2997,7 +2997,7 @@ CAFE LATTE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Cafe latte + Straw" </Value>
+	<Value> "Strawberry Syrup , Espresso, Milk" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -3142,10 +3142,10 @@ CAFE LATTE" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "ICED SON JAS CHEE TEA"
+		Var NameDrink = "SON JAS CHEE TEA SMOOTHIE"
 		Var NameDrinkTH = "สันจัสชี่"
-		Var DrinkDescriptionTH = "Jasmine tea + Lychee"
-		Var DrinkDescription = "Jasmine tea + Lychee"
+		Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ ชามะลิ  และน้ำ"
+		Var DrinkDescription = "Lychee Syrup, Jasmine Tea, Water"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_HOT_JASMINE_Lychee_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
@ -3228,7 +3228,7 @@ CAFE LATTE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Jasmine tea + Lychee" </Value>
+	<Value> "น้ำเชื่อมลิ้นจี่ ชามะลิ  และน้ำ" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3239,8 +3239,8 @@ CAFE LATTE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "ICED SON JAS
-CHEE TEA" </Value>
+	<Value> "SON JAS
+CHEE TEA SMOOTHIE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3250,7 +3250,7 @@ CHEE TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "Jasmine tea + Lychee" </Value>
+	<Value> "Lychee Syrup, Jasmine Tea, Water" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
@ -3398,8 +3398,8 @@ CHEE TEA" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ROBINSON UP CHEE SMOOTHIE"
 		Var NameDrinkTH = "โรบินสันอัพชี่"
-		Var DrinkDescriptionTH = "เซเว่น อัพ ลิ้นจี่ มะนาว โซดา "
-		Var DrinkDescription = "7Up Lychee Lime Soda"
+		Var DrinkDescriptionTH = "7up น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา "
+		Var DrinkDescription = "7Up, Lychee Syrup, Lime &Soda"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_iced_7UP_Lychee_SODA_robinson_beauty.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		GetInstanceIDMenuTab OpenFromInstMenuTab
@ -3482,7 +3482,7 @@ CHEE TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "เซเว่น อัพ ลิ้นจี่ มะนาว โซดา " </Value>
+	<Value> "7up น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -3503,7 +3503,7 @@ CHEE TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showengText </State>
-	<Value> "7Up Lychee Lime Soda" </Value>
+	<Value> "7Up, Lychee Syrup, Lime &Soda" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@ -1257,7 +1257,7 @@
 	Var CountDownPauseVideo2 = 2
 	DEBUGVAR CountDownPauseVideo2
 	Var TimeProfilePrice = 0
-	Var XMLProfilePrevious = XMLProfile
+	

 </EventOpen>

@ -1385,7 +1385,7 @@
 </EventUnitTest7>

 <EventUnitTest8>
-	Var XMLProfile = "Discount50"
+	Var XMLProfile = "PromoReduced"
 	Var TimeProfilePrice = 0
 	
 </EventUnitTest8>
@ -1705,6 +1705,9 @@
 	If XMLProfilePrevious = XMLProfile Then
 		
 	Else
+		DEBUGVAR XMLProfile
+		DEBUGVAR XMLProfilePrevious
+		
 		If TimeProfilePrice = 5 Then
 			PRICE "Reset" "-"
 			PRICE "Load" "-"
@ -1723,7 +1726,10 @@
 			DEBUGVAR ProfileIndex[10]

 			PRICE "Reload" "-"
+
+			Var XMLProfilePrevious = XMLProfile
 		EndIf
+		
 	EndIf
 	
 	Refresh
--- a/xml/page_catalog_group_pro_robinson_beauty.xml
+++ b/xml/page_catalog_group_pro_robinson_beauty.xml
@ -53,7 +53,7 @@
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "ICED REVLON STRAW CHEE SODA"
+		Var NameDrink = "REVLON STRAW CHEE SODA SMOOTHIE"
 		Var NameDrinkTH = "เรฟลอนสตรอว์ชี่ โซดา"
 		Var DrinkDescriptionTH = "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และโซดา"
 		Var DrinkDescription = "Strawberry Syrup, Lychee Syrup &Soda"
@ -150,8 +150,8 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "ICED REVLON
-STRAW CHEE SODA" </Value>
+	<Value> "REVLON
+STRAW CHEE SODA SMOOTHIE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -1319,7 +1319,7 @@ STRAW CANO" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "ICED CLARINS PLUM CARA MILK"
+		Var NameDrink = "CLARINS PLUM CARA MILK SMOOTHIE"
 		Var NameDrinkTH = "คลาแรงส์พลัม คารามิลล์"
 		Var DrinkDescriptionTH = "น้ำเชื่อมบ๊วย น้ำเชื่อมคาราเมล นมและน้ำแข็ง"
 		Var DrinkDescription = "Ume Syrup, Caramel Syrup, Milk ,Ice"
@ -1416,8 +1416,8 @@ STRAW CANO" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "ICED CLARINS
-PLUM CARA MILK" </Value>
+	<Value> "CLARINS
+PLUM CARA MILK SMOOTHIE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@ -2582,7 +2582,7 @@ CAFE LATTE" </Value>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var NameDrink = "ICED SON JAS CHEE TEA"
+		Var NameDrink = "SON JAS CHEE TEA SMOOTHIE"
 		Var NameDrinkTH = "สันจัสชี่"
 		Var DrinkDescriptionTH = "น้ำเชื่อมลิ้นจี่ ชามะลิ  และน้ำ"
 		Var DrinkDescription = "Lychee Syrup, Jasmine Tea, Water"
@ -2678,8 +2678,8 @@ CAFE LATTE" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x322B26 </Color>
 	<State> showengText </State>
-	<Value> "ICED SON JAS
-CHEE TEA" </Value>
+	<Value> "SON JAS
+CHEE TEA SMOOTHIE" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>