THAI INTER: Fix extra topping OatMilk, Fix 3 langs with page_check_member
This commit is contained in:
parent
c4135c748f
commit
9855b45597
4 changed files with 149 additions and 97 deletions
|
|
@ -579,7 +579,7 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
Var StringToppingOatMilkWithPrice = ""
|
||||
;Var StringToppingOatMilkWithPrice = ""
|
||||
Var StringToppingOreoWithPrice = ""
|
||||
Var StringCoffeeLevelWithPrice0 = ""
|
||||
Var StringCoffeeLevelWithPrice1 = ""
|
||||
|
|
@ -932,8 +932,8 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000108, LanguageShowByIndex)
|
||||
Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
|
||||
;Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000108, LanguageShowByIndex)
|
||||
;Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
|
||||
|
||||
Var StringToppingOreoWithPrice !assigned GetLanguageID( 000101, LanguageShowByIndex)
|
||||
Var StringToppingOreoWithPrice = StringToppingOreoWithPrice + text_price_6
|
||||
|
|
@ -6072,7 +6072,7 @@
|
|||
<Width> 500 </Width>
|
||||
<Height> 72 </Height>
|
||||
<Language>
|
||||
<ID> 000109 </ID>
|
||||
<ID> 000112 </ID>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
|
|
@ -6135,11 +6135,12 @@
|
|||
<Text>
|
||||
<X> 120 </X>
|
||||
<Y> 69 </Y>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<State> "Enable" </State>
|
||||
<Size> 36 </Size>
|
||||
<Color> 0x84776F </Color>
|
||||
<Value> StringToppingOatMilkWithPrice </Value>
|
||||
<Width> 800 </Width>
|
||||
<Height> 65 </Height>
|
||||
<Language>
|
||||
<ID> 000113 </ID>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
</Block>
|
||||
|
|
@ -8865,12 +8866,12 @@
|
|||
EndIf
|
||||
EndIf
|
||||
|
||||
If OatMilkEnable = "Enable" Then
|
||||
DEBUGVAR LanguageShowByIndex
|
||||
Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000108, LanguageShowByIndex)
|
||||
Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
|
||||
DEBUGVAR StringToppingOatMilkWithPrice
|
||||
EndIf
|
||||
;If OatMilkEnable = "Enable" Then
|
||||
;DEBUGVAR LanguageShowByIndex
|
||||
;Var StringToppingOatMilkWithPrice !assigned GetLanguageID( 000108, LanguageShowByIndex)
|
||||
;Var StringToppingOatMilkWithPrice = StringToppingOatMilkWithPrice + OatMilkPrice
|
||||
;DEBUGVAR StringToppingOatMilkWithPrice
|
||||
;EndIf
|
||||
|
||||
If showOreoAddEnable = "Enable" Then
|
||||
DEBUGVAR LanguageShowByIndex
|
||||
|
|
|
|||
|
|
@ -12,26 +12,36 @@
|
|||
Var ChangeMemberPassword = 0
|
||||
|
||||
; Default language (Thai).
|
||||
If show_eng = "false" Then
|
||||
;If show_eng = "false" Then
|
||||
;Var show_btn = "ROOT/taobin_project/image/page2/bn_eng_lang_2.png"
|
||||
;Var text = "เลือกบริการที่คุณต้องการ"
|
||||
;Var Extension = ".png"
|
||||
SetLanguage "THAI"
|
||||
EndIf
|
||||
;SetLanguage "THAI"
|
||||
;EndIf
|
||||
|
||||
; language (Eng).
|
||||
If show_eng = "true" Then
|
||||
;If show_eng = "true" Then
|
||||
;Var show_btn = "ROOT/taobin_project/image/page2/bn_thai_lang_2.png"
|
||||
;Var text = "Manage your Tao Bin account"
|
||||
;Var Extension = "_en.png"
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
;If LanguageShow = "MYANMAR" Then
|
||||
;Var text = "သင်၏ Tao Bin အကောင့်ကို စီမံခန့်ခွဲပါ။"
|
||||
;Var Extension = "_mmr.png"
|
||||
;SetLanguage "MYANMAR"
|
||||
;Else
|
||||
;SetLanguage "ENG"
|
||||
;EndIf
|
||||
;EndIf
|
||||
|
||||
If show_eng = "true" Then
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
SetLanguage "MYANMAR"
|
||||
Else
|
||||
SetLanguage "ENG"
|
||||
EndIf
|
||||
Else
|
||||
SetLanguage "THAI"
|
||||
EndIf
|
||||
|
||||
|
||||
|
|
@ -152,8 +162,9 @@
|
|||
<EventClick>
|
||||
|
||||
Var OpenTopupCredit = 1
|
||||
Var CheckMemberTitleTH = "กรุณาใส่เบอร์มือถือ\nเพื่อเติมเต่าบินเครดิต"
|
||||
Var CheckMemberTitleEN = "Please enter your mobile number\nto topup Tao bin credit."
|
||||
Var ShowTextTopup = "Enable"
|
||||
Var ShowTextCoupon = "Invisible"
|
||||
Var ShowTextPass = "Invisible"
|
||||
Open "ROOT/taobin_project/xml/page_check_member.xml"
|
||||
|
||||
</EventClick>
|
||||
|
|
@ -168,8 +179,9 @@
|
|||
<EventClick>
|
||||
|
||||
Var OpenCheckCoupon = 1
|
||||
Var CheckMemberTitleTH = "กรุณาใส่เบอร์มือถือ\nเพื่อเช็กคะแนนสะสมของคุณ"
|
||||
Var CheckMemberTitleEN = "Please enter your mobile number\nto check reward point."
|
||||
Var ShowTextTopup = "Invisible"
|
||||
Var ShowTextCoupon = "Enable"
|
||||
Var ShowTextPass = "Invisible"
|
||||
Open "ROOT/taobin_project/xml/page_check_member.xml"
|
||||
|
||||
</EventClick>
|
||||
|
|
@ -184,8 +196,9 @@
|
|||
<EventClick>
|
||||
|
||||
Var ChangeMemberPassword = 1
|
||||
Var CheckMemberTitleTH = "กรุณาใส่เบอร์มือถือ\nเพื่อเปลี่ยนรหัสผ่าน"
|
||||
Var CheckMemberTitleEN = "Please enter your mobile number\nto change password."
|
||||
Var ShowTextTopup = "Invisible"
|
||||
Var ShowTextCoupon = "Invisible"
|
||||
Var ShowTextPass = "Enable"
|
||||
Open "ROOT/taobin_project/xml/page_check_member.xml"
|
||||
|
||||
</EventClick>
|
||||
|
|
|
|||
|
|
@ -259,7 +259,11 @@
|
|||
EndIf
|
||||
|
||||
If EnableMultiInstance = "true" Then
|
||||
Open "ROOT/taobin_project/inter/tha/xml/page_catalog.lxml"
|
||||
If InternationalEnable = 1 Then
|
||||
If CountryName = "Thailand" Then
|
||||
Open "ROOT/taobin_project/inter/tha/xml/page_catalog.lxml"
|
||||
EndIf
|
||||
EndIf
|
||||
EndIf
|
||||
|
||||
Var Price5Active = 0
|
||||
|
|
@ -737,7 +741,7 @@
|
|||
Open "/mnt/sdcard/coffeevending/taobin_project/xml/menutab/page_catalog.xml"
|
||||
</EventUnitTest1>
|
||||
<EventUnitTest2>
|
||||
|
||||
Open "ROOT/taobin_project/xml/page_before_check_member.xml"
|
||||
</EventUnitTest2>
|
||||
|
||||
<EventUnitTest3>
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@
|
|||
|
||||
Var TaobinCredit = 0
|
||||
|
||||
Var show_eng_button_stage = "Enable"
|
||||
|
||||
;inter-max-number
|
||||
If CountryName = "Malaysia" Then
|
||||
|
|
@ -69,70 +68,6 @@
|
|||
EndIf
|
||||
|
||||
</EventOpen>
|
||||
|
||||
|
||||
<EventLanguageOnChange>
|
||||
DEBUGVAR LanguageShow
|
||||
|
||||
If LanguageShow = "ENG" Then
|
||||
Var CheckMemberTitle = CheckMemberTitleEN
|
||||
|
||||
Var DirImage = "ROOT/taobin_project/image/collectiing_en"
|
||||
Var Xtext19 = 154
|
||||
|
||||
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
|
||||
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
|
||||
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_enter_your_mobile_to_credit_balance.mp3"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "THAI" Then
|
||||
Var CheckMemberTitle = CheckMemberTitleTH
|
||||
|
||||
Var DirImage = "ROOT/taobin_project/image/collectiing"
|
||||
|
||||
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
|
||||
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
|
||||
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_enter_your_mobile_to_credit_balance.mp3"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
Var CheckMemberTitle = CheckMemberTitleMMR
|
||||
Var DirImage = "ROOT/taobin_project/image/collectiing_mmr"
|
||||
EndIf
|
||||
SAVELOG "EventLanguageOnChange menu -list"
|
||||
|
||||
If InternationalEnable = 1 Then
|
||||
If CountryName = "Thailand" Then
|
||||
Var show_eng_button_stage = "Invisible"
|
||||
Var LanguageButtonEnable = "Enable"
|
||||
EndIf
|
||||
;inter-max-number
|
||||
If CountryName = "Malaysia" Then
|
||||
Var show_eng_button_stage = "Invisible"
|
||||
EndIf
|
||||
|
||||
;inter-max-number
|
||||
If CountryName = "Indonesia" Then
|
||||
Var show_eng_button_stage = "Invisible"
|
||||
EndIf
|
||||
|
||||
;inter-max-number
|
||||
If CountryName = "Australia" Then
|
||||
Var show_eng_button_stage = "Invisible"
|
||||
EndIf
|
||||
Else
|
||||
Var LanguageButtonEnable = "Invisible"
|
||||
Var show_eng_button_stage = "Enable"
|
||||
EndIf
|
||||
|
||||
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
RefreshAll
|
||||
</EventLanguageOnChange>
|
||||
|
||||
|
||||
<Timeout> 1000 </Timeout>
|
||||
<EventTimeout>
|
||||
|
||||
|
|
@ -263,7 +198,68 @@
|
|||
</EventActionError>
|
||||
|
||||
|
||||
<EventLanguageOnChange>
|
||||
DEBUGVAR LanguageShow
|
||||
|
||||
If LanguageShow = "ENG" Then
|
||||
;Var CheckMemberTitle = CheckMemberTitleEN
|
||||
|
||||
Var DirImage = "ROOT/taobin_project/image/collectiing_en"
|
||||
Var Xtext19 = 154
|
||||
|
||||
Var show_btp = "ROOT/taobin_project/image/bn_thai_lang_press.png"
|
||||
Var show_btn = "ROOT/taobin_project/image/bn_thai_lang.png"
|
||||
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_eng/Please_enter_your_mobile_to_credit_balance.mp3"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "THAI" Then
|
||||
;Var CheckMemberTitle = CheckMemberTitleTH
|
||||
|
||||
Var DirImage = "ROOT/taobin_project/image/collectiing"
|
||||
|
||||
Var show_btp = "ROOT/taobin_project/image/bn_eng_lang_press.png"
|
||||
Var show_btn = "ROOT/taobin_project/image/bn_eng_lang.png"
|
||||
|
||||
PlayLong "/mnt/sdcard/coffeevending/taobin_project/sound_thai/Please_enter_your_mobile_to_credit_balance.mp3"
|
||||
EndIf
|
||||
|
||||
If LanguageShow = "MYANMAR" Then
|
||||
;Var CheckMemberTitle = CheckMemberTitleMMR
|
||||
|
||||
Var DirImage = "ROOT/taobin_project/image/collectiing_mmr"
|
||||
EndIf
|
||||
|
||||
SAVELOG "EventLanguageOnChange menu -list"
|
||||
|
||||
If InternationalEnable = 1 Then
|
||||
If CountryName = "Thailand" Then
|
||||
Var show_eng_button_stage = "Invisible"
|
||||
Var LanguageButtonEnable = "Enable"
|
||||
EndIf
|
||||
;inter-max-number
|
||||
If CountryName = "Malaysia" Then
|
||||
Var show_eng_button_stage = "Invisible"
|
||||
EndIf
|
||||
|
||||
;inter-max-number
|
||||
If CountryName = "Indonesia" Then
|
||||
Var show_eng_button_stage = "Invisible"
|
||||
EndIf
|
||||
|
||||
;inter-max-number
|
||||
If CountryName = "Australia" Then
|
||||
Var show_eng_button_stage = "Invisible"
|
||||
EndIf
|
||||
Else
|
||||
Var LanguageButtonEnable = "Invisible"
|
||||
Var show_eng_button_stage = "Enable"
|
||||
EndIf
|
||||
|
||||
|
||||
OpenInst 3 "ROOT/taobin_project/xml/topview2.xml"
|
||||
RefreshAll
|
||||
</EventLanguageOnChange>
|
||||
|
||||
|
||||
<Button>
|
||||
|
|
@ -591,6 +587,7 @@
|
|||
<Button>
|
||||
<X> 44 </X>
|
||||
<Y> 1783 </Y>
|
||||
<Refresh> "Enable" </Refresh>
|
||||
<Filename> Var( DirImage + "/bn_back.png" )</Filename>
|
||||
<FilenamePress> Var( DirImage + "/bp_back.png" )</FilenamePress>
|
||||
<Sound> "/mnt/sdcard/coffeevending/wav/click.wav" </Sound>
|
||||
|
|
@ -685,15 +682,52 @@
|
|||
;<Filename> Var( DirImage + "/text_19.png" )</Filename>
|
||||
;</Image>
|
||||
|
||||
;<Text>
|
||||
;<X> 0 </X>
|
||||
;<Y> 521 </Y>
|
||||
;<Width> 1080 </Width>
|
||||
;<Align> Center </Align>
|
||||
;<Font> KanitRegularTTF </Font>
|
||||
;<Color> 0x513C2F </Color>
|
||||
;<Size> 51 </Size>
|
||||
;<Value> CheckMemberTitle </Value>
|
||||
;</Text>
|
||||
|
||||
<Text>
|
||||
<X> 0 </X>
|
||||
<Y> 521 </Y>
|
||||
<Refresh> "Enable" </Refresh>
|
||||
<State> ShowTextTopup </State>
|
||||
<Width> 1080 </Width>
|
||||
<Align> Center </Align>
|
||||
<Font> KanitRegularTTF </Font>
|
||||
<Color> 0x513C2F </Color>
|
||||
<Size> 51 </Size>
|
||||
<Value> CheckMemberTitle </Value>
|
||||
<Height> 200 </Height>
|
||||
<Language>
|
||||
<Refresh> "Enable" </Refresh>
|
||||
<ID> 002001 </ID>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
<X> 0 </X>
|
||||
<Y> 521 </Y>
|
||||
<State> ShowTextCoupon </State>
|
||||
<Width> 1080 </Width>
|
||||
<Height> 200 </Height>
|
||||
<Language>
|
||||
<Refresh> "Enable" </Refresh>
|
||||
<ID> 002002 </ID>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
<Text>
|
||||
<X> 0 </X>
|
||||
<Y> 521 </Y>
|
||||
<State> ShowTextPass </State>
|
||||
<Width> 1080 </Width>
|
||||
<Height> 200 </Height>
|
||||
<Language>
|
||||
<Refresh> "Enable" </Refresh>
|
||||
<ID> 002003 </ID>
|
||||
</Language>
|
||||
</Text>
|
||||
|
||||
<Image>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue