THAI: PaymentCode move actionOk to EventTimeout

xml/page_payment_code.xml

@@ -10,6 +10,7 @@
 <EventOpen>
 	; On open
 	Var ECommerce = ""
+	Var CodeActionOK = 0
 	Var Seeker.FreeVendingCampaign = 0
 
 	Var Timeout = 0
@@ -159,49 +160,16 @@
         Refresh
     EndIf
 
-	TimerReset
-</EventTimeout>
-
-<EventIDCard>
-
-
-	If IDCardStatus = "OK" Then
-		If IDCardReady = "OK" Then
-			If IDCardData = "START" Then
-			CoinVending OFF
-			Open "ROOT/taobin_project/xml/page_show_consent2.xml"
-			EndIf
-		EndIf
-	EndIf
-
-
-
-
-
-
-</EventIDCard>
-
-<EventCoin>
-
-	If ViewBill > 0 Then
-		CoinVending BILLREJECT
-	EndIf
-
-</EventCoin>
-
-
-<EventActionOk>
-
-
     If Seeker.CodeChannel = 1 Then
+        If CodeActionOK = 1 Then
 
-        Var ShowLoadingText = "Invisible"
+            DEBUGVAR CodeActionOK
-
-        SAVELOG "Seeker.CodeChannel 1 > ActOK."
-
-
             DEBUGVAR ECommerce
-		SAVELOG ECommerce
+
+            If ECommerce = "" Then
+
+            Else
+                Var ShowLoadingText = "Invisible"
 
                 SPLIT  ECommerce "/"  5  Seeker.VendingCode
                 SPLIT  ECommerce "/"  7  Seeker.VendingCampaignRI3
@@ -435,38 +403,56 @@
                         Else
                             Open "ROOT/taobin_project/xml/page_payment_cash.xml"
                         EndIf
-
-
-
                     Else
 
                         Var ShowErrorText = "Enable"
                         Var text_show_error = DirImage + "/text_show_error.png"
                         Var GetPayInfoFlag = 0
                         Var Seeker.CodeChannel = 0
-
+                    EndIf
+                EndIf
+            EndIf
         EndIf
 	EndIf
 
-	Else
+	TimerReset
+</EventTimeout>
 
-		;SAVELOG "Seeker.CodeChannel 2 > ActOK."
+<EventIDCard>
-		;
-		;Var CreditAmount = 0
-		;Var QRCODE99 = SessionID
-		;Var QRCODE99 = QRCODE99 + Ext1a
-		;Var QRCODE99 = QRCODE99 + Ext21
-		;Var QRCODETMP = QRCODE99
-		;Var Seeker.CodeChannel = 1
-		;
-		;If CART_COUNT >= 1 Then
-		;	Open "ROOT/taobin_project/xml/page_payment_cashMore.xml"
-		;Else
-		;	Open "ROOT/taobin_project/xml/page_payment_cash.xml"
-		;EndIf
 
 
+	If IDCardStatus = "OK" Then
+		If IDCardReady = "OK" Then
+			If IDCardData = "START" Then
+			CoinVending OFF
+			Open "ROOT/taobin_project/xml/page_show_consent2.xml"
 			EndIf
+		EndIf
+	EndIf
+
+
+
+
+
+
+</EventIDCard>
+
+<EventCoin>
+
+	If ViewBill > 0 Then
+		CoinVending BILLREJECT
+	EndIf
+
+</EventCoin>
+
+
+<EventActionOk>
+
+    If Seeker.CodeChannel = 1 Then
+        SAVELOG "Seeker.CodeChannel 1 > ActOK."
+        Var CodeActionOK = 1
+    EndIf
+
 
 </EventActionOk>
 
@@ -1081,6 +1067,7 @@
 
 	        Var TelephoneNumber = Seeker.CodeNumber
 	        Var Seeker.CodeChannel = 1
+			Var CodeActionOK = 0
 
 		EndIf