Merge branch 'nosugar-18up-18uplive'

This commit is contained in:
Pakin 2023-11-13 14:07:02 +07:00
commit 2f973583a0
11 changed files with 648 additions and 88 deletions

View file

@ -921,52 +921,82 @@
EndIf
EndIf
; Init read
;ReadProfile "ROOT/xmlprofile/main.json" "XMLProfile"
DEBUGVAR XMLProfile
; Init read if XMLProfile contains this mode
;
STRCONTAIN "EnableXMLProfile" XMLProfile EnableJsonProfileMode
STRCONTAIN "y18IDCardLive" XMLProfile Y18IDCARDLIVE_ENABLE
STRCONTAIN "y18IDCard" XMLProfile Y18IDCARD_ENABLE
STRCONTAIN "SugarBreak" XMLProfile SugarBreakEnable
STRCONTAIN "Discount50" XMLProfile Discount50
DEBUGVAR EnableLiveness
DEBUGVAR Only18
DEBUGVAR NoSugarStepRight2
DEBUGVAR HalfPrice
If EnableJsonProfileMode = "true" Then
If Y18IDCARDLIVE_ENABLE = "true" Then
Var EnableLiveness = "true"
Var Only18 = "true"
Else
Var EnableLiveness = "false"
Var Only18 = "false"
ReadProfile "ROOT/xmlprofile/main.json" "XMLProfileFromJson"
DEBUGVAR XMLProfileFromJson
STRCONTAIN "y18IDCardLive" XMLProfileFromJson Y18IDCARDLIVE_ENABLE
STRCONTAIN "y18IDCard" XMLProfileFromJson Y18IDCARD_ENABLE
STRCONTAIN "y20IDCard-Liveness" XMLProfileFromJson Y20IDCARDLIVE_ENABLE
STRCONTAIN "y20IDCard" XMLProfileFromJson Y20IDCARD_ENABLE
STRCONTAIN "SugarBreak" XMLProfileFromJson SugarBreakEnable
STRCONTAIN "Discount50" XMLProfileFromJson Discount50
STRCONTAIN "ClossMenu" XMLProfileFromJson ClossMenu
; DEBUGVAR EnableLiveness
; DEBUGVAR Only18
; DEBUGVAR NoSugarStepRight2
; DEBUGVAR HalfPrice
; If Y18IDCARDLIVE_ENABLE = "true" Then
; Var EnableLiveness = "true"
; Var Only18 = "true"
; Else
; Var EnableLiveness = "false"
; Var Only18 = "false"
; EndIf
If Y18IDCARD_ENABLE = "true" Then
Var Only18 = "true"
; MenuProfile
Else
Var Only18 = "false"
EndIf
If Y20IDCARDLIVE_ENABLE = "true" Then
Var EnableLiveness = "true"
Var Only20 = "true"
Else
Var EnableLiveness = "false"
Var Only20 = "false"
EndIf
If Y20IDCARD_ENABLE = "true" Then
Var Only20 = "true"
; MenuProfile
Else
Var Only20 = "false"
EndIf
; Only get 1,2,3
If SugarBreakEnable = "true" Then
Var NoSugarStepRight2 = "true"
Else
Var NoSugarStepRight2 = "false"
EndIf
If Discount50 = "true" Then
Var HalfPrice = "true"
Var InvokeDiscountCMD = "true"
DEBUGVAR InvokeDiscountCMD
__CMD "invoke-discount-50" "-" "-" "-"
Else
Var HalfPrice = "false"
DEBUGVAR Discount50
EndIf
EndIf
If Y18IDCARD_ENABLE = "true" Then
Var Only18 = "true"
; MenuProfile
Else
Var Only18 = "false"
EndIf
; Only get 1,2,3
If SugarBreakEnable = "true" Then
Var NoSugarStepRight2 = "true"
Else
Var NoSugarStepRight2 = "false"
EndIf
If Discount50 = "true" Then
Var HalfPrice = "true"
Var InvokeDiscountCMD = "true"
DEBUGVAR InvokeDiscountCMD
__CMD "invoke-discount-50" "-" "-" "-"
Else
Var HalfPrice = "false"
DEBUGVAR Discount50
EndIf
; If ClossMenu = "true"
Var NETCORE_LOST_COUNT_UP = 0
@ -1018,7 +1048,7 @@
;DEBUGVAR 12-02-01-0021.Price
;DEBUGVAR $12-02-01-0021.Price
DEBUGVAR XMLProfile
; DEBUGVAR XMLProfile
; test
; Var XMLProfile = "y18IDCard"
; Var XMLProfile = "y18IDCardLive"
@ -1027,8 +1057,8 @@
If XMLProfile = "" Then
; test action
ReadProfile "ROOT/xmlprofile/main.json" "XMLProfile"
DEBUGVAR XMLProfile
ReadProfile "ROOT/xmlprofile/main.json" "XMLProfileFromJson"
DEBUGVAR XMLProfileFromJson
; Var XMLProfile = "Discount50"
@ -1041,18 +1071,18 @@
__CMD "invoke-discount-50" "-" "-" "-"
Var InvokeDiscountCMD = "true"
Else
DEBUGVAR InvokeDiscountCMD
; DEBUGVAR InvokeDiscountCMD
EndIf
Else
Var HalfPrice = "false"
DEBUGVAR Discount50
; DEBUGVAR Discount50
EndIf
DEBUGVAR EnableLiveness
DEBUGVAR Only18
DEBUGVAR NoSugarStepRight2
DEBUGVAR HalfPrice
; DEBUGVAR EnableLiveness
; DEBUGVAR Only18
; DEBUGVAR NoSugarStepRight2
; DEBUGVAR HalfPrice
DEBUGVAR WebAppShow
If IgnoreNetCore = "true" Then