From 0c547ff5c6295a2840ce4a3487a379b2a21c10c3 Mon Sep 17 00:00:00 2001
From: Kenta420 <poomipat002@gmail.com>
Date: Thu, 20 Feb 2025 11:15:07 +0700
Subject: [PATCH] HKG: Hide 2 option sugar and update page payment cash

---
 image/page_payment/alpha_popup.png      | Bin 0 -> 4132 bytes
 inter/hkg/xml/page_topping_select6.lxml |   6 +-
 xml/page_payment_cash-HKG.xml           | 123 +++++++++++++-----------
 3 files changed, 72 insertions(+), 57 deletions(-)
 create mode 100644 image/page_payment/alpha_popup.png

diff --git a/image/page_payment/alpha_popup.png b/image/page_payment/alpha_popup.png
new file mode 100644
index 0000000000000000000000000000000000000000..966e87e5e0130931bf67a280bfcbef11634e602d
GIT binary patch
literal 4132
zcmeHKZBr6h6h1_$kpxyOW%S}|*^Z{ps1qhgqy@HHTWt$zSvJiGYA?E&T8J@~WsQ=q
zJ8LQGPHr_>pp{mHsjC*dy<ljXK%``eSZax3iO62}AMAHNoO$M)IrrYV=bn4-^PJtf
zg@wm?;s5|2&5qg*FoT86?&g9bUh|sYBAA`Rju8ONnLlk9D3LBiL5yHKYdy%-6f<&W
z@|c^M05{LincO!EfS`zuV(!Sq3>gB8et)?{Y{cfybxGjtn8lr+n?$<j*^3R?cI0A~
z*eBph^oF?HB)qKZ$ryGW30HOL{xt&siUGG$ZfXj6pl!Z&>T-<rf&5}mgl$S+H!d~N
z+Js5<Ub}YfGW8oDOXmmz)QS+(q%^|?nvC=dg5zqnbSP}Rf6{JjITPN8r-n+NA0moE
zOryg9_22pZdZ<ki8fl)Qe#@H23O?6`)A&XbF~E?JHmynUF)XPz*S%pcz<}y$EOR1j
zW4r7V*8T^zWLvG(Llhe20Vy;Qz5IsHgHiLH;6Bo`pjhF#sUQ;%3%!}K<P&k>LhA>0
zCF}g1z3)z*kyO@ck4>FydsNiHXDk9x>F;lvn)py`2`(6>SR>D@mE94NbbB8a;joaY
zztLGqAP7o^E~nNi8~HhfHdN`uw@DjE8vP6A=6Ua%3DO|HJo(Zz>^~iS@y9)z-GCZq
z{U&?QK+fV@rYa5Dk|F|-`ZMVKBCDW}e_G>e`KSe;Ud)cbntOr^8nljP$A_?6ZEny_
zOzzQi+85VW+%@qHD)vGQ_!{p2tl`=!vQ|p^t2Da(V}Aj3yBG5uG|LgbjVozDXI}cQ
zBO=q2b-P6FezgO{&n!;|w{ayAXltcr^Pr~hdS`m|R+}CT+&v->=Z(lH3avNPm?L5t
z);9w>6hCl&d`Vf!)fZi%Qw}s?y^<q&y%@ls%b~<AMMy?SnMN+9Y#G90<fA-)6NmEk
zF%iVR0aBDkTOk2hPr<+`>I`s8oe9J@Zm_)71J>nwgP4f=*UOpUtb?;3ocF@{J~-b=
z=Xc=z7M=9KNt2v(@&B;mToQ|bG~g3EiRGB4<OB{y6b`U69r5g@;|Hs$6Ndn5Ud5%R
z9Y%PdBKylnqngMD80V0O3???B=cU8eiJN5B8dqpaP}XJBB;HrMK#ae;<(gq{<JkMi
z1~hM}InkA#Um5d#^1HtWJ)kCWcqIM#ep_Q^*MDAihihAFVW&65w`9?6rt}J`UAjg@
z<MEKxIgpIC=G%WP*E(8}<VshU({1+2&&5cKy`88R=3AvlUx)LSi-NJ{SCgN~(_uwe
z%fNV>(D;H`q0{Lm-qUt_0{E(|?v>XAk9``Wc31b)klgTX(ecKN%)`_mN&1L%bpeQr
z;&U`MVMcRyVX=&oZ(!8SNE9OZQpQp37R4-F&3oi^!>_x4QoHgX^sY`5s8vc{>z=`_
zskJ<p_OeCn_Y3qwff^6uzT}6`M-mnoF5oTpeT=b9skKiT4RmaxA^Mkxg??I;z&A7w
zybR78&f}&f)t{EhWXYC~`mhmq5HIUFcPX$UL!fFoCZp<tz0ISvthJ_5fG-Z=&?=q4
z2d%cTJ?H4X2%c=!>=n?vIo2yJL%ock)J_CRLL^D2+h3Re>8DhE&U{$(QwlU)-$_1c
oPo^m-4t-e9GeyR4%pDF);B8#O5B#r6B<dl0!<H!d`uG$70w3&1<p2Nx

literal 0
HcmV?d00001

diff --git a/inter/hkg/xml/page_topping_select6.lxml b/inter/hkg/xml/page_topping_select6.lxml
index 52303b2a..ffbabb0d 100644
--- a/inter/hkg/xml/page_topping_select6.lxml
+++ b/inter/hkg/xml/page_topping_select6.lxml
@@ -2128,7 +2128,8 @@
 <Button>
 <X> 680 </X>
 <Y> 79 </Y>
-<State> SugarState5 </State>
+;<State> SugarState5 </State>
+<State> "Invisible" </State>
 <Filename> SugarNormalPicLv5 </Filename>
 <FilenamePress>  SugarPressPicLv5 </FilenamePress>
 <FilenameDisable>  "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg5.png" </FilenameDisable>
@@ -2182,7 +2183,8 @@
 <Button>
 <X> 820 </X>
 <Y> 79 </Y>
-<State> SugarState6 </State>
+;<State> SugarState6 </State>
+<State> "Invisible" </State>
 <Filename> SugarNormalPicLv6 </Filename>
 <FilenamePress>  SugarPressPicLv6 </FilenamePress>
 <FilenameDisable>  "ROOT/taobin_project/image/topping2_en/bu_sugarlevel_sg6.png" </FilenameDisable>
diff --git a/xml/page_payment_cash-HKG.xml b/xml/page_payment_cash-HKG.xml
index 8405703b..1dfe81c0 100644
--- a/xml/page_payment_cash-HKG.xml
+++ b/xml/page_payment_cash-HKG.xml
@@ -78,6 +78,8 @@
 	Var PayAmount = PriceDrink
 
 	Var LOADING_STATE = "Invisible"
+	Var AlphaLoadingState = "Invisible"
+	Var AlphaPopupLoadingState = "Invisible"
 	; Below original
 	; On open
 
@@ -221,27 +223,6 @@
 	Var Seeker.PayWithQR = 0
 	Var NoGotoMenupage = "false"
 
-    If show_eng = "true" Then
-    	Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png"
-    	Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png"
-    Else
-    	Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png"
-    	Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png"
-    EndIf
-
-	Var X_CASH = 216
-
-	If RoadShow = "true" Then
-		Var X_CASH = 287
-		If show_eng = "true" Then
-			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment_en/page_payment/bn_cash.png"
-			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment_en/page_payment/bp_cash.png"
-		Else
-			Var FilenameShowbuttonCashBN = "ROOT/taobin_project/image/page_payment/bn_cash.png"
-			Var FilenameShowbuttonCashBP = "ROOT/taobin_project/image/page_payment/bp_cash.png"
-		EndIf
-	EndIf
-
 	If GetFreeFromError = 1 Then
 		Var Seeker.FreeVendingCampaign = 1
 		CoinVending OFF
@@ -373,6 +354,7 @@
                 Var CreditCardButtonState = "Disable"
                 Var QRCodeButtonState = "Disable"
                 Var LOADING_STATE = "Enable"
+				Var AlphaLoadingState = "Enable"
                 Var EnablingCreditCard = 1
                 Var EnablingCountDown = 5
                 Var RequestCreditCardCountDown = 1
@@ -588,6 +570,7 @@
 
 				Var QRCODE99 = QRCODE99KBANK
 				Var LOADING_STATE = "Invisible"
+				Var AlphaPopupLoadingState = "Invisible"
 
 				If show_eng = "true" Then
 					PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_mobile.mp3"
@@ -613,6 +596,7 @@
 
 				Var QRCODE99 = QRCODE99KBANK
 				Var LOADING_STATE = "Invisible"
+				Var AlphaPopupLoadingState = "Invisible"
 
 				If show_eng = "true" Then
 					PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
@@ -641,6 +625,7 @@
 
 				Var QRCODE99 = QRCODE99Shoppy
 				Var LOADING_STATE = "Invisible"
+				Var AlphaPopupLoadingState = "Invisible"
 
 				If show_eng = "true" Then
 					PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
@@ -667,6 +652,7 @@
 
 				Var QRCODE99 = QRCODE99Shoppy
 				Var LOADING_STATE = "Invisible"
+				Var AlphaPopupLoadingState = "Invisible"
 
 				If show_eng = "true" Then
 					PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
@@ -693,6 +679,7 @@
 
 				Var QRCODE99 = QRCODE99Shoppy
 				Var LOADING_STATE = "Invisible"
+				Var AlphaPopupLoadingState = "Invisible"
 
 				If show_eng = "true" Then
 					PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
@@ -719,6 +706,7 @@
 
 				Var QRCODE99 = QRCODE99Shoppy
 				Var LOADING_STATE = "Invisible"
+				Var AlphaPopupLoadingState = "Invisible"
 
 				If show_eng = "true" Then
 					PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
@@ -740,6 +728,7 @@
 
 		Var QRErrorState = "Invisible"
 		Var LOADING_STATE = "Invisible"
+		Var AlphaPopupLoadingState = "Invisible"
 
 		If ViewBill > 0 Then
 			CoinVending BILLREJECT
@@ -773,6 +762,7 @@
 			If alphaState = "Enable" Then
 				Var QRErrorState = "Enable"
 				Var LOADING_STATE = "Invisible"
+				Var AlphaPopupLoadingState = "Invisible"
 			EndIf
 		EndIf
 		If ReqPayInfoFlag = 2 Then
@@ -780,6 +770,7 @@
 			If alphaState = "Enable" Then
 				Var QRErrorState = "Enable"
 				Var LOADING_STATE = "Invisible"
+				Var AlphaPopupLoadingState = "Invisible"
 			EndIf
 		EndIf
 		If ReqPayInfoFlag = 3 Then
@@ -787,6 +778,7 @@
 			If alphaState = "Enable" Then
 				Var QRErrorState = "Enable"
 				Var LOADING_STATE = "Invisible"
+				Var AlphaPopupLoadingState = "Invisible"
 			EndIf
 		EndIf
 		If ReqPayInfoFlag = 4 Then
@@ -794,6 +786,7 @@
 			If alphaState = "Enable" Then
 				Var QRErrorState = "Enable"
 				Var LOADING_STATE = "Invisible"
+				Var AlphaPopupLoadingState = "Invisible"
 			EndIf
 		EndIf
 	Else
@@ -808,6 +801,7 @@
 		If alphaState = "Enable" Then
 			Var QRErrorState = "Enable"
 			Var LOADING_STATE = "Invisible"
+			Var AlphaPopupLoadingState = "Invisible"
 		EndIf
 
 	EndIf
@@ -886,6 +880,7 @@
 	  EndIf
 
 	  Var LOADING_STATE = "Invisible"
+	  Var AlphaPopupLoadingState = "Invisible"
 	  Var QRErrorState = "Invisible"
 
 	EndIf
@@ -1151,6 +1146,7 @@
             Var CreditCardButtonState = "Enable"
             Var QRCodeButtonState = "Enable"
             Var LOADING_STATE = "Invisible"
+			Var AlphaLoadingState = "Invisible"
             Var FirstTimeDelayEnableButton = 0
         Else
             Var FirstTimeDelayEnableButtonCountDown = FirstTimeDelayEnableButtonCountDown - 1
@@ -1185,6 +1181,7 @@
             Var VendingCashless = "-"
             If FirstTimeDelayEnableButton = 0 Then
                 Var LOADING_STATE = "Invisible"
+				Var AlphaPopupLoadingState = "Invisible"
             EndIf
             Var EnablingCountDown = 0
             Var EnablingCreditCard = 0
@@ -1217,9 +1214,10 @@
             Var Timeout = 0
             Var UserChoosePayment = "QRCode"
             Var QRErrorState = "Invisible"
-            Var QR_POPUP = CountryRootPath + "/image/page_payment/img_tap_card_5_sec.png"
+            Var QR_POPUP = CountryRootPath + "/image/page_payment/img_use_qr_code.png"
             Var VendingCashless = "-"
             Var LOADING_STATE = "Invisible"
+			Var AlphaPopupLoadingState = "Invisible"
             Var EnablingQRCode = 0
             Var EnablingCountDown = 0
         Else
@@ -1256,6 +1254,7 @@
         If CashlessClosingPopupCountDown = 0 Then
             Var alphaState = "Invisible"
             Var LOADING_STATE = "Invisible"
+			Var AlphaPopupLoadingState = "Invisible"
             Var CashlessClosingPopup = 0
         Else
             Var CashlessClosingPopupCountDown = CashlessClosingPopupCountDown - 1
@@ -1673,7 +1672,7 @@
 ;</Button>
 
 <Button>
-<X> X_CASH </X>
+<X> 327 </X>
 <Y> TopRowY </Y>
 <State> CreditCardButtonState </State>
 <Filename> Var( CountryRootPath + "/image/page_payment/bn_credit_card.png") </Filename>
@@ -1700,17 +1699,20 @@ If alphaState = "Invisible" Then
                 Var QR_POPUP = CountryRootPath + "/image/page_payment/img_tap_card_5_sec.png"
                 If EnablingCreditCard = 1 Then
                     Var LOADING_STATE = "Enable"
+					Var AlphaPopupLoadingState = "Enable"
                 EndIf
             Else
                 If UserChoosePayment = "QRCode" Then
                     CashlessReq VENDINGCANCEL ""
                     Var LOADING_STATE = "Enable"
+					Var AlphaPopupLoadingState = "Enable"
                     Var SwitchingQRCodeToCreditCard = 1
                     Var SwitchingContDown = 1
                 Else
                     Coin CARD
                     Var UserChoosePayment = "CreditCard"
                     Var LOADING_STATE = "Enable"
+					Var AlphaPopupLoadingState = "Enable"
                     Var EnablingCreditCard = 1
                     Var EnablingCountDown = 5
                     Var RequestCreditCardCountDown = 1
@@ -1724,7 +1726,7 @@ EndIf
 </Button>
 
 <Button>
-<X> 439 </X>
+<X> 551 </X>
 <Y> TopRowY </Y>
 <State> QRCodeButtonState </State>
 <Filename> Var( CountryRootPath + "/image/page_payment/bn_qr_code.png") </Filename>
@@ -1744,6 +1746,7 @@ If alphaState = "Invisible" Then
             Var QRErrorState = "Invisible"
             Var QR_POPUP = CountryRootPath + "/image/page_payment/img_use_qr_code.png"
             Var LOADING_STATE = "Enable"
+			Var AlphaPopupLoadingState = "Enable"
             Var alphaState = "Enable"
 
             If UserChoosePayment = "CreditCard" Then
@@ -1753,6 +1756,7 @@ If alphaState = "Invisible" Then
             Else
                 Coin CARD
                 Var LOADING_STATE = "Enable"
+				Var AlphaPopupLoadingState = "Enable"
                 Var EnablingQRCode = 1
                 Var EnablingCountDown = 5
                 Var RequestQRCodeCountDown = 1
@@ -1901,20 +1905,10 @@ eval(
 
 
 
-<Image>
-<X> 267 </X>
-<Y> 1065 </Y>
-<State> LOADING_STATE </State>
-<Filename> Var( DirImage + "/loadingText.png" )</Filename>
-</Image>
-
-
-
-
 
 <Button>
-<X> 438 </X>
-<Y> 1345 </Y>
+<X> 766 </X>
+<Y> 777 </Y>
 <State>
 eval(
     If alphaState = "Enable" Then
@@ -1928,9 +1922,8 @@ eval(
     EndIf
 )
 </State>
-<Filename> Var( DirImage + "/bn_cancel.png" )</Filename>
-<FilenameDisable> Var( DirImage + "/bp_cancel.png" )</FilenameDisable>
-<FilenamePress> Var( DirImage + "/bp_cancel.png" )</FilenamePress>
+<Filename> "ROOT/taobin_project/image/page_payment/Exit.png" </Filename>
+<FilenamePress> "ROOT/taobin_project/image/page_payment/Exit.png" </FilenamePress>
 <Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
 <Volume> SoundVolume </Volume>
 <EventClick>
@@ -1940,6 +1933,7 @@ eval(
     If CashlessPayFlag = 1 Then
         CashlessReq VENDINGCANCEL ""
         Var LOADING_STATE = "Enable"
+		Var AlphaPopupLoadingState = "Enable"
         Var CashlessClosingPopup = 1
         Var CashlessClosingPopupCountDown = 1
         Var UserChoosePayment = ""
@@ -1948,6 +1942,7 @@ eval(
     Else
         Var QRCODE99 = ""
         Var LOADING_STATE = "Invisible"
+		Var AlphaPopupLoadingState = "Invisible"
         Var QRErrorState = "Invisible"
         Var alphaState = "Invisible"
     EndIf
@@ -2464,23 +2459,41 @@ eval(
 <Filename> Var( DirImage + "/CancelOrder.png" ) </Filename>
 </Image>
 
-;<GIF>
-;<X> 493 </X>
-;<Y> 960 </Y>
-;<Width> 94 </Width>
-;<Height> 94 </Height>
-;<State> cancelState </State>
-;<Filename> Var( DirImage + "/loading.gif" )</Filename>
-;</GIF>
 
-;<GIF>
-;<X> 493 </X>
-;<Y> 1195 </Y>
-;<Width> 94 </Width>
-;<Height> 94 </Height>
-;<State> AdultState2 </State>
-;<Filename> Var( DirImage + "/loading.gif" )</Filename>
-;</GIF>
+<Image>
+<X> 0 </X>
+<Y> 380 </Y>
+<State> AlphaLoadingState </State>
+<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
+</Image>
+
+<Image>
+<X> 249 </X>
+<Y> 748 </Y>
+<State> AlphaPopupLoadingState </State>
+<Filename> "ROOT/taobin_project/image/page_payment/alpha_popup.png" </Filename>
+</Image>
+
+<Text>
+<X> 267 </X>
+<Y> 1065 </Y>
+<Width> 516 </Width>
+<Height> 75 </Height>
+<Size> 48 </Size>
+<Font> RobotoBold </Font>
+<Color> eval(
+	If AlphaLoadingState = "Enable" Then
+		Var return = 0xFFFFFF
+	Else
+		Var return = 0x5A5A5A
+	EndIf
+)
+</Color>
+<Align> Center </Align>
+<State> LOADING_STATE </State>
+<Value> "Just Moment, Please" </Value>
+;<Filename> Var( DirImage + "/loadingText.png" )</Filename>
+</Text>
 
 <GIF>
 <X> 493 </X>