DUBAI: hide oatmilk topping, fix cashless turn on cancel immediately after detect end then error

inter/whatthecup/uae_dubai/xml/page_payment_cash-UAE_blue.xml

@@ -781,6 +781,8 @@
 		Var QRErrorState = "Invisible"
 		Var LOADING_STATE = "Invisible"
 
+		Var CountDownAllowCancel = 9999999
+
 		If ViewBill > 0 Then
 				CoinVending BILLREJECT
 		EndIf
@@ -873,11 +875,14 @@
     		Var Timeout = 0
     	EndIf
 
-    	;Var QRErrorFlag = 1
+		;Var QRErrorFlag = 1
-    	If alphaState = "Enable" Then
+		If alphaState = "Enable" Then
-    		Var QRErrorState = "Enable"
+			Var QRErrorState = "Enable"
-    		Var LOADING_STATE = "Invisible"
+			Var LOADING_STATE = "Invisible"
-    	EndIf
+
+			Var CountDownAllowCancel = 0
+
+		EndIf
 
 	EndIf
 
@@ -962,6 +967,26 @@
     		Var VendingIsError = 0
     		Var VendingIsUnknown = 0
 		EndIf
+	Else
+		; case-get-end-then-reset-then-still-error
+		If VendingIsError > 0 Then
+			If VendingCashless = "ERROR" Then
+				SAVELOG "VendingError::resetByEndStillError ---> Error"
+				Var CountDownAllowCancel = 0
+				Var VendingIsQueueCounter = 0
+				Var VendingIsError = 0
+				Var VendingIsUnknown = 0
+			EndIf
+
+			If VendingCashless = "FAIL" Then
+				SAVELOG "VendingError::resetByEndStillError ---> Fail"
+				Var CountDownAllowCancel = 0
+				Var VendingIsQueueCounter = 0
+				Var VendingIsError = 0
+				Var VendingIsUnknown = 0
+			EndIf
+
+		EndIf
 	EndIf
 
 	If VendingIsUnknown > 59 Then
@@ -1143,6 +1168,9 @@
 
 
 	If CoinInOK = 1 Then
+
+		Var PayState5 = "Disable"
+
 		Var CoinInCounter = CoinInCounter + 1
 		If CoinInCounter = 1 Then
 
@@ -1153,6 +1181,11 @@
 			Var PayOK = 1
 
 		EndIf
+
+	Else
+	    If Timeout < 120 Then
+			Var PayState5 = "Enable"
+		EndIf
 	EndIf
 
 	Var stringLog = "Timeout " + Timeout
@@ -1969,12 +2002,21 @@
 <Volume> SoundVolume </Volume>
 <EventClick>
 
-    Var LOADING_STATE = "Invisible"
+	  Var LOADING_STATE = "Invisible"
-    Var QRErrorState = "Invisible"
+	  Var QRErrorState = "Invisible"
-    Var alphaState = "Invisible"
+	  Var alphaState = "Invisible"
-    Var QRCODE99 = ""
+	  Var CountDownAllowCancel = 9999999
-    ;CoinVending ON
+	  Var VendingIsIdleByPressingBtn = 0
-    ;VendingQR OFF
+
+
+	  Var QRCODE99 = ""
+	  ;CoinVending ON
+	  ;VendingQR OFF
+
+	  CashlessReq OFF ""
+
+
+
 
     If CashlessPayFlag = 1 Then
         Var CashlessPayFlag = 0

inter/whatthecup/uae_dubai/xml/page_topping_select6_blue.lxml

@@ -4142,12 +4142,12 @@
 
 ;-BEGIN milk choice
 <Block>
-<State> OatMilkToppingEnable </State>
+<State> "Invisible" </State>
 <Width> 986 </Width>
 <Height> 157 </Height>
 <MarginTop> 20 </MarginTop>
 <Image>
-<State> OatMilkToppingEnable </State>
+<State> "Invisible" </State>
 <Filename> "ROOT/taobin_project/inter/whatthecup/uae_dubai/image/topping2_en/bg_milk_choice.png" </Filename>
 </Image>
 
@@ -4164,7 +4164,7 @@
 <Button>
 <X> 40 </X>
 <Y> 72 </Y>
-<State> OatMilkEnable </State>
+<State> "Invisible" </State>
 <Mode> "No" </Mode>
 <Filename> "ROOT/taobin_project/image/topping2/bn_cereal.png" </Filename>
 <FilenamePress> "ROOT/taobin_project/image/topping2/bp_cereal.png" </FilenamePress>
@@ -4191,7 +4191,7 @@
 <Button>
 <X> 896 </X>
 <Y> 78 </Y>
-<State> OatMilkEnable </State>
+<State> "Invisible" </State>
 <Mode> "No" </Mode>
 <Filename> Var( DirImage + "/cb_notcheck.png" ) </Filename>
 <FilenamePress> Var( DirImage + "/cb_checked.png" ) </FilenamePress>
@@ -4219,7 +4219,7 @@
 <X> text_milk_choice_price_x </X>
 <Y> 63 </Y>
 <Font> KanitRegularTTF </Font>
-<State> "Enable" </State>
+<State> "Invisible" </State>
 <Size> 36 </Size>
 <Color> HeadlineColor </Color>
 <Value> text_price_oat_milk </Value>