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

Merge branch 'masterpiece' into sgp_blue

Browse source
This commit is contained in:
Pakin 2024-09-26 17:24:09 +07:00
commit c958e15b68
2 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ui/lang.tsv
View file

@ -1312,3 +1312,7 @@
2100054 Sleep mode will be turn on
when machine operating. Sleep mode will be turn on
when machine operating. 2100054 Sleep mode will be turn on
when machine operating. Sleep mode will be turn on
when machine operating.
2100055 Sleep mode will be turn off
when machine operating. Sleep mode will be turn off
when machine operating. 2100055 Sleep mode will be turn off
when machine operating. Sleep mode will be turn off
when machine operating.
2100056 Please check before confirming Please check before confirming 2100056 Please check before confirming Please check before confirming
2100057 Fan module Fan module
Fan
2200000 Fan พัดลม

Can't render this file because it has a wrong number of fields in line 21.

19
xml/page_payment_cash-UAE.xml
View file

@ -747,6 +747,13 @@
EndIf EndIf
If VendingCashless = "END" Then
If ReqPayInfoFromCashOther = 2 Then
DEBUGVAR "CashlessReq OFF"
CashlessReq OFF
EndIf
EndIf
</EventActionOk> </EventActionOk>
<EventActionError> <EventActionError>
@ -1494,7 +1501,8 @@
If CancelFlag = 0 Then If CancelFlag = 0 Then
Var QR_POPUP = "/img_popup8.png" Var QR_POPUP = "/img_popup8.png"
Var alphaState = "Enable" Var alphaState = "Enable"
;Coin CARD Coin CARD
Var ReqPayInfoFromCashOther = 2 Var ReqPayInfoFromCashOther = 2
Var CreditCardRef = "" Var CreditCardRef = ""
@ -1516,9 +1524,7 @@
Var Timeout = 0 Var Timeout = 0
EndIf EndIf
Var QRErrorState = "Invisible"
Var VendingCashless = "-" Var VendingCashless = "-"
Var LOADING_STATE = "Enable"
Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign Var RemainAmountX = PayAmount - Seeker.IntVendingCampaign
CashlessPay RemainAmountX CreditCardRef CashlessPay RemainAmountX CreditCardRef
Var CashlessPayFlag = 1 Var CashlessPayFlag = 1
@ -1738,18 +1744,11 @@
;CoinVending ON ;CoinVending ON
;VendingQR OFF ;VendingQR OFF
If ReqPayInfoFromCashOther = 2 Then
DEBUGVAR "CashlessReq OFF by user"
CashlessReq OFF
EndIf
If CashlessPayFlag = 1 Then If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0 Var CashlessPayFlag = 0
CashlessReq FAIL CashlessReq FAIL
EndIf EndIf
Refresh Refresh
</EventClick> </EventClick>
</Button> </Button>