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

Merge branch 'masterpiece' of ssh://forthrd.ddns.net:2222/1TBHDD/ikong/taobin_project into masterpiece

Browse source
This commit is contained in:
wanlop run 2025-05-30 15:19:37 +07:00
commit 34ceea967c
55 changed files with 5749 additions and 911 deletions
Download patch file Download diff file Expand all files Collapse all files

16
xml/page_payment_cash-AUS.xml
View file

@ -98,6 +98,8 @@
Var EMAPopupSuccessState = "Invisible"
Var EMAPopupErrorState = "Invisible"
Var QRErrorText = "Errror scanning\nthe QR code"
Var QRErrorImg = "/QRError.png"
Var QR_POPUP = "/img_popup8-2.png"
Var alphaState = "Invisible"
Var alphaState2 = "Invisible"
@ -2102,13 +2104,13 @@ EndIf
<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
</Image>
<Image>
<X> 182 </X>
<Y> 748 </Y>
;inter-image
<State> alphaState2 </State>
<Filename> Var( DirImage2 + "/img_popup11-AUS.png" )</Filename>
</Image>
;<Image>
;<X> 182 </X>
;<Y> 748 </Y>
;;inter-image
;<State> alphaState2 </State>
;<Filename> Var( DirImage2 + "/img_popup11-AUS.png" )</Filename>
;</Image>
<Image>

53
xml/page_payment_cash-GBR.xml
View file

@ -16,7 +16,7 @@
;EndIf
Var ErrorCause = ""
Var MAX_EMA_CODE = 6
Var MAX_EMA_CODE = 5
Var PreScaleCanculate = 100
@ -99,6 +99,8 @@
Var EMAPopupSuccessState = "Invisible"
Var EMAPopupErrorState = "Invisible"
Var QRErrorText = "Errror scanning\nthe QR code"
Var QRErrorImg = "/QRError.png"
Var QR_POPUP = "/img_popup8-2.png"
Var alphaState = "Invisible"
Var alphaState2 = "Invisible"
@ -703,7 +705,7 @@
INT _EMAMemberBalance
Var EMAMemberName !assigned SprintFmt("[%s]", _EMAMemberName)
Var _BalanceFormat = "Remain Balance: $%.2f"
Var _BalanceFormat = "Remain Balance: £%.2f"
Var EMAMemberBalance !assigned StringFmt(_EMAMemberBalance, _BalanceFormat, PreScaleConvertShow)
DEBUGVAR EMAMemberName
@ -1716,7 +1718,8 @@ EndIf
<Button>
<X> 328 </X>
<Y> 1399 </Y>
<State> PayWithFatzebraState </State>
;<State> PayWithFatzebraState </State>
<State> "Invisible" </State>
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_qr_code.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_qr_code.png" </FilenamePress>
<FilenameDisable> "ROOT/taobin_project/inter/gbr/image/payment_cash/bd_qr_code.png" </FilenameDisable>
@ -1806,23 +1809,25 @@ EndIf
</EventClick>
</Button>
;<Button>
;<X> 552 </X>
;<Y> 1399 </Y>
;<State> "Enable" </State>
;<Filename> Var( DirImage + "/bn_pay_with_comingSoon.png") </Filename>
;<FilenamePress> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenamePress>
;<FilenameDisable> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenameDisable>
;<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
;<Volume> SoundVolume </Volume>
;<EventClick>
;
;</EventClick>
;</Button>
<Button>
<X> 552 </X>
<Y> 1399 </Y>
<State> "Disable" </State>
<Filename> Var( DirImage + "/bn_pay_with_comingSoon.png") </Filename>
<FilenamePress> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenamePress>
<FilenameDisable> Var( DirImage + "/bn_pay_with_comingSoon.png") </FilenameDisable>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
<Volume> SoundVolume </Volume>
<EventClick>
</EventClick>
</Button>
<Button>
;<X> 552 </X>
;<Y> 1399 </Y>
<X> 328 </X>
<Y> 1399 </Y>
<State> PayWithAUBState </State>
<Filename> "ROOT/taobin_project/inter/gbr/image/payment_cash/bn_pay_with_ema.png" </Filename>
<FilenamePress> "ROOT/taobin_project/inter/gbr/image/payment_cash/bp_pay_with_ema.png" </FilenamePress>
@ -2113,13 +2118,13 @@ EndIf
<Filename> "ROOT/taobin_project/image/page_payment/alpha.png" </Filename>
</Image>
<Image>
<X> 182 </X>
<Y> 748 </Y>
;inter-image
<State> alphaState2 </State>
<Filename> Var( DirImage2 + "/img_popup11-GBR.png" )</Filename>
</Image>
;<Image>
;<X> 182 </X>
;<Y> 748 </Y>
;;inter-image
;<State> alphaState2 </State>
;<Filename> Var( DirImage2 + "/img_popup11-GBR.png" )</Filename>
;</Image>
<Image>