From d28f470fbce7af1b7650c4f12d7cc57f419d5add Mon Sep 17 00:00:00 2001
From: Pakin <pakin.t@forth.co.th>
Date: Mon, 10 Mar 2025 11:39:07 +0700
Subject: [PATCH] SGP: add delay page payment init, MYS: fix bug remove cup
 button not show

---
 .../sgp/xml/page_payment_cash-SGP_blue.xml    | 88 ++++++++++++-------
 xml/page_board.xml                            |  5 +-
 2 files changed, 61 insertions(+), 32 deletions(-)

diff --git a/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml b/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml
index b9942e7c..1e93d875 100644
--- a/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml
+++ b/inter/whatthecup/sgp/xml/page_payment_cash-SGP_blue.xml
@@ -25,6 +25,8 @@
     Var  PreScaleCanculate = 100
 	DEBUGVAR VendingCashless
 	CashlessReq FAIL ""
+	Var WaitForStableCashlessState = 3
+	DEBUGVAR WaitForStableCashlessState
 
 
 	Var CashlessPayFlag = 0
@@ -706,6 +708,7 @@
 
 	If VendingCashless = "OK" Then
 		DEBUGVAR CashlessCode
+		DEBUGVAR "Ok make::drink"
 		Var Timeout = 0
 
 		Var QRErrorState = "Invisible"
@@ -728,7 +731,9 @@
 		DEBUGVAR UserChoosePayment
 		Var UserChoosePayment = ""
 		Open "ROOT/taobin_project/xml/page_thankyou.xml"
-
+	Else
+		DEBUGVAR "VendingCashless get ActOk not ok"
+		DEBUGVAR VendingCashless
 	EndIf
 
 </EventActionOk>
@@ -805,37 +810,47 @@
 			DEBUGVAR UserChoosePayment
 			DEBUGVAR VendingCashless
 
-			If UserChoosePayment = "CreditCashless" Then
-				If VendingCashless = "READY" Then
-					Var QRCODE99 = ""
-					Var Timeout = 0
-					Var QRErrorState = "Invisible"
-					Var QR_POPUP = "ROOT/taobin_project/image/page_payment_en/page_payment/img_popup8-2.png"
-					Var VendingCashless = "-"
-					Var LOADING_STATE = "Enable"
-					Var alphaState = "Enable"
-					Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
-					CashlessPay RemainAmountX CreditCardRef
-					Var CashlessPayFlag = 1
+			If WaitForStableCashlessState = 0 Then
+
+				If UserChoosePayment = "CreditCashless" Then
+					If VendingCashless = "READY" Then
+						Var QRCODE99 = ""
+						Var Timeout = 0
+						Var QRErrorState = "Invisible"
+						Var QR_POPUP = "ROOT/taobin_project/image/page_payment_en/page_payment/img_popup8-2.png"
+						Var VendingCashless = "-"
+						Var LOADING_STATE = "Enable"
+						Var alphaState = "Enable"
+						Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
+						CashlessPay RemainAmountX CreditCardRef
+						Var CashlessPayFlag = 1
+					EndIf
 				EndIf
+
+				If UserChoosePayment = "" Then
+					If VendingCashless = "READY" Then
+						Var QRCODE99 = ""
+						Var Timeout = 0
+						Var QRErrorState = "Invisible"
+						Var QR_POPUP = "ROOT/taobin_project/image/page_payment_en/page_payment/img_popup8-2.png"
+						Var VendingCashless = "-"
+						Var LOADING_STATE = "Enable"
+						Var alphaState = "Enable"
+						Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
+						CashlessPay RemainAmountX CreditCardRef
+						Var CashlessPayFlag = 1
+
+						Var UserChoosePayment = "CreditCashless"
+					EndIf
+				EndIf
+			Else
+
+				DEBUGVAR "Get EventCashless while not stable"
+				DEBUGVAR WaitForStableCashlessState
+				DEBUGVAR VendingCashless
 			EndIf
 
-			If UserChoosePayment = "" Then
-				If VendingCashless = "READY" Then
-					Var QRCODE99 = ""
-					Var Timeout = 0
-					Var QRErrorState = "Invisible"
-					Var QR_POPUP = "ROOT/taobin_project/image/page_payment_en/page_payment/img_popup8-2.png"
-					Var VendingCashless = "-"
-					Var LOADING_STATE = "Enable"
-					Var alphaState = "Enable"
-					Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
-					CashlessPay RemainAmountX CreditCardRef
-					Var CashlessPayFlag = 1
-
-					Var UserChoosePayment = "CreditCashless"
-				EndIf
-			EndIf
+			
 
 		EndIf
 
@@ -860,6 +875,14 @@
 
 	DEBUGVAR VendingCashless
 
+	If WaitForStableCashlessState > 0 Then
+		DEBUGVAR WaitForStableCashlessState
+		Var LOADING_STATE = "Enable"
+		Var WaitForStableCashlessState = WaitForStableCashlessState - 1
+	Else
+		Var LOADING_STATE = "Invisible"
+	EndIf
+
 
 	If ReadyForBrew = "false" Then
 		SAVELOG "Back to main1"
@@ -1828,7 +1851,12 @@ EndIf
 <Filename>  QR_POPUP </Filename>
 </Image>
 
-
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<State> LOADING_STATE </State>
+<Filename> "ROOT/taobin_project/inter/whatthecup/sgp/image/page_payment_en/page_payment/alpha.png" </Filename>
+</Image>
 
 <Image>
 <X> 267 </X>
diff --git a/xml/page_board.xml b/xml/page_board.xml
index 3319ff14..7dfa11b2 100644
--- a/xml/page_board.xml
+++ b/xml/page_board.xml
@@ -662,6 +662,9 @@
 	READ_FILE "/mnt/sdcard/enable_load_lang_fast" ENABLE_LOAD_LANG_V2
 	STRCONTAIN "1" ENABLE_LOAD_LANG_V2 UseLoadLangV2
 
+	; very-big-btn-init
+	Var UseVeryBigRemoveCupButton = "false"
+
 
 	;inter-page-board
 	If CountryName = "Malaysia" Then
@@ -1282,8 +1285,6 @@
 	Var btnRemoveCupY = 630
 	Var btnRemoveCupYNotPageBoard = 500
 
-	Var UseVeryBigRemoveCupButton = "false"
-
 	If UseVeryBigRemoveCupButton = "true" Then
 		Var btnRemoveCupX = 580
 		Var btnRemoveCupY = 530