From 8343595362bcc8e4e4dc1e9ef90c05b6aeda957e Mon Sep 17 00:00:00 2001
From: kong <wanlop@forth.co.th>
Date: Wed, 7 Jul 2021 15:44:43 +0700
Subject: [PATCH] Add page and block payment.xml when not ready

---
 xml/page_back_to_remove_cup.xml | 55 +++++++++++++++++++++++++++++++++
 xml/page_board_0.xml            |  4 ++-
 xml/page_payment.xml            | 13 +++++++-
 3 files changed, 70 insertions(+), 2 deletions(-)
 create mode 100644 xml/page_back_to_remove_cup.xml

diff --git a/xml/page_back_to_remove_cup.xml b/xml/page_back_to_remove_cup.xml
new file mode 100644
index 00000000..4e908086
--- /dev/null
+++ b/xml/page_back_to_remove_cup.xml
@@ -0,0 +1,55 @@
+<Popup>
+<Width> 1080 </Width>
+<Height> 1920 </Height>
+
+<EventOpen>
+	
+	OpenInst 0 "/mnt/sdcard/coffeevending/taobin_project/xml/page_remove_cup.xml"
+	
+	If TermTemOnline = "true" Then
+		OpenInst 1 "/mnt/sdcard/coffeevending/termtem_project/xml/test_video_loop.xml"
+	Else
+		OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/test_video_loop.xml"
+	EndIf
+
+	TopView "hide"
+
+	If TNumberTaobinMember = "" Then
+
+	Else
+		If PayWithQR = 1 Then
+			Var VendingTSID = VendingTSIDTmp
+		EndIf 	
+
+
+		Var BmiYear = PointTaobinStr
+		Var PointCrm = ""
+
+		If FromConsent = 1 Then 
+			Var PointCrm = "pdpa1"
+		EndIf
+
+		Var GetScore = VendingTSID
+		If TaobinErrorNetwork = 0 Then
+			AddData 11 TNumberTaobinMember  BmiYear PointCrm GetScore
+		Else
+			Var PointCrm = ""
+			AddData 14 TNumberTaobinMember  BmiYear PointCrm GetScore
+		EndIf
+
+		Var TNumberTaobinMember = ""
+		Var VendingTSID = ""
+
+	EndIf
+	
+	Open "/mnt/sdcard/coffeevending/taobin_project/xml/page_list.xml"
+
+
+</EventOpen>
+<Timeout> 60000 </Timeout>
+<EventTimeout> 
+	;Var menu_status = "stop"
+	
+</EventTimeout> 
+
+</Popup>
diff --git a/xml/page_board_0.xml b/xml/page_board_0.xml
index ff119786..53ceda08 100644
--- a/xml/page_board_0.xml
+++ b/xml/page_board_0.xml
@@ -29,6 +29,7 @@
 
 	Var RoadShow = "false"
 	Var IgnorePoint = "true"
+	Var ResetNumber = "0899999999"
 </EventOpen>
 <Timeout> 1000 </Timeout>
 <EventTimeout> 
@@ -110,6 +111,7 @@
 	If countClick = 3 Then
 		
 	EndIf
+	numberPhone = ""
 
 	If countClick = 5 Then
 		Var countClick = 0
@@ -127,7 +129,7 @@
 <Align> Center </Align>
 <Font> RobotoBlack </Font>
 <Color> 0x513C2F </Color>
-<Value> countClick </Value>
+<Value> numberPhone </Value>
 </Text>
 
 
diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index ebfb95aa..97c89135 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -65,7 +65,7 @@
 	EndIf
 
 	If MachineStage = "remove-cup" Then
-		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+		Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
 
 	EndIf
 	
@@ -74,6 +74,17 @@
 </EventOpen>
 <Timeout> 900 </Timeout>
 <EventTimeout> 
+	
+	If ReadyForBrew = "false" Then
+		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
+		Var ReadyForBrew = "false"
+	EndIf
+
+	If MachineStage = "remove-cup" Then
+		Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+
+	EndIf
+
 	Var CountStepPackPayment = CountStepPackPayment + 1
 	If CountStepPackPayment = 1 Then