From 56ac2ac014fd9a7a6f9c36732502d68cf2675e17 Mon Sep 17 00:00:00 2001
From: miggaze <pichet@forth.co.th>
Date: Tue, 30 Jan 2024 10:07:19 +0700
Subject: [PATCH] fix bug

---
 xml/page_payment_credit3-Topup.xml     |  4 ++
 xml/page_payment_credit3-TopupCash.xml | 70 +++++++++++++++++++++++++-
 xml/page_payment_credit3-TopupQR.xml   |  8 ++-
 3 files changed, 79 insertions(+), 3 deletions(-)

diff --git a/xml/page_payment_credit3-Topup.xml b/xml/page_payment_credit3-Topup.xml
index 68d7de10..3cb39f2b 100644
--- a/xml/page_payment_credit3-Topup.xml
+++ b/xml/page_payment_credit3-Topup.xml
@@ -108,6 +108,10 @@
 </EventIDCard>
 
 <EventCoin>
+
+If ViewBill > 0 Then
+		CoinVending BILLREJECT
+	EndIf
 </EventCoin>
 
 
diff --git a/xml/page_payment_credit3-TopupCash.xml b/xml/page_payment_credit3-TopupCash.xml
index 6261ec74..4e5a6f63 100644
--- a/xml/page_payment_credit3-TopupCash.xml
+++ b/xml/page_payment_credit3-TopupCash.xml
@@ -60,7 +60,10 @@
     
     
     Var CreditAmount = AmountNumber
-    Var RemainAmount = CreditAmount 
+    Var RemainAmount = CreditAmount - CoinAmount
+
+		
+
 	Var RemainAmountStr = "" + RemainAmount
 
 	Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow )
@@ -73,6 +76,7 @@
     Var PayOK = 0
 	Var CancelFlag = 0
 	Var ChangeFlag2 = 0
+
 	
 
     
@@ -94,6 +98,60 @@
 	Var NamePriceShow = showname + " "
 	Var NamePriceShow = NamePriceShow + DrinkAmountStr
 
+	If CoinInOK = 0 Then
+
+			Var RemainAmount = CreditAmount - CoinAmount
+			
+
+			Var SumCoinAmount = CoinAmount 
+			
+			If SumCoinAmount >= CreditAmount Then 
+				CoinVending OFF
+				Var Canout = SumCoinAmount - CreditAmount
+				If Canout = 0 Then
+					Var RemainAmountStr = 0
+					Var RemainAmountStr !assigned StringFmt( 0, DisplayFormat, PreScaleConvertShow )
+				Else
+					If show_eng = "true" Then 
+						Var RemainAmountStr !assigned StringFmt( Canout, DisplayFormat, PreScaleConvertShow )
+						Var RemainAmountStr = "Change " + RemainAmountStr
+						Var RemainAmountStr = RemainAmountStr + "###size=90"
+					Else
+						Var RemainAmountStr = "ทอน " + Canout
+					EndIf
+				EndIf
+
+
+				If Seeker.StoreCreditFlag = 1 Then
+					Var RemainAmountStr = 0
+					Var RemainAmountStr !assigned StringFmt( 0, DisplayFormat, PreScaleConvertShow )
+				EndIf
+
+				
+				Var CancleState = "Disable"
+				Var CoinInOK = 1
+				Var CoinInCounter = 0
+
+				Var TxRef1 = ""	
+				CreateTxRef1 TxRef1
+
+
+
+			Else
+				Var RemainAmountStr = "" + RemainAmount
+				Var RemainAmountStr !assigned StringFmt( RemainAmount, DisplayFormat, PreScaleConvertShow )
+			EndIf
+
+			Var Timeout = 0
+
+			
+			Var showRemaining = charOfBaht + RemainAmountStr
+			
+
+		
+		EndIf
+
+
 	
 
 </EventOpen>
@@ -130,7 +188,15 @@
 			Open "ROOT/taobin_project/xml/page_payment_credit3-TopupSuccess.xml" 
 		Else
 
-            If CoinAmount > 0 Then
+			Var payCreditFlag = 0
+			If CoinAmount > 0 Then
+				Var payCreditFlag = 1
+			EndIf
+			If ChangeFlag2 = 1 Then
+				Var payCreditFlag = 1
+			EndIf
+
+            If payCreditFlag = 1 Then
 
                 Var TelephoneNumber = Seeker.TNumberTaobinCredit
                 Var PayO2 = Var Seeker.CoffeePinNumber
diff --git a/xml/page_payment_credit3-TopupQR.xml b/xml/page_payment_credit3-TopupQR.xml
index b881ff1b..db06ce23 100644
--- a/xml/page_payment_credit3-TopupQR.xml
+++ b/xml/page_payment_credit3-TopupQR.xml
@@ -37,7 +37,9 @@
 
 
                
-	DEBUGVAR Seeker
+	If ViewBill > 0 Then
+		CoinVending BILLREJECT
+	EndIf
 
     
 	
@@ -87,6 +89,10 @@
 </EventIDCard>
 
 <EventCoin>
+
+If ViewBill > 0 Then
+		CoinVending BILLREJECT
+	EndIf
 </EventCoin>