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

Merge remote-tracking branch 'refs/remotes/origin/masterpiece' into masterpiece

Browse source
This commit is contained in:
wanlop run 2024-04-28 21:59:51 +07:00
commit 0e92352f2d
3 changed files with 104 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xml/page_board.xml
View file

@ -818,7 +818,7 @@
STRCONTAIN "521215" MaterialAvailable SugarZeroCalEnable
Var DisableTaobinCredit = "true"
Var SettingDisableTaobinCredit = "true"
; Singapore disable point
Var SettingIgnoreCollectPoint = 1
@ -865,7 +865,7 @@
LoadLanguage "/mnt/sdcard/coffeevending/taobin_project/inter/uae_dubai/menu/lang.tsv"
EndIf
Var DisableTaobinCredit = "true"
Var SettingDisableTaobinCredit = "true"
EndIf

103
xml/page_payment_cash-SGP.xml
View file

@ -458,7 +458,7 @@
Var TopRowY = 1276
Var BotRowY = 1499
If DisableTaobinCredit = "true" Then
If SettingDisableTaobinCredit = "true" Then
Var PayState4 = "Invisible"
EndIf
</EventOpen>
@ -1514,7 +1514,7 @@ EndIf
<Button>
<X> 439 </X>
<Y> eval(
If DisableTaobinCredit = "true" Then
If SettingDisableTaobinCredit = "true" Then
Var return = TopRowY
Else
Var return = BotRowY
@ -1900,7 +1900,13 @@ EndIf
<Button>
<X> 327 </X>
<Y> 1208 </Y>
<State> alphaState3 </State>
<State> eval(
If SettingDisableTaobinCredit = "true" Then
Var return = "Invisible"
Else
Var return = alphaState3
EndIf
) </State>
<Filename> Var( DirImage2 + "/bn_keep.png" )</Filename>
<FilenamePress> Var( DirImage2 + "/bp_keep.png" )</FilenamePress>
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
@ -1923,6 +1929,44 @@ EndIf
CoinVending BILLREJECT
Var alphaState3 = "Invisible"
If SettingDisableTaobinCredit = "true" Then
If EnoughChange = "yes" Then
Else
If CoinInOK = 0 Then
If CancelFlag = 0 Then
If ViewBill > 0 Then
CoinVending BILLREJECT
EndIf
SAVELOG "ButtonCancleMain > Cancle Order."
Machine CancelWepApp
CoinVending OFF
Var CancelFlag = 1
Var cancelState = "Enable"
Var CancelCounter = 0
If FlagQROpened = 1 Then
Var CancelNumber = 12
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
EndIf
EndIf
EndIf
Refresh
</EventClick>
</Button>
@ -1953,6 +1997,47 @@ EndIf
CoinVending BILLREJECT
Var alphaState3_offline = "Invisible"
If SettingDisableTaobinCredit = "true" Then
If EnoughChange = "yes" Then
Else
If CoinInOK = 0 Then
If CancelFlag = 0 Then
If ViewBill > 0 Then
CoinVending BILLREJECT
EndIf
SAVELOG "ButtonCancleMain > Cancle Order."
Machine CancelWepApp
CoinVending OFF
Var CancelFlag = 1
Var cancelState = "Enable"
Var CancelCounter = 0
If FlagQROpened = 1 Then
Var CancelNumber = 12
EndIf
If CashlessPayFlag = 1 Then
Var CashlessPayFlag = 0
CashlessReq FAIL
EndIf
EndIf
EndIf
EndIf
EndIf
Refresh
</EventClick>
</Button>
@ -2085,9 +2170,21 @@ EndIf
</Text>
<EventUnitTest1>
Var SELLONLINE = 1
Var EnoughChange = "nay"
Var PayState1 = "Enable"
</EventUnitTest1>
<EventUnitTest2>
Var SELLONLINE = 1
Var EnoughChange = "yes"
Var PayState1 = "Enable"
</EventUnitTest2>

4
xml/page_payment_cash-UAE.xml
View file

@ -489,7 +489,7 @@
Var TopRowY = 1276
Var BotRowY = 1499
If DisableTaobinCredit = "true" Then
If SettingDisableTaobinCredit = "true" Then
Var PayState4 = "Invisible"
EndIf
@ -1548,7 +1548,7 @@ EndIf
<Button>
<X> 439 </X>
<Y> eval(
If DisableTaobinCredit = "true" Then
If SettingDisableTaobinCredit = "true" Then
Var return = TopRowY
Else
Var return = BotRowY