Do stall
This commit is contained in:
parent
365f23131d
commit
1c7d03e044
46 changed files with 2365 additions and 279 deletions
File diff suppressed because it is too large
Load diff
|
|
@ -210,14 +210,6 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
If RejectOrder = "true" Then
|
||||
SAVELOG "RejectOrder page_thankyouConti"
|
||||
|
||||
Var error_code_stop_now = 1221
|
||||
Var LastMakeDrinkResult = "fail"
|
||||
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
__CMD "check-cup" Seeker.selected_a_drink "-" "-"
|
||||
|
||||
|
|
@ -326,6 +318,52 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
; run test;
|
||||
If CountDownThankyou = 0 Then
|
||||
|
||||
; reset all var
|
||||
DEBUGVAR MachineStage
|
||||
SAVELOG "CountDownThankyou = 0"
|
||||
|
||||
Var CountDownBrewing = BrewTime
|
||||
Var CountUpBrewing = 0
|
||||
SAVELOG BrewTime
|
||||
|
||||
Var ShowCountDownBrewing = CountDownBrewing
|
||||
Var MachineState_Result = 0
|
||||
|
||||
If MenuReadyForCup = "YES" Then
|
||||
Var LastMakeDrinkResult = "-"
|
||||
If New_Payment = 1 Then
|
||||
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
|
||||
EndIf
|
||||
MakeDrinkV1 Seeker.selected_a_drink SelectSugarID
|
||||
|
||||
If CountryName = "Thailand" Then
|
||||
|
||||
If New_Payment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_brewing3.xml"
|
||||
EndIf
|
||||
Else
|
||||
|
||||
If InternationalEnable = 1 Then
|
||||
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
|
||||
Open Brew3Inter
|
||||
Else
|
||||
;obsolete
|
||||
If New_Payment = 1 Then
|
||||
Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_brewing3.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -486,7 +524,7 @@
|
|||
</EventUnitTest1>
|
||||
|
||||
<EventUnitTest2>
|
||||
Open "ROOT/xml/page_thankyouConti.xml"
|
||||
Open "ROOT/taoin_project/xml/page_thankyouConti.xml"
|
||||
</EventUnitTest2>
|
||||
|
||||
<EventUnitTest3>
|
||||
|
|
|
|||
|
|
@ -649,8 +649,7 @@
|
|||
If FromEnergyDrink1BathPro = 1 Then
|
||||
Open "ROOT/taobin_project/xml/event/energy_drink_1_bath/page_energy_drink_1_bath_consent.xml"
|
||||
EndIf
|
||||
If CupRemain > 0 Then
|
||||
|
||||
|
||||
If Only18 = "true" Then
|
||||
DEBUGVAR SelectDrink
|
||||
MenuProfile SelectDrink "IsMenuInProfile"
|
||||
|
|
@ -683,7 +682,6 @@
|
|||
OpenInst 1 "/mnt/sdcard/coffeevending/taobin_project/xml/page_advert.xml"
|
||||
Open "ROOT/taobin_project/xml/page_payment.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue