THAI INTER: Fix Page_drinkfail, Page_show_error [multi refresh], Page_thank_you [credit], Add Image

This commit is contained in:
Ittipat Lusuk 2024-12-10 13:57:11 +07:00
parent 49b8be98be
commit fc5e9ce097
36 changed files with 80 additions and 22 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.9 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 122 KiB

After

Width:  |  Height:  |  Size: 133 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

View file

@ -193,12 +193,12 @@
RootLayoutVisible 3 "show" RootLayoutVisible 3 "show"
;for test!!!!!!!!!!!!!!! ;for test!!!!!!!!!!!!!!!
If InternationalEnable = 1 Then ;If InternationalEnable = 1 Then
If CountryName = "Thailand" Then ;If CountryName = "Thailand" Then
Var ShowButtonClick2 = "Enable" ;Var ShowButtonClick2 = "Enable"
Var ButtontoTopupMenu = "Enable" ;Var ButtontoTopupMenu = "Enable"
EndIf ;EndIf
EndIf ;EndIf
</EventOpen> </EventOpen>
<Timeout> 1000 </Timeout> <Timeout> 1000 </Timeout>

View file

@ -1131,6 +1131,9 @@
If EnableMultiInstance = "true" Then If EnableMultiInstance = "true" Then
If CountryName = "Thailand" Then If CountryName = "Thailand" Then
; test payment
Var New_Payment = 1
Var InternationalEnable = 1 Var InternationalEnable = 1
DEBUGVAR InternationalEnable DEBUGVAR InternationalEnable
@ -1149,7 +1152,7 @@
Var ENABLE_UAE_DUBAI = "Invisible" Var ENABLE_UAE_DUBAI = "Invisible"
EnableLanguage "ENG" EnableLanguage "ENG"
EnableLanguage "THAI" EnableLanguage "THAI"
EnableLanguage "MYANMAR" ;EnableLanguage "MYANMAR"
If MyanmarLangEnable = "true" Then If MyanmarLangEnable = "true" Then
EnableLanguage "MYANMAR" EnableLanguage "MYANMAR"
@ -1168,6 +1171,7 @@
Var ShowButtonClick2 = "Invisible" Var ShowButtonClick2 = "Invisible"
Var ButtontoTopupMenu = "Enable" Var ButtontoTopupMenu = "Enable"
Var CurrentPageShowError = 0
Var PriceUnitText = "" Var PriceUnitText = ""

View file

@ -17,6 +17,10 @@
Var DirImage = "ROOT/taobin_project/image/collectiing/" Var DirImage = "ROOT/taobin_project/image/collectiing/"
EndIf EndIf
If LanguageShow = "MYANMAR" Then
Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/"
EndIf
Var Timeout = 0 Var Timeout = 0
StopLongPlay StopLongPlay

View file

@ -8,6 +8,8 @@
<EventOpen> <EventOpen>
; On open ; On open
RootLayoutVisible 3 "hide"
Var Seeker.TNumberTaobinMember = "" Var Seeker.TNumberTaobinMember = ""

View file

@ -17,6 +17,10 @@
Var DirImage = "ROOT/taobin_project/image/collectiing/" Var DirImage = "ROOT/taobin_project/image/collectiing/"
EndIf EndIf
If LanguageShow = "MYANMAR" Then
Var DirImage = "ROOT/taobin_project/image/collectiing_mmr/"
EndIf
Var Timeout = 0 Var Timeout = 0
Var GetFreeFlag = 0 Var GetFreeFlag = 0

View file

@ -1238,10 +1238,11 @@
Var PayState2 = "Disable" Var PayState2 = "Disable"
EndIf EndIf
Var PayState2 = "Enable" ;for test
Var PayState3 = "Enable" ;Var PayState2 = "Enable"
Var PayState4 = "Enable" ;Var PayState3 = "Enable"
Var PayState5 = "Enable" ;Var PayState4 = "Enable"
;Var PayState5 = "Enable"
</EventOpen> </EventOpen>
<EventActionOk> <EventActionOk>

View file

@ -10,6 +10,11 @@
Var countClick = 0 Var countClick = 0
Var countClick2 = 0 Var countClick2 = 0
If InternationalEnable = 1 Then
If CountryName = "Thailand" Then
Var CurrentPageShowError = 1
EndIf
EndIf
DEBUGVAR MachineStage DEBUGVAR MachineStage
DEBUGVAR stop_now DEBUGVAR stop_now
@ -190,7 +195,7 @@
Function 2 Function 2
Refresh RefreshAll
</EventLanguageOnChange> </EventLanguageOnChange>
<Function2> <Function2>

View file

@ -69,6 +69,13 @@
Var DirImage = "ROOT/taobin_project/image/page_thankyou" Var DirImage = "ROOT/taobin_project/image/page_thankyou"
EndIf 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 StarwState
DEBUGVAR LidState DEBUGVAR LidState
DEBUGVAR BottomText DEBUGVAR BottomText

View file

@ -48,6 +48,13 @@
Var BottomText = PicturePath + "text_bottom_thai2.png" Var BottomText = PicturePath + "text_bottom_thai2.png"
EndIf 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 StarwState
;DEBUGVAR LidState ;DEBUGVAR LidState
DEBUGVAR BottomText DEBUGVAR BottomText
@ -108,6 +115,10 @@
Var DirImage2 = "ROOT/taobin_project/image/complete/" Var DirImage2 = "ROOT/taobin_project/image/complete/"
EndIf EndIf
If LanguageShow = "MYANMAR" Then
Var DirImage2 = "ROOT/taobin_project/image/complete_mmr/"
EndIf
Var txtDrinkOKState = "Invisible" Var txtDrinkOKState = "Invisible"
Var buttonRemoveCup = "Invisible" Var buttonRemoveCup = "Invisible"
@ -280,6 +291,9 @@
Else Else
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ" Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
EndIf EndIf
If LanguageShow = "MYANMAR" Then
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
EndIf
Else Else
If CupChecking = "true" Then If CupChecking = "true" Then
If show_eng = "true" Then If show_eng = "true" Then
@ -287,12 +301,18 @@
Else Else
Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ" Var MachineErrorDetailAll = " กรุณานำแก้วออกก่อนครับ/คะ"
EndIf EndIf
If LanguageShow = "MYANMAR" Then
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
EndIf
Else Else
If show_eng = "true" Then If show_eng = "true" Then
Var MachineErrorDetailAll = " Press button for take a cup." Var MachineErrorDetailAll = " Press button for take a cup."
Else Else
Var MachineErrorDetailAll = " กรุณากดปุ่ม แล้วนำแก้วออกก่อนครับ/คะ" Var MachineErrorDetailAll = " กรุณากดปุ่ม แล้วนำแก้วออกก่อนครับ/คะ"
EndIf EndIf
If LanguageShow = "MYANMAR" Then
Var MachineErrorDetailAll = " ကျေးဇူးပြုပြီး ဖန်ခွက်ကို အရင်ထုတ်ပါ။"
EndIf
EndIf EndIf
EndIf EndIf

View file

@ -39,6 +39,13 @@
Var BottomText = PicturePath + "text_bottom_thai2.png" Var BottomText = PicturePath + "text_bottom_thai2.png"
EndIf 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 StarwState
DEBUGVAR LidState DEBUGVAR LidState
DEBUGVAR BottomText DEBUGVAR BottomText

View file

@ -204,17 +204,21 @@
DEBUGVAR BrewCommand DEBUGVAR BrewCommand
Var BrewCommand = "-" Var BrewCommand = "-"
If EnableMultiInstance = "true" Then If EnableMultiInstance = "true" Then
InstanceOverSetString "RefreshNow" 5 If CurrentPageShowError = 1 Then
InstanceOverSetString "RefreshNow" 6 ;do not thing
InstanceOverSetString "RefreshNow" 7 Else
InstanceOverSetString "RefreshNow" 8 InstanceOverSetString "RefreshNow" 5
InstanceOverSetString "RefreshNow" 9 InstanceOverSetString "RefreshNow" 6
InstanceOverSetString "RefreshNow" 10 InstanceOverSetString "RefreshNow" 7
InstanceOverSetString "RefreshNow" 11 InstanceOverSetString "RefreshNow" 8
; TODO InstanceOverSetString "RefreshNow" 9
InstanceOverSetString "RefreshNow" 10
InstanceOverSetString "RefreshNow" 11
; TODO
; Trick Refresh First ; Trick Refresh First
Var SlientRefreshIndex = 2 Var SlientRefreshIndex = 2
EndIf
EndIf EndIf
If Not#CountDownForMulti = 99 Then If Not#CountDownForMulti = 99 Then