Merge branch 'masterpiece' into sgp_blue

ui/lang.tsv

@@ -1312,3 +1312,7 @@
 2100054		Sleep mode will be turn on
when machine operating.	Sleep mode will be turn on
when machine operating.
 2100055		Sleep mode will be turn off
when machine operating.	Sleep mode will be turn off
when machine operating.
 2100056		Please check before confirming	Please check before confirming
+2100057		Fan module	Fan module
+
+	Fan
+2200000		Fan	พัดลม

xml/page_payment_cash-UAE.xml

@@ -747,6 +747,13 @@
 
 	EndIf
 
+	If VendingCashless = "END" Then
+        If ReqPayInfoFromCashOther = 2 Then
+            DEBUGVAR "CashlessReq OFF"
+           	CashlessReq OFF
+        EndIf
+	EndIf
+
 </EventActionOk>
 
 <EventActionError>
@@ -1494,7 +1501,8 @@
     		If CancelFlag = 0 Then
                 Var QR_POPUP = "/img_popup8.png"
                 Var alphaState = "Enable"
-                ;Coin CARD
+                Coin CARD
+
                 Var ReqPayInfoFromCashOther = 2
                 Var CreditCardRef = ""
 
@@ -1516,9 +1524,7 @@
          			Var Timeout = 0
           		EndIf
 
-          		Var QRErrorState = "Invisible"
           		Var VendingCashless = "-"
-          		Var LOADING_STATE = "Enable"
           		Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
           		CashlessPay RemainAmountX CreditCardRef
           		Var CashlessPayFlag = 1
@@ -1738,18 +1744,11 @@
     ;CoinVending ON
     ;VendingQR OFF
 
-
-    If ReqPayInfoFromCashOther = 2 Then
-        DEBUGVAR "CashlessReq OFF by user"
-	  	CashlessReq OFF
-    EndIf
-
     If CashlessPayFlag = 1 Then
         Var CashlessPayFlag = 0
         CashlessReq FAIL
     EndIf
 
-
     Refresh
 </EventClick>
 </Button>