From d73f5e9e76b29001364b28e1242cdf4ca203cd9c Mon Sep 17 00:00:00 2001
From: Pakin <pakin.t@forth.co.th>
Date: Mon, 6 Nov 2023 10:42:33 +0700
Subject: [PATCH] move codes for cont checking

---
 xml/page_board.xml | 66 ++++++++++++++++++++++++++++++++++------------
 1 file changed, 49 insertions(+), 17 deletions(-)

diff --git a/xml/page_board.xml b/xml/page_board.xml
index 364b3877..714767e3 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -917,20 +917,10 @@
 		EndIf
 	EndIf
 
-
-	; New profile: Y18, Y18+Live, NoSugarStepRight2
-
-	DEBUGVAR XMLProfile
-	; test 
-	;	Var XMLProfile = "y18IDCard"
-	;	Var XMLProfile = "y18IDCardLive"
-	;	Var XMLProfile = "SugarBreak"
-
-	; test action
+	; Init read
 	ReadProfile "ROOT/xmlprofile/main.json" "XMLProfile"
 	DEBUGVAR XMLProfile
 
-	; Var XMLProfile = "Discount50"
 	STRCONTAIN "y18IDCardLive" XMLProfile Y18IDCARDLIVE_ENABLE
 	STRCONTAIN "y18IDCard" XMLProfile Y18IDCARD_ENABLE
 	STRCONTAIN "SugarBreak" XMLProfile SugarBreakEnable
@@ -941,7 +931,6 @@
 	DEBUGVAR Only18
 	DEBUGVAR NoSugarStepRight2
 	DEBUGVAR HalfPrice
-
 	If Y18IDCARDLIVE_ENABLE = "true" Then
 		Var EnableLiveness = "true"
 		Var Only18 = "true"
@@ -952,6 +941,7 @@
 
 	If Y18IDCARD_ENABLE = "true" Then
 		Var Only18 = "true"
+		; MenuProfile 
 	Else
 		Var Only18 = "false"
 	EndIf
@@ -973,11 +963,6 @@
 		DEBUGVAR Discount50
 	EndIf
 
-	DEBUGVAR EnableLiveness
-	DEBUGVAR Only18
-	DEBUGVAR NoSugarStepRight2
-	DEBUGVAR HalfPrice
-
 	Var NETCORE_LOST_COUNT_UP = 0
 
 </EventOpen>
@@ -1017,6 +1002,48 @@
 
 <Timeout> 1000 </Timeout>
 <EventTimeout>
+
+	; New profile: Y18, Y18+Live, NoSugarStepRight2
+
+	;DEBUGVAR 12-02-01-0021.Price
+	;DEBUGVAR $12-02-01-0021.Price
+
+	DEBUGVAR XMLProfile
+	; test 
+	;	Var XMLProfile = "y18IDCard"
+	;	Var XMLProfile = "y18IDCardLive"
+	;	Var XMLProfile = "SugarBreak"
+
+	If XMLProfile = "" Then
+
+		; test action
+		ReadProfile "ROOT/xmlprofile/main.json" "XMLProfile"
+		DEBUGVAR XMLProfile
+
+		; Var XMLProfile = "Discount50"
+
+	EndIf
+	
+	If Discount50 = "true" Then
+		Var HalfPrice = "true"
+
+		If InvokeDiscountCMD = "" Then
+			__CMD "invoke-discount-50" "-" "-" "-"
+			Var InvokeDiscountCMD = "true"
+		Else
+			DEBUGVAR InvokeDiscountCMD
+		EndIf
+
+	Else
+		Var HalfPrice = "false"
+		DEBUGVAR Discount50
+	EndIf
+
+	DEBUGVAR EnableLiveness
+	DEBUGVAR Only18
+	DEBUGVAR NoSugarStepRight2
+	DEBUGVAR HalfPrice
+
 	DEBUGVAR WebAppShow
 	If IgnoreNetCore = "true" Then
 
@@ -1164,10 +1191,15 @@
 			Var CountDownPauseVideo = CountDownPauseVideo - 1
 
 			If CountDownPauseVideo  = 1 Then
+
+				If InvokeDiscountCMD = "true" Then
+
 				If JXMLVersionInt > 451 Then 
 					TapScreen 30 638
 				EndIf
 
+				EndIf
+
 			EndIf
 			If CountDownPauseVideo  = 0 Then