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

DO

Browse source
This commit is contained in:
kong 2022-02-24 13:39:59 +07:00
parent cd8df752dc
commit b97be007fc
3 changed files with 90 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
xml/page_board.xml
View file

@ -536,7 +536,7 @@
DEBUGVAR CountUpReloadAll
If CountUpReloadAll > 60 Then
If CountUpReloadAll > 40 Then
Var StartUpExt = "-"
Var CountUpReloadAll = 0

102
xml/page_payment.xml
View file

@ -12,7 +12,6 @@
Var QRCODETMP = ""
Var QRChannel = 0
Var HaveCup = "true"
;Var PriceDrink = 5
@ -82,20 +81,7 @@
EndIf
If Seeker = "curr" Then
If MachineStage = "remove-cup" Then
SAVELOG "MachineStage = remove-cup"
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
EndIf
If CupChecking = "true" Then
SAVELOG "CupChecking = true"
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
EndIf
EndIf
Var MachineStage = "-"
@ -122,12 +108,44 @@
DEBUGVAR Seeker.thankStrawFlag
Var Seeker.PayWithQR = 0
If CupChecking = "true" Then
Var StageShowAlias = "Invisible"
Var StageShowLoading = "Enable"
Else
Var StageShowAlias = "Enable"
Var StageShowLoading = "Invisible"
EndIf
</EventOpen>
<Timeout> 900 </Timeout>
<EventTimeout>
DEBUGVAR Seeker
DEBUGVAR HaveCup
DEBUGVAR CupChecking
If Seeker = "curr" Then
If MachineStage = "remove-cup" Then
SAVELOG "MachineStage = remove-cup"
If HaveCup = "true" Then
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
EndIf
EndIf
If CupChecking = "true" Then
If HaveCup = "true" Then
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
EndIf
EndIf
EndIf
If ReadyForBrew = "false" Then
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
@ -139,8 +157,11 @@
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
EndIf
Var CountStepPackPayment = CountStepPackPayment + 1
If CupChecking = "false" Then
If HaveCup = "false" Then
Var CountStepPackPayment = CountStepPackPayment + 1
EndIf
EndIf
If CountStepPackPayment = 1 Then
@ -219,6 +240,8 @@
EndIf
TimerReset
Refresh
</EventTimeout>
@ -235,16 +258,57 @@
<Image>
<State> StageShowAlias</State>
<X> 375 </X>
<Y> 623 </Y>
<Width> 331 </Width>
<Height> 435 </Height>
<Filename> PictureDrink </Filename>
</Image>
<Text>
<State> StageShowAlias</State>
<X> 0 </X>
<Y> 938 </Y>
<Width> 1080</Width>
<Align> Center </Align>
<Size> 72 </Size>
<Font> KanitMediumTTF </Font>
<Color> 0x513C2F </Color>
<Value> showname </Value>
</Text>
<Text>
<State> StageShowAlias</State>
<X> 0 </X>
<Y> 1022 </Y>
<Width> 1080</Width>
<Align> Center </Align>
<Size> 24 </Size>
<Font> KanitLightTTF </Font>
<Color> 0x6F5F51 </Color>
<Value> showdesc </Value>
</Text>
<Image>
<State> StageShowAlias</State>
<X> 144 </X>
<Y> 413 </Y>
<Filename> Var( DirImage + "/text_1.png" ) </Filename>
</Image>
<GIF>
<X> 493 </X>
<Y> 968 </Y>
<State>"Enable"</State>
<State>StageShowLoading</State>
<Width> 94 </Width>
<Height> 94 </Height>
<Filename> Var( DirImage + "/loading.gif" )</Filename>
</GIF>
<Image>
<State>StageShowLoading</State>
<X> 267 </X>
<Y> 1065 </Y>
<Filename> Var( DirImage + "/loadingText.png" )</Filename>

6
xml/page_payment_cashMore.xml
View file

@ -575,6 +575,7 @@
If CancelFlag = 0 Then
SAVELOG "Timeout > 180 s."
Cart "DeleteMenuID" "ALL"
Var CART_COUNT=0
If ViewBill > 0 Then
@ -809,6 +810,7 @@
If CoinInOK = 0 Then
If CancelFlag = 0 Then
Cart "DeleteMenuID" "ALL"
Var CART_COUNT=0
SAVELOG "VDCancle > Cancle Order."
CoinVending OFF
Var CancelFlag = 1
@ -1349,6 +1351,8 @@
If CoinInOK = 0 Then
If CancelFlag = 0 Then
Cart "DeleteMenuID" "ALL"
Var CART_COUNT = 0
SAVELOG "ButtonCancleMain > Cancle All Order."
CoinVending OFF
Var CancelFlag = 1
@ -1616,6 +1620,8 @@ EndIf
If CancelFlag = 0 Then
Cart "DeleteMenuID" "ALL"
SAVELOG "ButtonCancleAlpha2 > Cancle Order."
Var CART_COUNT = 0
CoinVending OFF
Var CancelFlag = 1
Var cancelState = "Enable"