From a880c4c0dcfe644b5369d7972bb7e924abc79c0a Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Tue, 30 Jul 2024 13:07:04 +0700
Subject: [PATCH] THAI: Fix bugs

---
 xml/page_display_get_15_discount.xml   | 18 +++++++--------
 xml/page_payment_credit3-TopupCash.xml | 32 ++++++++++++++++----------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/xml/page_display_get_15_discount.xml b/xml/page_display_get_15_discount.xml
index fc1566a9..5ca2baca 100644
--- a/xml/page_display_get_15_discount.xml
+++ b/xml/page_display_get_15_discount.xml
@@ -30,19 +30,19 @@
 
 	Var Timeout = Timeout + 1
 
-	If FromCheckMemberPoint = 1 Then
-		If Timeout > 10 Then
+	If Timeout > 10 Then
+		If FromCheckMemberPoint = 1 Then
 			Open "ROOT/taobin_project/xml/page_check_member2.xml"
-		EndIf
-	Else
-		If Seeker.IsLineMember = 0 Then
-			If LuckyDrawCampaign = 1 Then
-				Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+		Else
+			If Seeker.IsLineMember = 0 Then
+				If LuckyDrawCampaign = 1 Then
+					Open "ROOT/taobin_project/xml/sometime/page_campaign_ads_lucky_draw.xml"
+				Else
+					Open "ROOT/taobin_project/xml/page_lid_straw.xml"
+				EndIf
 			Else
 				Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 			EndIf
-		Else
-			Open "ROOT/taobin_project/xml/page_lid_straw.xml"
 		EndIf
 	EndIf
 
diff --git a/xml/page_payment_credit3-TopupCash.xml b/xml/page_payment_credit3-TopupCash.xml
index 76888816..22f8ac42 100644
--- a/xml/page_payment_credit3-TopupCash.xml
+++ b/xml/page_payment_credit3-TopupCash.xml
@@ -78,8 +78,6 @@
 	Var ChangeTimeout = 0
 	Var CancelCounter = 0
 
-	CoinVending XBILL
-
 
     Var ServiceAmount2 = CreditAmount
     Var ServiceCharge = 0
@@ -95,6 +93,24 @@
 
 	Var warning_price_state = "Enable"
 	
+	If CoinAmount > 0 Then
+	
+		Var SumAmount = CreditAmount + CoinAmount
+
+
+		If SumAmount >= PayAmountSubDiscount Then
+			Var confirmButtonState = "Enable"
+			Var alphaState2 = "Invisible"
+			Var warning_price_state = "Invisible"
+		Else
+			Var warning_price_state = "Enable"
+		EndIf
+
+		Var RemainAmountStr !assigned StringFmt( SumAmount, DisplayFormat, PreScaleConvertShow )
+		Var showRemaining = charOfBaht + RemainAmountStr
+		
+	EndIf
+
 
 </EventOpen>
 <Timeout> 1000 </Timeout>
@@ -112,7 +128,6 @@
 					AddData 24 TelephoneNumber  BmiYear PointCrm GetScore
 				EndIf
 
-				CoinVending OFF
 				Var CancelFlag = 1
 				Var CancelCounter = 0
 				If CoinAmount = 0 Then
@@ -163,6 +178,8 @@
 
                 Pay ServiceType TelephoneNumber ServiceCredit SuggestID SessionID2 ServiceAmount2 ServiceCharge Donate
                 Var PayCredit = 1
+				
+				CoinVending OFF
                 
                 If Seeker = "curr" Then
                     Open "ROOT/taobin_project/xml/page_catalog.xml"  
@@ -212,14 +229,6 @@
 	
 	EndIf
 	
-	
-
-
-    
-
-
-	
-
 	TimerReset
 	Refresh
 </EventTimeout> 
@@ -381,7 +390,6 @@
 				AddData 24 TelephoneNumber  BmiYear PointCrm GetScore
 			EndIf
 
-			CoinVending OFF
 			Var CancelCounter = 0
 			Var CancelFlag = 1
 			If CoinAmount = 0 Then