oatmilk

menu/new-layout.tsv

@@ -385,15 +385,14 @@ Name=Momday,file=page_catalog_momday.skt
 Name=pepween,file=page_catalog_group_pro_pepween.skt
 		พระจันทร์สีเลือด	Red Moon	เป๊ปซี่ น้ำเชื่อมสตรอเบอร์รี่ ผงมะนาว และโซดา	Pepsi, Strawberry, Limenade and Soda	-	12-99-05-0053	-	bn_redmoon.png	-	-	-
 		สุภาพสตรีสีขาว	White Lady	เป๊ปซี่ ชามะลิ น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา	Pepsi, Jasmine Tea, Lychee Lime and Soda	-	12-99-05-0054	-	bn_white_lady.png	-	-	-
-		เสียงดนตรีตอนตี 3	Mysterious music box	เป๊ปซี่ ขิง ผงมะนาว และโซดา	Pepsi, Ginger, Lime and Soda	-	12-99-05-0055	-	bn_mysterious_music_box.png	-	-	-
-		หมอกควันแห่งความมืด	Haunted Haze	เป๊ปซี่ น้ำเชื่อมบ๊วย น้ำเชื่อมลิ้นจี่  และโซดา	Pepsi, Lychee, Plum and Soda	-	12-99-05-0056	-	bn_haunted_haza.png	-	-	-
-		พยาบาทชาติที่แล้ว	The Haunting of the Past	เป๊ปซี่ น้ำเชื่อมชูกำลัง ผงมะนาว และโซดา	Pepsi Energy,  Lime and Soda	-	12-99-05-0057	-	bn_haunting_of_the_past.png	-	-	-
-		ท่านเคาท์เขย่าขวัญ	The dark lord	เป๊ปซี่ น้ำเชื่อมสละ ผงมะนาว และโซดา	Pepsi Salak,  Lime and Soda	-	12-99-05-0058	-	bn_the_dark_load.png	-	-	-
-		ห้องเชือดหมายเลข 13	Room no.13	เป๊ปซี่ น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา	pepsi, lychee ,  Lime and Soda	-	12-99-05-0059	-	bn_room_no_13.png	-	-	-
-		ค่ำคืนคอยหลอน	Haunted Harvest	เป๊ปซี่ มัทฉะ  และโซดา	Pepsi, Matcha and Soda	-	12-99-05-0060	-	bn_huanted_harvert.png	-	-	-
+		เสียงดนตรีตอนตี 3	Mysterious\nmusic box	เป๊ปซี่ ขิง ผงมะนาว และโซดา	Pepsi, Ginger, Lime and Soda	-	12-99-05-0055	-	bn_mysterious_music_box.png	-	-	-
+		หมอกควัน\nแห่งความมืด	Haunted Haze	เป๊ปซี่ น้ำเชื่อมบ๊วย น้ำเชื่อมลิ้นจี่  และโซดา	Pepsi, Lychee, Plum and Soda	-	12-99-05-0056	-	bn_haunted_haza.png	-	-	-
+		พยาบาทชาติที่แล้ว	The Haunting of\nthe Past	เป๊ปซี่ น้ำเชื่อมชูกำลัง ผงมะนาว และโซดา	Pepsi Energy,  Lime and Soda	-	12-99-05-0057	-	bn_haunting_of_the_past.png	-	-	-
+		ท่านเคาท์เขย่าขวัญ	The dark lord	เป๊ปซี่ น้ำเชื่อมสละ ผงมะนาว และโซดา	Pepsi Salak,  Lime and Soda	-	12-99-05-0058	-	bn_the_dark_lord.png	-	-	-
+		ห้องเชือด\nหมายเลข 13	Room no.13	เป๊ปซี่ น้ำเชื่อมลิ้นจี่ ผงมะนาว และโซดา	pepsi, lychee ,  Lime and Soda	-	12-99-05-0059	-	bn_room_no_13.png	-	-	-
+		ค่ำคืนคอยหลอน	Haunted Harvest	เป๊ปซี่ มัทฉะ  และโซดา	Pepsi, Matcha and Soda	-	12-99-05-0060	-	bn_haunted_harvert.png	-	-	-
 		แม่ชีไร้หัว	Cursed Coffee	เป๊ปซี่ กาแฟ น้ำเชื่อมยูซุ และโซดา	Pepsi, Coffee, Yuzu  and Soda	-	12-99-05-0061	-	bn_cursed_coffee.png	-	-	-
-		คุณยายท้ายหมู่บ้าน	The Haunting Hag of village	เป๊ปซี่ น้ำเชื่อมบ๊วย ผงชาไทย และโซดา	Pepsi, Plum, Thai Tea and Soda	-	12-99-05-0062	-	bn_haunting_hag_of_village.png	-	-	-
-		คำเตือนของซาตาน	Jasmine Jinx	เป๊ปซี่ ชามะลิ น้ำเชื่อมยูซุ ผงมะนาว และโซดา	Pepsi Jasmine Yuzu and Soda	-	12-99-05-0063	-	bn_jasmin_jinx.png	-	-	-
+		คุณยายท้ายหมู่บ้าน	The Haunting\nHag of village	เป๊ปซี่ น้ำเชื่อมบ๊วย ผงชาไทย และโซดา	Pepsi, Plum, Thai Tea and Soda	-	12-99-05-0062	-	bn_haunting_hag_of_village.png	-	-	-
 		อาถรรพ์คืนวันพุธ	Midnight's Enigma	เป๊ปซี่ น้ำเชื่อมบ๊วย ผงมะนาว  และโซดา	Pepsi Plum Lime and Soda	-	12-99-05-0064	-	bn_midnight_enigma.png	-	-	-
 		ล้า ท้า หลอน	Unbelievers' Demise	เป๊ปซี่ ชามะลิ น้ำเชื่อมเมล่อน  และโซดา	Pepsi Jasmine Melon and Soda	-	12-99-05-0065	-	bn_unbelievers_demise.png	-	-	-
 		ดิน 7 ป่าช้า	7 Haunted Woods	? (เป๊ปซี่ นม และโอริโอ้ )	? (pepsi oreo)	-	-	12-99-03-0066	bn_haunted_woods.png	-	-	-
@@ -441,3 +440,4 @@ Name=Obsolete,file=page_obsolete.skt
 		โฮจิฉะ	HOJICHA	ชาเขียวคั่ว 	Hojicha	12-02-01-0036	12-02-02-0036	12-02-03-0036	bn_hot_hojicha_tea_sing.png				#N/A	#N/A	#N/A	#N/A	#N/A
 		บลูเบอร์รี่โปรตีน	BLUEBERRY SHAKE	เวย์โปรตีน นม \nน้ำเชื่อมบลูเบอร์รี่	Whey protein,\nBlueberry Syrup & Milk	-	12-04-02-0007	-	bn_protein_Blueberry.png				-	#N/A	-	#N/A	#N/A
 		โตเกียวบานาน่าโปรตีน	BANANA SHAKE	เวย์โปรตีน นม \nน้ำเชื่อมโตเกียวบานาน่า	Whey protein, Milk,\nTokyo Banana syrup	-	12-04-02-0019	-	bn_protein_Banana.png	-	-	-	-	฿65.00	-	NN	NN
+		คำเตือนของซาตาน	Jasmine Jinx	เป๊ปซี่ ชามะลิ น้ำเชื่อมยูซุ ผงมะนาว และโซดา	Pepsi Jasmine Yuzu and Soda	-	12-99-05-0063	-	bn_jasmin_jinx.png	-	-	-

xml/event/pepween/page_collect_point_pro_pepween_2.xml

@@ -158,46 +158,125 @@
 
 				Var PopweenPointNewIndex = 0
 
-				If Seeker.ProductCode = "12-99-05-0053" Then
-					Var PopweenPointNewIndex = 0
+				If Seeker.selected_a_drink = "12-99-05-0053" Then
+					If PopweenPointState[0]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 0
+					EndIf
+
+					Var PopweenPointState[0] = 1
 				EndIf
-				If Seeker.ProductCode = "12-99-05-0054" Then
-					Var PopweenPointNewIndex = 1
+				If Seeker.selected_a_drink = "12-99-05-0054" Then	
+					If PopweenPointState[1]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 1
+					EndIf
+				
+					Var PopweenPointState[1] = 1
 				EndIf
-				If Seeker.ProductCode = "12-99-05-0055" Then
-					Var PopweenPointNewIndex = 2
+				If Seeker.selected_a_drink = "12-99-05-0055" Then
+					If PopweenPointState[2]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 2
+					EndIf
+
+					Var PopweenPointState[2] = 1
 				EndIf
-				If Seeker.ProductCode = "12-99-05-0057" Then
-					Var PopweenPointNewIndex = 3
+				If Seeker.selected_a_drink = "12-99-05-0057" Then
+					If PopweenPointState[3]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 3
+					EndIf
+
+					Var PopweenPointState[3] = 1
 				EndIf
-				If Seeker.ProductCode = "12-99-05-0058" Then
-					Var PopweenPointNewIndex = 4
+				If Seeker.selected_a_drink = "12-99-05-0058" Then
+					If PopweenPointState[4]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 4
+					EndIf
+					Var PopweenPointState[4] = 1
 				EndIf
-				If Seeker.ProductCode = "12-99-05-0059" Then
-					Var PopweenPointNewIndex = 5
+				If Seeker.selected_a_drink = "12-99-05-0059" Then
+					If PopweenPointState[5]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 5
+					EndIf
+
+					Var PopweenPointState[5] = 1
 				EndIf
-				If Seeker.ProductCode = "12-99-05-0060" Then
-					Var PopweenPointNewIndex = 6
+				If Seeker.selected_a_drink = "12-99-05-0060" Then
+					If PopweenPointState[6]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 6
+					EndIf
+
+					Var PopweenPointState[6] = 1
 				EndIf
-				If Seeker.ProductCode = "12-99-05-0061" Then
-					Var PopweenPointNewIndex = 7
+				If Seeker.selected_a_drink = "12-99-05-0061" Then
+					If PopweenPointState[7]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 7
+					EndIf
+					Var PopweenPointState[7] = 1
 				EndIf
-				If Seeker.ProductCode = "12-99-05-0062" Then
-					Var PopweenPointNewIndex = 8
+				If Seeker.selected_a_drink = "12-99-05-0062" Then
+					If PopweenPointState[8]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 8
+					EndIf
+
+					Var PopweenPointState[8] = 1
 				EndIf
-				If Seeker.ProductCode = "12-99-05-0064" Then
-					Var PopweenPointNewIndex = 9
+				If Seeker.selected_a_drink = "12-99-05-0064" Then
+					If PopweenPointState[9]  = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 9
+					EndIf
+
+					Var PopweenPointState[9] = 1
 				EndIf
-				If Seeker.ProductCode = "12-99-05-0065" Then
-					Var PopweenPointNewIndex = 10
+				If Seeker.selected_a_drink = "12-99-05-0065" Then
+					If PopweenPointState[10] = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 10
+					EndIf
+
+					Var PopweenPointState[10] = 1
 				EndIf
-				If Seeker.ProductCode = "12-99-05-0056" Then
-					Var PopweenPointNewIndex = 11
+				If Seeker.selected_a_drink = "12-99-05-0056" Then
+					If PopweenPointState[11] = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 11
+					EndIf
+
+					Var PopweenPointState[11] = 1
 				EndIf
-				If Seeker.ProductCode = "12-99-05-0066" Then
-					Var PopweenPointNewIndex = 11
+				If Seeker.selected_a_drink = "12-99-03-0066" Then
+					If PopweenPointState[12] = 1 Then
+						Var PopweenPointNewIndex = ""
+					Else
+						Var PopweenPointNewIndex = 12
+					EndIf
+
+					Var PopweenPointState[12] = 1
 				EndIf
 
+				DEBUGVAR Seeker.selected_a_drink
+				DEBUGVAR PopweenPointNewIndex
+
 				DEBUGVAR Seeker.PointTaobinStr
 				DEBUGVAR Seeker.TNumberTaobinMember
 				If TaobinPDPA = 0 Then

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
 
@@ -43,31 +44,6 @@
 		Var ThaiTextState = "Enable"
 	EndIf
 	
-	Var CoffeePointTmp = CoffeePoint
-
-	;If CoffeePoint > 12 Then
-	;	Var Timeout = 18
-	;	Var CoffeePointTmp = 13
-	;EndIf
-
-	If CoffeePoint < 17 Then
-		Var CoffeePointTmp = 1
-	Else
-		Var CoffeePointTmp = CoffeePoint - 17
-	EndIf
-
-	Var PointDiff = 13 - CoffeePointTmp
-
-	If show_eng = "true" Then
-		Var TaobinLevelDesc1 = "You're just " + PointDiff
-		Var TaobinLevelDesc1 = TaobinLevelDesc1 + " menu item away from unlocking a Secret graveyard prize."
-		Var TaobinLevelDesc2 = "Collect all 13 horrifying menus now!"
-	Else
-		Var TaobinLevelDesc1 = "เหลืออีก " + PointDiff
-		Var TaobinLevelDesc1 = TaobinLevelDesc1 + " เมนูที่จะเปิดล็อคความน่าสะพรึง"
-		Var TaobinLevelDesc2 = "สะสมให้ครบ 13 เมนูแสนอร่อยปนความสยองตอนนี้เลย!"
-	EndIf
-	
 	Var CheckCoupons = 0
 	Var MakeDrinkState = 0
 
@@ -102,33 +78,33 @@
 	Var taobinImgPoint[11] = "/skull_active.png"
 	Var taobinImgPoint[12] = "/skull_active.png"
 
-	Var taobinTextPoint[0].Thai = "พระจันทร์สีเลือด"
-	Var taobinTextPoint[1].Thai = "สุภาพสตรีสีขาว"
-	Var taobinTextPoint[2].Thai = "เสียงดนตรีตอนตี 3"
-	Var taobinTextPoint[3].Thai = "พยาบาทชาติที่แล้ว"
-	Var taobinTextPoint[4].Thai = "ท่านเคาท์เขย่าขวัญ"
-	Var taobinTextPoint[5].Thai = "ห้องเชือดหมายเลข 13"
-	Var taobinTextPoint[6].Thai = "ค่ำคืนคอยหลอน"
-	Var taobinTextPoint[7].Thai = "แม่ชีไร้หัว"
-	Var taobinTextPoint[8].Thai = "คุณยายท้ายหมู่บ้าน"
-	Var taobinTextPoint[9].Thai = "อาถรรพ์คืนวันพุธ"
-	Var taobinTextPoint[10].Thai = "ล้า ท้า หลอน"
-	Var taobinTextPoint[11].Thai = "หมอกควันแห่งความมืด"
-	Var taobinTextPoint[12].Thai = "ดิน 7 ป่าช้า"
+	Var taobinTextPointTH[0] = "พระจันทร์สีเลือด"
+	Var taobinTextPointTH[1] = "สุภาพสตรีสีขาว"
+	Var taobinTextPointTH[2] = "เสียงดนตรีตอนตี 3"
+	Var taobinTextPointTH[3] = "พยาบาทชาติที่แล้ว"
+	Var taobinTextPointTH[4] = "ท่านเคาท์เขย่าขวัญ"
+	Var taobinTextPointTH[5] = "ห้องเชือดหมายเลข 13"
+	Var taobinTextPointTH[6] = "ค่ำคืนคอยหลอน"
+	Var taobinTextPointTH[7] = "แม่ชีไร้หัว"
+	Var taobinTextPointTH[8] = "คุณยายท้ายหมู่บ้าน"
+	Var taobinTextPointTH[9] = "อาถรรพ์คืนวันพุธ"
+	Var taobinTextPointTH[10] = "ล้า ท้า หลอน"
+	Var taobinTextPointTH[11] = "หมอกควันแห่งความมืด"
+	Var taobinTextPointTH[12] = "ดิน 7 ป่าช้า"
 
-	Var taobinTextPoint[0].Eng = "Red Moon"
-	Var taobinTextPoint[1].Eng = "White Lady"
-	Var taobinTextPoint[2].Eng = "Mysterious music box"
-	Var taobinTextPoint[3].Eng = "Haunted Haze"
-	Var taobinTextPoint[4].Eng = "The dark lord"
-	Var taobinTextPoint[5].Eng = "Room no.13"
-	Var taobinTextPoint[6].Eng = "Haunted Harvest"
-	Var taobinTextPoint[7].Eng = "Cursed Coffee"
-	Var taobinTextPoint[8].Eng = "The Haunting Hag of village"
-	Var taobinTextPoint[9].Eng = "Midnight's Enigma"
-	Var taobinTextPoint[10].Eng = "Unbelievers' Demise"
-	Var taobinTextPoint[11].Eng = "Haunted Haze"
-	Var taobinTextPoint[12].Eng = "7 Haunted Woods"
+	Var taobinTextPointEN[0] = "Red Moon"
+	Var taobinTextPointEN[1] = "White Lady"
+	Var taobinTextPointEN[2] = "Mysterious music box"
+	Var taobinTextPointEN[3] = "Haunted Haze"
+	Var taobinTextPointEN[4] = "The dark lord"
+	Var taobinTextPointEN[5] = "Room no.13"
+	Var taobinTextPointEN[6] = "Haunted Harvest"
+	Var taobinTextPointEN[7] = "Cursed Coffee"
+	Var taobinTextPointEN[8] = "The Haunting Hag of village"
+	Var taobinTextPointEN[9] = "Midnight's Enigma"
+	Var taobinTextPointEN[10] = "Unbelievers' Demise"
+	Var taobinTextPointEN[11] = "Haunted Haze"
+	Var taobinTextPointEN[12] = "7 Haunted Woods"
 
 	Var taobinTextColorPoint[0] =  "0xFFFFFF"
 	Var taobinTextColorPoint[1] =  "0xFFFFFF"
@@ -144,50 +120,84 @@
 	Var taobinTextColorPoint[11] = "0xFFFFFF"
 	Var taobinTextColorPoint[12] = "0xFFFFFF"
 
+	Var PepweenPoint = 0
 
 	If PopweenPointState[0] = 1 Then
 		Var taobinP1 = "Enable"
+		Var PepweenPoint = PepweenPoint + 1
 	EndIf
 	If PopweenPointState[1] = 1 Then
 		Var taobinP2 = "Enable"
+		Var PepweenPoint = PepweenPoint + 1
 	EndIf
 	If PopweenPointState[2] = 1 Then
 		Var taobinP3 = "Enable"
+		Var PepweenPoint = PepweenPoint + 1
 	EndIf
 	If PopweenPointState[3] = 1 Then
 		Var taobinP4 = "Enable"
+		Var PepweenPoint = PepweenPoint + 1
 	EndIf
 	If PopweenPointState[4] = 1 Then
 		Var taobinP5 = "Enable"
+		Var PepweenPoint = PepweenPoint + 1
 	EndIf
 	If PopweenPointState[5] = 1 Then
 		Var taobinP6 = "Enable"
+		Var PepweenPoint = PepweenPoint + 1
 	EndIf
 	If PopweenPointState[6] = 1 Then
 		Var taobinP7 = "Enable"
+		Var PepweenPoint = PepweenPoint + 1
 	EndIf
 	If PopweenPointState[7] = 1 Then
 		Var taobinP8 = "Enable"
+		Var PepweenPoint = PepweenPoint + 1
 	EndIf
 	If PopweenPointState[8] = 1 Then
 		Var taobinP9 = "Enable"
+		Var PepweenPoint = PepweenPoint + 1
 	EndIf
 	If PopweenPointState[9] = 1 Then
 		Var taobinP10 = "Enable"
+		Var PepweenPoint = PepweenPoint + 1
 	EndIf
 	If PopweenPointState[10] = 1 Then
 		Var taobinP11 = "Enable"
+		Var PepweenPoint = PepweenPoint + 1
 	EndIf
 	If PopweenPointState[11] = 1 Then
 		Var taobinP12 = "Enable"
+		Var PepweenPoint = PepweenPoint + 1
 	EndIf
 	If PopweenPointState[12] = 1 Then
 		Var taobinP13 = "Enable"
+		Var PepweenPoint = PepweenPoint + 1
 	EndIf
 
-	If PopweenPointNewIndex >= 0 Then
-		Var taobinImgPoint[PopweenPointNewIndex] = "/skull_active_new.png"
-		Var taobinTextColorPoint[PopweenPointNewIndex] = "0xE97A13"
+	If PopweenPointNewIndex = "" Then
+		; Nothing
+	Else
+		If PopweenPointNewIndex >= 0 Then
+			Var taobinImgPoint[PopweenPointNewIndex] = "/skull_active_new.png"
+			Var taobinTextColorPoint[PopweenPointNewIndex] = "0xE97A13"
+		EndIf
+	EndIf
+
+	Var PointDiff = 13 - PepweenPoint
+
+	If show_eng = "true" Then
+		Var TaobinLevelDesc1 = "You're just " + PointDiff
+		Var TaobinLevelDesc1 = TaobinLevelDesc1 + " menu item away from unlocking a Secret graveyard prize."
+		Var TaobinLevelDesc2 = "Collect all 13 horrifying menus now!"
+	Else
+		Var TaobinLevelDesc1 = "เหลืออีก " + PointDiff
+		Var TaobinLevelDesc1 = TaobinLevelDesc1 + " เมนูที่จะเปิดล็อคความน่าสะพรึง"
+		Var TaobinLevelDesc2 = "สะสมให้ครบ 13 เมนูแสนอร่อยปนความสยองตอนนี้เลย!"
+	EndIf
+
+	If PepweenPoint = 13 Then
+		Var showRandomBtnState = "Enable"
 	EndIf
 
 	If Seeker = "curr" Then
@@ -196,15 +206,8 @@
 		Var CheckCouponState = "Disable"
 	EndIf
 
-	Var CurrentPointSlot = "10"
-	Var CurrentPointCheck = ""
-	Var val3 = "X"
-	AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
+	Var CurrentPointSlot = PopweenPointNewIndex + 1
 
-;	Var CodeType = "114"
-;	Var val2 = "X"
-;	Var val3 = "X"
-;	AddData 36 TelephoneNumber CodeType val2 val3
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -216,24 +219,11 @@
 	
 
 	Var Timeout = Timeout + 1
-	If Timeout > 5 Then
-
-    	; goto lid straw
-    	If CoffeePoint > 29 Then
-			Open "ROOT/taobin_project/xml/page_display_get_free.xml"
-		Else
-			If Seeker.FromConsent = 1 Then 
-				Open "ROOT/taobin_project/xml/page_display_get_free.xml"
-			Else
-
-				If PromotionIDCurrentOrder > 1 Then
-					Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
-				EndIf
-
-				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
-			EndIf
-			
-		EndIf
+	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
 
 	
@@ -244,45 +234,10 @@
 
 
 	
-
-			
 <EventSecurity> 
 	Open "/media/bt/xml/security_alarm.xml" 
 </EventSecurity>
 
-<EventActionOk>
-	If  CheckCoupons = 1 Then
-		Var MakeDrinkState = 1
-		Var CouponPage = 1 
-		Var CouponInfo1 =  Ext1a
-		Var CouponInfo2 =  Ext1b
-		Var CouponInfo3 =  Ext1c
-		Var CouponInfo4 =  Ext1d
-		Var CouponInfo5 =  Ext1e
-		Var CouponInfo6 =  Ext1f
-		Var CouponInfo7 =  Ext1g
-		Var CouponInfo8 =  Ext1h
-		Var CouponInfo9 =  Ext1i
-		Var CouponInfo10 =  Ext1j
-		
-		Var TelephoneNumber = TelephoneNumberX
-		GETACCEXT TelephoneNumber 13
-		Var CheckCoupons = 2 
-
-	Else
-
-		If  CheckCoupons = 2 Then 
-
-			Var TaobinCredit =  Ext1b
-			Open "ROOT/taobin_project/xml/page_check_member2.xml" 
-
-		EndIf
-		 
-	EndIf
-
-	
-</EventActionOk>
-
 
 <EventMachine>
 	If MachineStage = "drink-success" Then
@@ -364,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>
@@ -371,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>
@@ -409,7 +373,7 @@
 <Width> 120 </Width>
 <Font> KanitRegularTTF </Font>
 <Color> 0xDE794E </Color>
-<Value> CoffeePointRank </Value>
+<Value> PepweenPoint </Value>
 </Text>
 
 <Text>
@@ -445,7 +409,7 @@
 <Width> 120 </Width>
 <Font> KanitRegularTTF </Font>
 <Color> 0xDE794E </Color>
-<Value> CoffeePointRank </Value>
+<Value> PepweenPoint </Value>
 </Text>
 
 <Text>
@@ -575,131 +539,287 @@
 <Text>
 <X> 239 </X>
 <Y> 1244 </Y>
+<State> ThaiTextState </State>
 <Size> 12 </Size>
 <Width> 100 </Width>
 <Font> KanitRegularTTF </Font>
 <Color> taobinTextColorPoint[0] </Color>
-<Value> taobinTextPoint[0] </Value>
+<Value> taobinTextPointTH[0] </Value>
+</Text>
+
+<Text>
+<X> 250 </X>
+<Y> 1244 </Y>
+<State> EngTextState </State>
+<Size> 12 </Size>
+<Width> 100 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> taobinTextColorPoint[0] </Color>
+<Value> taobinTextPointEN[0] </Value>
 </Text>
 
 <Text>
 <X> 374 </X>
 <Y> 1244 </Y>
+<State> ThaiTextState </State>
 <Size> 12 </Size>
 <Width> 100 </Width>
 <Font> KanitRegularTTF </Font>
 <Color> taobinTextColorPoint[1] </Color>
-<Value> taobinTextPoint[1] </Value>
+<Value> taobinTextPointTH[1] </Value>
+</Text>
+
+<Text>
+<X> 382 </X>
+<Y> 1244 </Y>
+<State> EngTextState </State>
+<Size> 12 </Size>
+<Width> 100 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> taobinTextColorPoint[1] </Color>
+<Value> taobinTextPointEN[1] </Value>
 </Text>
 
 <Text>
 <X> 498 </X>
 <Y> 1244 </Y>
+<State> ThaiTextState </State>
 <Size> 12 </Size>
 <Width> 100 </Width>
 <Font> KanitRegularTTF </Font>
 <Color> taobinTextColorPoint[2] </Color>
-<Value> taobinTextPoint[2] </Value>
+<Value> taobinTextPointTH[2] </Value>
+</Text>
+
+<Text>
+<X> 485 </X>
+<Y> 1244 </Y>
+<State> EngTextState </State>
+<Size> 12 </Size>
+<Width> 150 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> taobinTextColorPoint[2] </Color>
+<Value> taobinTextPointEN[2] </Value>
 </Text>
 
 <Text>
 <X> 635 </X>
 <Y> 1244 </Y>
+<State> ThaiTextState </State>
 <Size> 12 </Size>
 <Width> 100 </Width>
 <Font> KanitRegularTTF </Font>
 <Color> taobinTextColorPoint[3] </Color>
-<Value> taobinTextPoint[3] </Value>
+<Value> taobinTextPointTH[3] </Value>
+</Text>
+
+<Text>
+<X> 644 </X>
+<Y> 1244 </Y>
+<State> EngTextState </State>
+<Size> 12 </Size>
+<Width> 100 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> taobinTextColorPoint[3] </Color>
+<Value> taobinTextPointEN[3] </Value>
 </Text>
 
 <Text>
 <X> 765 </X>
 <Y> 1244 </Y>
+<State> ThaiTextState </State>
 <Size> 12 </Size>
 <Width> 100 </Width>
 <Font> KanitRegularTTF </Font>
 <Color> taobinTextColorPoint[4] </Color>
-<Value> taobinTextPoint[4] </Value>
+<Value> taobinTextPointTH[4] </Value>
+</Text>
+
+<Text>
+<X> 775 </X>
+<Y> 1244 </Y>
+<State> EngTextState </State>
+<Size> 12 </Size>
+<Width> 100 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> taobinTextColorPoint[4] </Color>
+<Value> taobinTextPointEN[4] </Value>
 </Text>
 
 <Text>
 <X> 227 </X>
 <Y> 1388 </Y>
+<State> ThaiTextState </State>
 <Size> 12 </Size>
 <Width> 105 </Width>
 <Font> KanitRegularTTF </Font>
 <Color> taobinTextColorPoint[5] </Color>
-<Value> taobinTextPoint[5] </Value>
+<Value> taobinTextPointTH[5] </Value>
 </Text>
 
 <Text>
-<X> 370 </X>
+<X> 250 </X>
 <Y> 1388 </Y>
+<State> EngTextState </State>
+<Size> 12 </Size>
+<Width> 105 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> taobinTextColorPoint[5] </Color>
+<Value> taobinTextPointEN[5] </Value>
+</Text>
+
+<Text>
+<X> 375 </X>
+<Y> 1388 </Y>
+<State> ThaiTextState </State>
 <Size> 12 </Size>
 <Width> 100 </Width>
 <Font> KanitRegularTTF </Font>
 <Color> taobinTextColorPoint[6] </Color>
-<Value> taobinTextPoint[6] </Value>
+<Value> taobinTextPointTH[6] </Value>
+</Text>
+
+<Text>
+<X> 368 </X>
+<Y> 1388 </Y>
+<State> EngTextState </State>
+<Size> 12 </Size>
+<Width> 100 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> taobinTextColorPoint[6] </Color>
+<Value> taobinTextPointEN[6] </Value>
 </Text>
 
 <Text>
 <X> 521 </X>
 <Y> 1388 </Y>
+<State> ThaiTextState </State>
 <Size> 12 </Size>
 <Width> 100 </Width>
 <Font> KanitRegularTTF </Font>
 <Color> taobinTextColorPoint[7] </Color>
-<Value> taobinTextPoint[7] </Value>
+<Value> taobinTextPointTH[7] </Value>
+</Text>
+
+<Text>
+<X> 508 </X>
+<Y> 1388 </Y>
+<State> EngTextState </State>
+<Size> 12 </Size>
+<Width> 100 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> taobinTextColorPoint[7] </Color>
+<Value> taobinTextPointEN[7] </Value>
 </Text>
 
 <Text>
 <X> 634 </X>
 <Y> 1388 </Y>
+<State> ThaiTextState </State>
 <Size> 12 </Size>
 <Width> 100 </Width>
 <Font> KanitRegularTTF </Font>
 <Color> taobinTextColorPoint[8] </Color>
-<Value> taobinTextPoint[8] </Value>
+<Value> taobinTextPointTH[8] </Value>
+</Text>
+
+<Text>
+<X> 634 </X>
+<Y> 1388 </Y>
+<State> EngTextState </State>
+<Size> 12 </Size>
+<Width> 100 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> taobinTextColorPoint[8] </Color>
+<Value> taobinTextPointEN[8] </Value>
 </Text>
 
 <Text>
 <X> 769 </X>
 <Y> 1388 </Y>
+<State> ThaiTextState </State>
 <Size> 12 </Size>
 <Width> 100 </Width>
 <Font> KanitRegularTTF </Font>
 <Color> taobinTextColorPoint[9] </Color>
-<Value> taobinTextPoint[9] </Value>
+<Value> taobinTextPointTH[9] </Value>
+</Text>
+
+<Text>
+<X> 764 </X>
+<Y> 1388 </Y>
+<State> EngTextState </State>
+<Size> 12 </Size>
+<Width> 100 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> taobinTextColorPoint[9] </Color>
+<Value> taobinTextPointEN[9] </Value>
 </Text>
 
 <Text>
 <X> 246 </X>
 <Y> 1530 </Y>
+<State> ThaiTextState </State>
 <Size> 12 </Size>
 <Width> 100 </Width>
 <Font> KanitRegularTTF </Font>
 <Color> taobinTextColorPoint[10] </Color>
-<Value> taobinTextPoint[10] </Value>
+<Value> taobinTextPointTH[10] </Value>
+</Text>
+
+<Text>
+<X> 246 </X>
+<Y> 1530 </Y>
+<State> EngTextState </State>
+<Size> 12 </Size>
+<Width> 100 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> taobinTextColorPoint[10] </Color>
+<Value> taobinTextPointEN[10] </Value>
 </Text>
 
 <Text>
 <X> 355 </X>
 <Y> 1530 </Y>
+<State> ThaiTextState </State>
 <Size> 12 </Size>
 <Width> 110 </Width>
 <Font> KanitRegularTTF </Font>
 <Color> taobinTextColorPoint[11] </Color>
-<Value> taobinTextPoint[11] </Value>
+<Value> taobinTextPointTH[11] </Value>
+</Text>
+
+<Text>
+<X> 375 </X>
+<Y> 1530 </Y>
+<State> EngTextState </State>
+<Size> 12 </Size>
+<Width> 110 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> taobinTextColorPoint[11] </Color>
+<Value> taobinTextPointEN[11] </Value>
 </Text>
 
 <Text>
 <X> 515 </X>
 <Y> 1530 </Y>
+<State> ThaiTextState </State>
 <Size> 12 </Size>
 <Width> 100 </Width>
 <Font> KanitRegularTTF </Font>
 <Color> taobinTextColorPoint[12] </Color>
-<Value> taobinTextPoint[12] </Value>
+<Value> taobinTextPointTH[12] </Value>
+</Text>
+
+<Text>
+<X> 500 </X>
+<Y> 1530 </Y>
+<State> EngTextState </State>
+<Size> 12 </Size>
+<Width> 100 </Width>
+<Font> KanitRegularTTF </Font>
+<Color> taobinTextColorPoint[12] </Color>
+<Value> taobinTextPointEN[12] </Value>
 </Text>
 
 ;

xml/event/pepween/page_collect_point_pro_pepween_error.xml

@@ -22,6 +22,53 @@
         Var ShowEngText = "Invisible"
 	EndIf
 
+	Var PopweenPointNewIndex = 0
+
+	If Seeker.selected_a_drink = "12-99-05-0053" Then
+		Var PopweenPointNewIndex = 0
+	EndIf
+	If Seeker.selected_a_drink = "12-99-05-0054" Then
+		Var PopweenPointNewIndex = 1
+	EndIf
+	If Seeker.selected_a_drink = "12-99-05-0055" Then
+		Var PopweenPointNewIndex = 2
+	EndIf
+	If Seeker.selected_a_drink = "12-99-05-0057" Then
+		Var PopweenPointNewIndex = 3
+	EndIf
+	If Seeker.selected_a_drink = "12-99-05-0058" Then
+		Var PopweenPointNewIndex = 4
+	EndIf
+	If Seeker.selected_a_drink = "12-99-05-0059" Then
+		Var PopweenPointNewIndex = 5
+	EndIf
+	If Seeker.selected_a_drink = "12-99-05-0060" Then
+		Var PopweenPointNewIndex = 6
+	EndIf
+	If Seeker.selected_a_drink = "12-99-05-0061" Then
+		Var PopweenPointNewIndex = 7
+	EndIf
+	If Seeker.selected_a_drink = "12-99-05-0062" Then
+		Var PopweenPointNewIndex = 8
+	EndIf
+	If Seeker.selected_a_drink = "12-99-05-0064" Then
+		Var PopweenPointNewIndex = 9
+	EndIf
+	If Seeker.selected_a_drink = "12-99-05-0065" Then
+		Var PopweenPointNewIndex = 10
+	EndIf
+	If Seeker.selected_a_drink = "12-99-05-0056" Then
+		Var PopweenPointNewIndex = 11
+	EndIf
+	If Seeker.selected_a_drink = "12-99-03-0066" Then
+		Var PopweenPointNewIndex = 12
+	EndIf
+
+	Var CurrentPointSlot = PopweenPointNewIndex + 1
+	Var CurrentPointCheck = "check"
+	Var val3 = "X"
+	AddData 35 TelephoneNumber CurrentPointSlot CurrentPointCheck val3
+
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -32,12 +79,6 @@
 
 	Var Timeout = Timeout + 1
 	If Timeout > 5 Then
-        ; goto lid straw
-
-		If PromotionIDCurrentOrder > 1 Then
-			Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
-		EndIf
-
 		Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 	EndIf
 

xml/event/pepween/page_pepween_random.xml

@@ -168,6 +168,31 @@
 
             ; Send to server
 
+            Var CodeType = ""
+            Var var2 = "X"
+            Var var3 = "X"
+
+            If UserCouponReward = "dis30" Then
+                Var CodeType = "115"
+            EndIf
+
+            If UserCouponReward = "dis50" Then
+                Var CodeType = "116"
+            EndIf
+
+            If UserCouponReward = "dis100" Then
+                Var CodeType = "114"
+            EndIf
+
+            ; Empty Random 
+            ;If CodeType = "" Then
+            ;    ; TODO: Handle just in case
+            ;Else
+            ;    
+            ;EndIf
+
+            AddData 36 TelephoneNumber CodeType var2 var3
+
             Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml"
         </EventOnClick>
     </Button>
@@ -189,6 +214,31 @@
 
             ; Send to server
 
+            Var CodeType = ""
+            Var var2 = "X"
+            Var var3 = "X"
+
+            If UserCouponReward = "dis30" Then
+                Var CodeType = "115"
+            EndIf
+
+            If UserCouponReward = "dis50" Then
+                Var CodeType = "116"
+            EndIf
+
+            If UserCouponReward = "dis100" Then
+                Var CodeType = "114"
+            EndIf
+
+            ; Empty Random 
+            ;If CodeType = "" Then
+            ;    ; TODO: Handle just in case
+            ;Else
+            ;    
+            ;EndIf
+
+            AddData 36 TelephoneNumber CodeType var2 var3
+
             Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml"
         </EventOnClick>
     </Button>
@@ -210,6 +260,31 @@
 
             ; Send to server
 
+            Var CodeType = ""
+            Var var2 = "X"
+            Var var3 = "X"
+
+            If UserCouponReward = "dis30" Then
+                Var CodeType = "115"
+            EndIf
+
+            If UserCouponReward = "dis50" Then
+                Var CodeType = "116"
+            EndIf
+
+            If UserCouponReward = "dis100" Then
+                Var CodeType = "114"
+            EndIf
+
+            ; Empty Random 
+            ;If CodeType = "" Then
+            ;    ; TODO: Handle just in case
+            ;Else
+            ;    
+            ;EndIf
+
+            AddData 36 TelephoneNumber CodeType var2 var3
+
             Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml"
         </EventOnClick>
     </Button>
@@ -231,6 +306,31 @@
 
             ; Send to server
 
+            Var CodeType = ""
+            Var var2 = "X"
+            Var var3 = "X"
+
+            If UserCouponReward = "dis30" Then
+                Var CodeType = "115"
+            EndIf
+
+            If UserCouponReward = "dis50" Then
+                Var CodeType = "116"
+            EndIf
+
+            If UserCouponReward = "dis100" Then
+                Var CodeType = "114"
+            EndIf
+
+            ; Empty Random 
+            ;If CodeType = "" Then
+            ;    ; TODO: Handle just in case
+            ;Else
+            ;    
+            ;EndIf
+
+            AddData 36 TelephoneNumber CodeType var2 var3
+
             Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml"
         </EventOnClick>
     </Button>
@@ -252,6 +352,31 @@
 
             ; Send to server
 
+            Var CodeType = ""
+            Var var2 = "X"
+            Var var3 = "X"
+
+            If UserCouponReward = "dis30" Then
+                Var CodeType = "115"
+            EndIf
+
+            If UserCouponReward = "dis50" Then
+                Var CodeType = "116"
+            EndIf
+
+            If UserCouponReward = "dis100" Then
+                Var CodeType = "114"
+            EndIf
+
+            ; Empty Random 
+            ;If CodeType = "" Then
+            ;    ; TODO: Handle just in case
+            ;Else
+            ;    
+            ;EndIf
+
+            AddData 36 TelephoneNumber CodeType var2 var3
+
             Open "ROOT/taobin_project/xml/event/pepween/page_pepween_result.xml"
         </EventOnClick>
     </Button>

xml/event/pepween/page_pepween_result.xml

@@ -29,36 +29,17 @@
     <EventTimeout>
         DEBUGVAR Timeout
 
-        If PayOfflineMode = 1 Then
-            Var ServerRespond = 0
-            Var CouponResponeFailed = 1
-        EndIf
 
-        If Timeout > 60 Then
+
+        If Timeout > 5 Then
             ; Check and return Error
-            Var CouponResponeFailed = 1
-            Open "ROOT/taobin_project/xml/event/pepween/page_pepween_error.xml"
+            Open "ROOT/taobin_project/xml/page_lid_straw.xml"
         EndIf
 
         Var Timeout = Timeout + 1
         TimerReset
     </EventTimeout>
 
-    <EventActionOk>
-        If CouponResponeFailed = 0 Then
-            ; TODO:
-            ;Open "ROOT/taobin_project/xml/event/pepween/page_pepween_error.xml"
-        EndIf
-
-    </EventActionOk>
-
-    <EventActionError>
-        ; TODO: open coupon send error page
-        If CouponResponeFailed = 1 Then
-            Open "ROOT/taobin_project/xml/event/pepween/page_pepween_error.xml"
-        EndIf
-    </EventActionError>
-
     <Video>
         <X> 0 </X>
         <Y> 0 </Y>

xml/event/script_common_for_open_promotion_xml.ev

@@ -5,6 +5,13 @@ DEBUGVAR PayOfflineMode
 ; zone promote
 If OpenFromPageBoard = 1 Then
 
+	If PepweenEnable = 1 Then
+		Var BigButtonEnable = "Enable"
+		OpenInst 2 "ROOT/taobin_project/xml/event/promotion_pepween.xml"
+	    Var OpenFromPageBoard = 0
+	EndIf
+
+
 	If TamatianEnable = 1 Then
 
 		Var BigButtonEnable = "Enable"  

xml/event/tricker.ev

@@ -41,6 +41,8 @@ Var TamatianEnable = 0
 ; September 9 - 16
 Var MayDayRunEnable = 0
 
+; Enable Milk Choice Vegan
+Var MilkChoiceVeganEnable = 0
 
 If SystemDateMonthInt = 9 Then
 	If SystemDateDayInt > 5 Then
@@ -80,6 +82,11 @@ If SystemDateMonthInt = 10 Then
 		Var PepweenEnable = 1
 	EndIf
 
+	If SystemDateDayInt >= 13 Then
+		If SystemDateDayInt <= 24 Then
+			Var MilkChoiceVeganEnable = 1
+		EndIf
+	EndIf
 EndIf
 
 DEBUGVAR PepweenEnable
@@ -189,6 +196,7 @@ EndIf
 
 
 If InternationalEnable = 1 Then
+	Var MilkChoiceVeganEnable = 0
 	Var GameEnableFromTrickerEv = 0
 	Var TamatianEnable = 0
 	Var MayDayRunEnable = 0

xml/menu_new_layout_gen.py

@@ -262,6 +262,16 @@
         out_xml( '\t</Button>\r\n')
 
 
+        menu_color_font = None
+        desc_color_font = None
+
+        sppromo = pd_code_2.split("-") if pd_code_2 != "##-##-##-####" else pd_code_3.split("-")
+        if int(sppromo[len(sppromo) - 1][2:]) > 52 and int(sppromo[len(sppromo) - 1][2:]) < 67:
+    
+          menu_color_font = '0xFFFFFF'
+          desc_color_font = '0xFFFFFF'
+   
+     
         if spl[1] != "None":
           out_xml( '\t<Text>\r\n')
           out_xml( '\t<X>  16   </X>\r\n')
@@ -270,7 +280,7 @@
           out_xml( '\t<Width>220</Width>\r\n')
           out_xml( '\t<Mode> "multi2" </Mode>\r\n')
           out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
-          out_xml( '\t<Color> 0x322B26 </Color>\r\n')
+          out_xml( '\t<Color> 0x322B26 </Color>\r\n' if menu_color_font == None else '\t<Color> '+menu_color_font+' </Color>\r\n')
           out_xml( '\t<State> showthaiText </State>\r\n')
           out_xml( '\t<Value> "' + spl[0].replace("\\n", "\n") + '" </Value>\r\n')
           out_xml( '\t</Text>\r\n')
@@ -281,7 +291,7 @@
           out_xml( '\t<Size> 14 </Size>\r\n')
           out_xml( '\t<Width>220</Width>\r\n')
           out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
-          out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
+          out_xml( '\t<Color> 0x6F5F51 </Color>\r\n' if menu_color_font == None else '\t<Color> '+menu_color_font+' </Color>\r\n')
           out_xml( '\t<State> showthaiText </State>\r\n')
           out_xml( '\t<Value> "' +  spl[2].replace("\\n", "\n") + '" </Value>\r\n')
           out_xml( '\t</Text>\r\n')
@@ -294,7 +304,7 @@
           out_xml( '\t<Width>220</Width>\r\n')
           out_xml( '\t<Mode> "multi2" </Mode>\r\n')
           out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
-          out_xml( '\t<Color> 0x322B26 </Color>\r\n')
+          out_xml( '\t<Color> 0x322B26 </Color>\r\n' if menu_color_font == None else '\t<Color> '+menu_color_font+' </Color>\r\n')
           out_xml( '\t<State> showengText </State>\r\n')
           out_xml( '\t<Value> "' + spl[1].replace("\\n", "\n") + '" </Value>\r\n')
           out_xml( '\t</Text>\r\n')
@@ -305,7 +315,7 @@
           out_xml( '\t<Size> 14 </Size>\r\n')
           out_xml( '\t<Width>220</Width>\r\n')
           out_xml( '\t<Font> KanitMediumTTF </Font>\r\n')
-          out_xml( '\t<Color> 0x6F5F51 </Color>\r\n')
+          out_xml( '\t<Color> 0x6F5F51 </Color>\r\n' if menu_color_font == None else '\t<Color> '+menu_color_font+' </Color>\r\n')
           out_xml( '\t<State> showengText </State>\r\n')
           out_xml( '\t<Value> "' + spl[3].replace("\\n", "\n") + '" </Value>\r\n')
           out_xml( '\t</Text>\r\n')

xml/page_catalog_group_pro_pepween.skt

@@ -14,6 +14,16 @@
         #include=menu_catalog_default_init.py
     ?>
     
+    DEBUGVAR SystemTimeHourInt
+    If SystemTimeHourInt >= 19 Then
+        Var Haunted7price = 30
+    Else
+        If SystemTimeHourInt < 5 Then
+            Var Haunted7price = 30
+        Else
+            Var Haunted7price = $12-99-03-0066.Price
+        EndIf
+    EndIf
     
 
     Var Timeout = 0

xml/page_collect_point_1.xml

@@ -65,8 +65,50 @@
 	Var CampaingRef1 = CampaingRef1 + CampaingRef2
 	Var ParamCP = ParamCP + CampaingRef1
 
+	Var GoToNormalCollectPoint = 1
+	If PepweenEnable = 1 Then
+		If Seeker.selected_a_drink = "12-99-05-0053" Then
+			Var GoToNormalCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0054" Then
+			Var GoToNormalCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0055" Then
+			Var GoToNormalCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0057" Then
+			Var GoToNormalCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0058" Then
+			Var GoToNormalCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0059" Then
+			Var GoToNormalCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0060" Then
+			Var GoToNormalCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0061" Then
+			Var GoToNormalCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0062" Then
+			Var GoToNormalCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0064" Then
+			Var GoToNormalCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0065" Then
+			Var GoToNormalCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-05-0056" Then
+			Var GoToNormalCollectPoint = 0
+		EndIf
+		If Seeker.selected_a_drink = "12-99-03-0066" Then
+			Var GoToNormalCollectPoint = 0
+		EndIf
+	EndIf
 	
-	
+	DEBUGVAR GoToNormalCollectPoint
 	
 	If Seeker.TNumberTaobinCredit = "" Then
 	
@@ -104,7 +146,8 @@
 			Var Param1 = TelephoneNumber + "/" 
 			Var Param1 = Param1 + ParamCP
 
-			If PepweenEnable = 1 Then
+
+			If GoToNormalCollectPoint = 0 Then
 				GETACCEXT TelephoneNumber 31
 				Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml"  
 			Else
@@ -130,6 +173,7 @@
 		SAVELOG "collect_point1-p71."
 		Var TelephoneNumberX = TelephoneNumber
 		DEBUGVAR TelephoneNumber
+		DEBUGVAR GoToNormalCollectPoint
 		If PromotionIDCurrentOrder > 1 Then
 			Open "ROOT/taobin_project/xml/page_display_Promo1Get1Free.xml"
 		EndIf
@@ -137,7 +181,7 @@
 		;GetAccInfo TelephoneNumber OperatorTemp CreditAmount OperatorStatus AccountType GetScore tc
 		Var Param1 = TelephoneNumber + "/" 
 		Var Param1 = Param1 + ParamCP
-		If PepweenEnable = 1 Then
+		If GoToNormalCollectPoint = 0 Then
 			GETACCEXT TelephoneNumber 31
 			Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml"  
 		Else
@@ -613,7 +657,7 @@
 			Var Param1 = TelephoneNumber + "/" 
 			Var Param1 = Param1 + ParamCP
 
-			If PepweenEnable = 1 Then
+			If GoToNormalCollectPoint = 0 Then
 				GETACCEXT TelephoneNumber 31
 				Open "ROOT/taobin_project/xml/event/pepween/page_collect_point_pro_pepween_2.xml"  
 			Else

xml/page_topping_select7.xml

@@ -85,7 +85,6 @@
 	;Var ShotCoffeePremium = "Enable"
 	;Var showOreoAddEnable = "Enable"
 
-	Var CerealMilkToppingEnable = "Invisible"
 
 	Var ExtraTopping = "Invisible"
 
@@ -118,6 +117,7 @@
 		Var text_x_add_oreo_price = 430
 		Var text_show_normal_x = 408
 		Var text_x_free_adjust = 100
+		Var text_milk_choice_price_x = 255
 		If PromotionOreoToppingFreeEnable = 0 Then 
 			Var text_x_free_adjust = text_x_free_adjust + 5
 		EndIf
@@ -136,10 +136,10 @@
 		Var text_x_add_oreo_price = 420
 		Var text_show_normal_x = 386
 		Var text_x_free_adjust = 70
+		Var text_milk_choice_price_x = 237
 		If PromotionOreoToppingFreeEnable = 0 Then 
 			Var text_x_free_adjust = text_x_free_adjust + 30
 		EndIf
-	
 	EndIf
 
 	Var text_x_free_topping =  text_x_add_oreo_price + text_x_free_adjust
@@ -299,8 +299,15 @@
 	Var img_smth_dis = "/bt_smoothie_disable_no.png"
 	Var img_smth_dis2 = "/bt_smoothie_disable2_no.png"
 
+	If MilkChoiceVeganEnable = 1 Then
+		Var CerealMilkToppingEnable = "Invisible"
+		Var CerealMilkToppingVegan = "Enable"
+	Else
+		Var CerealMilkToppingEnable = "Enable"
+		Var CerealMilkToppingVegan = "Invisible"
+	EndIf
+	Var CerealMilkEnable = "Invisible"
 
-	Var CerealMilkEnable = "Enable"
 
 	Var topping_price_refresh = 1
 
@@ -524,6 +531,7 @@
 		Var text_x_add_oreo_price = 430
 		Var text_show_normal_x = 408
 		Var text_x_free_adjust = 100
+		Var text_milk_choice_price_x = 255
 		If PromotionOreoToppingFreeEnable = 0 Then 
 			Var text_x_free_adjust = text_x_free_adjust + 5
 		EndIf
@@ -542,10 +550,10 @@
 		Var text_x_add_oreo_price = 420
 		Var text_show_normal_x = 386
 		Var text_x_free_adjust = 70
+		Var text_milk_choice_price_x = 237
 		If PromotionOreoToppingFreeEnable = 0 Then 
 			Var text_x_free_adjust = text_x_free_adjust + 30
 		EndIf
-	
 	EndIf
 
 	Var text_x_free_topping =  text_x_add_oreo_price + text_x_free_adjust
@@ -1485,8 +1493,7 @@
 		If MenuCodeName1 = "Cereal-Milk" Then
 			Var CerealMilkToppingEnable = "Enable"
 			Var CerealMilkPrice = SubMenuPrice1
-			Var ExtraTopping = "Enable"
-		
+			Var CerealMilkEnable = "Enable"
 		EndIf
 
 		
@@ -1619,8 +1626,8 @@
 <X> 52 </X>
 <Y> 881 </Y>
 <Width> 1080 </Width>
-<Height> 900 </Height>
-<ScrollHeight> "auto-all" </ScrollHeight>
+<Height> 880 </Height>
+<ScrollHeight> 880 </ScrollHeight>
 <Scroll> "Vertical" </Scroll>
 <Column> 1 </Column>
 
@@ -2793,45 +2800,28 @@
 ;
 ;
 ;
-;-BEGIN shot layout
+;
+;
+;
+;
+;-BEGIN milk choice
 <Block>
-<State> ExtraTopping </State>
-<Width> 1080 </Width>
-<Height> "auto" </Height>
+<State> "Enable" </State>
+<Width> 986 </Width>
+<Height> 157 </Height>
 <MarginTop> 20 </MarginTop>
-
-<ListView1>
-<Width> 986 </Width>
-<Height> "auto" </Height>	
-<Align> "vertical"</Align>
-<State> ExtraTopping </State>
-;
-<Row1>
-	<Width> 986 </Width>
-	<Height> 64 </Height>
-	<State> ExtraTopping </State>
-	<Image>
-		<Filename> Var( DirImage + "/bg_top.png" ) </Filename>
-	</Image>
-</Row1>
-
-;
-;
-;
-<Row1>
-<Width> 986 </Width>
-<Height> "auto" </Height>	
-<State> CerealMilkToppingEnable </State>
-; 
 <Image>
-	<X> 0 </X>
-	<Y> 0 </Y>
-	<Filename> Var( DirImage + "/bg_top_milk.png") </Filename>
+<State> CerealMilkToppingEnable </State>
+<Filename> Var( DirImage + "/bg_milk_choice.png" )</Filename>
+</Image>
+<Image>
+<State> CerealMilkToppingVegan </State>
+<Filename> Var( DirImage + "/bg_milk_choice_j.png" )</Filename>
 </Image>
 
 <Button>
 <X> 40 </X>
-<Y> 5 </Y>
+<Y> 72 </Y>
 <State> CerealMilkEnable </State>
 <Mode> "No" </Mode>
 <Filename> "ROOT/taobin_project/image/topping2/bn_cereal.png" </Filename>
@@ -2857,7 +2847,7 @@
 ; 
 <Button>
 <X> 896 </X>
-<Y> 14 </Y>
+<Y> 78 </Y>
 <State> CerealMilkEnable </State>
 <Mode> "No" </Mode>
 <Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
@@ -2883,16 +2873,51 @@
 </Button>
 
 <Text>
-<X> CerealMilkX </X>
-<Y> 2 </Y>
+<X> text_milk_choice_price_x </X>
+<Y> 69 </Y>
 <Font> KanitRegularTTF </Font>
-<State> CerealMilkEnable</State>
+<State> "Enable" </State>
 <Size> 36 </Size>
 <Color> 0x84776F </Color>
 <Value> CerealMilkPrice </Value>
 </Text>
 
+</Block>
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;
+;-BEGIN shot layout
+<Block>	
+<State> ExtraTopping </State>
+<Width> 1080 </Width>
+<Height> "auto" </Height>
+<MarginTop> 20 </MarginTop>
+
+<ListView1>
+<Width> 986 </Width>
+<Height> "auto" </Height>	
+<Align> "vertical"</Align>
+<State> ExtraTopping </State>
+;
+<Row1>
+	<Width> 986 </Width>
+	<Height> 64 </Height>
+	<State> ExtraTopping </State>
+	<Image>
+		<Filename> Var( DirImage + "/bg_top.png" ) </Filename>
+	</Image>
 </Row1>
+
 ;
 ;
 ;