preserve order, link to iden18

xml/page_board.xml

@@ -918,18 +918,18 @@
 	EndIf
 
 	; Init read
-	ReadProfile "ROOT/xmlprofile/main.json" "XMLProfile"
+	ReadProfile "ROOT/xmlprofile/main.json" "XMLProfileFromJson"
-	DEBUGVAR XMLProfile
+	DEBUGVAR XMLProfileFromJson
 
-	STRCONTAIN "y18IDCardLive" XMLProfile Y18IDCARDLIVE_ENABLE
+	STRCONTAIN "y18IDCardLive" XMLProfileFromJson Y18IDCARDLIVE_ENABLE
-	STRCONTAIN "y18IDCard" XMLProfile Y18IDCARD_ENABLE
+	STRCONTAIN "y18IDCard" XMLProfileFromJson Y18IDCARD_ENABLE
 	
-	STRCONTAIN "y20IDCard-Liveness" XMLProfile Y20IDCARDLIVE_ENABLE
+	STRCONTAIN "y20IDCard-Liveness" XMLProfileFromJson Y20IDCARDLIVE_ENABLE
-	STRCONTAIN "y20IDCard" XMLProfile Y20IDCARD_ENABLE
+	STRCONTAIN "y20IDCard" XMLProfileFromJson Y20IDCARD_ENABLE
 
-	STRCONTAIN "SugarBreak" XMLProfile SugarBreakEnable
+	STRCONTAIN "SugarBreak" XMLProfileFromJson SugarBreakEnable
-	STRCONTAIN "Discount50" XMLProfile Discount50
+	STRCONTAIN "Discount50" XMLProfileFromJson Discount50
-	STRCONTAIN "ClossMenu" XMLProfile ClossMenu
+	STRCONTAIN "ClossMenu" XMLProfileFromJson ClossMenu
 
 	
 	; DEBUGVAR EnableLiveness

xml/page_identity18_verification.xml

@@ -0,0 +1,481 @@
+<Popup>
+<Cache> "Enable" </Cache>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+<Background> "0xeae6e1" </Background>
+<Volume> SoundVolume </Volume>
+<EventOpen>
+
+    Var CamFlag = 0
+	Var CamCount = 0
+    Var Timeout = 0
+    Var ShutterResult = "-"
+
+    Var AdultFlag = 1
+	 
+    If AdultFlag = 1 Then
+
+        Var AdultFlag = 0
+
+        DEBUGVAR SystemDate
+        Var sdate = ""
+        Var sdate = SystemDate
+        Var sdateday = ""
+        Var sdatemonth = ""
+        Var sdateyear = ""
+        SPLIT sdate "/" 1 sdateday 
+        SPLIT sdate "/" 2 sdatemonth
+        SPLIT sdate "/" 3 sdateyear 
+        INT sdateday
+        INT sdatemonth
+        INT sdateyear
+        Var AdultState = "Enable"
+        Var AdultState1 = "Enable"
+
+        Var countAdultS2 = 0
+        Var AdultFlag2 = 1
+    EndIf
+
+    If show_eng = "true" Then 
+        Var DirImage = "ROOT/taobin_project/image/page_payment_en/page_payment"
+        Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend_en"
+        Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
+
+    Else
+        Var DirImage = "ROOT/taobin_project/image/page_payment"
+        Var DirImage2 = "ROOT/taobin_project/image/page_payment_cash_extend"
+        Var page_doing_show_time_image = "ROOT/taobin_project/image/page_doing/img2.png"
+    EndIf
+
+
+    If CameraCount = 1 Then
+        
+    EndIf
+
+    Var IDBirthdate = ""
+
+    Var LivenessResult = ""
+
+    Var CountDownDelayReadCardID = 5
+    DEBUGVAR CameraCount
+    ;STOPCARDID
+    Var LivenessShowString = ""
+    
+    Var CameraStage = "Invisible"
+    Var IDcardStage = "Enable"
+    Var IDcardStageText = "Enable"
+    Var load_gif_stage = "Invisible"
+    Var IDcardTextStatus = "โปรดเสียบบัตรประชาชน \nเพื่อดำเนินการต่อ"
+
+    Var LivenessRestartCount = 0
+    Var FailTrickCount = 0
+
+    Var FailState = "Invisible"
+
+    Var StepGetServer = 0
+
+    Var Cid = 29
+    Var PointCrm = "2"
+    Var GetScore = "1"
+    Var IDNumx = "2640100003053"
+	;AddData Cid TelephoneNumber  IDNumx PointCrm GetScore
+
+</EventOpen>
+
+<EventActionOk>
+
+    DEBUGVAR Ext1a
+
+    ; If StepGetServer = 1 Then
+
+    ;     If Ext1a = "ok" Then
+    ;         Var ChildrenFree = 1
+	; 		Open "ROOT/taobin_project/xml/page_payment.xml" 
+    ;     Else
+
+    ;         If Ext1a = "limit" Then
+    ;             Var load_gif_stage = "Invisible"
+    ;             Var FailState = "Enable"
+    ;             Var img_popup16 = "/img_popup16-3.png"
+
+    ;             WRITE_FILE "/mnt/sdcard/oreo_for_free_limit" "true"
+
+    ;         Else
+
+    ;             Var load_gif_stage = "Invisible"
+    ;             Var FailState = "Enable"
+    ;             Var img_popup16 = "/img_popup16-2.png"
+
+    ;         EndIf
+
+    ;         Refresh
+
+    ;     EndIf
+
+    ; EndIf
+
+</EventActionOk>
+
+<EventActionError>
+</EventActionError>
+
+
+<EventIDCard>
+
+    DEBUGVAR IDCardStatus
+    DEBUGVAR IDCardReady
+    DEBUGVAR IDCardData
+    DEBUGVAR IDBirthdate
+    DEBUGVAR IDFullNameEng
+
+
+    If IDCardStatus = "OK" Then
+        If IDCardReady = "OK" Then
+            If IDCardData = "START" Then
+                Var load_gif_stage = "Enable"
+                Var IDcardStageText = "Invisible"
+                Var FailState = "Invisible"
+                ;Var img_popup16 = "/img_popup16-1.png"
+                RefreshAll
+                Var Timeout = 90
+            EndIf
+        EndIf
+    EndIf
+
+
+
+
+    If IDCardStatus = "OK" Then
+        If IDCardReady = "OK" Then
+            If IDCardData = "ERROR" Then
+                    Var load_gif_stage = "Invisible"
+                    Var IDcardStageText = "Enable"
+                    Var IDcardTextStatus = "อ่านบัตรไม่ได้"
+
+                    Var FailState = "Enable"
+                    Var img_popup16 = "/img_popup16-1.png"
+                    
+                Refresh
+            EndIf
+        EndIf
+    EndIf
+
+    If IDCardStatus = "ERROR" Then 
+            Var load_gif_stage = "Invisible"
+            Var IDcardStageText = "Enable"
+            Var IDcardTextStatus = "อ่านบัตรไม่ได้"
+          
+            Var FailState = "Enable"
+            Var img_popup16 = "/img_popup16-1.png"
+            Refresh
+    EndIf
+
+     If IDCardStatus = "ERROR" Then
+        If IDCardReady = "ERROR" Then
+            If IDCardData = "ERROR" Then
+                 Var FailState = "Invisible"
+            EndIf
+        EndIf
+    EndIf
+
+    If IDCardStatus = "OK" Then
+        If IDCardReady = "OK" Then
+            If IDCardData = "DONE" Then
+
+                ;Var birthDate = IDBirthdate
+                Var StrYear = ""
+                Var StrMon = ""
+                Var StrDay = ""
+
+                SUBSTRING IDBirthdate 0 4 StrYear
+                SUBSTRING IDBirthdate 4 6 StrMon
+                SUBSTRING IDBirthdate 6 8 StrDay
+
+                INT StrYear
+                INT StrMon
+                INT StrDay
+
+                Var Adult7 = 0
+                Var Adult15 = 0
+               
+                DEBUGVAR StrYear
+                DEBUGVAR StrMon
+                DEBUGVAR StrDay
+
+                DEBUGVAR sdatemonth
+                DEBUGVAR sdateday
+
+                Var sdateyear = sdateyear + 543
+                Var AgeNumber = sdateyear - StrYear
+                DEBUGVAR AgeNumber
+
+
+                If AgeNumber >= 18 Then
+
+                    Open "ROOT/taobin_project/xml/page_payment.xml" 
+
+                    ;  If AgeNumber = 18 Then
+                    ;     If sdatemonth > StrMon Then 
+                    ;         Var Adult15 = 1
+                    ;     Else
+                    ;         If sdatemonth = StrMon Then 
+                    ;             If  sdateday >= StrDay Then 
+                    ;                 Var Adult15 = 1
+                    ;             EndIf
+                    ;         EndIf
+                    ;     EndIf
+
+                    ;  Else
+                    ;     Var Adult15 = 1
+                    ;  EndIf
+                Else
+
+                EndIf
+
+                ; If Adult15 = 0 Then
+
+                ;     If AgeNumber >= 15 Then
+                ;         If AgeNumber = 15 Then
+                ;             If sdatemonth > StrMon Then 
+                ;                 Var Adult7 = 1
+                ;             Else
+                ;                 If sdatemonth = StrMon Then 
+                ;                     If  sdateday >= StrDay Then 
+                ;                         Var Adult7 = 1
+                ;                     EndIf
+                ;                 EndIf
+                ;             EndIf
+
+                ;         Else
+                ;             Var Adult7 = 1
+                ;         EndIf
+                ;     Else
+
+                ;     EndIf
+
+                    
+                ; EndIf
+
+                ;Var Adult7 = 1
+
+                ; If Adult7 = 1 Then
+
+                  
+
+                ;     GETACCEXT IDNum 27
+                ;     Var StepGetServer = 1
+                
+                ; Else
+
+
+                ;     Var load_gif_stage = "Invisible"
+                ;     Var FailState = "Enable"
+                ;     Var img_popup16 = "/img_popup16-1.png"
+
+                ;     Refresh
+
+                ; EndIf
+
+            
+            EndIf
+        EndIf
+    EndIf
+
+
+
+
+</EventIDCard>
+
+
+
+
+<Timeout> 1000 </Timeout>
+<EventTimeout> 
+    DEBUGVAR IDCardStatus
+    DEBUGVAR IDCardReady
+    DEBUGVAR IDCardData
+    DEBUGVAR IDBirthdate
+    DEBUGVAR CountDownDelayReadCardID
+    DEBUGVAR ShutterResult
+    DEBUGVAR IDCardState
+    DEBUGVAR load_gif_stage
+
+    If IDBirthdate = "" Then
+        Var CountDownDelayReadCardID = CountDownDelayReadCardID - 1
+        If CountDownDelayReadCardID = 0 Then
+            READCARDID
+            Var CountDownDelayReadCardID = 600
+        EndIf
+    EndIf
+
+    DEBUGVAR Timeout
+    Var Timeout = Timeout + 1
+
+    If Timeout > 120 Then
+        Open "ROOT/taobin_project/xml/page_catalog2.xml" 
+    EndIf
+
+    If IDCardState = "PRESENT" Then
+        If IDCardStatus = "ERROR" Then
+            Var load_gif_stage = "Invisible"
+            Var IDcardStageText = "Enable"
+            Var IDcardTextStatus = "อ่านบัตรไม่ได้อะ"
+            Refresh
+        EndIf
+    EndIf
+
+
+ 
+
+
+	Refresh
+	TimerReset
+</EventTimeout> 
+
+
+<Video>
+<X> 0 </X>
+<Y> 0 </Y>
+<Width> 1080</Width>
+<Height> 380 </Height>
+<Loop> "true" </Loop>
+<Filename> video_menu_0 </Filename>
+</Video>
+
+; back
+<Button>
+<X> 19 </X>
+<Y> 420 </Y>
+<Filename> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page2/bn_back_arrow.png" </FilenamePress>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	
+		Open "ROOT/taobin_project/xml/page_catalog2.xml" 
+	
+</EventClick>
+</Button>
+
+
+
+
+
+
+<Image>
+<X> 75 </X>
+<Y> 493 </Y>
+<State> "Enable" </State>
+<Filename> Var( DirImage + "/img_popup18.png" )</Filename>
+</Image>
+
+<Button>
+<X> 358 </X>
+<Y> 1769 </Y>
+<State>"Enable"</State>
+<Filename> Var( DirImage + "/bn_cancel_all.png"  )</Filename>
+<FilenamePress> Var( DirImage + "/bp_cancel_all.png"  ) </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bp_cancel_all.png" ) </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/page_catalog2.xml" 
+</EventClick>
+</Button>
+
+<Button>
+<X> 360 </X>
+<Y> 1373 </Y>
+<State>FailState</State>
+<Filename> Var( DirImage + "/bn_cancel_all.png"  )</Filename>
+<FilenamePress> Var( DirImage + "/bp_cancel_all.png"  ) </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bp_cancel_all.png" ) </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/page_catalog2.xml" 
+</EventClick>
+</Button>
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<State> load_gif_stage </State>
+<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
+</Image>
+
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<State> FailState </State>
+<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
+</Image>
+
+<Image>
+<X> 249 </X>
+<Y> 751 </Y>
+<State> load_gif_stage </State>
+<Filename> Var( DirImage + "/img_popup15.png" )</Filename>
+</Image>
+
+<Image>
+<X> 249 </X>
+<Y> 751 </Y>
+<State> FailState </State>
+<Filename> Var( DirImage + img_popup16 )</Filename>
+</Image>
+
+
+<Button>
+<X> 350 </X>
+<Y> 1370 </Y>
+<State>FailState</State>
+<Filename> Var( DirImage + "/bn_cancel_all.png"  )</Filename>
+<FilenamePress> Var( DirImage + "/bp_cancel_all.png"  ) </FilenamePress>
+<FilenameDisable> Var( DirImage + "/bp_cancel_all.png" ) </FilenameDisable>
+<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
+<Volume> SoundVolume </Volume>
+<EventClick> 
+	Open "ROOT/taobin_project/xml/page_catalog2.xml" 
+</EventClick>
+</Button>
+
+
+
+
+<GIF>
+<X> 440 </X>
+<Y> 988 </Y>
+<State> load_gif_stage </State>
+<Filename> "ROOT/taobin_project/image/page_payment/loading.gif"</Filename>
+</GIF>
+
+<EventUnitTest1>
+    Var IDCardStatus = "OK"
+    Var IDCardReady = "OK"
+    Var IDCardData = "START"
+    EventEvaluate "EventIDCard"
+</EventUnitTest1>
+
+<EventUnitTest2>
+    Var IDBirthdate = 25271014
+    Var IDCardStatus = "OK"
+    Var IDCardReady = "OK"
+    Var IDCardData = "DONE"
+    EventEvaluate "EventIDCard"
+</EventUnitTest2>
+<EventUnitTest3>
+    Var LivenessResult = "pass"
+    EventEvaluate "EventLivenessState"
+</EventUnitTest3>
+
+<EventUnitTest4>
+    Var IDCardState = "PRESENT"
+    Var IDCardStatus = "ERROR"
+    Var IDCardReady = "ERROR"
+    Var IDCardData = "ERROR"
+</EventUnitTest4>
+
+</Popup>
+
+

xml/page_topping_select7_copy.xml

@@ -388,7 +388,7 @@
 				EndIf
 			EndIf
 
-			If Only20 = "true" Then
+			If Only18 = "true" Then
 				DEBUGVAR SelectDrink
 				MenuProfile SelectDrink "IsMenuInProfile"
 
@@ -398,13 +398,18 @@
 				DEBUGVAR IsMenuInProfile
 
 				If IsMenuInProfile = "true" Then
+
+					; Check profile
 					
-					If EnableLiveness = "true" Then						
+					If EnableLiveness = "true" Then
+						DEBUGVAR EnableLiveness				
 						OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
-						Open "ROOT/taobin_project/xml/page_adult_error.xml" 
+						; full 
+						Open "ROOT/taobin_project/xml/page_identity_verification.xml" 
 					Else
 						OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_blank.xml"
-						Open "ROOT/taobin_project/xml/page_identity_verification.xml"
+						; Only IDCard
+						Open "ROOT/taobin_project/xml/page_identity18_verification.xml"
 					EndIf
 
 				Else

xmlprofile/ClossMenu.json

@@ -1 +1 @@
-{"content":[],"name":"ClossMenu"}
+{"name":"ClossMenu","content":[]}

xmlprofile/main.json

@@ -1 +1 @@
-{"ClossMenu":{"enable":true,"except":[],"modifiers":[]},"SugarBreak":{"enable":true,"except":[],"modifiers":[]},"y18IDCard":{"enable":true,"except":[],"modifiers":[]},"y20IDCard":{"enable":true,"except":[],"modifiers":[]},"y20IDCard-Liveness":{"enable":true,"except":[],"modifiers":[]}}
+{"SugarBreak":{"except":[],"enable":true,"modifiers":[]},"y18IDCard":{"modifiers":[],"except":[],"enable":true},"y20IDCard":{"except":[],"modifiers":[],"enable":false},"y20IDCard-Liveness":{"except":[],"enable":false,"modifiers":[]},"ClossMenu":{"except":[],"modifiers":[],"enable":false}}

xmlprofile/y20IDCard-Liveness.json

@@ -1 +1 @@
-{"content":[],"name":"y20IDCard-Liveness"}
+{"name":"y20IDCard-Liveness","content":[]}