pakin/taobin_project
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases 1 Packages Wiki Activity Actions

HKG: Hide 2 option sugar and update page payment cash

Browse source
This commit is contained in:
Kenta420 2025-02-20 11:15:07 +07:00
parent 9012701c8b
commit 0c547ff5c6
3 changed files with 72 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

123
xml/page_payment_cash-HKG.xml
View file

@ -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>