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

OK triple order menu

Browse source
This commit is contained in:
kong 2021-12-31 01:12:18 +07:00
parent 31a587ea0d
commit abc4ade9fa
5 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xml/page_brewing3.xml
View file

@ -216,6 +216,7 @@
EndIf
If waitAckPay = 1 Then
SAVELOG "waitAckPay = 1"
Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf
@ -332,6 +333,7 @@
If waitAckPay = 1 Then
If Timeout > 60 Then
Var VendingTSID = ""
SAVELOG "TIMEOUT=60"
Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf
@ -625,6 +627,7 @@
Var ServiceSuccess = "yes"
If waitAckPay = 0 Then
SAVELOG "waitAckPay=0"
Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf
@ -708,7 +711,7 @@
If MachineStage = "show-menu" Then
If MachineState_Result = 0 Then
SAVELOG "back_to_main from line > 655."
SAVELOG "back_to_main from line > 714."
;Open "ROOT/taobin_project/xml/page_drinkok.xml"
Var MachineState_Result = 1
EndIf
@ -812,6 +815,7 @@
If IgnoreNetCore = "true" Then
If CountDownBrewing = 0 Then
SAVELOG "CountDownBrewing=0"
Open "ROOT/taobin_project/xml/page_drinkok.xml"
EndIf
EndIf

14
xml/page_drinkok.xml
View file

@ -235,12 +235,16 @@
Open "ROOT/taobin_project/xml/page_drinkfail2.xml"
Else
If NextOrder = "true" Then
Var NextOrder = "false"
If HaveCup = "false" Then
If CHECKCUP = "false" Then
Var NextOrder = "false"
TransferVar "next" "curr"
Var Seeker = "curr"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
TransferVar "next" "curr"
Var Seeker = "curr"
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
EndIf
EndIf
Else
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
EndIf

4
xml/page_payment.xml
View file

@ -74,12 +74,13 @@
EndIf
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
@ -111,6 +112,7 @@
EndIf
If MachineStage = "remove-cup" Then
SAVELOG "MachineStage = remove-cup 2"
Open "ROOT/taobin_project/xml/page_back_to_remove_cup.xml"
EndIf

8
xml/page_thankyouConti.xml
View file

@ -7,7 +7,7 @@
<Volume> SoundVolume </Volume>
<EventOpen>
; On open
Var CountDownThankyou = 3
Var CountDownThankyou = 4
Var CountDownBrewing = BrewTime
Var CountUpBrewing = 0
SAVELOG BrewTime
@ -83,6 +83,8 @@
; Pack
Topping "Pack" ExtendData
Var MachineStage = "NextOrder"
@ -112,6 +114,7 @@
Var PictureFile = PictureFile + PictureEnd
If CART_INDEX = 0 Then
DEBUGVAR Seeker.selected_a_drink
MakeDrinkV1 Seeker.selected_a_drink SelectSugarID
Else
;Cart "MakeID" CART_INDEX
@ -125,12 +128,13 @@
; run test;
If CountDownThankyou = 0 Then
DEBUGVAR MachineStage
Var CountDownBrewing = BrewTime
Var CountUpBrewing = 0
SAVELOG BrewTime
Var ShowCountDownBrewing = CountDownBrewing
Var MachineState_Result = 0
Open "ROOT/taobin_project/xml/page_brewing3.xml"

3
xml/page_topping_select.xml
View file

@ -10,7 +10,7 @@
WEB "DISABLE"
Open "ROOT/taobin_project/xml/page_topping_select3.xml"
DEBUGVAR EnableSelectMenuBetweenBrew
If JXMLVersionInt >= 369 Then
If EnableSelectMenuBetweenBrew = "Enable" Then
@ -18,6 +18,7 @@
EndIf
EndIf
Open "ROOT/taobin_project/xml/page_topping_select3.xml"
DEBUGVAR BrewVersionInt