diff --git a/.gitignore b/.gitignore
index a33be141..f23468b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 cip
 video/_main_page.mp4
 .DS_Store
+.vscode
\ No newline at end of file
diff --git a/image/page_drink_n/IcedCocoax1_mom_cocoacocoa.png b/image/page_drink_n/IcedCocoax1_mom_cocoacocoa.png
index c9745a4d..bd499ec0 100644
Binary files a/image/page_drink_n/IcedCocoax1_mom_cocoacocoa.png and b/image/page_drink_n/IcedCocoax1_mom_cocoacocoa.png differ
diff --git a/inter/aus/xml/event/tricker.ev b/inter/aus/xml/event/tricker.ev
index ecd80f33..69ef5f17 100644
--- a/inter/aus/xml/event/tricker.ev
+++ b/inter/aus/xml/event/tricker.ev
@@ -9,11 +9,11 @@
 ; Enable app game 
 Var GameEnableFromTrickerEv = 1
 
-Var NewCollectPointFlag = 0
+Var NewCollectPointFlag = 1
 
 Var WinterWarmersCatalogFlag = 0
 
-Var WestfieldCatalogFlag = 1
+Var WestfieldCatalogFlag = 0
 
 Var XMLLiveInfoEnable = 1
 
diff --git a/inter/aus/xml/page_brewing3.lxml b/inter/aus/xml/page_brewing3.lxml
index ab7c2660..0cc3087e 100644
--- a/inter/aus/xml/page_brewing3.lxml
+++ b/inter/aus/xml/page_brewing3.lxml
@@ -1110,20 +1110,13 @@
 				Var Cid = 26 
 
 				If NewCollectPointFlag = 1 Then
-					Var redeemSeeker = "curr-redeem"
-				
-					If redeemSeeker.redeem2Dollar = 1 Then
-						; TODO: Var Cid = 
+					If Seeker.redeem2Dollar = 1 Then
+						Var Cid = 49
 					EndIf
 
-					If redeemSeeker.redeem1Dollar = 1 Then
-						; TODO: Var Cid = 
+					If Seeker.redeem1Dollar = 1 Then
+						Var Cid = 48
 					EndIf
-
-					; reset
-					Var redeemSeeker.phoneNumber = ""
-					Var redeemSeeker.redeem2Dollar = 0
-					Var redeemSeeker.redeem1Dollar = 0
 				EndIf
  
 				AddData Cid Seeker.TNumberTaobinMember  Seeker.PointTaobinStr PointCrm GetScore
@@ -1231,20 +1224,13 @@
 			If AddData = 1 Then
 				Var Cid = 26
 				If NewCollectPointFlag = 1 Then
-					Var redeemSeeker = "curr-redeem"
-				
-					If redeemSeeker.redeem2Dollar = 1 Then
-						; TODO: Var Cid = 
+					If Seeker.redeem2Dollar = 1 Then
+						Var Cid = 49
 					EndIf
 
-					If redeemSeeker.redeem1Dollar = 1 Then
-						; TODO: Var Cid = 
+					If Seeker.redeem1Dollar = 1 Then
+						Var Cid = 48
 					EndIf
-
-					; reset
-					Var redeemSeeker.phoneNumber = ""
-					Var redeemSeeker.redeem2Dollar = 0
-					Var redeemSeeker.redeem1Dollar = 0
 				EndIf
 				AddData Cid Seeker.TNumberTaobinMember  Seeker.PointTaobinStr PointCrm GetScore
 			EndIf
diff --git a/inter/aus/xml/page_collect_point_1.lxml b/inter/aus/xml/page_collect_point_1.lxml
new file mode 100644
index 00000000..548759b4
--- /dev/null
+++ b/inter/aus/xml/page_collect_point_1.lxml
@@ -0,0 +1,696 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+;<Refresh> "Partial" </Refresh>
+<EventOpen>
+	; On open
+
+	Var InternationalEnable = 1
+
+	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
+
+	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
+
+	
+	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
+
+
+			GETACCEXT Param1 23
+			Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_2.lxml"  
+
+		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
+		
+
+		;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
+		Var Param1 = TelephoneNumber + "/" 
+		Var Param1 = Param1 + ParamCP
+
+		
+		GETACCEXT Param1 23
+		Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_2.lxml"  
+
+	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."
+		
+	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+</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
+
+		Var Tel2D = TelephoneNumber 
+		Trim Tel2D 1
+
+		If Tel2D = "0" Then
+			Var Tel2DFlag = 1
+		EndIf
+
+
+		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
+
+			GETACCEXT Param1 23
+			Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_2.lxml"  
+
+		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>
+
+
+;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/inter/aus/xml/page_collect_point_2.lxml b/inter/aus/xml/page_collect_point_2.lxml
new file mode 100644
index 00000000..ff8f74f0
--- /dev/null
+++ b/inter/aus/xml/page_collect_point_2.lxml
@@ -0,0 +1,282 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+
+<EventOpen>
+	; On open
+
+	Var Timeout = 0
+	SAVELOG UnitTestType
+	
+	If UnitTestType = "1" Then
+		Var CoffeePoint = 10
+		Open "ROOT/taobin_project/xml/page_show_consent.xml"
+	EndIf
+
+	Var TaobinLevel = 0
+	Var Point2X = 0
+
+	Var Seeker.IsLineMember = 0
+	Var Seeker.TaobinErrorNetwork = 0
+
+
+	 If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/collectiing_en"
+		
+		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2_eng.png"
+
+		
+	Else
+		Var DirImage = "ROOT/taobin_project/image/collectiing"
+
+		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+	EndIf
+
+	If PayOfflineMode = 1 Then
+		Var Seeker.TaobinErrorNetwork = 1
+		Var Seeker.PointTaobinStr = ParamCP
+		Var TelephoneNumber = TelephoneNumberX
+		Var Seeker.TNumberTaobinMember= TelephoneNumber
+		Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_error.xml"
+
+	EndIf
+		
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+	Var CountDownBrewing = BREW_CNT
+
+	Var ShowCountDownBrewing = CountDownBrewing
+
+
+	Var Timeout = Timeout + 1
+	If Timeout > 30 Then
+      
+		
+			Var TaobinLevel = 0
+			Var CoffeePoint = 1 
+
+			Var Seeker.TaobinErrorNetwork = 1
+			Var Seeker.PointTaobinStr = ParamCP
+			
+				Var TelephoneNumber = TelephoneNumberX
+			
+			Var Seeker.TNumberTaobinMember= TelephoneNumber
+			Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_error.xml"
+		
+		
+	EndIf
+
+	TimerReset
+	Refresh
+</EventTimeout> 
+
+
+
+
+			
+<EventSecurity> 
+	Open "/media/bt/xml/security_alarm.xml" 
+</EventSecurity>
+
+<EventActionOk>
+
+	If StepGetPoint = 0 Then
+		If PdpaAsk = 0 Then
+			Open "ROOT/taobin_project/xml/page_show_consent.xml" 
+		Else
+			Var StepGetPoint = 1
+		
+				Var TelephoneNumber = TelephoneNumberX
+			
+    		GETACCEXT TelephoneNumber 14
+			Var Ext1a = ""
+			Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_2.xml"  
+		EndIf
+	Else
+		If Ext1a = "" Then
+			
+			Var Seeker.TaobinErrorNetwork = 1
+			Var Seeker.PointTaobinStr = ParamCP
+			Var TelephoneNumber = TelephoneNumberX
+			Var Seeker.TNumberTaobinMember = TelephoneNumber
+			Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_error.xml"
+			
+		Else
+			If Ext1a = "ok" Then
+
+				Var TaobinName = Ext1d
+				Var TaobinCoupons = Ext1g
+				Var TaobinExpire = Ext1f
+				Var TaobinLevel = Ext1e
+				Var TaobinPDPA = Ext1h
+
+				Var TaobinPromoX = Ext1j
+
+				DEBUGVAR TaobinPDPA
+
+				Var PointTaobinTmp = Ext1i
+
+				DEBUGVAR PointTaobinTmp
+				INT PointTaobinTmp
+
+				INT TaobinPDPA
+
+				If TaobinName = "-" Then
+					Var Seeker.IsLineMember = 0
+				Else
+					Var Seeker.IsLineMember = 1
+				EndIf
+				
+
+				Var TelephoneNumber = TelephoneNumberX
+				Var TNumberTaobinMemberXXX = TelephoneNumber
+
+				;Var PointTaobinTmp = 4
+				
+				Var PointTaobin = PointTaobinTmp
+
+				DEBUGVAR  TaobinLevel
+
+				Var Seeker.PointTaobinStr = ParamCP
+				Var Seeker.TNumberTaobinMember = TelephoneNumberX
+
+				Var CoffeePointRank = Ext1b
+				INT CoffeePointRank
+
+				Var CoffeePoint1 = Ext1c
+				INT CoffeePoint1
+			
+				Var CoffeePoint = PointTaobin + CoffeePoint1
+				Var CoffeePointOld = CoffeePoint1
+
+				If Seeker = "next" Then
+					Var CurrSeeker = "curr"
+					If CurrSeeker.TNumberTaobinMember = Seeker.TNumberTaobinMember Then
+						Var CoffeePoint = Seeker.CurrentCoffeePoint + PointTaobin
+						If CurrSeeker.redeem1Dollar = 1 Then
+							Var CoffeePoint = CoffeePoint - 10
+							Var CoffeePointOld = Seeker.CurrentCoffeePoint - 10
+						EndIf
+
+						If CurrSeeker.redeem2Dollar = 1 Then
+							Var CoffeePoint = CoffeePoint - 20
+							Var CoffeePointOld = Seeker.CurrentCoffeePoint - 20
+						EndIf
+					EndIf
+				EndIf
+
+				Seeker.CurrentCoffeePoint = CoffeePoint
+
+				If TaobinLevel = 1 Then
+					Var CoffeePointRank = CoffeePointRank + 0
+				Else
+					Var CoffeePointRank = CoffeePointRank + PointTaobin
+				EndIf 
+
+				Var CoffeePointRankTmp = CoffeePointRank
+
+
+				DEBUGVAR Seeker.PointTaobinStr
+				DEBUGVAR Seeker.TNumberTaobinMember
+				
+				If NewCollectPointFlag = 1 Then
+					Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_3.lxml"
+				Else
+					Open "ROOT/taobin_project/xml/page_collect_point_3.xml" 
+				EndIf
+
+			Else
+				
+				Var Seeker.TaobinErrorNetwork = 1
+				
+				Var Seeker.PointTaobinStr = ParamCP
+				Var TelephoneNumber = TelephoneNumberX
+				Var Seeker.TNumberTaobinMember = TelephoneNumber
+				Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_error.lxml"
+			EndIf
+		EndIf
+	EndIf
+
+</EventActionOk>
+
+<EventActionError> 
+
+
+	
+		
+		Var Seeker.TaobinErrorNetwork = 1
+	
+		Var Seeker.PointTaobinStr = ParamCP
+		Var TelephoneNumber = TelephoneNumberX
+		Var Seeker.TNumberTaobinMember= TelephoneNumber
+		Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_error.lxml"
+	
+
+</EventActionError> 
+
+<EventMachine>
+	If MachineStage = "drink-success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MachineStage = "drink-failed" Then
+		Var MachineState_Result = 2
+	EndIf
+</EventMachine>
+
+
+
+<Image>
+<X> 178 </X>
+<Y> 680 </Y>
+<Filename> Var( DirImage + "/text20.png" ) </Filename>
+</Image>
+
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+
+
+
+
+<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>
+
+
+;
+<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>
+
+
+</Popup>
+	
\ No newline at end of file
diff --git a/inter/aus/xml/page_collect_point_3.lxml b/inter/aus/xml/page_collect_point_3.lxml
index d6075bd3..9c385d88 100644
--- a/inter/aus/xml/page_collect_point_3.lxml
+++ b/inter/aus/xml/page_collect_point_3.lxml
@@ -482,7 +482,7 @@
 
 	
 
-	Var Timeout = Timeout + 1
+	;Var Timeout = Timeout + 1
 	If Timeout > 5 Then
     	; goto lid straw
 
@@ -935,19 +935,12 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	; goto lid straw
-	;Open "ROOT/taobin_project/xml/page_back_to_main.xml"
-	If Seeker.FromConsent = 1 Then 
-		Open "ROOT/taobin_project/xml/page_display_get_free.xml"
-	Else
-		If CoffeePoint > 29 Then
-			Open "ROOT/taobin_project/xml/page_display_get_free.xml"
-		EndIf
-
-
-		
-
-		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	If CoffeePoint >= 30 Then
+		Var RedeemType = "get_free"
+		Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_redeem.lxml"
 	EndIf
+	
+	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 
 </EventClick>
 </Button>
@@ -1014,8 +1007,8 @@
 	Var TaobinLevel = "3"
 	Var TNumberTaobinMemberXXX = "0809120280"
 	Var CoffeePointRank = 106
-	Var CoffeePointOld = 18
-	Var CoffeePoint = 20
+	Var CoffeePointOld = 16
+	Var CoffeePoint = 17
 	Open "ROOT/taobin_project/inter/aus/xml/page_collect_point_3.lxml"
 </EventUnitTest4>
 
diff --git a/inter/aus/xml/page_collect_point_error.lxml b/inter/aus/xml/page_collect_point_error.lxml
new file mode 100644
index 00000000..87db96ef
--- /dev/null
+++ b/inter/aus/xml/page_collect_point_error.lxml
@@ -0,0 +1,108 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+
+<EventOpen>
+	; On open
+	
+
+	Var Timeout = 0
+	SAVELOG show_eng
+	
+    If show_eng = "true" Then 
+		Var DirImage = "ROOT/taobin_project/image/display_get_free_en/"
+		Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
+
+	Else
+		Var DirImage = "ROOT/taobin_project/image/display_get_free/"
+		Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
+		Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
+	EndIf
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+	Var Timeout = Timeout + 1
+	If Timeout > 5 Then
+        ; goto lid straw
+		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+	EndIf
+
+	TimerReset
+	Refresh
+</EventTimeout> 
+
+<EventMachine>
+	If MachineStage = "drink-success" Then
+		Var MachineState_Result = 1
+	EndIf
+
+	If MachineStage = "drink-failed" Then
+		Var MachineState_Result = 2
+	EndIf
+</EventMachine>
+
+
+
+<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> Var( DirImage + "/img_popup4.png" )</Filename>
+</Image>
+
+
+<Button>
+<X> 397 </X>
+<Y> 1680 </Y>
+<Filename> Var( DirImage + "/bn_accept.png" ) </Filename>
+<FilenamePress> Var( DirImage + "/bp_accept.png" )</FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	; goto lid straw
+
+	Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+
+</EventClick>
+</Button>
+
+
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+
+
+
+		
+
+
+			
+
+
+
+
+			
+<EventSecurity> 
+	Open "/media/bt/xml/security_alarm.xml" 
+</EventSecurity>
+
+
+</Page>
\ No newline at end of file
diff --git a/inter/aus/xml/page_collect_point_redeem.lxml b/inter/aus/xml/page_collect_point_redeem.lxml
index 59cf61e1..1a6cca3b 100644
--- a/inter/aus/xml/page_collect_point_redeem.lxml
+++ b/inter/aus/xml/page_collect_point_redeem.lxml
@@ -1,5 +1,4 @@
 <Popup>
-    <Cache> "Enable" </Cache>
     <Width> 1080 </Width>
     <Height> 1920 </Height>
     <Background> "0x303030" </Background>
@@ -16,7 +15,7 @@
             Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
         EndIf
 
-        Var DirImage = "ROOT/taobin_project/inter/aus/image/collect_point/redeem"
+        Var DirImage = "ROOT/taobin_project/inter/aus/image/collect_point/redeem/"
 
         Var congratsState = "Enable"
         Var sendCodeState = "Invisible"
@@ -46,13 +45,6 @@
             Var TargetTimeout = 5
         EndIf
 
-        Var SELLONLINE = 0
-        If SELLSTATUS = "SELLONLINE" Then
-            Var SELLONLINE = 1
-        EndIf
-        If SELLSTATUS = "SELLNOCASH" Then
-            Var SELLONLINE = 1
-        EndIf
 
 
     </EventOpen>
@@ -64,7 +56,7 @@
 
         Var ShowCountDownBrewing = CountDownBrewing
 
-        ;Var Timeout = Timeout + 1
+        Var Timeout = Timeout + 1
 
         If Timeout > TargetTimeout Then
             If sendCodeState = "Enable" Then
@@ -76,6 +68,14 @@
 
                     Var Timeout = 0
                     Var TargetTimeout = 5
+
+                    Var SELLONLINE = 0
+                    If SELLSTATUS = "SELLONLINE" Then
+                        Var SELLONLINE = 1
+                    EndIf
+                    If SELLSTATUS = "SELLNOCASH" Then
+                        Var SELLONLINE = 1
+                    EndIf
             
                     If SELLONLINE = 1 Then
                         Var headerBackground = "/success_header_bg.png"
@@ -144,13 +144,13 @@
     <Image>
         <X> 158 </X>
         <Y> 682 </Y>
-        <Filename> Var( DirImage + headerImage ) </Filename>
+        <Filename> headerImage </Filename>
     </Image>
 
     <Image>
         <X> content_X </X>
         <Y> content_Y </Y>
-        <Filename> Var( DirImage + contentImage ) </Filename>
+        <Filename> contentImage </Filename>
     </Image>
 
 
@@ -203,32 +203,38 @@
         <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
         <Volume> SoundVolume </Volume>
         <EventClick> 
-            Var redeemSeeker = "curr-redeem"
-            Var redeemSeeker.phoneNumber = Seeker.TNumberTaobinMember
             If RedeemType = "1_dollar" Then
-                Var redeemSeeker.redeem1Dollar = 1
+                Var Seeker.redeem1Dollar = 1
             EndIf
 
             If RedeemType = "2_dollar" Then
-                Var redeemSeeker.redeem2Dollar = 1
+                Var Seeker.redeem2Dollar = 1
             EndIf
 
             Var congratsState = "Invisible"
             Var sendCodeState = "Enable"
 
+            Var SELLONLINE = 0
+            If SELLSTATUS = "SELLONLINE" Then
+                Var SELLONLINE = 1
+            EndIf
+            If SELLSTATUS = "SELLNOCASH" Then
+                Var SELLONLINE = 1
+            EndIf
+
             Var Timeout = 0
             Var TargetTimeout = 5
             
             If SELLONLINE = 1 Then
                 Var headerBackground = "/success_header_bg.png"
-                Var headerImage = "/redeem_success_header.png"
-                Var contentImage = "/redeem_success_content.png"
+                Var headerImage = DirImage + "/redeem_success_header.png"
+                Var contentImage = DirImage + "/redeem_success_content.png"
                 Var content_X = 308
                 Var content_Y = 1065
             Else
                 Var headerBackground = "/fail_header_bg.png"
-                Var headerImage = "/redeem_fail_header.png"
-                Var contentImage = "/redeem_fail_content.png"
+                Var headerImage = DirImage + "/redeem_fail_header.png"
+                Var contentImage = DirImage + "/redeem_fail_content.png"
                 Var content_X = 243
                 Var content_Y = 1118
             EndIf
diff --git a/xml/open_page_collect_point.ev b/xml/open_page_collect_point.ev
new file mode 100644
index 00000000..2b5a65bc
--- /dev/null
+++ b/xml/open_page_collect_point.ev
@@ -0,0 +1,19 @@
+
+; default
+Var PageCollectPoint1 = "ROOT/taobin_project/xml/page_collect_point_1.xml"
+
+If Country = "Australia" Then
+    Var PageCollectPoint1 = "ROOT/taobin_project/inter/aus/xml/page_collect_point_1.xml"
+EndIf
+
+If CountryName = "Singapore" Then
+    ; ask-if-member-yet
+    Var MemberPrompt = CountryRootPath + "xml/page_member_prompt.lxml"
+    If SettingIgnoreCollectPoint = 1 Then
+        Var PageCollectPoint1 = "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
+    Else
+        Var PageCollectPoint1 = MemberPrompt
+    EndIf
+EndIf
+
+Open PageCollectPoint1
\ No newline at end of file
diff --git a/xml/page_payment_cashMore.xml b/xml/page_payment_cashMore.xml
index 9fb3f784..be33315b 100644
--- a/xml/page_payment_cashMore.xml
+++ b/xml/page_payment_cashMore.xml
@@ -2020,7 +2020,7 @@ EndIf
 			
 			;Open "ROOT/taobin_project/xml/page_thankyou.xml"
 
-			;Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
+			;TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
 			
 			; show consent
 			;Open "ROOT/taobin_project/xml/page_show_consent.xml"
diff --git a/xml/page_payment_storeCredit.xml b/xml/page_payment_storeCredit.xml
index 16c71c39..40f072e5 100644
--- a/xml/page_payment_storeCredit.xml
+++ b/xml/page_payment_storeCredit.xml
@@ -52,7 +52,7 @@
 			If Seeker.FreeVendingCampaign = 1 Then
 				Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 			Else
-				Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+				TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
 			EndIf
 		Else
 			CoinVending BILLREJECT
@@ -482,7 +482,7 @@
 			If Seeker.FreeVendingCampaign = 1 Then
 				Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 			Else
-				Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+				TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
 			EndIf
 	Else
 			CoinVending BILLREJECT
diff --git a/xml/page_payment_storeCredit0.xml b/xml/page_payment_storeCredit0.xml
index 29783b15..f997631e 100644
--- a/xml/page_payment_storeCredit0.xml
+++ b/xml/page_payment_storeCredit0.xml
@@ -55,7 +55,7 @@
 			If Seeker.FreeVendingCampaign = 1 Then
 				Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 			Else
-				Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+				TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
 			EndIf
 
 
@@ -76,7 +76,7 @@
 		If Seeker.FreeVendingCampaign = 1 Then
 			Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 		Else
-			Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+			TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
 		EndIf
 	EndIf
 
@@ -141,7 +141,7 @@
 			Open "ROOT/taobin_project/xml/page_payment_storeCredit.xml" 
 		Else
 			Var Seeker.StoreCreditFlag = 1 
-			Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+			TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
 		EndIf
 
 		
@@ -171,7 +171,7 @@
         If Seeker.FreeVendingCampaign = 1 Then
 			Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 		Else
-			Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+			TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
 		EndIf
 
 
diff --git a/xml/page_payment_storeCredit3.xml b/xml/page_payment_storeCredit3.xml
index edd7bc66..01625f7a 100644
--- a/xml/page_payment_storeCredit3.xml
+++ b/xml/page_payment_storeCredit3.xml
@@ -76,7 +76,7 @@
 			If Seeker.FreeVendingCampaign = 1 Then
 				Open "ROOT/taobin_project/xml/page_lid_straw.xml"  
 			Else
-				Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+				TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
 			EndIf
 			
 		Else
diff --git a/xml/page_thankyou.xml b/xml/page_thankyou.xml
index 8b4d3679..5a12e622 100644
--- a/xml/page_thankyou.xml
+++ b/xml/page_thankyou.xml
@@ -410,17 +410,7 @@
 
 				DEBUGVAR ChangeFlag2
 
-				If CountryName = "Singapore" Then
-					; ask-if-member-yet
-					Var MemberPrompt = CountryRootPath + "xml/page_member_prompt.lxml"
-					If SettingIgnoreCollectPoint = 1 Then
-						Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
-					Else
-						Open MemberPrompt
-					EndIf
-				Else
-					Open "ROOT/taobin_project/xml/page_collect_point_1.xml"
-				EndIf
+				TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
 
 			Else
 				If Seeker.StoreCreditFlag = 1 Then
@@ -485,29 +475,10 @@
 
 					If Seeker.FreeVendingCampaign = 1 Then
 						If Seeker.CollectPointPromotion = 1 Then
-							If CountryName = "Singapore" Then
-								; ask-if-member-yet
-								Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
-								If SettingIgnoreCollectPoint = 1 Then
-									Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
-								Else
-									Open MemberPrompt
-								EndIf
-								
-							EndIf
-							Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+							TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
 						Else
 							If Seeker.CollectPointMain = 1 Then
-								If CountryName = "Singapore" Then
-									; ask-if-member-yet
-									Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
-									If SettingIgnoreCollectPoint = 1 Then
-										Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
-									Else
-										Open MemberPrompt
-									EndIf
-								EndIf
-								Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+								TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
 							EndIf
 						EndIf
 						If Seeker.IsLineMember = 0 Then
@@ -531,17 +502,8 @@
 								Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 							EndIf 
 						EndIf
-						If CountryName = "Singapore" Then
-							; ask-if-member-yet
-							Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
-							If SettingIgnoreCollectPoint = 1 Then
-								Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
-							Else
-								Open MemberPrompt
-							EndIf
-						EndIf
 
-						Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+						TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
 					EndIf
 				Else
 					If GotoStoreCredit0 = 1 Then
@@ -568,32 +530,14 @@
 						If Seeker.FreeVendingCampaign = 1 Then
 
 							;If ChildrenFree = 1 Then
-							;	Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+							;	TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
 							;EndIf
 
 							If Seeker.CollectPointPromotion = 1 Then
-								If CountryName = "Singapore" Then
-									; ask-if-member-yet
-									Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
-									If SettingIgnoreCollectPoint = 1 Then
-										Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
-									Else
-										Open MemberPrompt
-									EndIf
-								EndIf
-								Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+								TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
 							Else
 								If Seeker.CollectPointMain = 1 Then
-									If CountryName = "Singapore" Then
-										; ask-if-member-yet
-										Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
-										If SettingIgnoreCollectPoint = 1 Then
-											Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
-										Else
-											Open MemberPrompt
-										EndIf
-									EndIf
-									Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+									TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
 								EndIf
 							EndIf
 
@@ -618,16 +562,7 @@
 									Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 								EndIf
 							EndIf
-							If CountryName = "Singapore" Then
-								; ask-if-member-yet
-								Var MemberPrompt = CountryRootPath + "/xml/page_member_prompt.lxml"
-								If SettingIgnoreCollectPoint = 1 Then
-									Open "ROOT/taobin_project/inter/sgp/xml/page_collect_point_1.lxml"
-								Else
-									Open MemberPrompt
-								EndIf
-							EndIf
-							Open "ROOT/taobin_project/xml/page_collect_point_1.xml" 
+							TRY "ROOT/taobin_project/xml/open_page_collect_point.ev"
 						EndIf
 					EndIf