From 1cae0470ab533fbe52176131165acb4d0047fd09 Mon Sep 17 00:00:00 2001
From: miggaze <pichet@forth.co.th>
Date: Tue, 10 Nov 2020 17:25:15 +0700
Subject: [PATCH] IDCard

---
 xml/page_brewing2.xml      |  7 ++++++-
 xml/page_payment_code.xml  |  2 +-
 xml/page_show_consent2.xml | 20 ++++++++++++++++++++
 3 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/xml/page_brewing2.xml b/xml/page_brewing2.xml
index 868968de..4271bc2e 100644
--- a/xml/page_brewing2.xml
+++ b/xml/page_brewing2.xml
@@ -314,7 +314,12 @@
 						If ChangeFlag2 = 1 Then
 							Var ChangeOK = 2
 						Else
-							Var ChangeOK = 4
+							If CodeChannel = 1 Then
+								Var ChangeOK = 4
+							Else
+								Var ChangeOK = 3
+							EndIf 
+							
 						EndIf
 					EndIf
 
diff --git a/xml/page_payment_code.xml b/xml/page_payment_code.xml
index ab5db4d1..b9213e6e 100644
--- a/xml/page_payment_code.xml
+++ b/xml/page_payment_code.xml
@@ -58,7 +58,7 @@
 
 	If IDCardStatus = "OK" Then
 		If IDCardReady = "OK" Then
-			If IDCardData = "DONE" Then
+			If IDCardData = "START" Then
 			CoinVending OFF
 			Open "ROOT/taobin_project/xml/page_show_consent2.xml" 
 			EndIf
diff --git a/xml/page_show_consent2.xml b/xml/page_show_consent2.xml
index 37192424..539eed32 100644
--- a/xml/page_show_consent2.xml
+++ b/xml/page_show_consent2.xml
@@ -24,6 +24,7 @@
 	EndIf
 
     Var AcceptFlag = 0 
+	Var AcceptState = "Disable"
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -69,6 +70,24 @@
     Refresh
 </EventActionOk>
 
+<EventIDCard>
+	
+
+	If IDCardStatus = "OK" Then
+		If IDCardReady = "OK" Then
+			If IDCardData = "DONE" Then
+			Var AcceptState = "Enable"
+			EndIf
+		EndIf
+	EndIf
+
+
+	
+
+
+
+</EventIDCard>
+
 
 
 <Image>
@@ -90,6 +109,7 @@
 <Button>
 <X> 577 </X>
 <Y> 1679 </Y>
+<State> AcceptState</State>
 <Filename> Var( DirImage + "/bn_accept.png" )</Filename>
 <FilenamePress> Var( DirImage + "/bp_accept.png" ) </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>