From fb79907bdc3c4f4f57040771ac660b9dc40c743f Mon Sep 17 00:00:00 2001
From: worawut <worawut@forth.co.th>
Date: Wed, 18 Jan 2023 15:25:41 +0700
Subject: [PATCH] invisible cancel

---
 spiral/xml/page_spiral_payment_cash.xml | 35 ++++++++++++++++---------
 xml/page_payment_cash.xml               | 13 ++++++++-
 2 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/spiral/xml/page_spiral_payment_cash.xml b/spiral/xml/page_spiral_payment_cash.xml
index 1ade88db..3934fdef 100644
--- a/spiral/xml/page_spiral_payment_cash.xml
+++ b/spiral/xml/page_spiral_payment_cash.xml
@@ -43,6 +43,8 @@
 	
 	Var alphaState = "Invisible"
 	Var alphaState2 = "Invisible"
+	Var FlagalphaState2 = 0
+	Var alphaState2t = alphaState2
 	Var alphaState3 = "Invisible"
 
 	
@@ -207,6 +209,7 @@
 			If Canout = 0 Then
 				Var RemainAmountStr = 0
 			Else
+				Var FlagalphaState2 = 1
 				Var RemainAmountStr = "ทอน " + Canout
 			EndIf
 
@@ -350,6 +353,7 @@
 
 		If web_payment = "CASH" Then
 			Var alphaState2 = "Enable"
+			Var alphaState2t = alphaState2
 		EndIf
 
 		If web_payment = "QR" Then
@@ -1023,6 +1027,7 @@
 				If Canout = 0 Then
 					Var RemainAmountStr = 0
 				Else
+					Var FlagalphaState2 = 1
 					Var RemainAmountStr = "ทอน " + Canout
 				EndIf
 
@@ -1041,8 +1046,12 @@
 
 			;Var RemainAmount = 0
 			Var showRemaining = charOfBaht + RemainAmountStr
+		
 			Var alphaState2 = "Enable"
-
+			Var alphaState2t = alphaState2
+			If FlagalphaState2 = 1 Then
+				Var alphaState2t = "Invisible"
+			EndIf
 		
 		EndIf
 
@@ -1196,6 +1205,7 @@
 		If EnoughChange = "yes" Then
 
 			Var alphaState2 = "Enable"
+			Var alphaState2t = alphaState2
 
 			If RoadShow = "true" Then
 				Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
@@ -1702,7 +1712,7 @@
 <Button>
 <X> 438 </X>
 <Y> 1345 </Y>
-<State> alphaState2 </State>
+<State> alphaState2t </State>
 <Filename> Var( DirImage + "/bn_cancel.png" )</Filename>
 <FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -1736,6 +1746,7 @@
 	EndIf
 	
 	Var alphaState2 = "Invisible"
+	Var alphaState2t = alphaState2
 	Refresh
 
 	
@@ -1871,16 +1882,16 @@
 	Open "/media/bt/xml/security_alarm.xml" 
 </EventSecurity>
 
-;<Text>
-;<X> 0 </X>
-;<Y> 1880 </Y>
-;<Size> 14 </Size>
-;<Align> "Left" </Align>
-;<Width> 1080 </Width>
-;<Font> KanitThinTTF </Font>
-;<Color> 0x513C2F </Color>
-;<Value> SelectDrink </Value>
-;</Text>
+<Text>
+<X> 100 </X>
+<Y> 1880 </Y>
+<Size> 14 </Size>
+<Align> "Left" </Align>
+<Width> 1080 </Width>
+<Font> KanitThinTTF </Font>
+<Color> 0x513C2F </Color>
+<Value> "55555" </Value>
+</Text>
 
 
 
diff --git a/xml/page_payment_cash.xml b/xml/page_payment_cash.xml
index 343b11fb..e3051d48 100644
--- a/xml/page_payment_cash.xml
+++ b/xml/page_payment_cash.xml
@@ -100,6 +100,8 @@
 	
 	Var alphaState = "Invisible"
 	Var alphaState2 = "Invisible"
+	Var FlagalphaState2 = 0
+	Var alphaState2t = alphaState2
 	Var alphaState3 = "Invisible"
 
 	
@@ -303,6 +305,7 @@
 					Var RemainAmountStr = "Change " + Canout
 					Var RemainAmountStr = RemainAmountStr + "###size=90"
 				Else
+					Var FlagalphaState2 = 1
 					Var RemainAmountStr = "ทอน " + Canout
 				EndIf
 			EndIf
@@ -434,6 +437,7 @@
 
 		If web_payment = "CASH" Then
 			Var alphaState2 = "Enable"
+			Var alphaState2t = alphaState2
 		EndIf
 
 		If web_payment = "QR" Then
@@ -1622,6 +1626,7 @@
 						Var RemainAmountStr = "Change " + Canout
 						Var RemainAmountStr = RemainAmountStr + "###size=90"
 					Else
+						Var FlagalphaState2 = 1
 						Var RemainAmountStr = "ทอน " + Canout
 					EndIf
 				EndIf
@@ -1643,6 +1648,10 @@
 			;Var RemainAmount = 0
 			Var showRemaining = charOfBaht + RemainAmountStr
 			Var alphaState2 = "Enable"
+			Var alphaState2t = alphaState2
+			If FlagalphaState2 = 1 Then
+				Var alphaState2t = "Invisible"
+			EndIf
 
 		
 		EndIf
@@ -1807,6 +1816,7 @@
 		If EnoughChange = "yes" Then
 
 			Var alphaState2 = "Enable"
+			Var alphaState2t = alphaState2
 
 			If RoadShow = "true" Then
 				Var GIFShowProcess = "ROOT/ui/page_05_loading/pic_loading_cup.gif"
@@ -2530,7 +2540,7 @@
 <Button>
 <X> 438 </X>
 <Y> 1345 </Y>
-<State> alphaState2 </State>
+<State> alphaState2t </State>
 <Filename> Var( DirImage + "/bn_cancel.png" )</Filename>
 <FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@@ -2559,6 +2569,7 @@
 	EndIf
 	
 	Var alphaState2 = "Invisible"
+	Var alphaState2t = alphaState2
 	Refresh