Merge branch 'masterpiece' of ssh://192.168.10.159:/1TBHDD/ikong/taobin_project into sgp_blue

xml/event/collect_promotion_point_condition.ev

@@ -0,0 +1,11 @@
+If RobinsonBeautyPro = 1 Then
+    If Seeker.VendingCode = "MKF" Then
+        Var Seeker.CollectPointPromotion = 1
+    EndIf
+EndIf
+
+If JemilaPro = 1 Then
+    If Seeker.VendingCode = "MKF" Then
+        Var Seeker.CollectPointPromotion = 1
+    EndIf
+EndIf

xml/event/robinson_beauty/page_robinson_beauty_random_result.xml

@@ -24,10 +24,10 @@
         If CodeType = "138" Then
             Var RewardText = DirImage + "/reward_lip_tint_oil_name.png"
             Var RewardImage = DirImage + "/reward_lip_tint_oil.png"
-            Var RewardText_X = 18
-            Var RewardText_Y = 923
-            Var RewardImage_X = 169
-            Var RewardImage_Y = 578
+            Var RewardText_X = 169
+            Var RewardText_Y = 578
+            Var RewardImage_X = 18
+            Var RewardImage_Y = 923
         EndIf
 
         If CodeType = "139" Then

xml/event/tricker.ev

@@ -234,6 +234,13 @@ If BoxID = 172232 Then
 	Var JemilaPro = 1
 EndIf
 
+If BoxID = 172053 Then
+	Var MomCocoaPro = 0
+	Var MomCocoaProDiscountEnable = 0
+	Var RobinsonBeautyPro = 0
+	Var JemilaPro = 1
+EndIf
+
 Var XMLLiveInfoEnable = 1
 
 

xml/menutab/page_catalog_group_pro_jemila.skt

@@ -0,0 +1,45 @@
+<?hurr 
+    #include=menu_head.py 
+?>
+
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+;<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+	; On open
+	<?hurr
+        #include=menu_catalog_default_init.py
+    ?>
+    
+
+
+    Var Timeout = 0
+
+
+    <?hurr 
+        #include=menu_catalog_new_menu.py
+    ?>
+
+</EventOpen>
+
+
+<?hurr 
+    #include=menu_catalog_new.py
+?>
+
+
+
+
+<?hurr 
+    #include=menu_new_layout_gen_v2.py
+?>
+<?hurr 
+    #include=menu_new_layout_gen.py
+?>
+
+
+
+</Popup>

xml/page_NewBrewing3.xml

@@ -297,7 +297,7 @@
 
 	If bg_lidProblem_ST = "Enable" Then
 		Var EnableTopupCreditBetweenBrew = "Invisible"
-		Var EnableGetMore
+		Var GetLidButtonState = "Invisible"
 	EndIf
 
 	If bg_strawProblem_ST = "Enable" Then
@@ -819,6 +819,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""
 
+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
 			Var PayDetail = ""
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
@@ -855,6 +857,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""
 
+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
 			Var PayDetail = ""
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID

xml/page_NewBrewing3Conti.xml

@@ -370,6 +370,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""
 
+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
 			Var PayDetail = ""
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
@@ -406,6 +408,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""
 
+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
 			Var PayDetail = ""
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID

xml/page_NewCannotConti.xml

@@ -359,6 +359,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""
 
+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
 			Var PayDetail = ""
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID
@@ -393,6 +395,8 @@
 			Var SuggestID  = ""
 			Var SessionID2 = ""
 
+			Var VendingDiscount = 0
+			Var VendingCampaign = 0
 			Var PayDetail = ""
 			Var PayDetail2 = ""
 			Var VendingOrderID = Seeker.ORDER_ID

xml/page_board.xml

@@ -1349,23 +1349,8 @@
 </EventUnitTest3>
 
 <EventUnitTest4>
-	Var XMLProfile = "School-Tier3"
-	PRICE "Reset" "-"
-	PRICE "Load" "-"
-	PRICE "CheckAndApply" XMLProfile
+	Var XMLProfile = "ProfileIncrease15"
 
-	DEBUGVAR ProfileIndex[0]
-	DEBUGVAR ProfileIndex[1]
-	DEBUGVAR ProfileIndex[2]
-	DEBUGVAR ProfileIndex[3]
-	DEBUGVAR ProfileIndex[4]
-	DEBUGVAR ProfileIndex[5]
-	DEBUGVAR ProfileIndex[6]
-	DEBUGVAR ProfileIndex[7]
-	DEBUGVAR ProfileIndex[8]
-	DEBUGVAR ProfileIndex[9]
-	DEBUGVAR ProfileIndex[10]
-	PRICE "Reload" ""
 </EventUnitTest4>
 
 <EventUnitTest5>

xml/page_brewing3.xml

@@ -394,7 +394,7 @@
 
 	If bg_lidProblem_ST = "Enable" Then
 		Var EnableTopupCreditBetweenBrew = "Invisible"
-		Var EnableGetMore
+		Var GetLidButtonState = "Invisible"
 	EndIf
 
 	If bg_strawProblem_ST = "Enable" Then

xml/page_catalog_group_pro_robinson_beauty.xml

@@ -55,8 +55,8 @@
 	<EventOnClick> 
 		Var NameDrink = "ICED REVLON STRAW CHEE SODA"
 		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
 		Var PriceD1 = $-.Price
@@ -139,7 +139,7 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Straw + Lychee + Soda" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ น้ำเชื่อมลิ้นจี่ และโซดา" </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -161,7 +161,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>
@@ -291,38 +291,38 @@ 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
 		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
@@ -339,7 +339,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" "-"
@@ -352,10 +352,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
@@ -392,7 +392,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>
@@ -414,7 +414,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>
@@ -444,7 +444,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>
@@ -454,8 +454,8 @@ LYCHEE SODA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-99-05-0059.Button </State>
-	<Value> StringFmt( $12-99-05-0059.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $12-99-05-0073.Button </State>
+	<Value> StringFmt( $12-99-05-0073.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 146 </X>
@@ -498,9 +498,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
@@ -537,7 +537,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>
@@ -562,8 +562,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
 		Var PriceD1 = $-.Price
@@ -646,7 +646,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>
@@ -668,7 +668,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>
@@ -816,8 +816,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
 		Var PriceD1 = $-.Price
@@ -900,7 +900,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>
@@ -922,7 +922,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>
@@ -1068,8 +1068,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
 		Var PriceD1 = $-.Price
@@ -1152,7 +1152,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>
@@ -1174,7 +1174,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>
@@ -1321,8 +1321,8 @@ STRAW CANO" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED CLARINS PLUM CARA MILK"
 		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
 		Var PriceD1 = $-.Price
@@ -1405,7 +1405,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>
@@ -1427,7 +1427,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>
@@ -1575,8 +1575,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
 		Var PriceD1 = $-.Price
@@ -1658,7 +1658,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>
@@ -1680,7 +1680,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>
@@ -1828,8 +1828,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
 		Var PriceD1 = $-.Price
@@ -1911,7 +1911,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>
@@ -1933,7 +1933,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>
@@ -2081,8 +2081,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
 		Var PriceD1 = $-.Price
@@ -2164,7 +2164,7 @@ MATCHA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "Cafe latte + Straw" </Value>
+	<Value> "น้ำเชื่อมสตรอเบอร์รี่ กาแฟและนม " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2186,7 +2186,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>
@@ -2332,8 +2332,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
 		Var PriceD1 = $-.Price
@@ -2415,7 +2415,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>
@@ -2437,7 +2437,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>
@@ -2584,8 +2584,8 @@ CAFE LATTE" </Value>
 	<EventOnClick> 
 		Var NameDrink = "ICED SON JAS CHEE TEA"
 		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
 		Var PriceD1 = $-.Price
@@ -2667,7 +2667,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>
@@ -2689,7 +2689,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>
@@ -2837,8 +2837,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
 		Var PriceD1 = $-.Price
@@ -2920,7 +2920,7 @@ CHEE TEA" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<State> showthaiText </State>
-	<Value> "เซเว่น อัพ ลิ้นจี่ มะนาว โซดา " </Value>
+	<Value> "7up น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา " </Value>
 	</Text>
 	<Text>
 	<X> 16 </X>
@@ -2941,7 +2941,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>

xml/page_payment_cash.xml

@@ -2897,27 +2897,6 @@
 <Filename> Var( DirImage + "/img_popup4.png" )</Filename>
 </Image>
 
-<Image>
-<X> 838 </X>
-<Y> 1350 </Y>
-<State> eval(  
-	 Var return = "Invisible"
-
-	 If AdultState1 = "Enable" Then
-	 	If AdultState2 = "Invisible" Then
-	 		Var return = "Enable"
-	 	EndIf
- 	EndIf
- 	DEBUGVAR return
-	)  
-</State>
-<Animation>
-	<Style> "Bounce" </Style>
-	<OnEvent> "TimerSec=3" </OnEvent>
-</Animation>
-<Filename> "ROOT/taobin_project/image/anmi/arrow_1.png" </Filename>
-</Image>
-
 <Button>
 <X> 360 </X>
 <Y> 1373 </Y>

xml/page_payment_code.xml

@@ -237,6 +237,8 @@
 						EndIf
 					EndIf
 
+					TRY "ROOT/taobin_project/xml/event/collect_promotion_point_condition.ev"
+
 
 					;Open "ROOT/taobin_project/xml/page_payment_cash.xml" 
 					Var Seeker.VendingCampaign = PayAmount

xml/topview2.xml

@@ -85,9 +85,12 @@
 		EndIf
 
 	EndIf
+	If CountryRootPath = "" Then
 
-	Var exhaust_fan_schedule = CountryRootPath + "/hardware/exhaust_fan_schedule.ev"
-
+		Var exhaust_fan_schedule = "ROOT/taobin_project/inter/tha/hardware/exhaust_fan_schedule.ev"
+	Else
+		Var exhaust_fan_schedule = CountryRootPath + "/hardware/exhaust_fan_schedule.ev"
+	EndIf
 	TRY exhaust_fan_schedule
 </EventOpen>
 <Timeout> 1000 </Timeout>