THAI INTER: Merge branch masterpiece -> th_mmr
This commit is contained in:
Ittipat Lusuk
commit
3c994e2ed1
548 changed files with 161156 additions and 52934 deletions
|
|
@ -10,9 +10,10 @@
|
|||
|
||||
RootLayoutVisible 3 "hide"
|
||||
|
||||
|
||||
Var Seeker.TNumberTaobinMember = ""
|
||||
|
||||
|
||||
|
||||
DEBUGVAR TelephoneNumberProblem
|
||||
DEBUGVAR Seeker.PromotionIDCurrentOrder
|
||||
|
||||
|
|
@ -21,7 +22,7 @@
|
|||
Open "ROOT/taobin_project/inter/sgp/xml/page_drinkfail_sg.lxml"
|
||||
EndIf
|
||||
|
||||
If CountryName = "Australia" Then
|
||||
If CountryName = "Australia" Then
|
||||
Open "ROOT/taobin_project/inter/aus/xml/page_drinkfail_aus.lxml"
|
||||
EndIf
|
||||
|
||||
|
|
@ -29,6 +30,9 @@
|
|||
Open "ROOT/taobin_project/inter/hkg/xml/page_drinkfail_hkg.lxml"
|
||||
EndIf
|
||||
|
||||
If CountryName = "UnitedArabEmirates Dubai" Then
|
||||
Open "ROOT/taobin_project/inter/uae_dubai/xml/page_drinkfail_uae.lxml"
|
||||
EndIf
|
||||
|
||||
|
||||
If TelephoneNumberProblem = "" Then
|
||||
|
|
@ -43,7 +47,7 @@
|
|||
DEBUGVAR ERROR_BREW_CAUSE_THAI
|
||||
|
||||
|
||||
If FailedCount > 0 Then
|
||||
If FailedCount > 0 Then
|
||||
Var ERROR_PAY_TIMEOUT = "false"
|
||||
DEBUGVAR FailedCount
|
||||
DEBUGVAR ERROR_PAY_TIMEOUT
|
||||
|
|
@ -57,13 +61,13 @@
|
|||
|
||||
|
||||
If ERROR_PAY_TIMEOUT = "true" Then
|
||||
|
||||
|
||||
If NumberFailed = "false" Then
|
||||
|
||||
If show_eng = "true" Then
|
||||
If show_eng = "true" Then
|
||||
Var TextErrorShow = ERROR_BREW_CAUSE_ENG
|
||||
Else
|
||||
If show_japan = "true" Then
|
||||
If show_japan = "true" Then
|
||||
Var TextErrorShow = ERROR_BREW_CAUSE_JAPAN
|
||||
Else
|
||||
Var TextErrorShow = ERROR_BREW_CAUSE_THAI
|
||||
|
|
@ -71,7 +75,7 @@
|
|||
EndIf
|
||||
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail4.xml"
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail4.xml"
|
||||
|
||||
EndIf
|
||||
|
||||
|
|
@ -82,7 +86,7 @@
|
|||
If CountryName = "Singapore" Then
|
||||
Open "ROOT/taobin_project/inter/sgp/xml/page_drinkfail_sg.lxml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
Else
|
||||
|
|
@ -93,21 +97,21 @@
|
|||
If CountryName = "Singapore" Then
|
||||
Open "ROOT/taobin_project/inter/sgp/xml/page_drinkfail_sg.lxml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail2-2.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
If show_eng = "true" Then
|
||||
|
||||
|
||||
|
||||
If show_eng = "true" Then
|
||||
Var DirImage = "ROOT/taobin_project/image/collectiing_en/"
|
||||
|
||||
Else
|
||||
|
|
@ -121,25 +125,25 @@
|
|||
|
||||
Var Timeout = 0
|
||||
|
||||
|
||||
|
||||
StopLongPlay
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Var MachineErrorDetailAll = MachineErrorDetail + " / "
|
||||
Var MachineErrorDetailAll = MachineErrorDetailAll + MachineErrorDetailEng
|
||||
|
||||
|
||||
|
||||
|
||||
If show_eng = "true" Then
|
||||
|
||||
If show_eng = "true" Then
|
||||
Var textRefundChannelX = "textRefundChannel1.png"
|
||||
Var xRefundChannelX = 249
|
||||
|
||||
If Seeker.PayWithQR = 0 Then
|
||||
If Seeker.PayWithQR = 0 Then
|
||||
|
||||
If Seeker.StoreCreditFlag = 1 Then
|
||||
Var textRefundChannelX = "textRefundChannel2.png"
|
||||
|
|
@ -163,7 +167,7 @@
|
|||
Var textRefundChannelX = "textRefundChannel1.png"
|
||||
Var xRefundChannelX = 204
|
||||
|
||||
If Seeker.PayWithQR = 0 Then
|
||||
If Seeker.PayWithQR = 0 Then
|
||||
|
||||
If Seeker.StoreCreditFlag = 1 Then
|
||||
Var textRefundChannelX = "textRefundChannel2.png"
|
||||
|
|
@ -188,13 +192,13 @@
|
|||
|
||||
DEBUGVAR CountryName
|
||||
DEBUGVAR MaxPhoneNumber
|
||||
|
||||
|
||||
Machine NewPaymentOpenBrewingXML
|
||||
|
||||
|
||||
</EventOpen>
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
||||
<EventTimeout>
|
||||
|
||||
SAVELOG MachineStage
|
||||
|
||||
Var Timeout = Timeout + 1
|
||||
|
|
@ -202,26 +206,26 @@
|
|||
If Timeout > 15 Then
|
||||
|
||||
If MachineStage = "remove-cup" Then
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
|
||||
Else
|
||||
If NextOrder = "true" Then
|
||||
Var NextOrder = "false"
|
||||
|
||||
TransferVar "next" "curr"
|
||||
Var Seeker = "curr"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
TimerReset
|
||||
|
||||
</EventTimeout>
|
||||
</EventTimeout>
|
||||
|
||||
|
||||
|
||||
|
|
@ -245,13 +249,13 @@
|
|||
<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_1.png" </FilenamePress>
|
||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
Var Timeout = 0
|
||||
Var TelephoneNumberProblem = TelephoneNumberProblem + "1"
|
||||
Trim TelephoneNumberProblem MaxPhoneNumber
|
||||
StrLen TelephoneNumberProblem TelNumLen
|
||||
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
|
|
@ -261,7 +265,7 @@
|
|||
TimerReset
|
||||
Refresh
|
||||
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -272,13 +276,13 @@
|
|||
<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_2.png" </FilenamePress>
|
||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
Var Timeout = 0
|
||||
Var TelephoneNumberProblem = TelephoneNumberProblem + "2"
|
||||
Trim TelephoneNumberProblem MaxPhoneNumber
|
||||
StrLen TelephoneNumberProblem TelNumLen
|
||||
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
|
|
@ -289,7 +293,7 @@
|
|||
Refresh
|
||||
|
||||
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -300,13 +304,13 @@
|
|||
<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_3.png" </FilenamePress>
|
||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
Var Timeout = 0
|
||||
Var TelephoneNumberProblem = TelephoneNumberProblem + "3"
|
||||
Trim TelephoneNumberProblem MaxPhoneNumber
|
||||
StrLen TelephoneNumberProblem TelNumLen
|
||||
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
|
|
@ -316,7 +320,7 @@
|
|||
TimerReset
|
||||
Refresh
|
||||
|
||||
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
|
@ -328,13 +332,13 @@
|
|||
<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_4.png" </FilenamePress>
|
||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
Var Timeout = 0
|
||||
Var TelephoneNumberProblem = TelephoneNumberProblem + "4"
|
||||
Trim TelephoneNumberProblem MaxPhoneNumber
|
||||
StrLen TelephoneNumberProblem TelNumLen
|
||||
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
|
|
@ -344,7 +348,7 @@
|
|||
TimerReset
|
||||
Refresh
|
||||
|
||||
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
|
@ -356,13 +360,13 @@
|
|||
<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_5.png" </FilenamePress>
|
||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
Var Timeout = 0
|
||||
Var TelephoneNumberProblem = TelephoneNumberProblem + "5"
|
||||
Trim TelephoneNumberProblem MaxPhoneNumber
|
||||
StrLen TelephoneNumberProblem TelNumLen
|
||||
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
|
|
@ -384,13 +388,13 @@
|
|||
<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_6.png" </FilenamePress>
|
||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
Var Timeout = 0
|
||||
Var TelephoneNumberProblem = TelephoneNumberProblem + "6"
|
||||
Trim TelephoneNumberProblem MaxPhoneNumber
|
||||
StrLen TelephoneNumberProblem TelNumLen
|
||||
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
|
|
@ -412,13 +416,13 @@
|
|||
<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_7.png" </FilenamePress>
|
||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
Var Timeout = 0
|
||||
Var TelephoneNumberProblem = TelephoneNumberProblem + "7"
|
||||
Trim TelephoneNumberProblem MaxPhoneNumber
|
||||
StrLen TelephoneNumberProblem TelNumLen
|
||||
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
|
|
@ -428,7 +432,7 @@
|
|||
TimerReset
|
||||
Refresh
|
||||
|
||||
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
|
@ -440,13 +444,13 @@
|
|||
<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_8.png" </FilenamePress>
|
||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
Var Timeout = 0
|
||||
Var TelephoneNumberProblem = TelephoneNumberProblem + "8"
|
||||
Trim TelephoneNumberProblem MaxPhoneNumber
|
||||
StrLen TelephoneNumberProblem TelNumLen
|
||||
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
|
|
@ -456,7 +460,7 @@
|
|||
TimerReset
|
||||
Refresh
|
||||
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -467,13 +471,13 @@
|
|||
<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_9.png" </FilenamePress>
|
||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
Var Timeout = 0
|
||||
Var TelephoneNumberProblem = TelephoneNumberProblem + "9"
|
||||
Trim TelephoneNumberProblem MaxPhoneNumber
|
||||
StrLen TelephoneNumberProblem TelNumLen
|
||||
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
|
|
@ -482,7 +486,7 @@
|
|||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -493,13 +497,13 @@
|
|||
<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_0.png" </FilenamePress>
|
||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
Var Timeout = 0
|
||||
Var TelephoneNumberProblem = TelephoneNumberProblem + "0"
|
||||
Trim TelephoneNumberProblem MaxPhoneNumber
|
||||
StrLen TelephoneNumberProblem TelNumLen
|
||||
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
Var Tel_Confirm_State = "Enable"
|
||||
EndIf
|
||||
|
||||
|
|
@ -509,7 +513,7 @@
|
|||
TimerReset
|
||||
Refresh
|
||||
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -521,23 +525,23 @@
|
|||
<FilenamePress> "ROOT/taobin_project/image/collectiing/bps_back-1.png" </FilenamePress>
|
||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
Var Timeout = 0
|
||||
Trim TelephoneNumberProblem -1
|
||||
|
||||
|
||||
StrLen TelephoneNumberProblem TelNumLen
|
||||
|
||||
If TelNumLen < 10 Then
|
||||
If TelNumLen < 10 Then
|
||||
Var Tel_Confirm_State = "Invisible"
|
||||
EndIf
|
||||
|
||||
If TelNumLen = 0 Then
|
||||
|
||||
If TelNumLen = 0 Then
|
||||
Var ShowTextNumber = "Enable"
|
||||
EndIf
|
||||
|
||||
TimerReset
|
||||
Refresh
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
||||
|
|
@ -551,22 +555,22 @@
|
|||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
If MachineStage = "remove-cup" Then
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
|
||||
Else
|
||||
|
||||
|
||||
If NextOrder = "true" Then
|
||||
Var NextOrder = "false"
|
||||
|
||||
TransferVar "next" "curr"
|
||||
Var Seeker = "curr"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
|
|
@ -585,10 +589,10 @@
|
|||
<FilenameDisable> Var( DirImage + "/bp_confirm.png" )</FilenameDisable>
|
||||
<Sound> "ROOT/sounds/codebuttom.wav" </Sound>
|
||||
<Volume> SoundVolume </Volume>
|
||||
<EventClick>
|
||||
<EventClick>
|
||||
|
||||
StrLen TelephoneNumberProblem TelNumLen
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
If TelNumLen >= MinPhoneNumber Then
|
||||
|
||||
|
||||
Var ProblemID = 7
|
||||
|
|
@ -608,14 +612,14 @@
|
|||
EndIf
|
||||
|
||||
; sgp-server-rm-zero
|
||||
|
||||
|
||||
|
||||
PROBLEM2 TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem
|
||||
|
||||
PROBLEM2 TelephoneNumberProblem ProblemID ChooseProblem VendingTSIDProblem
|
||||
|
||||
|
||||
If MachineStage = "remove-cup" Then
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
|
||||
Open "ROOT/taobin_project/xml/page_drinkfail3.xml"
|
||||
Else
|
||||
;inter-xml-open
|
||||
If CountryName = "Malaysia" Then
|
||||
|
|
@ -629,10 +633,10 @@
|
|||
|
||||
TransferVar "next" "curr"
|
||||
Var Seeker = "curr"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_thankyouConti.xml"
|
||||
Else
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
Open "ROOT/taobin_project/xml/page_back_to_main.xml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
|
@ -640,7 +644,7 @@
|
|||
|
||||
EndIf
|
||||
|
||||
|
||||
|
||||
|
||||
</EventClick>
|
||||
</Button>
|
||||
|
|
@ -717,4 +721,4 @@
|
|||
|
||||
|
||||
|
||||
</Popup>
|
||||
</Popup>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue