Before merge

This commit is contained in:
wanlop run 2025-01-15 10:35:56 +07:00
parent 45c3eaef1a
commit 9809d159dc
81 changed files with 3175 additions and 3088 deletions

View file

@ -123,7 +123,7 @@
;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
SAVELOG "Thank you conti version TCT5"
SAVELOG "Thank you conti version TCT6"
;PendingFlag InternationalEnable
;PendingFlag New_Payment
@ -169,6 +169,10 @@
EndIf
Var LastMakeDrinkResult = "fail"
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
Open "ROOT/taobin_project/xml/page_cannotConti.xml "
EndIf
@ -189,6 +193,10 @@
EndIf
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
Var LastMakeDrinkResult = "fail"
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
@ -206,6 +214,10 @@
If MachineStage = "close-maintenance" Then
If stop_now = "true" Then
Var LastMakeDrinkResult = "fail"
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
EndIf
EndIf
@ -500,7 +512,7 @@
<Width> 1080 </Width>
<Align> end </Align>
<Color> 0xFF0000 </Color>
<Value> "TCT5 "</Value>
<Value> "TCT6 "</Value>
</Text>