THAI INTER: Merge branch masterpiece -> th_mmr

This commit is contained in:
Ittipat Lusuk 2024-12-12 17:35:05 +07:00
commit 3c994e2ed1
548 changed files with 161156 additions and 52934 deletions

View file

@ -2,7 +2,7 @@
<Cache> "Enable" </Cache>
<Width> 1080 </Width>
<Height> 1920 </Height>
<Background> "0xeae6e1" </Background>
<Background> BackgroundColor </Background>
<Sound> "ROOT/taobin_project/sounds/chaching.mp3" </Sound>
<Volume> SoundVolume </Volume>
<EventOpen>
@ -19,30 +19,30 @@
Var ActionOKCase = 0
Var ChangeTimeout = 0
Var ChangeOK = 0
Var buttonRemoveCup = "Invisible"
Var MachineState_Result = 0
Var FailedCount = 0
Var ChangeAmountSum = 0
Var Tel_Confirm_Flag = 0
Var LastMakeDrinkResult = "-"
DEBUGVAR MachineStage
DEBUGVAR NextOrderStatus
If show_eng = "true" Then
Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png"
If show_eng = "true" Then
Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2_eng.png"
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
Var BottomText = PicturePath + "text_bottom_eng.png"
Else
Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png"
Var ImageDoing = "ROOT/taobin_project/image/page_doing/img2.png"
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
Var BottomText = PicturePath + "text_bottom_thai2.png"
@ -59,11 +59,11 @@
;DEBUGVAR LidState
DEBUGVAR BottomText
;If StarwState = "Press" Then
;I f StarwState = "Press" Then
; Machine StrawWithDelay
; LED LedDoorLid Blink 255 255 255 255
;EndIf
;If LidState = "Press" Then
;I f LidState = "Press" Then
; Machine LidWithDelay
; LED LedDoorLid Blink 255 255 255 255
;EndIf
@ -80,9 +80,9 @@
If Seeker = "curr" Then
SAVELOG "Call from thankyou Conti"
If Seeker.get_a_straw = "Press" Then
Machine StrawOrder
Machine StrawOrder
Var LedLidBlink = "true"
Var SaveTheWorldCount = SaveTheWorldCount + 1
@ -90,7 +90,7 @@
EndIf
If Seeker.get_a_lid = "Press" Then
Machine LidOrder
Machine LidOrder
Var LedLidBlink = "true"
Var SaveTheWorldCount = SaveTheWorldCount + 1
@ -109,7 +109,7 @@
DEBUGVAR NextOrderStatus
; Show text and button for remove CUP.
If show_eng = "true" Then
If show_eng = "true" Then
Var DirImage2 = "ROOT/taobin_project/image/complete_en/"
Else
Var DirImage2 = "ROOT/taobin_project/image/complete/"
@ -128,7 +128,7 @@
Var Timeout2 = 0
Var SlientRefreshEnable = 0
Var SlientRefreshEnable = 0
;include=ROOT/taobin_project/inc/remove_cup_event_open.inc
@ -136,13 +136,13 @@
;PendingFlag InternationalEnable
;PendingFlag New_Payment
;PendingFlag
;PendingFlag
</EventOpen>
<Timeout> 1000 </Timeout>
<EventTimeout>
<EventTimeout>
Var CountDownBrewing = CountDownBrewing - 1
DEBUGVAR MachineStage
@ -162,9 +162,9 @@
; Timeout2 10*60*2
If Timeout2 > 900 Then
SAVELOG "Timeout2 900"
SAVELOG "Make next order by take-cup with close-maintenance 2"
Var error_code_stop_now = 1221
If DoorCupPosition = "bottom" Then
@ -174,14 +174,14 @@
__CMD "error-code-1296" 0 "-" "-"
EndIf
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
EndIf
If MachineStage = "close-maintenance" Then
If stop_now = "true" Then
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
EndIf
EndIf
@ -190,7 +190,7 @@
Var error_code_stop_now = 1221
Open "ROOT/taobin_project/xml/page_cannotConti.xml"
EndIf
@ -212,19 +212,19 @@
If NextOrderStatus = "Disable" Then
Var LastMakeDrinkResult = "fail"
Else
Var CountDownThankyou = 0
EndIf
EndIf
EndIf
DEBUGVAR CountDownThankyou
; run test;
If CountDownThankyou = 0 Then
If CountDownThankyou = 0 Then
; reset all var
DEBUGVAR MachineStage
SAVELOG "CountDownThankyou = 0"
@ -232,41 +232,43 @@
Var CountDownBrewing = BrewTime
Var CountUpBrewing = 0
SAVELOG BrewTime
Var ShowCountDownBrewing = CountDownBrewing
Var MachineState_Result = 0
If MachineStage = "show-menu" Then
If HaveCup = "false" Then
Var LastMakeDrinkResult = "-"
If New_Payment = 1 Then
If New_Payment = 1 Then
__CMD "SetPay" "coffee-payment" Seeker.VendingTSID Seeker.ORDER_ID
EndIf
MakeDrinkV1 Seeker.selected_a_drink SelectSugarID
If InternationalEnable = 1 Then
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
If CountryName = "Thailand" Then
If New_Payment = 1 Then
Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
Else
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
Open "ROOT/taobin_project/xml/page_brewing3.xml"
EndIf
Else
If New_Payment = 1 Then
Open "ROOT/taobin_project/xml/page_NewBrewing3.xml"
If InternationalEnable = 1 Then
Var Brew3Inter = CountryRootPath + "/xml/page_brewing3.lxml"
Open Brew3Inter
Else
Open "ROOT/taobin_project/xml/page_brewing3.xml"
;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
EndIf
EndIf
If IceCleanStatus = "wait" Then
@ -315,10 +317,10 @@
EndIf
EndIf
EndIf
Refresh
TimerReset
</EventTimeout>
</EventTimeout>
@ -344,13 +346,13 @@
<Align> Center </Align>
<Size> 72 </Size>
<Font> KanitMediumTTF </Font>
<Color> 0x513C2F </Color>
<Color> HeadlineColor </Color>
<Value> Seeker.showname </Value>
</Text>
<EventChangeStatus>
If ChangeStatus = "payout-end" Then
If ChangeStatus = "payout-end" Then
EndIf
</EventChangeStatus>
@ -371,7 +373,7 @@
<Interval> 500 </Interval>
<Filename> Var( DirImage2 + "/bn_open_door.png" ) </Filename>
<FilenamePress> Var( DirImage2 + "/bp_open_door.png" ) </FilenamePress>
<EventClick>
<EventClick>
;include=ROOT/taobin_project/inc/remove_cup_button.inc