diff --git a/xml/event/pepween/page_collect_point_pro_pepween_2.xml b/xml/event/pepween/page_collect_point_pro_pepween_2.xml
index ed872353..34377756 100644
--- a/xml/event/pepween/page_collect_point_pro_pepween_2.xml
+++ b/xml/event/pepween/page_collect_point_pro_pepween_2.xml
@@ -256,12 +256,13 @@
 					Var PopweenPointState[10] = 1
 				EndIf
 				If Seeker.selected_a_drink = "12-99-05-0056" Then
-					Var PopweenPointNewIndex = 11
-					Var PopweenPointState[11] = 1
-
 					If PopweenPointState[11] = 1 Then
 						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 11
 					EndIf
+
+					Var PopweenPointState[11] = 1
 				EndIf
 				If Seeker.selected_a_drink = "12-99-03-0066" Then
 					If PopweenPointState[12] = 1 Then
diff --git a/xml/event/pepween/page_collect_point_pro_pepween_3.xml b/xml/event/pepween/page_collect_point_pro_pepween_3.xml
index a28c39de..3a6bae15 100644
--- a/xml/event/pepween/page_collect_point_pro_pepween_3.xml
+++ b/xml/event/pepween/page_collect_point_pro_pepween_3.xml
@@ -20,6 +20,7 @@
 	;Add after pay
 
 	Var PointMaskState = "Invisible"
+	Var showRandomBtnState = "Invisible"
 
     Var CoffeePointStr = CoffeePoint
 
@@ -195,6 +196,10 @@
 		Var TaobinLevelDesc2 = "สะสมให้ครบ 13 เมนูแสนอร่อยปนความสยองตอนนี้เลย!"
 	EndIf
 
+	If PepweenPoint = 13 Then
+		Var showRandomBtnState = "Enable"
+	EndIf
+
 	If Seeker = "curr" Then
 		Var CheckCouponState = "Enable"
 	Else
@@ -203,13 +208,6 @@
 
 	Var CurrentPointSlot = PopweenPointNewIndex + 1
 
-	If SELLONLINE = 1 Then
-		Var CurrentPointCheck = ""
-	Else
-		Var CurrentPointCheck = "check"
-	EndIf
-	Var val3 = "X"
-	AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -222,6 +220,9 @@
 
 	Var Timeout = Timeout + 1
 	If Timeout > 10 Then
+		Var CurrentPointCheck = "check"
+		Var val3 = "X"
+		AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
 		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 	EndIf
 
@@ -318,6 +319,7 @@
 <Button>
 <X> 423 </X>
 <Y> 1660 </Y>
+<State> showRandomBtnState </State>
 <Filename> Var( DirImage + "/bn_random.png" )</Filename>
 <FilenamePress> Var( DirImage + "/bp_random.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -325,6 +327,14 @@
 <EventClick> 
 	; goto lid straw
 
+	If SELLONLINE = 1 Then
+		Var CurrentPointCheck = ""
+	Else
+		Var CurrentPointCheck = "check"
+	EndIf
+	Var val3 = "X"
+	AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
+
 	Open "ROOT/taobin_project/xml/event/pepween/page_pepween_random.xml"
 
 </EventClick>
diff --git a/xml/page_catalog_group_pro_pepween.xml b/xml/page_catalog_group_pro_pepween.xml
index ea1c0d80..06c4adbe 100644
--- a/xml/page_catalog_group_pro_pepween.xml
+++ b/xml/page_catalog_group_pro_pepween.xml
@@ -3831,7 +3831,47 @@ Hag of village" </Value>
 </EventClick>
 </Button>
 
+<EventUnitTest4>
+	Var TelephoneNumber = "0809120280"
+	Var CurrentPointCheck = ""
+	Var val3 = "X"
 
+	Var CurrentPointSlot = "1"
+	AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
+
+	Var CurrentPointSlot = "2"
+	AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
+
+	Var CurrentPointSlot = "3"
+	AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
+
+	Var CurrentPointSlot = "4"
+	AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
+
+	Var CurrentPointSlot = "5"
+	AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
+
+	Var CurrentPointSlot = "6"
+	AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
+
+	Var CurrentPointSlot = "7"
+	AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
+
+	Var CurrentPointSlot = "8"
+	AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
+
+	Var CurrentPointSlot = "9"
+	AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
+
+	Var CurrentPointSlot = "10"
+	AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
+
+	Var CurrentPointSlot = "11"
+	AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
+
+	Var CurrentPointSlot = "12"
+	AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
+</EventUnitTest4>
 
 
 </Popup>