add bypass local

xml/page_board.xml

@@ -922,30 +922,54 @@
 	EndIf
 
 	; Debug
+	
 	; Var XMLProfile = XMLProfile + "-EnableXMLProfile"
 
 	; Init read if XMLProfile contains this mode
 	; 
 	; STRCONTAIN "EnableXMLProfile" XMLProfile EnableJsonProfileMode
-
+	; DEBUGVAR EnableJsonProfileMode
+	; If EnableJsonProfileMode = "true" Then
+	; 	DEBUGVAR XMLProfile
+	; Else
+	; 	DEBUGVAR EnableJsonProfileMode
+	; EndIf
+	DEBUGVAR EnableJsonProfileMode
+	DEBUGVAR IsServerProfileApplyMode
+	
 	If EnableJsonProfileMode = "true" Then
 
-		Var IsServerProfileApplyMode = ""
+	ReadProfile "ROOT/xmlprofile/main.json" "XMLProfileFromJson"
+	DEBUGVAR XMLProfile
+	DEBUGVAR XMLProfileFromJson
 
-		; get local enabled profiles
+	; Force mode, use "SERVER_OVERWRITE" as param
-		ReadProfile "ROOT/xmlprofile/main.json" "XMLProfileFromJson"
-		DEBUGVAR XMLProfileFromJson
 
-		; finalize applied profiles
+	CompareJsonProfileToServerProfile "-"
-		;	apply profiles by diff server profile to local
+		
-		;	insert "Ignore" if don't want to compare to server
-		CompareJsonProfileToServerProfile
 		; XMLProfile must contain at least 1 profile to make this `IsServerProfileApplyMode` to not be "Ignore"
+		
 		DEBUGVAR IsServerProfileApplyMode
+		
 		; If server does not has profile, this will apply all of the local enabled profiles.
+		
 		ApplyServerProfile "XMLProfileFromJson" IsServerProfileApplyMode
 
-		; final profile
+		DEBUGVAR XMLProfileFromJson
+		DEBUGVAR IsServerProfileApplyMode
+
+		If IsServerProfileApplyMode = "BypassLocal" Then
+
+		STRCONTAIN "y18IDCardLive" XMLProfile Y18IDCARDLIVE_ENABLE
+		STRCONTAIN "y18IDCard" XMLProfile Y18IDCARD_ENABLE
+		
+		STRCONTAIN "y20IDCard-Liveness" XMLProfile Y20IDCARDLIVE_ENABLE
+		STRCONTAIN "y20IDCard" XMLProfile Y20IDCARD_ENABLE
+
+		STRCONTAIN "SugarBreak" XMLProfile SugarBreakEnable
+		STRCONTAIN "Discount50" XMLProfile Discount50
+		STRCONTAIN "ClossMenu" XMLProfile ClossMenu
+		Else
 		STRCONTAIN "y18IDCardLive" XMLProfileFromJson Y18IDCARDLIVE_ENABLE
 		STRCONTAIN "y18IDCard" XMLProfileFromJson Y18IDCARD_ENABLE
 		
@@ -955,12 +979,15 @@
 		STRCONTAIN "SugarBreak" XMLProfileFromJson SugarBreakEnable
 		STRCONTAIN "Discount50" XMLProfileFromJson Discount50
 		STRCONTAIN "ClossMenu" XMLProfileFromJson ClossMenu
+		EndIf
+
+		; final profile
 
 		
-		; DEBUGVAR EnableLiveness
+		DEBUGVAR EnableLiveness
-		; DEBUGVAR Only18
+		DEBUGVAR Only18
-		; DEBUGVAR NoSugarStepRight2
+		DEBUGVAR NoSugarStepRight2
-		; DEBUGVAR HalfPrice
+		DEBUGVAR HalfPrice
 
 		; If Y18IDCARDLIVE_ENABLE = "true" Then
 		; 	Var EnableLiveness = "true"
@@ -1008,9 +1035,8 @@
 			Var HalfPrice = "false"
 			DEBUGVAR Discount50
 		EndIf
-	EndIf
-
 
+EndIf
 
 	; If ClossMenu = "true"
 
@@ -1057,7 +1083,12 @@
 </EventUnitTest3>
 
 <EventUnitTest4>
-	Var XMLProfile = "EnableXMLProfile"
+	STRCONTAIN "SugarBreak-y18IDCard" XMLProfile UnitTestProfile
+	If UnitTestProfile = "true" Then
+		Var XMLProfile = "standard"
+	Else
+		Var XMLProfile =  "EnableJsonProfileMode-SugarBreak-y18IDCard"
+	EndIf
 
 </EventUnitTest4>