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

Merge remote-tracking branch 'origin/masterpiece' into hkg_multi

Browse source
This commit is contained in:
Ittipat Lusuk 2025-03-10 11:31:16 +07:00
commit f6acf161ba
1197 changed files with 473794 additions and 58452 deletions
Download patch file Download diff file Expand all files Collapse all files

59
xml/page_payment_cash-HKG.xml
View file

@ -346,8 +346,8 @@
Var SwitchingQRCodeToCreditCard = 0
Var SwitchingContDown = 0
Var FirstTimeDelayEnableButton = 1
Var FirstTimeDelayEnableButtonCountDown = 5
;Var FirstTimeDelayEnableButton = 1
;Var FirstTimeDelayEnableButtonCountDown = 5
;If CoinInFlag = 0 Then
; If CancelFlag = 0 Then
@ -486,7 +486,7 @@
;Disable taobin credit
Var TopRowY = 1276
Var TopRowY = 1297
Var BotRowY = 1499
Var PayState4 = "Invisible"
@ -1154,17 +1154,17 @@
EndIf
If FirstTimeDelayEnableButton = 1 Then
If FirstTimeDelayEnableButtonCountDown = 0 Then
Var CreditCardButtonState = "Enable"
Var QRCodeButtonState = "Enable"
Var LOADING_STATE = "Invisible"
Var AlphaLoadingState = "Invisible"
Var FirstTimeDelayEnableButton = 0
Else
Var FirstTimeDelayEnableButtonCountDown = FirstTimeDelayEnableButtonCountDown - 1
EndIf
EndIf
;If FirstTimeDelayEnableButton = 1 Then
; If FirstTimeDelayEnableButtonCountDown = 0 Then
; Var CreditCardButtonState = "Enable"
; Var QRCodeButtonState = "Enable"
; Var LOADING_STATE = "Invisible"
; Var AlphaLoadingState = "Invisible"
; Var FirstTimeDelayEnableButton = 0
; Else
; Var FirstTimeDelayEnableButtonCountDown = FirstTimeDelayEnableButtonCountDown - 1
; EndIf
;EndIf
If EnablingCreditCard = 1 Then
@ -1192,11 +1192,15 @@
Var QRErrorState = "Invisible"
Var QR_POPUP = CountryRootPath + "/image/page_payment/img_tap_card_5_sec.png"
Var VendingCashless = "-"
If FirstTimeDelayEnableButton = 0 Then
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
EndIf
Var EnablingCountDown = 0
;If FirstTimeDelayEnableButton = 0 Then
; Var LOADING_STATE = "Invisible"
; Var AlphaPopupLoadingState = "Invisible"
;EndIf
Var LOADING_STATE = "Invisible"
Var AlphaPopupLoadingState = "Invisible"
Var EnablingCountDown = 0
Var EnablingCreditCard = 0
Else
Var EnablingCountDown = EnablingCountDown - 1
@ -1685,7 +1689,7 @@
;</Button>
<Button>
<X> 327 </X>
<X> 223 </X>
<Y> TopRowY </Y>
<State> CreditCardButtonState </State>
<Filename> Var( DirImage + "/bn_credit_card.png") </Filename>
@ -1739,7 +1743,7 @@ EndIf
</Button>
<Button>
<X> 551 </X>
<X> 566 </X>
<Y> TopRowY </Y>
<State> QRCodeButtonState </State>
<Filename> Var( DirImage + "/bn_qr_code.png") </Filename>
@ -2521,7 +2525,7 @@ eval(
<Width> 94 </Width>
<Height> 94 </Height>
<State> LOADING_STATE </State>
<Filename> Var( DirImage + "/loading.gif" )</Filename>
<Filename> "ROOT/taobin_project/image/page_payment/loading.gif"</Filename>
</GIF>
@ -2530,17 +2534,6 @@ eval(
Open "/media/bt/xml/security_alarm.xml"
</EventSecurity>
;<Text>
;<X> 0 </X>
;<Y> 1880 </Y>
;<Size> 14 </Size>
;<Align> "Left" </Align>
;<Width> 1080 </Width>
;<Font> KanitThinTTF </Font>
;<Color> 0x513C2F </Color>
;<Value> SelectDrink </Value>
;</Text>
<Button>