From 9855b4559786693710dc1e656580af1f7b144cce Mon Sep 17 00:00:00 2001 From: Ittipat Lusuk Date: Thu, 28 Nov 2024 13:40:59 +0700 Subject: [PATCH] THAI INTER: Fix extra topping OatMilk, Fix 3 langs with page_check_member --- inter/tha/xml/page_topping_select6.lxml | 29 ++-- xml/page_before_check_member.xml | 35 +++-- xml/page_catalog3.xml | 8 +- xml/page_check_member.xml | 174 ++++++++++++++---------- 4 files changed, 149 insertions(+), 97 deletions(-) diff --git a/inter/tha/xml/page_topping_select6.lxml b/inter/tha/xml/page_topping_select6.lxml index 1aa35fd8..2055b6f7 100644 --- a/inter/tha/xml/page_topping_select6.lxml +++ b/inter/tha/xml/page_topping_select6.lxml @@ -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 @@ 500 72 - 000109 + 000112 @@ -6135,11 +6135,12 @@ 120 69 - KanitRegularTTF "Enable" - 36 - 0x84776F - StringToppingOatMilkWithPrice + 800 + 65 + + 000113 + @@ -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 diff --git a/xml/page_before_check_member.xml b/xml/page_before_check_member.xml index 5cba996c..3be78a07 100644 --- a/xml/page_before_check_member.xml +++ b/xml/page_before_check_member.xml @@ -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 @@ 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" @@ -168,8 +179,9 @@ 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" @@ -184,8 +196,9 @@ 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" diff --git a/xml/page_catalog3.xml b/xml/page_catalog3.xml index 978ce111..2bdf280e 100644 --- a/xml/page_catalog3.xml +++ b/xml/page_catalog3.xml @@ -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" - + Open "ROOT/taobin_project/xml/page_before_check_member.xml" diff --git a/xml/page_check_member.xml b/xml/page_check_member.xml index 3b2b54f2..94a1dba6 100644 --- a/xml/page_check_member.xml +++ b/xml/page_check_member.xml @@ -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 - - - - 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 - - - 1000 @@ -263,7 +198,68 @@ + + 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 +