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

MYS: 8.21 fix payment ui

Browse source
This commit is contained in:
Pakin 2024-03-01 07:49:45 +07:00
parent 867a006298
commit 07b765da8b
1 changed files with 54 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

72
xml/page_payment_cash-MYR.xml
View file

@ -96,6 +96,8 @@
Var alphaState = "Invisible"
Var alphaState2 = "Invisible"
Var alphaState3 = "Invisible"
Var alphaStateLOGO = "Invisible"
Var alphaStateQR = "Invisible"
Var CoinInFlag = 0
@ -568,10 +570,12 @@
Var QRCODE99 = QRCODE99KBANK
Var LOADING_STATE = "Invisible"
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_mobile.mp3"
Else
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_mobile.mp3"
If alphaStateQR = "Enable" Then
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_mobile.mp3"
Else
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_mobile.mp3"
EndIf
EndIf
EndIf
@ -595,10 +599,12 @@
Var QRCODE99 = QRCODE99Shoppy
Var LOADING_STATE = "Invisible"
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
If alphaStateQR = "Enable" Then
If show_eng = "true" Then
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_scan_to_pay_via_e-wallet.mp3"
Else
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_scan_to_pay_via_e-wallet.mp3"
EndIf
EndIf
EndIf
@ -715,6 +721,12 @@
<Timeout> 1000 </Timeout>
<EventTimeout>
; group debug check alpha
;DEBUGVAR alphaState
;DEBUGVAR alphaState2
;DEBUGVAR alphaState3
If ReadyForBrew = "false" Then
SAVELOG "Back to main1"
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
@ -750,6 +762,10 @@
If Timeout >= 120 Then
Var alphaState = "Invisible"
Var alphaState2 = "Invisible"
Var alphaState3 = "Invisible"
Var alphaStateLOGO = "Invisible"
Var alphaStateQR = "Invisible"
If RoadShow = "true" Then
@ -1364,6 +1380,8 @@
<Volume> SoundVolume </Volume>
<EventClick>
DEBUGVAR PayState1
If alphaState = "Invisible" Then
If EnoughChange = "yes" Then
@ -1443,6 +1461,8 @@
Var FlagQROpened = 1
Var alphaState = "Enable"
Var alphaStateQR = "Enable"
Var alphaStateLOGO = "Enable"
;CoinVending OFF
VendingQR ON
@ -1557,6 +1577,8 @@
Var FlagQROpened = 1
Var alphaState = "Enable"
Var alphaStateLOGO = "Enable"
Var alphaStateQR = "Enable"
;CoinVending OFF
VendingQR ON
@ -1816,7 +1838,7 @@ EndIf
<Image>
<X> 267 </X>
<Y> 1065 </Y>
<Y> 1165 </Y>
<State> LOADING_STATE </State>
<Filename> Var( DirImage + "/loadingText.png" )</Filename>
</Image>
@ -1840,11 +1862,12 @@ EndIf
Var LOADING_STATE = "Invisible"
Var QRErrorState = "Invisible"
Var alphaState = "Invisible"
Var alphaStateLOGO = "Invisible"
Var alphaStateQR = "Invisible"
Var QRCODE99 = ""
;CoinVending ON
;VendingQR OFF
CashlessReq OFF
Coin CARDOFF
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
@ -2024,6 +2047,8 @@ EndIf
EndIf
Var alphaState2 = "Invisible"
Var alphaStateLOGO = "Invisible"
Var alphaStateQR = "Invisible"
Refresh
@ -2086,6 +2111,8 @@ EndIf
CoinVending BILLREJECT
Var alphaState3 = "Invisible"
Var alphaStateLOGO = "Invisible"
Var alphaStateQR = "Invisible"
Refresh
</EventClick>
</Button>
@ -2118,26 +2145,26 @@ EndIf
<Image>
<X> 483 </X>
<Y> 791 </Y>
<State> alphaState </State>
<Y> 891 </Y>
<State> alphaStateLOGO </State>
<Filename> LOGO_CH </Filename>
</Image>
<QRCode>
<X> 445 </X>
<Y> 958 </Y>
<X> 455 </X>
<Y> 1058 </Y>
<Width> 170 </Width>
<Height> 170 </Height>
<Color> "0xFFFFFF" </Color>
;<QRColor> "0xE61A5F" </QRColor>
<State> alphaState </State>
<State> alphaStateQR </State>
<Service> testservice </Service>
</QRCode>
<Button>
<X> 267 </X>
<Y> 960 </Y>
<Y> 1060 </Y>
<State>QRErrorState</State>
<Filename> Var( DirImage + "/QRError.png" ) </Filename>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -2174,7 +2201,7 @@ EndIf
<GIF>
<X> 493 </X>
<Y> 968 </Y>
<Y> 1068 </Y>
<Width> 94 </Width>
<Height> 94 </Height>
<State> LOADING_STATE </State>
@ -2251,7 +2278,16 @@ EndIf
Open CurrentXMLFileName2
</EventUnitTest1>
<EventUnitTest3>
Var EnableCash = "true"
Var PayState2 = "Enable"
Var PayState3 = "Enable"
Var PayState4 = "Enable"
Var PayState5 = "Enable"
Var QR_POPUP = "/img_popup8.png"
</EventUnitTest3>
</Popup>