diff --git a/inter/mys/xml/event/tricker.ev b/inter/mys/xml/event/tricker.ev
index 347e342f..1cadc2d0 100644
--- a/inter/mys/xml/event/tricker.ev
+++ b/inter/mys/xml/event/tricker.ev
@@ -14,9 +14,9 @@ Var FromFruityRaya = 0
 Var DisableUntilServerPartOK = 1
 
 
-If DisableUntilServerPartOK = 1 Then
+If DisableUntilServerPartOK = 0 Then
 	If SystemDateMonthInt = 3 Then
-		If SystemDateDayInt >= 25 Then
+		If SystemDateDayInt >= 29 Then
 			Var FruityRayaEnable = 1
 		EndIf
 	EndIf
@@ -29,4 +29,9 @@ EndIf
 
 If BoxID = 177746 Then
 	Var FruityRayaEnable = 1
+EndIf
+
+If BoxID = 200002 Then
+	Var FruityRayaEnable = 1
+	DEBUGVAR BoxID
 EndIf
\ No newline at end of file
diff --git a/inter/mys/xml/page_catalog_group_fruity_raya.lxml b/inter/mys/xml/page_catalog_group_fruity_raya.lxml
index 17382adb..445ac9e3 100644
--- a/inter/mys/xml/page_catalog_group_fruity_raya.lxml
+++ b/inter/mys/xml/page_catalog_group_fruity_raya.lxml
@@ -230,7 +230,7 @@
         Var DirImage2 = "ROOT/taobin_project/image/drink_option/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2/"
     EndIf
-	;inter-image
+    ;inter-image
    If CountryName = "Malaysia" Then
         Var DirImage2 = "ROOT/taobin_project/image/drink_option_myr/"
         Var DirImageAlter = "ROOT/taobin_project/image/page3_2_en/"
@@ -319,7 +319,7 @@
             ;Open "ROOT/taobin_project/xml/page_catalog_group_recommend.lxml" 
 
             Var OpenFileXML = CountryRootPath + "xml/event/script_common_for_open_promotion_xml.ev"
-			;inter-xml-open
+            ;inter-xml-open
             If CountryName = "Malaysia" Then 
                 ; zone promote
                 TRY OpenFileXML
@@ -1153,29 +1153,29 @@
 	</Text>
 </Block>
 	; ==================> Len = 3
-	; 12-02-01-0007 12-02-02-0007 12-02-03-0007 
+	; 12-02-01-0040 12-02-02-0040 12-02-03-0040 
 <Block>
 	<MarginLeft> 33 </MarginLeft>
 	<MarginTop> 22 </MarginTop>
 	<Width> 225 </Width>
 	<Height> 296 </Height>
-	<State> Flag( 12-02-01-0007.Button,12-02-02-0007.Button,12-02-03-0007.Button,$Sum120201000712020200071202030007) </State> 
+	<State> Flag( 12-02-01-0040.Button,12-02-02-0040.Button,12-02-03-0040.Button,$Sum120201004012020200401202030040) </State> 
 	<Button>
-	<State> $Sum120201000712020200071202030007 </State> 
-	<Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//bn_hot_lime_tea.png" </Filename>
-	<FilenamePress> "ROOT/taobin_project/inter/mys/image/page_drink_press_n//bn_hot_lime_tea.png" </FilenamePress>
-	<FilenameDisable> "ROOT/taobin_project/inter/mys/image/page_drink_disable_n2//bn_hot_lime_tea.png" </FilenameDisable>
+	<State> $Sum120201004012020200401202030040 </State> 
+	<Filename> "ROOT/taobin_project/inter/mys/image/page_drink_n//bn_limeblack_tea_SingPark.png" </Filename>
+	<FilenamePress> "ROOT/taobin_project/inter/mys/image/page_drink_press_n//bn_limeblack_tea_SingPark.png" </FilenamePress>
+	<FilenameDisable> "ROOT/taobin_project/inter/mys/image/page_drink_disable_n2//bn_limeblack_tea_SingPark.png" </FilenameDisable>
 	<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 	<Volume> SoundVolume </Volume>
 	<EventOnClick> 
-		Var PictureDrink = "ROOT/taobin_project/inter/mys/image/page_drink_picture2_n/" + "bn_hot_lime_tea.png"
+		Var PictureDrink = "ROOT/taobin_project/inter/mys/image/page_drink_picture2_n/" + "bn_limeblack_tea_SingPark.png"
 		Var OpenFromXML = CurrentXMLFileName2
-		Var PriceD1 = $12-02-01-0007.Price
-		Var PriceD2 = $12-02-02-0007.Price
-		Var PriceD3 = $12-02-03-0007.Price
-		Var PD_CODE1 = "12-02-01-0007"
-		Var PD_CODE2 = "12-02-02-0007"
-		Var PD_CODE3 = "12-02-03-0007"
+		Var PriceD1 = $12-02-01-0040.Price
+		Var PriceD2 = $12-02-02-0040.Price
+		Var PriceD3 = $12-02-03-0040.Price
+		Var PD_CODE1 = "12-02-01-0040"
+		Var PD_CODE2 = "12-02-02-0040"
+		Var PD_CODE3 = "12-02-03-0040"
 		; begin lang 
 		Var aliasName[0] = "LIME TEA"
 		Var aliasDesc[0] = "Thai Tea, Limenade, Sugar & Water"
@@ -1192,7 +1192,7 @@
 		Var NameLang[0][2] = "-"
 		Var NameLang[0][3] = "-"
 		Var NameLang[0][4] = "TEH LIMAU PANAS"
-		Var DescLang[0][0] = "Thai Tea, Limenade, Sugar and Hot water"
+		Var DescLang[0][0] = "Thai Tea, Limenade, Sugar & Water"
 		Var DescLang[0][1] = "ชาไทย มะนาว"
 		Var DescLang[0][2] = "-"
 		Var DescLang[0][3] = "-"
@@ -1202,25 +1202,25 @@
 		Var NameLang[1][2] = "-"
 		Var NameLang[1][3] = "-"
 		Var NameLang[1][4] = "TEH LIMAU AIS"
-		Var DescLang[1][0] = "Tea, Limenade, Sugar,  Water, Ice"
-		Var DescLang[1][1] = "ชาไทย มะนาว และน้ำแข็ง"
+		Var DescLang[1][0] = "Thai Tea, Limenade, Sugar & Water"
+		Var DescLang[1][1] = "ชาไทย มะนาว"
 		Var DescLang[1][2] = "-"
 		Var DescLang[1][3] = "-"
-		Var DescLang[1][4] = "Teh, Limau, Gula, Air, Ais"
-		Var NameLang[2][0] = "LIME TEA  SMOOTHIE"
+		Var DescLang[1][4] = "Teh Thai, Limau, Gula, Air"
+		Var NameLang[2][0] = "LIME TEA SMOOTHIE"
 		Var NameLang[2][1] = "ชามะนาวปั่น"
 		Var NameLang[2][2] = "-"
 		Var NameLang[2][3] = "-"
 		Var NameLang[2][4] = "SMOOTHIE TEH LIMAU"
-		Var DescLang[2][0] = "Tea, Limenade, Sugar,  Water, Ice"
-		Var DescLang[2][1] = "ชาไทย มะนาว และน้ำแข็ง"
+		Var DescLang[2][0] = "Thai Tea, Limenade, Sugar & Water"
+		Var DescLang[2][1] = "ชาไทย มะนาว"
 		Var DescLang[2][2] = "-"
 		Var DescLang[2][3] = "-"
-		Var DescLang[2][4] = "Teh Thai, Limau, Gula, Air, Ais"
+		Var DescLang[2][4] = "Teh Thai, Limau, Gula, Air"
 		; end lang 
-		Var PD_STAGE_1 = $12-02-01-0007.Button
-		Var PD_STAGE_2 = $12-02-02-0007.Button
-		Var PD_STAGE_3 = $12-02-03-0007.Button
+		Var PD_STAGE_1 = $12-02-01-0040.Button
+		Var PD_STAGE_2 = $12-02-02-0040.Button
+		Var PD_STAGE_3 = $12-02-03-0040.Button
 		Var SelectCountDrinkType = 0
 		Var DefaultDrinkType = 0
 		If PD_STAGE_1 = "Enable" Then
@@ -1236,12 +1236,12 @@
 			Var DefaultDrinkType = 3
 		EndIf
 		If PD_STAGE_2 = "Enable" Then
-			Topping "Load" "12-02-02-0007"
+			Topping "Load" "12-02-02-0040"
 		Else
 			If PD_STAGE_1 = "Enable" Then
-			Topping "Load" "12-02-01-0007"
+			Topping "Load" "12-02-01-0040"
 			Else
-			Topping "Load" "12-02-03-0007"
+			Topping "Load" "12-02-03-0040"
 			EndIf
 		EndIf
 		
@@ -1297,7 +1297,7 @@
 	<Image>
 	<X> 16 </X>
 	<Y> 264 </Y>
-	<State> $12-02-01-0007.Button </State>
+	<State> $12-02-01-0040.Button </State>
 	<Filename> Var( DirImage2 + "hot.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "hot_db.png" ) </FilenameDisable>
 	</Image>
@@ -1309,15 +1309,15 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-02-01-0007.Button </State>
-	<Value> StringFmt(  $12-02-01-0007.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $12-02-01-0040.Button </State>
+	<Value> StringFmt(  $12-02-01-0040.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "cold.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "cold_db.png" ) </FilenameDisable>
-	<State> $12-02-02-0007.Button </State>
+	<State> $12-02-02-0040.Button </State>
 	</Image>
 	<Text>
 	<X> 113 </X>
@@ -1327,15 +1327,15 @@
 	<Font> KanitMediumTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-02-02-0007.Button </State>
-	<Value> StringFmt( $12-02-02-0007.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $12-02-02-0040.Button </State>
+	<Value> StringFmt( $12-02-02-0040.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 146 </X>
 	<Y> 264 </Y>
 	<Filename> Var( DirImage2 + "blend.png" ) </Filename>
 	<FilenameDisable> Var( DirImage2 + "blend_db.png" ) </FilenameDisable>
-	<State> $12-02-03-0007.Button </State>
+	<State> $12-02-03-0040.Button </State>
 	</Image>
 	<Text>
 	<X> TextPriceMenuBlendX </X>
@@ -1345,8 +1345,8 @@
 	<Font> KanitRegularTTF </Font>
 	<Color> 0x6F5F51 </Color>
 	<ColorDisable> 0xEAE6E1 </ColorDisable>
-	<State> $12-02-03-0007.Button </State>
-	<Value> StringFmt(  $12-02-03-0007.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
+	<State> $12-02-03-0040.Button </State>
+	<Value> StringFmt(  $12-02-03-0040.Price , DisplayFormat, PreScaleConvertShow) </Value>; test
 	</Text>
 	<Image>
 	<X> 81 </X>
@@ -1355,7 +1355,7 @@
 		eval( 
 		If ICE_PROCESS_STATUS = 2 Then
 		
-			If $Sum120201000712020200071202030007 = "Disable" Then
+			If $Sum120201004012020200401202030040 = "Disable" Then
 				Var ice_tab_process_show = "Disable"
 			Else
 				Var ice_tab_process_show = "Enable"
@@ -1375,10 +1375,10 @@
 	<Y> 117 </Y>
 	<State> 
 		eval( 
-			If $Sum120201000712020200071202030007 = "Disable" Then
-				STRCONTAIN "ERR" $12-02-01-0007.TAG tag1_is_disable
-				STRCONTAIN "ERR" $12-02-02-0007.TAG tag2_is_disable
-				STRCONTAIN "ERR" $12-02-03-0007.TAG tag3_is_disable
+			If $Sum120201004012020200401202030040 = "Disable" Then
+				STRCONTAIN "ERR" $12-02-01-0040.TAG tag1_is_disable
+				STRCONTAIN "ERR" $12-02-02-0040.TAG tag2_is_disable
+				STRCONTAIN "ERR" $12-02-03-0040.TAG tag3_is_disable
 				Var return = "Invisible"
 				If tag1_is_disable = "true" Then
 					Var return = "Enable"
@@ -1412,7 +1412,7 @@
 	<Width>128</Width>
 	<Height>64</Height>
 	<Mode> "disable-show" </Mode>
-	<State> $Sum120201000712020200071202030007 </State> 
+	<State> $Sum120201004012020200401202030040 </State> 
 	<Language>
 		<ID> 000013 </ID> 
 	</Language>
diff --git a/xml/page_display_get_free.xml b/xml/page_display_get_free.xml
index ffabf6fb..72ef55f9 100644
--- a/xml/page_display_get_free.xml
+++ b/xml/page_display_get_free.xml
@@ -59,39 +59,7 @@
 
 	;inter-condition
 	;inter-image not use. because customer auto assige member.
-	If CountryName = "Malaysia" Then
-		;Var img_popup2 = "/img_popup2-MYR.png"
-		;Var img_popup3 = "/img_popup3-MYR.png"
-
-		Var MemberState1 = "Enable"
-		Var MemberState2 = "Invisible"
-		Var MemberState3 = "Invisible"
-	EndIf
-
-	;inter-image
-	If CountryName = "Indonesia" Then
-		;Var img_popup2 = "/img_popup2-IDR.png"
-		;Var img_popup3 = "/img_popup3-IDR.png"
-
-		Var MemberState1 = "Enable"
-		Var MemberState2 = "Invisible"
-		Var MemberState3 = "Invisible"
-	EndIf 
-
-	;inter-image
-	 If CountryName = "Australia" Then
-		;Var img_popup2 = "/img_popup2-AUS.png"
-		;Var img_popup3 = "/img_popup3-AUS.png"
-
-		Var MemberState1 = "Enable"
-		Var MemberState2 = "Invisible"
-		Var MemberState3 = "Invisible"
-	EndIf
-
-	;inter-image
-	 If CountryName = "Singapore" Then
-		;Var img_popup2 = "/img_popup2-SGP.png"
-		;Var img_popup3 = "/img_popup3-SGP.png"
+	If InternationalEnable = 1 Then
 
 		Var MemberState1 = "Enable"
 		Var MemberState2 = "Invisible"