From 950794676e854cb095e918d4e9b248d1f21cf67d Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Thu, 26 Sep 2024 14:55:34 +0700
Subject: [PATCH] [DUBAI] Update pay with credit card

---
 xml/page_payment_cash-UAE.xml | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/xml/page_payment_cash-UAE.xml b/xml/page_payment_cash-UAE.xml
index 7e9c1434..69e6f26c 100644
--- a/xml/page_payment_cash-UAE.xml
+++ b/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>