Mode cocktail show disable promtioni

menu/new-layout.tsv

@@ -416,8 +416,8 @@ Name=pepween,file=page_catalog_group_pro_pepween.skt
 		คุณยายท้ายหมู่บ้าน	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. Milk. Oreo and Ice	-	-	12-99-03-0066	bn_haunted_woods.png	-	-	-
+		ดิน 7 ป่าช้า	7 Haunted Woods	เป๊ปซี่ นม และโอริโอ้	Pepsi, Milk, Oreo and Ice	-	-	12-99-03-0066	bn_haunted_woods.png	-	-	-
-
+		น้ำตาหมาดำ	Midnight Hound's Sorrow	เป๊ปซี่ โกโก้ นม และโอริโอ้	Pepsi, Cocoa, Milk, Oreo and Ice			12-99-03-0067
 
 
 Name=CockTail,file=page_catalog_group_cocktail.skt

xml/event/script_common_for_open_promotion_xml.ev

@@ -2,33 +2,39 @@ DEBUGVAR NetworkStatus
 DEBUGVAR SELLONLINE
 DEBUGVAR PayOfflineMode
 
-; zone promote
+If CocktailShow = "true" Then
-If OpenFromPageBoard = 1 Then
+	If OpenFromPageBoard = 1 Then
-
-	If PepweenEnable = 1 Then
-		Var BigButtonEnable = "Enable"
-		OpenInst 2 "ROOT/taobin_project/xml/event/promotion_pepween.xml"
-	    Var OpenFromPageBoard = 0
-	
-	Else
 		OpenInst 2 "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
-	    
-	EndIf
-Else
-	If PepweenEnable = 1 Then
-
-		; Temporary debug
-		Var BigButtonEnable = "Enable"
-		Open "ROOT/taobin_project/xml/event/promotion_pepween.xml"
-
-
 	Else
-
-
 		Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
-
 	EndIf
 
-	
+Else
+	; 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
+		
+		Else
+			OpenInst 2 "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+		    
+		EndIf
+	Else
+		If PepweenEnable = 1 Then
+			; Temporary debug
+			Var BigButtonEnable = "Enable"
+			Open "ROOT/taobin_project/xml/event/promotion_pepween.xml"
+
+		Else
+
+			Open "ROOT/taobin_project/xml/page_catalog_group_recommend.xml" 
+
+		EndIf
+
+		
+	EndIf
 EndIf
 Var OpenFromPageBoard = 0

xml/page_board.xml

@@ -243,6 +243,7 @@
 		Var MenuKidButtonState = "Invisible"
 		Var WheyShow = "false"
 		Var WheyButtonState = "Invisible"
+		Var WebAppShow = "Invisible"
 	EndIf
 
 
@@ -369,6 +370,7 @@
 	Var ShowPrice = "Enable"
 	If RoadShow = "true" Then
 		Var ShowPrice = "Invisible"
+		Var WebAppShow = "Invisible"
 	EndIf
 
 	;SAVELOG WheyShow
@@ -595,7 +597,6 @@
 	Var LedLidBlink = "no"
 
 
-	Var WebAppShow = "Enable"
 	Var EnableSelectMenuBetweenBrew = "Enable"
 
 
@@ -955,6 +956,7 @@
 
 <Timeout> 1000 </Timeout>
 <EventTimeout>
+	DEBUGVAR WebAppShow
 	If IgnoreNetCore = "true" Then
 
 	Else

xml/page_catalog_group_pro_pepween.xml

@@ -3558,7 +3558,7 @@ Hag of village" </Value>
 		Var NameDrink = "7 Haunted Woods"
 		Var NameDrinkTH = "ดิน 7 ป่าช้า"
 		Var DrinkDescriptionTH = "เป๊ปซี่ นม และโอริโอ้"
-		Var DrinkDescription = "Pepsi. Milk. Oreo and Ice"
+		Var DrinkDescription = "Pepsi, Milk, Oreo and Ice"
 		Var PictureDrink = "ROOT/taobin_project/image/page_drink_picture2_n/" + "bn_haunted_woods.png"
 		Var OpenFromXML = CurrentXMLFileName2
 		Var PriceD1 = $-.Price
@@ -3658,7 +3658,7 @@ Hag of village" </Value>
 	<Font> KanitMediumTTF </Font>
 	<Color> 0xFFFFFF </Color>
 	<State> showengText </State>
-	<Value> "Pepsi. Milk. Oreo and Ice" </Value>
+	<Value> "Pepsi, Milk, Oreo and Ice" </Value>
 	</Text>
 	<Image>
 	<X> 16 </X>

xml/page_topping_select6.lxml

@@ -679,6 +679,13 @@
 			
 
 		Else
+			DEBUGVAR MAT_ID_9701
+			DEBUGVAR MAT_ID_9601
+			DEBUGVAR MAT_ID_519701
+			DEBUGVAR MAT_ID_519601
+			DEBUGVAR StrawState
+
+
 			Var ShowLidStraw = "Enable" 
 			If StrawState = "Enable" Then
 				If MAT_ID_9701 = "Enable" Then
@@ -687,9 +694,7 @@
 					Var StrawState = MAT_ID_9701
 				EndIf
 			EndIf
-			DEBUGVAR MAT_ID_9701
+			
-			DEBUGVAR StrawState
-
 			If StrawState = "Press" Then
 				Var Seeker.thankStrawFlag = 1
 			Else
@@ -730,6 +735,7 @@
 		EndIf
 		
 
+
 		If LidState = "Enable" Then
 			Var LidDeactiveButton = "Invisible" 
 		Else