diff --git a/inter/uae_dubai/xml/page_collect_point_1.lxml b/inter/uae_dubai/xml/page_collect_point_1.lxml
new file mode 100644
index 00000000..4259fcc3
--- /dev/null
+++ b/inter/uae_dubai/xml/page_collect_point_1.lxml
@@ -0,0 +1,928 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+;<Refresh> "Partial" </Refresh>
+<EventOpen>
+	; On open
+
+	; jump
+	If IgnoreCollectPointByMe = 1 Then
+		Var IgnoreCollectPointByMe = 0
+		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	EndIf
+
+	If Seeker.CodeChannel = 1 Then
+		If Seeker.CollectPointMain = 0 Then
+			SAVELOG "Seeker.CollectPointMain = 0 Jump!!!"
+			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+		EndIf
+	EndIf
+
+	If SettingIgnoreCollectPoint = 1 Then
+		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+
+	Var Tel_Confirm_State = "Invisible"
+	Var ShowTextNumber = "Enable"
+	Var Timeout = 0
+	Var TelephoneNumber = ""
+	Var TelephoneNumberX = ""
+
+	Var TimeOutPlay = 0
+
+    If show_eng = "true" Then
+		Var DirImage = "ROOT/taobin_project/image/collect_point1_en"
+		;Play "ROOT/taobin_project/sound_eng/Reward_final.mp3"
+
+		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+	Else
+		Var DirImage = "ROOT/taobin_project/image/collect_point1"
+		;Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3"
+
+		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+	EndIf
+
+	If InternationalEnable = 1 Then
+		If LanguageShow = "UAE_DUBAI" Then
+			Var IMG_CNT = CountryRootPath + "/image/page_doing/img2.png"
+		EndIf
+	EndIf
+
+	SAVELOG "collect_point1"
+	SAVELOG Seeker.TNumberTaobinCredit
+	SAVELOG TelephoneNumber
+	SAVELOG "collect_point1_"
+
+	Var Seeker.FromConsent = 0
+
+
+	Var ParamCP = ""
+	Var ParamCP = ParamCP + Seeker.CampaignPPrice
+	Var ParamCP = ParamCP + "/"
+	Var ParamCP = ParamCP + Seeker.CampaignPCode
+	Var ParamCP = ParamCP + "/"
+	Var ParamCP = ParamCP + Seeker.CampaignPayChanel
+	Var ParamCP = ParamCP + "/"
+
+	Var CampaingRef = ""
+	GenHashWithTimeStamp CampaingRef
+
+	Var CampaingRef1 = ""
+	Var CampaingRef2 = ""
+
+
+	SUBSTRING CampaingRef 0 6 CampaingRef1
+	SUBSTRING CampaingRef 12 18 CampaingRef2
+
+	Var CampaingRef1 = CampaingRef1 + CampaingRef2
+	Var ParamCP = ParamCP + CampaingRef1
+
+	Var PepweenCollectPoint = 1
+	If PepweenEnable = 1 Then
+		If Seeker.selected_a_drink = "12-99-05-0053" Then
+			Var PepweenCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0054" Then
+			Var PepweenCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0055" Then
+			Var PepweenCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0057" Then
+			Var PepweenCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0058" Then
+			Var PepweenCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0059" Then
+			Var PepweenCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0060" Then
+			Var PepweenCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0061" Then
+			Var PepweenCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0062" Then
+			Var PepweenCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0064" Then
+			Var PepweenCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0065" Then
+			Var PepweenCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0056" Then
+			Var PepweenCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-03-0066" Then
+			Var PepweenCollectPoint = 0
+		EndIf
+	EndIf
+
+	DEBUGVAR NotCollectPointPromotion
+
+	DEBUGVAR RobinsonBeautyPro
+	DEBUGVAR FromRobinsonBeautyPro
+	DEBUGVAR JemilaPro
+	DEBUGVAR FromJemilaPro
+	DEBUGVAR JemilaRewardOutOfStock
+
+	If Seeker.TNumberTaobinCredit = "" Then
+
+
+		If web_telnumOK = "" Then
+
+			If show_eng = "true" Then
+				Play "ROOT/taobin_project/sound_eng/Reward_final.mp3"
+			Else
+				Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3"
+			EndIf
+
+		Else
+			Var TelephoneNumber = web_telnumOK
+			Var StepGetPoint = 1
+
+			Var PdpaAsk = 0
+
+			Var OperatorTemp = ""
+			Var CreditAmount = 0
+			Var OperatorStatus = ""
+			Var AccountType = ""
+
+			SAVELOG "collect_point1-p52."
+
+
+			Var TelephoneNumberX = TelephoneNumber
+			DEBUGVAR TelephoneNumber
+
+			If FromTeaTimePro = 1 Then
+				Var TelPhoneNum = TelephoneNumber
+				Var drink_price = PriceFromCatalog
+				Var param2 = ""
+				Var param3 = ""
+				AddData 45 TelPhoneNum drink_price param2 param3
+			EndIf
+
+
+
+			;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
+			Var Param1 = TelephoneNumber + "/"
+			Var Param1 = Param1 + ParamCP
+
+			If NotCollectPointPromotion = 0 Then
+				If RobinsonBeautyPro = 1 Then
+					If FromRobinsonBeautyPro = 1 Then
+						If Seeker.CodeChannel = 1 Then
+							If Seeker.CollectPointPromotion = 1 Then
+								GETACCEXT TelephoneNumber 32
+								Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
+							EndIf
+						Else
+							GETACCEXT TelephoneNumber 32
+							Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
+						EndIf
+					EndIf
+				EndIf
+
+				If JemilaPro = 1 Then
+					If FromJemilaPro = 1 Then
+					    If JemilaRewardOutOfStock = 1 Then
+                            SAVELOG "Jemila prize out of stock skip collect promotion point."
+						Else
+    						If Seeker.CodeChannel = 1 Then
+    							If Seeker.CollectPointPromotion = 1 Then
+    								GETACCEXT TelephoneNumber 40
+    								Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml"
+    							EndIf
+    						Else
+    							GETACCEXT TelephoneNumber 40
+    							Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml"
+    						EndIf
+						EndIf
+					EndIf
+				EndIf
+			EndIf
+
+			GETACCEXT Param1 23
+			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+
+		EndIf
+	Else
+
+		Var TelephoneNumber = Seeker.TNumberTaobinCredit
+
+		If FromTeaTimePro = 1 Then
+			Var TelPhoneNum = TelephoneNumber
+			Var drink_price = PriceFromCatalog
+			Var param2 = ""
+			Var param3 = ""
+			AddData 45 TelPhoneNum drink_price param2 param3
+		EndIf
+
+		Var StepGetPoint = 1
+
+		Var PdpaAsk = 0
+
+		Var OperatorTemp = ""
+		Var CreditAmount = 0
+		Var OperatorStatus = ""
+		Var AccountType = ""
+
+		SAVELOG "collect_point1-p71."
+		Var TelephoneNumberX = TelephoneNumber
+		DEBUGVAR TelephoneNumber
+		DEBUGVAR PepweenCollectPoint
+
+
+		;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
+		Var Param1 = TelephoneNumber + "/"
+		Var Param1 = Param1 + ParamCP
+
+		If NotCollectPointPromotion = 0 Then
+			If RobinsonBeautyPro = 1 Then
+				If FromRobinsonBeautyPro = 1 Then
+					If Seeker.CodeChannel = 1 Then
+						If Seeker.CollectPointPromotion = 1 Then
+							GETACCEXT TelephoneNumber 32
+							Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
+						EndIf
+					Else
+						GETACCEXT TelephoneNumber 32
+						Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
+					EndIf
+				EndIf
+			EndIf
+
+			If JemilaPro = 1 Then
+				If FromJemilaPro = 1 Then
+				    If JemilaRewardOutOfStock = 1 Then
+                        SAVELOG "Jemila prize out of stock skip collect promotion point."
+                    Else
+                        If Seeker.CodeChannel = 1 Then
+                            If Seeker.CollectPointPromotion = 0 Then
+                                GETACCEXT TelephoneNumber 40
+                                Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml"
+                            EndIf
+                        Else
+                            GETACCEXT TelephoneNumber 40
+                            Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml"
+                        EndIf
+                    EndIf
+				EndIf
+			EndIf
+		EndIf
+
+
+		GETACCEXT Param1 23
+		Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+
+	EndIf
+
+	Var Tel_Confirm_Flag = 1
+
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout>
+
+	Var CountDownBrewing = BREW_CNT
+
+
+	Var ShowCountDownBrewing = CountDownBrewing
+
+
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen > 0 Then
+		Var ShowTextNumber = "Invisible"
+
+	Else
+		; Add
+		Var TimeOutPlay = TimeOutPlay + 1
+		If TimeOutPlay > 10 Then
+			Var TimeOutPlay = 0
+			If show_eng = "true" Then
+				Play "ROOT/taobin_project/sound_eng/Reward_final.mp3"
+			Else
+				Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3"
+			EndIf
+		EndIf
+		;
+
+	EndIf
+
+	DEBUGVAR Timeout
+
+	Var Timeout = Timeout + 1
+	If Timeout > 30 Then
+
+		SAVELOG "collect_point1-p107."
+		;Open "ROOT/taobin_project/xml/page_catalog.xml"
+
+
+        Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	EndIf
+
+	If Timeout = 18 Then
+		Var date_time_str = ""
+		STRDATETIME date_time_str
+		Var date_time_str = "/mnt/sdcard/scn_" + date_time_str
+		Var date_time_str = date_time_str + ".png"
+		DEBUGVAR date_time_str
+		SCREEN_CAP date_time_str
+	EndIf
+
+	If Timeout = 9 Then
+		;RefreshAll
+	EndIf
+
+	Refresh
+	TimerReset
+</EventTimeout>
+
+
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/alpha.png" </Filename>
+</Image>
+
+
+
+
+<Image>
+<X> 158 </X>
+<Y> 665 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/img_popup1.png" </Filename>
+</Image>
+
+<Button>
+<X> 333 </X>
+<Y> 1086 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_1.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_1.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "1"
+	Trim TelephoneNumber MaxPhoneNumber
+	StrLen TelephoneNumber TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+
+
+
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1086 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_2.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_2.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "2"
+	Trim TelephoneNumber MaxPhoneNumber
+	StrLen TelephoneNumber TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 620 </X>
+<Y> 1086 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_3.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_3.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "3"
+	Trim TelephoneNumber MaxPhoneNumber
+	StrLen TelephoneNumber TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 333 </X>
+<Y> 1230 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_4.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_4.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "4"
+	Trim TelephoneNumber MaxPhoneNumber
+	StrLen TelephoneNumber TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1230 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_5.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_5.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "5"
+	Trim TelephoneNumber MaxPhoneNumber
+	StrLen TelephoneNumber TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 620 </X>
+<Y> 1230 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_6.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_6.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "6"
+	Trim TelephoneNumber MaxPhoneNumber
+	StrLen TelephoneNumber TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 333 </X>
+<Y> 1373 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_7.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_7.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "7"
+	Trim TelephoneNumber MaxPhoneNumber
+	StrLen TelephoneNumber TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1373 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_8.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_8.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "8"
+	Trim TelephoneNumber MaxPhoneNumber
+	StrLen TelephoneNumber TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 620 </X>
+<Y> 1373 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_9.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_9.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "9"
+	Trim TelephoneNumber MaxPhoneNumber
+	StrLen TelephoneNumber TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+
+</EventClick>
+</Button>
+
+<Button>
+<X> 477 </X>
+<Y> 1517 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_0.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_0.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	Var Timeout = 0
+	Var TelephoneNumber = TelephoneNumber + "0"
+	Trim TelephoneNumber MaxPhoneNumber
+	StrLen TelephoneNumber TelNumLen
+
+	If TelNumLen >= MinPhoneNumber Then
+		Var Tel_Confirm_State = "Enable"
+	EndIf
+
+	Var ShowErrorText = "Invisible"
+	Var ShowTextNumber = "Invisible"
+
+	TimerReset
+	Refresh
+</EventClick>
+</Button>
+
+<Button>
+<X> 620 </X>
+<Y> 1517 </Y>
+<Filename> "ROOT/taobin_project/image/collectiing/bn_back-1.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/collectiing/bp_back-1.png" </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	Var Timeout = 0
+	Trim TelephoneNumber  -1
+
+	StrLen TelephoneNumber TelNumLen
+
+	If TelNumLen < 10 Then
+		Var Tel_Confirm_State = "Invisible"
+	EndIf
+
+
+	If TelNumLen = 0 Then
+		Var ShowTextNumber = "Enable"
+	EndIf
+
+	TimerReset
+	Refresh
+
+</EventClick>
+</Button>
+
+
+<Text>
+<X> 0 </X>
+<Y> 873 </Y>
+<Width> 1080 </Width>
+<Align> Center </Align>
+<Size> 62 </Size>
+<Font> RobotoBlack </Font>
+<Color> 0x513C2F </Color>
+<Value> TelephoneNumber </Value>
+<Format> Telnum-mask-1 </Format>
+</Text>
+
+<Button>
+<X> 218 </X>
+<Y> 1671 </Y>
+<Filename> Var( DirImage + "/bn_negative.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_negative.png") </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+	; goto lid straw
+	;Open "ROOT/taobin_project/xml/page_catalog.xml"
+	SAVELOG "collect_point1-p589."
+
+	If LuckyDrawCampaign = 1 Then
+		Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+	Else
+		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	EndIf
+</EventClick>
+</Button>
+
+
+<Button>
+<X> 577 </X>
+<Y> 1671 </Y>
+<State> Tel_Confirm_State </State>
+<Filename>  Var( DirImage + "/bn_positive.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_positive.png") </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bn_positive.png") </FilenameDisable>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick>
+
+
+
+	If Tel_Confirm_Flag = 1 Then
+
+		Var Tel2DFlag = 0
+
+		TRY "ROOT/taobin_project/xml/verify_number.ev"
+
+
+		If Tel2DFlag = 1 Then
+
+
+			Var StepGetPoint = 1
+
+			Var PdpaAsk = 0
+
+			Var OperatorTemp = ""
+			Var CreditAmount = 0
+			Var OperatorStatus = ""
+			Var AccountType = ""
+
+			SAVELOG "collect_point1-p583."
+			Var TelephoneNumberX = TelephoneNumber
+			;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
+			DEBUGVAR TelephoneNumber
+
+			If FromTeaTimePro = 1 Then
+				Var TelPhoneNum = TelephoneNumber
+				Var drink_price = PriceFromCatalog
+				Var param2 = ""
+				Var param3 = ""
+				AddData 45 TelPhoneNum drink_price param2 param3
+			EndIf
+
+
+
+			If ChildrenFree = 1 Then
+				Var Seeker.TNumberTaobinMember = TelephoneNumber
+				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+			EndIf
+
+
+
+
+			Var Param1 = TelephoneNumber + "/"
+			Var Param1 = Param1 + ParamCP
+
+			DEBUGVAR FruityRayaEnable
+			DEBUGVAR FromFruityRaya
+			If FruityRayaEnable = 1 Then
+				If FromFruityRaya = 1 Then
+					Open "ROOT/taobin_project/inter/mys/xml/event/fruit_raya/page_get_free_1_fruit_raya.lxml"
+				EndIf
+
+			EndIf
+
+			DEBUGVAR ProThaiTeaEnable
+			DEBUGVAR FromProThaiTea
+			If ProThaiTeaEnable = 1 Then
+				If FromProThaiTea = 1 Then
+					Open "ROOT/taobin_project/inter/mys/xml/event/thai_tea/page_get_free_1_thai_tea.lxml"
+				EndIf
+			EndIf
+
+			DEBUGVAR ProYuzuEnable
+			DEBUGVAR FromProYuzu
+			If ProYuzuEnable = 1 Then
+				If FromProYuzu = 1 Then
+					Open "ROOT/taobin_project/inter/mys/xml/event/yuzu/page_get_free_1_yuzu.lxml"
+				EndIf
+			EndIf
+
+			If NotCollectPointPromotion = 0 Then
+				If RobinsonBeautyPro = 1 Then
+					If FromRobinsonBeautyPro = 1 Then
+						If Seeker.CodeChannel = 1 Then
+							If Seeker.CollectPointPromotion = 1 Then
+								GETACCEXT TelephoneNumber 32
+								Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
+							EndIf
+						Else
+							GETACCEXT TelephoneNumber 32
+							Open "ROOT/taobin_project/xml/event/robinson_beauty/page_collect_point_robinson_beauty_2.xml"
+						EndIf
+					EndIf
+				EndIf
+
+				If JemilaPro = 1 Then
+					If FromJemilaPro = 1 Then
+					    If JemilaRewardOutOfStock = 1 Then
+                            SAVELOG "Jemila prize out of stock skip collect promotion point."
+                        Else
+                            If Seeker.CodeChannel = 1 Then
+                                If Seeker.CollectPointPromotion = 0 Then
+                                    GETACCEXT TelephoneNumber 40
+                                    Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml"
+                                EndIf
+                            Else
+                                GETACCEXT TelephoneNumber 40
+                                Open "ROOT/taobin_project/xml/event/jemila/page_collect_point_jemila_2.xml"
+                            EndIf
+                        EndIf
+					EndIf
+				EndIf
+			EndIf
+
+			GETACCEXT Param1 23
+			;Open "ROOT/taobin_project/xml/page_catalog.xml"
+			Open "ROOT/taobin_project/xml/page_collect_point_2.xml"
+
+		Else
+
+			If show_eng = "true" Then
+				Var DirImage2 = "ROOT/taobin_project/image/collectiing_en"
+			Else
+				Var DirImage2 = "ROOT/taobin_project/image/collectiing"
+			EndIf
+
+			Var text_show_error = DirImage2 + "/text_show_error5.png"
+
+			Var ShowErrorText = "Enable"
+			;Var TelephoneNumber = ""
+			Var Tel_Confirm_State = "Invisible"
+			Refresh
+
+
+
+		EndIf
+
+	EndIf
+</EventClick>
+</Button>
+
+; Border Edit
+<Image>
+<X> 217 </X>
+<Y> 866 </Y>
+<Filename> "ROOT/taobin_project/image/collect_point1/img3.png" </Filename>
+</Image>
+
+<Image>
+<X> 157 </X>
+<Y> 868 </Y>
+<State> ShowTextNumber </State>
+<Filename> Var( DirImage + "/text_edit.png") </Filename>
+</Image>
+
+
+<Image>
+<X> 236 </X>
+<Y> 699 </Y>
+<State> eval(
+	If FromProThaiTea = 1 Then
+		Var return = "Invisible"
+	Else
+		If FromProYuzu = 1 Then
+			Var return = "Invisible"
+		Else
+			Var return = "Enable"
+		EndIf
+	EndIf
+) </State>
+<Filename> Var( DirImage + "/text_2.png") </Filename>
+</Image>
+
+<Image>
+<X> 236 </X>
+<Y> 699 </Y>
+<State> eval(
+	If FromProThaiTea = 1 Then
+		Var return = "Enable"
+	Else
+		If FromProYuzu = 1 Then
+			Var return = "Invisible"
+		Else
+			Var return = "Enable"
+		EndIf
+	EndIf
+) </State>
+<Filename> Var( DirImage + "/edit.png") </Filename>
+</Image>
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+
+
+
+
+;
+<Image>
+<X> 751 </X>
+<Y> 413 </Y>
+<Filename> IMG_CNT </Filename>
+</Image>
+;
+<Text>
+<X> XPosiShowCountDownBrew </X>
+<Y> 470 </Y>
+<Align> End </Align>
+<Width> 153 </Width>
+<Size> 88 </Size>
+<Font> RobotoBold </Font>
+<Color> 0x513C2F </Color>
+<Value> ShowCountDownBrewing </Value>
+</Text>
+
+
+<Image>
+<X> 152 </X>
+<Y> 955 </Y>
+<State> ShowErrorText </State>
+<Filename> text_show_error </Filename>
+</Image>
+
+
+
+<EventSecurity>
+	Open "/media/bt/xml/security_alarm.xml"
+</EventSecurity>
+<EventMachine>
+	If MachineStage = "drink-success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MachineStage = "drink-failed" Then
+		Var MachineState_Result = 2
+	EndIf
+</EventMachine>
+
+
+
+
+</Popup>
\ No newline at end of file
diff --git a/xml/open_page_collect_point.ev b/xml/open_page_collect_point.ev
index aea3e35a..82b6163f 100644
--- a/xml/open_page_collect_point.ev
+++ b/xml/open_page_collect_point.ev
@@ -2,12 +2,8 @@
 ; default
 Var PageCollectPoint1 = "ROOT/taobin_project/xml/page_collect_point_1.xml"
 
-If CountryName = "Australia" Then
-    Var PageCollectPoint1 = "ROOT/taobin_project/inter/aus/xml/page_collect_point_1.lxml"
-EndIf
-
-If CountryName = "Malaysia" Then
-    Var PageCollectPoint1 = "ROOT/taobin_project/inter/mys/xml/page_collect_point_1.lxml"
+If InternationalEnable = 1 Then
+    Var PageCollectPoint1 = CountryRootPath + "/xml/page_collect_point_1.lxml"
 EndIf
 
 If CountryName = "Singapore" Then