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

Merge branch 'smoothie_tbp' of ssh://192.168.10.159/1TBHDD/ikong/taobin_project into smoothie_tbp

Browse source
This commit is contained in:
Ittipat Lusuk 2025-05-07 17:57:24 +07:00
commit a311b32d31
2 changed files with 110 additions and 102 deletions
Download patch file Download diff file Expand all files Collapse all files

80
xml/page_thankyouConti.xml
View file

@ -63,14 +63,14 @@
EndIf
;inter-image
If LanguageShow = "MYANMAR" Then
If LanguageShow = "MYANMAR" Then
Var BottomText = PicturePath + "text_bottom_eng.png"
Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
EndIf
If LanguageShow = "MSC" Then
If LanguageShow = "MSC" Then
Var BottomText = PicturePath + "text_bottom_eng.png"
@ -132,15 +132,15 @@
EndIf
;inter-image
If LanguageShow = "MYANMAR" Then
If LanguageShow = "MYANMAR" Then
Var DirImage2 = "ROOT/taobin_project/image/complete_mmr/"
EndIf
If LanguageShow = "MSC" Then
If LanguageShow = "MSC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_msc/"
EndIf
If LanguageShow = "MTC" Then
If LanguageShow = "MTC" Then
Var DirImage2 = "ROOT/taobin_project/inter/hkg/image/complete_mtc/"
EndIf
@ -157,6 +157,8 @@
;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
Var buttonRemoveCup = "Invisible"
SAVELOG "Thank you conti version TCT6"
;PendingFlag InternationalEnable
@ -193,7 +195,7 @@
SAVELOG "Make next order by take-cup with close-maintenance 2"
Var error_code_stop_now = 1221
If DoorCupPosition = "bottom" Then
@ -206,7 +208,7 @@
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
Open "ROOT/taobin_project/xml/page_cannotConti.xml "
EndIf
@ -217,29 +219,29 @@
SAVELOG "Make next order by take-cup with close-maintenance 3"
Var error_code_stop_now = CupErrorCodeForNextOrder
If DoorCupPosition = "bottom" Then
Else
Var error_code_stop_now = 1296
__CMD "error-code-1296" 0 "-" "-"
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"
EndIf
; setvarint Timeout2 888
If Timeout2 > 890 Then
__CMD "cup-error-code" "-" "-" "-"
DEBUGVAR CupErrorCodeForNextOrder
EndIf
@ -259,7 +261,7 @@
__CMD "check-cup" Seeker.selected_a_drink "-" "-"
; old condition
; old condition
If HaveCup = "false" Then
If MachineStage = "show-menu" Then
@ -356,13 +358,13 @@
__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"
If New_Payment = 1 Then
Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
Else
@ -371,12 +373,12 @@
Open Brew3Inter
Else
;obsolete
If New_Payment = 1 Then
Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
If New_Payment = 1 Then
Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
EndIf
EndIf
EndIf
EndIf
@ -398,6 +400,9 @@
;include=ROOT/taobin_project/inc/remove_cup_step.inc
If Timeout2 < 3 Then
Var buttonRemoveCup = "Invisible"
EndIf
If buttonRemoveCup = "Invisible" Then
If show_eng = "true" Then
@ -406,30 +411,30 @@
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
EndIf
;inter-text
If LanguageShow = "MYANMAR" Then
If LanguageShow = "MYANMAR" Then
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
EndIf
If LanguageShow = "MSC" Then
If LanguageShow = "MSC" Then
Var MachineErrorDetailAll = " 请拿杯子。"
EndIf
If LanguageShow = "MTC" Then
If LanguageShow = "MTC" Then
Var MachineErrorDetailAll = " 請拿杯子。"
EndIf
Else
Else
If CupChecking = "true" Then
If show_eng = "true" Then
Var MachineErrorDetailAll = " Please take a cup."
Else
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
EndIf
EndIf
;inter-text
If LanguageShow = "MYANMAR" Then
If LanguageShow = "MYANMAR" Then
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
EndIf
If LanguageShow = "MSC" Then
If LanguageShow = "MSC" Then
Var MachineErrorDetailAll = " 请拿杯子。"
EndIf
If LanguageShow = "MTC" Then
If LanguageShow = "MTC" Then
Var MachineErrorDetailAll = " 請拿杯子。"
EndIf
Else
@ -439,25 +444,28 @@
Var MachineErrorDetailAll = " กรุณากดปุ่ม แล้วนำแก้วออกก่อนครับ/คะ"
EndIf
;inter-text
If LanguageShow = "MYANMAR" Then
If LanguageShow = "MYANMAR" Then
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
EndIf
If LanguageShow = "MSC" Then
If LanguageShow = "MSC" Then
Var MachineErrorDetailAll = " 按按钮取杯子。"
EndIf
If LanguageShow = "MTC" Then
If LanguageShow = "MTC" Then
Var MachineErrorDetailAll = " 按按鈕取杯子。"
EndIf
EndIf
EndIf
If Timeout2 < 3 Then
Var MachineErrorDetailAll = "..."
EndIf
DEBUGVAR MenuReadyForCup
If MenuReadyForCup = "YES" Then
If DoorCupPosition = "bottom" Then
Var VideoPlayFile = VideoPath
Var VideoPlayFile = VideoPlayFile + VideoFileBegin
Var VideoPlayFile = VideoPlayFile + "1"
@ -470,9 +478,9 @@
DEBUGVAR CountDownForShowMenuNextOrderToBrew
DEBUGVAR Seeker.selected_a_drink
If CountDownForShowMenuNextOrderToBrew = 3 Then
EndIf
@ -491,7 +499,7 @@
Var buttonRemoveCup = "Invisible"
Else
EndIf