Merge
This commit is contained in:
commit
5d733eca34
36 changed files with 105 additions and 21 deletions
|
|
@ -1117,6 +1117,9 @@
|
|||
If EnableMultiInstance = "true" Then
|
||||
If CountryName = "Thailand" Then
|
||||
|
||||
; test payment
|
||||
Var New_Payment = 1
|
||||
|
||||
Var InternationalEnable = 1
|
||||
DEBUGVAR InternationalEnable
|
||||
|
||||
|
|
@ -1135,7 +1138,7 @@
|
|||
Var ENABLE_UAE_DUBAI = "Invisible"
|
||||
EnableLanguage "ENG"
|
||||
EnableLanguage "THAI"
|
||||
EnableLanguage "MYANMAR"
|
||||
;EnableLanguage "MYANMAR"
|
||||
|
||||
If MyanmarLangEnable = "true" Then
|
||||
EnableLanguage "MYANMAR"
|
||||
|
|
@ -1154,6 +1157,7 @@
|
|||
|
||||
Var ShowButtonClick2 = "Invisible"
|
||||
Var ButtontoTopupMenu = "Enable"
|
||||
Var CurrentPageShowError = 0
|
||||
|
||||
|
||||
Var PriceUnitText = ""
|
||||
|
|
|
|||
|
|
@ -17,6 +17,10 @@
|
|||
Var DirImage = "ROOT/taobin_project/image/collectiing/"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/"
|
||||
EndIf
|
||||
|
||||
|
||||
Var Timeout = 0
|
||||
StopLongPlay
|
||||
|
|
|
|||
|
|
@ -8,6 +8,8 @@
|
|||
<EventOpen>
|
||||
; On open
|
||||
|
||||
RootLayoutVisible 3 "hide"
|
||||
|
||||
Var Seeker.TNumberTaobinMember = ""
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -17,6 +17,10 @@
|
|||
Var DirImage = "ROOT/taobin_project/image/collectiing/"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/"
|
||||
EndIf
|
||||
|
||||
|
||||
Var Timeout = 0
|
||||
Var GetFreeFlag = 0
|
||||
|
|
|
|||
|
|
@ -1233,10 +1233,11 @@
|
|||
Var PayState2 = "Disable"
|
||||
EndIf
|
||||
|
||||
Var PayState2 = "Enable"
|
||||
Var PayState3 = "Enable"
|
||||
Var PayState4 = "Enable"
|
||||
Var PayState5 = "Enable"
|
||||
;for test
|
||||
;Var PayState2 = "Enable"
|
||||
;Var PayState3 = "Enable"
|
||||
;Var PayState4 = "Enable"
|
||||
;Var PayState5 = "Enable"
|
||||
</EventOpen>
|
||||
|
||||
<EventActionOk>
|
||||
|
|
|
|||
|
|
@ -18,6 +18,11 @@
|
|||
Var countClick = 0
|
||||
Var countClick2 = 0
|
||||
|
||||
If InternationalEnable = 1 Then
|
||||
If CountryName = "Thailand" Then
|
||||
Var CurrentPageShowError = 1
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
DEBUGVAR MachineStage
|
||||
DEBUGVAR stop_now
|
||||
|
|
@ -198,7 +203,7 @@
|
|||
|
||||
Function 2
|
||||
|
||||
Refresh
|
||||
RefreshAll
|
||||
</EventLanguageOnChange>
|
||||
|
||||
<Function2>
|
||||
|
|
|
|||
|
|
@ -69,6 +69,13 @@
|
|||
Var DirImage = "ROOT/taobin_project/image/page_thankyou"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
|
||||
Var BottomText = PicturePath + "text_bottom_eng.png"
|
||||
|
||||
Var DirImage = "ROOT/taobin_project/image/page_thankyou_en"
|
||||
EndIf
|
||||
|
||||
DEBUGVAR StarwState
|
||||
DEBUGVAR LidState
|
||||
DEBUGVAR BottomText
|
||||
|
|
|
|||
|
|
@ -48,6 +48,13 @@
|
|||
Var BottomText = PicturePath + "text_bottom_thai2.png"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
|
||||
Var BottomText = PicturePath + "text_bottom_eng.png"
|
||||
|
||||
Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
|
||||
EndIf
|
||||
|
||||
;DEBUGVAR StarwState
|
||||
;DEBUGVAR LidState
|
||||
DEBUGVAR BottomText
|
||||
|
|
@ -108,6 +115,10 @@
|
|||
Var DirImage2 = "ROOT/taobin_project/image/complete/"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var DirImage2 = "ROOT/taobin_project/image/complete_mmr/"
|
||||
EndIf
|
||||
|
||||
Var txtDrinkOKState = "Invisible"
|
||||
Var buttonRemoveCup = "Invisible"
|
||||
|
||||
|
|
@ -282,12 +293,25 @@
|
|||
Else
|
||||
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
|
||||
EndIf
|
||||
<<<<<<< HEAD
|
||||
Else
|
||||
=======
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
|
||||
EndIf
|
||||
Else
|
||||
>>>>>>> 3637980ada4fd59458b0d1e714c0a7b556fbf717
|
||||
If CupChecking = "true" Then
|
||||
If show_eng = "true" Then
|
||||
Var MachineErrorDetailAll = " Please take a cup."
|
||||
Else
|
||||
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
EndIf
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
|
||||
>>>>>>> 3637980ada4fd59458b0d1e714c0a7b556fbf717
|
||||
EndIf
|
||||
Else
|
||||
If show_eng = "true" Then
|
||||
|
|
@ -295,6 +319,9 @@
|
|||
Else
|
||||
Var MachineErrorDetailAll = " กรุณากดปุ่ม แล้วนำแก้วออกก่อนครับ/คะ"
|
||||
EndIf
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
|
|||
|
|
@ -39,6 +39,13 @@
|
|||
Var BottomText = PicturePath + "text_bottom_thai2.png"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
|
||||
Var BottomText = PicturePath + "text_bottom_eng.png"
|
||||
|
||||
Var DirImage = "ROOT/taobin_project/image/page_thankyou_mmr"
|
||||
EndIf
|
||||
|
||||
DEBUGVAR StarwState
|
||||
DEBUGVAR LidState
|
||||
DEBUGVAR BottomText
|
||||
|
|
|
|||
|
|
@ -219,17 +219,21 @@
|
|||
DEBUGVAR BrewCommand
|
||||
Var BrewCommand = "-"
|
||||
If EnableMultiInstance = "true" Then
|
||||
InstanceOverSetString "RefreshNow" 5
|
||||
InstanceOverSetString "RefreshNow" 6
|
||||
InstanceOverSetString "RefreshNow" 7
|
||||
InstanceOverSetString "RefreshNow" 8
|
||||
InstanceOverSetString "RefreshNow" 9
|
||||
InstanceOverSetString "RefreshNow" 10
|
||||
InstanceOverSetString "RefreshNow" 11
|
||||
; TODO
|
||||
If CurrentPageShowError = 1 Then
|
||||
;do not thing
|
||||
Else
|
||||
InstanceOverSetString "RefreshNow" 5
|
||||
InstanceOverSetString "RefreshNow" 6
|
||||
InstanceOverSetString "RefreshNow" 7
|
||||
InstanceOverSetString "RefreshNow" 8
|
||||
InstanceOverSetString "RefreshNow" 9
|
||||
InstanceOverSetString "RefreshNow" 10
|
||||
InstanceOverSetString "RefreshNow" 11
|
||||
; TODO
|
||||
|
||||
; Trick Refresh First
|
||||
Var SlientRefreshIndex = 2
|
||||
; Trick Refresh First
|
||||
Var SlientRefreshIndex = 2
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
If Not#CountDownForMulti = 99 Then
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue