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

fix change coin multi

Browse source
This commit is contained in:
miggaze 2021-11-15 19:41:38 +07:00
parent 2d873f12e9
commit 646c0b9d4e
4 changed files with 55 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

12
xml/page_brewing3Multi.xml
View file

@ -485,7 +485,9 @@
EndIf
If MachineState_Result = 1 Then
Var MachineState_Result = 2
EndIf
If MachineState_Result = 1 Then
@ -605,7 +607,9 @@
If StoreCreditFlag = 1 Then
Var ChangeOK = 2
Else
Change ServiceAmount2
;Change ServiceAmount2
Var ChangeAmountSum = ChangeAmountSum + ServiceAmount2
Var ChangeOK = 2
EndIf
EndIf
@ -620,7 +624,9 @@
If StoreCreditFlag = 1 Then
Var ChangeOK = 2
Else
Change ServiceAmount3
;Change ServiceAmount3
Var ChangeAmountSum = ChangeAmountSum + ServiceAmount3
Var ChangeOK = 2
EndIf
EndIf

13
xml/page_drinkfail2Multi.xml
View file

@ -104,7 +104,7 @@
SAVELOG next_ready
Var next_ready = "false"
Var MultiGo = 1
@ -147,7 +147,7 @@
If StoreCreditFlag = 1 Then
Else
Change ServiceAmount2
Var ChangeAmountSum = ChangeAmountSum + ServiceAmount2
Var MultiGo = 0
EndIf
EndIf
@ -189,7 +189,7 @@
If StoreCreditFlag = 1 Then
Else
Change ServiceAmount2
Var ChangeAmountSum = ChangeAmountSum + ServiceAmount2
Var MultiGo = 0
EndIf
EndIf
@ -202,6 +202,13 @@
EndIf
If CART_INDEX = CART_COUNT Then
If ChangeAmountSum > 0 Then
Change ChangeAmountSum
Var MultiGo = 0
EndIf
EndIf
</EventOpen>

49
xml/page_drinkok.xml
View file

@ -107,10 +107,42 @@
EndIf
Var MultiGo = 1
If CART_COUNT = 0 Then
Var sendPayMultiFlag = 1
Else
If CART_INDEX = CART_COUNT Then
If ChangeAmountSum > 0 Then
Change ChangeAmountSum
Var MultiGo = 0
EndIf
EndIf
EndIf
</EventOpen>
<Timeout> 500 </Timeout>
<EventTimeout>
DEBUGVAR MachineStage
DEBUGVAR CupOnArm
DEBUGVAR buttonRemoveCup
DEBUGVAR CART_COUNT
Var Timeout = Timeout + 1
If Timeout > 5 Then
Var MultiGo = 1
EndIf
If MultiGo = 1 Then
If CART_INDEX = CART_COUNT Then
;Pay Multi
If sendPayMultiFlag = 0 Then
@ -148,21 +180,10 @@
Var sendPayMultiFlag = 1
EndIf
EndIf
EndIf
EndIf
EndIf
</EventOpen>
<Timeout> 500 </Timeout>
<EventTimeout>
DEBUGVAR MachineStage
DEBUGVAR CupOnArm
DEBUGVAR buttonRemoveCup
DEBUGVAR CART_COUNT
If HaveCup = "false" Then
If MachineStage = "show-menu" Then
@ -223,7 +244,7 @@
EndIf
EndIf
Var Timeout = Timeout + 1
TimerReset
Refresh

1
xml/page_thankyou.xml
View file

@ -25,6 +25,7 @@
Var MachineState_Result = 0
Var FailedCount = 0
Var ChangeAmountSum = 0
If show_eng = "true" Then