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

fix(xml): merge conflic

Browse source
This commit is contained in:
Kenta420 2024-12-12 11:57:52 +07:00
parent 5269f48101
commit 899db59317
1 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

34
xml/page_thankyouConti.xml
View file

@ -48,7 +48,7 @@
Var BottomText = PicturePath + "text_bottom_thai2.png"
EndIf
If LanguageShow = "MYANMAR" Then
If LanguageShow = "MYANMAR" Then
Var BottomText = PicturePath + "text_bottom_eng.png"
@ -115,10 +115,10 @@
Var DirImage2 = "ROOT/taobin_project/image/complete/"
EndIf
If LanguageShow = "MYANMAR" Then
If LanguageShow = "MYANMAR" Then
Var DirImage2 = "ROOT/taobin_project/image/complete_mmr/"
EndIf
Var txtDrinkOKState = "Invisible"
Var buttonRemoveCup = "Invisible"
@ -243,13 +243,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
@ -258,12 +258,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
EndIf
@ -293,19 +293,17 @@
Else
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
EndIf
If LanguageShow = "MYANMAR" Then
If LanguageShow = "MYANMAR" 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
If LanguageShow = "MYANMAR" Then
EndIf
If LanguageShow = "MYANMAR" Then
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
EndIf
Else
@ -314,7 +312,7 @@
Else
Var MachineErrorDetailAll = " กรุณากดปุ่ม แล้วนำแก้วออกก่อนครับ/คะ"
EndIf
If LanguageShow = "MYANMAR" Then
If LanguageShow = "MYANMAR" Then
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
EndIf
EndIf