diff --git a/image/event/energy_drink_1_bath/check_member_fail_en.png b/image/event/energy_drink_1_bath/check_member_fail_en.png
new file mode 100644
index 00000000..b3b1b01e
Binary files /dev/null and b/image/event/energy_drink_1_bath/check_member_fail_en.png differ
diff --git a/image/event/energy_drink_1_bath/check_member_fail_th.png b/image/event/energy_drink_1_bath/check_member_fail_th.png
new file mode 100644
index 00000000..8c483a67
Binary files /dev/null and b/image/event/energy_drink_1_bath/check_member_fail_th.png differ
diff --git a/image/event/energy_drink_1_bath/energy_drink_1_bath_policy.png b/image/event/energy_drink_1_bath/energy_drink_1_bath_policy.png
index 2fe51e45..a0c9f51b 100644
Binary files a/image/event/energy_drink_1_bath/energy_drink_1_bath_policy.png and b/image/event/energy_drink_1_bath/energy_drink_1_bath_policy.png differ
diff --git a/image/event/energy_drink_1_bath/energy_drink_1_bath_policy_en.png b/image/event/energy_drink_1_bath/energy_drink_1_bath_policy_en.png
index 272812f9..3641722d 100644
Binary files a/image/event/energy_drink_1_bath/energy_drink_1_bath_policy_en.png and b/image/event/energy_drink_1_bath/energy_drink_1_bath_policy_en.png differ
diff --git a/image/event/energy_drink_1_bath/text20.png b/image/event/energy_drink_1_bath/text20.png
new file mode 100644
index 00000000..cfe06484
Binary files /dev/null and b/image/event/energy_drink_1_bath/text20.png differ
diff --git a/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_th.png b/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_th.png
index f310b35d..f26e3539 100644
Binary files a/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_th.png and b/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_th.png differ
diff --git a/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_check_member.xml b/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_check_member.xml
new file mode 100644
index 00000000..797df86c
--- /dev/null
+++ b/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_check_member.xml
@@ -0,0 +1,564 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+;<Refresh> "Partial" </Refresh>
+<EventOpen>
+	; On open
+
+	
+
+	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"
+		Var DirImage2 = "ROOT/taobin_project/image/page_payment_en/page_payment"
+		;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"
+		Var DirImage2 = "ROOT/taobin_project/image/page_payment"
+		;Play "ROOT/taobin_project/sound_thai/dontforget_number.mp3"
+
+		Var IMG_CNT = "ROOT/taobin_project/image/page_doing/img2.png"
+	EndIf
+
+	
+    
+	Var FailState = "Invisible"
+    Var FailPopupImage = "ROOT/taobin_project/image/event/energy_drink_1_bath/check_member_fail_th.png"
+
+	Var Tel_Confirm_Flag = 1
+
+	Var MaxNumber = 10
+
+	Var StepGetServer = 0
+	var OtpCode = ""
+
+	Var failTime = 0
+
+</EventOpen>
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+
+		
+	StrLen TelephoneNumber TelNumLen
+	If TelNumLen > 0 Then
+		Var ShowTextNumber = "Invisible"
+	EndIf
+	
+	DEBUGVAR Timeout
+
+	Var Timeout = Timeout + 1
+	If Timeout > 30 Then
+
+        TRY "/mnt/sdcard/coffeevending/taobin_project/xml/event/script_common_for_open_promotion_xml.ev"
+	EndIf
+
+
+	If FailState = "Enable" Then
+
+		Var failTime = failTime + 1
+		If failTime >= 5 Then
+			Var failTime = 0
+			Var FailState = "Invisible"
+			Var TelephoneNumber = ""
+			Var Tel_Confirm_State = "Invisible"
+			Var Timeout = 0
+		EndIf
+
+	EndIf
+
+
+
+	Refresh
+	TimerReset
+</EventTimeout> 
+
+<EventActionOk>
+
+    DEBUGVAR Ext1a
+    If StepGetServer = 1 Then
+
+        If Ext1a = "ok" Then
+            Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_catalog.xml"
+        Else
+            Var load_gif_stage = "Invisible"
+            Var FailState = "Enable"
+            Var img_popup16 = "/img_popup16-1.png"
+        EndIf
+
+		Refresh
+    EndIf
+
+</EventActionOk>
+
+<EventActionError>
+    SAVELOG "GET ERROR!!!"
+</EventActionError>
+
+
+
+
+<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 MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 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 MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 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 MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 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 MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 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 MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 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 MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 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 MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 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 MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 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 MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 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 MaxNumber
+	StrLen TelephoneNumber TelNumLen
+	
+	If TelNumLen >= 10 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_back.png") </Filename>
+<FilenamePress> Var( DirImage + "/bp_back.png") </FilenamePress>
+<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 		
+	Open "ROOT/taobin_project/xml/page_catalog2.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
+			;Open "ROOT/taobin_project/xml/page_identityMember_consent.xml"  
+
+
+			Var Param1 = TelephoneNumber 
+			GETACCEXT Param1 33
+			Var StepGetServer = 1
+
+
+		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> 188 </X>
+<Y> 699 </Y>
+<Filename> "ROOT/taobin_project/image/event/energy_drink_1_bath/text20.png" </Filename>
+</Image>
+
+<Image>
+<X> 152 </X>
+<Y> 955 </Y>
+<State> ShowErrorText </State>
+<Filename> text_show_error </Filename>
+</Image>
+
+
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<State> FailState </State>
+<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
+</Image>
+
+
+<Image>
+<X> 249 </X>
+<Y> 751 </Y>
+<State> FailState </State>
+<Filename> FailPopupImage </Filename>
+</Image>
+
+
+
+;include="ROOT/taobin_project/inc/video.inc"
+
+
+
+
+
+
+
+
+
+			
+
+			
+<EventSecurity> 
+	Open "/media/bt/xml/security_alarm.xml" 
+</EventSecurity>
+
+
+
+
+
+</Popup>
\ No newline at end of file
diff --git a/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_identity.xml b/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_identity.xml
index 933d3ba1..b6db5f71 100644
--- a/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_identity.xml
+++ b/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_identity.xml
@@ -113,34 +113,6 @@
 
     Refresh
 
-    ; If StepGetServer = 1 Then
-
-    ;     If Ext1a = "ok" Then
-    ;         Var ChildrenFree = 1
-	; 		Open "ROOT/taobin_project/xml/page_payment.xml" 
-    ;     Else
-
-    ;         If Ext1a = "limit" Then
-    ;             Var load_gif_stage = "Invisible"
-    ;             Var FailState = "Enable"
-    ;             Var img_popup16 = "/img_popup16-3.png"
-
-    ;             WRITE_FILE "/mnt/sdcard/oreo_for_free_limit" "true"
-
-    ;         Else
-
-    ;             Var load_gif_stage = "Invisible"
-    ;             Var FailState = "Enable"
-    ;             Var img_popup16 = "/img_popup16-2.png"
-
-    ;         EndIf
-
-    ;         Refresh
-
-    ;     EndIf
-
-    ; EndIf
-
 </EventActionOk>
 
 <EventActionError>
@@ -347,7 +319,22 @@
 <Volume> SoundVolume </Volume>
 <EventClick> 
 	
-		Open "ROOT/taobin_project/xml/page_catalog2.xml"
+		DEBUGVAR OpenFromXML
+
+        Var FromPowerUpPro = 0
+        Var FromEnergyDrink1BathPro = 0
+        Var FromCoffeeDrink1BathPro = 0
+        Var FromNamHomCoconutPro = 0
+        
+        OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert2.xml"
+        
+        DEBUGVAR OpenFromInstMenuTab
+        If OpenFromInstMenuTab > 0 Then
+            DEBUGVAR OpenFromInstMenuTab
+            TabMenuVisibleInst OpenFromInstMenuTab
+        EndIf
+
+        Open OpenFromXML
 	
 </EventClick>
 </Button>
@@ -398,7 +385,15 @@ eval(
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog2.xml" 
+	Var FromEnergyDrink1BathPro = 0
+
+	If  Seeker = "next" Then 
+		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+		Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+	Else
+		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+		Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
 </EventClick>
 </Button>
 
@@ -412,7 +407,15 @@ eval(
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick> 
-	Open "ROOT/taobin_project/xml/page_catalog2.xml" 
+    Var FromEnergyDrink1BathPro = 0
+
+	If  Seeker = "next" Then 
+		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
+		Open "ROOT/taobin_project/xml/page_brewing3Conti.xml"  
+	Else
+		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
+		Open "ROOT/taobin_project/xml/page_catalog.xml" 
+	EndIf
 </EventClick>
 </Button>
 
diff --git a/xml/event/promotion_energy_drink_1_bath.xml b/xml/event/promotion_energy_drink_1_bath.xml
index d431d6bf..97e2623d 100644
--- a/xml/event/promotion_energy_drink_1_bath.xml
+++ b/xml/event/promotion_energy_drink_1_bath.xml
@@ -13050,8 +13050,6 @@ LIMENADE SODA" </Value>
 
 
 
-<<<<<<< HEAD
-=======
 
 
 <Button>
@@ -13087,12 +13085,10 @@ LIMENADE SODA" </Value>
         )
      </FilenameDisable>
 <EventOnClick> 
-
-        Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_catalog.xml"
+        Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_check_member.xml"
         
 </EventOnClick>
 
->>>>>>> 3eb39e13631227c2112d7384cf82a0b86c464db5
 
 <Video>
     <X> 42 </X>
diff --git a/xml/event/promotion_template1.inc b/xml/event/promotion_template1.inc
index c12a5ada..cbc3a2af 100644
--- a/xml/event/promotion_template1.inc
+++ b/xml/event/promotion_template1.inc
@@ -32,8 +32,7 @@
         )
      </FilenameDisable>
 <EventOnClick> 
-
-        Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_catalog.xml"
+        Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_check_member.xml"
         
 </EventOnClick>
 
diff --git a/xml/event/triple_promotion_nam_hom_coconut_and_energy_drink_1_bath_and_wednesday_melon.xml b/xml/event/triple_promotion_nam_hom_coconut_and_energy_drink_1_bath_and_wednesday_melon.xml
index 06e80aa2..98b96f75 100644
--- a/xml/event/triple_promotion_nam_hom_coconut_and_energy_drink_1_bath_and_wednesday_melon.xml
+++ b/xml/event/triple_promotion_nam_hom_coconut_and_energy_drink_1_bath_and_wednesday_melon.xml
@@ -590,7 +590,7 @@
     <FilenamePress> 
      eval( 
         If show_eng = "true" Then 
-			If NamHomCoconutRewardOutOfStock = 1 Then
+            If NamHomCoconutRewardOutOfStock = 1 Then
             	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_en.png"
 			Else
             	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png"
@@ -607,7 +607,7 @@
     <FilenameDisable> 
      eval( 
         If show_eng = "true" Then 
-			If NamHomCoconutRewardOutOfStock = 1 Then
+            If NamHomCoconutRewardOutOfStock = 1 Then
             	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_out_of_stock_en.png"
 			Else
             	Var return = "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_en.png"
@@ -623,7 +623,7 @@
      </FilenameDisable>
 <EventOnClick> 
 
-       Open "ROOT/taobin_project/xml/page_catalog_group_pro_nam_hom_coconut.xml"
+        Open "ROOT/taobin_project/xml/page_catalog_group_pro_nam_hom_coconut.xml"
         
 </EventOnClick>
 
@@ -633,15 +633,17 @@
     <Height> 616 </Height>
     <Loop> "true" </Loop>
     <State> 
-        If show_eng = "true" Then
-			Var return = "Invisible"
-		Else
-			If NamHomCoconutRewardOutOfStock = 1 Then
-				Var return = "Invisible"
-			Else
-				Var return  = "Enable"
-			EndIf
-		EndIf
+        eval(
+            If show_eng = "true" Then
+                Var return = "Invisible"
+            Else
+				If NamHomCoconutRewardOutOfStock = 1 Then
+					Var return = "Invisible"
+                Else
+					Var return  = "Enable"
+				EndIf
+            EndIf
+        ) 
     </State>
     <Filename> "ROOT/taobin_project/image/event/nam_hom_coconut/nam_hom_coconut_th.mp4" </Filename>
 </Video>
@@ -709,7 +711,7 @@
      </FilenameDisable>
 <EventOnClick> 
 
-       Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_catalog.xml"
+       Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_check_member.xml"
         
 </EventOnClick>
 
diff --git a/xml/page_brewing3.xml b/xml/page_brewing3.xml
index 5d45b8b4..204ef105 100644
--- a/xml/page_brewing3.xml
+++ b/xml/page_brewing3.xml
@@ -273,6 +273,29 @@
 		EndIf
 	EndIf
 
+	If EnergyDrink1BathPro = 1 Then
+		If FromEnergyDrink1BathPro = 1 Then
+			SAVELOG "Adding Energy drink 1 Bath pro quota"
+			Var Param1 = ""
+			Var Param2 = ""
+			Var Param3 = ""
+
+			If IDNum = "" Then
+
+			Else
+				AddData 44 TelephoneNumber IDNum Param1 Param2
+			EndIf
+
+			; clear id
+			Var IDNum = ""
+			Var FromEnergyDrink1BathPro = 0
+			Var AddData = 0
+			Var DisableFromPowerup = "true"
+		Else
+			Var DisableFromPowerup = ""
+		EndIf
+	EndIf
+
 	If GetFreeFromError = 1 Then
 		;Var GetFreeFromError = 0
 		Var TelephoneNumberProblem = TelephoneNumberGOTFree
diff --git a/xml/page_topping_select7.xml b/xml/page_topping_select7.xml
index 7d4ff23b..12d4e1f1 100644
--- a/xml/page_topping_select7.xml
+++ b/xml/page_topping_select7.xml
@@ -6233,6 +6233,7 @@
 	EndIf
 
 	Var FromPowerUpPro = 0
+	Var FromEnergyDrink1BathPro = 0
 
 	If  Seeker = "next" Then 
 		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
@@ -7800,7 +7801,7 @@
 
 	
 	; policy
-	Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_powerup_consent.xml"
+	Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_consent.xml"
 
 </EventClick>
 </Button>