From b97be007fc756e14f7be93e64a57bdb50a4716eb Mon Sep 17 00:00:00 2001
From: kong <wanlop@forth.co.th>
Date: Thu, 24 Feb 2022 13:39:59 +0700
Subject: [PATCH] DO

---
 xml/page_board.xml            |   2 +-
 xml/page_payment.xml          | 102 +++++++++++++++++++++++++++-------
 xml/page_payment_cashMore.xml |   6 ++
 3 files changed, 90 insertions(+), 20 deletions(-)

diff --git a/xml/page_board.xml b/xml/page_board.xml
index 0d3f4575..d6a1eb39 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -536,7 +536,7 @@
 
 		DEBUGVAR CountUpReloadAll
 		
-		If CountUpReloadAll > 60 Then
+		If CountUpReloadAll > 40 Then
 
 			Var StartUpExt = "-"
 			Var CountUpReloadAll = 0
diff --git a/xml/page_payment.xml b/xml/page_payment.xml
index 55c518a4..7bdd9c77 100644
--- a/xml/page_payment.xml
+++ b/xml/page_payment.xml
@@ -12,7 +12,6 @@
 	Var QRCODETMP = ""
 
 	Var QRChannel = 0
-	Var HaveCup = "true"
 
 	;Var PriceDrink = 5
 
@@ -82,20 +81,7 @@
 	EndIf
 
 
-	If Seeker = "curr" Then
-
-		If MachineStage = "remove-cup" Then
-			SAVELOG "MachineStage = remove-cup"
-			Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
-
-		EndIf
-		
-		If CupChecking = "true" Then
-			SAVELOG "CupChecking = true"
-			Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
-		EndIf
-
-	EndIf
+	
 
 	Var MachineStage = "-"
 
@@ -122,12 +108,44 @@
 	DEBUGVAR Seeker.thankStrawFlag
 
 	Var Seeker.PayWithQR = 0
-	
+
+	If CupChecking = "true" Then
+		Var StageShowAlias = "Invisible"
+		Var StageShowLoading = "Enable"
+	Else
+		Var StageShowAlias = "Enable"
+		Var StageShowLoading = "Invisible"
+	EndIf
+
+
+
 				
 	
 </EventOpen>
 <Timeout> 900 </Timeout>
 <EventTimeout> 
+	DEBUGVAR Seeker
+	DEBUGVAR HaveCup
+	DEBUGVAR CupChecking
+
+
+	If Seeker = "curr" Then
+
+		If MachineStage = "remove-cup" Then
+			SAVELOG "MachineStage = remove-cup"
+			If HaveCup = "true" Then
+				Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+			EndIf
+
+		EndIf
+		
+		If CupChecking = "true" Then
+			If HaveCup = "true" Then
+				Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
+			EndIf
+		EndIf
+
+	EndIf
 	
 	If ReadyForBrew = "false" Then
 		Open "ROOT/taobin_project/xml/page_back_to_main.xml"
@@ -139,8 +157,11 @@
 		Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
 
 	EndIf
-
-	Var CountStepPackPayment = CountStepPackPayment + 1
+	If CupChecking = "false" Then
+		If HaveCup = "false" Then
+			Var CountStepPackPayment = CountStepPackPayment + 1
+		EndIf
+	EndIf
 	If CountStepPackPayment = 1 Then
 
 		
@@ -219,6 +240,8 @@
 	
 	EndIf
 
+
+
 	TimerReset
 	Refresh
 </EventTimeout> 
@@ -235,16 +258,57 @@
 
 
 
+<Image>
+<State> StageShowAlias</State>
+<X> 375 </X>
+<Y> 623 </Y>
+<Width> 331 </Width>
+<Height> 435 </Height>
+<Filename> PictureDrink </Filename>
+</Image>
+
+<Text>
+<State> StageShowAlias</State>
+<X> 0 </X>
+<Y> 938 </Y>
+<Width> 1080</Width>
+<Align> Center </Align>
+<Size> 72 </Size>
+<Font> KanitMediumTTF </Font>
+<Color> 0x513C2F </Color>
+<Value> showname </Value>
+</Text>
+
+<Text>
+<State> StageShowAlias</State>	
+<X> 0 </X>
+<Y> 1022 </Y>
+<Width> 1080</Width>
+<Align> Center </Align>
+<Size> 24 </Size>
+<Font> KanitLightTTF </Font>
+<Color> 0x6F5F51 </Color>
+<Value> showdesc </Value>
+</Text>
+
+<Image>
+<State> StageShowAlias</State>
+<X> 144 </X>
+<Y> 413 </Y>
+<Filename> Var( DirImage + "/text_1.png" ) </Filename>
+</Image>
+
 <GIF>
 <X> 493 </X>
 <Y> 968 </Y>
-<State>"Enable"</State>
+<State>StageShowLoading</State>
 <Width> 94 </Width>
 <Height> 94 </Height>
 <Filename> Var( DirImage + "/loading.gif" )</Filename>
 </GIF>
 
 <Image>
+<State>StageShowLoading</State>
 <X> 267 </X>
 <Y> 1065 </Y>
 <Filename> Var( DirImage + "/loadingText.png" )</Filename>
diff --git a/xml/page_payment_cashMore.xml b/xml/page_payment_cashMore.xml
index 972e797b..c8fe2a58 100644
--- a/xml/page_payment_cashMore.xml
+++ b/xml/page_payment_cashMore.xml
@@ -575,6 +575,7 @@
 			If CancelFlag = 0 Then
 				SAVELOG "Timeout  > 180 s."
 				Cart "DeleteMenuID" "ALL"
+				Var CART_COUNT=0
 				
 
 				If ViewBill > 0 Then
@@ -809,6 +810,7 @@
 		If CoinInOK = 0 Then
 			If CancelFlag = 0 Then
 				Cart "DeleteMenuID" "ALL"
+				Var CART_COUNT=0
 				SAVELOG "VDCancle  > Cancle Order."
 				CoinVending OFF
 				Var CancelFlag = 1
@@ -1349,6 +1351,8 @@
 	If CoinInOK = 0 Then
         If CancelFlag = 0 Then
 			Cart "DeleteMenuID" "ALL"
+			Var CART_COUNT = 0
+
 			SAVELOG "ButtonCancleMain  > Cancle All Order."
             CoinVending OFF
 			Var CancelFlag = 1
@@ -1616,6 +1620,8 @@ EndIf
         If CancelFlag = 0 Then
 			Cart "DeleteMenuID" "ALL"
 			SAVELOG "ButtonCancleAlpha2  > Cancle Order."
+			Var CART_COUNT = 0
+
             CoinVending OFF
 			Var CancelFlag = 1
 			Var cancelState = "Enable"